Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/482390/?format=api
{ "id": 482390, "url": "http://patchwork.ozlabs.org/api/patches/482390/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1433888105-30295-1-git-send-email-yanirx.lubetkin@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": "<1433888105-30295-1-git-send-email-yanirx.lubetkin@intel.com>", "list_archive_url": null, "date": "2015-06-09T22:15:05", "name": "e1000e: fix locking issue with e1000e_disable_aspm", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "dde78ad5cfe315febc2768397bfaf0edc134c1e7", "submitter": { "id": 66154, "url": "http://patchwork.ozlabs.org/api/people/66154/?format=api", "name": "Yanir Lubetkin", "email": "yanirx.lubetkin@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/1433888105-30295-1-git-send-email-yanirx.lubetkin@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/482390/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/482390/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 (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 0AE09140761\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 10 Jun 2015 08:15:54 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 86BDE322B4;\n\tTue, 9 Jun 2015 22:15:53 +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 b8f2p0pi0aY2; Tue, 9 Jun 2015 22:15:51 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id D9D1826514;\n\tTue, 9 Jun 2015 22:15:51 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7EDC01C1E80\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 9 Jun 2015 22:15:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7B01B91671\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 9 Jun 2015 22:15:51 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id mZ6b4vGrk8EQ for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 9 Jun 2015 22:15:50 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A21C59166F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 9 Jun 2015 22:15:50 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga102.fm.intel.com with ESMTP; 09 Jun 2015 15:15:50 -0700", "from unknown (HELO ccdpc064.localdomain.com) ([143.185.160.80])\n\tby orsmga002.jf.intel.com with ESMTP; 09 Jun 2015 15:15:49 -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,584,1427785200\"; d=\"scan'208\";a=\"743906541\"", "From": "Yanir Lubetkin <yanirx.lubetkin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 10 Jun 2015 01:15:05 +0300", "Message-Id": "<1433888105-30295-1-git-send-email-yanirx.lubetkin@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [PATCH] e1000e: fix locking issue with\n\te1000e_disable_aspm", "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>", "MIME-Version": "1.0", "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": "e1000e_disable_aspm called pci_disable_link_state_locked which requires\npci_bus_sem to be held, but is also called from places where this semaphore\nwas not previously acquired. This patch implements two flavors of\ndisable_aspm, one that acquires the lock, and the other (_locked) which\nshould be called when the semaphore is already acquired.\n\nSigned-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/netdev.c | 38 ++++++++++++++++++++++++++----\n 1 file changed, 34 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex b114658..ed2b795 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -6355,13 +6355,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)\n }\n \n /**\n- * e1000e_disable_aspm - Disable ASPM states\n+ * __e1000e_disable_aspm - Disable ASPM states\n * @pdev: pointer to PCI device struct\n * @state: bit-mask of ASPM states to disable\n+ * @locked: indication if this context holds pci_bus_sem locked.\n *\n * Some devices *must* have certain ASPM states disabled per hardware errata.\n **/\n-static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)\n+static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state, int locked)\n {\n \tstruct pci_dev *parent = pdev->bus->self;\n \tu16 aspm_dis_mask = 0;\n@@ -6400,7 +6401,10 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)\n \t\t \"L1\" : \"\");\n \n #ifdef CONFIG_PCIEASPM\n-\tpci_disable_link_state_locked(pdev, state);\n+\tif (locked)\n+\t\tpci_disable_link_state_locked(pdev, state);\n+\telse\n+\t\t pci_disable_link_state(pdev, state);\n \n \t/* Double-check ASPM control. If not disabled by the above, the\n \t * BIOS is preventing that from happening (or CONFIG_PCIEASPM is\n@@ -6423,6 +6427,32 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)\n \t\t\t\t\t aspm_dis_mask);\n }\n \n+/**\n+ * e1000e_disable_aspm - Disable ASPM states.\n+ * @pdev: pointer to PCI device struct\n+ * @state: bit-mask of ASPM states to disable\n+ *\n+ * This function acquires the pci_bus_sem!\n+ * Some devices *must* have certain ASPM states disabled per hardware errata.\n+ **/\n+static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)\n+{\n+\t__e1000e_disable_aspm(pdev, state, 0);\n+}\n+\n+/**\n+ * e1000e_disable_aspm_locked Disable ASPM states.\n+ * @pdev: pointer to PCI device struct\n+ * @state: bit-mask of ASPM states to disable\n+ *\n+ * This function must be called with pci_bus_sem acquired!\n+ * Some devices *must* have certain ASPM states disabled per hardware errata.\n+ **/\n+static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state) \n+{\n+\t__e1000e_disable_aspm(pdev, state, 1);\n+}\n+\n #ifdef CONFIG_PM\n static int __e1000_resume(struct pci_dev *pdev)\n {\n@@ -6436,7 +6466,7 @@ static int __e1000_resume(struct pci_dev *pdev)\n \tif (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)\n \t\taspm_disable_flag |= PCIE_LINK_STATE_L1;\n \tif (aspm_disable_flag)\n-\t\te1000e_disable_aspm(pdev, aspm_disable_flag);\n+\t\te1000e_disable_aspm_locked(pdev, aspm_disable_flag);\n \n \tpci_set_master(pdev);\n \n", "prefixes": [] }