From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058329; b=JtSNO6gqdtsZUaWu5rxnNXr/Kg4cOEgooWMJRorJjLNdChwd0g1Sl8poQ5chQlASSplO XDQJJySO8NP6qgCZGm3EJJwijciPSGOnNBmWGguoNStj/4/lom5DbMD9PXD1oUMEHnx3U 14iyoE+cI9d/TO5H2Jo0xFvdQbWgQUxu0qTA/nftgee/pevrX7gyoeNkBBjDOfn6kP2mX k+Xn37C+7D/PpJ4oe+MeKlry4UfL43BuWv8QHfma8iz7Gnwna7E63evRzmSY8ZYB5gxjY bcmUfUfJJFNW9RmlGibZbJWW8NZehPykbp3DvcgHjTSFlez9ZTx4ZpoSH4TIFfaUAWQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058329; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=vddHVhX9uUwlbwXe5l6dapsYnsX8h/Blj8xL+Yg6Y0c=; b=zw8duLPzXJZUIhyzcJIJrxWAbptLW6CLXwuUCcPvbPmbHTsUgOBbkB3IeJGIHs4ZAt6Z Xs8lkGa22mgI+PTOPQok2eWDxBdbY3RwLt5RgCVJOtAsmS4xKsd8d5/QQd92bIPAlGG4m xOmjE/0REySy0TGgEwBZb1Rh1f9qG1RNgO/fHa4cN3z51qzcGQtpQnYsuXTI+KLXZkJlx PeaDW0SC0BlfxRbqIgJ2oGfDW0t/B4AWH58LOC61JDUh+XKnix/XJ3Ssqcr59G/xkIiyr TsWmN5r1y07y7FEN+UY59jxPDKLdexZZFvGf44lQg8Cpbd8yWgZCMh6amfOAn0LWmYw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iWkyUMnJ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D910606A326; Thu, 19 Nov 2026 03:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iWkyUMnJ Received: by smtp.kernel.org (Postfix) with ESMTPSA id A82C61F000C4; Thu, 19 Nov 2026 03:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058329; bh=vddHVhX9uUwlbwXe5l6dapsYnsX8h/Blj8xL+Yg6Y0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iWkyUMnJbohXTE2uZm5tpb8jWnr7pkOPTOM6jdZ76AZBdWwPo/tgbu5LSIyAYYURQ rZRPnuHPrwCH/072WKAEg2YpJX9IqNucEhl4PPXjsw++S1oaGDRIXuWEmCYhRFRa34 tp/ThzDYaGdTL+hWxzcObJydIFjTWBBFLWntYBCM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Damien Le Moal , Niklas Cassel , Sasha Levin Subject: [PATCH 5.10 0395/1848] ata: ahci_st: Do not ignore errors when getting the reset controls Date: Wed, 18 Nov 2026 15:40:33 +0100 Message-ID: <20261118145930.352700346@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Niklas Cassel [ Upstream commit c74ee9230a8d1d2f6fcbceff55f56f7dd9b9cccd ] st_ahci_probe_resets() treats any error from devm_reset_control_get() as "reset control not defined" and continues with a NULL reset control: drv_data->pwr = devm_reset_control_get(dev, "pwr-dwn"); if (IS_ERR(drv_data->pwr)) { dev_info(dev, "power reset control not defined\n"); drv_data->pwr = NULL; } This also swallows -EPROBE_DEFER, which is returned when the reset controller providing the reset has not been probed yet. probe() then continues as if the device tree did not specify any reset, so the resets of the SATA IP are never deasserted, and st_ahci_configure_oob() and ahci_platform_init_host() access the MMIO of an IP which is still held in reset and powered down, which can result in an external abort. The resets are optional in the binding, as they are not part of its required properties, so use devm_reset_control_get_optional(), which returns NULL if the reset is not specified in the device tree, and propagate all other errors. Note that an absent reset is now indicated by a NULL reset control instead of an error, so the "reset control not defined" messages are dropped. Fixes: 76884cb2f7da ("ahci: st: Add support for ST's SATA IP") Cc: stable@vger.kernel.org Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20260915084127.692494-9-cassel@kernel.org Signed-off-by: Niklas Cassel Signed-off-by: Sasha Levin --- drivers/ata/ahci_st.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index c268264c2129c..98ec746d4a2ca 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -105,23 +105,20 @@ static int st_ahci_probe_resets(struct ahci_host_priv *hpriv, { struct st_ahci_drv_data *drv_data = hpriv->plat_data; - drv_data->pwr = devm_reset_control_get(dev, "pwr-dwn"); - if (IS_ERR(drv_data->pwr)) { - dev_info(dev, "power reset control not defined\n"); - drv_data->pwr = NULL; - } - - drv_data->sw_rst = devm_reset_control_get(dev, "sw-rst"); - if (IS_ERR(drv_data->sw_rst)) { - dev_info(dev, "soft reset control not defined\n"); - drv_data->sw_rst = NULL; - } - - drv_data->pwr_rst = devm_reset_control_get(dev, "pwr-rst"); - if (IS_ERR(drv_data->pwr_rst)) { - dev_dbg(dev, "power soft reset control not defined\n"); - drv_data->pwr_rst = NULL; - } + drv_data->pwr = devm_reset_control_get_optional(dev, "pwr-dwn"); + if (IS_ERR(drv_data->pwr)) + return dev_err_probe(dev, PTR_ERR(drv_data->pwr), + "failed to get pwr-dwn reset\n"); + + drv_data->sw_rst = devm_reset_control_get_optional(dev, "sw-rst"); + if (IS_ERR(drv_data->sw_rst)) + return dev_err_probe(dev, PTR_ERR(drv_data->sw_rst), + "failed to get sw-rst reset\n"); + + drv_data->pwr_rst = devm_reset_control_get_optional(dev, "pwr-rst"); + if (IS_ERR(drv_data->pwr_rst)) + return dev_err_probe(dev, PTR_ERR(drv_data->pwr_rst), + "failed to get pwr-rst reset\n"); return st_ahci_deassert_resets(hpriv, dev); } -- 2.53.0