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

Commit d1203852 authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/powernv: Boolean argument for pnv_ioda_setup_bus_PE() 



The patch changes the type of last argument of pnv_ioda_setup_bus_PE()
and phb::pick_m64_pe() to boolean. No functional change.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 96a2f92b

arch/powerpc/platforms/powernv/pci-ioda.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ static void pnv_ioda2_reserve_m64_pe(struct pci_bus *bus, 
}

}





static int pnv_ioda2_pick_m64_pe(struct pnv_phb *phb,

static int pnv_ioda2_pick_m64_pe(struct pnv_phb *phb,

				 struct pci_bus *bus, int all)

				 struct pci_bus *bus, bool all)

{

{

	resource_size_t segsz = phb->ioda.m64_segsize;

	resource_size_t segsz = phb->ioda.m64_segsize;

	struct pci_dev *pdev;

	struct pci_dev *pdev;
@@ -1064,7 +1064,7 @@ static void pnv_ioda_setup_same_PE(struct pci_bus *bus, struct pnv_ioda_pe *pe) 
 * subordinate PCI devices and buses. The second type of PE is normally

 * subordinate PCI devices and buses. The second type of PE is normally

 * orgiriated by PCIe-to-PCI bridge or PLX switch downstream ports.

 * orgiriated by PCIe-to-PCI bridge or PLX switch downstream ports.

 */

 */

static void pnv_ioda_setup_bus_PE(struct pci_bus *bus, int all)

static void pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)

{

{

	struct pci_controller *hose = pci_bus_to_host(bus);

	struct pci_controller *hose = pci_bus_to_host(bus);

	struct pnv_phb *phb = hose->private_data;

	struct pnv_phb *phb = hose->private_data;
@@ -1131,12 +1131,12 @@ static void pnv_ioda_setup_PEs(struct pci_bus *bus) 
{

{

	struct pci_dev *dev;

	struct pci_dev *dev;





	pnv_ioda_setup_bus_PE(bus, 0);

	pnv_ioda_setup_bus_PE(bus, false);





	list_for_each_entry(dev, &bus->devices, bus_list) {

	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (dev->subordinate) {

		if (dev->subordinate) {

			if (pci_pcie_type(dev) == PCI_EXP_TYPE_PCI_BRIDGE)

			if (pci_pcie_type(dev) == PCI_EXP_TYPE_PCI_BRIDGE)

				pnv_ioda_setup_bus_PE(dev->subordinate, 1);

				pnv_ioda_setup_bus_PE(dev->subordinate, true);

			else

			else

				pnv_ioda_setup_PEs(dev->subordinate);

				pnv_ioda_setup_PEs(dev->subordinate);

		}

		}

arch/powerpc/platforms/powernv/pci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ struct pnv_phb { 
	int (*init_m64)(struct pnv_phb *phb);

	int (*init_m64)(struct pnv_phb *phb);

	void (*reserve_m64_pe)(struct pci_bus *bus,

	void (*reserve_m64_pe)(struct pci_bus *bus,

			       unsigned long *pe_bitmap, bool all);

			       unsigned long *pe_bitmap, bool all);

	int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, int all);

	int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, bool all);

	int (*get_pe_state)(struct pnv_phb *phb, int pe_no);

	int (*get_pe_state)(struct pnv_phb *phb, int pe_no);

	void (*freeze_pe)(struct pnv_phb *phb, int pe_no);

	void (*freeze_pe)(struct pnv_phb *phb, int pe_no);

	int (*unfreeze_pe)(struct pnv_phb *phb, int pe_no, int opt);

	int (*unfreeze_pe)(struct pnv_phb *phb, int pe_no, int opt);