From: Jacob Keller <jacob.e.keller@intel.com>
To: linux-pci@vger.kernel.org, netdev@vger.kernel.org
Cc: Jacob Keller <jacob.e.keller@intel.com>,
ND Linux CI Server <nd.linux.ci.server@intel.com>,
Allan@vger.kernel.org, Bruce W <bruce.w.allan@intel.com>
Subject: [PATCH] ice-shared: add macro specifying max NVM offset
Date: Thu, 27 Feb 2020 14:36:30 -0800 [thread overview]
Message-ID: <20200227223635.1021197-2-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20200227223635.1021197-1-jacob.e.keller@intel.com>
The ice_aq_read_nvm function uses a somewhat weird construction for
verifying that the incoming offset is valid. Replace this construction
with a simple greater-than expression, and define the maximum value
(24bits) in the ice_adminq_cmd.h
By providing a macro, the check becomes more clear. Additionally the
maximum offset can be used in other locations.
Change-Id: I50993e53aca7c073d6906f48f8c9a6ecc05248d4
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Title: ice-shared: add macro specifying max NVM offset
Change-type: ImplementationChange
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/250507
Tested-by: ND Linux CI Server <nd.linux.ci.server@intel.com>
Reviewed-by: Allan, Bruce W <bruce.w.allan@intel.com>
---
ice_adminq_cmd.h | 1 +
ice_nvm.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ice_adminq_cmd.h b/ice_adminq_cmd.h
index 38134e9dab11..fbbe676d1f7d 100644
--- a/ice_adminq_cmd.h
+++ b/ice_adminq_cmd.h
@@ -2778,6 +2778,7 @@ ICE_CHECK_PARAM_LEN(ice_aqc_sff_eeprom);
* NVM Shadow RAM Dump commands (direct 0x0707)
*/
struct ice_aqc_nvm {
+#define ICE_AQC_NVM_MAX_OFFSET 0xFFFFFF
__le16 offset_low;
u8 offset_high;
#ifdef PREBOOT_SUPPORT
diff --git a/ice_nvm.c b/ice_nvm.c
index b075a05eb38f..0e6d8390deb8 100644
--- a/ice_nvm.c
+++ b/ice_nvm.c
@@ -35,8 +35,7 @@ ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, u16 length,
cmd = &desc.params.nvm;
- /* In offset the highest byte must be zeroed. */
- if (offset & 0xFF000000)
+ if (offset > ICE_AQC_NVM_MAX_OFFSET)
return ICE_ERR_PARAM;
ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_nvm_read);
--
2.25.0.368.g28a2d05eebfb
next prev parent reply other threads:[~2020-02-27 22:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 22:36 [PATCH 0/5] pci: implement function to read Device Serial Number Jacob Keller
2020-02-27 22:36 ` Jacob Keller [this message]
2020-02-27 22:43 ` [PATCH] ice-shared: add macro specifying max NVM offset Jacob Keller
2020-02-27 22:36 ` [PATCH 1/5] pci: introduce pci_get_dsn Jacob Keller
2020-03-01 5:27 ` David Miller
2020-03-02 19:58 ` Jacob Keller
2020-03-02 22:25 ` Bjorn Helgaas
2020-03-02 22:33 ` Jacob Keller
2020-03-02 23:20 ` Bjorn Helgaas
2020-03-02 23:24 ` Jacob Keller
2020-03-02 23:39 ` Bjorn Helgaas
2020-03-03 2:24 ` [PATCH v2 0/6] PCI: Implement function to read Device Serial Number Jacob Keller
2020-03-03 2:25 ` [PATCH v2 1/6] PCI: Introduce pci_get_dsn Jacob Keller
2020-03-04 22:42 ` Bjorn Helgaas
2020-03-03 2:25 ` [PATCH v2 2/6] bnxt_en: Use pci_get_dsn() Jacob Keller
2020-03-03 2:25 ` [PATCH v2 3/6] scsi: qedf: " Jacob Keller
2020-03-03 2:25 ` [PATCH v2 4/6] ice: " Jacob Keller
2020-03-03 2:25 ` [PATCH v2 5/6] ixgbe: " Jacob Keller
2020-03-03 2:25 ` [PATCH v2 6/6] nfp: " Jacob Keller
2020-03-03 3:40 ` Jakub Kicinski
2020-03-03 17:36 ` Jacob Keller
2020-03-04 22:28 ` [PATCH v2 0/6] PCI: Implement function to read Device Serial Number David Miller
2020-03-06 1:30 ` David Miller
2020-02-27 22:36 ` [PATCH 2/5] bnxt_en: use pci_get_dsn Jacob Keller
2020-03-02 22:25 ` Bjorn Helgaas
2020-02-27 22:36 ` [PATCH 3/5] scsi: qedf: " Jacob Keller
2020-02-27 22:36 ` [PATCH 4/5] ice: " Jacob Keller
2020-02-27 22:36 ` [PATCH 5/5] ixgbe: " Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200227223635.1021197-2-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=Allan@vger.kernel.org \
--cc=bruce.w.allan@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=nd.linux.ci.server@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).