Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1422100pxy; Mon, 2 Aug 2021 00:48:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo9+X5NKu/OVN8LN6ReW3wPVjM2uMR40mLdlnK+UVT5laSn5bsQU8b2u2H3HDML12Qcc7S X-Received: by 2002:a17:906:a2c4:: with SMTP id by4mr14479158ejb.521.1627890509872; Mon, 02 Aug 2021 00:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627890509; cv=none; d=google.com; s=arc-20160816; b=N5EAw+BA1QCfoy9nOG2ezSZyaNS/GBOt2YvaMiAS96CZslqmuguskkJ4K90/jt5qG7 T7/jRiEQ5bElnu4XNatSmslUGN6Ex/Fq5dNj8TdwRVBn3Dp446oyG5afdNtYeNc7/es+ WFCyM4teaOmej/UUW+QMpS44cEwBDI7DeJghfwYnYZ/mly28F8zbPvrUFIPyMMjmCHgZ B8YXnm4fBFr3OYP6zwjT3P1xUwiHYmdvQAHvJjCz/iQZdwaTxM561ESDkPRWguQh5pkF SFNg0NubX/fJDo36aceTnKcfWI4EUfZnjNlsStGBcktKYYn1jfNTD8fdVvH0yxcqZ1fT O6FQ== 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; bh=D3J5SJlyNbZUVHdzF4KvGRc9+LC4ECK4Y1u7rTFwImU=; b=EKLkiT5ixjqST39Gqzsl8ht8/9gs2N4D+PcYKSzuND0chtOD7wJHaAQpzx2bA3SxN7 Zib1B9qjveg5VXTvCPPg4AxiJ8QizMoAkgbrZ1v7YC8LNTm9w9KE+pFGmyQMdAN9v1Sg uV6D5dLe5amTH+rGp+jsK+pW71Hj9Sd20zpbLbL9+bBwEZZ3+c/cc1L7aTXYUB5sI0Mz qlVMYO0mPJ7qhx0lidMO1Yqq0Gn1H3MmICrvJ3x4xDoY7qu1K1LqCu2G24jaC/4pMqHk GROhwqoru/3YtUhD2I9DqxHLGwrt006V64JllWFwiTMBbMnUH/vm0EBTlHHZXp1FmXjz 00Cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi6si3728386edb.580.2021.08.02.00.48.06; Mon, 02 Aug 2021 00:48:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232625AbhHBHrC (ORCPT + 99 others); Mon, 2 Aug 2021 03:47:02 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:33506 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232482AbhHBHrB (ORCPT ); Mon, 2 Aug 2021 03:47:01 -0400 X-UUID: 482f44db113b442dbcb71c84c28f9bf5-20210802 X-UUID: 482f44db113b442dbcb71c84c28f9bf5-20210802 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1255673420; Mon, 02 Aug 2021 15:46:49 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 2 Aug 2021 15:46:47 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 2 Aug 2021 15:46:40 +0800 From: Yongqiang Niu To: Chun-Kuang Hu CC: Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Jassi Brar , Yongqiang Niu , Fabien Parent , Dennis YC Hsieh , , , , , , , Hsin-Yi Wang Subject: [PATCH v6, 3/3] mailbox: cmdq: add mt8192 support Date: Mon, 2 Aug 2021 15:46:05 +0800 Message-ID: <1627890365-22992-4-git-send-email-yongqiang.niu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1627890365-22992-1-git-send-email-yongqiang.niu@mediatek.com> References: <1627890365-22992-1-git-send-email-yongqiang.niu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org add mt8192 support Signed-off-by: Yongqiang Niu Signed-off-by: Hsin-Yi Wang --- drivers/mailbox/mtk-cmdq-mailbox.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 67a42b5..8d39b98 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -36,6 +36,8 @@ #define CMDQ_THR_WAIT_TOKEN 0x30 #define CMDQ_THR_PRIORITY 0x40 +#define GCE_GCTL_VALUE 0x48 + #define CMDQ_THR_ACTIVE_SLOT_CYCLES 0x3200 #define CMDQ_THR_ENABLED 0x1 #define CMDQ_THR_DISABLED 0x0 @@ -76,11 +78,13 @@ struct cmdq { struct clk *clock; bool suspended; u8 shift_pa; + bool control_by_sw; }; struct gce_plat { u32 thread_nr; u8 shift; + bool control_by_sw; }; u8 cmdq_get_shift_pa(struct mbox_chan *chan) @@ -121,6 +125,8 @@ static void cmdq_init(struct cmdq *cmdq) int i; WARN_ON(clk_enable(cmdq->clock) < 0); + if (cmdq->control_by_sw) + writel(0x7, cmdq->base + GCE_GCTL_VALUE); writel(CMDQ_THR_ACTIVE_SLOT_CYCLES, cmdq->base + CMDQ_THR_SLOT_CYCLES); for (i = 0; i <= CMDQ_MAX_EVENT; i++) writel(i, cmdq->base + CMDQ_SYNC_TOKEN_UPDATE); @@ -540,6 +546,7 @@ static int cmdq_probe(struct platform_device *pdev) cmdq->thread_nr = plat_data->thread_nr; cmdq->shift_pa = plat_data->shift; + cmdq->control_by_sw = plat_data->control_by_sw; cmdq->irq_mask = GENMASK(cmdq->thread_nr - 1, 0); err = devm_request_irq(dev, cmdq->irq, cmdq_irq_handler, IRQF_SHARED, "mtk_cmdq", cmdq); @@ -605,11 +612,14 @@ static int cmdq_probe(struct platform_device *pdev) static const struct gce_plat gce_plat_v2 = {.thread_nr = 16}; static const struct gce_plat gce_plat_v3 = {.thread_nr = 24}; static const struct gce_plat gce_plat_v4 = {.thread_nr = 24, .shift = 3}; +static const struct gce_plat gce_plat_v5 = {.thread_nr = 24, .shift = 3, + .control_by_sw = true}; static const struct of_device_id cmdq_of_ids[] = { {.compatible = "mediatek,mt8173-gce", .data = (void *)&gce_plat_v2}, {.compatible = "mediatek,mt8183-gce", .data = (void *)&gce_plat_v3}, {.compatible = "mediatek,mt6779-gce", .data = (void *)&gce_plat_v4}, + {.compatible = "mediatek,mt8192-gce", .data = (void *)&gce_plat_v5}, {} }; -- 1.8.1.1.dirty