Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291776/?format=api
{ "id": 1291776, "url": "http://patchwork.ozlabs.org/api/patches/1291776/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516005121.4963-2-anthony.l.nguyen@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": "<20200516005121.4963-2-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:51:08", "name": "[S45,02/15] ice: Simplify ice_sriov_configure", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4304221d13459cc285e0c13da846108dfff8646d", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20200516005121.4963-2-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 177330, "url": "http://patchwork.ozlabs.org/api/series/177330/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=177330", "date": "2020-05-16T00:51:18", "name": "[S45,01/15] ice: Refactor ice_ena_vf_mappings to split MSIX and queue mappings", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/177330/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1291776/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291776/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49P6H20WhKz9sTC\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:54:06 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 74AD488209;\n\tSat, 16 May 2020 00:54:04 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id QzsrzRNz9ue2; Sat, 16 May 2020 00:54:03 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D5D8988018;\n\tSat, 16 May 2020 00:54:03 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id 079431BF9C6\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id 03B3587F7D\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:59 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id FhRUEQlOVTnw for <intel-wired-lan@lists.osuosl.org>;\n Sat, 16 May 2020 00:53:55 +0000 (UTC)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 6694187F8B\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:55 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 May 2020 17:53:54 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga003.jf.intel.com with ESMTP; 15 May 2020 17:53:54 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n pjIID0CvCBA9zgZXGRXA3aT4/2+Bj30bI9aBIUJxmwSn8fuBsNEfhaXa8z66/iE7ZhWMkkZIxc\n XSa9kDnlC1EQ==", "\n THBDh1KHljG+FhxSlYRPrJoICxyeM+DjUg7Ea3uwi9pmbKhp6lVSUfLjKkREsdQIZNY1k2ovY+\n pX2fJcZtj93A==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,397,1583222400\"; d=\"scan'208\";a=\"263360538\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:51:08 -0700", "Message-Id": "<20200516005121.4963-2-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200516005121.4963-1-anthony.l.nguyen@intel.com>", "References": "<20200516005121.4963-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S45 02/15] ice: Simplify\n ice_sriov_configure", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Brett Creeley <brett.creeley@intel.com>\n\nAdd a new function for checking if SR-IOV can be configured based on\nthe PF and/or device's state/capabilities. Also, simplify the flow in\nice_sriov_configure().\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 72 ++++++++++++-------\n 1 file changed, 48 insertions(+), 24 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 8547eaaa7e40..5d6f23cf0c1f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1435,6 +1435,8 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)\n * ice_pci_sriov_ena - Enable or change number of VFs\n * @pf: pointer to the PF structure\n * @num_vfs: number of VFs to allocate\n+ *\n+ * Returns 0 on success and negative on failure\n */\n static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs)\n {\n@@ -1442,20 +1444,10 @@ static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs)\n \tstruct device *dev = ice_pf_to_dev(pf);\n \tint err;\n \n-\tif (!ice_pf_state_is_nominal(pf)) {\n-\t\tdev_err(dev, \"Cannot enable SR-IOV, device not ready\\n\");\n-\t\treturn -EBUSY;\n-\t}\n-\n-\tif (!test_bit(ICE_FLAG_SRIOV_CAPABLE, pf->flags)) {\n-\t\tdev_err(dev, \"This device is not capable of SR-IOV\\n\");\n-\t\treturn -EOPNOTSUPP;\n-\t}\n-\n \tif (pre_existing_vfs && pre_existing_vfs != num_vfs)\n \t\tice_free_vfs(pf);\n \telse if (pre_existing_vfs && pre_existing_vfs == num_vfs)\n-\t\treturn num_vfs;\n+\t\treturn 0;\n \n \tif (num_vfs > pf->num_vfs_supported) {\n \t\tdev_err(dev, \"Can't enable %d VFs, max VFs supported is %d\\n\",\n@@ -1471,37 +1463,69 @@ static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs)\n \t}\n \n \tset_bit(ICE_FLAG_SRIOV_ENA, pf->flags);\n-\treturn num_vfs;\n+\treturn 0;\n+}\n+\n+/**\n+ * ice_check_sriov_allowed - check if SR-IOV is allowed based on various checks\n+ * @pf: PF to enabled SR-IOV on\n+ */\n+static int ice_check_sriov_allowed(struct ice_pf *pf)\n+{\n+\tstruct device *dev = ice_pf_to_dev(pf);\n+\n+\tif (!test_bit(ICE_FLAG_SRIOV_CAPABLE, pf->flags)) {\n+\t\tdev_err(dev, \"This device is not capable of SR-IOV\\n\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\tif (ice_is_safe_mode(pf)) {\n+\t\tdev_err(dev, \"SR-IOV cannot be configured - Device is in Safe Mode\\n\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\tif (!ice_pf_state_is_nominal(pf)) {\n+\t\tdev_err(dev, \"Cannot enable SR-IOV, device not ready\\n\");\n+\t\treturn -EBUSY;\n+\t}\n+\n+\treturn 0;\n }\n \n /**\n * ice_sriov_configure - Enable or change number of VFs via sysfs\n * @pdev: pointer to a pci_dev structure\n- * @num_vfs: number of VFs to allocate\n+ * @num_vfs: number of VFs to allocate or 0 to free VFs\n *\n- * This function is called when the user updates the number of VFs in sysfs.\n+ * This function is called when the user updates the number of VFs in sysfs. On\n+ * success return whatever num_vfs was set to by the caller. Return negative on\n+ * failure.\n */\n int ice_sriov_configure(struct pci_dev *pdev, int num_vfs)\n {\n \tstruct ice_pf *pf = pci_get_drvdata(pdev);\n \tstruct device *dev = ice_pf_to_dev(pf);\n+\tint err;\n \n-\tif (ice_is_safe_mode(pf)) {\n-\t\tdev_err(dev, \"SR-IOV cannot be configured - Device is in Safe Mode\\n\");\n-\t\treturn -EOPNOTSUPP;\n-\t}\n+\terr = ice_check_sriov_allowed(pf);\n+\tif (err)\n+\t\treturn err;\n \n-\tif (num_vfs)\n-\t\treturn ice_pci_sriov_ena(pf, num_vfs);\n+\tif (!num_vfs) {\n+\t\tif (!pci_vfs_assigned(pdev)) {\n+\t\t\tice_free_vfs(pf);\n+\t\t\treturn 0;\n+\t\t}\n \n-\tif (!pci_vfs_assigned(pdev)) {\n-\t\tice_free_vfs(pf);\n-\t} else {\n \t\tdev_err(dev, \"can't free VFs because some are assigned to VMs.\\n\");\n \t\treturn -EBUSY;\n \t}\n \n-\treturn 0;\n+\terr = ice_pci_sriov_ena(pf, num_vfs);\n+\tif (err)\n+\t\treturn err;\n+\n+\treturn num_vfs;\n }\n \n /**\n", "prefixes": [ "S45", "02/15" ] }