Commit 286c2378 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Remove pci_resource_bar() and pci_iov_resource_bar() 



pci_std_update_resource() only deals with standard BARs, so we don't have
to worry about the complications of VF BARs in an SR-IOV capability.

Compute the BAR address inline and remove pci_resource_bar().  That makes
pci_iov_resource_bar() unused, so remove that as well.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
parent 546ba9f8

drivers/pci/iov.c

+0 −18
Original line number Diff line number Diff line
@@ -553,24 +553,6 @@ void pci_iov_release(struct pci_dev *dev) 
		sriov_release(dev);

}



/**

 * pci_iov_resource_bar - get position of the SR-IOV BAR

 * @dev: the PCI device

 * @resno: the resource number

 *

 * Returns position of the BAR encapsulated in the SR-IOV capability.

 */

int pci_iov_resource_bar(struct pci_dev *dev, int resno)

{

	if (resno < PCI_IOV_RESOURCES || resno > PCI_IOV_RESOURCE_END)

		return 0;



	BUG_ON(!dev->is_physfn);



	return dev->sriov->pos + PCI_SRIOV_BAR +

		4 * (resno - PCI_IOV_RESOURCES);

}



/**

 * pci_iov_update_resource - update a VF BAR

 * @dev: the PCI device

drivers/pci/pci.c

+0 −30
Original line number Diff line number Diff line
@@ -4827,36 +4827,6 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags) 
}

EXPORT_SYMBOL(pci_select_bars);



/**

 * pci_resource_bar - get position of the BAR associated with a resource

 * @dev: the PCI device

 * @resno: the resource number

 * @type: the BAR type to be filled in

 *

 * Returns BAR position in config space, or 0 if the BAR is invalid.

 */

int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type)

{

	int reg;



	if (resno < PCI_ROM_RESOURCE) {

		*type = pci_bar_unknown;

		return PCI_BASE_ADDRESS_0 + 4 * resno;

	} else if (resno == PCI_ROM_RESOURCE) {

		*type = pci_bar_mem32;

		return dev->rom_base_reg;

	} else if (resno < PCI_BRIDGE_RESOURCES) {

		/* device specific resource */

		*type = pci_bar_unknown;

		reg = pci_iov_resource_bar(dev, resno);

		if (reg)

			return reg;

	}



	dev_err(&dev->dev, "BAR %d: invalid resource\n", resno);

	return 0;

}



/* Some architectures require additional programming to enable VGA */

static arch_set_vga_state_t arch_set_vga_state;

drivers/pci/pci.h

+0 −6
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, 
int pci_setup_device(struct pci_dev *dev);

int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

		    struct resource *res, unsigned int reg);

int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type);

void pci_configure_ari(struct pci_dev *dev);

void __pci_bus_size_bridges(struct pci_bus *bus,

			struct list_head *realloc_head);
@@ -289,7 +288,6 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) 
#ifdef CONFIG_PCI_IOV

int pci_iov_init(struct pci_dev *dev);

void pci_iov_release(struct pci_dev *dev);

int pci_iov_resource_bar(struct pci_dev *dev, int resno);

void pci_iov_update_resource(struct pci_dev *dev, int resno);

resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);

void pci_restore_iov_state(struct pci_dev *dev);
@@ -304,10 +302,6 @@ static inline void pci_iov_release(struct pci_dev *dev) 


{

}

static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno)

{

	return 0;

}

static inline void pci_restore_iov_state(struct pci_dev *dev)

{

}

drivers/pci/setup-res.c

+7 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) 
	u16 cmd;

	u32 new, check, mask;

	int reg;

	enum pci_bar_type type;

	struct resource *res = dev->resource + resno;



	/* Per SR-IOV spec 3.4.1.11, VF BARs are RO zero */
@@ -70,14 +69,16 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) 
		new |= res->flags & ~PCI_BASE_ADDRESS_MEM_MASK;

	}



	reg = pci_resource_bar(dev, resno, &type);

	if (!reg)

		return;

	if (type != pci_bar_unknown) {

	if (resno < PCI_ROM_RESOURCE) {

		reg = PCI_BASE_ADDRESS_0 + 4 * resno;

	} else if (resno == PCI_ROM_RESOURCE) {

		if (!(res->flags & IORESOURCE_ROM_ENABLE))

			return;



		reg = dev->rom_base_reg;

		new |= PCI_ROM_ADDRESS_ENABLE;

	}

	} else

		return;



	/*

	 * We can't update a 64-bit BAR atomically, so when possible,

CRA Git | Maintained and supported by SUSTech CRA and CCSE