Commit 9c7cb891 authored by Tomasz Nowicki's avatar Tomasz Nowicki Committed by Bjorn Helgaas
Browse files

PCI: Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC 



Instead of assigning bus->domain_nr inside pci_bus_assign_domain_nr(),
return the domain and let the caller do the assignment.  Rename
pci_bus_assign_domain_nr() to pci_bus_find_domain_nr() to reflect this.

No functional change intended.

[bhelgaas: changelog]
Signed-off-by: default avatarTomasz Nowicki <tn@semihalf.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 935c760e

drivers/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -4941,7 +4941,7 @@ int pci_get_new_domain_nr(void) 
}



#ifdef CONFIG_PCI_DOMAINS_GENERIC

void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)

int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)

{

	static int use_dt_domains = -1;

	int domain = -1;
@@ -4985,7 +4985,7 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) 
		domain = -1;

	}



	bus->domain_nr = domain;

	return domain;

}

#endif

#endif

drivers/pci/probe.c

+3 −1
Original line number Diff line number Diff line
@@ -2127,7 +2127,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, 
	b->sysdata = sysdata;

	b->ops = ops;

	b->number = b->busn_res.start = bus;

	pci_bus_assign_domain_nr(b, parent);

#ifdef CONFIG_PCI_DOMAINS_GENERIC

	b->domain_nr = pci_bus_find_domain_nr(b, parent);

#endif

	b2 = pci_find_bus(pci_domain_nr(b), bus);

	if (b2) {

		/* If we already got to this bus through a different bridge, ignore it */

include/linux/pci.h

+1 −6
Original line number Diff line number Diff line
@@ -1390,12 +1390,7 @@ static inline int pci_domain_nr(struct pci_bus *bus) 
{

	return bus->domain_nr;

}

void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent);

#else

static inline void pci_bus_assign_domain_nr(struct pci_bus *bus,

					struct device *parent)

{

}

int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);

#endif



/* some architectures require additional setup to direct VGA traffic */

CRA Git | Maintained and supported by SUSTech CRA and CCSE