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

Commit 2ab51dde authored by Tomasz Nowicki's avatar Tomasz Nowicki Committed by Bjorn Helgaas
Browse files

ARM64: PCI: Add acpi_pci_bus_find_domain_nr() 



Extend pci_bus_find_domain_nr() so it can find the domain from either:

  - ACPI, via the new acpi_pci_bus_find_domain_nr() interface, or
  - DT, via of_pci_bus_find_domain_nr()

Note that this is only used for CONFIG_PCI_DOMAINS_GENERIC=y, so it does
not affect x86 or ia64.

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

arch/arm64/kernel/pci.c

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mm.h>

#include <linux/of_pci.h>

#include <linux/of_platform.h>

#include <linux/pci.h>

#include <linux/slab.h>



/*
@@ -85,6 +86,12 @@ EXPORT_SYMBOL(pcibus_to_node); 
#endif



#ifdef CONFIG_ACPI



int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)

{

	return 0;

}



/* Root bridge scanning */

struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)

{

drivers/pci/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *	Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>

 */



#include <linux/acpi.h>

#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/init.h>
@@ -4990,7 +4991,8 @@ static int of_pci_bus_find_domain_nr(struct device *parent) 


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

{

	return of_pci_bus_find_domain_nr(parent);

	return acpi_disabled ? of_pci_bus_find_domain_nr(parent) :

			       acpi_pci_bus_find_domain_nr(bus);

}

#endif

#endif

include/linux/pci.h

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

	return bus->domain_nr;

}

#ifdef CONFIG_ACPI

int acpi_pci_bus_find_domain_nr(struct pci_bus *bus);

#else

static inline int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)

{ return 0; }

#endif

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

#endif