From patchwork Tue Jul 4 09:32:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089707vqx; Tue, 4 Jul 2023 02:36:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlGyqs+dv7DgXeFfsq04uEVS45NvgxDkyV/9eU88T4nePu8iHuPbckD/nH0ZyZvRdy5xD+rt X-Received: by 2002:a17:90a:6c82:b0:263:4f6d:bd97 with SMTP id y2-20020a17090a6c8200b002634f6dbd97mr7429566pjj.16.1688463403013; Tue, 04 Jul 2023 02:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463402; cv=none; d=google.com; s=arc-20160816; b=mRwl6F42VflrVmzxFqcSgfslVfSNj0TCtl03F9aCB3rzXARscwecCoHh6rx7iPjHfM 7vgSvpRQ1HXQe8vaz6Frwjkl7+OznVkJC1R4+3PWWuUka1y0dvuNNEl48TBQCGn0aSxz PR1IPGltYT6FmFMoE68K19a1HBAGOn/xVOPkiiEnTy9jfcnflcNO49AHCfatoxveKqTT Xv9OGB6ET5W12OlGBTRUgExoxg0eBpeVxduHwgW3oNrfZTJ2ul6MI6+svPSYIbVyXoEw Rp2z/KS5wDJ3ZaIA7QKme/5h75cJS2gqWQA94mAkmXNlLBZqhxgUKhdHgshSDNUchCCh z6Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=gAMP+42Q3KLeV4PczST5vc1c4m4VDJHI9qvMrpPmdv0=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=DyyB7qXPckQmuB3LnHS4ZlSEOIiPfycl44v8YjmU8zq1M1sIBGbT88gFd9xj3vz9lx 1paUVJiVBp9MejZA/xk+VybZoLurpYZk/5xI7Ohi4Dmz8d4cjb43V2wHivFWcMxaKIDC Dzcae81W1+wgUyhKO6zolVs/S0eFgWD17UE2+0014N8jhAPTfuMma77mhbrjaLmBjjEV llOA8BW5B1XnRYZGfullcVFzPFijeFD1D21jUWEw+2OvFeOVx47TTHvzrS9yAcS+BFCB 1lu+8As6fEKRyQXi47byUakwTmu/44rtjWioNcs7NeddcaXlldmJ8Bci/pGnpZkmfwcf hUiA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a63f90a000000b00553a9801a56si21010973pgi.54.2023.07.04.02.36.29; Tue, 04 Jul 2023 02:36:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbjGDJeo (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232160AbjGDJeJ (ORCPT ); Tue, 4 Jul 2023 05:34:09 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DE4319AB for ; Tue, 4 Jul 2023 02:33:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tz-RR; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C09y-Jg; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOq-002TxX-U5; Tue, 04 Jul 2023 11:32:44 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 01/26] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Date: Tue, 4 Jul 2023 11:32:17 +0200 Message-Id: <20230704093242.583575-2-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482200858646713?= X-GMAIL-MSGID: =?utf-8?q?1770482200858646713?= As a matter of fact the regmap_pmu already is mandatory because it is used unconditionally in the driver. Bail out gracefully in probe() rather than crashing later. Fixes: b9d1262bca0af ("PM / devfreq: event: support rockchip dfi controller") Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- Notes: Changes since v4: - move to beginning of the series to make it easier to backport to stable - Add a Fixes: tag - add missing of_node_put() drivers/devfreq/event/rockchip-dfi.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 39ac069cabc75..74893c06aa087 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -193,14 +193,15 @@ static int rockchip_dfi_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(data->clk), "Cannot get the clk pclk_ddr_mon\n"); - /* try to find the optional reference to the pmu syscon */ node = of_parse_phandle(np, "rockchip,pmu", 0); - if (node) { - data->regmap_pmu = syscon_node_to_regmap(node); - of_node_put(node); - if (IS_ERR(data->regmap_pmu)) - return PTR_ERR(data->regmap_pmu); - } + if (!node) + return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n"); + + data->regmap_pmu = syscon_node_to_regmap(node); + of_node_put(node); + if (IS_ERR(data->regmap_pmu)) + return PTR_ERR(data->regmap_pmu); + data->dev = dev; desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); From patchwork Tue Jul 4 09:32:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1095213vqx; Tue, 4 Jul 2023 02:50:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6TbECRZ84zyNkkv9GHwhnVG5ExI7B22CsOLdJ/1tZ8/TIxtTF08ujsd0iGt1evfqClmX8A X-Received: by 2002:a9d:6948:0:b0:6b7:52ce:ff38 with SMTP id p8-20020a9d6948000000b006b752ceff38mr13210807oto.16.1688464204165; Tue, 04 Jul 2023 02:50:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464204; cv=none; d=google.com; s=arc-20160816; b=N0PWbeo0cuD+nuQwK3keLSHJ1p6hDAernpqv6oLlJstkRD3rLrCh+PZ7SxONniaEV2 oQ2hkpLLZPvyoL6IFJwqyC9ek4oqj3AK6NOAyLEOVsSMbv4PLtha1lQr4xB4zNQ7re1W T6HA/z6RZSjFssSaKBzWHrdStD0ICGlX233MfGX9ZbXNlkV9GSLIJQW1sKVYkWwgnnmD dtnhwmyiNlGh6tb0D49U4fjekp7LkgbHi4+XngiTvCHC6l8EQTu2TikCeArmqrWhyA16 XHAqDTf5FwXLd2fe4Iv/zOGCYLiU77y5Gk5j+RQQJqqcdwhpDMHL+J4rNJz24WkFCS3R daWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mIAjzTJNoziz+nXn9Vvs1nFcoL2STNA6NQSqFxPoxwk=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=l5JVhTRUaFip88i02o+smm1tGs412SjmMHM8DFVnaqejKhAwGjvIz7ebbbzZv+vyeD WjsBJvKCbHqTohznANUOynRyq3Qfw2Oykhq1WuQRP7amYsHr79K5caCZxqwT57zf1xlj zZQkHoDJky9FxeK7Zu7z9rj+tMg8nIZ0E035kYEzB0NHtaiiCB+B1lkxNLlSTkJsRXOv VpneNLT6/s8Ld7wYp33c8bOOgkSL4letCH4KIHaUl5pnlinHox7jxvA0DZllmQ4NO7dR EzQP2TUX6QDSGkvt/LsYZkPM2lrBk5z8rW1A2L0Phfl6WsEuSi92Ujnm6I2Di0x7ZjOy ZxYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a63f90a000000b00553a9801a56si21010973pgi.54.2023.07.04.02.49.51; Tue, 04 Jul 2023 02:50:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232046AbjGDJdq (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231989AbjGDJdQ (ORCPT ); Tue, 4 Jul 2023 05:33:16 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A28AE6B for ; Tue, 4 Jul 2023 02:33:15 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006u2-5v; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0A8-75; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOq-002Txb-Uo; Tue, 04 Jul 2023 11:32:44 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 02/26] PM / devfreq: rockchip-dfi: Embed desc into private data struct Date: Tue, 4 Jul 2023 11:32:18 +0200 Message-Id: <20230704093242.583575-3-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770483041438470871?= X-GMAIL-MSGID: =?utf-8?q?1770483041438470871?= No need for an extra allocation, just embed the struct devfreq_event_desc into the private data struct. Reviewed-by: Heiko Stuebner Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 74893c06aa087..467f9f42d38f7 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -49,7 +49,7 @@ struct dmc_usage { */ struct rockchip_dfi { struct devfreq_event_dev *edev; - struct devfreq_event_desc *desc; + struct devfreq_event_desc desc; struct dmc_usage ch_usage[RK3399_DMC_NUM_CH]; struct device *dev; void __iomem *regs; @@ -204,14 +204,10 @@ static int rockchip_dfi_probe(struct platform_device *pdev) data->dev = dev; - desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); - if (!desc) - return -ENOMEM; - + desc = &data->desc; desc->ops = &rockchip_dfi_ops; desc->driver_data = data; desc->name = np->name; - data->desc = desc; data->edev = devm_devfreq_event_add_edev(&pdev->dev, desc); if (IS_ERR(data->edev)) { From patchwork Tue Jul 4 09:32:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089384vqx; Tue, 4 Jul 2023 02:35:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4wEaY48uEiOP85IJChjfckwaAel/4I5TGSjIN2tHoZJDS46qVXp3Piwop4b8n5gKlJx6ZT X-Received: by 2002:a05:6a20:3d14:b0:115:dfb:da59 with SMTP id y20-20020a056a203d1400b001150dfbda59mr12911356pzi.3.1688463353725; Tue, 04 Jul 2023 02:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463353; cv=none; d=google.com; s=arc-20160816; b=IWYPpHMt8I2kLo8XWzKUS8FxCKnf/4KXoEqwGw5vbk75LkkzfTe5/HsnM1iEfWsRmd ynxGTPa2hPrvxQXlRhYF2jMl+iqv8WIWz1QvIFcKA3JmG+GPR+b/DVSfuQw8R+FS84Bo 2XCxaCJps1C6RlbZm1RVGljcZt0iz7Tpg9VIGuAUELC1LeMW5b5pDdhjWhrQRrj1VkwZ 5JpKV7ZR+f45xiN2TAsVf5J6fj7HxTLhZJGZ2kIhbt/8J/ZnAVORoDqKnyyDcUATBGQ5 cwJ0hH6qPCpjtbnqRbhZ4Af3m5ILv/XuldPsmkkRDjkosanRU+C5pnhoXl6VnzlK5/I1 zr+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=rCA91NJzFNfInK8K2CDkNQJyzMy51AyUWeSVxCLqkrY=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=R8YvrI8tyqe+iSZeSSsICXBRqbI+4wGxmuhn4N2lFirDxS7Fvc2mgFwWVOU+1qN33p Iwzi/G542MAHYoj2GDLI7WO4IcyYFgBKyh3+RhETZ5gX//ISWk5NoV3dTew8tTqfjuaT pSoqQQEAJo66VWsz4GLJDcX+sAjqqKM4bksDhxQR3nh1UEuUo9qkIjMiOos3+/iWemRg bThE7YJr+b2I2axqWr5cEXxTjQozLE8HqE55KkohWmuHOpQ93WD3rzBCiKAAKtHjbJ2Y O0jFtG7e1B9l5sUHIxXJmDRH86Q4j6D+t+1rDDAnVRMc+z5o6kBYhz3Tye0qkyfeZI5O ZYEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a170903011300b001b83a575968si11754381plc.395.2023.07.04.02.35.40; Tue, 04 Jul 2023 02:35:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231985AbjGDJdW (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231661AbjGDJdJ (ORCPT ); Tue, 4 Jul 2023 05:33:09 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 276D6187 for ; Tue, 4 Jul 2023 02:33:08 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tt-RS; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09b-Bq; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOq-002Txf-VY; Tue, 04 Jul 2023 11:32:44 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 03/26] PM / devfreq: rockchip-dfi: use consistent name for private data struct Date: Tue, 4 Jul 2023 11:32:19 +0200 Message-Id: <20230704093242.583575-4-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482149576131590?= X-GMAIL-MSGID: =?utf-8?q?1770482149576131590?= The variable name for the private data struct is 'info' in some functions and 'data' in others. Both names do not give a clue what type the variable has, so consistently use 'dfi'. Reviewed-by: Heiko Stuebner Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 467f9f42d38f7..e19e5acaa362c 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -59,13 +59,13 @@ struct rockchip_dfi { static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); - void __iomem *dfi_regs = info->regs; + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); + void __iomem *dfi_regs = dfi->regs; u32 val; u32 ddr_type; /* get ddr type */ - regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); + regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & RK3399_PMUGRF_DDRTYPE_MASK; @@ -84,28 +84,28 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); - void __iomem *dfi_regs = info->regs; + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); + void __iomem *dfi_regs = dfi->regs; writel_relaxed(SOFTWARE_DIS, dfi_regs + DDRMON_CTRL); } static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); u32 tmp, max = 0; u32 i, busier_ch = 0; - void __iomem *dfi_regs = info->regs; + void __iomem *dfi_regs = dfi->regs; rockchip_dfi_stop_hardware_counter(edev); /* Find out which channel is busier */ for (i = 0; i < RK3399_DMC_NUM_CH; i++) { - info->ch_usage[i].access = readl_relaxed(dfi_regs + + dfi->ch_usage[i].access = readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20) * 4; - info->ch_usage[i].total = readl_relaxed(dfi_regs + + dfi->ch_usage[i].total = readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); - tmp = info->ch_usage[i].access; + tmp = dfi->ch_usage[i].access; if (tmp > max) { busier_ch = i; max = tmp; @@ -118,20 +118,20 @@ static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev) static int rockchip_dfi_disable(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); rockchip_dfi_stop_hardware_counter(edev); - clk_disable_unprepare(info->clk); + clk_disable_unprepare(dfi->clk); return 0; } static int rockchip_dfi_enable(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); int ret; - ret = clk_prepare_enable(info->clk); + ret = clk_prepare_enable(dfi->clk); if (ret) { dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret); return ret; @@ -149,13 +149,13 @@ static int rockchip_dfi_set_event(struct devfreq_event_dev *edev) static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, struct devfreq_event_data *edata) { - struct rockchip_dfi *info = devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); int busier_ch; busier_ch = rockchip_dfi_get_busier_ch(edev); - edata->load_count = info->ch_usage[busier_ch].access; - edata->total_count = info->ch_usage[busier_ch].total; + edata->load_count = dfi->ch_usage[busier_ch].access; + edata->total_count = dfi->ch_usage[busier_ch].total; return 0; } @@ -176,47 +176,47 @@ MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); static int rockchip_dfi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct rockchip_dfi *data; + struct rockchip_dfi *dfi; struct devfreq_event_desc *desc; struct device_node *np = pdev->dev.of_node, *node; - data = devm_kzalloc(dev, sizeof(struct rockchip_dfi), GFP_KERNEL); - if (!data) + dfi = devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL); + if (!dfi) return -ENOMEM; - data->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(data->regs)) - return PTR_ERR(data->regs); + dfi->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(dfi->regs)) + return PTR_ERR(dfi->regs); - data->clk = devm_clk_get(dev, "pclk_ddr_mon"); - if (IS_ERR(data->clk)) - return dev_err_probe(dev, PTR_ERR(data->clk), + dfi->clk = devm_clk_get(dev, "pclk_ddr_mon"); + if (IS_ERR(dfi->clk)) + return dev_err_probe(dev, PTR_ERR(dfi->clk), "Cannot get the clk pclk_ddr_mon\n"); node = of_parse_phandle(np, "rockchip,pmu", 0); if (!node) return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n"); - data->regmap_pmu = syscon_node_to_regmap(node); + dfi->regmap_pmu = syscon_node_to_regmap(node); of_node_put(node); - if (IS_ERR(data->regmap_pmu)) - return PTR_ERR(data->regmap_pmu); + if (IS_ERR(dfi->regmap_pmu)) + return PTR_ERR(dfi->regmap_pmu); - data->dev = dev; + dfi->dev = dev; - desc = &data->desc; + desc = &dfi->desc; desc->ops = &rockchip_dfi_ops; - desc->driver_data = data; + desc->driver_data = dfi; desc->name = np->name; - data->edev = devm_devfreq_event_add_edev(&pdev->dev, desc); - if (IS_ERR(data->edev)) { + dfi->edev = devm_devfreq_event_add_edev(&pdev->dev, desc); + if (IS_ERR(dfi->edev)) { dev_err(&pdev->dev, "failed to add devfreq-event device\n"); - return PTR_ERR(data->edev); + return PTR_ERR(dfi->edev); } - platform_set_drvdata(pdev, data); + platform_set_drvdata(pdev, dfi); return 0; } From patchwork Tue Jul 4 09:32:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089907vqx; Tue, 4 Jul 2023 02:37:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4iqrAV/rsaht80kuZDsVyL5FPJKQPS/t8+02wvx8cVnwRT4cuIaE0GvT0960PzZF7eV9hk X-Received: by 2002:a05:6a20:258d:b0:11d:2764:d9c1 with SMTP id k13-20020a056a20258d00b0011d2764d9c1mr16191215pzd.51.1688463426955; Tue, 04 Jul 2023 02:37:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463426; cv=none; d=google.com; s=arc-20160816; b=vDFMJW9jN+wiJ8crV9RB5orDISZ3Z48/A+Cts8XrfPUfTubJI5YPrZYOd8csfQAwY9 GERQRJWqW7topybBt8A9NxV1aaUEWcoLiiDoc377fAgA/7w/IWKYK2V1ZH0lkQQQS5oE INNFDiOaoTuZMbF2Xv7szv2TCbu0BLrzv/VQgXmDFflZfWv3gPSbhqPUCP96COyFk9Yk VfG5P1I4h1wEH3LU6mzPjQD6ZxLuALoKNWgIFLUhOywL/Z7X7zXIfI+ivqmG516INoDh RU+FGayasxHgMKDMuY3DLrHDdsygPlb7qThEZgOgRoAgP99OKqRMFKI7IVXSU5PX1E+M bfOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=V067Dbq2wl+hlkX/PhQ3Z1kXzkOrdFBiPp9EOe3RxzU=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=0+q04uZSB49N8WGX1IRqNKqo86Yroq2i5AFLJlzWv/h1QB2fm7gpFklt6gROvcaI+m iHMYVCbzmGtau7+iWLdKfGzNAgzxBr5rCSeJSzlxErfgEHGtdAXxFnTbY6zVtMCURBYh 6sxW5kvnAD4rcnwssk3ke8Mrg3l2/zQvsz20DDHj0adGEdHKpndPtjh0eKbj9T3MLrTv ZdRMtVYX4QckRGio587c1lqtdd0z9nsdxQ5OpETHgMiNi1sqjVV91sP0CxEKiWk2wuzD 1JRhiSRhCYah2+3yLGhnfCACH6CgW70G1kuZUHDXQRC7YgN5szRnUgSXy2qjf9a99otu mFzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t2-20020a170902b20200b001b7deb697dcsi19528395plr.415.2023.07.04.02.36.54; Tue, 04 Jul 2023 02:37:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231593AbjGDJfj (ORCPT + 99 others); Tue, 4 Jul 2023 05:35:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231975AbjGDJe4 (ORCPT ); Tue, 4 Jul 2023 05:34:56 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D50D31BFA for ; Tue, 4 Jul 2023 02:33:44 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tm-RF; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOs-00C09R-Js; Tue, 04 Jul 2023 11:32:46 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Txj-0B; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 04/26] PM / devfreq: rockchip-dfi: Add SoC specific init function Date: Tue, 4 Jul 2023 11:32:20 +0200 Message-Id: <20230704093242.583575-5-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482226085014735?= X-GMAIL-MSGID: =?utf-8?q?1770482226085014735?= Move the RK3399 specifics to a SoC specific init function to make the way free for supporting other SoCs later. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- Notes: Changes since v4: - use of_device_get_match_data() - use a callback rather than a struct type as driver data drivers/devfreq/event/rockchip-dfi.c | 48 +++++++++++++++++++--------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index e19e5acaa362c..6b1ef29df7048 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -55,27 +56,21 @@ struct rockchip_dfi { void __iomem *regs; struct regmap *regmap_pmu; struct clk *clk; + u32 ddr_type; }; static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); void __iomem *dfi_regs = dfi->regs; - u32 val; - u32 ddr_type; - - /* get ddr type */ - regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); - ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & - RK3399_PMUGRF_DDRTYPE_MASK; /* clear DDRMON_CTRL setting */ writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); /* set ddr type to dfi */ - if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) + if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); - else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) + else if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); /* enable count, use software mode */ @@ -167,8 +162,26 @@ static const struct devfreq_event_ops rockchip_dfi_ops = { .set_event = rockchip_dfi_set_event, }; +static int rk3399_dfi_init(struct rockchip_dfi *dfi) +{ + struct regmap *regmap_pmu = dfi->regmap_pmu; + u32 val; + + dfi->clk = devm_clk_get(dfi->dev, "pclk_ddr_mon"); + if (IS_ERR(dfi->clk)) + return dev_err_probe(dfi->dev, PTR_ERR(dfi->clk), + "Cannot get the clk pclk_ddr_mon\n"); + + /* get ddr type */ + regmap_read(regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); + dfi->ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & + RK3399_PMUGRF_DDRTYPE_MASK; + + return 0; +}; + static const struct of_device_id rockchip_dfi_id_match[] = { - { .compatible = "rockchip,rk3399-dfi" }, + { .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init }, { }, }; MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); @@ -179,6 +192,12 @@ static int rockchip_dfi_probe(struct platform_device *pdev) struct rockchip_dfi *dfi; struct devfreq_event_desc *desc; struct device_node *np = pdev->dev.of_node, *node; + int (*soc_init)(struct rockchip_dfi *dfi); + int ret; + + soc_init = of_device_get_match_data(&pdev->dev); + if (!soc_init) + return -EINVAL; dfi = devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL); if (!dfi) @@ -188,11 +207,6 @@ static int rockchip_dfi_probe(struct platform_device *pdev) if (IS_ERR(dfi->regs)) return PTR_ERR(dfi->regs); - dfi->clk = devm_clk_get(dev, "pclk_ddr_mon"); - if (IS_ERR(dfi->clk)) - return dev_err_probe(dev, PTR_ERR(dfi->clk), - "Cannot get the clk pclk_ddr_mon\n"); - node = of_parse_phandle(np, "rockchip,pmu", 0); if (!node) return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n"); @@ -209,6 +223,10 @@ static int rockchip_dfi_probe(struct platform_device *pdev) desc->driver_data = dfi; desc->name = np->name; + ret = soc_init(dfi); + if (ret) + return ret; + dfi->edev = devm_devfreq_event_add_edev(&pdev->dev, desc); if (IS_ERR(dfi->edev)) { dev_err(&pdev->dev, From patchwork Tue Jul 4 09:32:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115669 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1091307vqx; Tue, 4 Jul 2023 02:41:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7esE0gQFlCrOMDJDAdS16Aufr0I+y58MhRCOgg9kBVL5GhhCSDQnoDeT/ZQmHhI+0MPvKS X-Received: by 2002:a17:90a:130d:b0:261:cce:d1c2 with SMTP id h13-20020a17090a130d00b002610cced1c2mr24456172pja.11.1688463662821; Tue, 04 Jul 2023 02:41:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463662; cv=none; d=google.com; s=arc-20160816; b=vVl4q58cEoqSzFdJLZuJAGLqN/B3v/5krYCPyxpPO+84XKf82ADXRoO1WHJBewiiIC NTgt5Qj6J1tDPkZLzovO1W5LeRw9QPy91q2HjAtMQugpOSLKM8qOOMPggTwCWGaWl8LV E2Oh60DzY7SMe8JNMtT8dy7rCvIEWVcl6y8sIRhpVl/SNFirqPSUK1VPn8Wu36EiIzGf H61vFYSkLv8QuKSeMngwYATn/ES4x1mBE7Fj9ZPqjxNDPkOegQppIQuhHe+fxV1Y+Drs UpIHkfS3Bxbcpbtb20RFCmamMG26dFhTlH0SgBYvU1AHbnrIvqb+xZAioAjhnlIvtn81 WmGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=/zxomqZkaPFOUgX78j8BqOVRBQXb4c5lTQFXoaTEzYw=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=ft2rDzZWnCXAmZsSeNxV2VV22sKSc1gYV3cT6gpl3lnDBFY2+OwehLEOEkBVBEo/+D RTQZH8A22Y0jLYLo2dtmh4ZLTeO6VXiZZQ+tCmjpmDRAoDhKFkRUorgwrXCewY9T1aAH zsV0AFJIDvpK1J6ghvQ8ac0stMQRxS9i301AKMxsA3COkZC+Wcl3sUnPid+LOk1adQ9v 8Rd1hb2/nNSmIEUpDfyTO1/y/ujAdf+wJb8uBp1roOtfknCNnbTcBVVzWp/hgdPGBluv vcHDZxnSv/4mGopXlAQRsnUyeO8P7mhp54Au35yo5M/G/6a4p7kVONZjR+uEG5V0Rmo9 0Itg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t189-20020a6381c6000000b0055ba896f567si3913220pgd.585.2023.07.04.02.40.48; Tue, 04 Jul 2023 02:41:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231776AbjGDJdJ (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230492AbjGDJdH (ORCPT ); Tue, 4 Jul 2023 05:33:07 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F20611F for ; Tue, 4 Jul 2023 02:33:06 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tp-RT; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09X-5Z; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Txn-12; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 05/26] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Date: Tue, 4 Jul 2023 11:32:21 +0200 Message-Id: <20230704093242.583575-6-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482473484815022?= X-GMAIL-MSGID: =?utf-8?q?1770482473484815022?= When adding perf support to the DFI driver the perf part will need the raw counter values, so move the fixed * 4 factor to rockchip_dfi_get_event(). Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 6b1ef29df7048..680f629da64fc 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -97,7 +97,7 @@ static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev) /* Find out which channel is busier */ for (i = 0; i < RK3399_DMC_NUM_CH; i++) { dfi->ch_usage[i].access = readl_relaxed(dfi_regs + - DDRMON_CH0_DFI_ACCESS_NUM + i * 20) * 4; + DDRMON_CH0_DFI_ACCESS_NUM + i * 20); dfi->ch_usage[i].total = readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); tmp = dfi->ch_usage[i].access; @@ -149,7 +149,7 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, busier_ch = rockchip_dfi_get_busier_ch(edev); - edata->load_count = dfi->ch_usage[busier_ch].access; + edata->load_count = dfi->ch_usage[busier_ch].access * 4; edata->total_count = dfi->ch_usage[busier_ch].total; return 0; From patchwork Tue Jul 4 09:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115658 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089488vqx; Tue, 4 Jul 2023 02:36:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFhO5pAzQnlmXqZLT0D6zez4uz0Zp/m8pJ0RP8Er7svOVdzLM0mpZDXAnDF2VwW+qXBxf4c X-Received: by 2002:a05:6a21:7898:b0:12e:7ca3:e22 with SMTP id bf24-20020a056a21789800b0012e7ca30e22mr7315144pzc.27.1688463366930; Tue, 04 Jul 2023 02:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463366; cv=none; d=google.com; s=arc-20160816; b=sthrxuP6wh3XyDzsjb/DpK5aC+PY0qJ1hh2XKSoDeq6nqZ7ePdZikTYrODTURFkrhu J5NgLo8T316BchH4mkegwGWKKE/RFy8I3z4n24t6w70GpVcKYF/S5Lyub4va3pxD5jVT 6U9vRWwTFGpVcI407aTXNZ3ahEyhKYaHg6fSkuJdbljmwRmSjrKTEEjNeSyDP6r8DPzr P+CrUzlWdSJHTgwW57pbcw52Mi+ZkkpTfUF9FX752TrHfzEAHS++963osYUkcZzlbHjc wp4NgHqU2NIbxouUWF9U2GSH6nsjkUmMY3S8Yyp+25H1dLWlIsqEuIR3gQRs9mgdSLY/ 6flQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=W5RReQq0WoI2/3AdZF6mIlU3dJrAa99Ym/qBFMQbvkQ=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=gdmR7tahcgdXN3ig0Ai91IcuXB7tjWEk2CnaxCyilm2uT/Ul775F6RsJSHUAqWen9N dF715vqpWd1t2q0/Y3mCmzTDI2PumhfCRE3Dozd1VchBLBBiE9zvt+2zJsOVmumTGOpl zOiE4zye/USZaBnpl46EgCSMWj0eaawsRzZqZku2pfKDTzWpfd6nGRd6uXm3q/dpr/x8 SUHeflIV2+u8PaKZEpDF/LcLFNBwDPmCK4uiNUbf6Cf+mwmO0uLZniC/YbJL71T2WEuH iBVp2dw7hQzUazu7Jtsmg8LubVOlUiXb2OIznrfOOLSKm9wkRdISRRIDhoXOl+IiA4XI Y25A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a632a0c000000b00557523b8fa1si20949347pgq.880.2023.07.04.02.35.54; Tue, 04 Jul 2023 02:36:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232118AbjGDJdn (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231929AbjGDJdP (ORCPT ); Tue, 4 Jul 2023 05:33:15 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B2781B6 for ; Tue, 4 Jul 2023 02:33:14 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006u3-7h; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0AA-8s; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Txr-1h; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 06/26] PM / devfreq: rockchip-dfi: Use free running counter Date: Tue, 4 Jul 2023 11:32:22 +0200 Message-Id: <20230704093242.583575-7-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482163435295754?= X-GMAIL-MSGID: =?utf-8?q?1770482163435295754?= The DDR_MON counters are free running counters. These are resetted to 0 when starting them over like currently done when reading the current counter values. Resetting the counters becomes a problem with perf support we want to add later, because perf needs counters that are not modified elsewhere. This patch removes resetting the counters and keeps them running instead. That means we no longer use the absolute counter values but instead compare them with the counter values we read last time. Not stopping the counters also has the impact that they are running while we are reading them. We cannot read multiple timers atomically, so the values do not exactly fit together. The effect should be negligible though as the time between two measurements is some orders of magnitude bigger than the time we need to read multiple registers. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- Notes: Changes since v4: - rephrase commit message - Drop unused variable drivers/devfreq/event/rockchip-dfi.c | 52 ++++++++++++++++------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 680f629da64fc..126bb744645b6 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -38,11 +38,15 @@ #define DDRMON_CH1_COUNT_NUM 0x3c #define DDRMON_CH1_DFI_ACCESS_NUM 0x40 -struct dmc_usage { +struct dmc_count_channel { u32 access; u32 total; }; +struct dmc_count { + struct dmc_count_channel c[RK3399_DMC_NUM_CH]; +}; + /* * The dfi controller can monitor DDR load. It has an upper and lower threshold * for the operating points. Whenever the usage leaves these bounds an event is @@ -51,7 +55,7 @@ struct dmc_usage { struct rockchip_dfi { struct devfreq_event_dev *edev; struct devfreq_event_desc desc; - struct dmc_usage ch_usage[RK3399_DMC_NUM_CH]; + struct dmc_count last_event_count; struct device *dev; void __iomem *regs; struct regmap *regmap_pmu; @@ -85,30 +89,18 @@ static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev) writel_relaxed(SOFTWARE_DIS, dfi_regs + DDRMON_CTRL); } -static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev) +static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dmc_count *count) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); - u32 tmp, max = 0; - u32 i, busier_ch = 0; + u32 i; void __iomem *dfi_regs = dfi->regs; - rockchip_dfi_stop_hardware_counter(edev); - - /* Find out which channel is busier */ for (i = 0; i < RK3399_DMC_NUM_CH; i++) { - dfi->ch_usage[i].access = readl_relaxed(dfi_regs + + count->c[i].access = readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20); - dfi->ch_usage[i].total = readl_relaxed(dfi_regs + + count->c[i].total = readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); - tmp = dfi->ch_usage[i].access; - if (tmp > max) { - busier_ch = i; - max = tmp; - } } - rockchip_dfi_start_hardware_counter(edev); - - return busier_ch; } static int rockchip_dfi_disable(struct devfreq_event_dev *edev) @@ -145,12 +137,28 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, struct devfreq_event_data *edata) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); - int busier_ch; + struct dmc_count count; + struct dmc_count *last = &dfi->last_event_count; + u32 access = 0, total = 0; + int i; + + rockchip_dfi_read_counters(edev, &count); + + /* We can only report one channel, so find the busiest one */ + for (i = 0; i < RK3399_DMC_NUM_CH; i++) { + u32 a = count.c[i].access - last->c[i].access; + u32 t = count.c[i].total - last->c[i].total; + + if (a > access) { + access = a; + total = t; + } + } - busier_ch = rockchip_dfi_get_busier_ch(edev); + edata->load_count = access * 4; + edata->total_count = total; - edata->load_count = dfi->ch_usage[busier_ch].access * 4; - edata->total_count = dfi->ch_usage[busier_ch].total; + dfi->last_event_count = count; return 0; } From patchwork Tue Jul 4 09:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115653 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089350vqx; Tue, 4 Jul 2023 02:35:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YG/SUNDhc1x7s0kf6d/b1Hs+1v68DlHQuqVh0jKYP0kx7d7frhsYSwtZvGLX1tbFL/n4n X-Received: by 2002:a05:6808:b2a:b0:3a3:7505:700a with SMTP id t10-20020a0568080b2a00b003a37505700amr11361004oij.44.1688463349222; Tue, 04 Jul 2023 02:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463349; cv=none; d=google.com; s=arc-20160816; b=AfD6HtvzaAOvRyCJr0zBTlsiumkkq3Ov3ppm/EaLcfbs8G0g3s3HXSOW9oKfFsDz2i SKZ39A1vtNGsFqp2HyoOQbh/+AqWJWiAVDiMdepgKLL4YETRCEf5x3HPlmkPPoFOUcAi 9rl325ulX5ZqlPZ7u24BJFkuAtdpR2Wy18HwHrOQe6q5qNUNOnpI6dOPI5P6QzxIbtpD Mx/pX2G7ILkmPVu5fSSaSNVeugjDTpsjI8qy7+7xBrbZ0/jPHj34qM4OsTcfS4HwQKSv T40cQkPh4eKX4iuzH7FUgEcJNZFHvlb6nB7z4APfOicDcIEX7v07w17/NtoV3v2jfdUG polQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hQ3nE/G8/G4Q8F4dmYZco6ytSaY9g1DbwaiDxRhr6Jg=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=dp7AncS9tqADPV4LYQgSPVwv0j0aYYVeFwcbUJJmj7WCQyyvpKMwNY/VO7FAxIZ4Gz NHS9dg8TZBsdThhiewMzp+Pmy5VgEGpMcGIDWQDdW8oK1bxQjeMN5kYFDHFrZBhAlAOj IbgmSmxK1bIi/5iNH7keXgJ/D+/PmVWRnK+HQFkvCr3VSJDusTf6ev3r/bvx40bktoxd JPkfCQrOxLDdPyxpk4ZASjH0tc8ok0ai3OIcY9dDvS6Xqdff0EdoLEU8G1sNJepLOBuW Tm3Nac+l+AMOvukBZj85wpOMjuMgwiHv4tnJTeVWah9yZn16gVjxdqmnHoo9YMRzkv2J Lgbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w13-20020a627b0d000000b0066df86b9458si18517154pfc.223.2023.07.04.02.35.36; Tue, 04 Jul 2023 02:35:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231548AbjGDJdN (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjGDJdH (ORCPT ); Tue, 4 Jul 2023 05:33:07 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ED5DFB for ; Tue, 4 Jul 2023 02:33:06 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tu-RM; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09f-DO; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Txv-2W; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 07/26] PM / devfreq: rockchip-dfi: introduce channel mask Date: Tue, 4 Jul 2023 11:32:23 +0200 Message-Id: <20230704093242.583575-8-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482144407423757?= X-GMAIL-MSGID: =?utf-8?q?1770482144407423757?= Different Rockchip SoC variants have a different number of channels. Introduce a channel mask to make the number of channels configurable from SoC initialization code. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 126bb744645b6..82de24a027579 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -18,10 +18,11 @@ #include #include #include +#include #include -#define RK3399_DMC_NUM_CH 2 +#define DMC_MAX_CHANNELS 2 /* DDRMON_CTRL */ #define DDRMON_CTRL 0x04 @@ -44,7 +45,7 @@ struct dmc_count_channel { }; struct dmc_count { - struct dmc_count_channel c[RK3399_DMC_NUM_CH]; + struct dmc_count_channel c[DMC_MAX_CHANNELS]; }; /* @@ -61,6 +62,7 @@ struct rockchip_dfi { struct regmap *regmap_pmu; struct clk *clk; u32 ddr_type; + unsigned int channel_mask; }; static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) @@ -95,7 +97,9 @@ static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dm u32 i; void __iomem *dfi_regs = dfi->regs; - for (i = 0; i < RK3399_DMC_NUM_CH; i++) { + for (i = 0; i < DMC_MAX_CHANNELS; i++) { + if (!(dfi->channel_mask & BIT(i))) + continue; count->c[i].access = readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20); count->c[i].total = readl_relaxed(dfi_regs + @@ -145,9 +149,14 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, rockchip_dfi_read_counters(edev, &count); /* We can only report one channel, so find the busiest one */ - for (i = 0; i < RK3399_DMC_NUM_CH; i++) { - u32 a = count.c[i].access - last->c[i].access; - u32 t = count.c[i].total - last->c[i].total; + for (i = 0; i < DMC_MAX_CHANNELS; i++) { + u32 a, t; + + if (!(dfi->channel_mask & BIT(i))) + continue; + + a = count.c[i].access - last->c[i].access; + t = count.c[i].total - last->c[i].total; if (a > access) { access = a; @@ -185,6 +194,8 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) dfi->ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & RK3399_PMUGRF_DDRTYPE_MASK; + dfi->channel_mask = GENMASK(1, 0); + return 0; }; From patchwork Tue Jul 4 09:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089711vqx; Tue, 4 Jul 2023 02:36:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4M2nu38P6LebKAtmqp+q06Amqa/DAaqBztWy6HQxk11Nfz/8QpzuYQc3BQGVfM+veCbA+i X-Received: by 2002:a05:6a20:42a6:b0:12d:39c6:9f94 with SMTP id o38-20020a056a2042a600b0012d39c69f94mr17227282pzj.47.1688463403666; Tue, 04 Jul 2023 02:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463403; cv=none; d=google.com; s=arc-20160816; b=NnqBG8kBHLYZzzoIQvjrYpLDVHDJS2csmdt2qwk6y4O4+w6B94Mbjj9kpxDywp/XwV XGbalDVLFc4R0nUZy0JZ6w/kNkehRdHtCK+gMEK/6GK8pfNEM41xEV5dpUepsVu2I5Av bhcnTOdmJEiKh7CRbDqdvCgst3sXxCN2lWJ3MS/oshMv4GaasLrr2cvHFA7/3eXH3DNo X5pEyyy6KMDsfd2px/VskLEX4+DduP2oDrBVtLxGBmgaUYD6rHDNzZY7AUyTd0pAGKSH 4JS33n/JEUhB9Kek8gZjk0fiKX9xFBBp6ggXHOu6dDs22tHIE3ZUr8Av/fFx0bahPydu izXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=orWk3dI+i9U9LGdKgBPC8N01+Ym/BZABPo6bJ899Yf4=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=z/3O24LG+W7jKHFLCdOmc4VlAcVJzl5JkJSrjGZpKFjFpyswgY5U/iPXMEf/L+ccBX q+Mnjw22KfFRKuFyBVK1F9w2Dn1zmb4ddmspB7kCsJu1AGYljUwhjyL09W+FqltWMTYZ 79K7DmY4/E2OOd8/oH46oMqHzkB2LY2UgQ8E5TQDNAn0T9yYD+icMA7juQTRbMUKfLYD FJ5jGf/GVwD//Vg9nsxbHdE6HcxlIpnAVYnRYEtMWDM4NOIkdtvlMlhgtM4z1a+AbPAq go9CdF3B9vPcU3WJQi0tPoJJAnfJvoH5XMxK9lHEDbgsiixCfQGhjaAgOkfaBydR+y+J /Izg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o14-20020a63e34e000000b0053f32b910c1si20292998pgj.700.2023.07.04.02.36.30; Tue, 04 Jul 2023 02:36:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbjGDJeq (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231441AbjGDJeK (ORCPT ); Tue, 4 Jul 2023 05:34:10 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 663F519AA for ; Tue, 4 Jul 2023 02:33:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006v2-Ik; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0AH-P0; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Txz-3M; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 08/26] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Date: Tue, 4 Jul 2023 11:32:24 +0200 Message-Id: <20230704093242.583575-9-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482202253891102?= X-GMAIL-MSGID: =?utf-8?q?1770482202253891102?= The DDRTYPE defines are named to be RK3399 specific, but they can be used for other Rockchip SoCs as well, so replace the RK3399_PMUGRF_ prefix with ROCKCHIP_. They are defined in a SoC specific header file, so when generalizing the prefix also move the new defines to a SoC agnostic header file. While at it use GENMASK to define the DDRTYPE bitfield and give it a name including the full register name. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 9 +++++---- drivers/devfreq/rk3399_dmc.c | 10 +++++----- include/soc/rockchip/rk3399_grf.h | 7 +------ include/soc/rockchip/rockchip_grf.h | 17 +++++++++++++++++ 4 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 include/soc/rockchip/rockchip_grf.h diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 82de24a027579..6bccb6fbcfc0c 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -18,8 +18,10 @@ #include #include #include +#include #include +#include #include #define DMC_MAX_CHANNELS 2 @@ -74,9 +76,9 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); /* set ddr type to dfi */ - if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) + if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3) writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); - else if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) + else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4) writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); /* enable count, use software mode */ @@ -191,8 +193,7 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) /* get ddr type */ regmap_read(regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); - dfi->ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & - RK3399_PMUGRF_DDRTYPE_MASK; + dfi->ddr_type = FIELD_GET(RK3399_PMUGRF_OS_REG2_DDRTYPE, val); dfi->channel_mask = GENMASK(1, 0); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c index daff407026157..fd2c5ffedf41e 100644 --- a/drivers/devfreq/rk3399_dmc.c +++ b/drivers/devfreq/rk3399_dmc.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -381,17 +382,16 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) } regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); - ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & - RK3399_PMUGRF_DDRTYPE_MASK; + ddr_type = FIELD_GET(RK3399_PMUGRF_OS_REG2_DDRTYPE, val); switch (ddr_type) { - case RK3399_PMUGRF_DDRTYPE_DDR3: + case ROCKCHIP_DDRTYPE_DDR3: data->odt_dis_freq = data->ddr3_odt_dis_freq; break; - case RK3399_PMUGRF_DDRTYPE_LPDDR3: + case ROCKCHIP_DDRTYPE_LPDDR3: data->odt_dis_freq = data->lpddr3_odt_dis_freq; break; - case RK3399_PMUGRF_DDRTYPE_LPDDR4: + case ROCKCHIP_DDRTYPE_LPDDR4: data->odt_dis_freq = data->lpddr4_odt_dis_freq; break; default: diff --git a/include/soc/rockchip/rk3399_grf.h b/include/soc/rockchip/rk3399_grf.h index 3eebabcb28123..775f8444bea8d 100644 --- a/include/soc/rockchip/rk3399_grf.h +++ b/include/soc/rockchip/rk3399_grf.h @@ -11,11 +11,6 @@ /* PMU GRF Registers */ #define RK3399_PMUGRF_OS_REG2 0x308 -#define RK3399_PMUGRF_DDRTYPE_SHIFT 13 -#define RK3399_PMUGRF_DDRTYPE_MASK 7 -#define RK3399_PMUGRF_DDRTYPE_DDR3 3 -#define RK3399_PMUGRF_DDRTYPE_LPDDR2 5 -#define RK3399_PMUGRF_DDRTYPE_LPDDR3 6 -#define RK3399_PMUGRF_DDRTYPE_LPDDR4 7 +#define RK3399_PMUGRF_OS_REG2_DDRTYPE GENMASK(15, 13) #endif diff --git a/include/soc/rockchip/rockchip_grf.h b/include/soc/rockchip/rockchip_grf.h new file mode 100644 index 0000000000000..dde1a9796ccb5 --- /dev/null +++ b/include/soc/rockchip/rockchip_grf.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Rockchip General Register Files definitions + */ + +#ifndef __SOC_ROCKCHIP_GRF_H +#define __SOC_ROCKCHIP_GRF_H + +/* Rockchip DDRTYPE defines */ +enum { + ROCKCHIP_DDRTYPE_DDR3 = 3, + ROCKCHIP_DDRTYPE_LPDDR2 = 5, + ROCKCHIP_DDRTYPE_LPDDR3 = 6, + ROCKCHIP_DDRTYPE_LPDDR4 = 7, +}; + +#endif /* __SOC_ROCKCHIP_GRF_H */ From patchwork Tue Jul 4 09:32:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1093958vqx; Tue, 4 Jul 2023 02:47:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFr1dTYBmbFTzpYQbpib9Lyx1n3VVMyrQuDcnbdfV073sDgYadAIbK94avFTJaU8pi1gp9B X-Received: by 2002:a17:902:c407:b0:1ac:5717:fd5 with SMTP id k7-20020a170902c40700b001ac57170fd5mr15457572plk.60.1688464048401; Tue, 04 Jul 2023 02:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464048; cv=none; d=google.com; s=arc-20160816; b=VjvCW4RD9okf96YaeyJXWCZG4CQ7HGWNi7Z8r+Quros3c2AkAAWf2Im0qw1FmeIqIh Pcd2IAjvBcLuYTCH23xRmN5+ukkZOoHoU4qC2LHSBWQ+/0A54+WUWlwNBmKayM95crjf vsATh/PKjQFeiqj8rUaWkMXl+yucZqAFAo/P2m9dqu440Z2FFi7YvylkBwa1bbbx7XzE ElnGUirASPvl2/cmORUdqumttqM4LQ0G2iCVyTtbuF3xK8oh1A5r+yARHMbYUiLjMoZr O2Px0pqqJUD13WFIHS6UaKuIqRGc3KhoF0Y1FBKt/R4Dvb5xb242hg6TX1L7e2ea4dxu ykQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dPxkvAbFshHBUP1gvm3mXMrH6dgJqJQhV0rg6XszgV8=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=Hs4yyd82r7FGMzR2in9dJTubroiJ4ehfQWM5qU1QHO9A93mIxEnuzd7jxETwRyDGFJ aFTFy1SzMEo/PotKjj2YEX9WVE8VrguqRQLbBPgjRh69KuyFbxwepSn5NCycBKvZkpw5 IlnAAcS0eeLjEhjnjJpPPio9SzHjnL1A3A1yX0V5ijpXdR5DE9HWTfAGW43tZ7kms2gL N00QWi0DAnaUfCHVzPMbeWGFoESqcpUBlVAHIu8LOsvoKwrnxB17rPraP6nArsRea0Ya 31A5SUEWBJmsdVHp1H/LXwasLxPnPTkU675hY3012eiNfcKJYdtTigsQ9Zm+1YcRObTe l7NQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a3-20020a170902ecc300b001b55048e61asi21694405plh.612.2023.07.04.02.47.11; Tue, 04 Jul 2023 02:47:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231976AbjGDJe6 (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232187AbjGDJeM (ORCPT ); Tue, 4 Jul 2023 05:34:12 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 446FB19A4 for ; Tue, 4 Jul 2023 02:33:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006xx-8Y; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Ap-HA; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Ty3-4E; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 09/26] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Date: Tue, 4 Jul 2023 11:32:25 +0200 Message-Id: <20230704093242.583575-10-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482878008260015?= X-GMAIL-MSGID: =?utf-8?q?1770482878008260015?= Use the HIWORD_UPDATE() define known from other rockchip drivers to make the defines look less odd to the readers who've seen other rockchip drivers. The HIWORD registers have their functional bits in the lower 16 bits whereas the upper 16 bits contain a mask. Only the functional bits that have the corresponding mask bit set are modified during a write. Although the register writes look different, the end result should be the same, at least there's no functional change intended with this patch. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 6bccb6fbcfc0c..6b3ef97b3be09 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -26,15 +26,19 @@ #define DMC_MAX_CHANNELS 2 +#define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) + /* DDRMON_CTRL */ #define DDRMON_CTRL 0x04 -#define CLR_DDRMON_CTRL (0x1f0000 << 0) -#define LPDDR4_EN (0x10001 << 4) -#define HARDWARE_EN (0x10001 << 3) -#define LPDDR3_EN (0x10001 << 2) -#define SOFTWARE_EN (0x10001 << 1) -#define SOFTWARE_DIS (0x10000 << 1) -#define TIME_CNT_EN (0x10001 << 0) +#define DDRMON_CTRL_DDR4 BIT(5) +#define DDRMON_CTRL_LPDDR4 BIT(4) +#define DDRMON_CTRL_HARDWARE_EN BIT(3) +#define DDRMON_CTRL_LPDDR23 BIT(2) +#define DDRMON_CTRL_SOFTWARE_EN BIT(1) +#define DDRMON_CTRL_TIMER_CNT_EN BIT(0) +#define DDRMON_CTRL_DDR_TYPE_MASK (DDRMON_CTRL_DDR4 | \ + DDRMON_CTRL_LPDDR4 | \ + DDRMON_CTRL_LPDDR23) #define DDRMON_CH0_COUNT_NUM 0x28 #define DDRMON_CH0_DFI_ACCESS_NUM 0x2c @@ -73,16 +77,20 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) void __iomem *dfi_regs = dfi->regs; /* clear DDRMON_CTRL setting */ - writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); + writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | DDRMON_CTRL_SOFTWARE_EN | + DDRMON_CTRL_HARDWARE_EN), dfi_regs + DDRMON_CTRL); /* set ddr type to dfi */ if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3) - writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); + writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK), + dfi_regs + DDRMON_CTRL); else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4) - writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); + writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK), + dfi_regs + DDRMON_CTRL); /* enable count, use software mode */ - writel_relaxed(SOFTWARE_EN, dfi_regs + DDRMON_CTRL); + writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN), + dfi_regs + DDRMON_CTRL); } static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev) @@ -90,7 +98,8 @@ static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev) struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); void __iomem *dfi_regs = dfi->regs; - writel_relaxed(SOFTWARE_DIS, dfi_regs + DDRMON_CTRL); + writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), + dfi_regs + DDRMON_CTRL); } static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dmc_count *count) From patchwork Tue Jul 4 09:32:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089443vqx; Tue, 4 Jul 2023 02:36:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6PJwYCwKWYPV8QRtuaz9O7GO+AngQ3ITC1S048zz0huPLpLt73lbdLPAjQ+eI1kFnxJSy X-Received: by 2002:a81:6c07:0:b0:56f:ecdd:ded7 with SMTP id h7-20020a816c07000000b0056fecddded7mr10114922ywc.10.1688463362015; Tue, 04 Jul 2023 02:36:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463361; cv=none; d=google.com; s=arc-20160816; b=ny/uf2YHXbRNX2FNQwohIekejlhtqTaG+kc2xLI5FeKXJhD8yE8bhtgfXP4EoUdDk/ PRtd/Sooi6sdoJydiSzOdTn+Ay3zlFRT86vHob+EOb/1UkhtUcr5XDTzeAPV2Q3B83w7 cWb49yhpVJkwDmeZ5F1sb4q/z/LBXrhVneUE9qyPQxvw2SyE47LTouSZqjlbPAi8vV+l 32n11zEvm8+CDmM9hKhifjwQASGzZP1IDf38YWmFQWmTpJrNuGHpz7w2SaX6+Xe7jrHL gaiPvThr48Tw4nenSK5+AiqwB4vrnIkaowJrtPw5gfjh79kaaZ7vYKvKkzp8jzabzcmo A1Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BfdWfFL82Sj9v9lVmFzp1Ri6VF6v4IEwdYbB7ZQI4LY=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=bnQ4QnlkWPrxH4GthPGkfFxK4AQATVUyddCovMSBQE4A2/buXKN7w0ys8WXmb73ciU 2JYBFpBW7VAVROuMm37z7jq3wiwfQn94LB7qgW13Vb3OqI69mJRV7WC5Xdf4GzkEFRqq vRqB8KGRRST6x1BBySIslNb++IedZK5FUYeFoKjtLKCMmFUkCTKmJ4lsa7pZFXyUxgio F0aI61LdZvrX6FFag+V2ZV8mhDV2v8nTLFzhooqfOxVdwui7M1kSDy8eZHnIHgFOaTVX 56cD7nWSegZm6pLYSRtMjnF7cLSEWv0USEDPptFTPWrdBSUCU8MlJGvvz0yYIlX06QVt yrgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y184-20020a638ac1000000b005533a901a5csi20511555pgd.830.2023.07.04.02.35.49; Tue, 04 Jul 2023 02:36:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232105AbjGDJdg (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231826AbjGDJdN (ORCPT ); Tue, 4 Jul 2023 05:33:13 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8BBF1A4 for ; Tue, 4 Jul 2023 02:33:11 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006ty-RI; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C09x-ID; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Ty7-52; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 10/26] PM / devfreq: rockchip-dfi: Add RK3568 support Date: Tue, 4 Jul 2023 11:32:26 +0200 Message-Id: <20230704093242.583575-11-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482158215570584?= X-GMAIL-MSGID: =?utf-8?q?1770482158215570584?= This adds RK3568 support to the DFI driver. Only iniitialization differs from the currently supported RK3399. Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 21 +++++++++++++++++++++ include/soc/rockchip/rk3568_grf.h | 12 ++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 include/soc/rockchip/rk3568_grf.h diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 6b3ef97b3be09..261d112580c9e 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -23,6 +23,7 @@ #include #include +#include #define DMC_MAX_CHANNELS 2 @@ -209,10 +210,30 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) return 0; }; +static int rk3568_dfi_init(struct rockchip_dfi *dfi) +{ + struct regmap *regmap_pmu = dfi->regmap_pmu; + u32 reg2, reg3; + + regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG2, ®2); + regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG3, ®3); + + dfi->ddr_type = FIELD_GET(RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO, reg2); + + if (FIELD_GET(RK3568_PMUGRF_OS_REG3_SYSREG_VERSION, reg3) >= 0x3) + dfi->ddr_type |= FIELD_GET(RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3, reg3) << 3; + + dfi->channel_mask = 1; + + return 0; +}; + static const struct of_device_id rockchip_dfi_id_match[] = { { .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init }, + { .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init }, { }, }; + MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); static int rockchip_dfi_probe(struct platform_device *pdev) diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h new file mode 100644 index 0000000000000..575584e9d8834 --- /dev/null +++ b/include/soc/rockchip/rk3568_grf.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef __SOC_RK3568_GRF_H +#define __SOC_RK3568_GRF_H + +#define RK3568_PMUGRF_OS_REG2 0x208 +#define RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO GENMASK(15, 13) + +#define RK3568_PMUGRF_OS_REG3 0x20c +#define RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3 GENMASK(13, 12) +#define RK3568_PMUGRF_OS_REG3_SYSREG_VERSION GENMASK(31, 28) + +#endif /* __SOC_RK3568_GRF_H */ From patchwork Tue Jul 4 09:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1092562vqx; Tue, 4 Jul 2023 02:43:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlEV2Gs2QLY7uSZOioQXWcpTCB7WdtyVw8baeJvk2f1HCyWShJ/dMU/pbO598KGwFDLQWjEp X-Received: by 2002:a05:6870:3c16:b0:1a2:c149:99cd with SMTP id gk22-20020a0568703c1600b001a2c14999cdmr12705807oab.8.1688463837403; Tue, 04 Jul 2023 02:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463837; cv=none; d=google.com; s=arc-20160816; b=YTuoIbwUEusaLji7bBN4qqU8rbzgCoVmF+oUDV3xgn0ED6dqNp7+BET8n3qBam98Xv 33KInQsCVYSIHO/HP+SUnZh//zTs+0x5/yfppKiLTvc4UH4dXkEPyI1e59Da9pCXEROl Bh0FMEbkae8i6kambSrR2TIwqNA5RCfJ1KcfRjpJNTjJvXjEmE/uu8/xTE/tUdribvs3 Dd6V93k0oM1BBVWGLkKAdqNFbmz6BdpfxmmFESR9i5ZMoi6dD/WlZ9lX/zmuxUiUvOzA e2w85d7n4zmtw+hyy87aA3dQFRZmqkjOlYOxjjTeN92arZ4V0B2geiLYTlX9FU+Iu+Pw Ynmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SQA0RXZqE9ew622HcRw40QyMpyIfFjSTHy139Gr6Uco=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=cCAfQkbnrmjDvRVbKRVCbGdMBYgRsKghvBYuXlckUCQ+COXUbuhrOwuSwPnNp5tTsj NCUxwR2M9kjRrgUSoPGoVDj9GjsyFvHzVLxZDqc5hx3zoUoOIvucMzrOupMwg6FsG3Ix VuNAURsD4H9/PsOMLppET5L+ikCyAqAhCNo/BWBW/qHWVJw/HMnR7JYIQLkiBSk/H5fs Odl9oFQvddFMMA6+jBWSyEJLNKPWFixpZqf+qbixVeBW7VZfbSpd0PwBY2nnfnBXslVK tQ9V7fN46akjKOzBahIdjkgjI5v5r7ycBjvLuuKEo/jKwG1n75oBWcwbveHgsmaVzhWs UNng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a63f90a000000b00553a9801a56si21010973pgi.54.2023.07.04.02.43.43; Tue, 04 Jul 2023 02:43:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230326AbjGDJdj (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231913AbjGDJdN (ORCPT ); Tue, 4 Jul 2023 05:33:13 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DA98187 for ; Tue, 4 Jul 2023 02:33:12 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006u0-RS; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C0A4-UD; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TyB-5s; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 11/26] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Date: Tue, 4 Jul 2023 11:32:27 +0200 Message-Id: <20230704093242.583575-12-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482656770261508?= X-GMAIL-MSGID: =?utf-8?q?1770482656770261508?= According to the downstream driver the DDRMON_CTRL_LPDDR23 bit must be set for both LPDDR2 and LPDDR3. Add the missing LPDDR2 case and while at it turn the if/else if/else into switch/case which makes it easier to read. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 261d112580c9e..16cd5365671f7 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -82,12 +82,19 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) DDRMON_CTRL_HARDWARE_EN), dfi_regs + DDRMON_CTRL); /* set ddr type to dfi */ - if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3) + switch (dfi->ddr_type) { + case ROCKCHIP_DDRTYPE_LPDDR2: + case ROCKCHIP_DDRTYPE_LPDDR3: writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK), dfi_regs + DDRMON_CTRL); - else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4) + break; + case ROCKCHIP_DDRTYPE_LPDDR4: writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK), dfi_regs + DDRMON_CTRL); + break; + default: + break; + } /* enable count, use software mode */ writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN), From patchwork Tue Jul 4 09:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1091341vqx; Tue, 4 Jul 2023 02:41:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7HjyiqE6L6bxuWMCdEP1eMtzon23EgDSWdTrJR6qXI6qtGeoqIkS0zJhkOaA2UXQ6b9RKY X-Received: by 2002:a17:902:e84e:b0:1b7:de50:7d9c with SMTP id t14-20020a170902e84e00b001b7de507d9cmr28631203plg.15.1688463667758; Tue, 04 Jul 2023 02:41:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463667; cv=none; d=google.com; s=arc-20160816; b=zHvpBbX9KvZZhur8Mi1FCrafUtkIMDfNjVq/m4SDciisBUqglVQwqP2WsFo2O+EOP8 eoWKjEa90YcXU+g15PP+Yacn/WMsSIooQ3m+oiMq8SuhHlY0Fb8G6J/ugbZwDxdBz90y JgcDsUiMZK2D3a2j07WLW+UxM/UiNBQO3dMyvlzLeJNzwRX4g5uctqETuGHRqy+hrC6s 4vG77BWXcrmNiP1lhNH/xZXF8w8JYA364NkhcPPI1gdAq1LkzDxsHpExCvQqtTt4yr/R JqhQt0NxBH/WP52MphhZ0MrP2YqtN6WDXftSRVW1Q/5mNQNTaG769NLqTFGpfnagmsC/ viUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6l0HT7a6rJZNYfPPc8pxtL/Cx53sW4xoZ3iu+8PtrQU=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=x3WzZXJME2dgRPD43FF3idof0ZfrE5HIk5KAHtQeu+JLCBooGHhFkzO/XrgmSAdSmk en8RWFZ45AFFYetq9VLxRHwGcB/VsxB9pvqhCdZLqbyI4ciscb1M8f0nGee8hKodMfXM oqUMnA5fzvhBs0hBmG/EN97rv8GHZJCOLe1iV733VU723nBxxYzCPg0h8SiDPmo+Xhj/ GOnzeRqkgagLbgrY31QmatfZ6ClC5+XjPtRPJiFSUVQhWzUYVMKXubuRoSQGyfIV5lvy RauuxDWbcXrT+PqlDMkAJQteMiiKMY+5Ejt3Ri4zHKivxf+mJBshqIi3r/hvPUQ1WOD6 FshQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a170902d2c200b001b8664a2b6dsi10069129plc.639.2023.07.04.02.40.53; Tue, 04 Jul 2023 02:41:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbjGDJdv (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231540AbjGDJdT (ORCPT ); Tue, 4 Jul 2023 05:33:19 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A8B4E41 for ; Tue, 4 Jul 2023 02:33:17 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006yZ-Fd; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Ay-Oa; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TyF-6d; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 12/26] PM / devfreq: rockchip-dfi: Handle LPDDR4X Date: Tue, 4 Jul 2023 11:32:28 +0200 Message-Id: <20230704093242.583575-13-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482478974792551?= X-GMAIL-MSGID: =?utf-8?q?1770482478974792551?= In the DFI driver LPDDR4X can be handled in the same way as LPDDR4. Add the missing case. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 1 + include/soc/rockchip/rockchip_grf.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 16cd5365671f7..0a568c5551699 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -89,6 +89,7 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) dfi_regs + DDRMON_CTRL); break; case ROCKCHIP_DDRTYPE_LPDDR4: + case ROCKCHIP_DDRTYPE_LPDDR4X: writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK), dfi_regs + DDRMON_CTRL); break; diff --git a/include/soc/rockchip/rockchip_grf.h b/include/soc/rockchip/rockchip_grf.h index dde1a9796ccb5..e46fd72aea8d1 100644 --- a/include/soc/rockchip/rockchip_grf.h +++ b/include/soc/rockchip/rockchip_grf.h @@ -12,6 +12,7 @@ enum { ROCKCHIP_DDRTYPE_LPDDR2 = 5, ROCKCHIP_DDRTYPE_LPDDR3 = 6, ROCKCHIP_DDRTYPE_LPDDR4 = 7, + ROCKCHIP_DDRTYPE_LPDDR4X = 8, }; #endif /* __SOC_ROCKCHIP_GRF_H */ From patchwork Tue Jul 4 09:32:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1095269vqx; Tue, 4 Jul 2023 02:50:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6tHMMrFKBwgT81NHiCBycrw178BSo8w8uvZWXMJS/Vfv6IUSBNenG/XIm1ge6iCQxoVdip X-Received: by 2002:a05:6a20:734e:b0:110:9210:f6b8 with SMTP id v14-20020a056a20734e00b001109210f6b8mr16806071pzc.35.1688464209715; Tue, 04 Jul 2023 02:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464209; cv=none; d=google.com; s=arc-20160816; b=tT35KGNg+weT2LFixOSIpBGIGvqsDW4R3ZM+fbKprdSeZcfvHEp/8vXzkdOZMJgDSU 8OwF833+QVXh+kNdZ7bqspIi+oo0L9j0yKLsRSAyiGIuMnXnZ3YBby0dEITfkBSsgR3I V58ZZ/d/gNsqwRN+rjnakX3vdS7e+ItRsPlT/9PeEMt76T4sdkTIb6p5aSbGZdcFalOV yBL30Vin/+4UD0iK7lWaSfsgbzYAAVJDxHdgQ5bc5cECU4mQkLXTgXULrxIKAQuY8F+/ gI1LVDjeTmikDvd6p9jE0D5gt8j7k8ZjyIml4T8LzVJHhXtyPam9e2zBLO9skd9NGls2 NQ6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=VjcphYLnfkgoMyrAo1arLEHSWVa2t3ANVRhaeuOioqI=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=E9+LB25+Luwryh2AS7bCY1MST5aqJfzjxhIQN/hNP1c3RZ9O1j4QsqgdiKG+EtVgMp p3iBM3h12TAOoDmImguLcleqpiKYzjw/x9wAVpdDmiL/459uNvzPiI2VkdV1aXxWzlxg WcB2gjBB8XGTjYTRNle3ismCk+Q661DgN4+0RV7iQD6mDQrxQ7P63oX7xIAzUTJovwLY 2KHgPEtDPZq38pgdkiBchofTZGeKiPuO1r7xvZPkdeJlJhlGvJ5X0ctDMjZrTFhAr9HZ qHrfbRnI02srfTb6MXORgnP1c/XPO6G1u0JhAp/O4Qkfj1eyWza9KMiUQ2M/7KtstPZ/ ViqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c184-20020a624ec1000000b006825e2dba5fsi8904290pfb.258.2023.07.04.02.49.55; Tue, 04 Jul 2023 02:50:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230389AbjGDJeB (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232066AbjGDJdW (ORCPT ); Tue, 4 Jul 2023 05:33:22 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EEC71B4 for ; Tue, 4 Jul 2023 02:33:19 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tr-RY; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09Z-6L; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TyJ-7N; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 13/26] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Date: Tue, 4 Jul 2023 11:32:29 +0200 Message-Id: <20230704093242.583575-14-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770483047161104408?= X-GMAIL-MSGID: =?utf-8?q?1770483047161104408?= The internal functions do not need the struct devfreq_event_dev *, so pass them the struct rockchip_dfi *. This is a preparation for adding perf support later which doesn't have a struct devfreq_event_dev *. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 0a568c5551699..d39db5de7f19c 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -72,9 +72,8 @@ struct rockchip_dfi { unsigned int channel_mask; }; -static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) +static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi) { - struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); void __iomem *dfi_regs = dfi->regs; /* clear DDRMON_CTRL setting */ @@ -102,18 +101,16 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) dfi_regs + DDRMON_CTRL); } -static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev) +static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi) { - struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); void __iomem *dfi_regs = dfi->regs; writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), dfi_regs + DDRMON_CTRL); } -static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dmc_count *count) +static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count) { - struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); u32 i; void __iomem *dfi_regs = dfi->regs; @@ -131,7 +128,7 @@ static int rockchip_dfi_disable(struct devfreq_event_dev *edev) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); - rockchip_dfi_stop_hardware_counter(edev); + rockchip_dfi_stop_hardware_counter(dfi); clk_disable_unprepare(dfi->clk); return 0; @@ -148,7 +145,7 @@ static int rockchip_dfi_enable(struct devfreq_event_dev *edev) return ret; } - rockchip_dfi_start_hardware_counter(edev); + rockchip_dfi_start_hardware_counter(dfi); return 0; } @@ -166,7 +163,7 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, u32 access = 0, total = 0; int i; - rockchip_dfi_read_counters(edev, &count); + rockchip_dfi_read_counters(dfi, &count); /* We can only report one channel, so find the busiest one */ for (i = 0; i < DMC_MAX_CHANNELS; i++) { From patchwork Tue Jul 4 09:32:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089758vqx; Tue, 4 Jul 2023 02:36:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1WVKLta4xC71JynTsQ/1ijgndLt0bAIqTeYi4yoF+NzxjelRCCZu4ye3VBdHPl4sagw3x X-Received: by 2002:a17:90b:2353:b0:263:931b:bb5f with SMTP id ms19-20020a17090b235300b00263931bbb5fmr7824165pjb.14.1688463408947; Tue, 04 Jul 2023 02:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463408; cv=none; d=google.com; s=arc-20160816; b=Y78MvuGBSctNZv1De0qhus9hak1b5z0448B9MXTotSZ4kB35QKF1b13/3uHRet9S+8 x5Gj3dzYkICcQIYxJknQVlAK5PpPoLJxVQbcN99VdQNHXQVcO8u7JXLDf2PkFO+l99bN hLTUCiguFJFOUj2GNP8g5187KSY0MxhyWw4wc2hvfIslvpZmUN0OcOoBb09bgdgYiS90 a7TQRcTFvbvNYpDl9cp3W3lal/oXoOGGcwhPBUJ79DRCQp/BTtCNn6swBJilgWeFs0ix Wehf47BpPY/odDkNCTIkFb7etH+fJ3wGxRJgMncdAOQXKv6rExZ/BaC/ylVl9YefkWUq ocCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=j9/RhfRaR/J0tuS0eaR0LAQkOj/yO+OTGp7bfvbpvk0=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=nfhvQfgfzM5C+JkLkJuMbNUZA9MP3HZDEmPyYlEzt5hmiKdMYSW6BYp5plX73jeEM9 XQK531IgFIhIf0b+Eui0bdt53gdLRtjH3o7dyqhhi8oVZlJVxYSUu2xfkDOhb++HM3Xt YUunVepotMsJhXv6WaFyta7E0Bu308TFFD/HDs4D03jZeMzxvnJSCMEXpCeT3Dyhd6ex +exAUywf8RvWzn1RJXMnGGzLOWCwfpKwPzghtwzr6pMMy8bEn8TEP/yUwAvSNwfn9KRC w4EvreuuV5l1LQhACZcFedCdLiB0y04L1LxOCbLuII4tJxCHAMVyWILGCMJnZe9/Xylo tUuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk17-20020a17090b4a1100b00263dee6d04dsi1972343pjb.126.2023.07.04.02.36.35; Tue, 04 Jul 2023 02:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232025AbjGDJfF (ORCPT + 99 others); Tue, 4 Jul 2023 05:35:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232128AbjGDJeU (ORCPT ); Tue, 4 Jul 2023 05:34:20 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B621BC0 for ; Tue, 4 Jul 2023 02:33:30 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tq-RU; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09Y-68; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TyN-8A; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 14/26] PM / devfreq: rockchip-dfi: Prepare for multiple users Date: Tue, 4 Jul 2023 11:32:30 +0200 Message-Id: <20230704093242.583575-15-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482207180097766?= X-GMAIL-MSGID: =?utf-8?q?1770482207180097766?= When adding perf support later the DFI must be enabled when either of devfreq-event or perf is active. Prepare for that by adding a usage counter for the DFI. Also move enabling and disabling of the clock away from the devfreq-event specific functions to which the perf specific part won't have access. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 57 +++++++++++++++++++--------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index d39db5de7f19c..8a7af7c32ae0d 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -68,13 +68,28 @@ struct rockchip_dfi { void __iomem *regs; struct regmap *regmap_pmu; struct clk *clk; + int usecount; + struct mutex mutex; u32 ddr_type; unsigned int channel_mask; }; -static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi) +static int rockchip_dfi_enable(struct rockchip_dfi *dfi) { void __iomem *dfi_regs = dfi->regs; + int ret = 0; + + mutex_lock(&dfi->mutex); + + dfi->usecount++; + if (dfi->usecount > 1) + goto out; + + ret = clk_prepare_enable(dfi->clk); + if (ret) { + dev_err(&dfi->edev->dev, "failed to enable dfi clk: %d\n", ret); + goto out; + } /* clear DDRMON_CTRL setting */ writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | DDRMON_CTRL_SOFTWARE_EN | @@ -99,14 +114,30 @@ static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi) /* enable count, use software mode */ writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN), dfi_regs + DDRMON_CTRL); +out: + mutex_unlock(&dfi->mutex); + + return ret; } -static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi) +static void rockchip_dfi_disable(struct rockchip_dfi *dfi) { void __iomem *dfi_regs = dfi->regs; + mutex_lock(&dfi->mutex); + + dfi->usecount--; + + WARN_ON_ONCE(dfi->usecount < 0); + + if (dfi->usecount > 0) + goto out; + writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), dfi_regs + DDRMON_CTRL); + clk_disable_unprepare(dfi->clk); +out: + mutex_unlock(&dfi->mutex); } static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count) @@ -124,29 +155,20 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun } } -static int rockchip_dfi_disable(struct devfreq_event_dev *edev) +static int rockchip_dfi_event_disable(struct devfreq_event_dev *edev) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); - rockchip_dfi_stop_hardware_counter(dfi); - clk_disable_unprepare(dfi->clk); + rockchip_dfi_disable(dfi); return 0; } -static int rockchip_dfi_enable(struct devfreq_event_dev *edev) +static int rockchip_dfi_event_enable(struct devfreq_event_dev *edev) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); - int ret; - - ret = clk_prepare_enable(dfi->clk); - if (ret) { - dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret); - return ret; - } - rockchip_dfi_start_hardware_counter(dfi); - return 0; + return rockchip_dfi_enable(dfi); } static int rockchip_dfi_set_event(struct devfreq_event_dev *edev) @@ -190,8 +212,8 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, } static const struct devfreq_event_ops rockchip_dfi_ops = { - .disable = rockchip_dfi_disable, - .enable = rockchip_dfi_enable, + .disable = rockchip_dfi_event_disable, + .enable = rockchip_dfi_event_enable, .get_event = rockchip_dfi_get_event, .set_event = rockchip_dfi_set_event, }; @@ -272,6 +294,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev) return PTR_ERR(dfi->regmap_pmu); dfi->dev = dev; + mutex_init(&dfi->mutex); desc = &dfi->desc; desc->ops = &rockchip_dfi_ops; From patchwork Tue Jul 4 09:32:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089628vqx; Tue, 4 Jul 2023 02:36:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHUvj0sSrNkn2SeZRJXwMwvf9hbmL3zjOHD7YP5yiWJ/acCTJXaKwSp14axGKMf5qFLL+3 X-Received: by 2002:a17:902:c94d:b0:1b8:64a9:ea60 with SMTP id i13-20020a170902c94d00b001b864a9ea60mr10832689pla.53.1688463387864; Tue, 04 Jul 2023 02:36:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463387; cv=none; d=google.com; s=arc-20160816; b=ZlFmxzbf47haWqSfDkg2KPWY6J6LNMjQ/Kf3f056JZ8+52UQLRKUGXQ/N6c+bvr212 McOlfGjDpbDShU42DJUesX/ECWqc7aIXwZxcghqMSwtWYJQHl/ZhCOgvDERowV2PjN7N CL3qIsHsMC1TzqopaGm+yGhmfxwyYP82ek9ceT/960kJt+yfmqOIPS8AbwY8T+8cwFh8 qvb97WyDf+S6bT1Uo5OkRGy9ZUSt77Aw++lVn3t+emsqlDXkoOPeoqrIJXxSaLKoau49 Q+IobfEc7xHjF9d4yp+8+/r64h4R6Nut1oABFR1aBrtJDHxENIg4gGS+Y8OWR/Fbyn4i A+KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=cRB/wnKP7BGs0T3dvCrY9uPN1y2snP1mC7CVxytFd0Y=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=ovihHzQBAgykC308XwdnTamI8P3jEnT453v8z2S84w/LzvC3yLqTmHvwkskCm1i6Lt OQu6K8I3wQd/SsMnmMgfTdcddpXgZDbw2jiQKt5PxpPmXhVCcY2RLEZDSAKOmpvcdHAX qNj+iAAcxZUjWGY+QTotB7zp2Y3PWxQLsnlZb8PzMmTdNc5j4Uc2TLOC3YB8EkAX+TgX MswmYoTgqq0WQbJbxiIRWTi7zI/DOcMbB4KH14AB5d9T4+MA1GspY3Ulq62kFDINX27d /4rjJMtxqVC2oB/wp7gazZyR8pd+yIMvPwMTYR/Dd66Fmqw2SA9J6kuzhcGjhPsSa2U/ erGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i10-20020a170902c94a00b001b8a54a17f4si1375219pla.50.2023.07.04.02.36.13; Tue, 04 Jul 2023 02:36:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230081AbjGDJeO (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232025AbjGDJdi (ORCPT ); Tue, 4 Jul 2023 05:33:38 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB6DC10FB for ; Tue, 4 Jul 2023 02:33:20 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tv-RH; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09i-Hp; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TyW-8y; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 15/26] PM / devfreq: rockchip-dfi: give variable a better name Date: Tue, 4 Jul 2023 11:32:31 +0200 Message-Id: <20230704093242.583575-16-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482185269722942?= X-GMAIL-MSGID: =?utf-8?q?1770482185269722942?= struct dmc_count_channel::total counts the clock cycles of the DDR controller. Rename it accordingly to give the reader a better idea what this is about. While at it, at some documentation to struct dmc_count_channel. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- drivers/devfreq/event/rockchip-dfi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 8a7af7c32ae0d..50e497455dc69 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -46,9 +46,14 @@ #define DDRMON_CH1_COUNT_NUM 0x3c #define DDRMON_CH1_DFI_ACCESS_NUM 0x40 +/** + * struct dmc_count_channel - structure to hold counter values from the DDR controller + * @access: Number of read and write accesses + * @clock_cycles: DDR clock cycles + */ struct dmc_count_channel { u32 access; - u32 total; + u32 clock_cycles; }; struct dmc_count { @@ -150,7 +155,7 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun continue; count->c[i].access = readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20); - count->c[i].total = readl_relaxed(dfi_regs + + count->c[i].clock_cycles = readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); } } @@ -182,29 +187,29 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); struct dmc_count count; struct dmc_count *last = &dfi->last_event_count; - u32 access = 0, total = 0; + u32 access = 0, clock_cycles = 0; int i; rockchip_dfi_read_counters(dfi, &count); /* We can only report one channel, so find the busiest one */ for (i = 0; i < DMC_MAX_CHANNELS; i++) { - u32 a, t; + u32 a, c; if (!(dfi->channel_mask & BIT(i))) continue; a = count.c[i].access - last->c[i].access; - t = count.c[i].total - last->c[i].total; + c = count.c[i].clock_cycles - last->c[i].clock_cycles; if (a > access) { access = a; - total = t; + clock_cycles = c; } } edata->load_count = access * 4; - edata->total_count = total; + edata->total_count = clock_cycles; dfi->last_event_count = count; From patchwork Tue Jul 4 09:32:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1095091vqx; Tue, 4 Jul 2023 02:49:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlG6/p0v7ayvL8YxjbOZ2BQe3bI7bXzx/ViHo2n/B5wQGhFnzHl8ULUZa9gDF3nPPb3ZTTMq X-Received: by 2002:a05:620a:25d1:b0:765:5ba6:a5ce with SMTP id y17-20020a05620a25d100b007655ba6a5cemr13011145qko.45.1688464189055; Tue, 04 Jul 2023 02:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464189; cv=none; d=google.com; s=arc-20160816; b=zYlqee6uXNdbce3vnmbbbrIr4U7LJKFi6SFLlS6uw2CVSi4L47tAA2leD+ppyzurS6 C2+vC94Tldi2pYmINjx1Bd32YhnYYV+Kkg0vOMck7826pp3AM+cd3ZQZPbAOCE2F6xTD ORJr0dtvuTr2HpLLTXINbC12PxBxvZWHYGV2RKV1BCdwOBMHh/dfNNSO5upcNSzvnV3J /xhAyBuzqqdh6ugLYoOhb70TrjMtJHjRjFp51y//Cm/yRMs5Q6IcloM7TbSeOBJrlOsG kYo6pD4X7Ww58apDC0LLzWhm/BlC3knp0ZCaPmxRd7bE+6Qf4rVEQKFLmn/onCIpTTRS Xa0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PDnQuSPzW/ZK+BZUf82b16L15zcWzCp+KtBqmdqD7zM=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=yk85+Gxx0Tc55OAvgAN5SUYJvvcj+c97TBfS/G/oVHqVFY20bBk6UmGKGm+rtSjCEl XlpbXlhllYCvlyDu+8+cst01HmzcV5EZjpuyiOIqvIs3U4VLwdbHgySjVOpb9wOFORe2 yjOQaeXFM069HAGWlrfM+ao2r2UXb24MQx/hOo8qpSX4dgUyPepH2SyRLKOM8xAlUs3C FCcnrSXbf/sLXdRE6+a8mBck04OasDKzGNdxvtlfaED8f2n6qyondVNgFqPfNSW+0DUa /afJoVePvXlNJWWtVGQ9BZ3cULMusr2KHwoGFOIVdQdkGltxzFfIu2wQcnsSNKmPfPpD e48Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n56-20020a056a000d7800b0067f03c85d88si12715030pfv.177.2023.07.04.02.49.34; Tue, 04 Jul 2023 02:49:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232102AbjGDJfw (ORCPT + 99 others); Tue, 4 Jul 2023 05:35:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231469AbjGDJfJ (ORCPT ); Tue, 4 Jul 2023 05:35:09 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 506451FD6 for ; Tue, 4 Jul 2023 02:33:51 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006wq-Nu; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0AK-Tp; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tya-9o; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 16/26] PM / devfreq: rockchip-dfi: Add perf support Date: Tue, 4 Jul 2023 11:32:32 +0200 Message-Id: <20230704093242.583575-17-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770483025515943801?= X-GMAIL-MSGID: =?utf-8?q?1770483025515943801?= The DFI is a unit which is suitable for measuring DDR utilization, but so far it could only be used as an event driver for the DDR frequency scaling driver. This adds perf support to the DFI driver. Usage with the 'perf' tool can look like: perf stat -a -e rockchip_ddr/cycles/,\ rockchip_ddr/read-bytes/,\ rockchip_ddr/write-bytes/,\ rockchip_ddr/bytes/ sleep 1 Performance counter stats for 'system wide': 1582524826 rockchip_ddr/cycles/ 1802.25 MB rockchip_ddr/read-bytes/ 1793.72 MB rockchip_ddr/write-bytes/ 3595.90 MB rockchip_ddr/bytes/ 1.014369709 seconds time elapsed perf support has been tested on a RK3568 and a RK3399, the latter with dual channel DDR. Signed-off-by: Sascha Hauer Reviewed-by: Sebastian Reichel Acked-by: Chanwoo Choi --- Notes: Changes since v5: - Add missing initialization of &dfi->last_perf_count Changes since v4: - use __stringify to ensure event type definitions and event numbers in sysfs are consistent - only use 64bit values in structs holding counters - support monitoring individual DDR channels - fix return value in rockchip_ddr_perf_event_init(): -EOPNOTSUPP -> -EINVAL - check for invalid event->attr.config values - start hrtimer to trigger in one second, not immediately - use devm_add_action_or_reset() - add suppress_bind_attrs - enable DDRMON during probe when perf is enabled - use a seqlock to protect perf reading the counters from the hrtimer callback modifying them drivers/devfreq/event/rockchip-dfi.c | 442 ++++++++++++++++++++++++++- include/soc/rockchip/rk3399_grf.h | 2 + include/soc/rockchip/rk3568_grf.h | 1 + 3 files changed, 440 insertions(+), 5 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 50e497455dc69..969b62f071b83 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -16,10 +16,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -41,19 +43,39 @@ DDRMON_CTRL_LPDDR4 | \ DDRMON_CTRL_LPDDR23) +#define DDRMON_CH0_WR_NUM 0x20 +#define DDRMON_CH0_RD_NUM 0x24 #define DDRMON_CH0_COUNT_NUM 0x28 #define DDRMON_CH0_DFI_ACCESS_NUM 0x2c #define DDRMON_CH1_COUNT_NUM 0x3c #define DDRMON_CH1_DFI_ACCESS_NUM 0x40 +#define PERF_EVENT_CYCLES 0x0 +#define PERF_EVENT_READ_BYTES 0x1 +#define PERF_EVENT_WRITE_BYTES 0x2 +#define PERF_EVENT_READ_BYTES0 0x3 +#define PERF_EVENT_WRITE_BYTES0 0x4 +#define PERF_EVENT_READ_BYTES1 0x5 +#define PERF_EVENT_WRITE_BYTES1 0x6 +#define PERF_EVENT_READ_BYTES2 0x7 +#define PERF_EVENT_WRITE_BYTES2 0x8 +#define PERF_EVENT_READ_BYTES3 0x9 +#define PERF_EVENT_WRITE_BYTES3 0xa +#define PERF_EVENT_BYTES 0xb +#define PERF_ACCESS_TYPE_MAX 0xc + /** * struct dmc_count_channel - structure to hold counter values from the DDR controller * @access: Number of read and write accesses * @clock_cycles: DDR clock cycles + * @read_access: number of read accesses + * @write_acccess: number of write accesses */ struct dmc_count_channel { - u32 access; - u32 clock_cycles; + u64 access; + u64 clock_cycles; + u64 read_access; + u64 write_access; }; struct dmc_count { @@ -69,6 +91,11 @@ struct rockchip_dfi { struct devfreq_event_dev *edev; struct devfreq_event_desc desc; struct dmc_count last_event_count; + + struct dmc_count last_perf_count; + struct dmc_count total_count; + seqlock_t count_seqlock; /* protects last_perf_count and total_count */ + struct device *dev; void __iomem *regs; struct regmap *regmap_pmu; @@ -77,6 +104,14 @@ struct rockchip_dfi { struct mutex mutex; u32 ddr_type; unsigned int channel_mask; + enum cpuhp_state cpuhp_state; + struct hlist_node node; + struct pmu pmu; + struct hrtimer timer; + unsigned int cpu; + int active_events; + int burst_len; + int buswidth[DMC_MAX_CHANNELS]; }; static int rockchip_dfi_enable(struct rockchip_dfi *dfi) @@ -145,7 +180,7 @@ static void rockchip_dfi_disable(struct rockchip_dfi *dfi) mutex_unlock(&dfi->mutex); } -static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count) +static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *c) { u32 i; void __iomem *dfi_regs = dfi->regs; @@ -153,13 +188,36 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun for (i = 0; i < DMC_MAX_CHANNELS; i++) { if (!(dfi->channel_mask & BIT(i))) continue; - count->c[i].access = readl_relaxed(dfi_regs + + c->c[i].read_access = readl_relaxed(dfi_regs + + DDRMON_CH0_RD_NUM + i * 20); + c->c[i].write_access = readl_relaxed(dfi_regs + + DDRMON_CH0_WR_NUM + i * 20); + c->c[i].access = readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20); - count->c[i].clock_cycles = readl_relaxed(dfi_regs + + c->c[i].clock_cycles = readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); } } +static void rockchip_ddr_perf_counters_add(struct rockchip_dfi *dfi, + const struct dmc_count *now, + struct dmc_count *res) +{ + const struct dmc_count *last = &dfi->last_perf_count; + int i; + + for (i = 0; i < DMC_MAX_CHANNELS; i++) { + res->c[i].read_access = dfi->total_count.c[i].read_access + + (u32)(now->c[i].read_access - last->c[i].read_access); + res->c[i].write_access = dfi->total_count.c[i].write_access + + (u32)(now->c[i].write_access - last->c[i].write_access); + res->c[i].access = dfi->total_count.c[i].access + + (u32)(now->c[i].access - last->c[i].access); + res->c[i].clock_cycles = dfi->total_count.c[i].clock_cycles + + (u32)(now->c[i].clock_cycles - last->c[i].clock_cycles); + } +} + static int rockchip_dfi_event_disable(struct devfreq_event_dev *edev) { struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); @@ -223,6 +281,370 @@ static const struct devfreq_event_ops rockchip_dfi_ops = { .set_event = rockchip_dfi_set_event, }; +#ifdef CONFIG_PERF_EVENTS + +static ssize_t ddr_perf_cpumask_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pmu *pmu = dev_get_drvdata(dev); + struct rockchip_dfi *dfi = container_of(pmu, struct rockchip_dfi, pmu); + + return cpumap_print_to_pagebuf(true, buf, cpumask_of(dfi->cpu)); +} + +static struct device_attribute ddr_perf_cpumask_attr = + __ATTR(cpumask, 0444, ddr_perf_cpumask_show, NULL); + +static struct attribute *ddr_perf_cpumask_attrs[] = { + &ddr_perf_cpumask_attr.attr, + NULL, +}; + +static const struct attribute_group ddr_perf_cpumask_attr_group = { + .attrs = ddr_perf_cpumask_attrs, +}; + +PMU_EVENT_ATTR_STRING(cycles, ddr_pmu_cycles, "event="__stringify(PERF_EVENT_CYCLES)) + +#define DFI_PMU_EVENT_ATTR(_name, _var, _str) \ + PMU_EVENT_ATTR_STRING(_name, _var, _str); \ + PMU_EVENT_ATTR_STRING(_name.unit, _var##_unit, "MB"); \ + PMU_EVENT_ATTR_STRING(_name.scale, _var##_scale, "9.536743164e-07") + +DFI_PMU_EVENT_ATTR(read-bytes0, ddr_pmu_read_bytes0, "event="__stringify(PERF_EVENT_READ_BYTES0)); +DFI_PMU_EVENT_ATTR(write-bytes0, ddr_pmu_write_bytes0, "event="__stringify(PERF_EVENT_WRITE_BYTES0)); + +DFI_PMU_EVENT_ATTR(read-bytes1, ddr_pmu_read_bytes1, "event="__stringify(PERF_EVENT_READ_BYTES1)); +DFI_PMU_EVENT_ATTR(write-bytes1, ddr_pmu_write_bytes1, "event="__stringify(PERF_EVENT_WRITE_BYTES1)); + +DFI_PMU_EVENT_ATTR(read-bytes2, ddr_pmu_read_bytes2, "event="__stringify(PERF_EVENT_READ_BYTES2)); +DFI_PMU_EVENT_ATTR(write-bytes2, ddr_pmu_write_bytes2, "event="__stringify(PERF_EVENT_WRITE_BYTES2)); + +DFI_PMU_EVENT_ATTR(read-bytes3, ddr_pmu_read_bytes3, "event="__stringify(PERF_EVENT_READ_BYTES3)); +DFI_PMU_EVENT_ATTR(write-bytes3, ddr_pmu_write_bytes3, "event="__stringify(PERF_EVENT_WRITE_BYTES3)); + +DFI_PMU_EVENT_ATTR(read-bytes, ddr_pmu_read_bytes, "event="__stringify(PERF_EVENT_READ_BYTES)); +DFI_PMU_EVENT_ATTR(write-bytes, ddr_pmu_write_bytes, "event="__stringify(PERF_EVENT_WRITE_BYTES)); + +DFI_PMU_EVENT_ATTR(bytes, ddr_pmu_bytes, "event="__stringify(PERF_EVENT_BYTES)); + +#define DFI_ATTR_MB(_name) \ + &_name.attr.attr, \ + &_name##_unit.attr.attr, \ + &_name##_scale.attr.attr + +static struct attribute *ddr_perf_events_attrs[] = { + &ddr_pmu_cycles.attr.attr, + DFI_ATTR_MB(ddr_pmu_read_bytes), + DFI_ATTR_MB(ddr_pmu_write_bytes), + DFI_ATTR_MB(ddr_pmu_read_bytes0), + DFI_ATTR_MB(ddr_pmu_write_bytes0), + DFI_ATTR_MB(ddr_pmu_read_bytes1), + DFI_ATTR_MB(ddr_pmu_write_bytes1), + DFI_ATTR_MB(ddr_pmu_read_bytes2), + DFI_ATTR_MB(ddr_pmu_write_bytes2), + DFI_ATTR_MB(ddr_pmu_read_bytes3), + DFI_ATTR_MB(ddr_pmu_write_bytes3), + DFI_ATTR_MB(ddr_pmu_bytes), + NULL, +}; + +static const struct attribute_group ddr_perf_events_attr_group = { + .name = "events", + .attrs = ddr_perf_events_attrs, +}; + +PMU_FORMAT_ATTR(event, "config:0-7"); + +static struct attribute *ddr_perf_format_attrs[] = { + &format_attr_event.attr, + NULL, +}; + +static const struct attribute_group ddr_perf_format_attr_group = { + .name = "format", + .attrs = ddr_perf_format_attrs, +}; + +static const struct attribute_group *attr_groups[] = { + &ddr_perf_events_attr_group, + &ddr_perf_cpumask_attr_group, + &ddr_perf_format_attr_group, + NULL, +}; + +static int rockchip_ddr_perf_event_init(struct perf_event *event) +{ + struct rockchip_dfi *dfi = container_of(event->pmu, struct rockchip_dfi, pmu); + + if (event->attr.type != event->pmu->type) + return -ENOENT; + + if (event->attach_state & PERF_ATTACH_TASK) + return -EINVAL; + + if (event->cpu < 0) { + dev_warn(dfi->dev, "Can't provide per-task data!\n"); + return -EINVAL; + } + + return 0; +} + +static u64 rockchip_ddr_perf_event_get_count(struct perf_event *event) +{ + struct rockchip_dfi *dfi = container_of(event->pmu, struct rockchip_dfi, pmu); + int blen = dfi->burst_len; + struct dmc_count total, now; + unsigned int seq; + u64 c = 0; + int i; + + rockchip_dfi_read_counters(dfi, &now); + + do { + seq = read_seqbegin(&dfi->count_seqlock); + + rockchip_ddr_perf_counters_add(dfi, &now, &total); + + } while (read_seqretry(&dfi->count_seqlock, seq)); + + switch (event->attr.config) { + case PERF_EVENT_CYCLES: + c = total.c[0].clock_cycles; + break; + case PERF_EVENT_READ_BYTES: + for (i = 0; i < DMC_MAX_CHANNELS; i++) + c += total.c[i].read_access * blen * dfi->buswidth[i]; + break; + case PERF_EVENT_WRITE_BYTES: + for (i = 0; i < DMC_MAX_CHANNELS; i++) + c += total.c[i].write_access * blen * dfi->buswidth[i]; + break; + case PERF_EVENT_READ_BYTES0: + c = total.c[0].read_access * blen * dfi->buswidth[0]; + break; + case PERF_EVENT_WRITE_BYTES0: + c = total.c[0].write_access * blen * dfi->buswidth[0]; + break; + case PERF_EVENT_READ_BYTES1: + c = total.c[1].read_access * blen * dfi->buswidth[1]; + break; + case PERF_EVENT_WRITE_BYTES1: + c = total.c[1].write_access * blen * dfi->buswidth[1]; + break; + case PERF_EVENT_READ_BYTES2: + c = total.c[2].read_access * blen * dfi->buswidth[2]; + break; + case PERF_EVENT_WRITE_BYTES2: + c = total.c[2].write_access * blen * dfi->buswidth[2]; + break; + case PERF_EVENT_READ_BYTES3: + c = total.c[3].read_access * blen * dfi->buswidth[3]; + break; + case PERF_EVENT_WRITE_BYTES3: + c = total.c[3].write_access * blen * dfi->buswidth[3]; + break; + case PERF_EVENT_BYTES: + for (i = 0; i < DMC_MAX_CHANNELS; i++) + c += total.c[i].access * blen * dfi->buswidth[i]; + break; + } + + return c; +} + +static void rockchip_ddr_perf_event_update(struct perf_event *event) +{ + u64 now; + s64 prev; + + if (event->attr.config >= PERF_ACCESS_TYPE_MAX) + return; + + now = rockchip_ddr_perf_event_get_count(event); + prev = local64_xchg(&event->hw.prev_count, now); + local64_add(now - prev, &event->count); +} + +static void rockchip_ddr_perf_event_start(struct perf_event *event, int flags) +{ + u64 now = rockchip_ddr_perf_event_get_count(event); + + local64_set(&event->hw.prev_count, now); +} + +static int rockchip_ddr_perf_event_add(struct perf_event *event, int flags) +{ + struct rockchip_dfi *dfi = container_of(event->pmu, struct rockchip_dfi, pmu); + + dfi->active_events++; + + if (dfi->active_events == 1) { + dfi->total_count = (struct dmc_count){}; + rockchip_dfi_read_counters(dfi, &dfi->last_perf_count); + hrtimer_start(&dfi->timer, ns_to_ktime(NSEC_PER_SEC), HRTIMER_MODE_REL); + } + + if (flags & PERF_EF_START) + rockchip_ddr_perf_event_start(event, flags); + + return 0; +} + +static void rockchip_ddr_perf_event_stop(struct perf_event *event, int flags) +{ + rockchip_ddr_perf_event_update(event); +} + +static void rockchip_ddr_perf_event_del(struct perf_event *event, int flags) +{ + struct rockchip_dfi *dfi = container_of(event->pmu, struct rockchip_dfi, pmu); + + rockchip_ddr_perf_event_stop(event, PERF_EF_UPDATE); + + dfi->active_events--; + + if (dfi->active_events == 0) + hrtimer_cancel(&dfi->timer); +} + +static enum hrtimer_restart rockchip_dfi_timer(struct hrtimer *timer) +{ + struct rockchip_dfi *dfi = container_of(timer, struct rockchip_dfi, timer); + struct dmc_count now, total; + + rockchip_dfi_read_counters(dfi, &now); + + write_seqlock(&dfi->count_seqlock); + + rockchip_ddr_perf_counters_add(dfi, &now, &total); + dfi->total_count = total; + dfi->last_perf_count = now; + + write_sequnlock(&dfi->count_seqlock); + + hrtimer_forward_now(&dfi->timer, ns_to_ktime(NSEC_PER_SEC)); + + return HRTIMER_RESTART; +}; + +static int ddr_perf_offline_cpu(unsigned int cpu, struct hlist_node *node) +{ + struct rockchip_dfi *dfi = hlist_entry_safe(node, struct rockchip_dfi, node); + int target; + + if (cpu != dfi->cpu) + return 0; + + target = cpumask_any_but(cpu_online_mask, cpu); + if (target >= nr_cpu_ids) + return 0; + + perf_pmu_migrate_context(&dfi->pmu, cpu, target); + dfi->cpu = target; + + return 0; +} + +static void rockchip_ddr_cpuhp_remove_state(void *data) +{ + struct rockchip_dfi *dfi = data; + + cpuhp_remove_multi_state(dfi->cpuhp_state); + + rockchip_dfi_disable(dfi); +} + +static void rockchip_ddr_cpuhp_remove_instance(void *data) +{ + struct rockchip_dfi *dfi = data; + + cpuhp_state_remove_instance_nocalls(dfi->cpuhp_state, &dfi->node); +} + +static void rockchip_ddr_perf_remove(void *data) +{ + struct rockchip_dfi *dfi = data; + + perf_pmu_unregister(&dfi->pmu); +} + +static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi) +{ + struct pmu *pmu = &dfi->pmu; + int ret; + + seqlock_init(&dfi->count_seqlock); + + pmu->module = THIS_MODULE; + pmu->capabilities = PERF_PMU_CAP_NO_EXCLUDE; + pmu->task_ctx_nr = perf_invalid_context; + pmu->attr_groups = attr_groups; + pmu->event_init = rockchip_ddr_perf_event_init; + pmu->add = rockchip_ddr_perf_event_add; + pmu->del = rockchip_ddr_perf_event_del; + pmu->start = rockchip_ddr_perf_event_start; + pmu->stop = rockchip_ddr_perf_event_stop; + pmu->read = rockchip_ddr_perf_event_update; + + dfi->cpu = raw_smp_processor_id(); + + ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, + "rockchip_ddr_perf_pmu", + NULL, + ddr_perf_offline_cpu); + + if (ret < 0) { + dev_err(dfi->dev, "cpuhp_setup_state_multi failed: %d\n", ret); + return ret; + } + + dfi->cpuhp_state = ret; + + rockchip_dfi_enable(dfi); + + ret = devm_add_action_or_reset(dfi->dev, rockchip_ddr_cpuhp_remove_state, dfi); + if (ret) + return ret; + + ret = cpuhp_state_add_instance_nocalls(dfi->cpuhp_state, &dfi->node); + if (ret) { + dev_err(dfi->dev, "Error %d registering hotplug\n", ret); + return ret; + } + + ret = devm_add_action_or_reset(dfi->dev, rockchip_ddr_cpuhp_remove_instance, dfi); + if (ret) + return ret; + + hrtimer_init(&dfi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + dfi->timer.function = rockchip_dfi_timer; + + switch (dfi->ddr_type) { + case ROCKCHIP_DDRTYPE_LPDDR2: + case ROCKCHIP_DDRTYPE_LPDDR3: + dfi->burst_len = 8; + break; + case ROCKCHIP_DDRTYPE_LPDDR4: + case ROCKCHIP_DDRTYPE_LPDDR4X: + dfi->burst_len = 16; + break; + } + + ret = perf_pmu_register(pmu, "rockchip_ddr", -1); + if (ret) + return ret; + + return devm_add_action_or_reset(dfi->dev, rockchip_ddr_perf_remove, dfi); +} +#else +static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi) +{ + return 0; +} +#endif + static int rk3399_dfi_init(struct rockchip_dfi *dfi) { struct regmap *regmap_pmu = dfi->regmap_pmu; @@ -239,6 +661,9 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) dfi->channel_mask = GENMASK(1, 0); + dfi->buswidth[0] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH0, val) == 0 ? 4 : 2; + dfi->buswidth[1] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH1, val) == 0 ? 4 : 2; + return 0; }; @@ -255,6 +680,8 @@ static int rk3568_dfi_init(struct rockchip_dfi *dfi) if (FIELD_GET(RK3568_PMUGRF_OS_REG3_SYSREG_VERSION, reg3) >= 0x3) dfi->ddr_type |= FIELD_GET(RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3, reg3) << 3; + dfi->buswidth[0] = FIELD_GET(RK3568_PMUGRF_OS_REG2_BW_CH0, reg2) == 0 ? 4 : 2; + dfi->channel_mask = 1; return 0; @@ -317,6 +744,10 @@ static int rockchip_dfi_probe(struct platform_device *pdev) return PTR_ERR(dfi->edev); } + ret = rockchip_ddr_perf_init(dfi); + if (ret) + return ret; + platform_set_drvdata(pdev, dfi); return 0; @@ -327,6 +758,7 @@ static struct platform_driver rockchip_dfi_driver = { .driver = { .name = "rockchip-dfi", .of_match_table = rockchip_dfi_id_match, + .suppress_bind_attrs = true, }, }; module_platform_driver(rockchip_dfi_driver); diff --git a/include/soc/rockchip/rk3399_grf.h b/include/soc/rockchip/rk3399_grf.h index 775f8444bea8d..39cd44cec982f 100644 --- a/include/soc/rockchip/rk3399_grf.h +++ b/include/soc/rockchip/rk3399_grf.h @@ -12,5 +12,7 @@ /* PMU GRF Registers */ #define RK3399_PMUGRF_OS_REG2 0x308 #define RK3399_PMUGRF_OS_REG2_DDRTYPE GENMASK(15, 13) +#define RK3399_PMUGRF_OS_REG2_BW_CH0 GENMASK(3, 2) +#define RK3399_PMUGRF_OS_REG2_BW_CH1 GENMASK(19, 18) #endif diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h index 575584e9d8834..52853efd6720e 100644 --- a/include/soc/rockchip/rk3568_grf.h +++ b/include/soc/rockchip/rk3568_grf.h @@ -4,6 +4,7 @@ #define RK3568_PMUGRF_OS_REG2 0x208 #define RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO GENMASK(15, 13) +#define RK3568_PMUGRF_OS_REG2_BW_CH0 GENMASK(3, 2) #define RK3568_PMUGRF_OS_REG3 0x20c #define RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3 GENMASK(13, 12) From patchwork Tue Jul 4 09:32:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089683vqx; Tue, 4 Jul 2023 02:36:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hrS0bs5/yU8HPnRouhUuVcBEf+d5HQoz8TFDghWivEBtzPLr6+q92SkWk5pqVeAljUDkH X-Received: by 2002:a05:6808:5d0:b0:3a3:7f10:d71b with SMTP id d16-20020a05680805d000b003a37f10d71bmr10157921oij.58.1688463398722; Tue, 04 Jul 2023 02:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463398; cv=none; d=google.com; s=arc-20160816; b=Kra0eDJw1jFyO2AGWr9tFdwkaBFjU6DHizP2S70jCQFg6vbyz2l2sPjHy0WiyDspa4 PDVonMkHAOQagvDUABKoE5+bYrkJ2KIwWHCFDQSKtooWioAZZlEp+kE++pCIBRmm3/FL IHP2rdcZNx6toO6dCfX0iBnDZhO/HgWHwcJDXTSZy9AByUmsPB3+aPpid00u0AQezbMJ 6xK9DDa85LETOlW/mqPcXW/8m6olra3EhqqmuZ2xsjm05Lzh/CY1rt4lpcNvg9yQm8cD r2xEOw6K6OMR8QMHP9sH49DyGkTxWJ3ug7QHNvYMlBTM9cP5cWBjfTiJOuzu7+w1G4AE sKsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Skqxx2SkxTDa7rkcKNx5uX0PmbhQ6Nr0tLQEjoXCmwI=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=tb41gCAxCZIA6M4kkgNSWQzPc8FgjW03Vrdje6WXuV9xpf56wo6zlsEO+rHybeftF5 2gvMxXwtO8gbaxqGDwijVxoWdekgc8By/H+vZt2dKOfDB6CxrICutEqTXm1Rvmupg5+d /tLF71CHVVIxneGlOWHXxrqLcc8oNNEbMXDP9ajMPzPEGzWC2AqPf2Q8IP8czXijFBYX 4EKm+Xgl/TsZZ1zqKBbbHQowz/Fca76jX6lzV2URLN/9/g8wJN5Bb7EfD3mF63fCC9yN VGaJvaK5X+e7bed6D/jI+tVUPmWhSG5Ex32V0v5/e0yJA5jYnzi/nr76HxAdYUTh/2Kl avqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c37-20020a631c65000000b00544c0bf5ffesi20287253pgm.606.2023.07.04.02.36.25; Tue, 04 Jul 2023 02:36:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231148AbjGDJeZ (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232059AbjGDJdy (ORCPT ); Tue, 4 Jul 2023 05:33:54 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61CDD171B for ; Tue, 4 Jul 2023 02:33:23 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006u1-0c; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0A7-3d; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tye-BB; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 17/26] PM / devfreq: rockchip-dfi: make register stride SoC specific Date: Tue, 4 Jul 2023 11:32:33 +0200 Message-Id: <20230704093242.583575-18-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482196529651635?= X-GMAIL-MSGID: =?utf-8?q?1770482196529651635?= The currently supported RK3399 has a stride of 20 between the channel specific registers. Upcoming RK3588 has a different stride, so put the stride into driver data to make it configurable. While at it convert decimal 20 to hex 0x14 for consistency with RK3588 which has a register stride 0x4000 and we want to write that in hex as well. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 969b62f071b83..85ec93fd41858 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -112,6 +112,7 @@ struct rockchip_dfi { int active_events; int burst_len; int buswidth[DMC_MAX_CHANNELS]; + int ddrmon_stride; }; static int rockchip_dfi_enable(struct rockchip_dfi *dfi) @@ -189,13 +190,13 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun if (!(dfi->channel_mask & BIT(i))) continue; c->c[i].read_access = readl_relaxed(dfi_regs + - DDRMON_CH0_RD_NUM + i * 20); + DDRMON_CH0_RD_NUM + i * dfi->ddrmon_stride); c->c[i].write_access = readl_relaxed(dfi_regs + - DDRMON_CH0_WR_NUM + i * 20); + DDRMON_CH0_WR_NUM + i * dfi->ddrmon_stride); c->c[i].access = readl_relaxed(dfi_regs + - DDRMON_CH0_DFI_ACCESS_NUM + i * 20); + DDRMON_CH0_DFI_ACCESS_NUM + i * dfi->ddrmon_stride); c->c[i].clock_cycles = readl_relaxed(dfi_regs + - DDRMON_CH0_COUNT_NUM + i * 20); + DDRMON_CH0_COUNT_NUM + i * dfi->ddrmon_stride); } } @@ -664,6 +665,8 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) dfi->buswidth[0] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH0, val) == 0 ? 4 : 2; dfi->buswidth[1] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH1, val) == 0 ? 4 : 2; + dfi->ddrmon_stride = 0x14; + return 0; }; From patchwork Tue Jul 4 09:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115654 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089382vqx; Tue, 4 Jul 2023 02:35:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlGmHK5UXZ79KX8oMvGEaJRjNg9lC2ZnKy6oUM/2cy+xAFE+sHw4NDxNPqlUzsaukBan3YR1 X-Received: by 2002:a92:c04d:0:b0:345:ba42:ca4d with SMTP id o13-20020a92c04d000000b00345ba42ca4dmr14648199ilf.15.1688463353251; Tue, 04 Jul 2023 02:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463353; cv=none; d=google.com; s=arc-20160816; b=j6PpCbDlTHBeEae2xb8O8NmtM+6/rcIgxChG2UnAeMrBXWgOxxoCmxsyfzMVUBC6js 5vxzltiDkHlcbLbu6SELs2GarOpZBVAJeysqqPlPFDez+ZXfDcqwjLuKzB5jr/Leyw1Y MhwATu3KkFUd9zJIQGoNF3vYBoq/DKDXnc6yk6kupKTWf/2E05bS1ir8U+Bkdt6RBb5r 4upEyXoAT3B6+skq5m0sLjUmYLwg8UY6RsF5WQZcjAGPUk+BNjX+WviKwvsHvQSGaTrl VWYzsRp6TT9ZpdSGvXIcwIdTA8qKfw2aMlg5cIV+Whul/ZLnK64dL6WMZdSBIkCyYuw8 TPQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=eX8cYf5PVm9j5NBmGMP+a1qKK+34YCjIrHqywx0CSqU=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=bxVOfiWe+UOC9VF8bFo7f8nqvQMKcHlZmRfHYCGggo94ElQQ3THKSVxkt5WpTtxg9b 6b++YhhcVcUM3A/1S8d6qLkuoRu6raUEy6ZIYYKK3wwxrKd7mqexA6iKRqYbdeWbsutj potXqdGsev0nlOwzvd3nzI4OIA2XaWmZjOxbQU+GA/fETlxnSZ3K1OWXh72Pe079OpEZ JB+tpaNan3aisE3nmRNqv2X4HHpmBodX5+fl6HL6keGWefe7CwbfJ3KgeqjG81Rkg5UF 4CDp5DsSnzkZnQPsAwILIWzyklRGzMVoD0zetNR50JOnYwa5P9GD7v8z3SOElMIug15D Pz/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k26-20020a635a5a000000b005534371608dsi19926970pgm.849.2023.07.04.02.35.41; Tue, 04 Jul 2023 02:35:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231996AbjGDJd1 (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbjGDJdK (ORCPT ); Tue, 4 Jul 2023 05:33:10 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BBA51A4 for ; Tue, 4 Jul 2023 02:33:09 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcP0-0006tx-Bd; Tue, 04 Jul 2023 11:32:54 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C09u-DX; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tyk-Bx; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 18/26] PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers Date: Tue, 4 Jul 2023 11:32:34 +0200 Message-Id: <20230704093242.583575-19-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482148902815229?= X-GMAIL-MSGID: =?utf-8?q?1770482148902815229?= The currently supported RK3399 has a set of registers per channel, but it has only a single DDRMON_CTRL register. With upcoming RK3588 this will be different, the RK3588 has a DDRMON_CTRL register per channel. Instead of expecting a single DDRMON_CTRL register, loop over the channels and write the channel specific DDRMON_CTRL register. Break out early out of the loop when there is only a single DDRMON_CTRL register like on the RK3399. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 72 ++++++++++++++++++---------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 85ec93fd41858..2362d3953ba40 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -113,12 +113,13 @@ struct rockchip_dfi { int burst_len; int buswidth[DMC_MAX_CHANNELS]; int ddrmon_stride; + bool ddrmon_ctrl_single; }; static int rockchip_dfi_enable(struct rockchip_dfi *dfi) { void __iomem *dfi_regs = dfi->regs; - int ret = 0; + int i, ret = 0; mutex_lock(&dfi->mutex); @@ -132,29 +133,41 @@ static int rockchip_dfi_enable(struct rockchip_dfi *dfi) goto out; } - /* clear DDRMON_CTRL setting */ - writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | DDRMON_CTRL_SOFTWARE_EN | - DDRMON_CTRL_HARDWARE_EN), dfi_regs + DDRMON_CTRL); + for (i = 0; i < DMC_MAX_CHANNELS; i++) { + u32 ctrl = 0; - /* set ddr type to dfi */ - switch (dfi->ddr_type) { - case ROCKCHIP_DDRTYPE_LPDDR2: - case ROCKCHIP_DDRTYPE_LPDDR3: - writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK), - dfi_regs + DDRMON_CTRL); - break; - case ROCKCHIP_DDRTYPE_LPDDR4: - case ROCKCHIP_DDRTYPE_LPDDR4X: - writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK), - dfi_regs + DDRMON_CTRL); - break; - default: - break; - } + if (!(dfi->channel_mask & BIT(i))) + continue; - /* enable count, use software mode */ - writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN), - dfi_regs + DDRMON_CTRL); + /* clear DDRMON_CTRL setting */ + writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | + DDRMON_CTRL_SOFTWARE_EN | DDRMON_CTRL_HARDWARE_EN), + dfi_regs + i * dfi->ddrmon_stride + DDRMON_CTRL); + + /* set ddr type to dfi */ + switch (dfi->ddr_type) { + case ROCKCHIP_DDRTYPE_LPDDR2: + case ROCKCHIP_DDRTYPE_LPDDR3: + ctrl = DDRMON_CTRL_LPDDR23; + break; + case ROCKCHIP_DDRTYPE_LPDDR4: + case ROCKCHIP_DDRTYPE_LPDDR4X: + ctrl = DDRMON_CTRL_LPDDR4; + break; + default: + break; + } + + writel_relaxed(HIWORD_UPDATE(ctrl, DDRMON_CTRL_DDR_TYPE_MASK), + dfi_regs + i * dfi->ddrmon_stride + DDRMON_CTRL); + + /* enable count, use software mode */ + writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN), + dfi_regs + i * dfi->ddrmon_stride + DDRMON_CTRL); + + if (dfi->ddrmon_ctrl_single) + break; + } out: mutex_unlock(&dfi->mutex); @@ -164,6 +177,7 @@ static int rockchip_dfi_enable(struct rockchip_dfi *dfi) static void rockchip_dfi_disable(struct rockchip_dfi *dfi) { void __iomem *dfi_regs = dfi->regs; + int i; mutex_lock(&dfi->mutex); @@ -174,8 +188,17 @@ static void rockchip_dfi_disable(struct rockchip_dfi *dfi) if (dfi->usecount > 0) goto out; - writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), - dfi_regs + DDRMON_CTRL); + for (i = 0; i < DMC_MAX_CHANNELS; i++) { + if (!(dfi->channel_mask & BIT(i))) + continue; + + writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), + dfi_regs + i * dfi->ddrmon_stride + DDRMON_CTRL); + + if (dfi->ddrmon_ctrl_single) + break; + } + clk_disable_unprepare(dfi->clk); out: mutex_unlock(&dfi->mutex); @@ -666,6 +689,7 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) dfi->buswidth[1] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH1, val) == 0 ? 4 : 2; dfi->ddrmon_stride = 0x14; + dfi->ddrmon_ctrl_single = true; return 0; }; From patchwork Tue Jul 4 09:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089434vqx; Tue, 4 Jul 2023 02:36:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1j/PaGy5FrFJ+VRF9qHA+l7fBDidf7+O7xijWD12+zHH75C782ozjB2MM7jUFsonsXtIA X-Received: by 2002:a05:6358:7056:b0:134:c785:5932 with SMTP id 22-20020a056358705600b00134c7855932mr8065188rwp.32.1688463360809; Tue, 04 Jul 2023 02:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463360; cv=none; d=google.com; s=arc-20160816; b=hM5fIn/Yjql6yKDogTrJKWYNBL3PqxcmWwUtDKTrQY0/HPLdjruEEWBukdhZujMBOJ lUaBLmC/ZOvzFEb+smzoHH0QeS98VU1j4J3OM1T4fEurri65vJp0xqGGkTwp8ii9VMNR UKYhfMz7NdP019STXA8lGkEiqOfIfsmMNYix87Cy/tdjN6xsP9oUl45qvYXLWORcqWO0 I4UV2pXHYWGxxK6Y8qpcxxDKAUphrMVccxLjV4YIztDA8fEwAlgQ01NLzPLy3rowQzmM nKQulcdL9RHzvop8/plwjC4EIKC2vOknVu2PnWLyIBTGoilJTrIYfa043dQnjs5r48Lt INiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Cm/29utd5nyLFTfRFhcCwJQfxSogEmsQgu+HCFZjnxY=; fh=Ul0uojO/E0G8BDamYBtxReB7v/bF7vIcK0uTzKr9qWU=; b=E97FGfwc167Ki83FL5IN4ycirTRhiYOluQ+7L5+GdSZnMXsLmSzXIc86so4MagnDE+ 6xY1dYYucKyti0sGq/Zqlx0OiZg6ReYyTtN0/St3U3VTye/Bt+aE58ZChnWUotIy+6M+ 7ZOZ5GNboT6RYjza1dq9w0svV313Yzou2Fz26FiS2v7CbRssTpM+utFPC6InFL1X8mJW t1neVCfr9NxI/g3JYdDjxhYOqoAcaO+Yba1rfUja2onIhrCajBVYzXhRFsczaflN56p6 ZEQ+NI/1w3HH+SQb/kfQOOLgRb7JYceD7udaeUGKm3L83C43Cb0CgiS49oxNYd6n1I0h xr7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j10-20020a056a00234a00b006819405e9d9si1029895pfj.145.2023.07.04.02.35.48; Tue, 04 Jul 2023 02:36:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232096AbjGDJdc (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231292AbjGDJdL (ORCPT ); Tue, 4 Jul 2023 05:33:11 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E55D187 for ; Tue, 4 Jul 2023 02:33:10 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006ts-Rb; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOt-00C09a-AT; Tue, 04 Jul 2023 11:32:47 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tyo-Co; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v7 19/26] PM / devfreq: rockchip-dfi: add support for RK3588 Date: Tue, 4 Jul 2023 11:32:35 +0200 Message-Id: <20230704093242.583575-20-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482156751588224?= X-GMAIL-MSGID: =?utf-8?q?1770482156751588224?= Add support for the RK3588 to the driver. The RK3588 has four DDR channels with a register stride of 0x4000 between the channel registers, also it has a DDRMON_CTRL register per channel. Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 30 +++++++++++++++++++++++++++- include/soc/rockchip/rk3588_grf.h | 18 +++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 include/soc/rockchip/rk3588_grf.h diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 2362d3953ba40..9854d4093e186 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -26,8 +26,9 @@ #include #include #include +#include -#define DMC_MAX_CHANNELS 2 +#define DMC_MAX_CHANNELS 4 #define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) @@ -714,9 +715,36 @@ static int rk3568_dfi_init(struct rockchip_dfi *dfi) return 0; }; +static int rk3588_dfi_init(struct rockchip_dfi *dfi) +{ + struct regmap *regmap_pmu = dfi->regmap_pmu; + u32 reg2, reg3, reg4; + + regmap_read(regmap_pmu, RK3588_PMUGRF_OS_REG2, ®2); + regmap_read(regmap_pmu, RK3588_PMUGRF_OS_REG3, ®3); + regmap_read(regmap_pmu, RK3588_PMUGRF_OS_REG4, ®4); + + dfi->ddr_type = FIELD_GET(RK3588_PMUGRF_OS_REG2_DRAMTYPE_INFO, reg2); + + if (FIELD_GET(RK3588_PMUGRF_OS_REG3_SYSREG_VERSION, reg3) >= 0x3) + dfi->ddr_type |= FIELD_GET(RK3588_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3, reg3) << 3; + + dfi->buswidth[0] = FIELD_GET(RK3588_PMUGRF_OS_REG2_BW_CH0, reg2) == 0 ? 4 : 2; + dfi->buswidth[1] = FIELD_GET(RK3588_PMUGRF_OS_REG2_BW_CH1, reg2) == 0 ? 4 : 2; + dfi->buswidth[2] = FIELD_GET(RK3568_PMUGRF_OS_REG2_BW_CH0, reg4) == 0 ? 4 : 2; + dfi->buswidth[3] = FIELD_GET(RK3588_PMUGRF_OS_REG2_BW_CH1, reg4) == 0 ? 4 : 2; + dfi->channel_mask = FIELD_GET(RK3588_PMUGRF_OS_REG2_CH_INFO, reg2) | + FIELD_GET(RK3588_PMUGRF_OS_REG2_CH_INFO, reg4) << 2; + + dfi->ddrmon_stride = 0x4000; + + return 0; +}; + static const struct of_device_id rockchip_dfi_id_match[] = { { .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init }, { .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init }, + { .compatible = "rockchip,rk3588-dfi", .data = rk3588_dfi_init }, { }, }; diff --git a/include/soc/rockchip/rk3588_grf.h b/include/soc/rockchip/rk3588_grf.h new file mode 100644 index 0000000000000..630b35a550640 --- /dev/null +++ b/include/soc/rockchip/rk3588_grf.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef __SOC_RK3588_GRF_H +#define __SOC_RK3588_GRF_H + +#define RK3588_PMUGRF_OS_REG2 0x208 +#define RK3588_PMUGRF_OS_REG2_DRAMTYPE_INFO GENMASK(15, 13) +#define RK3588_PMUGRF_OS_REG2_BW_CH0 GENMASK(3, 2) +#define RK3588_PMUGRF_OS_REG2_BW_CH1 GENMASK(19, 18) +#define RK3588_PMUGRF_OS_REG2_CH_INFO GENMASK(29, 28) + +#define RK3588_PMUGRF_OS_REG3 0x20c +#define RK3588_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3 GENMASK(13, 12) +#define RK3588_PMUGRF_OS_REG3_SYSREG_VERSION GENMASK(31, 28) + +#define RK3588_PMUGRF_OS_REG4 0x210 +#define RK3588_PMUGRF_OS_REG5 0x214 + +#endif /* __SOC_RK3588_GRF_H */ From patchwork Tue Jul 4 09:32:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1091370vqx; Tue, 4 Jul 2023 02:41:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlE18uV7Us5WhdXnMWeX0CudGMEV6GNdDbs0apYBqgpHRasOEj64j2ZMO9aWiJPzrFCc42Jc X-Received: by 2002:a05:6a20:2584:b0:12e:5f07:7ed8 with SMTP id k4-20020a056a20258400b0012e5f077ed8mr7204945pzd.36.1688463675686; Tue, 04 Jul 2023 02:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463675; cv=none; d=google.com; s=arc-20160816; b=QO5hdY44j9i4DG52A0+siCw2w0/JbCCz95T6IwLGjjUNaUhYDLfa3Pq6mRly/3vs5/ MyhTYrbydvmB70rN9BrhqtKHOX1EN1dDq1djE6llgm04nUCyArQLOZ8RavlXTVnk0MVB d+xZzvdvrbiQowI9leVJPYw/zo2sx7AKZHqjgCeiflr1bM7Ke9kb49AQWQ+N8Vo92WiP vVVsSEmthLqomyrziVK5z0DtD/TynFIn9mRoI6bhr+7JffeVCRreh60ldP6GpvAYJIq9 gizRiSeT/Pjm5biSL381Tk3AfMsxwqcSJfg2Avkp4nLhhketUON7c+Z9PrakyFNukNLL GHhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=J0NKAIlvSVhvqJ+/ToGqqrSmP8SDB/UnV5THL82OEMQ=; fh=VlUTT6Q4TYEHNCjitjQTmkdjl4jg6719bXpAVwfmlzg=; b=FQeCnEYE2p91s4tKG93y2NLvTFRLSJ9yRkv2p90tCSPHzaWyj/izvvjTP83ES6M2qj Pz9bjqNgWRBtrYwDCVv9rWB5mph7T7bCQ/Yv45HQWUQ8GiSLaPTSwkNi4t/rcNRCM1vF rybMvUk3IZ1w4J6aVTHEhJIzmoMyZFHqJ2RS4WPhuFYbtnmdxFnYfQG6EWLh7JoAH/WK dziWJjRtE6fhWWkVkUdODoDIossY8w06d8ABJ+ILxyU7xy8f+zNpwsamkYj6tRY05XuI s9OotbTd/0bV7e00VOgkMRALtkqrvd7PJRJwJuiSuZIgVGur+ybw0GCnPzsCfkZYXh8h eR/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r3-20020a1709028bc300b001add2ba445asi19573456plo.259.2023.07.04.02.41.02; Tue, 04 Jul 2023 02:41:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231140AbjGDJg3 (ORCPT + 99 others); Tue, 4 Jul 2023 05:36:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231469AbjGDJfy (ORCPT ); Tue, 4 Jul 2023 05:35:54 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E93210F1 for ; Tue, 4 Jul 2023 02:34:13 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006xf-3v; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Ah-Ah; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tys-Dd; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Rob Herring Subject: [PATCH v7 20/26] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Date: Tue, 4 Jul 2023 11:32:36 +0200 Message-Id: <20230704093242.583575-21-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482487172645479?= X-GMAIL-MSGID: =?utf-8?q?1770482487172645479?= Convert the Rockchip DFI binding to yaml. Reviewed-by: Rob Herring Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- Notes: Changes since v4: - Revert to state of v3 (changes were lost in v4) .../bindings/devfreq/event/rockchip,dfi.yaml | 61 +++++++++++++++++++ .../bindings/devfreq/event/rockchip-dfi.txt | 18 ------ .../rockchip,rk3399-dmc.yaml | 2 +- 3 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml delete mode 100644 Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml new file mode 100644 index 0000000000000..7a82f6ae0701e --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/devfreq/event/rockchip,dfi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip DFI + +maintainers: + - Sascha Hauer + +properties: + compatible: + enum: + - rockchip,rk3399-dfi + + clocks: + maxItems: 1 + + clock-names: + items: + - const: pclk_ddr_mon + + interrupts: + maxItems: 1 + + reg: + maxItems: 1 + + rockchip,pmu: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon managing the "PMU general register files". + +required: + - compatible + - clocks + - clock-names + - interrupts + - reg + +additionalProperties: false + +examples: + - | + #include + #include + + bus { + #address-cells = <2>; + #size-cells = <2>; + + dfi: dfi@ff630000 { + compatible = "rockchip,rk3399-dfi"; + reg = <0x00 0xff630000 0x00 0x4000>; + interrupts = ; + rockchip,pmu = <&pmugrf>; + clocks = <&cru PCLK_DDR_MON>; + clock-names = "pclk_ddr_mon"; + }; + }; diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt b/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt deleted file mode 100644 index 148191b0fc158..0000000000000 --- a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt +++ /dev/null @@ -1,18 +0,0 @@ - -* Rockchip rk3399 DFI device - -Required properties: -- compatible: Must be "rockchip,rk3399-dfi". -- reg: physical base address of each DFI and length of memory mapped region -- rockchip,pmu: phandle to the syscon managing the "pmu general register files" -- clocks: phandles for clock specified in "clock-names" property -- clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon"; - -Example: - dfi: dfi@ff630000 { - compatible = "rockchip,rk3399-dfi"; - reg = <0x00 0xff630000 0x00 0x4000>; - rockchip,pmu = <&pmugrf>; - clocks = <&cru PCLK_DDR_MON>; - clock-names = "pclk_ddr_mon"; - }; diff --git a/Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml b/Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml index fb4920397d08e..aba8649aaeb10 100644 --- a/Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml @@ -18,7 +18,7 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle description: Node to get DDR loading. Refer to - Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt. + Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml. clocks: maxItems: 1 From patchwork Tue Jul 4 09:32:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089775vqx; Tue, 4 Jul 2023 02:36:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zzkS8vwNl11W2rC5lGeeE1Xbw6+SXaKETgYl8TXTEZLIPFbL3Uq899KGU3Wge15IT9U/P X-Received: by 2002:a05:6830:20d1:b0:6b7:4f35:c68e with SMTP id z17-20020a05683020d100b006b74f35c68emr12702496otq.34.1688463411850; Tue, 04 Jul 2023 02:36:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463411; cv=none; d=google.com; s=arc-20160816; b=x3GVClRzGDB/c0d0H5zkl/ytjI0lidOJganJ6fqyBcYlVk2mZoJlVOAtFDtumY9csb 4rIeqVJPRhCZc/pMUNWT9NUVkTkwpkDqs5qRkdZT0Z95+i9Co9AzXYUosFVud9d98diw yLQGHhLe7s/JH9S2r/MMJb9bI3g0ATOPTr04KiEfqRiecA5axL+o3u1OQuWKNW2Nca7V REX3zC62CpyJ358cnj2uoXjYVkwggHXGeeRZcbD04p28xSgtQ3V3CtKUaoFbo2Q0xYAb xEkuSn4sz4JI002c7Gl/qPMFzwvLjq5R5ammRkeerVqcgz2uIpdVVBSlbpJrDvJ0Xj0u Vhww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qNbiYijIA4gzdOnoTywQySk1L3vJHrzmSM4GRfGJIVM=; fh=azcbqXFU94vU5bvYOAsIQqOgloknHCH4Gu/+1bvGDpU=; b=1HMgLKP+E7YjzyykOzGmth4dviz+8X/Lxc9jI9YZgLKhwGCq86At6Jjbm4STzugJeG 6Uc2+/X6vGl7d4Z0gNmq94jUoLL+0lLkCxvZThbTIXyF+hushh3VVpuLyuejxoz5EZku Cv6UGHR2WHAGaMrsEMJ+K/iQxRy/e4DIDTCpHRZla1Oz6+5RLSsVzg+75QpgTQK5H6rd PBaFAQh54Kt1BaUMprP4vQssgTPY7ng2FWmwCm6RKj1O2B5wRK4mAIDuNU7F6u0CpBMa YqhCZc8lOpV6DA9Pa0Rt2FSKcwdIOUKXqyhkH9sa88E5pBDbuiBJkS5iPShZuPlqeohp vvGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c28-20020a631c1c000000b0055759bb6883si20398975pgc.63.2023.07.04.02.36.38; Tue, 04 Jul 2023 02:36:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231449AbjGDJfN (ORCPT + 99 others); Tue, 4 Jul 2023 05:35:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231601AbjGDJeb (ORCPT ); Tue, 4 Jul 2023 05:34:31 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E869E1BD0 for ; Tue, 4 Jul 2023 02:33:33 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006vB-Pq; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOv-00C0AG-O9; Tue, 04 Jul 2023 11:32:49 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tyw-EU; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Conor Dooley Subject: [PATCH v7 21/26] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Date: Tue, 4 Jul 2023 11:32:37 +0200 Message-Id: <20230704093242.583575-22-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482210650111236?= X-GMAIL-MSGID: =?utf-8?q?1770482210650111236?= This adds the rockchip,rk3568-dfi compatible to the binding. Make clocks optional for this SoC as the RK3568 doesn't have a kernel controllable PCLK. Reviewed-by: Conor Dooley Signed-off-by: Sascha Hauer Acked-by: Chanwoo Choi --- .../bindings/devfreq/event/rockchip,dfi.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml index 7a82f6ae0701e..e8b64494ee8bd 100644 --- a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml @@ -13,6 +13,7 @@ properties: compatible: enum: - rockchip,rk3399-dfi + - rockchip,rk3568-dfi clocks: maxItems: 1 @@ -34,11 +35,21 @@ properties: required: - compatible - - clocks - - clock-names - interrupts - reg +if: + properties: + compatible: + contains: + enum: + - rockchip,rk3399-dfi + +then: + required: + - clocks + - clock-names + additionalProperties: false examples: From patchwork Tue Jul 4 09:32:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089792vqx; Tue, 4 Jul 2023 02:36:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlGyCimxyRA3KPrMmClXfu/WM0pqFFmfIT3gdAkMvokxTWQCB2slLbfer+MY755a09vHWL40 X-Received: by 2002:a17:903:234e:b0:1b6:4bbd:c3b6 with SMTP id c14-20020a170903234e00b001b64bbdc3b6mr12231303plh.9.1688463413516; Tue, 04 Jul 2023 02:36:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463413; cv=none; d=google.com; s=arc-20160816; b=dnUbBAcTI8VM++6aaTGc1ixsR2bGGuoq9E2woBm6lZnNFWlmHNDINvnWNzTPst5Ncn RnnSVQn09azGRXxkBG8VspxU4yCY69KRmXHFON+HA7+IkTOfk/VMlWXpdc9SoLw6FnXG RJhOWSZSucgSHJEO/EK5fi//yJ/fuFswke/vnT7j942GbXAA8rqWguLsNTJ33GAgK+0Y N5OFezV+kC8aqa44r1GR2p7teaRJQLvwyZUf5DqsGKStw3vEgjHYHMQXorKp1Q5DNsIg cvF3w/cnDhv7jT52XSsZPDZZeB5uKhDARvwA8jiR9Mig7irmshSP+mxKKdguS5rcLoUR YGZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SkfqaA8/RJS+625MZhrRtwa1Pba22CXSJWHCMWVVBm8=; fh=azcbqXFU94vU5bvYOAsIQqOgloknHCH4Gu/+1bvGDpU=; b=ekwtPic6QBb12z1P3RtdrncKmVySr5BbWyF8Jy/lUDxPWL6ey4eMO+irL8PM1DwSlO au1pgh2iDKU7G3rhLzzbM/DnfijWz1GKHXF8FqXKE188C3qX4MAguFbmo0Zgy8UTJjui 8orqSq6H/6Uhp5Xk+dQrpmEueE5ea4j/ribZ4/SYhj4N5uhbjVd/AgXynatW9mnbv2cT FpXPKuMXCNKtmfNP+S8qX0+2MR5eOPjO/tHiirMnuNck4qDGcTzHsAz71taOMPTRYIt0 gjF0q52fUX2w/YLrBRtYeEf0TQcSehHJFnhIGMgaQy4AQRuyLn3P/6aH+OBeYUBDvbZp Wfvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i7-20020a170902c94700b001b880b346cbsi7056667pla.220.2023.07.04.02.36.36; Tue, 04 Jul 2023 02:36:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232180AbjGDJeL (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232090AbjGDJdc (ORCPT ); Tue, 4 Jul 2023 05:33:32 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E254B10FA for ; Tue, 4 Jul 2023 02:33:20 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006xy-7N; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Aq-HX; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tz0-FC; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Conor Dooley Subject: [PATCH v7 22/26] dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support Date: Tue, 4 Jul 2023 11:32:38 +0200 Message-Id: <20230704093242.583575-23-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482212466415264?= X-GMAIL-MSGID: =?utf-8?q?1770482212466415264?= This adds rockchip,rk3588-dfi to the list of compatibles. Unlike ealier SoCs the rk3588 has four interrupts (one for each channel) instead of only one, so increase the number of allowed interrupts to four. Signed-off-by: Sascha Hauer Acked-by: Conor Dooley Acked-by: Chanwoo Choi --- Notes: Changes since v4: - new patch Changes since v5: - drop interrupt-names property Changes since v4: - new patch .../devicetree/bindings/devfreq/event/rockchip,dfi.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml index e8b64494ee8bd..50d3fabe958d5 100644 --- a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml @@ -14,6 +14,7 @@ properties: enum: - rockchip,rk3399-dfi - rockchip,rk3568-dfi + - rockchip,rk3588-dfi clocks: maxItems: 1 @@ -23,7 +24,8 @@ properties: - const: pclk_ddr_mon interrupts: - maxItems: 1 + minItems: 1 + maxItems: 4 reg: maxItems: 1 From patchwork Tue Jul 4 09:32:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1094991vqx; Tue, 4 Jul 2023 02:49:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4sMVORYrNXQ9Kq8v0OMDLEob58HAGLSSxpjvGlO9Nl90sNCbpB9eGbUfYyZ/+hew6m4k6Y X-Received: by 2002:a05:6a20:4325:b0:125:4c0b:93cd with SMTP id h37-20020a056a20432500b001254c0b93cdmr12412593pzk.34.1688464177105; Tue, 04 Jul 2023 02:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464177; cv=none; d=google.com; s=arc-20160816; b=nfarS05Km3jGiNM3WmkXwqwNuQKVGiwdqVUQ4ezeQFLqEUv6nBhj3AbcEruSyXVYKk uVcO7z4Nam1U1brBpZ85P+QV2/KgnTcOe8NtSg6h+wxibq5XmIlgn6x7OpTUvDPQPyTq yyTdulexyjlkI3dll9EWwMMLOBIrde2Fl/NZR6GqCiCJzrUrhJmptdzPKF6u/7hVZPIV xaT3EDkdj0C9dv/II4x78VzaRas5eBVThfqMv9GzMO1ojrCTXwCPPdCgdckh8yKSqy0L Yb2iChQh5c2xQo2VqjD4f5sOrlcLspDa8d5yYzKcVqNzqGLeW1t2Bkzce7jfDPWAKSNP 5iQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ph44e8c68NpdjsIgTdtctjUy1AtViZ5h1+ojqkjbrY8=; fh=azcbqXFU94vU5bvYOAsIQqOgloknHCH4Gu/+1bvGDpU=; b=Ee22S9Q7Tn5D5KTwexOijiRlf6INJJMWOYPJUZ5p1qALg1lIpvyZIGYk0POq6vLI5e MXpOXmLvIXcABJ3viNa+xVigl7JLnIbN24ILL3xerLq01u5C0rNGQAAwvc3srBNIyUC0 8z8wMr31HSm32ti+SPr+7Y1g+JnXYd5h4lmUa6g9ijkh6Wa5Ci78bS7/iS/fAunvPN82 HIS6b/CD0OWc8HI7pdsV5iGo+WnDuQF2UqBaXbQBkqukhK/b1zzG033pddhPD8XxyCwC bYWdBXNTEpl37nQCvBpwhvO6uOuHEwpIN/EKns6g0Umb8WCUPOik8+pj5BU7V50oDu3x gDog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q8-20020a17090311c800b001b03ba09cd1si21827492plh.128.2023.07.04.02.49.22; Tue, 04 Jul 2023 02:49:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232069AbjGDJei (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232079AbjGDJeI (ORCPT ); Tue, 4 Jul 2023 05:34:08 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B34719A8 for ; Tue, 4 Jul 2023 02:33:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006xi-3x; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Aj-C0; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tz4-Fw; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Conor Dooley Subject: [PATCH v7 23/26] dt-bindings: soc: rockchip: grf: add rockchip,rk3588-pmugrf Date: Tue, 4 Jul 2023 11:32:39 +0200 Message-Id: <20230704093242.583575-24-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770483012970372502?= X-GMAIL-MSGID: =?utf-8?q?1770483012970372502?= Add rockchip,rk3588-pmugrf compatible string. Signed-off-by: Sascha Hauer Acked-by: Conor Dooley --- Notes: Changes since v5: - new patch Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 65a2d5a4f28d8..12f8fe4435584 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -52,6 +52,7 @@ properties: - rockchip,rk3399-pmugrf - rockchip,rk3568-grf - rockchip,rk3568-pmugrf + - rockchip,rk3588-pmugrf - rockchip,rv1108-grf - rockchip,rv1108-pmugrf - rockchip,rv1126-grf From patchwork Tue Jul 4 09:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089830vqx; Tue, 4 Jul 2023 02:36:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4xLU9sIaKK4bjUHeN8efbd1lg6L5FiAQugSOVSjZTpcOKCphDRiw9AbI40obhHwpnu9nLE X-Received: by 2002:a05:6a20:96d1:b0:12c:a57:6e46 with SMTP id hq17-20020a056a2096d100b0012c0a576e46mr8997667pzc.18.1688463417920; Tue, 04 Jul 2023 02:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463417; cv=none; d=google.com; s=arc-20160816; b=uI1FV0gGjaYMga5SJYkAfyf6aQOyLfvLLmopVugtj1Q9OFq/zP3xflrAqw03eczbeY QqBFsxgce7qmVkoSoCWr8vb9CwlWO2KQy9JIDN8tWtmxa7Gv0p8UdRY5tSmodDz5tnnj RmbMndY2Vj82O04Mhboykk8iFTeuQxiardGZd11Fti7PFN2UaJ9prQJgPT3hvU+5VFoi w4hsfkXU8/0xyzkwohPdguvjRSwaHGjlja4mSeKgaMJC02lsGBnTru3hQuYOR9R7+q5A HZVT9Mo7StAUH9yQV1pFYfcOmrV9coeCoXfYG5lVRaV5ofzJ/tsJkPNULSchKovpenZ5 6iXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pmpp7ujEbUXRBkQ1oeQZCiMqqmNKG6aFw3a2OvUcotg=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=isNCe7kjLNKEniOWUljjhAjGEmrXNLfTu0sizldEKekv/NxhMrbZvOUlZAtCHGH5dd 4vvxFhCeNMiDGRghhTUrnxD5CThwhhIdBCdxkT1UQwyndmL6LWNSyBmuaUIhenBWZMI8 ifnqM6mw0/6KHWqBXyiekkrmSx3zkolt3PUJF487C0wgxMRVwAyBXutQB+DjyGBhNc1G ZgJhO9zeHazORe8UV/jQ7MKY2ER5bZb42hbH4bXXiklxREbTkntKBVl1ne+l5hk9XnxT ozUokQdHMtFL2gotrBGEBuojMQeYXPbG0u255/lTsOvOkNqUDDen1eEitrt5qzOnA/ru wnXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s5-20020a170902ea0500b001b89cda5e11si3437494plg.425.2023.07.04.02.36.44; Tue, 04 Jul 2023 02:36:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231917AbjGDJfZ (ORCPT + 99 others); Tue, 4 Jul 2023 05:35:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231153AbjGDJeg (ORCPT ); Tue, 4 Jul 2023 05:34:36 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D77701BDC for ; Tue, 4 Jul 2023 02:33:35 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOx-0006xv-6c; Tue, 04 Jul 2023 11:32:51 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Ao-Ga; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Tz8-Gc; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 24/26] arm64: dts: rockchip: rk3399: Enable DFI Date: Tue, 4 Jul 2023 11:32:40 +0200 Message-Id: <20230704093242.583575-25-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482217127868062?= X-GMAIL-MSGID: =?utf-8?q?1770482217127868062?= the DFI unit can provide useful data for measuring DDR utilization and works without any configuration from the board, so enable it in the dtsi file directly. Signed-off-by: Sascha Hauer --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 928948e7c7bbb..fa0a5dbd1b0ec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1331,7 +1331,6 @@ dfi: dfi@ff630000 { interrupts = ; clocks = <&cru PCLK_DDR_MON>; clock-names = "pclk_ddr_mon"; - status = "disabled"; }; vpu: video-codec@ff650000 { From patchwork Tue Jul 4 09:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1094165vqx; Tue, 4 Jul 2023 02:48:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlELLgSFfcjwYR6yiLcz5RXWtODQTi1Dl0SepZcEzxCBJAWQOqfVgeNRHT4lTqwgz7tedhdd X-Received: by 2002:a05:6a00:84c:b0:681:3ed2:b493 with SMTP id q12-20020a056a00084c00b006813ed2b493mr11979023pfk.26.1688464082673; Tue, 04 Jul 2023 02:48:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688464082; cv=none; d=google.com; s=arc-20160816; b=W26PMvY556z3SM3r+J9mDumgXiT6ttFOAkeHCtxcmfPNU3Ne0rv3xkO7w/7cFqvz7P /jCmfj9HojeV1yfq/yhLJ1al+g51SUpgLnWUAf5bdSa64Rr8nBJBQhfMLvC9TqYQ88Mg FzWgUheoOof6ll6hmqVd8u1hZ3XzjzQl+CaydD9W0FAWhUq+jGwclAduIXQq0nyMxGC9 +eMJBFKIO1veSwdyTuvINqVnhLS8wvxMP+g5Ib4UwT/Q2+UZ+j/P5/CrGnf8wdN/3cPL QvP/MgVwF2tpXdgDHK2Fwq98VDgY9I+AoEEkWlzEi+qiKtjErdvlbTVox0TSrRbzXZa1 LaEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8e4SWVl9b8OIaj+rpCMQVAx3WT/OnOJHkWY7MckxQ0Q=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=z/cNrqV9P4yQlKFp/yRPCtTo4K0L8SA2SL59u+7sUEh5O5Yd4drSyUzSrokhCh80P+ aeVKbl9xPdXMEpsvizLZInVxuFppNbhJBfiENgr6RQh49NjbgwLwr2oRZ+PxBG+6dp6E I8s72uVeHp1NYDBr5vp9jGJN7bCtW8hjtjDcU0RPCIf6dOYVccoOZMihJzU1Ep8139lV b2GIlY7qbtDApos2hyyMQSTcPpVAqJw2/EQBaVSncNLrORwfKXBuKUxeVlzVQgw34Njo BfOHlPhjH6RweI2lENnLEF4p7yS/uJC7DNCHihhdyFIdNoEYjK9HC7MqzJI3IcqqRqeH adFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a63f90a000000b00553a9801a56si21010973pgi.54.2023.07.04.02.47.50; Tue, 04 Jul 2023 02:48:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232145AbjGDJdz (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231956AbjGDJdU (ORCPT ); Tue, 4 Jul 2023 05:33:20 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4A2610C3 for ; Tue, 4 Jul 2023 02:33:17 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOw-0006xX-TS; Tue, 04 Jul 2023 11:32:50 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOw-00C0Ac-6N; Tue, 04 Jul 2023 11:32:50 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TzC-HJ; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 25/26] arm64: dts: rockchip: rk356x: Add DFI Date: Tue, 4 Jul 2023 11:32:41 +0200 Message-Id: <20230704093242.583575-26-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482913754441823?= X-GMAIL-MSGID: =?utf-8?q?1770482913754441823?= The DFI unit can be used to measure DRAM utilization using perf. Add the node to the device tree. Signed-off-by: Sascha Hauer --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 61680c7ac4899..a92a07e553133 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -948,6 +948,13 @@ qos_vop_m1: qos@fe1a8100 { reg = <0x0 0xfe1a8100 0x0 0x20>; }; + dfi: dfi@fe230000 { + compatible = "rockchip,rk3568-dfi"; + reg = <0x00 0xfe230000 0x00 0x400>; + interrupts = ; + rockchip,pmu = <&pmugrf>; + }; + pcie2x1: pcie@fe260000 { compatible = "rockchip,rk3568-pcie"; reg = <0x3 0xc0000000 0x0 0x00400000>, From patchwork Tue Jul 4 09:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 115660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1089636vqx; Tue, 4 Jul 2023 02:36:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7LLx7IV4Tj4l7x5Soxn2BauW5NYQq8P0E7VuI2uybqUe3sbVQQDL7+J/TggTLvwEaGGM+E X-Received: by 2002:a05:6a20:6a0f:b0:106:9266:4448 with SMTP id p15-20020a056a206a0f00b0010692664448mr21310682pzk.16.1688463389015; Tue, 04 Jul 2023 02:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463389; cv=none; d=google.com; s=arc-20160816; b=bbrKmp83DMp8j9dolsN+NGs4+Dl83I60bZgKNdrSxhQ44la2kBUDPKieqXlcSMOWKF eJ3eoJ3mr+7z0Ffkwcr7eL+gnzAQLYyIzPaml5ktahYtlrfgC3wwqvu9ggdvhlZXqiJW r4u1LJrv1EXYFK9RDKckCismYqVVurC5OM9q6PXlNTJrIHER133eDmwbwZDMZH0QXwQw oYG1kf6Lauz/JK21JNo4IRSksM9JkaSKB+gRTm7VfDFE2oep7fZehKEdurZeL6BhCJCL 5X+KTzLdnR1uUPvxkUYKPAui2LrZZqXwTDzxTv2weM+dVCLdRbk5SvXmD3C1lU9vVeGV 6fzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0UoAsp3uAmOer8te07H4qGmY/V5+yCsBVzw3r9qiIGA=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=yj30tJ4FszkIJ799oXBauVi4URLobhCB1gSFXerlYK9tPGAlnbx+huDo4BPhnCVn3p Y2D1vjHoBRfvG/P6f/3cYxHBsAFK/8wgIET9tiMdA+XfGEHF2M5GeY6SzxMH8AuCeahU BG5nIoneLrfrjt8ZvZDhzCgYD7eJ4qWbUywyl90rfzuOi6vEBDMbwvTLiQIrp1esWzzh knx/vyRIY87BKCjGtoqa8lSrSoFPIa4/psd1jwAl4ABQ6HlHtcD1NzjzAM10JuQxcoZo NDUqAovAunWpjyLdOXTBGlLf+GjeD8BGUoiuRnT6uGbDZBSVCQ+LWpYMz4kD4vPZK+jY rsaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z9-20020a656649000000b00543d2bb0086si20041494pgv.741.2023.07.04.02.36.14; Tue, 04 Jul 2023 02:36:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231553AbjGDJeT (ORCPT + 99 others); Tue, 4 Jul 2023 05:34:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231469AbjGDJdp (ORCPT ); Tue, 4 Jul 2023 05:33:45 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 715AA1703 for ; Tue, 4 Jul 2023 02:33:21 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006tw-RL; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C09s-8Y; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002TzG-I0; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 26/26] arm64: dts: rockchip: rk3588s: Add DFI Date: Tue, 4 Jul 2023 11:32:42 +0200 Message-Id: <20230704093242.583575-27-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770482186494372246?= X-GMAIL-MSGID: =?utf-8?q?1770482186494372246?= The DFI unit can be used to measure DRAM utilization using perf. Add the node to the device tree. The DFI needs a rockchip,pmu phandle to the pmu containing registers for SDRAM configuration details. This is added in this patch as well. Reviewed-by: Sebastian Reichel Signed-off-by: Sascha Hauer --- Notes: Changes since v4: - new patch arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index a3124bd2e092c..723a17ec04361 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -397,6 +397,11 @@ scmi_shmem: sram@0 { }; }; + pmu1grf: syscon@fd58a000 { + compatible = "rockchip,rk3588-pmugrf", "syscon", "simple-mfd"; + reg = <0x0 0xfd58a000 0x0 0x10000>; + }; + sys_grf: syscon@fd58c000 { compatible = "rockchip,rk3588-sys-grf", "syscon"; reg = <0x0 0xfd58c000 0x0 0x1000>; @@ -1121,6 +1126,17 @@ qos_vop_m1: qos@fdf82200 { reg = <0x0 0xfdf82200 0x0 0x20>; }; + dfi: dfi@fe060000 { + reg = <0x00 0xfe060000 0x00 0x10000>; + compatible = "rockchip,rk3588-dfi"; + interrupts = , + , + , + ; + interrupt-names = "ch0", "ch1", "ch2", "ch3"; + rockchip,pmu = <&pmu1grf>; + }; + gmac1: ethernet@fe1c0000 { compatible = "rockchip,rk3588-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe1c0000 0x0 0x10000>;