From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25158606A31C for ; Sun, 8 Nov 2026 07:02:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ZW7j/fWb; dkim=pass (2048-bit key, unprotected) header.d=gahingwoo.com header.i=@gahingwoo.com header.a=rsa-sha256 header.s=fm1 header.b=Z2Jk3UOn; dkim=pass (2048-bit key, unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=dT7cmPK6 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=YuP1M84mtHZ6+9tDpx0o714X9as9Hb8rA+5Zuurb0GU=; b=ZW7j/fWb9l8MEC mGMhwLUNF5kLGHn2AtiUxgu9h1+m3OsjT0HHZf9xH/z2Auyu1gG4qP7zFFUcVynkjzgVw4jKrSInH tFwWca0gmPYFUMg70NDHZ8O2OSgQmzaiAeJs7DeOJHs0fjP+DgHDCScL3jDwMLnDiyEZPrcT57nkF vWnJseYZPzkagf9Lo+l4XgmCj883BaExlSp7swPvljkuh+iGrmNdPl59SD/vMSjjYCY7s89ba8EWz mfPJVBaOzAXOLhShORr48xaNLaZt2FyYmIJwzs9vhYlKtL5Dt8lGwpXyShYgfdJNb7ZtnQDK8gfc/ s5ml9KGooHg4cQZ0tppQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPwvM-0000000FkpU-04tI; Sun, 08 Nov 2026 07:02:44 +0000 Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPwvJ-0000000FknS-10ao for linux-arm-kernel@lists.infradead.org; Sun, 08 Nov 2026 07:02:42 +0000 Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id B0BC41D00181 for ; Sun, 8 Nov 2026 02:02:40 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sun, 08 Nov 2026 02:02:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gahingwoo.com; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1794121356; x= 1794207756; bh=YuP1M84mtHZ6+9tDpx0o714X9as9Hb8rA+5Zuurb0GU=; b=Z 2Jk3UOnqqMaHpNz5crNHjWpFn+5j8ewy+A7IML9x53glSExvwE74ZevREcuFgQ7x 3QzlDw5aA3VViWOShf17Y44RY3J0JQn0fCXe5/kYJg4C9XZl0gaorJf1RL3NCrlS HDz3J0ubGqcAuns45bUlBGqH8PQEa1GZPB45u/bMQtTC6TgsP2raEfEtw+2b6vgO YSk96wfAhjWdw7b2vMTLbmi/p5lpm6hmj+4Nw858zq7lGBxdHc5ZraZj3oS7T3un 6fbVWD5GNrClQNcgV+FMo8xOvu0SsY+DMX9pm851U//H+FR2XPJGOHUEO509SX9b e5ZsP0IrJx0Oy+PNWurOw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1794121356; x=1794207756; bh=Y uP1M84mtHZ6+9tDpx0o714X9as9Hb8rA+5Zuurb0GU=; b=dT7cmPK62Vw9Ifl+M bj0py1i2kHkJXX6RRGgR96NCk2SI5YliDIC9RoaZEXwUsq/8sINnxk3si2LB06B5 fcQE1JdZkVcpMynijch3K/iieQvsv6hmkLGyOZe8JS19ijPqIIWKIF1SBcqe5vCk 4EkzkXXAt1pWOxqVAGicdbJqQ9YQDe1HdY7D6WoECgF3QqeMoZ1BVABB1ugE8ow5 pqdantYHniJTLNFc4gTvEtF7V4DSZc15OpViIfHX+UK4zawQxkI6wVkRxsaeNuEQ F3VFvlNKifgiq+vVhh7U4+TwrCRT43Hy0ayQpuAaMUuS/SpG+fBvp5ttQEZd5rfJ Gljgg== X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=sign d=gahingwoo.com a=rsa-sha256; DKIM2-Signature: i=1; m=1; t=1794121356; d=gahingwoo.com; mf=PGdhaGluZ0BnYWhpbmd3b28uY29tPg==; rt=PGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZz4=; s=fm1:rsa-sha256:hS61DgEHgZioA2Wljax3xH6+h01yoePJ3ooG4BzL5wcOWHg WkrITk9a93A5S1wG2EUDIVcr2LmPd/Hz3eOq5D2MKzSV1LeQjfCERFtF79qiNJ8c 80HuHYXldvpNm/g0XM76ZbdaaMoZ2z/Cf63v0gTysv6wFfiZl+3X0yIOMW5HjDsO QENJr3pkL9ajEYE5QBpQXGPrZhk+UENuz6dJJ4Q/AsXHL1QVZiS94NI3i/q2pE5a sJGQEhww2/Lbpiy0ibNp//VpbDkZLuG6iQYO9cbhZoRZuJwYbYxEFB9npB2UEcXM nsH+5zCsG7AUPXkxw3rGwKAj3iIZopNOoXpQbnA==; X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=mi-m=1; hc=11; hn=cc,content-transfer-encoding,date,feedback-id,from, in-reply-to,message-id,mime-version,references,subject,to; Message-Instance: m=1; h=sha256:+1HnbT0QnULyCFYm4s9Bmj2kBPzK7XWKE8LKwDwa9hE=:FTENYIcF1GraRtf1PRqiAuPabp0jeJCFomgowjmTcY8=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTFKhclCCJN9i5LFQp5fvn9DylL5PDR95+qcmUDEkBDvAaUlhVhO6JW1PTcA0oiilr afxU+kS37MwfkRVrV2sLhNS1OkBSH9hrpfUYkvEeAEfTx8oUhC1lvQdEqsrvfO12L2kPDm Y90xvEv61R5vWsABT3XVmqKcWsSTBPoQRHs33ySAWpN7mh8mIX7nfmpu6Q5St0DdZLVl6o GJpMHUC7TjUVqLMHfqfKk9SHn10f5lL6CdG6YeehrsosttZtbM1aNiFk46XYC+svmJcMBn 4w1I3sJZaXrv8SSndHCWUOH7cbPZHBY65Sr1oZjnZZRxSV2wTTFO+3xU/Lmvhk4YCMlhGR sjXpYEdGJN2S9l638DpwwIDioV7PKg4nr5+2uB/PvDzw4VfPZn1ZTNSORT135TlirsbsRf lg6fPt6C4GxTrIUuKHLYvBGx9dAxacztDSd3NOgs0f2CgpXWH8wH5m1AqG13OlvWFHDld0 HvJF9Oh5sXDPmKOrov+7yZDp3zggr6ltAHQc98VCvQkE/dEV2LpM9An6GPrGMiPWCL/VJL cXoSExqyPt5MzcDon4ymw7gCA7RiCGmMeQSaGwIEdoXeT+uNZSsTwQrsVzQctI6GbJjLHy Emc/OKE9Zt7x/pYb8yDmaZVFVJK3aLKPB/qoNpJkh1SLqFwSjvJs1xeUGyFg X-ME-Proxy: Feedback-ID: i7a5e4b5f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 8 Nov 2026 02:02:26 -0500 (EST) From: Jiaxing Hu To: tomeu@tomeuvizoso.net, heiko@sntech.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, ulfh@kernel.org, p.zabel@pengutronix.de, ogabbay@kernel.org, zhangqing@rock-chips.com Cc: royalnet026@gmail.com, abel.vesa@oss.qualcomm.com, sebastian.reichel@collabora.com, sidong.yang@furiosa.ai, u.kleine-koenig@baylibre.com, chaoyi.chen@rock-chips.com, shawn.lin@rock-chips.com, finley.xiao@rock-chips.com, diederik@cknow-tech.com, alchark@flipper.net, leonard@lausen.nl, jeff.hugo@oss.qualcomm.com, rfoss@kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, iommu@lists.linux.dev, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jiaxing Hu Subject: [PATCH v16 11/16] accel/rocket: select the per-core clock and reset counts from match data Date: Sun, 8 Nov 2026 19:59:12 +1300 Message-ID: <20261108065917.135194-12-gahing@gahingwoo.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261108065917.135194-1-gahing@gahingwoo.com> References: <20261108065917.135194-1-gahing@gahingwoo.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261107_230241_313853_71995D66 X-CRM114-Status: GOOD ( 18.56 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 The RK3576 and the RK3588 use the same NPU block, but with different numbers of clocks and resets. Take the number of clocks and resets for each core from soc_data in the match data, so the driver uses the right count on each SoC. The RK3588 keeps four clocks and two resets. A device without match data fails before any resource is allocated. Signed-off-by: Jiaxing Hu --- drivers/accel/rocket/rocket_core.c | 8 ++++---- drivers/accel/rocket/rocket_core.h | 6 ++++++ drivers/accel/rocket/rocket_drv.c | 18 +++++++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c index 5dd260bacbff..b202d15816a3 100644 --- a/drivers/accel/rocket/rocket_core.c +++ b/drivers/accel/rocket/rocket_core.c @@ -23,7 +23,7 @@ int rocket_core_init(struct rocket_core *core) core->resets[0].id = "srst_a"; core->resets[1].id = "srst_h"; - err = devm_reset_control_bulk_get_exclusive(&pdev->dev, ARRAY_SIZE(core->resets), + err = devm_reset_control_bulk_get_exclusive(&pdev->dev, core->soc->num_resets, core->resets); if (err) return dev_err_probe(dev, err, "failed to get resets for core %d\n", core->index); @@ -32,7 +32,7 @@ int rocket_core_init(struct rocket_core *core) core->clks[1].id = "hclk"; core->clks[2].id = "npu"; core->clks[3].id = "pclk"; - err = devm_clk_bulk_get(dev, ARRAY_SIZE(core->clks), core->clks); + err = devm_clk_bulk_get(dev, core->soc->num_clks, core->clks); if (err) return dev_err_probe(dev, err, "failed to get clocks for core %d\n", core->index); @@ -109,9 +109,9 @@ void rocket_core_fini(struct rocket_core *core) void rocket_core_reset(struct rocket_core *core) { - reset_control_bulk_assert(ARRAY_SIZE(core->resets), core->resets); + reset_control_bulk_assert(core->soc->num_resets, core->resets); udelay(10); - reset_control_bulk_deassert(ARRAY_SIZE(core->resets), core->resets); + reset_control_bulk_deassert(core->soc->num_resets, core->resets); } diff --git a/drivers/accel/rocket/rocket_core.h b/drivers/accel/rocket/rocket_core.h index f6d7382854ca..bfbf5110b524 100644 --- a/drivers/accel/rocket/rocket_core.h +++ b/drivers/accel/rocket/rocket_core.h @@ -27,9 +27,15 @@ #define rocket_core_writel(core, reg, value) \ writel(value, (core)->core_iomem + (REG_CORE_##reg) - REG_CORE_S_STATUS) +struct rocket_soc_data { + unsigned int num_clks; + unsigned int num_resets; +}; + struct rocket_core { struct device *dev; struct rocket_device *rdev; + const struct rocket_soc_data *soc; unsigned int index; int irq; diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c index 5d7805c41dc3..1030d8407b78 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -159,8 +159,14 @@ static const struct drm_driver rocket_drm_driver = { static int rocket_probe(struct platform_device *pdev) { + const struct rocket_soc_data *soc = of_device_get_match_data(&pdev->dev); int ret; + if (!soc) { + dev_err(&pdev->dev, "no match data for this device\n"); + return -ENODEV; + } + if (rdev == NULL) { /* First core probing, initialize DRM device. */ rdev = rocket_device_init(drm_dev, &rocket_drm_driver); @@ -179,6 +185,7 @@ static int rocket_probe(struct platform_device *pdev) rdev->cores[core].rdev = rdev; rdev->cores[core].dev = &pdev->dev; + rdev->cores[core].soc = soc; rdev->cores[core].index = core; rdev->num_cores++; @@ -216,8 +223,13 @@ static void rocket_remove(struct platform_device *pdev) } } +static const struct rocket_soc_data rk3588_soc_data = { + .num_clks = 4, + .num_resets = 2, +}; + static const struct of_device_id dt_match[] = { - { .compatible = "rockchip,rk3588-rknn-core" }, + { .compatible = "rockchip,rk3588-rknn-core", .data = &rk3588_soc_data }, {} }; MODULE_DEVICE_TABLE(of, dt_match); @@ -243,7 +255,7 @@ static int rocket_device_runtime_resume(struct device *dev) if (core < 0) return -ENODEV; - err = clk_bulk_prepare_enable(ARRAY_SIZE(rdev->cores[core].clks), rdev->cores[core].clks); + err = clk_bulk_prepare_enable(rdev->cores[core].soc->num_clks, rdev->cores[core].clks); if (err) { dev_err(dev, "failed to enable (%d) clocks for core %d\n", err, core); return err; @@ -263,7 +275,7 @@ static int rocket_device_runtime_suspend(struct device *dev) if (!rocket_job_is_idle(&rdev->cores[core])) return -EBUSY; - clk_bulk_disable_unprepare(ARRAY_SIZE(rdev->cores[core].clks), rdev->cores[core].clks); + clk_bulk_disable_unprepare(rdev->cores[core].soc->num_clks, rdev->cores[core].clks); return 0; } -- 2.43.0