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

added PCI memory alignment

Browse Source
This commit is contained in:
Markus Fröschle
2013-11-03 03:44:04 +00:00
parent 22cbc5a23d
commit 26d03d34d7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
BaS_gcc/sources/pci.c
View File

@@ -207,10 +207,10 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
if (address) /* is bar in use? */ if (address) /* is bar in use? */
{ {
xprintf("%s region found with base address %08x, size = %x\r\n", //xprintf("%s region found with base address %08x, size = %x\r\n",
(IS_PCI_MEM_BAR(value) ? "Memory" : "I/O"), //(IS_PCI_MEM_BAR(value) ? "Memory" : "I/O"),
(IS_PCI_MEM_BAR(value) ? PCI_MEMBAR_ADR(value) : PCI_IOBAR_ADR(value)), //(IS_PCI_MEM_BAR(value) ? PCI_MEMBAR_ADR(value) : PCI_IOBAR_ADR(value)),
(IS_PCI_MEM_BAR(value) ? ~(address & 0xfffffff0) + 1 : ~(address & 0xfffffffc) + 1)); //(IS_PCI_MEM_BAR(value) ? ~(address & 0xfffffff0) + 1 : ~(address & 0xfffffffc) + 1));
/* adjust base address to alignment requirements */ /* adjust base address to alignment requirements */
if (IS_PCI_MEM_BAR(value)) if (IS_PCI_MEM_BAR(value))
@@ -219,7 +219,8 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
mem_address = (mem_address + size - 1) & ~(size - 1); mem_address = (mem_address + size - 1) & ~(size - 1);
pci_write_config_longword(bus, slot, function, 0x10 + i, mem_address); pci_write_config_longword(bus, slot, function, 0x10 + i, mem_address);
xprintf("BAR[%d] configured to %08x, size %x\r\n", i, mem_address, size); value = pci_read_config_longword(bus, slot, function, 0x10 + i);
xprintf("BAR[%d] configured to %08x, size %x\r\n", i, value, size);
mem_address += size; mem_address += size;
} }
else if (IS_PCI_IO_BAR(value)) else if (IS_PCI_IO_BAR(value))
@@ -228,7 +229,8 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
io_address = (io_address + size - 1) & ~(size - 1); io_address = (io_address + size - 1) & ~(size - 1);
pci_write_config_longword(bus, slot, function, 0x10 + i, io_address); pci_write_config_longword(bus, slot, function, 0x10 + i, io_address);
xprintf("BAR[%d] mapped to %08x, size %x\r\n", i, io_address, size); value = pci_read_config_longword(bus, slot, function, 0x10 + i);
xprintf("BAR[%d] mapped to %08x, size %x\r\n", i, value, size);
io_address += size; io_address += size;
} }
} }