From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E223C43464 for ; Fri, 18 Sep 2020 04:12:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B88D423770 for ; Fri, 18 Sep 2020 04:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600402356; bh=Q9slKOmrxGdBSBMeB8FmMl5kOyt2E2ILmyItUGGgDbM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=DzhPddmeNDIr+kDUUfD4pFNI7V4JPxOhBmUX3X+6zqysOGFW7Yf+fdGecQu2eSBdc 9fwPe7ebxeryiLBUH4QpHoZfV51YJ3+CzTPd6RlMVrWoMbANJiOPLz/AOqiAOnRzgA ty2TJStztmNXwCxO+xCDrAe/NBIARVaWY//dnJNQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgIREMf (ORCPT ); Fri, 18 Sep 2020 00:12:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:56070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726198AbgIREMf (ORCPT ); Fri, 18 Sep 2020 00:12:35 -0400 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A687B23600; Fri, 18 Sep 2020 04:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600402354; bh=Q9slKOmrxGdBSBMeB8FmMl5kOyt2E2ILmyItUGGgDbM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TLU9Sl9xR9M6Bajj6jZZmo7p31ukJ+PCUbEXGJfO+je0JIv+LShR4eSlnkQMul9tE CjFBM3EUJKZL/Dg8T99ToN0H0FNdlcf/vF57qdefSede/a62uYinCi/pixiZDKGsno ETbX766rOLKCw0Qoko13/R1q1+35ZYEySpdsHHuM= Date: Thu, 17 Sep 2020 21:12:34 -0700 From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, kernel-team@android.com Cc: Alim Akhtar , Avri Altman Subject: Re: [PATCH 4/6] scsi: ufs: fix LINERESET on hibern8 Message-ID: <20200918041234.GA3300389@google.com> References: <20200915204532.1672300-1-jaegeuk@kernel.org> <20200915204532.1672300-4-jaegeuk@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200915204532.1672300-4-jaegeuk@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please ignore this patch. Thanks. On 09/15, Jaegeuk Kim wrote: > From: Jaegeuk Kim > > When testing infinite test to read sysfs entries of UFS, I got a UFS timeout > with the following kernel message. > > query: dev_cmd_send: seq_no=78082 tag=31, idn=2 > query: ufshcd_wait_for_dev_cmd: dev_cmd request timedout, tag 31 > query: __ufshcd_query_descriptor: opcode 0x01 for idn 2 failed, index 0, err = -11 > -- hibern8: dme: dme_send: cmd_id=0x17 idn=0 > query: ufshcd_query_descriptor: failed with error -11, retries 3 > -- hibern8: ufshcd_update_uic_error: LINERESET during hibern8 enter > -- hibern8: __ufshcd_uic_hibern8_enter: hibern8 enter failed. ret = -110 > > The problem is casued by hibern8 command issued by ufshcd_suspend(), which is > not aware of query command. If autohibern8 is enabled, we actually don't need > to issue hibern8 command by suspend. > > Cc: Alim Akhtar > Cc: Avri Altman > Signed-off-by: Jaegeuk Kim > --- > drivers/scsi/ufs/ufshcd.c | 20 ++++++++++++++++++-- > drivers/scsi/ufs/ufshcd.h | 1 + > 2 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 848e33ec40639..bdc82cc3824aa 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -3079,8 +3079,12 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba, > int retries; > > for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) { > - err = __ufshcd_query_descriptor(hba, opcode, idn, index, > + err = -EAGAIN; > + down_read(&hba->query_lock); > + if (!ufshcd_is_link_hibern8(hba)) > + err = __ufshcd_query_descriptor(hba, opcode, idn, index, > selector, desc_buf, buf_len); > + up_read(&hba->query_lock); > if (!err || err == -EINVAL) > break; > } > @@ -8263,8 +8267,8 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > enum ufs_pm_level pm_lvl; > enum ufs_dev_pwr_mode req_dev_pwr_mode; > enum uic_link_state req_link_state; > + bool need_upwrite = false; > > - hba->pm_op_in_progress = 1; > if (!ufshcd_is_shutdown_pm(pm_op)) { > pm_lvl = ufshcd_is_runtime_pm(pm_op) ? > hba->rpm_lvl : hba->spm_lvl; > @@ -8275,6 +8279,15 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > req_link_state = UIC_LINK_OFF_STATE; > } > > + if (ufshcd_is_runtime_pm(pm_op) && > + req_link_state == UIC_LINK_HIBERN8_STATE && > + hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT) { > + need_upwrite = true; > + if (!down_write_trylock(&hba->query_lock)) > + return -EBUSY; > + } > + hba->pm_op_in_progress = 1; > + > /* > * If we can't transition into any of the low power modes > * just gate the clocks. > @@ -8403,6 +8416,8 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) > } > > hba->pm_op_in_progress = 0; > + if (need_upwrite) > + up_write(&hba->query_lock); > > if (ret) > ufshcd_update_reg_hist(&hba->ufs_stats.suspend_err, (u32)ret); > @@ -8894,6 +8909,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > mutex_init(&hba->dev_cmd.lock); > > init_rwsem(&hba->clk_scaling_lock); > + init_rwsem(&hba->query_lock); > > ufshcd_init_clk_gating(hba); > > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 363589c0bd370..6f8e05eaf9661 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -754,6 +754,7 @@ struct ufs_hba { > bool is_urgent_bkops_lvl_checked; > > struct rw_semaphore clk_scaling_lock; > + struct rw_semaphore query_lock; > unsigned char desc_size[QUERY_DESC_IDN_MAX]; > atomic_t scsi_block_reqs_cnt; > > -- > 2.28.0.618.gf4bc123cb7-goog