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; };