From nobody Mon Feb 9 19:04:48 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 5EB543B8BAB; Thu, 8 Jan 2026 10:52:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767869570; cv=pass; b=cvVMeIl+E6sTSEXoy7tS/Rp91tEwCgNZba3Mfuibp9DZnqAru4Whe9V878moX59Yf91M6X342AYjRaxjshA8XHfScXa4zByqWWtoBbgPOzB5MtWw9/gCgsIZuWn+tQw5cj+jTEuDrRbeMffBRNvObNdC3O+juhZUuO6v+sbmuz4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767869570; c=relaxed/simple; bh=ADDIXt09yqegDXFacn3Jte4aQPPiDQtClT7AhZQMkho=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ajb129lpkDDIIFZhcbU2uAIifvSZMvWXvLY1gJuYk9G7D1F9rIj+1cJ89WqeG/Xrarm6m3gIJ6zSrXPRRlQzrZZa1qyoHWHov1Dz2q22ZLYn3VjBIrEJK5atH3IOjIm+mSmfcjOdrBxIigZPPlbRjJLdQdB+vcMPHqmKObuouPk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=koZBo/bq; arc=pass smtp.client-ip=136.143.188.112 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 (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="koZBo/bq" ARC-Seal: i=1; a=rsa-sha256; t=1767869531; cv=none; d=zohomail.com; s=zohoarc; b=XN1eXPshnW4NHI2LlZN5ypia+4Sacq9/O2hkwYGDYVR/+c35HA01Lh2R4YPb/mT4MmNlLDmR/AFN7Uni+4JRTC+AgXCbUbJxxTCWW/m87gYLqIAWwhEcvVSyQ7Uek866fUlRTrctcMC2Utl3X1DPaWpHpem/+vn/I9cDxzqwphc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767869531; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=H+C+FMF5vbv2XWKxgnFrTmjORSNwgaOrPo2kBB0dXs8=; b=fUjxU+58kmRxFpEpoqqSteKEIUoRA+T/VCwgD/pce+dep6N9ZD8B9Q981PrV99eOgG+d4AA5dlMzmf9TiNzg6Keky3jgUleMiotQNZkzDiZSK6QRbFib8pX1v49jcexFVAydZ3MFHs0eldoLS954IB/vzkdnuXXBunpwFEALB60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1767869531; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=H+C+FMF5vbv2XWKxgnFrTmjORSNwgaOrPo2kBB0dXs8=; b=koZBo/bqK6kQ3LQOj1M438myE8aB90irpxquJr58HQH4DTXcPBRWb0ODxvd2h9gX wdZfZ9BJhhjqwhFxEJuEfvnmSNVpIL6iJjg+jgzjiU59y8LD9sf7HCYkKgq1E3ZTxmy Ba6ojwNMncUgrxwIHIS1qK3iqKjWd2CwKta85sZg= Received: by mx.zohomail.com with SMTPS id 1767869529991481.93318396021266; Thu, 8 Jan 2026 02:52:09 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 08 Jan 2026 11:49:41 +0100 Subject: [PATCH v5 22/24] scsi: ufs: mediatek: Back up idle timer in per-instance struct Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260108-mt8196-ufs-v5-22-49215157ec41@collabora.com> References: <20260108-mt8196-ufs-v5-0-49215157ec41@collabora.com> In-Reply-To: <20260108-mt8196-ufs-v5-0-49215157ec41@collabora.com> To: Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Peter Wang , Stanley Jhu , "James E.J. Bottomley" , "Martin K. Petersen" , Philipp Zabel , Liam Girdwood , Mark Brown , Chaotian Jing , Neil Armstrong Cc: Louis-Alexis Eyraud , kernel@collabora.com, linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 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 durin= g power mode changes") Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Nicolas Frattaroli --- drivers/ufs/host/ufs-mediatek.c | 20 ++++++++------------ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediate= k.c index fbfa23abbb87..5cddbdb1db40 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1398,28 +1398,24 @@ static int ufs_mtk_pwr_change_notify(struct ufs_hba= *hba, const struct ufs_pa_layer_attr *dev_max_params, struct ufs_pa_layer_attr *dev_req_params) { - int ret =3D 0; - static u32 reg; + struct ufs_mtk_host *host =3D ufshcd_get_variant(hba); =20 switch (stage) { case PRE_CHANGE: if (ufshcd_is_auto_hibern8_supported(hba)) { - reg =3D ufshcd_readl(hba, REG_AUTO_HIBERNATE_IDLE_TIMER); + host->hibernate_idle_timer =3D ufshcd_readl( + hba, REG_AUTO_HIBERNATE_IDLE_TIMER); ufs_mtk_auto_hibern8_disable(hba); } - ret =3D ufs_mtk_pre_pwr_change(hba, dev_max_params, - dev_req_params); - break; + return ufs_mtk_pre_pwr_change(hba, dev_max_params, 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 =3D -EINVAL; - break; + ufshcd_writel(hba, host->hibernate_idle_timer, + REG_AUTO_HIBERNATE_IDLE_TIMER); + return 0; } =20 - return ret; + return -EINVAL; } =20 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-mediate= k.h index fa27ab4d6d6c..e5a3f70e7024 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -187,6 +187,7 @@ struct ufs_mtk_host { u16 ref_clk_gating_wait_us; u32 ip_ver; bool legacy_ip_ver; + u32 hibernate_idle_timer; =20 bool mcq_set_intr; bool is_mcq_intr_enabled; --=20 2.52.0