From patchwork Mon Oct 16 08:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 13422699 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 7B4D5CDB465 for ; Mon, 16 Oct 2023 08:02:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231135AbjJPICX (ORCPT ); Mon, 16 Oct 2023 04:02:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231967AbjJPICU (ORCPT ); Mon, 16 Oct 2023 04:02:20 -0400 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AE86B4; Mon, 16 Oct 2023 01:02:17 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4065dea9a33so40271935e9.3; Mon, 16 Oct 2023 01:02:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697443336; x=1698048136; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7vxzdd7hvG1LZGKkqhTZumSilwKU2j2TuY6Cx8E9gJo=; b=ev/jab1eV1cbharyKMsaQwtfcgPVcwWewxeEX1djIYlMrQg+qFfKoHNKKloMihZsmr 0njoBA62xbbWFnbyHb6HgYa8gy2RAWFUWoWv0SsAn2TquSY8AlSxCNbQ2FltMPCu3JG3 OSJ+hUlbsZrl1U4QrgKsjnQrwJHhEAqJWQAYihMpx/ULN80nE141qX0ZK8257g/w0gfp aIQiSjbKk363DAa+DfhGLl8zBnz4K7UrpKl9W0Bw45D5u++FbuFnM4S+H+yifwHKdBKQ 2sDCLijCJqAUc1CYtiXaeNlw/CpuFwcfz7GJiRYRVsGuqL6Et+WYTDp2Xwi5fgvbTMM2 wNqQ== X-Gm-Message-State: AOJu0Ywl3TgvvKOtv+m0geYgXBChfgTBnvtdBRw42NubL6HURgNxav5r oR2eKwK3k1euUkOFvIXITlENQyKyvMsCORZS X-Google-Smtp-Source: AGHT+IEnAQcfulAK8tSKm3mqtTHbvdCU+3ufmoudypoqa9HGPqbCXKZR1ZkkXFpExKpIiIPsRBFBng== X-Received: by 2002:a7b:c40a:0:b0:406:61c6:30b8 with SMTP id k10-20020a7bc40a000000b0040661c630b8mr28046368wmi.22.1697443335642; Mon, 16 Oct 2023 01:02:15 -0700 (PDT) Received: from cizrna.home (cst-prg-37-192.cust.vodafone.cz. [46.135.37.192]) by smtp.gmail.com with ESMTPSA id p22-20020a05600c419600b00407460234f9sm6395535wmh.21.2023.10.16.01.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 01:02:15 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Da Xue , Tomeu Vizoso , Lucas Stach , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Ulf Hansson , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: VIM3: Set the rates of the clocks for the NPU Date: Mon, 16 Oct 2023 10:02:03 +0200 Message-ID: <20231016080205.41982-1-tomeu@tomeuvizoso.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Otherwise they are left at 24MHz and the NPU runs very slowly. Signed-off-by: Tomeu Vizoso Suggested-by: Lucas Stach --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index ff68b911b729..9d5eab6595d0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2502,6 +2502,9 @@ npu: npu@ff100000 { clocks = <&clkc CLKID_NNA_CORE_CLK>, <&clkc CLKID_NNA_AXI_CLK>; clock-names = "core", "bus"; + assigned-clocks = <&clkc CLKID_NNA_CORE_CLK>, + <&clkc CLKID_NNA_AXI_CLK>; + assigned-clock-rates = <800000000>, <800000000>; resets = <&reset RESET_NNA>; status = "disabled"; }; From patchwork Mon Oct 16 08:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 13422698 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 65213C41513 for ; Mon, 16 Oct 2023 08:02:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231853AbjJPICY (ORCPT ); Mon, 16 Oct 2023 04:02:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjJPICX (ORCPT ); Mon, 16 Oct 2023 04:02:23 -0400 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36529DC; Mon, 16 Oct 2023 01:02:19 -0700 (PDT) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-50435ad51bbso5317898e87.2; Mon, 16 Oct 2023 01:02:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697443337; x=1698048137; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qtLS9Nj2nFZBWPhUvEtRP9PYRoru3Ywsw6HKjKsybKc=; b=c0IZT4D8Nsxv62ZEZlgu2DEtSvWccOrCZFGl5xEN5f3Zf6/A3QZtj1WLO9HAQPcyn7 lVoy6gz6uyWT+wiWKYRkoEqtTy7r5sCJX3bd45pwpb2f9pZ3GoQkO5R89WMIplbM8KHz KnyAh24OhQJ8/Qd7VI17JBaHRITSHl6kqjoHzlD6umbYj0/ewPlYHCOlWyHkh/DGUDtq vArVJN00Q5RKyXIaLzI6VY/QTvH/HvHy7rX10KULcRzrG3fVN5EeqkkIHhmP9Q5GmfrN WwO9qdiHr0jhPbpmtlXfh5XtSgi51z16aTYoBIU3LMsRgZMk7DZGJyYH5CcZGXFKcQiA qJ7w== X-Gm-Message-State: AOJu0Yw/3APZs4kQoqub3dP3Q00Ve4ryvSdnyroZru67MC+CYlmocv6P nnrZL7c8v92q9J4Q/MFXrYAFX6Pe+5cR1jLH X-Google-Smtp-Source: AGHT+IEJgVTIkDdKS8wbwl9GR9zgveQ3KCzOuWUyYvLzmOvka53rPoTXp7pcFySPS7cbYgXGyHt08g== X-Received: by 2002:a05:6512:33d0:b0:507:a1df:1408 with SMTP id d16-20020a05651233d000b00507a1df1408mr4684169lfg.55.1697443337286; Mon, 16 Oct 2023 01:02:17 -0700 (PDT) Received: from cizrna.home (cst-prg-37-192.cust.vodafone.cz. [46.135.37.192]) by smtp.gmail.com with ESMTPSA id p22-20020a05600c419600b00407460234f9sm6395535wmh.21.2023.10.16.01.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 01:02:16 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Da Xue , Tomeu Vizoso , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Ulf Hansson , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH 2/2] pmdomain: amlogic: Fix mask for the second NNA mem PD domain Date: Mon, 16 Oct 2023 10:02:04 +0200 Message-ID: <20231016080205.41982-2-tomeu@tomeuvizoso.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231016080205.41982-1-tomeu@tomeuvizoso.net> References: <20231016080205.41982-1-tomeu@tomeuvizoso.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Without this change, the NPU hangs when the 8th NN core is used. It matches what the out-of-tree driver does. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong --- drivers/pmdomain/amlogic/meson-ee-pwrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pmdomain/amlogic/meson-ee-pwrc.c b/drivers/pmdomain/amlogic/meson-ee-pwrc.c index cfb796d40d9d..0dd71cd814c5 100644 --- a/drivers/pmdomain/amlogic/meson-ee-pwrc.c +++ b/drivers/pmdomain/amlogic/meson-ee-pwrc.c @@ -228,7 +228,7 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = { static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] = { { G12A_HHI_NANOQ_MEM_PD_REG0, GENMASK(31, 0) }, - { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(23, 0) }, + { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(31, 0) }, }; #define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \