Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6225c3a authored by David Daney's avatar David Daney Committed by Bjorn Helgaas
Browse files

PCI: generic: Fix address window calculation for non-zero starting bus 



Make the offset from the beginning of the "reg" property be from the
starting bus number, rather than zero.  Hoist the invariant size
calculation out of the mapping for loop.

Update host-generic-pci.txt to clarify the semantics of the "reg" property
with respect to non-zero starting bus numbers.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
parent 47ddb949

Documentation/devicetree/bindings/pci/host-generic-pci.txt

+3 −2
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ Properties of the host controller node: 
- #size-cells    : Must be 2.



- reg            : The Configuration Space base address and size, as accessed

                   from the parent bus.



                   from the parent bus.  The base address corresponds to

                   the first bus in the "bus-range" property.  If no

                   "bus-range" is specified, this will be bus 0 (the default).



Properties of the /chosen node:

drivers/pci/host/pci-host-generic.c

+2 −2
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static int gen_pci_parse_map_cfg_windows(struct gen_pci *pci) 
	struct resource *bus_range;

	struct device *dev = pci->host.dev.parent;

	struct device_node *np = dev->of_node;

	u32 sz = 1 << pci->cfg.ops->bus_shift;



	err = of_address_to_resource(np, 0, &pci->cfg.res);

	if (err) {
@@ -196,10 +197,9 @@ static int gen_pci_parse_map_cfg_windows(struct gen_pci *pci) 
	bus_range = pci->cfg.bus_range;

	for (busn = bus_range->start; busn <= bus_range->end; ++busn) {

		u32 idx = busn - bus_range->start;

		u32 sz = 1 << pci->cfg.ops->bus_shift;



		pci->cfg.win[idx] = devm_ioremap(dev,

						 pci->cfg.res.start + busn * sz,

						 pci->cfg.res.start + idx * sz,

						 sz);

		if (!pci->cfg.win[idx])

			return -ENOMEM;