From nobody Thu Apr 9 14:59:15 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 EF5EE28FFF6; Sun, 8 Mar 2026 15:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772982887; cv=none; b=AL40sGsWlt3JcXnML8Ry5c4fBiHFAGmWAGPruznU2YbU2zz/tbT8ADzwjKrdNioAMz3dO8wdIpcvO42nzcn0ZN+rnqAOniaJjmt7zAx7WgTAKeGOh1ZvAe7zMQxBd4O1qDnRJAdrb4TuL2G6dWwvh4U+Qkf3MjaUkHmEVl2EEWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772982887; c=relaxed/simple; bh=T1vQOyC+h+ggvIkYuZVPhVd22DkJjZOIueWZPhwA4uA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lIi6mZKNHJvtYCQv4G2F3l0QawhOP45tOnxixoELr6jKZbFhQvfOU/nw4JvQ2CD+HHpMcBciaQ/YwbktkVLM9mare/UgR/H0p5+Mz3iwuSitHFOgKHXIwtjlZrpf2ZTkowcgzp2LO+0Ss2qXFzicybg3nB+ISWC5NtKu4j20OvE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Vt79dfva; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Vt79dfva" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 628AqeVC1112394; Sun, 8 Mar 2026 15:14:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=JseLfOpXmUG D235N1cDhLKkwdGiFBKKr01lKGTgsewQ=; b=Vt79dfva4xkWWLAWPbyjCJOIUt6 xXzFF9ghs8rjq5CBFx/pmYYtoBnLyhOLKMbArxwWWZj/xla8x8Oxv+3d8uBsv6jY zZNKWRos66T84/rQfjkpoVSGer5LYyGVd/VKsLMjTzbTspyO5qteyvn7sGUn3LZt muJ0rkriHcixeRzcQEpFKhzK1wyQloPB88SWxdjSlLXqliXjsMsd6j1B5xR+QaZ9 gRTwFDLg2EfANv4bdU+ZptEdx2aZotqdMrPlziUhFKtq6Jj3z1+A5E69fpmDscRE 4+j5Hw5djvkGzuoiJo4UadYBTEP2vUbVW0t2QBgDiUmwdW5A3PZWkxFtVuQ== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4crbbg2s7g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Mar 2026 15:14:28 +0000 (GMT) Received: from pps.filterd (NALASPPMTA01.qualcomm.com [127.0.0.1]) by NALASPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTP id 628FERBr026003; Sun, 8 Mar 2026 15:14:27 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA01.qualcomm.com (PPS) with ESMTPS id 4crd3n2ves-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Mar 2026 15:14:27 +0000 Received: from NALASPPMTA01.qualcomm.com (NALASPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 628FEQE9025998; Sun, 8 Mar 2026 15:14:26 GMT Received: from hu-devc-lv-u22-c.qualcomm.com (hu-cang-lv.qualcomm.com [10.81.25.255]) by NALASPPMTA01.qualcomm.com (PPS) with ESMTPS id 628FEQvt025995 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Mar 2026 15:14:26 +0000 Received: by hu-devc-lv-u22-c.qualcomm.com (Postfix, from userid 359480) id 564D75A2; Sun, 8 Mar 2026 08:14:26 -0700 (PDT) From: Can Guo To: avri.altman@wdc.com, bvanassche@acm.org, beanhuo@micron.com, martin.petersen@oracle.com, mani@kernel.org Cc: linux-scsi@vger.kernel.org, Can Guo , Alim Akhtar , "James E.J. Bottomley" , Peter Wang , Adrian Hunter , "Bao D. Nguyen" , Archana Patni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 02/12] scsi: ufs: core: Pass force_pmc to ufshcd_config_pwr_mode() as a parameter Date: Sun, 8 Mar 2026 08:13:59 -0700 Message-Id: <20260308151409.3779137-3-can.guo@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260308151409.3779137-1-can.guo@oss.qualcomm.com> References: <20260308151409.3779137-1-can.guo@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: bAaZV2Q5aMON8Q7Wj5FS4OLf8NTl2Nde X-Proofpoint-ORIG-GUID: bAaZV2Q5aMON8Q7Wj5FS4OLf8NTl2Nde X-Authority-Analysis: v=2.4 cv=SumdKfO0 c=1 sm=1 tr=0 ts=69ad9254 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=N54-gffFAAAA:8 a=EUspDBNiAAAA:8 a=ufAJUjbdAAAA:8 a=WUAhUjOuKNn0ZP5bh2sA:9 a=rB1ygNaI0PWiOa_UD5GD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA4MDE0MCBTYWx0ZWRfX4ZWQRMgPS//5 pmYP9IHzR4YYbzG+oNGUaIHQfRWSLlNE/s+sUEymVILQFu4tKP42LEbqKX6pU3PNatGadsGwUbH AOh3PZk2q+RZgAWLBoqId2CNit2r0S+bzlEXkrueyNTO/ZTgXZ9VUIWZMy/6M0LW04wy/EXsptS 8+qGiVbX+RT0/Ot/S2U0qNBXOUqo7VzGF5hUDOJHfuba1118dRSkCFpIRknnvDdpNINx092Imbe bQ8oBTyjsuWcyVOdeMwjnqSW1iGYTKcCrCLTZwNSD/wk2GqwsYMOHuJh9N9475fKiEz8Au6++3s KBX4PS8rg8neeSRBsiEKyanCeQmyJnN/QFlBtWLpkIjiJ6tdbW1nJzra/y4Wz0kzT7oHUdwpv2q tklk5RE6QRqcAHaehnooH6/88WRo+h6S4lKv8tHCTIJ9D9sxuQ99UPVzodRclf2Du3b9DxUzQQ+ fsE6P9nGDFzjcjLtHEw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-08_04,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603080140 Content-Type: text/plain; charset="utf-8" Currently, callers must manually toggle hba->force_pmc before and after calling ufshcd_config_pwr_mode() to force a Power Mode change. Introduce enum ufshcd_pmc_policy and refactor ufshcd_config_pwr_mode() to accept pmc_policy as a parameter to force a Power Mode change. Reviewed-by: Bart Van Assche Signed-off-by: Can Guo --- drivers/ufs/core/ufshcd.c | 35 ++++++++++++++++++++++------------- drivers/ufs/host/ufshcd-pci.c | 3 ++- include/ufs/ufshcd.h | 19 +++++++++++++++---- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 9ff6c5977f2d..7a7944a6f7d4 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -1407,7 +1407,8 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, u32= target_gear, bool scale_up =20 config_pwr_mode: /* check if the power mode needs to be changed or not? */ - ret =3D ufshcd_config_pwr_mode(hba, &new_pwr_info); + ret =3D ufshcd_config_pwr_mode(hba, &new_pwr_info, + UFSHCD_PMC_POLICY_DONT_FORCE); if (ret) dev_err(hba->dev, "%s: failed err %d, old gear: (tx %d rx %d), new gear:= (tx %d rx %d)", __func__, ret, @@ -4248,7 +4249,8 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr= _sel, pwr_mode_change =3D true; } if (pwr_mode_change) { - ret =3D ufshcd_change_power_mode(hba, &temp_pwr_info); + ret =3D ufshcd_change_power_mode(hba, &temp_pwr_info, + UFSHCD_PMC_POLICY_DONT_FORCE); if (ret) goto out; } @@ -4272,7 +4274,8 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr= _sel, =20 if (peer && (hba->quirks & UFSHCD_QUIRK_DME_PEER_ACCESS_AUTO_MODE) && pwr_mode_change) - ufshcd_change_power_mode(hba, &orig_pwr_info); + ufshcd_change_power_mode(hba, &orig_pwr_info, + UFSHCD_PMC_POLICY_DONT_FORCE); out: return ret; } @@ -4664,6 +4667,7 @@ static int ufshcd_get_max_pwr_mode(struct ufs_hba *hb= a) * ufshcd_dme_change_power_mode() - UniPro DME Power Mode change sequence * @hba: per-adapter instance * @pwr_mode: pointer to the target power mode (gear/lane) attributes + * @pmc_policy: Power Mode change policy * * This function handles the low-level DME (Device Management Entity) * configuration required to transition the UFS link to a new power mode. = It @@ -4679,12 +4683,13 @@ static int ufshcd_get_max_pwr_mode(struct ufs_hba *= hba) * Return: 0 on success, non-zero error code on failure. */ static int ufshcd_dme_change_power_mode(struct ufs_hba *hba, - struct ufs_pa_layer_attr *pwr_mode) + struct ufs_pa_layer_attr *pwr_mode, + enum ufshcd_pmc_policy pmc_policy) { int ret; =20 /* if already configured to the requested pwr_mode */ - if (!hba->force_pmc && + if (pmc_policy =3D=3D UFSHCD_PMC_POLICY_DONT_FORCE && pwr_mode->gear_rx =3D=3D hba->pwr_info.gear_rx && pwr_mode->gear_tx =3D=3D hba->pwr_info.gear_tx && pwr_mode->lane_rx =3D=3D hba->pwr_info.lane_rx && @@ -4767,6 +4772,7 @@ static int ufshcd_dme_change_power_mode(struct ufs_hb= a *hba, * ufshcd_change_power_mode() - Change UFS Link Power Mode * @hba: per-adapter instance * @pwr_mode: pointer to the target power mode (gear/lane) attributes + * @pmc_policy: Power Mode change policy * * This function handles the high-level sequence for changing the UFS link * power mode. It triggers vendor-specific pre-change notification, @@ -4776,13 +4782,14 @@ static int ufshcd_dme_change_power_mode(struct ufs_= hba *hba, * Return: 0 on success, non-zero error code on failure. */ int ufshcd_change_power_mode(struct ufs_hba *hba, - struct ufs_pa_layer_attr *pwr_mode) + struct ufs_pa_layer_attr *pwr_mode, + enum ufshcd_pmc_policy pmc_policy) { int ret; =20 ufshcd_vops_pwr_change_notify(hba, PRE_CHANGE, pwr_mode); =20 - ret =3D ufshcd_dme_change_power_mode(hba, pwr_mode); + ret =3D ufshcd_dme_change_power_mode(hba, pwr_mode, pmc_policy); =20 if (!ret) ufshcd_vops_pwr_change_notify(hba, POST_CHANGE, pwr_mode); @@ -4795,11 +4802,13 @@ EXPORT_SYMBOL_GPL(ufshcd_change_power_mode); * ufshcd_config_pwr_mode - configure a new power mode * @hba: per-adapter instance * @desired_pwr_mode: desired power configuration + * @pmc_policy: Power Mode change policy * * Return: 0 upon success; < 0 upon failure. */ int ufshcd_config_pwr_mode(struct ufs_hba *hba, - struct ufs_pa_layer_attr *desired_pwr_mode) + struct ufs_pa_layer_attr *desired_pwr_mode, + enum ufshcd_pmc_policy pmc_policy) { struct ufs_pa_layer_attr final_params =3D { 0 }; int ret; @@ -4809,7 +4818,7 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba, if (ret) memcpy(&final_params, desired_pwr_mode, sizeof(final_params)); =20 - return ufshcd_change_power_mode(hba, &final_params); + return ufshcd_change_power_mode(hba, &final_params, pmc_policy); } EXPORT_SYMBOL_GPL(ufshcd_config_pwr_mode); =20 @@ -6866,14 +6875,13 @@ static void ufshcd_err_handler(struct work_struct *= work) * are sent via bsg and/or sysfs. */ down_write(&hba->clk_scaling_lock); - hba->force_pmc =3D true; - pmc_err =3D ufshcd_config_pwr_mode(hba, &(hba->pwr_info)); + pmc_err =3D ufshcd_config_pwr_mode(hba, &hba->pwr_info, + UFSHCD_PMC_POLICY_FORCE); if (pmc_err) { needs_reset =3D true; dev_err(hba->dev, "%s: Failed to restore power mode, err =3D %d\n", __func__, pmc_err); } - hba->force_pmc =3D false; ufshcd_print_pwr_info(hba); up_write(&hba->clk_scaling_lock); spin_lock_irqsave(hba->host->host_lock, flags); @@ -9148,7 +9156,8 @@ static int ufshcd_post_device_init(struct ufs_hba *hb= a) if (hba->dev_ref_clk_freq !=3D REF_CLK_FREQ_INVAL) ufshcd_set_dev_ref_clk(hba); /* Gear up to HS gear. */ - ret =3D ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); + ret =3D ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info, + UFSHCD_PMC_POLICY_DONT_FORCE); if (ret) { dev_err(hba->dev, "%s: Failed setting power mode, err =3D %d\n", __func__, ret); diff --git a/drivers/ufs/host/ufshcd-pci.c b/drivers/ufs/host/ufshcd-pci.c index 894b7589b14e..aa5e593769c3 100644 --- a/drivers/ufs/host/ufshcd-pci.c +++ b/drivers/ufs/host/ufshcd-pci.c @@ -154,7 +154,8 @@ static int ufs_intel_set_lanes(struct ufs_hba *hba, u32= lanes) =20 pwr_info.lane_rx =3D lanes; pwr_info.lane_tx =3D lanes; - ret =3D ufshcd_change_power_mode(hba, &pwr_info); + ret =3D ufshcd_change_power_mode(hba, &pwr_info, + UFSHCD_PMC_POLICY_DONT_FORCE); if (ret) dev_err(hba->dev, "%s: Setting %u lanes, err =3D %d\n", __func__, lanes, ret); diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 51c2555bea73..16facaee3e77 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -529,6 +529,17 @@ enum ufshcd_state { UFSHCD_STATE_ERROR, }; =20 +/** + * enum ufshcd_pmc_policy - Power Mode change policy + * @UFSHCD_PMC_POLICY_DONT_FORCE: Do not force a Power Mode change. + * @UFSHCD_PMC_POLICY_FORCE: Force a Power Mode change even if current Pow= er + * Mode is same as target Power Mode. + */ +enum ufshcd_pmc_policy { + UFSHCD_PMC_POLICY_DONT_FORCE, + UFSHCD_PMC_POLICY_FORCE, +}; + enum ufshcd_quirks { /* Interrupt aggregation support is broken */ UFSHCD_QUIRK_BROKEN_INTR_AGGR =3D 1 << 0, @@ -882,7 +893,6 @@ enum ufshcd_mcq_opr { * @saved_uic_err: sticky UIC error mask * @ufs_stats: various error counters * @force_reset: flag to force eh_work perform a full reset - * @force_pmc: flag to force a power mode change * @silence_err_logs: flag to silence error logs * @dev_cmd: ufs device management command information * @last_dme_cmd_tstamp: time stamp of the last completed DME command @@ -1036,7 +1046,6 @@ struct ufs_hba { u32 saved_uic_err; struct ufs_stats ufs_stats; bool force_reset; - bool force_pmc; bool silence_err_logs; =20 /* Device management request data */ @@ -1363,9 +1372,11 @@ extern int ufshcd_dme_set_attr(struct ufs_hba *hba, = u32 attr_sel, extern int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel, u32 *mib_val, u8 peer); extern int ufshcd_change_power_mode(struct ufs_hba *hba, - struct ufs_pa_layer_attr *pwr_mode); + struct ufs_pa_layer_attr *pwr_mode, + enum ufshcd_pmc_policy pmc_policy); extern int ufshcd_config_pwr_mode(struct ufs_hba *hba, - struct ufs_pa_layer_attr *desired_pwr_mode); + struct ufs_pa_layer_attr *desired_pwr_mode, + enum ufshcd_pmc_policy pmc_policy); extern int ufshcd_uic_change_pwr_mode(struct ufs_hba *hba, u8 mode); =20 /* UIC command interfaces for DME primitives */ --=20 2.34.1