| Message ID | 20190424041959.4087-2-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | Simplify some not-really-necessary PCI bus callbacks | expand |
On Wed, 24 Apr 2019 14:19:57 +1000 David Gibson <david@gibson.dropbear.id.au> wrote: > These functions have an explicit test for accesses above the device's > config size. But pci_host_config_{read,write}_common() which they're > about to call already have checks against the config space limit and > do the right thing. So, remove the redundant tests. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/pci/pcie_host.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c > index 553db56778..1ee4945a6d 100644 > --- a/hw/pci/pcie_host.c > +++ b/hw/pci/pcie_host.c > @@ -47,11 +47,6 @@ static void pcie_mmcfg_data_write(void *opaque, hwaddr mmcfg_addr, > } > addr = PCIE_MMCFG_CONFOFFSET(mmcfg_addr); > limit = pci_config_size(pci_dev); > - if (limit <= addr) { > - /* conventional pci device can be behind pcie-to-pci bridge. > - 256 <= addr < 4K has no effects. */ > - return; > - } > pci_host_config_write_common(pci_dev, addr, limit, val, len); > } > > @@ -70,11 +65,6 @@ static uint64_t pcie_mmcfg_data_read(void *opaque, > } > addr = PCIE_MMCFG_CONFOFFSET(mmcfg_addr); > limit = pci_config_size(pci_dev); > - if (limit <= addr) { > - /* conventional pci device can be behind pcie-to-pci bridge. > - 256 <= addr < 4K has no effects. */ > - return ~0x0; > - } > return pci_host_config_read_common(pci_dev, addr, limit, len); > } >
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c index 553db56778..1ee4945a6d 100644 --- a/hw/pci/pcie_host.c +++ b/hw/pci/pcie_host.c @@ -47,11 +47,6 @@ static void pcie_mmcfg_data_write(void *opaque, hwaddr mmcfg_addr, } addr = PCIE_MMCFG_CONFOFFSET(mmcfg_addr); limit = pci_config_size(pci_dev); - if (limit <= addr) { - /* conventional pci device can be behind pcie-to-pci bridge. - 256 <= addr < 4K has no effects. */ - return; - } pci_host_config_write_common(pci_dev, addr, limit, val, len); } @@ -70,11 +65,6 @@ static uint64_t pcie_mmcfg_data_read(void *opaque, } addr = PCIE_MMCFG_CONFOFFSET(mmcfg_addr); limit = pci_config_size(pci_dev); - if (limit <= addr) { - /* conventional pci device can be behind pcie-to-pci bridge. - 256 <= addr < 4K has no effects. */ - return ~0x0; - } return pci_host_config_read_common(pci_dev, addr, limit, len); }
These functions have an explicit test for accesses above the device's config size. But pci_host_config_{read,write}_common() which they're about to call already have checks against the config space limit and do the right thing. So, remove the redundant tests. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/pci/pcie_host.c | 10 ---------- 1 file changed, 10 deletions(-)