From nobody Fri Oct 2 06:58:31 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F2D93E51F7 for ; Tue, 4 Aug 2026 08:35:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785832548; cv=none; b=e7rNROdNLipM7vD6d9+9Ny1g0IqQMRJQp+OdEQPI5rKmE1YATiMSmSvNypWBUgMmkWlvKIOhdq1gs57H5oQGuUPaGxBeRlCgO7FecAbvAKZKcLoi++295oP0IL2ijUSihhlhTlEdTnJOMbG4sjEkHu0EX2fl6OYw9V18odb1uyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785832548; c=relaxed/simple; bh=Ef+6+ghJPfzjnygqfI736xG8JIentu2vWdpO6rH3VTU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=QEpYPX1IM2srxNW+fYPkQXTbQ6/3HVH3tfH+tVZ70/amEe61dH7dfRePt0kyz8aNf0WFYsxkgS5NlHw0g/LVI3LBTO2+s0R8RQAqUlL2na18O0rXT+o0zFv+vO2cA72Qh+UbR25ezcYasB0Eo9pFvHo9dWvFycak6y4PR1hXndY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b=RxnJN9gu; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b="RxnJN9gu" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 762123FBBD for ; Tue, 4 Aug 2026 08:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1785832542; bh=EwWoMFmkHrUBoojEnGvrGh+7TlMjWGGUnHH4vpXCfXI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=RxnJN9gu4Gzypp3bcQFClKvwwVz8DX0o6qSl4RMrnl7udJ+DPyTAuhuj3oRdFT9rT 30TTlxfivk/CQpQBKlUpUMMB47/39zv0roaSlcfHQ+5Q94om6fn+Uu/p7IESIv1J+w KSW2GOxsNnGc7Pvxzq5OVfH2UbsdzGzg3cVoc6KQNGGQPmTZ2ddNuOSHCwxv+P3Gt8 PPYRvbUDUpYXG3hHHzAy1FMQ2AyCXmF3gIJ1pCeKbYaglWpNTaWVJYraedA1KPFkRA HAksoawRRS2Xoue6swiZ7l8PP8jyE0U8G+iebyaS/f7vUnKL8N+9PmNyiknXhZS9Jd NYUwG/T3r58OVGabrRv7kCzrWoWhCxnROO/1jzxmZYvTGde5XhspRsauuCdOaG0PjG WPCJvbBSuxp2iWLrsUUeK9P2MszxMTTPrtETKLPLoBxOE/eIPEHlIYXfJmXM3QPT8L 6wnPv4jbrNpyNHYsUYuttgSf29MoBNnOdVA2oGhb2sLNlfy7kBbRS6jpNi8jK2gMiW na2hFBeL2HLjl87MoO4oAYOHKrhv3LcCiTPP6PwcqiI70w6+mf40dttsK00yK+aVOz 0GRZ3UKttTxGGPX3/SauOH3UTxc0I1vjgzvS+L+jrvC6tV7G7zXOdgMufusPFtDanb tdcZ/XPLCNcKS4wKO2RDiFf4= Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4957287363bso18756985e9.0 for ; Tue, 04 Aug 2026 01:35:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785832542; x=1786437342; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EwWoMFmkHrUBoojEnGvrGh+7TlMjWGGUnHH4vpXCfXI=; b=LGBa9IqrHWGWJGWm80ycZj9nn35z1Tcx3q9nLvv+0p1gX4dhiTm3vM8r9Umm7BM5gc d8/Sdw/Jzrlmzxyem69Wc2cF4wrEOY3632QI1ehbV1VF5jxznNfB68ahH++Jp1C+L+EU s2qRQiy1xH8MM8dU4M8AEn/6KMuxSUScXZRaKEQXOpvorh2ffQJi4VCQLaW6KohKr9Sa KKiVdQOKyPsoI22hlS3EOlj653LLngNqeXvi2aO1XyM5Mh1q/c6KGyRPG/SXEkoA1zxb cI0g7YXFAnyec8xooIrzohvCp7H0oc/3BQIW1XC+Lm0Mucd4F+drlmEEAwqOKlOlufgz uxpg== X-Forwarded-Encrypted: i=1; AHgh+Rp7X1tN9/WTdA7fE4KsErBFvIFaCRbVPzQ1Z7Ro2FUxAaRsagHCoIbwVAZ8zvh/QKaa5q/OFiEzXop2inE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzpmi2YE7UbY+gQU7Wes8K63Ymlo5hZ0Mqjfuqm56dQW60W3QOV nN/wGnSj/AMw1YbildTYo9FU8l9Fw6KdktbwPi2MvPsLQhDvijUIch8SB2IB+UjWWC2EqA9ngzJ gTcd7k3k7SyMwoqKsiZ214XsmbMj4PPagqcbcRhga3/aaNDZqKam2HH0Aipz5sJgwXdg59csp8O ctzTEcSg== X-Gm-Gg: AR+sD13xeKskhCQwN1i4d2j1c8ImDXvN5gaYcghHM9YJTryfGeZiZR+zxhzKPpxZ6Lf QssO43FUQi8PI84EU2AI0O3JsIusyU6Yw7jJIvMW2ndh0vmFqqrm3to7uBp1UJx4wuzwNKxnmXt oz+QjgRDd4oFOFrW1r04kcZHSmw81wu0PhlvGM29Y2/AbeTmu5gIDsbbDYAf4/AppSlboks7+J7 kSA6e5gF955NMRhPcUosIrv1KFPQ9qCth4USIJIalUS28u5Q6N4lnqQYgsjHFICB0HalmVxSEcT Pfl0S0r8RF/LsHvkf1wpDyt+xQbD0QGW1mJo0pL4U0Ozov6IwTCLLwNPRkqX8AHaUJs+mJzJMD9 JaaOnR4K+fdfyR4gyFgZ/LphmTbI= X-Received: by 2002:a05:600c:35c1:b0:499:484a:81d0 with SMTP id 5b1f17b1804b1-499484a820emr119807825e9.9.1785832541770; Tue, 04 Aug 2026 01:35:41 -0700 (PDT) X-Received: by 2002:a05:600c:35c1:b0:499:484a:81d0 with SMTP id 5b1f17b1804b1-499484a820emr119806935e9.9.1785832541293; Tue, 04 Aug 2026 01:35:41 -0700 (PDT) Received: from rmalz.. (77-236-28-43.static.play.pl. [77.236.28.43]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fd4c33sm61377825e9.8.2026.08.04.01.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 01:35:40 -0700 (PDT) From: Robert Malz To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexander Lobakin , Jesse Brandeburg , Jacob Keller Cc: Robert Malz , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl v4] ice: acquire NVM lock around each flash read Date: Tue, 4 Aug 2026 10:35:36 +0200 Message-Id: <20260804083537.3997889-1-robert.malz@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" FW caps the NVM read lock at a maximum of 3000ms regardless of the timeout requested via ice_acquire_nvm(). ice_read_flat_nvm() splits a read into multiple ice_aq_read_nvm() commands, one per 4KB sector, all issued under a single lock taken by the caller. Reading a large region can exceed 3000ms, so FW reclaims the lock mid-read and the remaining commands might fail. Move the lock acquire/release into ice_read_flat_nvm() so it brackets each individual ice_aq_read_nvm() command, ensuring the lock is never held across more than one FW read. ice_release_nvm() issues its own AQ command and overwrites hw->adminq.sq_last_status, which some callers inspect after a failed read. Add an optional read_aq_err output parameter to ice_read_flat_nvm() to capture the failing read's AQ error before the release; callers that need it (ice_discover_flash_size() and the ethtool/devlink log paths) use it instead of sq_last_status, others pass NULL. Callers that previously took the lock around ice_read_flat_nvm(), ice_read_sr_word() or ice_read_flash_module() now call them without it. The now-redundant per-block locking in ice_devlink_nvm_snapshot() is dropped. ice_read_sr_word() is now a thin wrapper, so ice_read_sr_word_aq() is folded into it. Fixes: e94509906d6b ("ice: create function to read a section of the NVM and= Shadow RAM") Signed-off-by: Robert Malz Reviewed-by: Marcin Szycik Reviewed-by: Przemek Kitszel Tested-by: Rinitha S (A Contingent worker at Intel) --- v4: - Fold ice_read_sr_word_aq() into ice_read_sr_word() now that the latter is only a wrapper. - Reduce the scope of read_aq_err in ice_devlink_nvm_snapshot() to the read loop. - Fix reverse christmas tree ordering of the added read_aq_err declarations. v3: - Log the failure via ice_debug() when ice_acquire_nvm() fails inside ice_read_flat_nvm(), rather than silently aborting the read. v2: - Replace the save/restore of sq_last_status across ice_release_nvm(), which could race with a concurrent AdminQ command, with a new optional read_aq_err output parameter. - Add missing "Return:" kdoc to ice_read_sr_word(). --- .../net/ethernet/intel/ice/devlink/devlink.c | 32 ++----- drivers/net/ethernet/intel/ice/ice_ethtool.c | 16 +--- drivers/net/ethernet/intel/ice/ice_nvm.c | 90 ++++++++++--------- drivers/net/ethernet/intel/ice/ice_nvm.h | 2 +- 4 files changed, 58 insertions(+), 82 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net= /ethernet/intel/ice/devlink/devlink.c index 22b7d8e6bd9e..8c2b63eef82b 100644 --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c @@ -1890,27 +1890,18 @@ static int ice_devlink_nvm_snapshot(struct devlink = *devlink, */ for (i =3D 0; i < num_blks; i++) { u32 read_sz =3D min_t(u32, ICE_DEVLINK_READ_BLK_SIZE, left); - - status =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (status) { - dev_dbg(dev, "ice_acquire_nvm failed, err %d aq_err %d\n", - status, hw->adminq.sq_last_status); - NL_SET_ERR_MSG_MOD(extack, "Failed to acquire NVM semaphore"); - vfree(nvm_data); - return -EIO; - } + enum libie_aq_err read_aq_err =3D LIBIE_AQ_RC_OK; =20 status =3D ice_read_flat_nvm(hw, i * ICE_DEVLINK_READ_BLK_SIZE, - &read_sz, tmp, read_shadow_ram); + &read_sz, tmp, read_shadow_ram, + &read_aq_err); if (status) { dev_dbg(dev, "ice_read_flat_nvm failed after reading %u bytes, err %d a= q_err %d\n", - read_sz, status, hw->adminq.sq_last_status); + read_sz, status, read_aq_err); NL_SET_ERR_MSG_MOD(extack, "Failed to read NVM contents"); - ice_release_nvm(hw); vfree(nvm_data); return -EIO; } - ice_release_nvm(hw); =20 tmp +=3D read_sz; left -=3D read_sz; @@ -1943,6 +1934,7 @@ static int ice_devlink_nvm_read(struct devlink *devli= nk, struct netlink_ext_ack *extack, u64 offset, u32 size, u8 *data) { + enum libie_aq_err read_aq_err =3D LIBIE_AQ_RC_OK; struct ice_pf *pf =3D devlink_priv(devlink); struct device *dev =3D ice_pf_to_dev(pf); struct ice_hw *hw =3D &pf->hw; @@ -1966,24 +1958,14 @@ static int ice_devlink_nvm_read(struct devlink *dev= link, return -ERANGE; } =20 - status =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (status) { - dev_dbg(dev, "ice_acquire_nvm failed, err %d aq_err %d\n", - status, hw->adminq.sq_last_status); - NL_SET_ERR_MSG_MOD(extack, "Failed to acquire NVM semaphore"); - return -EIO; - } - status =3D ice_read_flat_nvm(hw, (u32)offset, &size, data, - read_shadow_ram); + read_shadow_ram, &read_aq_err); if (status) { dev_dbg(dev, "ice_read_flat_nvm failed after reading %u bytes, err %d aq= _err %d\n", - size, status, hw->adminq.sq_last_status); + size, status, read_aq_err); NL_SET_ERR_MSG_MOD(extack, "Failed to read NVM contents"); - ice_release_nvm(hw); return -EIO; } - ice_release_nvm(hw); =20 return 0; } diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/eth= ernet/intel/ice/ice_ethtool.c index 49371b065845..d3cc6fef6a09 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -853,6 +853,7 @@ static int ice_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom, u8 *bytes) { + enum libie_aq_err read_aq_err =3D LIBIE_AQ_RC_OK; struct ice_pf *pf =3D ice_netdev_to_pf(netdev); struct ice_hw *hw =3D &pf->hw; struct device *dev; @@ -869,24 +870,15 @@ ice_get_eeprom(struct net_device *netdev, struct etht= ool_eeprom *eeprom, if (!buf) return -ENOMEM; =20 - ret =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (ret) { - dev_err(dev, "ice_acquire_nvm failed, err %d aq_err %s\n", - ret, libie_aq_str(hw->adminq.sq_last_status)); - goto out; - } - ret =3D ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf, - false); + false, &read_aq_err); if (ret) { dev_err(dev, "ice_read_flat_nvm failed, err %d aq_err %s\n", - ret, libie_aq_str(hw->adminq.sq_last_status)); - goto release; + ret, libie_aq_str(read_aq_err)); + goto out; } =20 memcpy(bytes, buf, eeprom->len); -release: - ice_release_nvm(hw); out: kfree(buf); return ret; diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/etherne= t/intel/ice/ice_nvm.c index 7e187a804dfa..21f3b615dbbf 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -53,17 +53,27 @@ int ice_aq_read_nvm(struct ice_hw *hw, u16 module_typei= d, u32 offset, * @length: (in) number of bytes to read; (out) number of bytes actually r= ead * @data: buffer to return data in (sized to fit the specified length) * @read_shadow_ram: if true, read from shadow RAM instead of NVM + * @read_aq_err: if non-NULL, receives the AQ error status of the failing = read * * Reads a portion of the NVM, as a flat memory space. This function corre= ctly * breaks read requests across Shadow RAM sectors and ensures that no sing= le * read request exceeds the maximum 4KB read for a single AdminQ command. * + * FW caps the read lock at a maximum of 3000ms, so a read spanning multip= le + * 4KB sectors cannot be done under a single lock without FW reclaiming it + * mid-read. The NVM lock is therefore acquired and released around each AQ + * read, so this function must be called without the lock held. + * + * Since ice_release_nvm() issues an AQ command that overwrites + * hw->adminq.sq_last_status, callers that need the failing read's AQ error + * must use @read_aq_err rather than inspecting sq_last_status afterwards. + * * Returns a status code on failure. Note that the data pointer may be * partially updated if some reads succeed before a failure. */ int ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, - bool read_shadow_ram) + bool read_shadow_ram, enum libie_aq_err *read_aq_err) { u32 inlen =3D *length; u32 bytes_read =3D 0; @@ -92,12 +102,30 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *= length, u8 *data, =20 last_cmd =3D !(bytes_read + read_size < inlen); =20 + status =3D ice_acquire_nvm(hw, ICE_RES_READ); + if (status) { + ice_debug(hw, ICE_DBG_NVM, "Failed to acquire NVM lock, err %d aq_err %= s\n", + status, libie_aq_str(hw->adminq.sq_last_status)); + break; + } + status =3D ice_aq_read_nvm(hw, ICE_AQC_NVM_START_POINT, offset, read_size, data + bytes_read, last_cmd, read_shadow_ram, NULL); - if (status) + if (status) { + /* Capture the read's AQ error before ice_release_nvm() + * issues its own AQ command and overwrites + * sq_last_status. + */ + if (read_aq_err) + *read_aq_err =3D hw->adminq.sq_last_status; + + ice_release_nvm(hw); break; + } + + ice_release_nvm(hw); =20 bytes_read +=3D read_size; offset +=3D read_size; @@ -177,14 +205,19 @@ int ice_aq_erase_nvm(struct ice_hw *hw, u16 module_ty= peid, struct ice_sq_cd *cd) } =20 /** - * ice_read_sr_word_aq - Reads Shadow RAM via AQ + * ice_read_sr_word - Reads Shadow RAM word * @hw: pointer to the HW structure * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF) * @data: word read from the Shadow RAM * * Reads one 16 bit word from the Shadow RAM using ice_read_flat_nvm. + * + * The NVM lock is acquired and released internally by ice_read_flat_nvm() + * around the FW read, so this function must be called without the lock he= ld. + * + * Return: zero on success, or a negative error code on failure. */ -static int ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data) +int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data) { u32 bytes =3D sizeof(u16); __le16 data_local; @@ -194,7 +227,7 @@ static int ice_read_sr_word_aq(struct ice_hw *hw, u16 o= ffset, u16 *data) * Shadow RAM sector restrictions necessary when reading from the NVM. */ status =3D ice_read_flat_nvm(hw, offset * sizeof(u16), &bytes, - (__force u8 *)&data_local, true); + (__force u8 *)&data_local, true, NULL); if (status) return status; =20 @@ -330,13 +363,8 @@ ice_read_flash_module(struct ice_hw *hw, enum ice_bank= _select bank, u16 module, return -EINVAL; } =20 - status =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (status) - return status; - - status =3D ice_read_flat_nvm(hw, start + offset, &length, data, false); - - ice_release_nvm(hw); + status =3D ice_read_flat_nvm(hw, start + offset, &length, data, false, + NULL); =20 return status; } @@ -418,27 +446,6 @@ ice_read_netlist_module(struct ice_hw *hw, enum ice_ba= nk_select bank, u32 offset return status; } =20 -/** - * ice_read_sr_word - Reads Shadow RAM word and acquire NVM if necessary - * @hw: pointer to the HW structure - * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF) - * @data: word read from the Shadow RAM - * - * Reads one 16 bit word from the Shadow RAM using the ice_read_sr_word_aq. - */ -int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data) -{ - int status; - - status =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (!status) { - status =3D ice_read_sr_word_aq(hw, offset, data); - ice_release_nvm(hw); - } - - return status; -} - /** * ice_get_pfa_module_tlv - Reads sub module TLV from NVM PFA * @hw: pointer to hardware structure @@ -856,20 +863,18 @@ int ice_get_inactive_netlist_ver(struct ice_hw *hw, s= truct ice_netlist_info *net static int ice_discover_flash_size(struct ice_hw *hw) { u32 min_size =3D 0, max_size =3D ICE_AQC_NVM_MAX_OFFSET + 1; - int status; - - status =3D ice_acquire_nvm(hw, ICE_RES_READ); - if (status) - return status; + int status =3D 0; =20 while ((max_size - min_size) > 1) { + enum libie_aq_err read_aq_err =3D LIBIE_AQ_RC_OK; u32 offset =3D (max_size + min_size) / 2; u32 len =3D 1; u8 data; =20 - status =3D ice_read_flat_nvm(hw, offset, &len, &data, false); + status =3D ice_read_flat_nvm(hw, offset, &len, &data, false, + &read_aq_err); if (status =3D=3D -EIO && - hw->adminq.sq_last_status =3D=3D LIBIE_AQ_RC_EINVAL) { + read_aq_err =3D=3D LIBIE_AQ_RC_EINVAL) { ice_debug(hw, ICE_DBG_NVM, "%s: New upper bound of %u bytes\n", __func__, offset); status =3D 0; @@ -880,7 +885,7 @@ static int ice_discover_flash_size(struct ice_hw *hw) min_size =3D offset; } else { /* an unexpected error occurred */ - goto err_read_flat_nvm; + return status; } } =20 @@ -888,9 +893,6 @@ static int ice_discover_flash_size(struct ice_hw *hw) =20 hw->flash.flash_size =3D max_size; =20 -err_read_flat_nvm: - ice_release_nvm(hw); - return status; } =20 diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.h b/drivers/net/etherne= t/intel/ice/ice_nvm.h index 63cdc6bdac58..e1d1a11f5ca4 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.h +++ b/drivers/net/ethernet/intel/ice/ice_nvm.h @@ -19,7 +19,7 @@ int ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid,= u32 offset, bool read_shadow_ram, struct ice_sq_cd *cd); int ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, - bool read_shadow_ram); + bool read_shadow_ram, enum libie_aq_err *read_aq_err); int ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv, u16 *module_tlv= _len, u16 module_type); --=20 2.34.1