From nobody Thu Sep 18 23:34:35 2025 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 A8433C4321E for ; Fri, 2 Dec 2022 11:52:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233205AbiLBLwx (ORCPT ); Fri, 2 Dec 2022 06:52:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233368AbiLBLwk (ORCPT ); Fri, 2 Dec 2022 06:52:40 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38838B4A4; Fri, 2 Dec 2022 03:52:37 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id n21so10975555ejb.9; Fri, 02 Dec 2022 03:52:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=1PtgXAGJmcmMEV5+MQtqk497ZJ57rtsXRI8tIjkSb9M=; b=iDb0lkEMzmazESd5awPzg6ZyS1abQbKXpfLtGCsD8QafTrPd9VY/H4r1xegNz7As+J rQvTR++06iApH+ybBpDCVdB2nEtLoZXKwxNx26exg2lGz4plEChJwe6/3N3Ws3kxGxeB Wmr5iLSr931xsGgQiuSDwsluZeN+OkaoT8A3KJF04LHjJNJ3/fs3MhBrFLZXMmejh0Sz V8EGz5XledxGK1gUgI4FzCGMPThvV2JOvek/IUvnWw+7NkY37RrYzGTusSrqQGQz1PWG yR4ZIbXJ6n1Pnqti2PFV0RyYqLMdTNRE2PV7jYA05JrC4QO0+9ccdIS1YrEyNYwklQm3 47mQ== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1PtgXAGJmcmMEV5+MQtqk497ZJ57rtsXRI8tIjkSb9M=; b=YbGlZO82iC0dSLCptcZwTzhxkE5R6lxBImgCt44hdzi5UNqQ0Nb2N8dhe2Ncvqnr3q sO4QVJn3mt9l967zuuGoJ6gTH+iYW23ULrvoUJGz6kID+Vi0GmsrmZHEeqR4LtMlM6un fJSsl6OXfK1oNnZeXOKLrlRFRpB03JaIb7OE6t6RGJj6HhKat8RZGUvQe84o+tNsFNyo DvQeUFRb1lvS4U3ofd+wu9KdcVf4lQj3Dwm8g9mi7qcFM4qIknnbf+INlgOQWc/tbbX+ r7VgmBdQJRJWpE2TiNL8hsqjgClfhPebJQXKAvPZfXO0gYUhn4gerhyNfV+6sqqXYbSB eCRw== X-Gm-Message-State: ANoB5ploVXDnJER9Bux8Q7yZc25aWLF8wUq8r92ibfoOGFzQ5Fv9AnzU yWxulGCZd+NZhy3AyoJGDnQ+LI5hKywV+g== X-Google-Smtp-Source: AA0mqf7jj01A8oMhYJoBckXaekMhZdpOj5mhNi9QsJ1oBNazwr9oRc1BsyV5aCFi7NW8gl2Dy7/6MA== X-Received: by 2002:a17:906:6c7:b0:78d:4061:5e1b with SMTP id v7-20020a17090606c700b0078d40615e1bmr51092779ejb.47.1669981955805; Fri, 02 Dec 2022 03:52:35 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:35 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Philipp Zabel , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 1/8] dt-bindings: reset: meson-g12a: Add missing NNA reset Date: Fri, 2 Dec 2022 12:52:13 +0100 Message-Id: <20221202115223.39051-2-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Doesn't appear in the TRM I have, but it is used by the downstream galcore driver. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong Acked-by: Philipp Zabel Reviewed-by: Martin Blumenstingl --- include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include= /dt-bindings/reset/amlogic,meson-g12a-reset.h index 6d487c5eba2c..45f6b8a951d0 100644 --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h @@ -69,7 +69,9 @@ #define RESET_PARSER_FETCH 72 #define RESET_CTL 73 #define RESET_PARSER_TOP 74 -/* 75-77 */ +/* 75 */ +#define RESET_NNA 76 +/* 77 */ #define RESET_DVALIN 78 #define RESET_HDMITX 79 /* 80-95 */ --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 53A68C4167B for ; Fri, 2 Dec 2022 11:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232662AbiLBLxC (ORCPT ); Fri, 2 Dec 2022 06:53:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233185AbiLBLwm (ORCPT ); Fri, 2 Dec 2022 06:52:42 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCF5915811; Fri, 2 Dec 2022 03:52:39 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id fc4so4039069ejc.12; Fri, 02 Dec 2022 03:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zpYJc8YISu2BRlH3hvxZv0fOIwXysejIA3F+djx3hbo=; b=f7b0KJLVs/0oskAJftN1Qp6QFdvpMjsxCbNbiw0zdeJ72tKWquaI5caqW/LDnVfhR6 qJE/N6ti/sPb37MKmE2J/YRHHtMYf8XzCrwNN6Ke0peHMXKrCYhfIgGPjcuQjEynX7vN +kkZBsFOtGrX1xrJxn60nO5hHLeUJirZu/2+KqNDANHoqK7k6ipCIyRLqSAb0Ziiv4Nt 0DWFlY+mVPZG1/1OnMG9Mqc4ys2wu0LJA08/RlR4xs0s8ZQ4kdsKne2bVNbON9vRt3DZ XGhIij0pQQD5Z9GvAKmms2+JemxRJHrHirV+kRiopMh9nuFp/C26GaAFMpNNAi5cGu/n oBgw== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zpYJc8YISu2BRlH3hvxZv0fOIwXysejIA3F+djx3hbo=; b=jrJ9fOy0/LvQDufSPMkuB+yOSGsYclrOR/3SAD+Jktfo/tnNzDBeMZUEg0WJUDXTtF k0KZcL6xzv9nfIzjXbi1igjgwBr8sOqdVNbcT36U1DcV9CYidocsQeJ7/tV6gOEmMeBN F6wxNYNl79USFHh7HB49W7dj7YpDEXDgU8fBausJKTDWfwtNJJ3Bgqh8pI9PJS8ewp+g 7QOjcQ1IL78KHoQufLAv6AQiDc/RkB25jHAEr1YUPIFgOAF8dmTZxSHUVimuSqYJpAX1 T54DYyY+6qep8M/1YE3hXUQhxS3Ka5Oo9JHj0QuotqO4+OoE9coEBLRAR6jURGjtJGIU RsVw== X-Gm-Message-State: ANoB5pnPKTamGvaTU+IlS8TNjls8BlbDf/TFV3wEXP4uOqmpXJms8ABH Y7ywVyQ4kb0kA2bhSaF/Ihm1VEV9QwM4jQ== X-Google-Smtp-Source: AA0mqf6nsc6YYjKGVTd3lWG1CooxDXTgbjwEpGKczarRIZtXYEjv/A+Z7GaUd+d2lI3Yo0V2wBadoQ== X-Received: by 2002:a17:906:c2c9:b0:7c0:ba35:b9ec with SMTP id ch9-20020a170906c2c900b007c0ba35b9ecmr4229488ejb.687.1669981958335; Fri, 02 Dec 2022 03:52:38 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:37 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 2/8] dt-bindings: power: Add G12A NNA power domain Date: Fri, 2 Dec 2022 12:52:14 +0100 Message-Id: <20221202115223.39051-3-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add define for the NNA power domain for the NPU in the G12A. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- include/dt-bindings/power/meson-g12a-power.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/power/meson-g12a-power.h b/include/dt-bind= ings/power/meson-g12a-power.h index bb5e67a842de..93b03bdd60b7 100644 --- a/include/dt-bindings/power/meson-g12a-power.h +++ b/include/dt-bindings/power/meson-g12a-power.h @@ -9,5 +9,6 @@ =20 #define PWRC_G12A_VPU_ID 0 #define PWRC_G12A_ETH_ID 1 +#define PWRC_G12A_NNA_ID 2 =20 #endif --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 96633C47088 for ; Fri, 2 Dec 2022 11:52:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233391AbiLBLw5 (ORCPT ); Fri, 2 Dec 2022 06:52:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233243AbiLBLwm (ORCPT ); Fri, 2 Dec 2022 06:52:42 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06656BF7 for ; Fri, 2 Dec 2022 03:52:41 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id l11so6182500edb.4 for ; Fri, 02 Dec 2022 03:52:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=XFkg6LALiTZGl9NAXbdWzz4DpTKGtwoKK/kUM7aSbHk=; b=MGB53sJL6yNAkcbcZAcQts88mjn8TP+JI77aEgnVW+FAk+1d6rh9ciPxK90Zeee/Cm 2sIEUfrOhCWKWZQbuL+VJvUUJBL5hZRrkL6ReE/KKXcQJ/BVqjaj+i6ECDUu5hci0ot/ lgYI37DqkagAHEbN6+IfcGdqdKJYKhPkuj2q8zblZ7FCFc3bB751wdFMitgFkfLs2AoL CGWyWvhYZLQT0dIKRhFjgRp+pDWQevKkAIv72WwRjcc4EIK/8U8ChrQ9ykdzOVnPlIx+ p78QIwsckbEY30ifzsEuFsZbDWVjzfD1hqgWP1jtLjA8GkusPtRQ6gdt8HMJ+DbiwTJM 2MDw== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XFkg6LALiTZGl9NAXbdWzz4DpTKGtwoKK/kUM7aSbHk=; b=MgZ3QhA+ywNsvGGA1TFmTW+q5UTjevTbt5XAvmL7x4HvwJzfehD1LKthPm7Hu0JEEN +275IgomkE5ZB7+XjmmkaBOI+yjhzPxzIzhYP4BNiz7QVz/zKWmIXRWwi11I9Znht+Ot 4Bb9Xm1mHRX8K0IgS437WrS9E2rgR9qNCYa14AYyAmFCekYIY4FsSe0tjXol7NieTK/A 6YBtvrhFh3NOhgRmnW1+FBAgekdpqe6MxmlmJVevq11m2rXCsTGXYD9z96nx1zmEjHc8 xd95lQH4P/uj1AKdOZfRaNw8FzLcgJEO6zvBmwsbSrOWI1AW+aZmrAffyaVXVbOd3/lF rp2Q== X-Gm-Message-State: ANoB5plijByuaSPPxCjUKgrjhKrXkpOhjrrk+thLlF49d6RRFwsWDECh KHftQNzgAfpTWax2tQ9vYlk= X-Google-Smtp-Source: AA0mqf5YSdD37zIdHOwaNDFnnyA8aeWZS/MRjbqAv9Ar3+pF4SJfF+ThVg5sQUFrfqscQmTMdUV2lA== X-Received: by 2002:a05:6402:19a:b0:460:7413:5d46 with SMTP id r26-20020a056402019a00b0046074135d46mr64058882edv.47.1669981959517; Fri, 02 Dec 2022 03:52:39 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:39 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Martin Blumenstingl , Kevin Hilman , Jerome Brunet , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 3/8] soc: amlogic: meson-pwrc: Add NNA power domain for A311D Date: Fri, 2 Dec 2022 12:52:15 +0100 Message-Id: <20221202115223.39051-4-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Based on power initialization sequence in downstream driver. Signed-off-by: Tomeu Vizoso Reviewed-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- drivers/soc/amlogic/meson-ee-pwrc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meso= n-ee-pwrc.c index dd5f2a13ceb5..f54acffc83f9 100644 --- a/drivers/soc/amlogic/meson-ee-pwrc.c +++ b/drivers/soc/amlogic/meson-ee-pwrc.c @@ -46,6 +46,9 @@ #define HHI_NANOQ_MEM_PD_REG1 (0x47 << 2) #define HHI_VPU_MEM_PD_REG2 (0x4d << 2) =20 +#define G12A_HHI_NANOQ_MEM_PD_REG0 (0x43 << 2) +#define G12A_HHI_NANOQ_MEM_PD_REG1 (0x44 << 2) + struct meson_ee_pwrc; struct meson_ee_pwrc_domain; =20 @@ -106,6 +109,13 @@ static struct meson_ee_pwrc_top_domain sm1_pwrc_usb = =3D SM1_EE_PD(17); static struct meson_ee_pwrc_top_domain sm1_pwrc_pci =3D SM1_EE_PD(18); static struct meson_ee_pwrc_top_domain sm1_pwrc_ge2d =3D SM1_EE_PD(19); =20 +static struct meson_ee_pwrc_top_domain g12a_pwrc_nna =3D { + .sleep_reg =3D GX_AO_RTI_GEN_PWR_SLEEP0, + .sleep_mask =3D BIT(16) | BIT(17), + .iso_reg =3D GX_AO_RTI_GEN_PWR_ISO0, + .iso_mask =3D BIT(16) | BIT(17), +}; + /* Memory PD Domains */ =20 #define VPU_MEMPD(__reg) \ @@ -217,6 +227,11 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_au= dio[] =3D { { HHI_AUDIO_MEM_PD_REG0, GENMASK(27, 26) }, }; =20 +static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] =3D { + { G12A_HHI_NANOQ_MEM_PD_REG0, GENMASK(31, 0) }, + { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(23, 0) }, +}; + #define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \ { \ .name =3D __name, \ @@ -253,6 +268,8 @@ static struct meson_ee_pwrc_domain_desc g12a_pwrc_domai= ns[] =3D { [PWRC_G12A_VPU_ID] =3D VPU_PD("VPU", &gx_pwrc_vpu, g12a_pwrc_mem_vpu, pwrc_ee_is_powered_off, 11, 2), [PWRC_G12A_ETH_ID] =3D MEM_PD("ETH", meson_pwrc_mem_eth), + [PWRC_G12A_NNA_ID] =3D TOP_PD("NNA", &g12a_pwrc_nna, g12a_pwrc_mem_nna, + pwrc_ee_is_powered_off), }; =20 static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] =3D { --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 281B6C4321E for ; Fri, 2 Dec 2022 11:53:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233380AbiLBLxE (ORCPT ); Fri, 2 Dec 2022 06:53:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233000AbiLBLwn (ORCPT ); Fri, 2 Dec 2022 06:52:43 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B5A024F2C; Fri, 2 Dec 2022 03:52:42 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id d14so1212396edj.11; Fri, 02 Dec 2022 03:52:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=emFoOM20hOM5X61XhU2Zz+3u4EcYFFGnLjIcqz3xjIc=; b=qGbxd30K3aoUCNRV3nAecE6ozZ6k5GHFTNjZ5lhz+nyIpwhHjEZJfCB8u43XI0hp1u zbB8Tob8DUgVVO8rRxdGFIOqh3jMy2eK7U+XhSBFf+9rEUbDnrs1qUBP0nC5Gvc2iknW ZKUgSSJrvtsFh/Yd+PGy012+1gt4J20IbV859+eln+HHAZ5JAiB30wBSxQXz2J+oKHhR nv06iSAIyqgwx0kgnRHP8g+jnjJiAmMotHkQIJfI0xCgVs7n4vXx4QHICBYoRM7cbsOj kSV64zlK5zrdMd6/mDfTKl5uoQbbNzN86Aab3UiFezv+24LDB3G0mDpfCj04F4+pbruV uJ1w== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=emFoOM20hOM5X61XhU2Zz+3u4EcYFFGnLjIcqz3xjIc=; b=h5M+W3ekBW0J3orE3DCEmlCwRY4TMPGM1bZmBNnxlK4aX7nAvS0jDV6rGA+7H4nhl6 72VJmx2wxJ3xKvOfySuFjnBRaKRicaZWBD2euZmDkPdZctqOg5mxYXYKJ/5oFHkBcihS J7Icu7dCSReNFvuYWYuazgN6N3EUdmGDmwdkIbaE1ABAHVHQZLnTyNkiyccyNUuvF0Y9 FqTpcKpODjAWhMvi3nFl5cWAOt2ZWNBLt+F1AVKQnOfASUWsrixhuj7jlHQbN80zOQsp xeUpYB3lRTn4BFeFWyHJabMdIYLbjZoMl+eqdspFPNXSc49OJ3GEIJIm6CpBMO409S+1 4TPQ== X-Gm-Message-State: ANoB5plyfAl4qvEnwxChd5QY9OXN78tvrOCtFEelUqfKY1sL0Zjq/EbC BM1itjXYs3UjUo8TplfSjwk= X-Google-Smtp-Source: AA0mqf5V6uCq7x3xqjBW+9xhSr7fmB9ifJ0yaL8Q+0LV5jIiurfuIcPejyhfPVb44rvShzNrrmpCag== X-Received: by 2002:aa7:da01:0:b0:46b:9f6e:4005 with SMTP id r1-20020aa7da01000000b0046b9f6e4005mr12419198eds.203.1669981960977; Fri, 02 Dec 2022 03:52:40 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:40 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 4/8] arm64: dts: Add DT node for the VIPNano-QI on the A311D Date: Fri, 2 Dec 2022 12:52:16 +0100 Message-Id: <20221202115223.39051-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This "NPU" is very similar to the Vivante GPUs and Etnaviv works well with it with just a few small changes. v2: Add reference to RESET_NNA (Neil) v3: Fix indentation (Neil) Signed-off-by: Tomeu Vizoso Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 11 +++++++++++ .../boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 45947c1031c4..61c8461df614 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include =20 / { interrupt-parent =3D <&gic>; @@ -2484,4 +2485,14 @@ xtal: xtal-clk { #clock-cells =3D <0>; }; =20 + npu: npu@ff100000 { + compatible =3D "vivante,gc"; + reg =3D <0x0 0xff100000 0x0 0x20000>; + interrupts =3D <0 147 4>; + clocks =3D <&clkc CLKID_NNA_CORE_CLK>, + <&clkc CLKID_NNA_AXI_CLK>; + clock-names =3D "core", "bus"; + resets =3D <&reset RESET_NNA>; + power-domains =3D <&pwrc PWRC_G12A_NNA_ID>; + }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts b= /arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts index 124a80901084..73f3d87dcefd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts @@ -15,6 +15,10 @@ / { compatible =3D "khadas,vim3", "amlogic,a311d", "amlogic,g12b"; }; =20 +&npu { + status =3D "okay"; +}; + /* * The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 CF0AAC4321E for ; Fri, 2 Dec 2022 11:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233382AbiLBLxJ (ORCPT ); Fri, 2 Dec 2022 06:53:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233303AbiLBLwp (ORCPT ); Fri, 2 Dec 2022 06:52:45 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD7D81263C for ; Fri, 2 Dec 2022 03:52:43 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id x2so6204578edd.2 for ; Fri, 02 Dec 2022 03:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=vcT8YWVtzB1GH3wOdz9aZTQd5ehiQWJpYZBWZtycvm8=; b=n6rSQm2scPUp8G7dkrFMvAlrmDdT5HqkEFLp5tVgjnDhobTyndc90glH9j1b0mNhM4 PlCdqyRunGFcWaw40v1XO1FSXh9aTfLBBrupdRpb73kotN52w4f1n2ij3hFHRPRX2wa4 kacKVYbnJWeQHWjvGMvFfVlMplLd/isdSbjz2AqBN0jDpGu7R2+DvXsdJd7fNvJf4Zhq 3kTdiH0gyp40Vejo7JRT3g8aEMXlLccp97tvG1j6mQExD9L9JFARULn1LNhUHNas2AKl vp6Xn+JSyYqlVspuDjrELJGnySjWwMg2YjB61h3wwHglmL06xvpYDgkkhBaBCSJ8wvgk 0mjw== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vcT8YWVtzB1GH3wOdz9aZTQd5ehiQWJpYZBWZtycvm8=; b=NOBo1gsVtETHbjjmrnYVE9tsudLMHbQnbzmv6Zhw2HcXjHt5aeoacXX3H5eYV8EuM8 QH2hb9RMa1gxrYFSYKZGUS+Jox6yrsjLdChpHVJsSvWkbcfJR+UUEw81pvY0Ba9KvD8c N3xEuQq2di9DJn2UXGHm7V/ehbRFZwtyATw6DqvKLVbDHBfULCyBjLiMBBNQKhuxsi6Q 0XzNAYZ1+C9/Qvc8FNvAjDoYuI/VRSHFCpCjf+/K2jj7c9zVJwJBchf5AcPN+0SCRhXs DHABmtebHRStWOJIjuTdAyn7sYcjm+bwH1K5H3HyETbdynIh6VBilPngpxKAzS+7nPo+ KpHw== X-Gm-Message-State: ANoB5pn9qyoBTioEpBFo1rVHe3wXPznnLju+B+KGUUT6KlR/iYVGJ+Zf gH5EFc0pa3MRfoVWWvaZXgo= X-Google-Smtp-Source: AA0mqf7z5O8rS3mctV42J+CAKDbBvQEW1qpHWHU4cS8Gyjn6lrLWf90VBV+FexZaVWvv37D7WFdRNw== X-Received: by 2002:a05:6402:1f89:b0:458:caec:8f1e with SMTP id c9-20020a0564021f8900b00458caec8f1emr62952822edc.280.1669981962298; Fri, 02 Dec 2022 03:52:42 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:41 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 5/8] drm/etnaviv: Add nn_core_count to chip feature struct Date: Fri, 2 Dec 2022 12:52:17 +0100 Message-Id: <20221202115223.39051-6-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We will use these for differentiating between GPUs and NPUs, as the downstream driver does. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 3 +++ drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.h index 85eddd492774..c8f3ad2031ce 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h @@ -50,6 +50,9 @@ struct etnaviv_chip_identity { /* Number of shader cores. */ u32 shader_core_count; =20 + /* Number of Neural Network cores. */ + u32 nn_core_count; + /* Size of the vertex cache. */ u32 vertex_cache_size; =20 diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnav= iv/etnaviv_hwdb.c index f2fc645c7956..44df273a5aae 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c @@ -16,6 +16,7 @@ static const struct etnaviv_chip_identity etnaviv_chip_id= entities[] =3D { .register_max =3D 64, .thread_count =3D 128, .shader_core_count =3D 1, + .nn_core_count =3D 0, .vertex_cache_size =3D 8, .vertex_output_buffer_size =3D 1024, .pixel_pipes =3D 1, @@ -47,6 +48,7 @@ static const struct etnaviv_chip_identity etnaviv_chip_id= entities[] =3D { .register_max =3D 64, .thread_count =3D 512, .shader_core_count =3D 2, + .nn_core_count =3D 0, .vertex_cache_size =3D 16, .vertex_output_buffer_size =3D 1024, .pixel_pipes =3D 1, @@ -78,6 +80,7 @@ static const struct etnaviv_chip_identity etnaviv_chip_id= entities[] =3D { .register_max =3D 64, .thread_count =3D 512, .shader_core_count =3D 2, + .nn_core_count =3D 0, .vertex_cache_size =3D 16, .vertex_output_buffer_size =3D 1024, .pixel_pipes =3D 1, @@ -109,6 +112,7 @@ static const struct etnaviv_chip_identity etnaviv_chip_= identities[] =3D { .register_max =3D 64, .thread_count =3D 1024, .shader_core_count =3D 4, + .nn_core_count =3D 0, .vertex_cache_size =3D 16, .vertex_output_buffer_size =3D 1024, .pixel_pipes =3D 2, --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 F0B8DC4321E for ; Fri, 2 Dec 2022 11:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233400AbiLBLxM (ORCPT ); Fri, 2 Dec 2022 06:53:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233042AbiLBLwq (ORCPT ); Fri, 2 Dec 2022 06:52:46 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1547F2A961 for ; Fri, 2 Dec 2022 03:52:44 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id s5so6104952edc.12 for ; Fri, 02 Dec 2022 03:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=NbApf1anPXhkyL1eMhU3x4CauZkX++vBii8PykYLja0=; b=Zaz1ET+G1SWchZ+VgoJoMcRplKphEziazSa2ThOiA/jFoSYOSbYC/0JWmbk7indYGE ZNKMyOgAmUOqNDEv9TUk/yPiJfFZkIKOcnLiuk7lFX+eXBoL6pMBgUrEf3KpCCqeJ/qo 5exqrQ1zKJlL05VIAa7DhkMb1bOyy9MePplKkiSQQh12oUA/OthYWtBMqG8Y/Fm2BMyi WlMKCLlUyCo+9gj9XV4nNWp1GoeRH4V3xkcy4dssda4Ap2EKC4gQoaH6o6deopLDVDPl 2YjPZ0RBftgHbuCkasZZbFvPihe9aeRTPIU1M+nLd/Ccoj7JLw1YSDnIs/jDREcL/5yG siUw== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NbApf1anPXhkyL1eMhU3x4CauZkX++vBii8PykYLja0=; b=Yv9q1AxZLP9s3ai8THmy5NhkaLU98+A2u/kjbQ2aCZMb3CfGOU6tJZ7O1FmX+rDGKL aJTfs84MrnLpczAMH8bFpiVQQ+ndET4chkNRL0aiw8FudUQzPoogWVKLIOv/p8oSv53W 4fLoJoW94kBUbJzGy0tg7R0h0qiyH7722sZbXM+bbU4sjRyHWfLcw2B9B5O146EiDBPu 9Z8Ycz2/mTOCtUbILsnLMP33OzgkAB+mKwTOJd19o0PmU+0rbaBOl1nLmDyLRJNAFhCg qLkgHpoJj87sG7FiIAcmteuTKu726VTx0fXwGqPzZLx0HIssf3rWN94C7JRI3mtsom8A hTvw== X-Gm-Message-State: ANoB5pmV2tHasZySYDVg/REuDJf/6kCYlWkbktTLkiEOFmMtj6OHq7ez 8Vh6F89NB+3DwOGyc39xjm8= X-Google-Smtp-Source: AA0mqf5u8WJUjMkgmdOQWN0p+3lPuMNPUEsyeQq7hpK3juNAdPo9O2CUMmzQw/QKtlOmoJlwzM+H5w== X-Received: by 2002:a05:6402:2404:b0:467:67e1:ca61 with SMTP id t4-20020a056402240400b0046767e1ca61mr12816866eda.27.1669981963506; Fri, 02 Dec 2022 03:52:43 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:43 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 6/8] drm/etnaviv: Warn when probing on NPUs Date: Fri, 2 Dec 2022 12:52:18 +0100 Message-Id: <20221202115223.39051-7-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Userspace is still not making full use of the hardware, so we don't know yet if changes to the UAPI won't be needed. Warn about it. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.c index 37018bc55810..3cbc82bbf8d4 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -765,6 +765,10 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) goto fail; } =20 + if (gpu->identity.nn_core_count > 0) + dev_warn(gpu->dev, "etnaviv has been instantiated on a NPU, " + "for which the UAPI is still experiment= al\n"); + /* Exclude VG cores with FE2.0 */ if (gpu->identity.features & chipFeatures_PIPE_VG && gpu->identity.features & chipFeatures_FE20) { --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 4C5F5C47088 for ; Fri, 2 Dec 2022 11:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233433AbiLBLxP (ORCPT ); Fri, 2 Dec 2022 06:53:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233378AbiLBLwr (ORCPT ); Fri, 2 Dec 2022 06:52:47 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59D792B26E for ; Fri, 2 Dec 2022 03:52:46 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id b2so10993492eja.7 for ; Fri, 02 Dec 2022 03:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Q2njBXO/jcTn1hW9BCGP1JQWTyTb5ivQ7E5VaL+5F8g=; b=PGqEPPKLMPgV0vs1JO0S4lzeqt1JVLn2xyAx1A9+XqqmsQA4aW7b2OGtkWZTtYA3Eg Z0+OCjTBDGEUvJZVWwBhd4GXirMMRQWepVJWj/kIkaFdxGN+0cyEeAOP4CaqICWSop+5 MhGsjaaGZUC02+BGwqJO78pXzl3AeZS+nSd5P8SiZAMc0ekU8MnPvuR36J3dJrJeUihs TlZjIuRUSmjtDzZorkt5kjUVuaspXtG+JM7dVqZNvCLb4YSjE3/fFfBfUYgFPwAHCPx1 xqXOSZ7Ud8M8UwiehMREoc+zKjdd6BdHaTn2sP6dtAoUTzIuFgAnPJGWLXVYc6Mg9oe3 W06Q== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Q2njBXO/jcTn1hW9BCGP1JQWTyTb5ivQ7E5VaL+5F8g=; b=IRzAYhnCWH7Eufg/RosswMbxSVkm1hO1Znrkvd4LSKL+8zqRBhIrjvYLmfeR2IErSj ARvUAqt6VrLPvN7Sq9jnvmfZEAQOXxsleKqSTvh532Vc1pMaS/P9d1lGcBOqatoxQA2A xMCxG2vIMRBnCCdyaVirx5zTca0GvobSRU2ux3ujKhnFl3BwWLl5bLTWxRKNtIKUq0A0 cDLJDJluXIIF+5svc88PQYYf1BdiJnCAnJGhGurxL99MjOOde77lQpVN1T2D3ViCmR9I vgfP6PoBlsHbAkW98PjuISoOFz/yhfXem0J4sRfVBkBTOyzNTnLcttnd3mTbZqWuvrK4 G7sA== X-Gm-Message-State: ANoB5pmiHfOO5O+ot7xPwB1sELmGKVukZMlNVJmanWZQzJEV0BcbuqPg GlKQhdppVCE0BORN7Satm5E= X-Google-Smtp-Source: AA0mqf4fSMzOzi3Zl9q8HAMPixjYiZvqfbProtvQ+lQZi/7zRZUXdlor2DZsqaqo4HlonrVcIFxykg== X-Received: by 2002:a17:906:d0da:b0:7ad:9891:8756 with SMTP id bq26-20020a170906d0da00b007ad98918756mr60667631ejb.203.1669981964923; Fri, 02 Dec 2022 03:52:44 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:44 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 7/8] drm/etnaviv: add HWDB entry for VIPNano-QI.7120.0055 Date: Fri, 2 Dec 2022 12:52:19 +0100 Message-Id: <20221202115223.39051-8-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is a compute-only module marketed towards AI and vision acceleration. This particular version can be found on the Amlogic A311D SoC. The feature bits are taken from the Khadas downstream kernel driver 6.4.4.3.310723AAA. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnav= iv/etnaviv_hwdb.c index 44df273a5aae..66b8ad6c7d26 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c @@ -134,6 +134,37 @@ static const struct etnaviv_chip_identity etnaviv_chip= _identities[] =3D { .minor_features10 =3D 0x90044250, .minor_features11 =3D 0x00000024, }, + { + .model =3D 0x8000, + .revision =3D 0x7120, + .product_id =3D 0x45080009, + .customer_id =3D 0x88, + .eco_id =3D 0, + .stream_count =3D 8, + .register_max =3D 64, + .thread_count =3D 256, + .shader_core_count =3D 1, + .vertex_cache_size =3D 16, + .vertex_output_buffer_size =3D 1024, + .pixel_pipes =3D 1, + .instruction_count =3D 512, + .num_constants =3D 320, + .buffer_size =3D 0, + .varyings_count =3D 16, + .features =3D 0xe0287cac, + .minor_features0 =3D 0xc1799eff, + .minor_features1 =3D 0xfefbfadb, + .minor_features2 =3D 0xeb9d6fbf, + .minor_features3 =3D 0xedfffced, + .minor_features4 =3D 0xd30dafc7, + .minor_features5 =3D 0x7b5ac333, + .minor_features6 =3D 0xfc8ee200, + .minor_features7 =3D 0x03fffa6f, + .minor_features8 =3D 0x00fe0ef0, + .minor_features9 =3D 0x0088003c, + .minor_features10 =3D 0x108048c0, + .minor_features11 =3D 0x00000010, + }, }; =20 bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu) --=20 2.38.1 From nobody Thu Sep 18 23:34:35 2025 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 0C8C3C4321E for ; Fri, 2 Dec 2022 11:53:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233436AbiLBLxR (ORCPT ); Fri, 2 Dec 2022 06:53:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233383AbiLBLwu (ORCPT ); Fri, 2 Dec 2022 06:52:50 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB0E5FB84; Fri, 2 Dec 2022 03:52:46 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id n21so10976393ejb.9; Fri, 02 Dec 2022 03:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=57nQPIWboUhS0hM6UAXc+mV0l81PKd9lsPdM8FKXFZQ=; b=dVxzLkdhqEgqAKSv+70d22Uvs8M8T9J4rDG/8s4Oza0wQ0nriev5N8Qr5s1LjcPQTl EWIVfMQ76Lr0iDoC8moEya14poTgrFjQjojMmoa/vkCLJ+o64o/H1yxYxWJ1fR1oy/Nc 1lKARHnRHQEoi9E91Vj7G+nYaoQpCs51nSo7jB2JP/+BXi1u0EJRJ18/9UYKemR2WpT3 7ty8QKrRSwU6e+Cec5v0dwtfxuyAgOVNG9VV3m6F8nEV6kZwTDUlz2nF4P1J6sAoTJMp V9w3NX7V+lgSRlVgBaoE/z0QxvKVdYuv2dcc8oQWAh3OxenMr3iQMAC1XGvm+p4XBUtF uopQ== 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:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=57nQPIWboUhS0hM6UAXc+mV0l81PKd9lsPdM8FKXFZQ=; b=7eU9rN7TE2miExefFiA6oDOndPNq+Jq4Yj3S+6fnK+XhbBiJRIk1fkJ/TCAhfprOeb nJXYr4TrOya3RvyrqP4tCtLVRGqRhVWZ3k0zIcRgyhetX05sXe301kWzMUDEzk8lg6up yXyeNuV5k7hhTX13ofqznO+7VPIvTY0AltUpd/kSA1GcZBFcHuj7WA69i7wHAfqQ2bCP 5NiCTPZTG1TtIR1n/5tdcSOPRN5+hgPQnCBFPoyzGIjB6EJn3eptqRVGe6OJJr3ts16Y Sps6lEsJT9st/rF1/fOEyYD0BUrVlLgaNkD/7HW5CP2USRaTp9qzrvM0IKSNMpdF3QLd GoeA== X-Gm-Message-State: ANoB5plliQgh8KH/77Vup8+ZEzyfFnRjXqBNIBuC7ajCBsi0sTdAIIXw LLvTsoRvfD+t0aZhC2pqxDs= X-Google-Smtp-Source: AA0mqf5dmSPQFvDVM2KnCeukh0RGM++NkoeSCFP2ggwb6ZRYdBekyNSRZ5XIe69a0MWQn+J1fofwOg== X-Received: by 2002:a17:906:a0d9:b0:78d:b912:6a6c with SMTP id bh25-20020a170906a0d900b0078db9126a6cmr60973122ejb.124.1669981966379; Fri, 02 Dec 2022 03:52:46 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:45 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 8/8] arm64: dts: Fix NPU power domain references in Amlogic G12-based SoCs Date: Fri, 2 Dec 2022 12:52:20 +0100 Message-Id: <20221202115223.39051-9-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The power sequence is different between SoCs in that family, so get the right bits for each one. Signed-off-by: Tomeu Vizoso Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 61c8461df614..d7eb01509685 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,7 +11,6 @@ #include #include #include -#include =20 / { interrupt-parent =3D <&gic>; @@ -2493,6 +2492,5 @@ npu: npu@ff100000 { <&clkc CLKID_NNA_AXI_CLK>; clock-names =3D "core", "bus"; resets =3D <&reset RESET_NNA>; - power-domains =3D <&pwrc PWRC_G12A_NNA_ID>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/= dts/amlogic/meson-g12b.dtsi index ee8fcae9f9f0..886380b5a96f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -139,3 +139,7 @@ map1 { &mali { dma-coherent; }; + +&npu { + power-domains =3D <&pwrc PWRC_G12A_NNA_ID>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-sm1.dtsi index 80737731af3f..318a16aa4433 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -543,3 +543,7 @@ &vpu { &usb { power-domains =3D <&pwrc PWRC_SM1_USB_ID>; }; + +&npu { + power-domains =3D <&pwrc PWRC_SM1_NNA_ID>; +}; --=20 2.38.1