From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 BDE723E3175 for ; Fri, 3 Jul 2026 10:33:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783074828; cv=none; b=cAgVog9U8S1BE22XInykPV+M/oAwOqxRcBdiEMhbxptadvpUd7LfDUKXZk5rJeirwLyZtFiNsjKweDZNiLJ01sB7A6dCapexeRdJvXNJEyeB9ekYQEO4DKZJhfGDqb2ZFzmmUx0pJov4tX+quBdY2KRGyKv7Mp3BfFb+ss3e4TE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783074828; c=relaxed/simple; bh=5walwYgdz+FXyJFC5ZFyjYw3FJMGXz4pT6iGuhHKpyk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=VH3wEgDicSV2cH2aSjHfngdF2Y/zm+V73uauiesuBfnlTVP4c3UR/iM5J63fcQ+uAIRoYOfIOecdyWCWL1WWOuAS2RmzrJtzybwYNeWRVV5ic9r8RofzQujzuymEpdTWYDkc1VM5NnhLO29MVCvo0nL2jkI/kFzUC63oH0Tti7E= 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=Adr3wxXs; arc=none smtp.client-ip=185.125.188.123 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="Adr3wxXs" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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-1.canonical.com (Postfix) with ESMTPS id 54F223F978 for ; Fri, 3 Jul 2026 10:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1783074817; bh=baVj67qvtniy6b+eW//3NKKeNSe13i7J3dl8qPlTepA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Adr3wxXsfddLoio5iQhdR47jCXRJeV0zflnES7w9SkqH3r9R+DoJ4YTyYqXQW0bfT RwRDjIRAedd+hPbphkO/ahdLNtIAB1L331LrzHxKnio5QkyYoqdHFVkFPA/ZCqP+QE 9MR6RfRmkrVoV9AulesVCvVfeIkazxHll5Q4NOSDaLQ4WHrE+VX+IPpelL/TSSvq8m A//C9ZbK9HM/dZkxUnd68qjzKVhAxxrdrpKkJxuRsptrpHQxsgcpgGwyRZWLDUtesY n58QHYMJjQ2vC96xvoy6GjrZciwevWluSfWhAPQqJHwuQUrsuUuDI5rrs1nq2iYZqV gKVoqam3lHUaQeUSv27IFoumtdQ9OX4cTB5bLvfL7MdPCDyF89tbCZwR76x/yb4DN4 hQji+tfLHOKEuW2KgmPIMcW1jVc6JYewWPH3pYtQTfAihuEjCW7m1YtWwECnc31R3V wYGZggyhJNmqIsmMONny6wTTl8vI++X742Aoaaz6UEwpLuD8JIEXPVtNQ2YgH3avW8 mfnfqnikUIcrW82ecOMftJGM3vXjKeBOEKAGTFTd4sjYWOa1u7b8uPNyZsCQMadNnF XMyogMWbPVpED2PwhIz8YOpWjQVSFYQEhujyaQpu7nxswMOPSnYU99eN8mkgiW1pvQ +mqhjAvGU4AX2yZ8+0z3t5zU= Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-476d52b13d7so366282f8f.0 for ; Fri, 03 Jul 2026 03:33:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783074817; x=1783679617; 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=baVj67qvtniy6b+eW//3NKKeNSe13i7J3dl8qPlTepA=; b=jzko5OY5OcvT3Z21V7yCx+VHa4sdAqTvFgXhrimlW5rfF1XXJgl9IWmg1m2GHl31dQ 9DC0/Ovkr2aA05Ej9FrjHZcL/g6VkTGifvy90iTEDfZcRan5QWwJ3RIAa0kj9n58rQOl SQotE+ShBsg13v4wIecYZ6RsLg/45iMAL7oCder/c7WJ64vSLN7MpilAwyo1uRGvYYA+ 4SAy8MKeo1KVa5sCxWBb89CEkTKs1SxWO9BXXtUAwVlg+UguMeHYmguOfwta+AFnc/fn hLASHG2NFW5BQAhhM4AXGbUIoLHa9l5qvQ81cykmjDLjOj5+DxV9C6R7MTH3GOH01u0k M3Iw== X-Forwarded-Encrypted: i=1; AHgh+RoCk/7Oy2OFRyCghPdppyVPHJcXdg4n1WJ3iaLg84ea/KkgHGA/J2cXbmbzrf+LeQfW3ZfaHUx8GScqcZ4=@vger.kernel.org X-Gm-Message-State: AOJu0YzzMSXGxEifr+xNMp6CHDT9in0+6r3bhsgkFZyJk2n6FVFJV7bg iif1SDfs/i6/6Q8XynNepChAWRt8IMkuEK6luEYx8lZLFsXswZw3J0ropELa5XCPx7onenbnmG4 06PLGSCL9oFsF6xXcpZhmsxO0/B+trm7g5WQf428pbmMDko0gOJ9PYLa6uEzyuwwauhBRySFW7c 1mTbhXFg== X-Gm-Gg: AfdE7clObTPHVS0CiBKUybLUyzBIAYHmXonQ57Po3GVXoQYwCFUoPG0Quclw7yK0Nhm JWDpLLm//jzJheXUkWsNS2juvLKakj4jNRX2fZfATR8xbvzKii7Lf2JRnR5UC1pQivICgzdV4r5 a64aTKzNmvdR4lrw9irYch/rYJBhBS9WIQwmtGPCd8z44kE9k2k/wh+jwSYkFK2chu71ET1XLlr Ttat+ykbmzNQHNCrudBurlJCau8Ft+Durx3lMoZ2B6qXHc9+CL2qIo8TTejM6KPqx+dfguVW7a2 vh8E1PMvtE5sKKGMs5o9b+rEEPNVaDJkTUVnw7JUEWAXjoSkpS8zyBK7X/3QONRJJE/Y+yqjc6L G3yCGNv6Ncrk70gxGe8+PuqPix+xm+bGUWrndDwHB2oom03M5P2fx+fwy X-Received: by 2002:a5d:4488:0:b0:461:cd9e:2368 with SMTP id ffacd0b85a97d-477afbcc1cbmr10672790f8f.27.1783074816720; Fri, 03 Jul 2026 03:33:36 -0700 (PDT) X-Received: by 2002:a5d:4488:0:b0:461:cd9e:2368 with SMTP id ffacd0b85a97d-477afbcc1cbmr10672768f8f.27.1783074816185; Fri, 03 Jul 2026 03:33:36 -0700 (PDT) Received: from localhost.localdomain (77-236-28-43.static.play.pl. [77.236.28.43]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbb79sm16482623f8f.2.2026.07.03.03.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 03:33:35 -0700 (PDT) From: Robert Malz To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexander Lobakin , Jacob Keller , Jesse Brandeburg Cc: Robert Malz , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl] ice: acquire NVM lock around each flash read Date: Fri, 3 Jul 2026 12:32:44 +0200 Message-Id: <20260703103245.374800-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: 8bit 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 would overwrite sq_last_status, so the read's AQ error is preserved across the release for callers such as ice_discover_flash_size() that inspect it. 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 per-block locking in ice_devlink_nvm_snapshot() is now redundant and dropped. Fixes: e94509906d6b ("ice: create function to read a section of the NVM and Shadow RAM") Signed-off-by: Robert Malz --- .../net/ethernet/intel/ice/devlink/devlink.c | 21 ------- drivers/net/ethernet/intel/ice/ice_ethtool.c | 11 +--- drivers/net/ethernet/intel/ice/ice_nvm.c | 58 ++++++++++--------- 3 files changed, 32 insertions(+), 58 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c index 22b7d8e6bd9e..7c7fe3d2e9d9 100644 --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c @@ -1891,26 +1891,15 @@ static int ice_devlink_nvm_snapshot(struct devlink *devlink, for (i = 0; i < num_blks; i++) { u32 read_sz = min_t(u32, ICE_DEVLINK_READ_BLK_SIZE, left); - status = 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; - } - status = ice_read_flat_nvm(hw, i * ICE_DEVLINK_READ_BLK_SIZE, &read_sz, tmp, read_shadow_ram); if (status) { dev_dbg(dev, "ice_read_flat_nvm failed after reading %u bytes, err %d aq_err %d\n", read_sz, status, hw->adminq.sq_last_status); NL_SET_ERR_MSG_MOD(extack, "Failed to read NVM contents"); - ice_release_nvm(hw); vfree(nvm_data); return -EIO; } - ice_release_nvm(hw); tmp += read_sz; left -= read_sz; @@ -1966,24 +1955,14 @@ static int ice_devlink_nvm_read(struct devlink *devlink, return -ERANGE; } - status = 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 = ice_read_flat_nvm(hw, (u32)offset, &size, data, read_shadow_ram); 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); NL_SET_ERR_MSG_MOD(extack, "Failed to read NVM contents"); - ice_release_nvm(hw); return -EIO; } - ice_release_nvm(hw); return 0; } diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index 49371b065845..ddeca39d822b 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -869,24 +869,15 @@ ice_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom, if (!buf) return -ENOMEM; - ret = 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 = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf, false); 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; + goto out; } 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/ethernet/intel/ice/ice_nvm.c index 7e187a804dfa..cb1541844242 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -58,6 +58,11 @@ int ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, * breaks read requests across Shadow RAM sectors and ensures that no single * 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 multiple + * 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. + * * Returns a status code on failure. Note that the data pointer may be * partially updated if some reads succeed before a failure. */ @@ -65,6 +70,7 @@ int ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, bool read_shadow_ram) { + enum libie_aq_err aq_err; u32 inlen = *length; u32 bytes_read = 0; bool last_cmd; @@ -92,12 +98,28 @@ ice_read_flat_nvm(struct ice_hw *hw, u32 offset, u32 *length, u8 *data, last_cmd = !(bytes_read + read_size < inlen); + status = ice_acquire_nvm(hw, ICE_RES_READ); + if (status) + break; + status = 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) { + /* ice_release_nvm() issues an AQ command that would + * overwrite sq_last_status, which some callers + * inspect after a failed read. Preserve the read's + * AQ error across the release. + */ + aq_err = hw->adminq.sq_last_status; + + ice_release_nvm(hw); + hw->adminq.sq_last_status = aq_err; break; + } + + ice_release_nvm(hw); bytes_read += read_size; offset += read_size; @@ -330,14 +352,8 @@ ice_read_flash_module(struct ice_hw *hw, enum ice_bank_select bank, u16 module, return -EINVAL; } - status = ice_acquire_nvm(hw, ICE_RES_READ); - if (status) - return status; - status = ice_read_flat_nvm(hw, start + offset, &length, data, false); - ice_release_nvm(hw); - return status; } @@ -419,24 +435,19 @@ ice_read_netlist_module(struct ice_hw *hw, enum ice_bank_select bank, u32 offset } /** - * ice_read_sr_word - Reads Shadow RAM word and acquire NVM if necessary + * 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 the ice_read_sr_word_aq. + * Reads one 16 bit word from the Shadow RAM using ice_read_sr_word_aq. + * + * 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 held. */ int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data) { - int status; - - status = ice_acquire_nvm(hw, ICE_RES_READ); - if (!status) { - status = ice_read_sr_word_aq(hw, offset, data); - ice_release_nvm(hw); - } - - return status; + return ice_read_sr_word_aq(hw, offset, data); } /** @@ -856,11 +867,7 @@ int ice_get_inactive_netlist_ver(struct ice_hw *hw, struct ice_netlist_info *net static int ice_discover_flash_size(struct ice_hw *hw) { u32 min_size = 0, max_size = ICE_AQC_NVM_MAX_OFFSET + 1; - int status; - - status = ice_acquire_nvm(hw, ICE_RES_READ); - if (status) - return status; + int status = 0; while ((max_size - min_size) > 1) { u32 offset = (max_size + min_size) / 2; @@ -880,7 +887,7 @@ static int ice_discover_flash_size(struct ice_hw *hw) min_size = offset; } else { /* an unexpected error occurred */ - goto err_read_flat_nvm; + return status; } } @@ -888,9 +895,6 @@ static int ice_discover_flash_size(struct ice_hw *hw) hw->flash.flash_size = max_size; -err_read_flat_nvm: - ice_release_nvm(hw); - return status; } -- 2.34.1