From patchwork Thu Feb 9 18:53:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 652295 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05DB8C61DA4 for ; Thu, 9 Feb 2023 18:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbjBISxm (ORCPT ); Thu, 9 Feb 2023 13:53:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjBISxj (ORCPT ); Thu, 9 Feb 2023 13:53:39 -0500 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A71AB1E1E1 for ; Thu, 9 Feb 2023 10:53:37 -0800 (PST) Received: by mail-pj1-f53.google.com with SMTP id pj3so2988217pjb.1 for ; Thu, 09 Feb 2023 10:53:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xIImaOy0qhbbIZG+o8zbEkqUy2VtEOpF3HJ9A/6L4T4=; b=wvmZ9LgKp8yZqoq15DlYTiHTI/KBlL2WAc8OShKWanKpvgzgwU7IhbVBeeohqPgKuS qdikUYgLmNmx6kIjP7/WaDVHA4SJEveV44xFobYYVWwPS1yTzjhvyzgf3rJdNU/wZEUo g53vI3S4+jUEIRwhEOD2JCdCo8pxyjZwAvs3rHD6Fd9pjQ+Ew9i4BlQrMk66GA0w7JcG 22qmaySpjE7otSVuTUJye53sBz2L6DZi2v1FbG10oUkTivGHAwWEm5p15nG3VpshcZiU Q0ES8YENDTbuvqi5J7AoC8PfDy6Att4HhSKtj/M5SWQQj5kNF6Svore9GoKf+TtqrGxI ZtqA== X-Gm-Message-State: AO0yUKWgecEurModYjzp2FowFREs0S8M3V2ztzyZGQuKxZw34z5u6VKr chv4AO61JP944/meY3lfpLs= X-Google-Smtp-Source: AK7set+ilB4esSywzdIxyYBwFvpmlz0/ipJQDfdvYBUhDxTc19wJ+rL1aoXGzJpYDPzbHrxyOvOaMQ== X-Received: by 2002:a05:6a20:8f13:b0:bc:7371:e3d6 with SMTP id b19-20020a056a208f1300b000bc7371e3d6mr12881673pzk.55.1675968817155; Thu, 09 Feb 2023 10:53:37 -0800 (PST) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:15f5:48f5:6861:f3f6]) by smtp.gmail.com with ESMTPSA id x18-20020a63b212000000b00478162d9923sm1603988pge.13.2023.02.09.10.53.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:53:36 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , Avri Altman , Adrian Hunter , linux-scsi@vger.kernel.org, Bart Van Assche , Mike Christie , John Garry , "James E.J. Bottomley" Subject: [PATCH v2 1/3] scsi: core: Extend struct scsi_exec_args Date: Thu, 9 Feb 2023 10:53:26 -0800 Message-Id: <20230209185328.2762796-2-bvanassche@acm.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230209185328.2762796-1-bvanassche@acm.org> References: <20230209185328.2762796-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Allow SCSI LLDs to specify SCMD_* flags. Cc: Mike Christie Cc: John Garry Signed-off-by: Bart Van Assche Reviewed-by: John Garry --- drivers/scsi/scsi_lib.c | 1 + include/scsi/scsi_device.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index abe93ec8b7d0..b7c569a42aa4 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -229,6 +229,7 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd, scmd->cmd_len = COMMAND_SIZE(cmd[0]); memcpy(scmd->cmnd, cmd, scmd->cmd_len); scmd->allowed = retries; + scmd->flags |= args->scmd_flags; req->timeout = timeout; req->rq_flags |= RQF_QUIET; diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 7e95ec45138f..c7bfb1f5a8e7 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -462,6 +462,7 @@ struct scsi_exec_args { unsigned int sense_len; /* sense buffer len */ struct scsi_sense_hdr *sshdr; /* decoded sense header */ blk_mq_req_flags_t req_flags; /* BLK_MQ_REQ flags */ + unsigned int scmd_flags; /* SCMD flags */ int *resid; /* residual length */ }; From patchwork Thu Feb 9 18:53:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 652638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5536FC636D3 for ; Thu, 9 Feb 2023 18:53:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229894AbjBISxy (ORCPT ); Thu, 9 Feb 2023 13:53:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbjBISxv (ORCPT ); Thu, 9 Feb 2023 13:53:51 -0500 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DCE05FE68 for ; Thu, 9 Feb 2023 10:53:47 -0800 (PST) Received: by mail-pl1-f169.google.com with SMTP id u9so3915231plf.3 for ; Thu, 09 Feb 2023 10:53:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+DLyy3X9GHPQsj6fQXw22QEKR6ye8QKoRgQwiKwUuT8=; b=TYTxcgQcnu0On5cGyD1cBlnwfT9r7fJhpK0W0xkmZoqvdXjy/y/ceD+bFiZOBbfq/C 56mt+2K9JBwCVeAECV/4MeqC0hORZR4272wxdqSWqZHrd0+Qw4+4vh3S/tRZN0j0moQW +nFAN3toMbV/j31k9oGdXWyTwS1rcDLrrRYo21nGAXh6jmuXWcnNpPj4dRTafttmFf3n wvNujsA4ntx8SVVtqeKA/SmLhzV9I4r9SoRpylUP4hxVwOOmgmYe2u0tdAwfJqeuFTfB jdPqXFaNirz8j7C3PxwSvcMQcKH4WygejEyF9qmLh0ZaHa9CDchGszVhNFMS46WPz6o2 tQAw== X-Gm-Message-State: AO0yUKVQmTRP7Wd6FStMmBTwXeyz8HFdWQQ1KyaQCqPTTKLAcVbgnj4r cK7Skdb+TqNp2U/nIlekLew= X-Google-Smtp-Source: AK7set+LT+w0JaJnbc85N9yD0u2UNwsSs2IWxpiYceHsleY+igmU2adamL2WNcqJVUtFArWTvKLvaw== X-Received: by 2002:a05:6a21:6d91:b0:c3:3143:26a2 with SMTP id wl17-20020a056a216d9100b000c3314326a2mr7202359pzb.23.1675968826799; Thu, 09 Feb 2023 10:53:46 -0800 (PST) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:15f5:48f5:6861:f3f6]) by smtp.gmail.com with ESMTPSA id x18-20020a63b212000000b00478162d9923sm1603988pge.13.2023.02.09.10.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:53:46 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , Avri Altman , Adrian Hunter , linux-scsi@vger.kernel.org, Bart Van Assche , Mike Christie , John Garry , "James E.J. Bottomley" , Bean Huo , Stanley Chu , Asutosh Das , Jinyoung Choi Subject: [PATCH v2 2/3] scsi: ufs: Rely on the block layer for setting RQF_PM Date: Thu, 9 Feb 2023 10:53:27 -0800 Message-Id: <20230209185328.2762796-3-bvanassche@acm.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230209185328.2762796-1-bvanassche@acm.org> References: <20230209185328.2762796-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Do not set RQF_PM explicitly since scsi_alloc_request() sets it indirectly if BLK_MQ_REQ_PM is set. The call chain for the code that sets RQF_PM is as follows: scsi_alloc_request() blk_mq_alloc_request() __blk_mq_alloc_requests() blk_mq_rq_ctx_init() if (data->flags & BLK_MQ_REQ_PM) data->rq_flags |= RQF_PM; Cc: Mike Christie Cc: John Garry Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 0cfe112ff8c3..3512dcc152c8 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -9141,7 +9141,8 @@ static int ufshcd_execute_start_stop(struct scsi_device *sdev, scmd->allowed = 0/*retries*/; scmd->flags |= SCMD_FAIL_IF_RECOVERING; req->timeout = 1 * HZ; - req->rq_flags |= RQF_PM | RQF_QUIET; + req->rq_flags |= RQF_QUIET; + WARN_ON_ONCE(!(req->rq_flags & RQF_PM)); blk_execute_rq(req, /*at_head=*/true); From patchwork Thu Feb 9 18:53:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 652294 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67D47C636D3 for ; Thu, 9 Feb 2023 18:54:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbjBISyD (ORCPT ); Thu, 9 Feb 2023 13:54:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjBISx5 (ORCPT ); Thu, 9 Feb 2023 13:53:57 -0500 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C4039B8A for ; Thu, 9 Feb 2023 10:53:56 -0800 (PST) Received: by mail-pl1-f180.google.com with SMTP id k13so3963607plg.0 for ; Thu, 09 Feb 2023 10:53:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsXYfzx1zFtNXOxMbtvslkoXX8qL5ws0GYag8HKrQqQ=; b=BD+3kWznQuJvvnRDu9Cysr7+RxZiB5sSHmNbVwPq8Iy0qnS3UWN7L1DKxx1moIkdPm 5a2x54fNxrV8HZHjj8NBrgZk6jXppgziopUBbIGSaHDrDiFk1z/S4/u39bVUZMK/fGdm DPoxboCS8+ko3O7RfhkvMjItPXKfOIVaa0LgRRdAMvpJXSiag3W34SJmgMExsFDCWFXD sYauTZf+6nW6RIO4QRegNzIFgz32Ij2Nnc3pfs4wa3g/HdmvoFhAIJPaZyZH9S0FJeZR xMddEUp/Q+ebmJLLRGFTxXBaiBP8118DMVTsOwksAhCZG0ecUwIu3FsbzP9QWfbsmMYx 01/Q== X-Gm-Message-State: AO0yUKWLEpvVnOZpfyN6dlRBaGHjwRaoisbAGCZ8sYugcQnIwa9RKaSJ T6Ztq5v4ovoDAWQikQ1+DpVzpWe8gY8= X-Google-Smtp-Source: AK7set/7CBRuw/GjzlZrC9FeLCpRnfEEe39vy/mTVrxkxA2E2mrycLA1RJ32RYRX0HTvEzG2NO36fg== X-Received: by 2002:a05:6a20:394f:b0:be:a177:af42 with SMTP id r15-20020a056a20394f00b000bea177af42mr15236629pzg.62.1675968835957; Thu, 09 Feb 2023 10:53:55 -0800 (PST) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:15f5:48f5:6861:f3f6]) by smtp.gmail.com with ESMTPSA id x18-20020a63b212000000b00478162d9923sm1603988pge.13.2023.02.09.10.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:53:55 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , Avri Altman , Adrian Hunter , linux-scsi@vger.kernel.org, Bart Van Assche , Mike Christie , John Garry , "James E.J. Bottomley" , Bean Huo , Stanley Chu , Asutosh Das , Jinyoung Choi Subject: [PATCH v2 3/3] scsi: ufs: Simplify ufshcd_execute_start_stop() Date: Thu, 9 Feb 2023 10:53:28 -0800 Message-Id: <20230209185328.2762796-4-bvanassche@acm.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230209185328.2762796-1-bvanassche@acm.org> References: <20230209185328.2762796-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use scsi_execute_cmd() instead of open-coding it. Cc: Mike Christie Cc: John Garry Signed-off-by: Bart Van Assche Reviewed-by: John Garry --- drivers/ufs/core/ufshcd.c | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 3512dcc152c8..cb59f6b55cfd 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -9125,35 +9125,15 @@ static int ufshcd_execute_start_stop(struct scsi_device *sdev, enum ufs_dev_pwr_mode pwr_mode, struct scsi_sense_hdr *sshdr) { - unsigned char cdb[6] = { START_STOP, 0, 0, 0, pwr_mode << 4, 0 }; - struct request *req; - struct scsi_cmnd *scmd; - int ret; - - req = scsi_alloc_request(sdev->request_queue, REQ_OP_DRV_IN, - BLK_MQ_REQ_PM); - if (IS_ERR(req)) - return PTR_ERR(req); - - scmd = blk_mq_rq_to_pdu(req); - scmd->cmd_len = COMMAND_SIZE(cdb[0]); - memcpy(scmd->cmnd, cdb, scmd->cmd_len); - scmd->allowed = 0/*retries*/; - scmd->flags |= SCMD_FAIL_IF_RECOVERING; - req->timeout = 1 * HZ; - req->rq_flags |= RQF_QUIET; - WARN_ON_ONCE(!(req->rq_flags & RQF_PM)); - - blk_execute_rq(req, /*at_head=*/true); - - if (sshdr) - scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len, - sshdr); - ret = scmd->result; - - blk_mq_free_request(req); + const unsigned char cdb[6] = { START_STOP, 0, 0, 0, pwr_mode << 4, 0 }; + const struct scsi_exec_args args = { + .sshdr = sshdr, + .req_flags = BLK_MQ_REQ_PM, + .scmd_flags = SCMD_FAIL_IF_RECOVERING, + }; - return ret; + return scsi_execute_cmd(sdev, cdb, REQ_OP_DRV_IN, /*buffer=*/NULL, + /*bufflen=*/0, /*timeout=*/HZ, /*retries=*/0, &args); } /**