From patchwork Tue Nov 29 18:53:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asutosh Das X-Patchwork-Id: 27408 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp513342wrr; Tue, 29 Nov 2022 11:00:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf42LmrXmRv6i1QQO0YrfeRLtLfFRFlWgNOz+JNT+yPLDcXZ0y0QdDKiLyt6Oy5u+0WY7GqX X-Received: by 2002:a05:6402:40c:b0:461:c894:f6b5 with SMTP id q12-20020a056402040c00b00461c894f6b5mr38034876edv.52.1669748400800; Tue, 29 Nov 2022 11:00:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669748400; cv=none; d=google.com; s=arc-20160816; b=Hq7SGCVangOiTeoKZR4AjoWmMDKUeYbHWuvUAjXNW9ONUG8GJXnG2RocMc8ZZo6Zo5 zWvQUw277BPvA5yoc2lxNXY9ZWzkJqbwjPVqxXMo7upTMD7CxVo8OR2byXS27fKZmNbg /XYjmGgFL4A/CqtmyLFwnbUzdUjzO32xradkdJ2H7/BZauUyZiycr/VgvqGKwHqFsj4+ sWGYBDRMbx8JT54N6jIpjZOVDXjFoksdtf60O2giLfrNQ1pINEG5QBGajxsklN/pxQ9f 7JA4fUjESyZUSJ71xnGBCsMcgyyPKaLPAtMIPwDUrCP2qi2jwzmqy3JPWBha4rY2VP1I MjXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ayT/B9TTsuGZyGZdPUqnbVMQKOPEfENgzDqXeHo/pjg=; b=l+9tqn0Hcswc//QHrRL9IVTTAM9tEs04jjFF9hVtvFtKXESsIlC6J1nhJjsMRnK4Ep p96uCT+w8yfSyWGDcHLwx0Ip2XMq09t78pccNtG7uHcekOTZ79lfEh4jAvWwEGxsYy0H Ara6IlmneZt7eRFiooInq2NooTYmOGKD8Heo0DN0LXlsrhU2VOsPCff9Fm//DRRY5h7j hmgodT2JuBOhifTvJS4j1mQNBThclBLjHOzfHh0nYOlne5/jTaqvTHGlgnn/0cliF4eu YpL1GSTs71Gq50wVZ63DJmaCWFMYv8i+Ky9VUlMlXWEqyjWNoOcN69szS4bPg8z64F8e ed6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=nNH21I9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di16-20020a170906731000b007a835c56b70si12379546ejc.267.2022.11.29.10.59.37; Tue, 29 Nov 2022 11:00:00 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=nNH21I9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236315AbiK2S5K (ORCPT + 99 others); Tue, 29 Nov 2022 13:57:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236394AbiK2S4k (ORCPT ); Tue, 29 Nov 2022 13:56:40 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D960F68C49; Tue, 29 Nov 2022 10:56:06 -0800 (PST) Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ATBc4aT013640; Tue, 29 Nov 2022 18:55:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=ayT/B9TTsuGZyGZdPUqnbVMQKOPEfENgzDqXeHo/pjg=; b=nNH21I9B5xLFHdYd4FI+azixzFOaaMiUfn3GcIlrMCAwXD21bVnxDQ5ozJzpgPBjnAzx vNY+fCj2ewP9h9bMeauCdbdSY9Mgrmlrk0euCj6Nsl4cIkNH1YChYcjIQEENKOUGBeNv ciYd0fys0vnr5Lep3DVg0T4Iu52W9L11FYuFFKLXVe1q0Uj0CZR4xHA99h3Yub/68s5k YMBpjuh8zCdghYEG+H/eOSMhs8nVjQ09aMptWYla7jdYep7AQHvIy3Sm9CNkvz2ntWrv /THpDEvMKP9YNCZ0Bu82WxDtj8oRYNHOw2JxQdyX5w2AQ6YuxgFmSOZnc0LG14aexW2Z mQ== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3m55m938vu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Nov 2022 18:55:53 +0000 Received: from nasanex01a.na.qualcomm.com ([10.52.223.231]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 2ATItrrs011314 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Nov 2022 18:55:53 GMT Received: from asutoshd-linux1.qualcomm.com (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 29 Nov 2022 10:55:52 -0800 From: Asutosh Das To: , , CC: , , , , , , , , , Asutosh Das , , Alim Akhtar , "James E.J. Bottomley" , Jinyoung Choi , open list Subject: [PATCH v7 10/16] ufs: core: mcq: Use shared tags for MCQ mode Date: Tue, 29 Nov 2022 10:53:16 -0800 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: ztmjy_ee9GnIlLJkAsdavhc7nm6l774b X-Proofpoint-GUID: ztmjy_ee9GnIlLJkAsdavhc7nm6l774b X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-29_11,2022-11-29_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0 phishscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 adultscore=0 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211290108 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750858099462339313?= X-GMAIL-MSGID: =?utf-8?q?1750858099462339313?= Enable shared tags for MCQ. For UFS, this should not have a huge performance impact. It however simplifies the MCQ implementation and reuses most of the existing code in the issue and completion path. Also add multiple queue mapping to map_queue(). Co-developed-by: Can Guo Signed-off-by: Can Guo Signed-off-by: Asutosh Das Reviewed-by: Bart Van Assche Reviewed-by: Manivannan Sadhasivam --- drivers/ufs/core/ufs-mcq.c | 2 ++ drivers/ufs/core/ufshcd.c | 28 ++++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c index a783dcd..cffec4c 100644 --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -280,6 +280,7 @@ void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba) int ufshcd_mcq_init(struct ufs_hba *hba) { + struct Scsi_Host *host = hba->host; struct ufs_hw_queue *hwq; int ret, i; @@ -315,6 +316,7 @@ int ufshcd_mcq_init(struct ufs_hba *hba) /* Give dev_cmd_queue the minimal number of entries */ hba->dev_cmd_queue->max_entries = MAX_DEV_CMD_ENTRIES; + host->host_tagset = 1; return 0; } diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 3210f6e..965e844 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2763,24 +2763,28 @@ static inline bool is_device_wlun(struct scsi_device *sdev) */ static void ufshcd_map_queues(struct Scsi_Host *shost) { - int i; + struct ufs_hba *hba = shost_priv(shost); + int i, queue_offset = 0; + + if (!is_mcq_supported(hba)) { + hba->nr_queues[HCTX_TYPE_DEFAULT] = 1; + hba->nr_queues[HCTX_TYPE_READ] = 0; + hba->nr_queues[HCTX_TYPE_POLL] = 1; + hba->nr_hw_queues = 1; + } for (i = 0; i < shost->nr_maps; i++) { struct blk_mq_queue_map *map = &shost->tag_set.map[i]; - switch (i) { - case HCTX_TYPE_DEFAULT: - case HCTX_TYPE_POLL: - map->nr_queues = 1; - break; - case HCTX_TYPE_READ: - map->nr_queues = 0; + map->nr_queues = hba->nr_queues[i]; + if (!map->nr_queues) continue; - default: - WARN_ON_ONCE(true); - } - map->queue_offset = 0; + map->queue_offset = queue_offset; + if (i == HCTX_TYPE_POLL && !is_mcq_supported(hba)) + map->queue_offset = 0; + blk_mq_map_queues(map); + queue_offset += map->nr_queues; } }