Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/898781/?format=api
{ "id": 898781, "url": "http://patchwork.ozlabs.org/api/patches/898781/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180416165536.7490-1-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": "<20180416165536.7490-1-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-04-16T16:55:36", "name": "ice: Update NVM AQ command functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f2bce690c35b2777634783f799b75d1b5336c4a5", "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/20180416165536.7490-1-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 39118, "url": "http://patchwork.ozlabs.org/api/series/39118/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=39118", "date": "2018-04-16T16:55:36", "name": "ice: Update NVM AQ command functions", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/39118/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/898781/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/898781/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.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40Pvdp60YHz9s0t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 17 Apr 2018 02:55:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6A5F022F7D;\n\tMon, 16 Apr 2018 16:55:40 +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 d3wqz4pJG-Lf; Mon, 16 Apr 2018 16:55:39 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 716CE228C5;\n\tMon, 16 Apr 2018 16:55:39 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 564A91CF0E8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 16 Apr 2018 16:55:38 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5283C87506\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 16 Apr 2018 16:55:38 +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 KmCCXwEWjffT for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 16 Apr 2018 16:55:37 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 788F7874E9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 16 Apr 2018 16:55:37 +0000 (UTC)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2018 09:55:36 -0700", "from shasta.jf.intel.com ([10.166.241.32])\n\tby orsmga008.jf.intel.com with ESMTP; 16 Apr 2018 09:55:36 -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.48,459,1517904000\"; d=\"scan'208\";a=\"34074412\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 16 Apr 2018 09:55:36 -0700", "Message-Id": "<20180416165536.7490-1-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "Subject": "[Intel-wired-lan] [PATCH] ice: Update NVM AQ command functions", "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 updates the NVM read/erase/update AQ commands to align with\nthe latest specification.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 13 +++++++------\n drivers/net/ethernet/intel/ice/ice_nvm.c | 7 ++++---\n 2 files changed, 11 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 5b13ca1bd85f..1f1b65954dce 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -1049,7 +1049,9 @@ struct ice_aqc_set_event_mask {\n * NVM Update commands (indirect 0x0703)\n */\n struct ice_aqc_nvm {\n-\tu8\tcmd_flags;\n+\t__le16 offset_low;\n+\tu8 offset_high;\n+\tu8 cmd_flags;\n #define ICE_AQC_NVM_LAST_CMD\t\tBIT(0)\n #define ICE_AQC_NVM_PCIR_REQ\t\tBIT(0)\t/* Used by NVM Update reply */\n #define ICE_AQC_NVM_PRESERVATION_S\t1\n@@ -1058,12 +1060,11 @@ struct ice_aqc_nvm {\n #define ICE_AQC_NVM_PRESERVE_ALL\tBIT(1)\n #define ICE_AQC_NVM_PRESERVE_SELECTED\t(3 << CSR_AQ_NVM_PRESERVATION_S)\n #define ICE_AQC_NVM_FLASH_ONLY\t\tBIT(7)\n-\tu8\tmodule_typeid;\n-\t__le16\tlength;\n+\t__le16 module_typeid;\n+\t__le16 length;\n #define ICE_AQC_NVM_ERASE_LEN\t0xFFFF\n-\t__le32\toffset;\n-\t__le32\taddr_high;\n-\t__le32\taddr_low;\n+\t__le32 addr_high;\n+\t__le32 addr_low;\n };\n \n /* Get/Set RSS key (indirect 0x0B04/0x0B02) */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c\nindex fa7a69ac92b0..92da0a626ce0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_nvm.c\n+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c\n@@ -16,7 +16,7 @@\n * Read the NVM using the admin queue commands (0x0701)\n */\n static enum ice_status\n-ice_aq_read_nvm(struct ice_hw *hw, u8 module_typeid, u32 offset, u16 length,\n+ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, u16 length,\n \t\tvoid *data, bool last_command, struct ice_sq_cd *cd)\n {\n \tstruct ice_aq_desc desc;\n@@ -33,8 +33,9 @@ ice_aq_read_nvm(struct ice_hw *hw, u8 module_typeid, u32 offset, u16 length,\n \t/* If this is the last command in a series, set the proper flag. */\n \tif (last_command)\n \t\tcmd->cmd_flags |= ICE_AQC_NVM_LAST_CMD;\n-\tcmd->module_typeid = module_typeid;\n-\tcmd->offset = cpu_to_le32(offset);\n+\tcmd->module_typeid = cpu_to_le16(module_typeid);\n+\tcmd->offset_low = cpu_to_le16(offset & 0xFFFF);\n+\tcmd->offset_high = (offset >> 16) & 0xFF;\n \tcmd->length = cpu_to_le16(length);\n \n \treturn ice_aq_send_cmd(hw, &desc, data, length, cd);\n", "prefixes": [] }