From ab02bc73ec24b25d0556680b0fa85daa6a8aa470 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 12 Apr 2022 16:35:33 +0200 Subject: [PATCH] Revert "scsi: ufs: Fix runtime PM messages never-ending cycle" This reverts commit 64b0fe4808bdf3af978f58acf2098af6b4795819. It breaks the kernel abi so revert it for now. We will add it back later at the next kabi update. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I7319d8ed31cd6b7cb2e3e48b70b15b6109ac53fb --- drivers/scsi/ufs/ufshcd.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 1e41712fc981..eea5af5fa166 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -582,12 +582,7 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) "INVALID MODE", }; - /* - * Using dev_dbg to avoid messages during runtime PM to avoid - * never-ending cycles of messages written back to storage by user space - * causing runtime resume, causing more messages and so on. - */ - dev_dbg(hba->dev, "%s:[RX, TX]: gear=[%d, %d], lane[%d, %d], pwr[%s, %s], rate = %d\n", + dev_err(hba->dev, "%s:[RX, TX]: gear=[%d, %d], lane[%d, %d], pwr[%s, %s], rate = %d\n", __func__, hba->pwr_info.gear_rx, hba->pwr_info.gear_tx, hba->pwr_info.lane_rx, hba->pwr_info.lane_tx, @@ -5001,12 +4996,6 @@ static int ufshcd_slave_configure(struct scsi_device *sdev) pm_runtime_get_noresume(&sdev->sdev_gendev); else if (ufshcd_is_rpm_autosuspend_allowed(hba)) sdev->rpm_autosuspend = 1; - /* - * Do not print messages during runtime PM to avoid never-ending cycles - * of messages written back to storage by user space causing runtime - * resume, causing more messages and so on. - */ - sdev->silence_suspend = 1; ufshcd_crypto_setup_rq_keyslot_manager(hba, q); @@ -7245,13 +7234,7 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, if (!hba->vreg_info.vcc || !hba->vreg_info.vccq || !hba->vreg_info.vccq2) { - /* - * Using dev_dbg to avoid messages during runtime PM to avoid - * never-ending cycles of messages written back to storage by - * user space causing runtime resume, causing more messages and - * so on. - */ - dev_dbg(hba->dev, + dev_err(hba->dev, "%s: Regulator capability was not set, actvIccLevel=%d", __func__, icc_level); goto out;