Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up pci initialization and moved call behind FPGA initialization (pin assignments collide)

Browse Source
This commit is contained in:
Markus Fröschle
2013-11-06 06:09:36 +00:00
parent 993906cf9a
commit 02d182395d
2 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
sources/pci.c
View File

@@ -302,34 +302,41 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
uint32_t value; uint32_t value;
value = pci_read_config_longword(handle, 0x10 + i); /* read BAR value */ /*
pci_write_config_longword(handle, 0x10 + i, 0xffffffff); /* write all bits */ * read BAR[i] value
address = pci_read_config_longword(handle, 0x10 + i); /* read back value */ */
value = pci_read_config_longword(handle, PCIBAR0 + i);
/*
* write all bits of BAR[i]
*/
pci_write_config_longword(handle, 0x10 + i, 0xffffffff);
/*
* read back value to see which bits have been set
*/
address = pci_read_config_longword(handle, PCIBAR0 + i);
if (address) /* is bar in use? */ if (address) /* is bar in use? */
{ {
//xprintf("%s region found with base address %08x, size = %x\r\n", /*
//(IS_PCI_MEM_BAR(value) ? "Memory" : "I/O"), * resource descriptor for this device
//(IS_PCI_MEM_BAR(value) ? PCI_MEMBAR_ADR(value) : PCI_IOBAR_ADR(value)), */
//(IS_PCI_MEM_BAR(value) ? ~(address & 0xfffffff0) + 1 : ~(address & 0xfffffffc) + 1));
struct pci_rd *rd = &descriptors[barnum]; struct pci_rd *rd = &descriptors[barnum];
/* adjust base address to card's alignment requirements */
if (IS_PCI_MEM_BAR(value)) if (IS_PCI_MEM_BAR(value))
{ {
/* adjust base address to card's alignment requirements */
int size = ~(address & 0xfffffff0) + 1; int size = ~(address & 0xfffffff0) + 1;
/* calculate start adress with alignment */ /* calculate a valid map adress with alignment requirements */
mem_address = (mem_address + size - 1) & ~(size - 1); mem_address = (mem_address + size - 1) & ~(size - 1);
/* write it to the BAR */ /* write it to the BAR */
pci_write_config_longword(handle, 0x10 + i, mem_address); pci_write_config_longword(handle, PCIBAR0 + i, mem_address);
/* read it back, just to be sure */ /* read it back, just to be sure */
value = pci_read_config_longword(handle, 0x10 + i); value = pci_read_config_longword(handle, PCIBAR0 + i);
//xprintf("BAR[%d] configured to %08x, size %x\r\n", i, value, size);
/* fill resource descriptor */ /* fill resource descriptor */
rd->next = sizeof(struct pci_rd); rd->next = sizeof(struct pci_rd);
@@ -345,22 +352,14 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
/* index to next unused resource descriptor */ /* index to next unused resource descriptor */
barnum++; barnum++;
} }
else if (IS_PCI_IO_BAR(value)) else if (IS_PCI_IO_BAR(value)) /* same as above for I/O resources */
{ {
int size = ~(address & 0xfffffffc) + 1; int size = ~(address & 0xfffffffc) + 1;
/* calculate start adress with alignment */
io_address = (io_address + size - 1) & ~(size - 1); io_address = (io_address + size - 1) & ~(size - 1);
pci_write_config_longword(handle, PCIBAR0 + i, io_address);
value = pci_read_config_longword(handle, PCIBAR0 + i);
/* write it to the BAR */
pci_write_config_longword(handle, 0x10 + i, io_address);
/* read it back, just to be sure */
value = pci_read_config_longword(handle, 0x10 + i);
//xprintf("BAR[%d] mapped to %08x, size %x\r\n", i, value, size);
/* fill resource descriptor */
rd->next = sizeof(struct pci_rd); rd->next = sizeof(struct pci_rd);
rd->flags = FLG_IO | FLG_8BIT | FLG_16BIT | FLG_32BIT | 1; rd->flags = FLG_IO | FLG_8BIT | FLG_16BIT | FLG_32BIT | 1;
rd->start = io_address; rd->start = io_address;
@@ -368,10 +367,8 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
rd->length = size; rd->length = size;
rd->dmaoffset = PCI_MEMORY_OFFSET; rd->dmaoffset = PCI_MEMORY_OFFSET;
/* adjust I/O adress for next turn */
io_address += size; io_address += size;
/* index to next unused resource descriptor */
barnum++; barnum++;
} }
} }
@@ -391,7 +388,9 @@ void pci_scan(void)
xprintf("\r\nPCI bus scan...\r\n\r\n"); xprintf("\r\nPCI bus scan...\r\n\r\n");
xprintf(" Bus| Dev|Func|Vndr|D-ID|\r\n"); xprintf(" Bus| Dev|Func|Vndr|D-ID|\r\n");
xprintf("----+----+----|----+----|\r\n"); xprintf("----+----+----|----+----|\r\n");
for (bus = 0; bus < 255; bus++) /* scan two busses. FireBee USB is on DEVSEL(17) */
/* FIXME: FireBee USB is on DEVSEL(17), but currently not found for whatever reason */
for (bus = 0; bus < 255; bus++)
{ {
for (device = 0; device < 32; device++) for (device = 0; device < 32; device++)
{ {
@@ -410,7 +409,7 @@ void pci_scan(void)
if (PCI_VENDOR_ID(value) != 0x1057 && PCI_DEVICE_ID(value) != 0x5806) /* do not configure bridge */ if (PCI_VENDOR_ID(value) != 0x1057 && PCI_DEVICE_ID(value) != 0x5806) /* do not configure bridge */
{ {
/* save handle to index value so that we later find our resources again */ /* save handle to index value so that we'll be able to later find our resources */
handles[index++] = PCI_HANDLE(bus, device, function); handles[index++] = PCI_HANDLE(bus, device, function);
/* configure memory and I/O for card */ /* configure memory and I/O for card */
@@ -420,7 +419,7 @@ void pci_scan(void)
/* test for multi-function device to avoid ghost device detects */ /* test for multi-function device to avoid ghost device detects */
value = pci_read_config_longword(handle, 0x0c); value = pci_read_config_longword(handle, 0x0c);
if (function == 0 && !(PCI_HEADER_TYPE(value) & 0x80)) /* no multi function device */ if (function == 0 && !(PCI_HEADER_TYPE(value) & 0x80)) /* no multi function device */
function = 8; function = 8; /* cancel inner loop */
} }
} }
} }

6
sources/sysinit.c
View File

@@ -1018,15 +1018,15 @@ void initialize_hardware(void)
init_slt(); init_slt();
init_fbcs(); init_fbcs();
init_ddram(); init_ddram();
init_eport();
init_xlbus_arbiter();
init_pci();
#ifdef MACHINE_FIREBEE #ifdef MACHINE_FIREBEE
init_fpga(); init_fpga();
init_pll(); init_pll();
init_video_ddr(); init_video_ddr();
dvi_on(); dvi_on();
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
init_eport();
init_xlbus_arbiter();
init_pci();
/* moved the following line (temporarily) to BaS (after MMU init) to be able to catch adressing errors on USB init */ /* moved the following line (temporarily) to BaS (after MMU init) to be able to catch adressing errors on USB init */
//init_usb(); //init_usb();
#ifdef MACHINE_FIREBEE #ifdef MACHINE_FIREBEE