From patchwork Tue May 25 05:53:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277897 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT 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 EC2E3C2B9F8 for ; Tue, 25 May 2021 05:54:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B754561413 for ; Tue, 25 May 2021 05:54:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B754561413 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qlK6p6uhqAMNXglMjEMSzst4kkcHa6j/KNzRWoxsjs8=; b=z3XOQegJQf3Yuk 9MdAHCxFFhI/KLgqDXM8nBAOFq0Bd5Rh1Eai3ERTkV3Fz0lJzNb6uVUIO0+0VzIKNPM3B7a0C/YSV y9ozVJ8+0QzGpr8wiLajXYhNeTZkyKXCbk5mFFwd8YxGYlw8i5+drCzfyDpFsmxGn9dcHVdPSJXGn mvohllfOCWbhsTDXqZ1mp5v27Wo3st+S8aQpqXFNOm0cbz/K7RAj8eOuZYi5FeH9s5dorSVG8wDUX KWdBYdbFQB/EuFSD8zwMJ2qvwqT33RTQPclr7Lk2kFyJZxek9SZ8d2bcxgbV9IeWE1ACbgF4gdfkb /ZLo5URDzlQ/GamcSUAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQ1G-003UYK-S0; Tue, 25 May 2021 05:54:22 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQ0Z-003UOK-Fa; Tue, 25 May 2021 05:53:42 +0000 X-UUID: 7ce4b7d99efe4fac915ddaaf69afb10d-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=Z3YgRiUcPI7aSIbmkqVoe3OpEl0GTL9O36vKr7jIn+M=; b=OVimEB8Xplq2K0VQY8SuePyZP05mOCKPB3H8VOGm2Kjgvq+i6Xs6M5IECv/2sNyA5l8e76BBHqPoAgIj2fOg0TFbjsWk+ZarmC0FKvm77q22o61Ud+dpy6zepm881tPHKbXS8M73y2MbMrfWaDRbgXNpfZ0zPnCOpYBcZm+4pYw=; X-UUID: 7ce4b7d99efe4fac915ddaaf69afb10d-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 667782685; Mon, 24 May 2021 22:53:33 -0700 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:16 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:14 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:14 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 1/7] dt-bindings: devapc: Add 'vio-idx-num' field to support mt8192 Date: Tue, 25 May 2021 13:53:00 +0800 Message-ID: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_225340_990189_CC14188B X-CRM114-Status: GOOD ( 11.77 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu For new ICs, there are multiple devapc HWs for different subsys. We add a field 'vio-idx-num' in DT to indicate the number of devices controlled by each devapc. To be backward compatible with old ICs which have only one devapc HW, this field is not required. The 'vio-idx-num' info will be set in compatible data instead. Reviewed-by: Rob Herring Signed-off-by: Nina Wu --- Documentation/devicetree/bindings/soc/mediatek/devapc.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/soc/mediatek/devapc.yaml b/Documentation/devicetree/bindings/soc/mediatek/devapc.yaml index 31e4d3c..69abd03 100644 --- a/Documentation/devicetree/bindings/soc/mediatek/devapc.yaml +++ b/Documentation/devicetree/bindings/soc/mediatek/devapc.yaml @@ -20,11 +20,16 @@ properties: compatible: enum: - mediatek,mt6779-devapc + - mediatek,mt8192-devapc reg: description: The base address of devapc register bank maxItems: 1 + mediatek,vio-idx-num: + description: The number of the devices controlled by devapc + $ref: /schemas/types.yaml#/definitions/uint32 + interrupts: description: A single interrupt specifier maxItems: 1 From patchwork Tue May 25 05:53:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277919 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 8C701C2B9F8 for ; Tue, 25 May 2021 06:00:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 573B1613AB for ; Tue, 25 May 2021 06:00:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 573B1613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Lw4RVipmA+3gZP5kIB0HB/ZE0JIbyG4SvkT7zZz5RCQ=; b=GHQMUn71Zv1vXh EAs+slVkwLs+eLa/C2tvE/VamYV3i9pO7agE3JY6JghPJvqHmL5YRKFkOxBsgR53sRzNRk++4jqJX ifSdNvINI7RgYgCiCYxIQs7K2QqmvCI2J3pLleWVQCLAJenDxrRxKAVf+duvazYfEvsU/9ZqGKq4P nHfwNeaqu8N7aVQAXGQj3+MUYJ7dmi2ctZjyduw+SrETMMj3bUamwmukxFkx53VVOIFuju2BHbkkf jIOZUsVkXkrBYc8pktfXr82T42uDcHeun1IKYXswShIVCwO3+BsNU0U+PHQ1vEBhd7DOgg731Gjms azT8ImqW88u6WljCSWEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQ7L-003WBu-VZ; Tue, 25 May 2021 06:00:40 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQ6n-003W56-Bd; Tue, 25 May 2021 06:00:06 +0000 X-UUID: 8cd11f3f81ea4fd1a7b50de3eb6602eb-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=zEKHr+ci2JttY8gj6nUAGYKf8GY5L0tjVJhMALr70gI=; b=HolRojYZC1TjoomOATJN2ioBXJ1BYcW9cicJX56VLR3FOR1EM4LxOBhC3uF/BxCl4+wH8fH2UTmJUEzpLuuaOdRoDp7wIz/ORJI5dFpwtLIGtsgOTcLooT/3q0EpvRuX7kLUtCszxQx9tXobrjLeIJVE3V9V5l0cmVYKI5DVWtA=; X-UUID: 8cd11f3f81ea4fd1a7b50de3eb6602eb-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 294518170; Mon, 24 May 2021 23:00:03 -0700 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:31 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:29 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:29 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 2/7] soc: mediatek: devapc: get 'vio_idx_num' info from DT Date: Tue, 25 May 2021 13:53:01 +0800 Message-ID: <1621921986-20578-2-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_230005_459277_DD1E7158 X-CRM114-Status: GOOD ( 19.54 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu For new ICs, there are multiple devapc HWs for different subsys. The number of devices controlled by each devapc (i.e. 'vio_idx_num') will be set in DT for per devapc node. On the other hand, for old ICs which have only one devapc HW, the 'vio_idx_num' info is set in compatible data. To be backward compatible, the 'vio_idx_num' in compatible data is set as the default value. Only when the default value is 0 will we get the 'vio_idx_num' from DT. Signed-off-by: Nina Wu --- drivers/soc/mediatek/mtk-devapc.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index f1cea04..71643d1 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -32,7 +32,7 @@ struct mtk_devapc_vio_dbgs { }; struct mtk_devapc_data { - /* numbers of violation index */ + /* default numbers of violation index */ u32 vio_idx_num; /* reg offset */ @@ -51,6 +51,9 @@ struct mtk_devapc_context { void __iomem *infra_base; struct clk *infra_clk; const struct mtk_devapc_data *data; + + /* numbers of violation index */ + u32 vio_idx_num; }; static void clear_vio_status(struct mtk_devapc_context *ctx) @@ -60,10 +63,10 @@ static void clear_vio_status(struct mtk_devapc_context *ctx) reg = ctx->infra_base + ctx->data->vio_sta_offset; - for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->data->vio_idx_num) - 1; i++) + for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num) - 1; i++) writel(GENMASK(31, 0), reg + 4 * i); - writel(GENMASK(VIO_MOD_TO_REG_OFF(ctx->data->vio_idx_num) - 1, 0), + writel(GENMASK(VIO_MOD_TO_REG_OFF(ctx->vio_idx_num) - 1, 0), reg + 4 * i); } @@ -80,15 +83,15 @@ static void mask_module_irq(struct mtk_devapc_context *ctx, bool mask) else val = 0; - for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->data->vio_idx_num) - 1; i++) + for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num) - 1; i++) writel(val, reg + 4 * i); val = readl(reg + 4 * i); if (mask) - val |= GENMASK(VIO_MOD_TO_REG_OFF(ctx->data->vio_idx_num) - 1, + val |= GENMASK(VIO_MOD_TO_REG_OFF(ctx->vio_idx_num) - 1, 0); else - val &= ~GENMASK(VIO_MOD_TO_REG_OFF(ctx->data->vio_idx_num) - 1, + val &= ~GENMASK(VIO_MOD_TO_REG_OFF(ctx->vio_idx_num) - 1, 0); writel(val, reg + 4 * i); @@ -256,6 +259,16 @@ static int mtk_devapc_probe(struct platform_device *pdev) if (!ctx->infra_base) return -EINVAL; + /* Set vio_idx_num to default value. + * If the value is 0, get the info from DT. + */ + ctx->vio_idx_num = ctx->data->vio_idx_num; + if (!ctx->vio_idx_num) + if (of_property_read_u32(node, + "vio-idx-num", + &ctx->vio_idx_num)) + return -EINVAL; + devapc_irq = irq_of_parse_and_map(node, 0); if (!devapc_irq) return -EINVAL; From patchwork Tue May 25 05:53:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277933 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT 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 DAF28C4707F for ; Tue, 25 May 2021 06:04:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5B98613AB for ; Tue, 25 May 2021 06:04:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5B98613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6mhihqLD3+HdmG0+Pg5bW8WA8CkbEdmeRCTGBqiIRws=; b=HL6KZ8WaNF7CZF eMqKrwxi40OxxOJekNQkf/C0qZ3FXHy9GX6mwTGVvSSel48vVWvdJQHtW3XeZBa5hQsrzVPo9hm4E rrWdkZtsZ75rrHrEMke7GLLOb934adSAvuRarFKXOJOdoFidYpy2k2t7jXVCD4O+q/ZwtmNh0xvTV poKuDlesWXzb+Dr/DXkmWUaYEliCYc+yOIG4E8qI47hhYpoW4phYNvZd9t2rBvYqo36Yv9rRQdYuY M96TitXI1d3JP2NZkb1FWNuPvLJX8GYl097tvY80BhU7j43Mu9SivzUTDz6OfWENg6qRATA5PpDSd 6KPnK1PWIke2BYCcTXDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQBL-003XAN-JU; Tue, 25 May 2021 06:04:47 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQAI-003WxH-0H; Tue, 25 May 2021 06:03:44 +0000 X-UUID: 097b6cfa30784a228ac9e20fff634a19-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=9ns82IY587K4PXmhGtum3Fbwa4lann5c4XHQ3JjguA4=; b=qUDdll3sg6Vk/EsMenraAj0GCaXbVMWaCPb5bu35mbpVVXyFSh/GQ+5qayQwyVVfRsSYYUy+nTXqeCk8WYUBCXjLTeT9Sszusir/vmnDjrmoOyb8qMkoWbZ7W14Cp2BUr9qCMDHYNDV7qwSch3vMeCZ/LsULwTnjfzAWQmL5ddA=; X-UUID: 097b6cfa30784a228ac9e20fff634a19-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 412609330; Mon, 24 May 2021 23:03:39 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:36 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:35 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:35 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 3/7] soc: mediatek: devapc: add shared flag to IRQ Date: Tue, 25 May 2021 13:53:02 +0800 Message-ID: <1621921986-20578-3-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_230342_095816_50E64831 X-CRM114-Status: GOOD ( 13.03 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu For new ICs, there are multiple devapc HWs for different subsys. They all share the same IRQ number. Signed-off-by: Nina Wu --- drivers/soc/mediatek/mtk-devapc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index 71643d1..6d58a75 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -281,7 +281,7 @@ static int mtk_devapc_probe(struct platform_device *pdev) return -EINVAL; ret = devm_request_irq(&pdev->dev, devapc_irq, devapc_violation_irq, - IRQF_TRIGGER_NONE, "devapc", ctx); + IRQF_TRIGGER_NONE | IRQF_SHARED, "devapc", ctx); if (ret) { clk_disable_unprepare(ctx->infra_clk); return ret; From patchwork Tue May 25 05:53:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277899 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0FE4EC2B9F8 for ; Tue, 25 May 2021 05:55:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC8BF613AB for ; Tue, 25 May 2021 05:55:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC8BF613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cjirzI8Twdr8o5wmw3anSqIk9QgYDCDczHniy/XLyRM=; b=akVYXrvEfOxSpx bgJh4/0DZopMzMxborQGVKLM1La+DHeTQUMMcSoqKj5a6ANld4IbpBynFRJKtrRvNsQJBQGqQcOKb JuVdAsMo67mMYE7ZJrfiiqK5pjnr3wxDo8dMHEWJMyxSpoeFVnEqXlww3g/Di8JnASyC99Yp1n3MP nAKyx/L4l7vqn6b+HkPcb4ORGqZcO4xwoHmrVNd1IBBFEJHyrrGlDDeojzj7U5baje3xTJDGgeIvh 3xMAQh6saA8QhcT6K62FOo4Mt/jqZUyODmvTP1M5r3FSPSKK8JCY2XlXra42JiLPjlvpnhvfeaTVA Vtw4lMtpgLK1YqMexEIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQ25-003Um7-Cq; Tue, 25 May 2021 05:55:13 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQ0s-003USM-SP; Tue, 25 May 2021 05:54:00 +0000 X-UUID: bcc76a56880547338808d0101e16fb85-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=YChYFSpMZ5X1sqIQJCrk/i4WTabGD/xOUN1MN5IhfT8=; b=YCgOW0IkLe0treKTSCGzNC5VYv7XMcwk3MO96QEMbmvuxuBBqqY4ZFR5ShdkUds/K+UzIn1mYYt0H2F4PjxDTbT1uVZB3Rs3a502uflemYAaCU7/gsv2N7xrOyyKWq4u4VGVQTpH0AQ134WH9sTpYqWxcRyt2p0UavTvTxeCwdM=; X-UUID: bcc76a56880547338808d0101e16fb85-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 289725427; Mon, 24 May 2021 22:53:53 -0700 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:50 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:49 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:49 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 4/7] soc: mediatek: devapc: rename register variable infra_base Date: Tue, 25 May 2021 13:53:03 +0800 Message-ID: <1621921986-20578-4-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_225358_964116_D258B420 X-CRM114-Status: GOOD ( 16.66 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu For new ICs, there are multiple devapc HWs for different subsys. For example, there is devapc respectively for infra, peri, peri2, etc. So we rename the variable 'infra_base' to 'base' for code readability. Signed-off-by: Nina Wu --- drivers/soc/mediatek/mtk-devapc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index 6d58a75..f5d63c5 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -48,7 +48,7 @@ struct mtk_devapc_data { struct mtk_devapc_context { struct device *dev; - void __iomem *infra_base; + void __iomem *base; struct clk *infra_clk; const struct mtk_devapc_data *data; @@ -61,7 +61,7 @@ static void clear_vio_status(struct mtk_devapc_context *ctx) void __iomem *reg; int i; - reg = ctx->infra_base + ctx->data->vio_sta_offset; + reg = ctx->base + ctx->data->vio_sta_offset; for (i = 0; i < VIO_MOD_TO_REG_IND(ctx->vio_idx_num) - 1; i++) writel(GENMASK(31, 0), reg + 4 * i); @@ -76,7 +76,7 @@ static void mask_module_irq(struct mtk_devapc_context *ctx, bool mask) u32 val; int i; - reg = ctx->infra_base + ctx->data->vio_mask_offset; + reg = ctx->base + ctx->data->vio_mask_offset; if (mask) val = GENMASK(31, 0); @@ -118,11 +118,11 @@ static int devapc_sync_vio_dbg(struct mtk_devapc_context *ctx) int ret; u32 val; - pd_vio_shift_sta_reg = ctx->infra_base + + pd_vio_shift_sta_reg = ctx->base + ctx->data->vio_shift_sta_offset; - pd_vio_shift_sel_reg = ctx->infra_base + + pd_vio_shift_sel_reg = ctx->base + ctx->data->vio_shift_sel_offset; - pd_vio_shift_con_reg = ctx->infra_base + + pd_vio_shift_con_reg = ctx->base + ctx->data->vio_shift_con_offset; /* Find the minimum shift group which has violation */ @@ -164,8 +164,8 @@ static void devapc_extract_vio_dbg(struct mtk_devapc_context *ctx) void __iomem *vio_dbg0_reg; void __iomem *vio_dbg1_reg; - vio_dbg0_reg = ctx->infra_base + ctx->data->vio_dbg0_offset; - vio_dbg1_reg = ctx->infra_base + ctx->data->vio_dbg1_offset; + vio_dbg0_reg = ctx->base + ctx->data->vio_dbg0_offset; + vio_dbg1_reg = ctx->base + ctx->data->vio_dbg1_offset; vio_dbgs.vio_dbg0 = readl(vio_dbg0_reg); vio_dbgs.vio_dbg1 = readl(vio_dbg1_reg); @@ -203,7 +203,7 @@ static irqreturn_t devapc_violation_irq(int irq_number, void *data) */ static void start_devapc(struct mtk_devapc_context *ctx) { - writel(BIT(31), ctx->infra_base + ctx->data->apc_con_offset); + writel(BIT(31), ctx->base + ctx->data->apc_con_offset); mask_module_irq(ctx, false); } @@ -215,7 +215,7 @@ static void stop_devapc(struct mtk_devapc_context *ctx) { mask_module_irq(ctx, true); - writel(BIT(2), ctx->infra_base + ctx->data->apc_con_offset); + writel(BIT(2), ctx->base + ctx->data->apc_con_offset); } static const struct mtk_devapc_data devapc_mt6779 = { @@ -255,8 +255,8 @@ static int mtk_devapc_probe(struct platform_device *pdev) ctx->data = of_device_get_match_data(&pdev->dev); ctx->dev = &pdev->dev; - ctx->infra_base = of_iomap(node, 0); - if (!ctx->infra_base) + ctx->base = of_iomap(node, 0); + if (!ctx->base) return -EINVAL; /* Set vio_idx_num to default value. From patchwork Tue May 25 05:53:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277935 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A2EE1C2B9F8 for ; Tue, 25 May 2021 06:05:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64D016140F for ; Tue, 25 May 2021 06:05:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64D016140F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IaXAM0v2WgNw6EIlbWWM9hNilKKkcp+ClJXAMo+T2is=; b=cNUMdO7XaXzwaZ 4MyvlWsdHy0qOyxwMXYIHVATnrDmgDMIr+QDgtvbR+1y5PHwuYGXGNGRENW+aFs6chUjF74ADe/E4 cDCBg5gbyAsrM8x14+amxkBmx+xjW+dMqOGR0js9q1viFJ1hIFIZa6dVyRAyL1ZP30KTzLTlTPTGC qxwm5otMfNgfiOaoXAcgkQ4ZmgDOTNp/DZOGsYScpiOR4EPgwVcJuC5zc8Sahsag9FkAhy5WDRqV6 k/PRhG51ZinONKcZJVgB+7lGIlzR4ATCeD26JR7f+14+nxfqj35Y0VX2mSZGMYkCMEzPLThqnxYto AXmEbeUAjIjufT/JCNIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQCG-003XO1-2t; Tue, 25 May 2021 06:05:44 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQAJ-003Wxl-0o; Tue, 25 May 2021 06:03:46 +0000 X-UUID: 0be76eaa0f6c44d9b3004cef565080ad-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=IeqqO8f1hiIGe/d5rxlROK2HoWoN70xo72brP495zpI=; b=FPI/j8kgv3Dt3cjokftXwaskayHo9yLJfQkyIQFzCQ1BTocKCH7DXfOTX4UoX3tnhY9UFcGjoVFnlRti/ksru//NVjl6ZjKROi6n0JAvhb8lUGvawO4fDZw8Ml8V4i4w3RcSoVrXnk9h6jG+El+wJkNOfZBHkJbYZGRRl9O4WN0=; X-UUID: 0be76eaa0f6c44d9b3004cef565080ad-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 236269152; Mon, 24 May 2021 23:03:39 -0700 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:53 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:51 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:51 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 5/7] soc: mediatek: devapc: add debug register for new IC support Date: Tue, 25 May 2021 13:53:04 +0800 Message-ID: <1621921986-20578-5-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_230343_114615_36C70E71 X-CRM114-Status: GOOD ( 16.76 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu There are 3 debug info registers in new ICs while in legacy ones, we have only 2. We add a 'version' field in compatible data to decide how we extract the debug info. Signed-off-by: Nina Wu --- drivers/soc/mediatek/mtk-devapc.c | 43 +++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index f5d63c5..bdc8fe9 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -26,12 +26,24 @@ struct mtk_devapc_vio_dbgs { u32 addr_h:4; u32 resv:4; } dbg0_bits; + + struct { + u32 dmnid:6; + u32 vio_w:1; + u32 vio_r:1; + u32 addr_h:4; + u32 resv:20; + } dbg0_bits_ver2; }; u32 vio_dbg1; + u32 vio_dbg2; }; struct mtk_devapc_data { + /* architecture version */ + u32 version; + /* default numbers of violation index */ u32 vio_idx_num; @@ -40,6 +52,7 @@ struct mtk_devapc_data { u32 vio_sta_offset; u32 vio_dbg0_offset; u32 vio_dbg1_offset; + u32 vio_dbg2_offset; u32 apc_con_offset; u32 vio_shift_sta_offset; u32 vio_shift_sel_offset; @@ -163,22 +176,43 @@ static void devapc_extract_vio_dbg(struct mtk_devapc_context *ctx) struct mtk_devapc_vio_dbgs vio_dbgs; void __iomem *vio_dbg0_reg; void __iomem *vio_dbg1_reg; + void __iomem *vio_dbg2_reg; + u32 vio_addr, bus_id, domain_id; + u32 vio_w, vio_r; vio_dbg0_reg = ctx->base + ctx->data->vio_dbg0_offset; vio_dbg1_reg = ctx->base + ctx->data->vio_dbg1_offset; + vio_dbg2_reg = ctx->base + ctx->data->vio_dbg2_offset; vio_dbgs.vio_dbg0 = readl(vio_dbg0_reg); vio_dbgs.vio_dbg1 = readl(vio_dbg1_reg); + if (ctx->data->version == 2U) + vio_dbgs.vio_dbg2 = readl(vio_dbg2_reg); + + if (ctx->data->version == 1U) { + /* arch version 1 */ + bus_id = vio_dbgs.dbg0_bits.mstid; + vio_addr = vio_dbgs.vio_dbg1; + domain_id = vio_dbgs.dbg0_bits.dmnid; + vio_w = vio_dbgs.dbg0_bits.vio_w; + vio_r = vio_dbgs.dbg0_bits.vio_r; + } else { + /* arch version 2 */ + bus_id = vio_dbgs.vio_dbg1; + vio_addr = vio_dbgs.vio_dbg2; + domain_id = vio_dbgs.dbg0_bits_ver2.dmnid; + vio_w = vio_dbgs.dbg0_bits_ver2.vio_w; + vio_r = vio_dbgs.dbg0_bits_ver2.vio_r; + } /* Print violation information */ - if (vio_dbgs.dbg0_bits.vio_w) + if (vio_w) dev_info(ctx->dev, "Write Violation\n"); - else if (vio_dbgs.dbg0_bits.vio_r) + else if (vio_r) dev_info(ctx->dev, "Read Violation\n"); dev_info(ctx->dev, "Bus ID:0x%x, Dom ID:0x%x, Vio Addr:0x%x\n", - vio_dbgs.dbg0_bits.mstid, vio_dbgs.dbg0_bits.dmnid, - vio_dbgs.vio_dbg1); + bus_id, domain_id, vio_addr); } /* @@ -219,6 +253,7 @@ static void stop_devapc(struct mtk_devapc_context *ctx) } static const struct mtk_devapc_data devapc_mt6779 = { + .version = 1, .vio_idx_num = 511, .vio_mask_offset = 0x0, .vio_sta_offset = 0x400, From patchwork Tue May 25 05:53:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277931 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT 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 405A6C2B9F8 for ; Tue, 25 May 2021 06:04:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED9C96140F for ; Tue, 25 May 2021 06:04:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED9C96140F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vsKao2UBhjxeME6L/XwlrVrPJJ28KIg7wspO6CXWOso=; b=A9joLY8uCgyVp6 ceJHfr23mbZ9q2wL0jpYbcMOnf5EgZGi+KeeJ6SOgHa/N/Iw1oyBiFyh/o9mIFv1d9m50dKKJzqJm BDXn18AcYICN9WsCu8uJbEswafGhtNbiBNrRAIcviDDWllPxeZ+rfj/Kr1frjJIgLsuWjgxX2gguL VLEHn+bdAqGqWSqivi56uTLa78jVdRDXaUhZk7p/4o+SiOIq/UMXhYCy6J15LXkStyA2SIRuHaPlY NR0z5SXsDfqvVNjOv7Yx6L7Zx6ca4ptpMKcLh69D7tSBc8+2woHIVEMLQeSfS+fTnFbXGu4wolumo YWnOqGbQpjwNeR9bpa8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQBJ-003X9r-0E; Tue, 25 May 2021 06:04:45 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQAK-003WxH-SC; Tue, 25 May 2021 06:03:46 +0000 X-UUID: 2e27311bd5474c5c85746a7914ea8ab1-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=2k1LMIj64UI3BvUQfu837OeQZJsn/DBVEF9IH36o17s=; b=nvqIx8JHeZPnH5yX4j/mt2Pw8NwJXLpWCeGTJZgTgj5KK9cbSmO+7P2qrSeXvzVPN5ncIfFZtkJ367cuoK7k5NB5hxrdO1kt+OQ7Htc970MEIyEjxV7lPprHYYmLJRTveacIfN3qllaH6emyyq0ioDuHGuosEN/3PW5b4gp0UmA=; X-UUID: 2e27311bd5474c5c85746a7914ea8ab1-20210524 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 624076786; Mon, 24 May 2021 23:03:39 -0700 Received: from mtkmbs08n1.mediatek.inc (172.21.101.55) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:53:55 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:53 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:53 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 6/7] soc: mediatek: devapc: support mt8192 Date: Tue, 25 May 2021 13:53:05 +0800 Message-ID: <1621921986-20578-6-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_230345_019439_4368C67A X-CRM114-Status: GOOD ( 10.05 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu Add compatible to support mt8192. Signed-off-by: Nina Wu --- drivers/soc/mediatek/mtk-devapc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index bdc8fe9..84dd6a2 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -265,11 +265,27 @@ static const struct mtk_devapc_data devapc_mt6779 = { .vio_shift_con_offset = 0xF20, }; +static const struct mtk_devapc_data devapc_mt8192 = { + .version = 2, + .vio_mask_offset = 0x0, + .vio_sta_offset = 0x400, + .vio_dbg0_offset = 0x900, + .vio_dbg1_offset = 0x904, + .vio_dbg2_offset = 0x908, + .apc_con_offset = 0xF00, + .vio_shift_sta_offset = 0xF20, + .vio_shift_sel_offset = 0xF30, + .vio_shift_con_offset = 0xF10, +}; + static const struct of_device_id mtk_devapc_dt_match[] = { { .compatible = "mediatek,mt6779-devapc", .data = &devapc_mt6779, }, { + .compatible = "mediatek,mt8192-devapc", + .data = &devapc_mt8192, + }, { }, }; From patchwork Tue May 25 05:53:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Wu X-Patchwork-Id: 12277901 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E69ECC2B9F8 for ; Tue, 25 May 2021 05:55:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7C60613AB for ; Tue, 25 May 2021 05:55:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7C60613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hb4EPWpKziFfUIHB0hkqdefIa3pG2wh5L3nKwuwIYYo=; b=X/crVdDCF6EvrD WbluSqv2qy3arKmOhQt6OVcPocyaAuZxH0CUQ3BQX+yISYhE38honJnAfP1YcNDWeusjU7RVSBiIq BZ/Ld8Hhc/EK2Zfuk1tMqjDtWms0o01XqKX9VascF6cOtEl/j3rAx0CwVjXPZjk8ci+XDqGRpYSPr spu+obhS/pQFMRaka5unATEUuAk7aS4JMYoc24Gmx4eY2ozR8MPuO35pKqG9pYXFSsbe5WJU0pe4Z 1Y8S/0m1l7u3ncQGxzg4nW/SWZyU0s5SuHR9f3W2LDxQO0UHe3lWfrdt5czPzFIQFcMxIBjCNCuVl 31SBsREvrvm0ZJSq5F5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llQ2c-003Uw5-0a; Tue, 25 May 2021 05:55:46 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1llQ0x-003UUB-Mj; Tue, 25 May 2021 05:54:05 +0000 X-UUID: 3dba30ac6aef4b4c84c00355367636fa-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=M9PbB3Ho7qxMK4qJbrHOGq+ZfKUCCg9EFAejM9xN66A=; b=hRqfQUpSki85u3sFg+ZSoPDIAIveErPdlgYyUNPVdrAdbjCfx4BxQ+TPD9TbtJrjZSQ6c1D/LkQwIWejHdmVQpAHrfLAT7DaLaEUTgNp/IcUlAlvjWchbOmtMY+5gst0Jbr8BJ/KKgye2LGxYPrmyiv9cBS7FC/aT4KSDII1Igs=; X-UUID: 3dba30ac6aef4b4c84c00355367636fa-20210524 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 420716170; Mon, 24 May 2021 22:54:02 -0700 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 22:54:00 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 25 May 2021 13:53:59 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 25 May 2021 13:53:59 +0800 From: Nina Wu To: Rob Herring , Matthias Brugger CC: Zhen Lei , Nina Wu , , , , , , , Subject: [PATCH v4 7/7] arm64: dts: mt8192: Add devapc node Date: Tue, 25 May 2021 13:53:06 +0800 Message-ID: <1621921986-20578-7-git-send-email-nina-cm.wu@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> References: <1621921986-20578-1-git-send-email-nina-cm.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210524_225403_788402_1FEAC30E X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nina Wu Add devapc nodes to mt8192. Signed-off-by: Nina Wu --- This patch depends on "Add dt-bindings of MT8192 clocks" [1] and "Add mt8192 clock controllers" [2] [1] https://patchwork.kernel.org/project/linux-mediatek/patch/20210524122053.17155-7-chun-jie.chen@mediatek.com/ [2] https://patchwork.kernel.org/project/linux-mediatek/patch/20210331083854.7650-2-chun-jie.chen@mediatek.com/ --- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi index b0923de..6f5c8c5 100644 --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi @@ -517,6 +517,33 @@ clock-names = "clk13m"; }; + devapc_infra: devapc@10207000 { + compatible = "mediatek,mt8192-devapc"; + reg = <0 0x10207000 0 0x1000>; + vio-idx-num = <367>; + interrupts = ; + clocks = <&infracfg CLK_INFRA_DEVICE_APC>; + clock-names = "devapc-infra-clock"; + }; + + devapc_peri: devapc@10274000 { + compatible = "mediatek,mt8192-devapc"; + reg = <0 0x10274000 0 0x1000>; + vio-idx-num = <292>; + interrupts = ; + clocks = <&infracfg CLK_INFRA_DEVICE_APC>; + clock-names = "devapc-infra-clock"; + }; + + devapc_peri2: devapc@10275000 { + compatible = "mediatek,mt8192-devapc"; + reg = <0 0x10275000 0 0x1000>; + vio-idx-num = <242>; + interrupts = ; + clocks = <&infracfg CLK_INFRA_DEVICE_APC>; + clock-names = "devapc-infra-clock"; + }; + scp_adsp: syscon@10720000 { compatible = "mediatek,mt8192-scp_adsp", "syscon"; reg = <0 0x10720000 0 0x1000>; @@ -661,6 +688,15 @@ status = "disabled"; }; + devapc_peri_par: devapc@11020000 { + compatible = "mediatek,mt8192-devapc"; + reg = <0 0x11020000 0 0x1000>; + vio-idx-num = <58>; + interrupts = ; + clocks = <&infracfg CLK_INFRA_DEVICE_APC>; + clock-names = "devapc-infra-clock"; + }; + nor_flash: spi@11234000 { compatible = "mediatek,mt8192-nor"; reg = <0 0x11234000 0 0xe0>;