Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1192295/?format=api
{ "id": 1192295, "url": "http://patchwork.ozlabs.org/api/patches/1192295/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191108142331.10221-1-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": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-11-08T14:23:17", "name": "[S33,01/15] ice: Store number of functions for the device", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "05db183171373e832934e85f703c6df164cf6b80", "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/20191108142331.10221-1-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 141798, "url": "http://patchwork.ozlabs.org/api/series/141798/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=141798", "date": "2019-11-08T14:23:30", "name": "[S33,01/15] ice: Store number of functions for the device", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/141798/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1192295/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1192295/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=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\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 478wZC5Lyfz9sPT\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 9 Nov 2019 09:54:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 45C6286538;\n\tFri, 8 Nov 2019 22:54:26 +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 GtrLFk1RYJzg; Fri, 8 Nov 2019 22:54:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4624286519;\n\tFri, 8 Nov 2019 22:54:24 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 550661BF5DB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4FAE92413D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:20 +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 MqMRIb-H9EgV for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:17 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id EC65923DA9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:16 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Nov 2019 14:54:16 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga008.fm.intel.com with ESMTP; 08 Nov 2019 14:54:16 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,283,1569308400\"; d=\"scan'208\";a=\"201478825\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 8 Nov 2019 06:23:17 -0800", "Message-Id": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S33 01/15] ice: Store number of functions\n\tfor the device", "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\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<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: Bruce Allan <bruce.w.allan@intel.com>\n\nStore the number of functions the device has and use this number when\nsetting safe mode capabilities instead of calculating it.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\nCo-developed-by: Kevin Scott <kevin.c.scott@intel.com>\nSigned-off-by: Kevin Scott <kevin.c.scott@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_common.c | 21 ++++++++++-----------\n drivers/net/ethernet/intel/ice/ice_type.h | 1 +\n 2 files changed, 11 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex 36be501ae623..e92eaec19c83 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -1673,6 +1673,10 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n \t\t\tice_debug(hw, ICE_DBG_INIT,\n \t\t\t\t \"%s: valid_functions (bitmap) = %d\\n\", prefix,\n \t\t\t\t caps->valid_functions);\n+\n+\t\t\t/* store func count for resource management purposes */\n+\t\t\tif (dev_p)\n+\t\t\t\tdev_p->num_funcs = hweight32(number);\n \t\t\tbreak;\n \t\tcase ICE_AQC_CAPS_SRIOV:\n \t\t\tcaps->sr_iov_1_1 = (number == 1);\n@@ -1875,8 +1879,7 @@ void ice_set_safe_mode_caps(struct ice_hw *hw)\n \tstruct ice_hw_dev_caps *dev_caps = &hw->dev_caps;\n \tu32 valid_func, rxq_first_id, txq_first_id;\n \tu32 msix_vector_first_id, max_mtu;\n-\tu32 num_func = 0;\n-\tu8 i;\n+\tu32 num_funcs;\n \n \t/* cache some func_caps values that should be restored after memset */\n \tvalid_func = func_caps->common_cap.valid_functions;\n@@ -1909,6 +1912,7 @@ void ice_set_safe_mode_caps(struct ice_hw *hw)\n \trxq_first_id = dev_caps->common_cap.rxq_first_id;\n \tmsix_vector_first_id = dev_caps->common_cap.msix_vector_first_id;\n \tmax_mtu = dev_caps->common_cap.max_mtu;\n+\tnum_funcs = dev_caps->num_funcs;\n \n \t/* unset dev capabilities */\n \tmemset(dev_caps, 0, sizeof(*dev_caps));\n@@ -1919,19 +1923,14 @@ void ice_set_safe_mode_caps(struct ice_hw *hw)\n \tdev_caps->common_cap.rxq_first_id = rxq_first_id;\n \tdev_caps->common_cap.msix_vector_first_id = msix_vector_first_id;\n \tdev_caps->common_cap.max_mtu = max_mtu;\n-\n-\t/* valid_func is a bitmap. get number of functions */\n-#define ICE_MAX_FUNCS 8\n-\tfor (i = 0; i < ICE_MAX_FUNCS; i++)\n-\t\tif (valid_func & BIT(i))\n-\t\t\tnum_func++;\n+\tdev_caps->num_funcs = num_funcs;\n \n \t/* one Tx and one Rx queue per function in safe mode */\n-\tdev_caps->common_cap.num_rxq = num_func;\n-\tdev_caps->common_cap.num_txq = num_func;\n+\tdev_caps->common_cap.num_rxq = num_funcs;\n+\tdev_caps->common_cap.num_txq = num_funcs;\n \n \t/* two MSIX vectors per function */\n-\tdev_caps->common_cap.num_msix_vectors = 2 * num_func;\n+\tdev_caps->common_cap.num_msix_vectors = 2 * num_funcs;\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex eba8b04b8cbd..c4854a987130 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -202,6 +202,7 @@ struct ice_hw_dev_caps {\n \tstruct ice_hw_common_caps common_cap;\n \tu32 num_vfs_exposed;\t\t/* Total number of VFs exposed */\n \tu32 num_vsi_allocd_to_host;\t/* Excluding EMP VSI */\n+\tu32 num_funcs;\n };\n \n /* MAC info */\n", "prefixes": [ "S33", "01/15" ] }