Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220802080146epcms2p24b86bfce3d3c09c79b91d861cb3b2cce@epcms2p2>
 <20220802080927epcms2p1d0d89c32a9bd07c07f233801bb954807@epcms2p1>
 <CGME20220802080146epcms2p24b86bfce3d3c09c79b91d861cb3b2cce@epcms2p8>
 <CAGaU9a_YZDxaeOCErnQwFF9mE7bARDf4sw3F3ai1DiWwNVMFcw@mail.gmail.com> <20220803041126epcms2p82bafb63e4f135d09017519ed3066f914@epcms2p8>
In-Reply-To: <20220803041126epcms2p82bafb63e4f135d09017519ed3066f914@epcms2p8>
From:   Stanley Chu <chu.stanley@gmail.com>
Date:   Wed, 3 Aug 2022 13:34:05 +0800
Message-ID: <CAGaU9a8Xxvtc0=Ci=ztwya=GqFZ0WB3p4wSo-QvLADdF3Fj+4Q@mail.gmail.com>
Subject: Re: (2) [PATCH v6 5/6] scsi: ufs: wb: Modify messages
To:     j-young.choi@samsung.com
Cc:     ALIM AKHTAR <alim.akhtar@samsung.com>,
        "avri.altman@wdc.com" <avri.altman@wdc.com>,
        "bvanassche@acm.org" <bvanassche@acm.org>,
        "jejb@linux.ibm.com" <jejb@linux.ibm.com>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "beanhuo@micron.com" <beanhuo@micron.com>,
        "adrian.hunter@intel.com" <adrian.hunter@intel.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

hi Jinyoung,

On Wed, Aug 3, 2022 at 12:11 PM Jinyoung CHOI <j-young.choi@samsung.com> wrote:
>
> Hi, Stanley,
>
> >Hi,
> >
> >On Tue, Aug 2, 2022 at 4:29 PM Jinyoung CHOI <j-young.choi@samsung.com> wrote:
> >>
> >> Messages are modified to fit the format of others.
> >>
> >> Reviewed-by: Avri Altman <avri.altman@wdc.com>
> >> Reviewed-by: Bart Van Assche <bvanassche@acm.org>
> >> Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com>
> >> ---
> >>  drivers/ufs/core/ufs-sysfs.c |  2 +-
> >>  drivers/ufs/core/ufshcd.c    | 23 +++++++++++------------
> >>  2 files changed, 12 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c
> >> index 2c0b7f45de4b..117272cf7d61 100644
> >> --- a/drivers/ufs/core/ufs-sysfs.c
> >> +++ b/drivers/ufs/core/ufs-sysfs.c
> >> @@ -230,7 +230,7 @@ static ssize_t wb_on_store(struct device *dev, struct device_attribute *attr,
> >>                  * If the platform supports UFSHCD_CAP_CLK_SCALING, turn WB
> >>                  * on/off will be done while clock scaling up/down.
> >>                  */
> >> -               dev_warn(dev, "To control WB through wb_on is not allowed!\n");
> >> +               dev_warn(dev, "It is not allowed to configure WB!\n");
> >>                 return -EOPNOTSUPP;
> >>         }
> >>
> >> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> >> index 5099d161f115..dcd7f03db2a2 100644
> >> --- a/drivers/ufs/core/ufshcd.c
> >> +++ b/drivers/ufs/core/ufshcd.c
> >> @@ -5737,13 +5737,13 @@ int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable)
> >>
> >>         ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_EN);
> >>         if (ret) {
> >> -               dev_err(hba->dev, "%s Write Booster %s failed %d\n",
> >> -                       __func__, enable ? "enable" : "disable", ret);
> >> +               dev_err(hba->dev, "%s: Write Booster %s failed %d\n",
> >> +                       __func__, enable ? "enabling" : "disabling", ret);
> >>                 return ret;
> >>         }
> >>
> >>         hba->dev_info.wb_enabled = enable;
> >> -       dev_info(hba->dev, "%s Write Booster %s\n",
> >> +       dev_info(hba->dev, "%s: Write Booster %s\n",
> >>                         __func__, enable ? "enabled" : "disabled");
> >
> >You need to rebase this patch to follow the latest change as
> >https://lore.kernel.org/all/20220709000027.3929970-1-bjorn.andersson@linaro.org/
>
> I am currently working on the latest 5.20/scsi-staging.
> In this case, can I refer the commit of 5.19/scsi-fixes
> and add commit to 5.20/scsi-staging?
> Or can I reflect it in my change?
> I have no experience, so please guide. :)
>
> Thank you for checking.
> Jinyoung.
>
>

I did not notice that the below patch is merged to 5.19/scsi-fixes, so
I guess perhaps you could keep working on the latest
5.20/scsi-staging, and then Martin would help resolve the conflict.
https://lore.kernel.org/all/20220709000027.3929970-1-bjorn.andersson@linaro.org/

Thanks,

Stanley