From patchwork Wed Oct 26 07:39:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RWRkaWUgSHVhbmcgKOm7g+aZuuWCkSk=?= X-Patchwork-Id: 13020267 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 B2B02C38A2D for ; Wed, 26 Oct 2022 07:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233245AbiJZHkG (ORCPT ); Wed, 26 Oct 2022 03:40:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232528AbiJZHkD (ORCPT ); Wed, 26 Oct 2022 03:40:03 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 998A813CFA for ; Wed, 26 Oct 2022 00:39:57 -0700 (PDT) X-UUID: 97cd148f2f8941378503f37dbe7aae8f-20221026 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=Z1gFY3alioo5hLWRum8LaBv7avS7z7Myd6WGS9UzTTs=; b=lBfeCWZz7JEYSQ9cW1BMNq/76yX3C3N131eOxaUlZub0928+dXzwfzM+4DzcCvMkSRNUS4186HHhQ5jjH/GVgKmAwxyGiDqcPzgMPYDeHixwhY0VsEY142GWOi4tQvLmiHaQSfH5TXTkGD2NNkfl7LxMhMaEJpxjRoPhk4wq8EE=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:bbe05789-832f-424e-aeeb-e86d3e3155f2,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:90 X-CID-INFO: VERSION:1.1.12,REQID:bbe05789-832f-424e-aeeb-e86d3e3155f2,IP:0,URL :0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTIO N:quarantine,TS:90 X-CID-META: VersionHash:62cd327,CLOUDID:9fe2b6e4-e572-4957-be22-d8f73f3158f9,B ulkID:221026153953QYFSVDV1,BulkQuantity:0,Recheck:0,SF:38|28|17|19|48,TC:n il,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 97cd148f2f8941378503f37dbe7aae8f-20221026 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 192730564; Wed, 26 Oct 2022 15:39:51 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Wed, 26 Oct 2022 15:39:50 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Wed, 26 Oct 2022 15:39:50 +0800 From: Eddie Huang To: Asutosh Das , , , , CC: , , , , , Eddie Huang Subject: [PATCH v1 1/2] ufs: core: mcq: Add config_mcq_resource vops Date: Wed, 26 Oct 2022 15:39:42 +0800 Message-ID: <20221026073943.22111-2-eddie.huang@mediatek.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20221026073943.22111-1-eddie.huang@mediatek.com> References: <20221026073943.22111-1-eddie.huang@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org SoCs vendor config MCQ register address resource in config_mcq_resource vops Signed-off-by: Eddie Huang --- drivers/ufs/core/ufs-mcq.c | 3 +++ drivers/ufs/core/ufshcd-priv.h | 8 ++++++++ include/ufs/ufshcd.h | 1 + 3 files changed, 12 insertions(+) diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c index b51ba35..1fdb45a 100644 --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -173,6 +173,9 @@ static int ufshcd_mcq_config_resource(struct ufs_hba *hba) struct resource *res_mem, *res_mcq; int i, ret = 0; + if (ufshcd_mcq_vops_config_resource(hba) == 0) + return 0; + memcpy(hba->res, ufs_res_info, sizeof(ufs_res_info)); for (i = 0; i < RES_MAX; i++) { diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index 6e9bec6..2f71b0e 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -257,6 +257,14 @@ static inline int ufshcd_vops_get_outstanding_cqs(struct ufs_hba *hba, return -EOPNOTSUPP; } +static inline int ufshcd_mcq_vops_config_resource(struct ufs_hba *hba) +{ + if (hba->vops && hba->vops->config_mcq_resource) + return hba->vops->config_mcq_resource(hba); + + return -EOPNOTSUPP; +} + extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[]; /** diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 506fc6e..be323c9 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -339,6 +339,7 @@ struct ufs_hba_variant_ops { int (*op_runtime_config)(struct ufs_hba *hba); int (*get_outstanding_cqs)(struct ufs_hba *hba, unsigned long *ocqs); + int (*config_mcq_resource)(struct ufs_hba *hba); }; /* clock gating state */ From patchwork Wed Oct 26 07:39:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RWRkaWUgSHVhbmcgKOm7g+aZuuWCkSk=?= X-Patchwork-Id: 13020268 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 8088FFA3742 for ; Wed, 26 Oct 2022 07:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233268AbiJZHkI (ORCPT ); Wed, 26 Oct 2022 03:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233242AbiJZHkF (ORCPT ); Wed, 26 Oct 2022 03:40:05 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BDB713E16 for ; Wed, 26 Oct 2022 00:39:58 -0700 (PDT) X-UUID: 2a2dcd859ad243e99f3b3b6c58f89286-20221026 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=VY59DSr/vLv19nNx/B+Y43pG1dxoo/HaYIuPllk8qdg=; b=iE97Wp/D3wPRAcdKHTy/u0KnSADBjhUuFLRD1EaYiiiKUG2NrDhFLndRuKUktlPa4Fqf5CjnK186PFlk96abEMb3G/nhn8BTpakh6FBEi7f2roNFFJKU7YSiRyAwfuZEk1bV3n9qN8cNBisZpuiaz8E9C9EaDVFqDPLMCLK7WVY=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:8c1d4b47-fe2a-454a-9390-10ceb764f554,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:70 X-CID-INFO: VERSION:1.1.12,REQID:8c1d4b47-fe2a-454a-9390-10ceb764f554,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTI ON:quarantine,TS:70 X-CID-META: VersionHash:62cd327,CLOUDID:89bc2d27-9eb1-469f-b210-e32d06cfa36e,B ulkID:2210261539532I77BJK6,BulkQuantity:0,Recheck:0,SF:38|28|17|19|48,TC:n il,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 2a2dcd859ad243e99f3b3b6c58f89286-20221026 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1167171629; Wed, 26 Oct 2022 15:39:51 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Wed, 26 Oct 2022 15:39:50 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Wed, 26 Oct 2022 15:39:50 +0800 From: Eddie Huang To: Asutosh Das , , , , CC: , , , , , Eddie Huang Subject: [PATCH v1 2/2] ufs: mtk-host: Add MCQ feature Date: Wed, 26 Oct 2022 15:39:43 +0800 Message-ID: <20221026073943.22111-3-eddie.huang@mediatek.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20221026073943.22111-1-eddie.huang@mediatek.com> References: <20221026073943.22111-1-eddie.huang@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Add Mediatek mcq resource and runtime configuration function to support MCQ capability Signed-off-by: Eddie Huang --- drivers/ufs/host/ufs-mediatek.c | 37 +++++++++++++++++++++++++++++++++++++ drivers/ufs/host/ufs-mediatek.h | 7 +++++++ 2 files changed, 44 insertions(+) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index c958279..3f5fc05 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -31,6 +31,8 @@ #define CREATE_TRACE_POINTS #include "ufs-mediatek-trace.h" +#define MCQ_QUEUE_OFFSET(c) ((((c) >> 16) & 0xFF) * 0x200) + static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = { { .wmanufacturerid = UFS_ANY_VENDOR, .model = UFS_ANY_MODEL, @@ -833,6 +835,8 @@ static int ufs_mtk_init(struct ufs_hba *hba) host->ip_ver = ufshcd_readl(hba, REG_UFS_MTK_IP_VER); + hba->caps |= UFSHCD_CAP_MCQ_EN; + goto out; out_variant_clear: @@ -1314,6 +1318,37 @@ static void ufs_mtk_event_notify(struct ufs_hba *hba, trace_ufs_mtk_event(evt, val); } +static int ufs_mtk_op_runtime_config(struct ufs_hba *hba) +{ + struct ufshcd_mcq_opr_info_t *opr; + int i; + + for (i = 0; i < OPR_MAX; i++) { + opr = &hba->mcq_opr[i]; + opr->stride = REG_UFS_MCQ_STRIDE; + } + + hba->mcq_opr[OPR_SQD].offset = REG_UFS_MTK_SQD; + hba->mcq_opr[OPR_SQIS].offset = REG_UFS_MTK_SQIS; + hba->mcq_opr[OPR_CQD].offset = REG_UFS_MTK_CQD; + hba->mcq_opr[OPR_CQIS].offset = REG_UFS_MTK_CQIS; + + hba->mcq_opr[OPR_SQD].base = hba->mmio_base + REG_UFS_MTK_SQD; + hba->mcq_opr[OPR_SQIS].base = hba->mmio_base + REG_UFS_MTK_SQIS; + hba->mcq_opr[OPR_CQD].base = hba->mmio_base + REG_UFS_MTK_CQD; + hba->mcq_opr[OPR_CQIS].base = hba->mmio_base + REG_UFS_MTK_CQIS; + + return 0; +} + +static int ufs_mtk_config_mcq_resource(struct ufs_hba *hba) +{ + hba->mcq_base = hba->mmio_base + + MCQ_QUEUE_OFFSET(hba->mcq_capabilities); + + return 0; +} + /* * struct ufs_hba_mtk_vops - UFS MTK specific variant operations * @@ -1335,6 +1370,8 @@ static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = { .dbg_register_dump = ufs_mtk_dbg_register_dump, .device_reset = ufs_mtk_device_reset, .event_notify = ufs_mtk_event_notify, + .op_runtime_config = ufs_mtk_op_runtime_config, + .config_mcq_resource = ufs_mtk_config_mcq_resource, }; /** diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h index aa26d41..febf702 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -26,6 +26,13 @@ #define REG_UFS_DEBUG_SEL_B2 0x22D8 #define REG_UFS_DEBUG_SEL_B3 0x22DC +#define REG_UFS_MTK_SQD 0x2800 +#define REG_UFS_MTK_SQIS 0x2814 +#define REG_UFS_MTK_CQD 0x281C +#define REG_UFS_MTK_CQIS 0x2824 + +#define REG_UFS_MCQ_STRIDE 0x30 + /* * Ref-clk control *