Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1253346/?format=api
{ "id": 1253346, "url": "http://patchwork.ozlabs.org/api/patches/1253346/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200312015818.1007882-4-jacob.e.keller@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": "<20200312015818.1007882-4-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2020-03-12T01:58:12", "name": "[v3,3/9] ice: store NVM version info in extracted format", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "826cca546fc6038c2d95c690a23c4e50a0512572", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20200312015818.1007882-4-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 163869, "url": "http://patchwork.ozlabs.org/api/series/163869/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=163869", "date": "2020-03-12T01:58:10", "name": "ice devlink support", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/163869/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1253346/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1253346/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.136;\n\thelo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 48dBnP6rD6z9sSL\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 12 Mar 2020 12:58:33 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C0CC7265B2;\n\tThu, 12 Mar 2020 01:58:31 +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 ezyfI4ODc7vq; Thu, 12 Mar 2020 01:58:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 06AAF2634D;\n\tThu, 12 Mar 2020 01:58:29 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 80F391BF9B6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Mar 2020 01:58:24 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 757708854C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Mar 2020 01:58:24 +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 4JBS0maiI5RS for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Mar 2020 01:58:22 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 64B5A88550\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Mar 2020 01:58:22 +0000 (UTC)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Mar 2020 18:58:22 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.241.33])\n\tby orsmga008.jf.intel.com with ESMTP; 11 Mar 2020 18:58:21 -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.70,543,1574150400\"; d=\"scan'208\";a=\"236656307\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 11 Mar 2020 18:58:12 -0700", "Message-Id": "<20200312015818.1007882-4-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200312015818.1007882-1-jacob.e.keller@intel.com>", "References": "<20200312015818.1007882-1-jacob.e.keller@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v3 3/9] ice: store NVM version info in\n\textracted format", "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>", "Cc": "Jakub Kicinski <kuba@kernel.org>", "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": "The NVM version and Option ROM version information is stored within the\nstruct ice_nvm_ver_info structure. The data for the NVM is stored as\na 2byte value with the major and minor versions each using one byte from\nthe field. The Option ROM is stored as a 4byte value that contains\na major, build, and patch number.\n\nModify the code to immediately extract the version values and store them\nin a new struct ice_orom_info. Remove the now unnecessary\nice_get_nvm_version function.\n\nUpdate ice_ethtool.c to use the new fields directly from the structured\ndata.\n\nThis reduces complexity of the code that prints these versions in\nice_ethtool.c\n\nUpdate the macro definitions and variable names to use the term \"orom\"\ninstead of \"oem\" for the Option ROM version. This helps increase the\nclarity of the Option ROM version code.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nReviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_common.c | 23 -----\n drivers/net/ethernet/intel/ice/ice_common.h | 3 -\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 +--\n drivers/net/ethernet/intel/ice/ice_nvm.c | 94 +++++++++++++-------\n drivers/net/ethernet/intel/ice/ice_type.h | 30 ++++---\n 5 files changed, 88 insertions(+), 75 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex f8dd840c03fb..a16ec5c6a0bc 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -614,29 +614,6 @@ static void ice_get_itr_intrl_gran(struct ice_hw *hw)\n \t}\n }\n \n-/**\n- * ice_get_nvm_version - get cached NVM version data\n- * @hw: pointer to the hardware structure\n- * @oem_ver: 8 bit NVM version\n- * @oem_build: 16 bit NVM build number\n- * @oem_patch: 8 NVM patch number\n- * @ver_hi: high 8 bits of the NVM version\n- * @ver_lo: low 8 bits of the NVM version\n- */\n-void\n-ice_get_nvm_version(struct ice_hw *hw, u8 *oem_ver, u16 *oem_build,\n-\t\t u8 *oem_patch, u8 *ver_hi, u8 *ver_lo)\n-{\n-\tstruct ice_nvm_info *nvm = &hw->nvm;\n-\n-\t*oem_ver = (u8)((nvm->oem_ver & ICE_OEM_VER_MASK) >> ICE_OEM_VER_SHIFT);\n-\t*oem_patch = (u8)(nvm->oem_ver & ICE_OEM_VER_PATCH_MASK);\n-\t*oem_build = (u16)((nvm->oem_ver & ICE_OEM_VER_BUILD_MASK) >>\n-\t\t\t ICE_OEM_VER_BUILD_SHIFT);\n-\t*ver_hi = (nvm->ver & ICE_NVM_VER_HI_MASK) >> ICE_NVM_VER_HI_SHIFT;\n-\t*ver_lo = (nvm->ver & ICE_NVM_VER_LO_MASK) >> ICE_NVM_VER_LO_SHIFT;\n-}\n-\n /**\n * ice_init_hw - main hardware initialization routine\n * @hw: pointer to the hardware structure\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h\nindex 21b31cd33c41..0885bdb5830c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.h\n+++ b/drivers/net/ethernet/intel/ice/ice_common.h\n@@ -162,9 +162,6 @@ ice_stat_update40(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n void\n ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n \t\t u64 *prev_stat, u64 *cur_stat);\n-void\n-ice_get_nvm_version(struct ice_hw *hw, u8 *oem_ver, u16 *oem_build,\n-\t\t u8 *oem_patch, u8 *ver_hi, u8 *ver_lo);\n enum ice_status\n ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,\n \t\t struct ice_aqc_get_elem *buf);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex e3d148f12aac..75970bcfa6c0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -167,11 +167,14 @@ static void\n ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n-\tu8 oem_ver, oem_patch, nvm_ver_hi, nvm_ver_lo;\n \tstruct ice_vsi *vsi = np->vsi;\n \tstruct ice_pf *pf = vsi->back;\n \tstruct ice_hw *hw = &pf->hw;\n-\tu16 oem_build;\n+\tstruct ice_orom_info *orom;\n+\tstruct ice_nvm_info *nvm;\n+\n+\tnvm = &hw->nvm;\n+\torom = &nvm->orom;\n \n \tstrscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));\n \tstrscpy(drvinfo->version, ice_drv_ver, sizeof(drvinfo->version));\n@@ -179,11 +182,9 @@ ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)\n \t/* Display NVM version (from which the firmware version can be\n \t * determined) which contains more pertinent information.\n \t */\n-\tice_get_nvm_version(hw, &oem_ver, &oem_build, &oem_patch,\n-\t\t\t &nvm_ver_hi, &nvm_ver_lo);\n \tsnprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),\n-\t\t \"%x.%02x 0x%x %d.%d.%d\", nvm_ver_hi, nvm_ver_lo,\n-\t\t hw->nvm.eetrack, oem_ver, oem_build, oem_patch);\n+\t\t \"%x.%02x 0x%x %d.%d.%d\", nvm->major_ver, nvm->minor_ver,\n+\t\t nvm->eetrack, orom->major, orom->build, orom->patch);\n \n \tstrscpy(drvinfo->bus_info, pci_name(pf->pdev),\n \t\tsizeof(drvinfo->bus_info));\ndiff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c\nindex 97aaf75379ae..ef68fa989a57 100644\n--- a/drivers/net/ethernet/intel/ice/ice_nvm.c\n+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c\n@@ -307,6 +307,62 @@ enum ice_status ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)\n \treturn status;\n }\n \n+/**\n+ * ice_get_orom_ver_info - Read Option ROM version information\n+ * @hw: pointer to the HW struct\n+ *\n+ * Read the Combo Image version data from the Boot Configuration TLV and fill\n+ * in the option ROM version data.\n+ */\n+static enum ice_status ice_get_orom_ver_info(struct ice_hw *hw)\n+{\n+\tu16 combo_hi, combo_lo, boot_cfg_tlv, boot_cfg_tlv_len;\n+\tstruct ice_orom_info *orom = &hw->nvm.orom;\n+\tenum ice_status status;\n+\tu32 combo_ver;\n+\n+\tstatus = ice_get_pfa_module_tlv(hw, &boot_cfg_tlv, &boot_cfg_tlv_len,\n+\t\t\t\t\tICE_SR_BOOT_CFG_PTR);\n+\tif (status) {\n+\t\tice_debug(hw, ICE_DBG_INIT,\n+\t\t\t \"Failed to read Boot Configuration Block TLV.\\n\");\n+\t\treturn status;\n+\t}\n+\n+\t/* Boot Configuration Block must have length at least 2 words\n+\t * (Combo Image Version High and Combo Image Version Low)\n+\t */\n+\tif (boot_cfg_tlv_len < 2) {\n+\t\tice_debug(hw, ICE_DBG_INIT,\n+\t\t\t \"Invalid Boot Configuration Block TLV size.\\n\");\n+\t\treturn ICE_ERR_INVAL_SIZE;\n+\t}\n+\n+\tstatus = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OROM_VER_OFF),\n+\t\t\t\t &combo_hi);\n+\tif (status) {\n+\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to read OROM_VER hi.\\n\");\n+\t\treturn status;\n+\t}\n+\n+\tstatus = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OROM_VER_OFF + 1),\n+\t\t\t\t &combo_lo);\n+\tif (status) {\n+\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to read OROM_VER lo.\\n\");\n+\t\treturn status;\n+\t}\n+\n+\tcombo_ver = ((u32)combo_hi << 16) | combo_lo;\n+\n+\torom->major = (u8)((combo_ver & ICE_OROM_VER_MASK) >>\n+\t\t\t ICE_OROM_VER_SHIFT);\n+\torom->patch = (u8)(combo_ver & ICE_OROM_VER_PATCH_MASK);\n+\torom->build = (u16)((combo_ver & ICE_OROM_VER_BUILD_MASK) >>\n+\t\t\t ICE_OROM_VER_BUILD_SHIFT);\n+\n+\treturn 0;\n+}\n+\n /**\n * ice_init_nvm - initializes NVM setting\n * @hw: pointer to the HW struct\n@@ -316,9 +372,8 @@ enum ice_status ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)\n */\n enum ice_status ice_init_nvm(struct ice_hw *hw)\n {\n-\tu16 oem_hi, oem_lo, boot_cfg_tlv, boot_cfg_tlv_len;\n \tstruct ice_nvm_info *nvm = &hw->nvm;\n-\tu16 eetrack_lo, eetrack_hi;\n+\tu16 eetrack_lo, eetrack_hi, ver;\n \tenum ice_status status;\n \tu32 fla, gens_stat;\n \tu8 sr_size;\n@@ -344,12 +399,14 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)\n \t\treturn ICE_ERR_NVM_BLANK_MODE;\n \t}\n \n-\tstatus = ice_read_sr_word(hw, ICE_SR_NVM_DEV_STARTER_VER, &nvm->ver);\n+\tstatus = ice_read_sr_word(hw, ICE_SR_NVM_DEV_STARTER_VER, &ver);\n \tif (status) {\n \t\tice_debug(hw, ICE_DBG_INIT,\n \t\t\t \"Failed to read DEV starter version.\\n\");\n \t\treturn status;\n \t}\n+\tnvm->major_ver = (ver & ICE_NVM_VER_HI_MASK) >> ICE_NVM_VER_HI_SHIFT;\n+\tnvm->minor_ver = (ver & ICE_NVM_VER_LO_MASK) >> ICE_NVM_VER_LO_SHIFT;\n \n \tstatus = ice_read_sr_word(hw, ICE_SR_NVM_EETRACK_LO, &eetrack_lo);\n \tif (status) {\n@@ -390,39 +447,12 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)\n \t\tbreak;\n \t}\n \n-\tstatus = ice_get_pfa_module_tlv(hw, &boot_cfg_tlv, &boot_cfg_tlv_len,\n-\t\t\t\t\tICE_SR_BOOT_CFG_PTR);\n+\tstatus = ice_get_orom_ver_info(hw);\n \tif (status) {\n-\t\tice_debug(hw, ICE_DBG_INIT,\n-\t\t\t \"Failed to read Boot Configuration Block TLV.\\n\");\n+\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to read Option ROM info.\\n\");\n \t\treturn status;\n \t}\n \n-\t/* Boot Configuration Block must have length at least 2 words\n-\t * (Combo Image Version High and Combo Image Version Low)\n-\t */\n-\tif (boot_cfg_tlv_len < 2) {\n-\t\tice_debug(hw, ICE_DBG_INIT,\n-\t\t\t \"Invalid Boot Configuration Block TLV size.\\n\");\n-\t\treturn ICE_ERR_INVAL_SIZE;\n-\t}\n-\n-\tstatus = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OEM_VER_OFF),\n-\t\t\t\t &oem_hi);\n-\tif (status) {\n-\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to read OEM_VER hi.\\n\");\n-\t\treturn status;\n-\t}\n-\n-\tstatus = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OEM_VER_OFF + 1),\n-\t\t\t\t &oem_lo);\n-\tif (status) {\n-\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to read OEM_VER lo.\\n\");\n-\t\treturn status;\n-\t}\n-\n-\tnvm->oem_ver = ((u32)oem_hi << 16) | oem_lo;\n-\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex bf0b7e5b9d39..72591b4aca11 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -241,12 +241,20 @@ struct ice_fc_info {\n \tenum ice_fc_mode req_mode;\t/* FC mode requested by caller */\n };\n \n+/* Option ROM version information */\n+struct ice_orom_info {\n+\tu8 major;\t\t\t/* Major version of OROM */\n+\tu8 patch;\t\t\t/* Patch version of OROM */\n+\tu16 build;\t\t\t/* Build version of OROM */\n+};\n+\n /* NVM Information */\n struct ice_nvm_info {\n-\tu32 eetrack; /* NVM data version */\n-\tu32 oem_ver; /* OEM version info */\n-\tu16 sr_words; /* Shadow RAM size in words */\n-\tu16 ver; /* NVM package version */\n+\tstruct ice_orom_info orom;\t/* Option ROM version info */\n+\tu32 eetrack;\t\t\t/* NVM data version */\n+\tu16 sr_words;\t\t\t/* Shadow RAM size in words */\n+\tu8 major_ver;\t\t\t/* major version of NVM package */\n+\tu8 minor_ver;\t\t\t/* minor version of dev starter */\n \tu8 blank_nvm_mode; /* is NVM empty (no FW present) */\n };\n \n@@ -633,7 +641,7 @@ struct ice_hw_port_stats {\n \n /* Checksum and Shadow RAM pointers */\n #define ICE_SR_BOOT_CFG_PTR\t\t0x132\n-#define ICE_NVM_OEM_VER_OFF\t\t0x02\n+#define ICE_NVM_OROM_VER_OFF\t\t0x02\n #define ICE_SR_NVM_DEV_STARTER_VER\t0x18\n #define ICE_SR_NVM_EETRACK_LO\t\t0x2D\n #define ICE_SR_NVM_EETRACK_HI\t\t0x2E\n@@ -641,12 +649,12 @@ struct ice_hw_port_stats {\n #define ICE_NVM_VER_LO_MASK\t\t(0xff << ICE_NVM_VER_LO_SHIFT)\n #define ICE_NVM_VER_HI_SHIFT\t\t12\n #define ICE_NVM_VER_HI_MASK\t\t(0xf << ICE_NVM_VER_HI_SHIFT)\n-#define ICE_OEM_VER_PATCH_SHIFT\t\t0\n-#define ICE_OEM_VER_PATCH_MASK\t\t(0xff << ICE_OEM_VER_PATCH_SHIFT)\n-#define ICE_OEM_VER_BUILD_SHIFT\t\t8\n-#define ICE_OEM_VER_BUILD_MASK\t\t(0xffff << ICE_OEM_VER_BUILD_SHIFT)\n-#define ICE_OEM_VER_SHIFT\t\t24\n-#define ICE_OEM_VER_MASK\t\t(0xff << ICE_OEM_VER_SHIFT)\n+#define ICE_OROM_VER_PATCH_SHIFT\t0\n+#define ICE_OROM_VER_PATCH_MASK\t\t(0xff << ICE_OROM_VER_PATCH_SHIFT)\n+#define ICE_OROM_VER_BUILD_SHIFT\t8\n+#define ICE_OROM_VER_BUILD_MASK\t\t(0xffff << ICE_OROM_VER_BUILD_SHIFT)\n+#define ICE_OROM_VER_SHIFT\t\t24\n+#define ICE_OROM_VER_MASK\t\t(0xff << ICE_OROM_VER_SHIFT)\n #define ICE_SR_PFA_PTR\t\t\t0x40\n #define ICE_SR_SECTOR_SIZE_IN_WORDS\t0x800\n #define ICE_SR_WORDS_IN_1KB\t\t512\n", "prefixes": [ "v3", "3/9" ] }