| Message ID | 20190201005622.14716-1-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [qemu] spapr_pci: Fix endianness in assigned-addresses property | expand |
On Fri, Feb 01, 2019 at 11:56:22AM +1100, Alexey Kardashevskiy wrote: > 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. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to ppc-for-4.0, thanks. > --- > hw/ppc/spapr_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index b74f263..a174952 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -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;
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index b74f263..a174952 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -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;
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. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- hw/ppc/spapr_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)