From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DEEAF2367D5; Tue, 16 Dec 2025 12:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765888407; cv=none; b=FQ35oXRf14KU74hViiRTvtT2ApG44AHgVuJzzIml+zo9+M+1YyfmBiTi6G1ysH8EySSQmbZUbGqCXbEhVB9e88RrGdQiFyRRmUUucYlG1QMQ9Kb/iU26v/1Gc7HELAyOtGSFvWueAYgwZaP7FBVW8X0NxC3XpOQ651ohs50/270= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765888407; c=relaxed/simple; bh=BmKYnkQGGYe1q64FVBR1Rxx1p9ZMVUqGyYHUOjlvN8E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pKFufJOTJhGaZur761fRSIqWukpD34Kpz3D7PwCN+tvBjBEDmL3iMfoO4utgImg+XfU/nQRXiRIleRzk5L1txeSBc0NMyIjw6O1Rwk1Jtoyqg51eDhpELWeeBM7TQJRqBg1hdB3nO9oHJygxODyNGFCdzDU5iMZlvct+SUPESaQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eql+BfnS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eql+BfnS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C4AFC4CEF1; Tue, 16 Dec 2025 12:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765888406; bh=BmKYnkQGGYe1q64FVBR1Rxx1p9ZMVUqGyYHUOjlvN8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eql+BfnSIQZnNWqYixWhmRhWz/6u6MEyYhUY1wBVeA/z4xdxxQ7u4oExvOusP/aD1 zU0INpATZKnTFZb3YEvqdhBn0GoSVrsbPiP/GyUDuSPbr9JmTgxLfOv4mRgE9vfKYg /HKYniySkjen49/Ppd8u7Ed9ibivvEMA03fk4xmw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Robert Marko , "Russell King (Oracle)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 492/614] net: phy: aquantia: check for NVMEM deferral Date: Tue, 16 Dec 2025 12:14:19 +0100 Message-ID: <20251216111419.197792825@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robert Marko [ Upstream commit a6c121a2432eee2c4ebceb1483ccd4a50a52983d ] Currently, if NVMEM provider is probed later than Aquantia, loading the firmware will fail with -EINVAL. To fix this, simply check for -EPROBE_DEFER when NVMEM is attempted and return it. Fixes: e93984ebc1c8 ("net: phy: aquantia: add firmware load support") Signed-off-by: Robert Marko Reviewed-by: Russell King (Oracle) Link: https://patch.msgid.link/20251127114514.460924-1-robimarko@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/aquantia/aquantia_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c index bbbcc9736b00e..569256152689f 100644 --- a/drivers/net/phy/aquantia/aquantia_firmware.c +++ b/drivers/net/phy/aquantia/aquantia_firmware.c @@ -369,7 +369,7 @@ int aqr_firmware_load(struct phy_device *phydev) * assume that, and load a new image. */ ret = aqr_firmware_load_nvmem(phydev); - if (!ret) + if (ret == -EPROBE_DEFER || !ret) return ret; ret = aqr_firmware_load_fs(phydev); -- 2.51.0