Browse Source

Loongson2k: fix pcie probe only process when dtb deleted this port.

Change-Id: I1af1cefbb4e0df284a3053571127b11f462e4138
Signed-off-by: QiaoChong <qiaochong@loongson.cn>
master
QiaoChong 6 years ago
parent
commit
8072d8098c
  1. 21
      Targets/LS2K/dev/load_dtb.c

21
Targets/LS2K/dev/load_dtb.c

@ -72,7 +72,7 @@ static int check_pci_bridge_ok(void)
const void *nodep; /* property node pointer */ const void *nodep; /* property node pointer */
int nodeoffset; /* node offset from libfdt */ int nodeoffset; /* node offset from libfdt */
int len, id, i; /* length of the property */ int len, id, i; /* length of the property */
char *ethernet_name[]={"/soc/pcie0_port0@40100000", "/soc/pcie0_port1@50000000", "/soc/pcie0_port2@54000000", "/soc/pcie0_port3@58000000", "/soc/pcie1_port0@60000000", "/soc/pcie1_port1@78000000"}; char *pcie_name[]={"/soc/pcie0_port0@40100000", "/soc/pcie0_port1@50000000", "/soc/pcie0_port2@54000000", "/soc/pcie0_port3@58000000", "/soc/pcie1_port0@60000000", "/soc/pcie1_port1@78000000"};
pcitag_t tag; pcitag_t tag;
unsigned int val, val1, d, start, end; unsigned int val, val1, d, start, end;
int dev; int dev;
@ -80,14 +80,14 @@ static int check_pci_bridge_ok(void)
if (!pci_probe_only) return 1; if (!pci_probe_only) return 1;
for(id = 0, dev=9;id < sizeof(ethernet_name)/sizeof(ethernet_name[0]);id++,dev++) { for(id = 0, dev=9;id < sizeof(pcie_name)/sizeof(pcie_name[0]);id++,dev++) {
nodeoffset = fdt_path_offset (working_fdt, ethernet_name[id]); nodeoffset = fdt_path_offset (working_fdt, pcie_name[id]);
if (nodeoffset < 0) { if (nodeoffset < 0) {
return 1; //no ethernet device, do nothing continue; //dtb deleted this pcie port
} }
nodep = fdt_getprop (working_fdt, nodeoffset, (const char* )"ranges", &len); nodep = fdt_getprop (working_fdt, nodeoffset, (const char* )"ranges", &len);
if(len <= 0) { if(len <= 0) {
return 1; //no mac prop in ethernet, do nothing continue; //dtb not set ranges
} }
memcpy(data, nodep, 12*4); memcpy(data, nodep, 12*4);
@ -130,8 +130,7 @@ static int update_pci_bridge(void * ssp)
const void *nodep; /* property node pointer */ const void *nodep; /* property node pointer */
int nodeoffset; /* node offset from libfdt */ int nodeoffset; /* node offset from libfdt */
int len, id, i; /* length of the property */ int len, id, i; /* length of the property */
u8 mac_addr[6] = {0x00, 0x55, 0x7B, 0xB5, 0x7D, 0xF7}; //default mac address char *pcie_name[]={"/soc/pcie0_port0@40100000", "/soc/pcie0_port1@50000000", "/soc/pcie0_port2@54000000", "/soc/pcie0_port3@58000000", "/soc/pcie1_port0@60000000", "/soc/pcie1_port1@78000000"};
char *ethernet_name[]={"/soc/pcie0_port0@40100000", "/soc/pcie0_port1@50000000", "/soc/pcie0_port2@54000000", "/soc/pcie0_port3@58000000", "/soc/pcie1_port0@60000000", "/soc/pcie1_port1@78000000"};
pcitag_t tag; pcitag_t tag;
unsigned int val, val1, start, end; unsigned int val, val1, start, end;
int dev; int dev;
@ -140,14 +139,14 @@ static int update_pci_bridge(void * ssp)
if (!pci_probe_only) return 0; if (!pci_probe_only) return 0;
for (id = 0, dev=9;id < sizeof(ethernet_name)/sizeof(ethernet_name[0]);id++,dev++) { for (id = 0, dev=9;id < sizeof(pcie_name)/sizeof(pcie_name[0]);id++,dev++) {
nodeoffset = fdt_path_offset (ssp, ethernet_name[id]); nodeoffset = fdt_path_offset (ssp, pcie_name[id]);
if (nodeoffset < 0) { if (nodeoffset < 0) {
return 1; //no ethernet device, do nothing continue; //dtb deleted this pcie port
} }
nodep = fdt_getprop (ssp, nodeoffset, (const char* )"ranges", &len); nodep = fdt_getprop (ssp, nodeoffset, (const char* )"ranges", &len);
if(len <= 0) { if(len <= 0) {
return 1; //no mac prop in ethernet, do nothing continue; //dtb not set ranges
} }
memcpy(data, nodep, 12*4); memcpy(data, nodep, 12*4);

Loading…
Cancel
Save