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

powerpc/powernv: Data type unsigned int for PE number 



This changes the data type of PE number from "int" to "unsigned int"
in order to match the fact PE number is never negative:

   * The number of PE to which the specified PCI device is attached.
   * The PE number map for SRIOV VFs.
   * The returned PE number from pnv_ioda_alloc_pe().
   * The returned PE number from pnv_ioda2_pick_m64_pe().

Suggested-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-By: default avatarAlistair Popple <alistair@popple.id.au>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 92b8f137

arch/powerpc/include/asm/pci-bridge.h

+3 −3
Original line number Diff line number Diff line
@@ -209,14 +209,14 @@ struct pci_dn { 
#ifdef CONFIG_EEH

	struct eeh_dev *edev;		/* eeh device */

#endif

#define IODA_INVALID_PE		(-1)

#define IODA_INVALID_PE		0xFFFFFFFF

#ifdef CONFIG_PPC_POWERNV

	int	pe_number;

	unsigned int pe_number;

	int     vf_index;		/* VF index in the PF */

#ifdef CONFIG_PCI_IOV

	u16     vfs_expanded;		/* number of VFs IOV BAR expanded */

	u16     num_vfs;		/* number of VFs enabled*/

	int     *pe_num_map;		/* PE# for the first VF PE or array */

	unsigned int *pe_num_map;	/* PE# for the first VF PE or array */

	bool    m64_single_mode;	/* Use M64 BAR in Single Mode */

#define IODA_INVALID_M64        (-1)

	int     (*m64_map)[PCI_SRIOV_NUM_BARS];

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

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void pnv_ioda_reserve_pe(struct pnv_phb *phb, int pe_no) 
	phb->ioda.pe_array[pe_no].pe_number = pe_no;

}



static int pnv_ioda_alloc_pe(struct pnv_phb *phb)

static unsigned int pnv_ioda_alloc_pe(struct pnv_phb *phb)

{

	unsigned long pe;
@@ -261,7 +261,7 @@ static void pnv_ioda2_reserve_m64_pe(struct pci_bus *bus, 
	}

}



static int pnv_ioda2_pick_m64_pe(struct pci_bus *bus, bool all)

static unsigned int pnv_ioda2_pick_m64_pe(struct pci_bus *bus, bool all)

{

	struct pci_controller *hose = pci_bus_to_host(bus);

	struct pnv_phb *phb = hose->private_data;
@@ -919,7 +919,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev) 
	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pci_get_pdn(dev);

	struct pnv_ioda_pe *pe;

	int pe_num;

	unsigned int pe_num;



	if (!pdn) {

		pr_err("%s: Device tree node not associated properly\n",
@@ -1010,7 +1010,7 @@ static void pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all) 
	struct pci_controller *hose = pci_bus_to_host(bus);

	struct pnv_phb *phb = hose->private_data;

	struct pnv_ioda_pe *pe;

	int pe_num = IODA_INVALID_PE;

	unsigned int pe_num = IODA_INVALID_PE;



	/* Check if PE is determined by M64 */

	if (phb->pick_m64_pe)

arch/powerpc/platforms/powernv/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void pnv_pci_config_check_eeh(struct pci_dn *pdn) 
	struct pnv_phb *phb = pdn->phb->private_data;

	u8	fstate;

	__be16	pcierr;

	int	pe_no;

	unsigned int pe_no;

	s64	rc;



	/*

arch/powerpc/platforms/powernv/pci.h

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

	void (*reserve_m64_pe)(struct pci_bus *bus,

			       unsigned long *pe_bitmap, bool all);

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

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

	int (*get_pe_state)(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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE