diff options
author | Sam Mendoza-Jonas <sam@mendozajonas.com> | 2016-02-18 14:37:10 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-02-23 14:33:09 +1100 |
commit | deb601f731207a91f555b5f81eaea95537de53dc (patch) | |
tree | 87aac0ffd7c73688bd4bf61d8d581e7901a9037a | |
parent | 0671bb857f442efde618f1968c30e2b4828c6924 (diff) | |
download | skiboot-deb601f731207a91f555b5f81eaea95537de53dc.zip skiboot-deb601f731207a91f555b5f81eaea95537de53dc.tar.gz skiboot-deb601f731207a91f555b5f81eaea95537de53dc.tar.bz2 |
core: Add explicit 1:1 mappings in ranges properties
Currently skiboot adds an empty ranges property for each PCI bridge,
representing a 1:1 mapping, which the kernel can later update if needed.
However this does not appear to be the case, which leads to an issue in
the kernel where the translation of assigned-addresses properties is
mishandled and prematurely drops the PCI memory flags (ie. the first
cell of an address).
Instead, explicitly describe a 1:1 mapping in each bridge's ranges
property, allowing assigned-addresses to be properly handled.
Signed-off-by: Sam Mendoza-Jonas <sam@mendozajonas.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | core/pci.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -1299,6 +1299,13 @@ static void pci_add_one_node(struct phb *phb, struct pci_device *pd, uint32_t rev_class, vdid; uint32_t reg[5]; uint8_t intpin; + const uint32_t ranges_direct[] = { + /* 64-bit direct mapping. We know the bridges + * don't cover the entire address space so + * use 0xf00... as a good compromise. */ + 0x02000000, 0x0, 0x0, + 0x02000000, 0x0, 0x0, + 0xf0000000, 0x0}; pci_cfg_read32(phb, pd->bdfn, 0, &vdid); pci_cfg_read32(phb, pd->bdfn, PCI_CFG_REV_ID, &rev_class); @@ -1393,12 +1400,12 @@ static void pci_add_one_node(struct phb *phb, struct pci_device *pd, */ pci_std_swizzle_irq_map(np, pd, lstate, swizzle); - /* We do an empty ranges property for now, we haven't setup any - * bridge windows, the kernel will deal with that - * - * XXX The kernel should probably fix that up + /* Parts of the OF address translation in the kernel will fail to + * correctly translate a PCI address if translating a 1:1 mapping + * (ie. an empty ranges property). + * Instead add a ranges property that explicitly translates 1:1. */ - dt_add_property(np, "ranges", NULL, 0); + dt_add_property(np, "ranges", ranges_direct, sizeof(ranges_direct)); list_for_each(&pd->children, child, link) pci_add_one_node(phb, child, np, lstate, swizzle); |