Skip to content

Commit

Permalink
PCI/VPD: Embed struct pci_vpd in struct pci_dev
Browse files Browse the repository at this point in the history 
Now that struct pci_vpd is really small, simplify the code by embedding
struct pci_vpd directly in struct pci_dev instead of dynamically allocating
it.

Link: https://lore.kernel.org/r/d898489e-22ba-71f1-2f31-f1a78dc15849@gmail.com
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Heiner Kallweit authored and Bjorn Helgaas committed Aug 12, 2021
1 parent 22ff2bc commit fd00faa
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 52 deletions.
1 change: 0 additions & 1 deletion drivers/pci/probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2225,7 +2225,6 @@ static void pci_release_capabilities(struct pci_dev *dev)
{
pci_aer_exit(dev);
pci_rcec_exit(dev);
pci_vpd_release(dev);
pci_iov_release(dev);
pci_free_cap_save_buffers(dev);
}
Expand Down
63 changes: 14 additions & 49 deletions drivers/pci/vpd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@

/* VPD access through PCI 2.2+ VPD capability */

struct pci_vpd {
struct mutex lock;
unsigned int len;
u8 cap;
};

static struct pci_dev *pci_get_func0_dev(struct pci_dev *dev)
{
return pci_get_slot(dev->bus, PCI_DEVFN(PCI_SLOT(dev->devfn), 0));
Expand All @@ -37,7 +31,7 @@ static size_t pci_vpd_size(struct pci_dev *dev)
unsigned char tag, header[1+2]; /* 1 byte tag, 2 bytes length */

/* Otherwise the following reads would fail. */
dev->vpd->len = PCI_VPD_MAX_SIZE;
dev->vpd.len = PCI_VPD_MAX_SIZE;

while (pci_read_vpd(dev, off, 1, header) == 1) {
size = 0;
Expand Down Expand Up @@ -89,7 +83,7 @@ static size_t pci_vpd_size(struct pci_dev *dev)
*/
static int pci_vpd_wait(struct pci_dev *dev, bool set)
{
struct pci_vpd *vpd = dev->vpd;
struct pci_vpd *vpd = &dev->vpd;
unsigned long timeout = jiffies + msecs_to_jiffies(125);
unsigned long max_sleep = 16;
u16 status;
Expand Down Expand Up @@ -119,12 +113,12 @@ static int pci_vpd_wait(struct pci_dev *dev, bool set)
static ssize_t pci_vpd_read(struct pci_dev *dev, loff_t pos, size_t count,
void *arg)
{
struct pci_vpd *vpd = dev->vpd;
struct pci_vpd *vpd = &dev->vpd;
int ret = 0;
loff_t end = pos + count;
u8 *buf = arg;

if (!vpd)
if (!vpd->cap)
return -ENODEV;

if (pos < 0)
Expand Down Expand Up @@ -186,12 +180,12 @@ static ssize_t pci_vpd_read(struct pci_dev *dev, loff_t pos, size_t count,
static ssize_t pci_vpd_write(struct pci_dev *dev, loff_t pos, size_t count,
const void *arg)
{
struct pci_vpd *vpd = dev->vpd;
struct pci_vpd *vpd = &dev->vpd;
const u8 *buf = arg;
loff_t end = pos + count;
int ret = 0;

if (!vpd)
if (!vpd->cap)
return -ENODEV;

if (pos < 0 || (pos & 3) || (count & 3))
Expand Down Expand Up @@ -238,25 +232,8 @@ static ssize_t pci_vpd_write(struct pci_dev *dev, loff_t pos, size_t count,

void pci_vpd_init(struct pci_dev *dev)
{
struct pci_vpd *vpd;
u8 cap;

cap = pci_find_capability(dev, PCI_CAP_ID_VPD);
if (!cap)
return;

vpd = kzalloc(sizeof(*vpd), GFP_ATOMIC);
if (!vpd)
return;

mutex_init(&vpd->lock);
vpd->cap = cap;
dev->vpd = vpd;
}

void pci_vpd_release(struct pci_dev *dev)
{
kfree(dev->vpd);
dev->vpd.cap = pci_find_capability(dev, PCI_CAP_ID_VPD);
mutex_init(&dev->vpd.lock);
}

static ssize_t vpd_read(struct file *filp, struct kobject *kobj,
Expand Down Expand Up @@ -288,7 +265,7 @@ static umode_t vpd_attr_is_visible(struct kobject *kobj,
{
struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));

if (!pdev->vpd)
if (!pdev->vpd.cap)
return 0;

return a->attr.mode;
Expand Down Expand Up @@ -400,7 +377,7 @@ static void quirk_f0_vpd_link(struct pci_dev *dev)
if (!f0)
return;

if (f0->vpd && dev->class == f0->class &&
if (f0->vpd.cap && dev->class == f0->class &&
dev->vendor == f0->vendor && dev->device == f0->device)
dev->dev_flags |= PCI_DEV_FLAGS_VPD_REF_F0;

Expand All @@ -418,10 +395,8 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
*/
static void quirk_blacklist_vpd(struct pci_dev *dev)
{
if (dev->vpd) {
dev->vpd->len = PCI_VPD_SZ_INVALID;
pci_warn(dev, FW_BUG "disabling VPD access (can't determine size of non-standard VPD format)\n");
}
dev->vpd.len = PCI_VPD_SZ_INVALID;
pci_warn(dev, FW_BUG "disabling VPD access (can't determine size of non-standard VPD format)\n");
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x0060, quirk_blacklist_vpd);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x007c, quirk_blacklist_vpd);
Expand All @@ -443,16 +418,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, PCI_ANY_ID,
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031,
PCI_CLASS_BRIDGE_PCI, 8, quirk_blacklist_vpd);

static void pci_vpd_set_size(struct pci_dev *dev, size_t len)
{
struct pci_vpd *vpd = dev->vpd;

if (!vpd || len == 0 || len > PCI_VPD_MAX_SIZE)
return;

vpd->len = len;
}

static void quirk_chelsio_extend_vpd(struct pci_dev *dev)
{
int chip = (dev->device & 0xf000) >> 12;
Expand All @@ -471,9 +436,9 @@ static void quirk_chelsio_extend_vpd(struct pci_dev *dev)
* limits.
*/
if (chip == 0x0 && prod >= 0x20)
pci_vpd_set_size(dev, 8192);
dev->vpd.len = 8192;
else if (chip >= 0x4 && func < 0x8)
pci_vpd_set_size(dev, 2048);
dev->vpd.len = 2048;
}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
Expand Down
9 changes: 7 additions & 2 deletions include/linux/pci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,14 @@ struct pci_cap_saved_state {
struct pci_cap_saved_data cap;
};

struct pci_vpd {
struct mutex lock;
unsigned int len;
u8 cap;
};

struct irq_affinity;
struct pcie_link_state;
struct pci_vpd;
struct pci_sriov;
struct pci_p2pdma;
struct rcec_ea;
Expand Down Expand Up @@ -473,7 +478,7 @@ struct pci_dev {
#ifdef CONFIG_PCI_MSI
const struct attribute_group **msi_irq_groups;
#endif
struct pci_vpd *vpd;
struct pci_vpd vpd;
#ifdef CONFIG_PCIE_DPC
u16 dpc_cap;
unsigned int dpc_rp_extensions:1;
Expand Down

0 comments on commit fd00faa

Please sign in to comment.