Commit cbd38438 authored by Michał Winiarski's avatar Michał Winiarski Committed by Bjorn Helgaas
Browse files

PCI: Add pci_resource_is_iov() to identify IOV resources 

There are multiple places where special handling is required for IOV
resources.

Extract the identification of IOV resources to pci_resource_is_iov() and
drop a few ifdefs.

Link: https://lore.kernel.org/r/20241216175632.4175-9-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarXiaochun Lee <lixc17@lenovo.com>
parent ee4621b7

drivers/pci/pci.h

+15 −4
Original line number Diff line number Diff line
@@ -632,6 +632,10 @@ 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);

int pci_iov_bus_range(struct pci_bus *bus);

static inline bool pci_resource_is_iov(int resno)

{

	return resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END;

}

extern const struct attribute_group sriov_pf_dev_attr_group;

extern const struct attribute_group sriov_vf_dev_attr_group;

#else
@@ -641,12 +645,21 @@ static inline int pci_iov_init(struct pci_dev *dev) 
}

static inline void pci_iov_release(struct pci_dev *dev) { }

static inline void pci_iov_remove(struct pci_dev *dev) { }

static inline void pci_iov_update_resource(struct pci_dev *dev, int resno) { }

static inline resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev,

							   int resno)

{

	return 0;

}

static inline void pci_restore_iov_state(struct pci_dev *dev) { }

static inline int pci_iov_bus_range(struct pci_bus *bus)

{

	return 0;

}



static inline bool pci_resource_is_iov(int resno)

{

	return false;

}

#endif /* CONFIG_PCI_IOV */



#ifdef CONFIG_PCIE_TPH
@@ -680,12 +693,10 @@ unsigned long pci_cardbus_resource_alignment(struct resource *); 
static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,

						     struct resource *res)

{

#ifdef CONFIG_PCI_IOV

	int resno = res - dev->resource;



	if (resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END)

	if (pci_resource_is_iov(resno))

		return pci_sriov_resource_alignment(dev, resno);

#endif

	if (dev->class >> 8 == PCI_CLASS_BRIDGE_CARDBUS)

		return pci_cardbus_resource_alignment(res);

	return resource_alignment(res);

drivers/pci/setup-bus.c

+3 −4
Original line number Diff line number Diff line
@@ -1093,17 +1093,16 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
			     (r->flags & mask) != type3))

				continue;

			r_size = resource_size(r);

#ifdef CONFIG_PCI_IOV



			/* Put SRIOV requested res to the optional list */

			if (realloc_head && i >= PCI_IOV_RESOURCES &&

					i <= PCI_IOV_RESOURCE_END) {

			if (realloc_head && pci_resource_is_iov(i)) {

				add_align = max(pci_resource_alignment(dev, r), add_align);

				resource_set_size(r, 0);

				add_to_list(realloc_head, dev, r, r_size, 0 /* Don't care */);

				children_add_size += r_size;

				continue;

			}

#endif



			/*

			 * aligns[0] is for 1MB (since bridge memory

			 * windows are always at least 1MB aligned), so

drivers/pci/setup-res.c

+1 −3
Original line number Diff line number Diff line
@@ -127,10 +127,8 @@ void pci_update_resource(struct pci_dev *dev, int resno) 
{

	if (resno <= PCI_ROM_RESOURCE)

		pci_std_update_resource(dev, resno);

#ifdef CONFIG_PCI_IOV

	else if (resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END)

	else if (pci_resource_is_iov(resno))

		pci_iov_update_resource(dev, resno);

#endif

}



int pci_claim_resource(struct pci_dev *dev, int resource)