From: "Asutosh Das (asd)" <asutoshd@codeaurora.org> To: Stanley Chu <stanley.chu@mediatek.com>, linux-scsi@vger.kernel.org, martin.petersen@oracle.com, avri.altman@wdc.com, alim.akhtar@samsung.com, jejb@linux.ibm.com Cc: beanhuo@micron.com, cang@codeaurora.org, matthias.bgg@gmail.com, bvanassche@acm.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, nguyenb@codeaurora.org, bjorn.andersson@linaro.org, kuohong.wang@mediatek.com, peter.wang@mediatek.com, chun-hung.wu@mediatek.com, andy.teng@mediatek.com, chaotian.jing@mediatek.com, cc.chou@mediatek.com, jiajie.hao@mediatek.com, alice.chao@mediatek.com Subject: Re: [PATCH v2 2/2] scsi: ufs: Uninline ufshcd_vops_device_reset function Date: Tue, 15 Dec 2020 09:33:49 -0800 [thread overview] Message-ID: <a1b39518-6a44-f349-008a-f029295d7e10@codeaurora.org> (raw) In-Reply-To: <20201208135635.15326-3-stanley.chu@mediatek.com> On 12/8/2020 5:56 AM, Stanley Chu wrote: > Since more and more statements showing up in ufshcd_vops_device_reset(), > uninline it to allow compiler making possibly better optimization. > > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> > --- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 27 ++++++++++++++++++++++----- > drivers/scsi/ufs/ufshcd.h | 19 +++++-------------- > 2 files changed, 27 insertions(+), 19 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index c1c401b2b69d..b2ca1a6ad426 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -580,6 +580,23 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) > hba->pwr_info.hs_rate); > } > > +static void ufshcd_device_reset(struct ufs_hba *hba) > +{ > + int err; > + > + err = ufshcd_vops_device_reset(hba); > + > + if (!err) { > + ufshcd_set_ufs_dev_active(hba); > + if (ufshcd_is_wb_allowed(hba)) { > + hba->wb_enabled = false; > + hba->wb_buf_flush_enabled = false; > + } > + } > + if (err != -EOPNOTSUPP) > + ufshcd_update_evt_hist(hba, UFS_EVT_DEV_RESET, err); > +} > + > void ufshcd_delay_us(unsigned long us, unsigned long tolerance) > { > if (!us) > @@ -3932,7 +3949,7 @@ int ufshcd_link_recovery(struct ufs_hba *hba) > spin_unlock_irqrestore(hba->host->host_lock, flags); > > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > ret = ufshcd_host_reset_and_restore(hba); > > @@ -6933,7 +6950,7 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba) > > do { > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > err = ufshcd_host_reset_and_restore(hba); > } while (err && --retries); > @@ -8712,7 +8729,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > * further below. > */ > if (ufshcd_is_ufs_dev_deepsleep(hba)) { > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > WARN_ON(!ufshcd_is_link_off(hba)); > } > if (ufshcd_is_link_hibern8(hba) && !ufshcd_uic_hibern8_exit(hba)) > @@ -8722,7 +8739,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > set_dev_active: > /* Can also get here needing to exit DeepSleep */ > if (ufshcd_is_ufs_dev_deepsleep(hba)) { > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > ufshcd_host_reset_and_restore(hba); > } > if (!ufshcd_set_dev_pwr_mode(hba, UFS_ACTIVE_PWR_MODE)) > @@ -9321,7 +9338,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > } > > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > ufshcd_init_crypto(hba); > > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 36d367eb8139..9bb5f0ed4124 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -1216,21 +1216,12 @@ static inline void ufshcd_vops_dbg_register_dump(struct ufs_hba *hba) > hba->vops->dbg_register_dump(hba); > } > > -static inline void ufshcd_vops_device_reset(struct ufs_hba *hba) > +static inline int ufshcd_vops_device_reset(struct ufs_hba *hba) > { > - if (hba->vops && hba->vops->device_reset) { > - int err = hba->vops->device_reset(hba); > - > - if (!err) { > - ufshcd_set_ufs_dev_active(hba); > - if (ufshcd_is_wb_allowed(hba)) { > - hba->wb_enabled = false; > - hba->wb_buf_flush_enabled = false; > - } > - } > - if (err != -EOPNOTSUPP) > - ufshcd_update_evt_hist(hba, UFS_EVT_DEV_RESET, err); > - } > + if (hba->vops && hba->vops->device_reset) > + return hba->vops->device_reset(hba); > + > + return -EOPNOTSUPP; > } > > static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba, > -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: "Asutosh Das (asd)" <asutoshd@codeaurora.org> To: Stanley Chu <stanley.chu@mediatek.com>, linux-scsi@vger.kernel.org, martin.petersen@oracle.com, avri.altman@wdc.com, alim.akhtar@samsung.com, jejb@linux.ibm.com Cc: alice.chao@mediatek.com, bvanassche@acm.org, andy.teng@mediatek.com, cc.chou@mediatek.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, linux-kernel@vger.kernel.org, nguyenb@codeaurora.org, jiajie.hao@mediatek.com, cang@codeaurora.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, matthias.bgg@gmail.com, bjorn.andersson@linaro.org, chaotian.jing@mediatek.com, linux-arm-kernel@lists.infradead.org, beanhuo@micron.com Subject: Re: [PATCH v2 2/2] scsi: ufs: Uninline ufshcd_vops_device_reset function Date: Tue, 15 Dec 2020 09:33:49 -0800 [thread overview] Message-ID: <a1b39518-6a44-f349-008a-f029295d7e10@codeaurora.org> (raw) In-Reply-To: <20201208135635.15326-3-stanley.chu@mediatek.com> On 12/8/2020 5:56 AM, Stanley Chu wrote: > Since more and more statements showing up in ufshcd_vops_device_reset(), > uninline it to allow compiler making possibly better optimization. > > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> > --- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 27 ++++++++++++++++++++++----- > drivers/scsi/ufs/ufshcd.h | 19 +++++-------------- > 2 files changed, 27 insertions(+), 19 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index c1c401b2b69d..b2ca1a6ad426 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -580,6 +580,23 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) > hba->pwr_info.hs_rate); > } > > +static void ufshcd_device_reset(struct ufs_hba *hba) > +{ > + int err; > + > + err = ufshcd_vops_device_reset(hba); > + > + if (!err) { > + ufshcd_set_ufs_dev_active(hba); > + if (ufshcd_is_wb_allowed(hba)) { > + hba->wb_enabled = false; > + hba->wb_buf_flush_enabled = false; > + } > + } > + if (err != -EOPNOTSUPP) > + ufshcd_update_evt_hist(hba, UFS_EVT_DEV_RESET, err); > +} > + > void ufshcd_delay_us(unsigned long us, unsigned long tolerance) > { > if (!us) > @@ -3932,7 +3949,7 @@ int ufshcd_link_recovery(struct ufs_hba *hba) > spin_unlock_irqrestore(hba->host->host_lock, flags); > > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > ret = ufshcd_host_reset_and_restore(hba); > > @@ -6933,7 +6950,7 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba) > > do { > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > err = ufshcd_host_reset_and_restore(hba); > } while (err && --retries); > @@ -8712,7 +8729,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > * further below. > */ > if (ufshcd_is_ufs_dev_deepsleep(hba)) { > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > WARN_ON(!ufshcd_is_link_off(hba)); > } > if (ufshcd_is_link_hibern8(hba) && !ufshcd_uic_hibern8_exit(hba)) > @@ -8722,7 +8739,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > set_dev_active: > /* Can also get here needing to exit DeepSleep */ > if (ufshcd_is_ufs_dev_deepsleep(hba)) { > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > ufshcd_host_reset_and_restore(hba); > } > if (!ufshcd_set_dev_pwr_mode(hba, UFS_ACTIVE_PWR_MODE)) > @@ -9321,7 +9338,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > } > > /* Reset the attached device */ > - ufshcd_vops_device_reset(hba); > + ufshcd_device_reset(hba); > > ufshcd_init_crypto(hba); > > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 36d367eb8139..9bb5f0ed4124 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -1216,21 +1216,12 @@ static inline void ufshcd_vops_dbg_register_dump(struct ufs_hba *hba) > hba->vops->dbg_register_dump(hba); > } > > -static inline void ufshcd_vops_device_reset(struct ufs_hba *hba) > +static inline int ufshcd_vops_device_reset(struct ufs_hba *hba) > { > - if (hba->vops && hba->vops->device_reset) { > - int err = hba->vops->device_reset(hba); > - > - if (!err) { > - ufshcd_set_ufs_dev_active(hba); > - if (ufshcd_is_wb_allowed(hba)) { > - hba->wb_enabled = false; > - hba->wb_buf_flush_enabled = false; > - } > - } > - if (err != -EOPNOTSUPP) > - ufshcd_update_evt_hist(hba, UFS_EVT_DEV_RESET, err); > - } > + if (hba->vops && hba->vops->device_reset) > + return hba->vops->device_reset(hba); > + > + return -EOPNOTSUPP; > } > > static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba, > -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-12-15 17:35 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-08 13:56 [PATCH v2 0/2] scsi: ufs: Re-enable WB after device reset Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 13:56 ` [PATCH v2 1/2] scsi: ufs: Re-enable WriteBooster " Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 14:13 ` Bean Huo 2020-12-08 14:13 ` Bean Huo 2020-12-08 14:13 ` Bean Huo 2020-12-09 1:09 ` Stanley Chu 2020-12-09 1:09 ` Stanley Chu 2020-12-09 1:09 ` Stanley Chu 2020-12-14 20:32 ` Bean Huo 2020-12-14 20:32 ` Bean Huo 2020-12-14 20:32 ` Bean Huo 2020-12-08 13:56 ` [PATCH v2 2/2] scsi: ufs: Uninline ufshcd_vops_device_reset function Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 13:56 ` Stanley Chu 2020-12-08 14:14 ` Bean Huo 2020-12-08 14:14 ` Bean Huo 2020-12-08 14:14 ` Bean Huo 2020-12-15 17:33 ` Asutosh Das (asd) [this message] 2020-12-15 17:33 ` Asutosh Das (asd) 2020-12-09 17:12 ` [PATCH v2 0/2] scsi: ufs: Re-enable WB after device reset Martin K. Petersen 2020-12-09 17:12 ` Martin K. Petersen 2020-12-09 17:12 ` Martin K. Petersen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a1b39518-6a44-f349-008a-f029295d7e10@codeaurora.org \ --to=asutoshd@codeaurora.org \ --cc=alice.chao@mediatek.com \ --cc=alim.akhtar@samsung.com \ --cc=andy.teng@mediatek.com \ --cc=avri.altman@wdc.com \ --cc=beanhuo@micron.com \ --cc=bjorn.andersson@linaro.org \ --cc=bvanassche@acm.org \ --cc=cang@codeaurora.org \ --cc=cc.chou@mediatek.com \ --cc=chaotian.jing@mediatek.com \ --cc=chun-hung.wu@mediatek.com \ --cc=jejb@linux.ibm.com \ --cc=jiajie.hao@mediatek.com \ --cc=kuohong.wang@mediatek.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=matthias.bgg@gmail.com \ --cc=nguyenb@codeaurora.org \ --cc=peter.wang@mediatek.com \ --cc=stanley.chu@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.