spapr_pci: Fix endianness in assigned-addresses property
PATCH 1/1 spapr_pci: Fix endianness in assigned-addresses property
reg->phys_hi and assigned->phys_hi are big endian but we do an extra byteswap anyway when copying reg->phys_hi to assigned->phys_hi. To make things slightly more messy, we also add a relocatable bit (b_n()) although in the right endianness.
This fixes endianness of assigned->phys_hi.
This is unlikely to produce any visible difference though as we should end up there only in the case of PCI hotplug and even then I am not sure if (d->io_regions[i].addr == PCI_BAR_UNMAPPED) == true.
--- hw/ppc/spapr_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr_pci.c +1 -1
@@ -964,7 +964,7 @@ static void populate_resource_props(PCIDevice *d, ResourceProps *rp) } assigned = &rp->assigned[assigned_idx++]; - assigned->phys_hi =cpu_to_be32 (reg->phys_hi |b_n (1 )); + assigned->phys_hi =cpu_to_be32 (be32_to_cpu (reg->phys_hi) |b_n (1 )); assigned->phys_mid =cpu_to_be32 (d->io_regions[i].addr >>32 ); assigned->phys_lo =cpu_to_be32 (d->io_regions[i].addr); assigned->size_hi = reg->size_hi;
Signature · 1 line
2.17.1
David Gibson
AppliedQuoted 5 lines · Alexey Kardashevskiy
reg->phys_hiandassigned->phys_hiare big endian but we do an extra byteswap anyway when copyingreg->phys_hitoassigned->phys_hi. To make things slightly more messy, we also add a relocatable bit (b_n()) although in the right endianness.
Quoted 7 lines
This fixes endianness of
assigned->phys_hi.This is unlikely to produce any visible difference though as we should end up there only in the case of PCI hotplug and even then I am not sure if (d->io_regions[i].addr ==
PCI_BAR_UNMAPPED) == true.Signed-off-by Alexey Kardashevskiy <[email protected]>
Applied to ppc-for-4.0, thanks.
Quoted 17 lines
--- hw/ppc/spapr_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/ppc/spapr_pci.c +1
-1@@ -964,7 +964,7 @@ static void populate_resource_props(PCIDevice *d, ResourceProps *rp) } assigned = &rp->assigned[assigned_idx++]; - assigned->phys_hi =cpu_to_be32 (reg->phys_hi |b_n (1 )); + assigned->phys_hi =cpu_to_be32 (be32_to_cpu (reg->phys_hi) |b_n (1 )); assigned->phys_mid =cpu_to_be32 (d->io_regions[i].addr >>32 ); assigned->phys_lo =cpu_to_be32 (d->io_regions[i].addr); assigned->size_hi = reg->size_hi;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson