Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/972028/?format=api
{ "id": 972028, "url": "http://patchwork.ozlabs.org/api/patches/972028/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180920002311.10891-8-anirudh.venkataramanan@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": "<20180920002311.10891-8-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-09-20T00:23:10", "name": "[7/8] ice: Update to capabilities admin queue command", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "17d57d9a5a55705b33eac93109d8271affc0824c", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20180920002311.10891-8-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 66524, "url": "http://patchwork.ozlabs.org/api/series/66524/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=66524", "date": "2018-09-20T00:23:03", "name": "Minor updates and bug fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/66524/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/972028/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/972028/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\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 42FyBT68zWz9s9J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 20 Sep 2018 10:23:29 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3B09288ABC;\n\tThu, 20 Sep 2018 00:23:28 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id uL8Q4iYTbI31; Thu, 20 Sep 2018 00:23:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C9B3788ADB;\n\tThu, 20 Sep 2018 00:23:25 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 03EC61C08AF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id ED0E8882AE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:22 +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 IQitbp61rLL5 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:18 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 6B34787FE8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:18 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Sep 2018 17:23:17 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga006.jf.intel.com with ESMTP; 19 Sep 2018 17:23:11 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,396,1531810800\"; d=\"scan'208\";a=\"75747554\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 19 Sep 2018 17:23:10 -0700", "Message-Id": "<20180920002311.10891-8-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "References": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 7/8] ice: Update to capabilities admin\n\tqueue command", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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": "This patch makes a couple of changes in the way the driver uses the\n\"get capabilities\" command.\n\n1. Get device capabilities in addition to function capabilities\n\n2. Align to latest spec by using cap_count to determine size of the\n buffer in case of length error.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_common.c | 50 ++++++++++++++++++++---------\n 1 file changed, 34 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex 0847dbf9d42f..decfdb065a20 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -1451,7 +1451,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n * @hw: pointer to the hw struct\n * @buf: a virtual buffer to hold the capabilities\n * @buf_size: Size of the virtual buffer\n- * @data_size: Size of the returned data, or buf size needed if AQ err==ENOMEM\n+ * @cap_count: cap count needed if AQ err==ENOMEM\n * @opc: capabilities type to discover - pass in the command opcode\n * @cd: pointer to command details structure or NULL\n *\n@@ -1459,7 +1459,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n * the firmware.\n */\n static enum ice_status\n-ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u16 *data_size,\n+ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u32 *cap_count,\n \t\t enum ice_adminq_opc opc, struct ice_sq_cd *cd)\n {\n \tstruct ice_aqc_list_caps *cmd;\n@@ -1477,58 +1477,76 @@ ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u16 *data_size,\n \tstatus = ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);\n \tif (!status)\n \t\tice_parse_caps(hw, buf, le32_to_cpu(cmd->count), opc);\n-\t*data_size = le16_to_cpu(desc.datalen);\n-\n+\telse if (hw->adminq.sq_last_status == ICE_AQ_RC_ENOMEM)\n+\t\t*cap_count =\n+\t\t\tDIV_ROUND_UP(le16_to_cpu(desc.datalen),\n+\t\t\t\t sizeof(struct ice_aqc_list_caps_elem));\n \treturn status;\n }\n \n /**\n- * ice_get_caps - get info about the HW\n+ * ice_discover_caps - get info about the HW\n * @hw: pointer to the hardware structure\n+ * @opc: capabilities type to discover - pass in the command opcode\n */\n-enum ice_status ice_get_caps(struct ice_hw *hw)\n+static enum ice_status ice_discover_caps(struct ice_hw *hw,\n+\t\t\t\t\t enum ice_adminq_opc opc)\n {\n \tenum ice_status status;\n-\tu16 data_size = 0;\n+\tu32 cap_count;\n \tu16 cbuf_len;\n \tu8 retries;\n \n \t/* The driver doesn't know how many capabilities the device will return\n \t * so the buffer size required isn't known ahead of time. The driver\n \t * starts with cbuf_len and if this turns out to be insufficient, the\n-\t * device returns ICE_AQ_RC_ENOMEM and also the buffer size it needs.\n-\t * The driver then allocates the buffer of this size and retries the\n-\t * operation. So it follows that the retry count is 2.\n+\t * device returns ICE_AQ_RC_ENOMEM and also the cap_count it needs.\n+\t * The driver then allocates the buffer based on the count and retries\n+\t * the operation. So it follows that the retry count is 2.\n \t */\n #define ICE_GET_CAP_BUF_COUNT\t40\n #define ICE_GET_CAP_RETRY_COUNT\t2\n \n-\tcbuf_len = ICE_GET_CAP_BUF_COUNT *\n-\t\tsizeof(struct ice_aqc_list_caps_elem);\n-\n+\tcap_count = ICE_GET_CAP_BUF_COUNT;\n \tretries = ICE_GET_CAP_RETRY_COUNT;\n \n \tdo {\n \t\tvoid *cbuf;\n \n+\t\tcbuf_len = (u16)(cap_count *\n+\t\t\t\t sizeof(struct ice_aqc_list_caps_elem));\n \t\tcbuf = devm_kzalloc(ice_hw_to_dev(hw), cbuf_len, GFP_KERNEL);\n \t\tif (!cbuf)\n \t\t\treturn ICE_ERR_NO_MEMORY;\n \n-\t\tstatus = ice_aq_discover_caps(hw, cbuf, cbuf_len, &data_size,\n-\t\t\t\t\t ice_aqc_opc_list_func_caps, NULL);\n+\t\tstatus = ice_aq_discover_caps(hw, cbuf, cbuf_len, &cap_count,\n+\t\t\t\t\t opc, NULL);\n \t\tdevm_kfree(ice_hw_to_dev(hw), cbuf);\n \n \t\tif (!status || hw->adminq.sq_last_status != ICE_AQ_RC_ENOMEM)\n \t\t\tbreak;\n \n \t\t/* If ENOMEM is returned, try again with bigger buffer */\n-\t\tcbuf_len = data_size;\n \t} while (--retries);\n \n \treturn status;\n }\n \n+/**\n+ * ice_get_caps - get info about the HW\n+ * @hw: pointer to the hardware structure\n+ */\n+enum ice_status ice_get_caps(struct ice_hw *hw)\n+{\n+\tenum ice_status status;\n+\n+\tstatus = ice_discover_caps(hw, ice_aqc_opc_list_dev_caps);\n+\tif (!status)\n+\t\tstatus = ice_discover_caps(hw, ice_aqc_opc_list_func_caps);\n+\n+\treturn status;\n+}\n+\n /**\n * ice_aq_manage_mac_write - manage MAC address write command\n * @hw: pointer to the hw struct\n", "prefixes": [ "7/8" ] }