From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 5DB9A484249; Tue, 1 Sep 2026 15:39:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788277191; cv=none; b=CxBLAgVXcpRApCJVFAwsd6uDEJre82yeNJ0ybzKEx7ISIu7Q13Vc4bRgdxObIzQGizgaXVXO2bnNl6uwu8YZX9P6yQwAH3DmVmchg7OHeW6Kk6mk9+5C1HS5M9D/3w/NBvjhIPM7YGvAKiS6clpPVuaWgJ+z7sN0cWhayyvX/vQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788277191; c=relaxed/simple; bh=emEbNvdBl1E3H/RNGiPDstnLoCgYWla1A/TJpHNBiNU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S4uN/vQHJU3agzyDLOD3Lzr99udR7LP82zfqkPlUEEZkb1eniOW78EMyjFRofRVYn+vBp8+UTs84oI09kJeYESs2fzuts2YGiTuGzNtUh0UuE4QXHZZ7iymyI3RyGoDHbuYvAtRJoQAdioatSKLMqBvkhQXFW0ZgN7Ub2F+w5tA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=M84DpsKN; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="M84DpsKN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788277187; bh=emEbNvdBl1E3H/RNGiPDstnLoCgYWla1A/TJpHNBiNU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=M84DpsKNz/q2OAd//30fkQ1nd1PUVie5rbUzkD0BnC+YlksL6vFMIwfEJ+EqGhDgn DUoGZQIxeAamkcGWpRByuXBBWKYRp63XSGFC9534vjSKnAxd+qpBj784Pp9eeKKhE7 6IQfI4TEyBeehC64ksHpktTwe++GYNFNOWpBUfx1EzzlNYr+/+EFNeT5eq8yop5IiL XC8Q4iYShTFHvlcJlEnLVGmKZkW6TWOOC3mMS5JOk+5mtlyLCPWCD8YoEAWGdcp3pB TvGZrr9T/GBSQwOu5LIaF8vEm+uIDXgyPCt6L5l92PcmKLNrAQ6B0GmYEEni3/cDdF r6r7XIm3HJweA== Received: from yukiji.home (unknown [100.64.0.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laeyraud) by bali.collaboradmins.com (Postfix) with ESMTPSA id E3BE117E0934; Tue, 01 Sep 2026 17:39:46 +0200 (CEST) From: Louis-Alexis Eyraud Date: Tue, 01 Sep 2026 17:39:09 +0200 Subject: [PATCH v11 21/24] scsi: ufs: mediatek: Back up idle timer in per-instance struct Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260901-mt8196-ufs-v11-21-dbd007704490@collabora.com> References: <20260901-mt8196-ufs-v11-0-dbd007704490@collabora.com> In-Reply-To: <20260901-mt8196-ufs-v11-0-dbd007704490@collabora.com> To: Chunfeng Yun , Vinod Koul , Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Peter Wang , Chaotian Jing , Alim Akhtar , Avri Altman , Bart Van Assche , Stanley Jhu , "James E.J. Bottomley" , Philipp Zabel , Liam Girdwood , Mark Brown , Manivannan Sadhasivam , "Martin K. Petersen" , "Martin K. Petersen" Cc: kernel@collabora.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Nicolas Frattaroli , Louis-Alexis Eyraud X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788277164; l=2715; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=aZNBLFc/7tbL8IzEarNOW8Y//xzBBLw1ML7qZwoSkYc=; b=jKso1yipqlBDtVOx0ULFaDCpYCD4UkUirAHqJofI74zujRvEBqV0V7UN0FDlsBK4BZ/78xBCk ni2gyuT/nrtBl6P17z8nrte+JLGPO4iQDP55V2D3Ibn+qB2mfzNjZku X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= From: Nicolas Frattaroli The MediaTek UFS driver uses a function-scope static variable to back up a hardware register across a power change in the ufs_mtk_pwr_change_notify function. This is dangerous, as it's only correct if only ever one instance of the driver is loaded, which isn't true if there's more than one device on a SoC that needs it, or it otherwise gets loaded a second time. Back it up into a member of the host struct instead, as this struct is per-instance. Rework the function to not use a pointless "ret" local as well. Fixes: f5ca8d0c7a63 ("scsi: ufs: host: mediatek: Disable auto-hibern8 during power mode changes") Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Nicolas Frattaroli Reviewed-by: Chaotian Jing Signed-off-by: Louis-Alexis Eyraud --- drivers/ufs/host/ufs-mediatek.c | 19 ++++++++----------- drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index f405f511f41f..4782fdf54866 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1441,27 +1441,24 @@ static int ufs_mtk_pwr_change_notify(struct ufs_hba *hba, enum ufs_notify_change_status stage, struct ufs_pa_layer_attr *dev_req_params) { - int ret = 0; - static u32 reg; + struct ufs_mtk_host *host = ufshcd_get_variant(hba); switch (stage) { case PRE_CHANGE: if (ufshcd_is_auto_hibern8_supported(hba)) { - reg = ufshcd_readl(hba, REG_AUTO_HIBERNATE_IDLE_TIMER); + host->ahit = ufshcd_readl( + hba, REG_AUTO_HIBERNATE_IDLE_TIMER); ufs_mtk_auto_hibern8_disable(hba); } - ret = ufs_mtk_pre_pwr_change(hba, dev_req_params); - break; + return ufs_mtk_pre_pwr_change(hba, dev_req_params); case POST_CHANGE: if (ufshcd_is_auto_hibern8_supported(hba)) - ufshcd_writel(hba, reg, REG_AUTO_HIBERNATE_IDLE_TIMER); - break; - default: - ret = -EINVAL; - break; + ufshcd_writel(hba, host->ahit, + REG_AUTO_HIBERNATE_IDLE_TIMER); + return 0; } - return ret; + return -EINVAL; } static int ufs_mtk_unipro_set_lpm(struct ufs_hba *hba, bool lpm) diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h index 6b81c8f76201..1fa14a83e8cd 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -188,6 +188,7 @@ struct ufs_mtk_host { u16 ref_clk_gating_wait_us; u32 ip_ver; bool legacy_ip_ver; + u32 ahit; bool mcq_set_intr; bool is_mcq_intr_enabled; -- 2.55.0