Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/480073/?format=api
{ "id": 480073, "url": "http://patchwork.ozlabs.org/api/patches/480073/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20150603184659.109080.6915.stgit@mdrustad-wks.jf.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20150603184659.109080.6915.stgit@mdrustad-wks.jf.intel.com>", "list_archive_url": null, "date": "2015-06-03T18:46:59", "name": "[V3,1/2] pci: Add dev_flags bit to access VPD through function 0", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "60f623bb3471d2da62c46f2dc3b7b0235db3a9c4", "submitter": { "id": 13252, "url": "http://patchwork.ozlabs.org/api/people/13252/?format=api", "name": "Rustad, Mark D", "email": "mark.d.rustad@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20150603184659.109080.6915.stgit@mdrustad-wks.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/480073/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/480073/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 59F981402B1\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 Jun 2015 04:47:05 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 92E8D2E4C4;\n\tWed, 3 Jun 2015 18:47:04 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id O9E+R+jQBzNO; Wed, 3 Jun 2015 18:47:02 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 546D22E376;\n\tWed, 3 Jun 2015 18:47:02 +0000 (UTC)", "from silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id B86C71BFA20\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 18:47:00 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B29682E420\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 18:47:00 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id FQtL57-LLT9o for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 18:47:00 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2C0BA2E376\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 18:47:00 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP; 03 Jun 2015 11:46:59 -0700", "from mdrustad-wks.jf.intel.com ([134.134.176.89])\n\tby fmsmga001.fm.intel.com with ESMTP; 03 Jun 2015 11:46:59 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,548,1427785200\"; d=\"scan'208\";a=\"720224934\"", "From": "Mark D Rustad <mark.d.rustad@intel.com>", "To": "bhelgaas@google.com", "Date": "Wed, 03 Jun 2015 11:46:59 -0700", "Message-ID": "<20150603184659.109080.6915.stgit@mdrustad-wks.jf.intel.com>", "In-Reply-To": "<20150603184445.109080.36387.stgit@mdrustad-wks.jf.intel.com>", "References": "<20150603184445.109080.36387.stgit@mdrustad-wks.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Cc": "linux-pci@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n\tnetdev@vger.kernel.org", "Subject": "[Intel-wired-lan] [PATCH V3 1/2] pci: Add dev_flags bit to access\n\tVPD through function 0", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "Add a dev_flags bit, PCI_DEV_FLAGS_VPD_REF_F0, to access VPD through\nfunction 0 to provide VPD access on other functions. This solves\nconcurrent access problems on many devices without changing the\nattributes exposed in sysfs. Never set this bit on function 0 or\nthere will be an infinite recursion.\n\nSigned-off-by: Mark Rustad <mark.d.rustad@intel.com>\n---\nChanges in V2:\n- Corrected spelling in log message\n- Added checks to see that the referenced function 0 is reasonable\nChanges in V3:\n- Don't leak a device reference\n- Check that function 0 has VPD\n- Make a helper for the function 0 checks\n- Do multifunction check in the quirk\n---\n drivers/pci/access.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 60 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/pci/access.c b/drivers/pci/access.c\nindex d9b64a175990..b965c12168b7 100644\n--- a/drivers/pci/access.c\n+++ b/drivers/pci/access.c\n@@ -439,6 +439,56 @@ static const struct pci_vpd_ops pci_vpd_pci22_ops = {\n \t.release = pci_vpd_pci22_release,\n };\n \n+static ssize_t pci_vpd_f0_read(struct pci_dev *dev, loff_t pos, size_t count,\n+\t\t\t void *arg)\n+{\n+\tstruct pci_dev *tdev = pci_get_slot(dev->bus, PCI_SLOT(dev->devfn));\n+\tssize_t ret;\n+\n+\tif (!tdev)\n+\t\treturn -ENODEV;\n+\n+\tret = pci_read_vpd(tdev, pos, count, arg);\n+\tpci_dev_put(tdev);\n+\treturn ret;\n+}\n+\n+static ssize_t pci_vpd_f0_write(struct pci_dev *dev, loff_t pos, size_t count,\n+\t\t\t\tconst void *arg)\n+{\n+\tstruct pci_dev *tdev = pci_get_slot(dev->bus, PCI_SLOT(dev->devfn));\n+\tssize_t ret;\n+\n+\tif (!tdev)\n+\t\treturn -ENODEV;\n+\n+\tret = pci_write_vpd(tdev, pos, count, arg);\n+\tpci_dev_put(tdev);\n+\treturn ret;\n+}\n+\n+static const struct pci_vpd_ops pci_vpd_f0_ops = {\n+\t.read = pci_vpd_f0_read,\n+\t.write = pci_vpd_f0_write,\n+\t.release = pci_vpd_pci22_release,\n+};\n+\n+static int pci_vpd_f0_dev_check(struct pci_dev *dev)\n+{\n+\tstruct pci_dev *tdev = pci_get_slot(dev->bus, PCI_SLOT(dev->devfn));\n+\tint ret = 0;\n+\n+\tif (!tdev)\n+\t\treturn -ENODEV;\n+\tif (!tdev->vpd || !tdev->multifunction ||\n+\t dev->class != tdev->class || dev->vendor != tdev->vendor ||\n+\t dev->device != tdev->device)\n+\t\tret = -ENODEV;\n+\n+\tpci_dev_put(tdev);\n+\treturn ret;\n+}\n+\n int pci_vpd_pci22_init(struct pci_dev *dev)\n {\n \tstruct pci_vpd_pci22 *vpd;\n@@ -447,12 +497,21 @@ int pci_vpd_pci22_init(struct pci_dev *dev)\n \tcap = pci_find_capability(dev, PCI_CAP_ID_VPD);\n \tif (!cap)\n \t\treturn -ENODEV;\n+\tif (dev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0) {\n+\t\tint ret = pci_vpd_f0_dev_check(dev);\n+\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n \tvpd = kzalloc(sizeof(*vpd), GFP_ATOMIC);\n \tif (!vpd)\n \t\treturn -ENOMEM;\n \n \tvpd->base.len = PCI_VPD_PCI22_SIZE;\n-\tvpd->base.ops = &pci_vpd_pci22_ops;\n+\tif (dev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0)\n+\t\tvpd->base.ops = &pci_vpd_f0_ops;\n+\telse\n+\t\tvpd->base.ops = &pci_vpd_pci22_ops;\n \tmutex_init(&vpd->lock);\n \tvpd->cap = cap;\n \tvpd->busy = false;\ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex 353db8dc4c6e..194df6d635e6 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -180,6 +180,8 @@ enum pci_dev_flags {\n \tPCI_DEV_FLAGS_NO_BUS_RESET = (__force pci_dev_flags_t) (1 << 6),\n \t/* Do not use PM reset even if device advertises NoSoftRst- */\n \tPCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),\n+\t/* Get VPD from function 0 VPD */\n+\tPCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8),\n };\n \n enum pci_irq_reroute_variant {\n", "prefixes": [ "V3", "1/2" ] }