From patchwork Sat Mar 4 15:39:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 658899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B116C6FD1A for ; Sat, 4 Mar 2023 15:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229649AbjCDPjc (ORCPT ); Sat, 4 Mar 2023 10:39:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjCDPjb (ORCPT ); Sat, 4 Mar 2023 10:39:31 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D05A914485 for ; Sat, 4 Mar 2023 07:39:29 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id t11so7326059lfr.1 for ; Sat, 04 Mar 2023 07:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677944367; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lkQLsP65fImQui6Vksp9H8jTY7ieBpcQFwnHm8FDZDI=; b=s6YJGuNh9e7vwlzJtoi28QZS/Y3lCyOfgBtkjUAqBXGnwdBamHYcyKYag0Y54JvjZV BfJ8ztDs7rWu5pWKQSsAW5KvfkUGhqgHSaasEPRugBl6vmrByEVFBZAD0WwL6ecVatJ5 kfUPVNdW2E9Ue+9j1TMQ3Xc69TzSK8NMK03dm5QliL5WHiiniFsCy1e4BdQbhByK3A2R qClNq7905EnW8vwjvWjHDpu6tBGkH2PteQZakKNtrGRuVl39htKni9K8u8r5AoL9NxkR tb6aAsVkxmZAyEz1awjIs/HT3ywyy5C4MQs/jF4iTQ2Bq3RtmfInCaIUPR40fiCNY+s6 tCHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677944367; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lkQLsP65fImQui6Vksp9H8jTY7ieBpcQFwnHm8FDZDI=; b=nCaeyy3l1fTO+CX7YKsgZnuZ1TMAM74R3XtNOU3SdQY0AN9zzorub3yXnvkA6zOjWW blxrh2EwEU/lej27aHFijFkRV2MhBNaqoFp1j0/oTx4/Je6KgEr8DFRKxE37syf5llw6 xgJm1xhkDJsv1hROkprG8T0ISTqN/qoMLbHDMbTm1owkdPgRrFXsSGhTvjg5ua/FapyZ JBb0cKIniT2T+KoLGTutkRr1D0GyisXroDP6k403rr6z6YTAqjpF15jeQWosZf4nOpvH /LMfu8dNjuzNL05cSRolE/YfhZivXk6STPqKXWlP1nO7xVm2QGWKkPBxFiMSRhfw/7km E0yw== X-Gm-Message-State: AO0yUKVV1tIx8LAmMRj+OTuXaKcvAigY+LE0VE2b0mxSrzAofKUvn/A+ /N39aAAZnJ2H/2ez3JKwucDsrg== X-Google-Smtp-Source: AK7set984gSDOF95hAvgeVWxAH84/h7tQGhGoRr204EqszEnVK0B/I535UZkA5P23YBu3xYIs5DyiA== X-Received: by 2002:ac2:5637:0:b0:4d5:716a:1c05 with SMTP id b23-20020ac25637000000b004d5716a1c05mr1461737lff.12.1677944367810; Sat, 04 Mar 2023 07:39:27 -0800 (PST) Received: from [192.168.1.101] (abym99.neoplus.adsl.tpnet.pl. [83.9.32.99]) by smtp.gmail.com with ESMTPSA id f14-20020ac2532e000000b004ab52b0bcf9sm855065lfh.207.2023.03.04.07.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 07:39:27 -0800 (PST) From: Konrad Dybcio Date: Sat, 04 Mar 2023 16:39:19 +0100 Subject: [PATCH 1/3] dt-bindings: interconnect: qcom,msm8998-bwmon: Add global registers MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v1-1-e563837dc7d1@linaro.org> References: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677944365; l=2057; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=GpWlgVV1H1bLYPigQ1OzrJ4jZWWfQSXtviV8ZB/PRmE=; b=yzDdXn/c20Uluh2T350t7wUZniq3/HP+GGR8FndDqzLW+kh24W69K9X2ImVbFXGS90cva9BxMlQJ NFnii4w1CKyt5XfH+tkluTcFVaOWAGXKDr3d4m4jY4E7K1d1+spu X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The BWMON has two sets of registers: one for handling the monitor itself and one called "global", which we didn't care about before, as on newer SoCs it was made contiguous with (but not the same as) the monitor's register range. Describe it. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml index 12a0d3ecbabb..6dd0cb0a1f43 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml @@ -49,9 +49,13 @@ properties: type: object reg: - # BWMON v4 (currently described) and BWMON v5 use one register address - # space. BWMON v2 uses two register spaces - not yet described. - maxItems: 1 + # BWMON v5 uses one register address space, v1-v4 use one or two. + minItems: 1 + maxItems: 2 + + reg-names: + minItems: 1 + maxItems: 2 required: - compatible @@ -63,6 +67,21 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + const: qcom,msm8998-bwmon + then: + properties: + reg: + minItems: 2 + + reg-names: + items: + - const: monitor + - const: global + examples: - | #include @@ -70,7 +89,8 @@ examples: pmu@1436400 { compatible = "qcom,sdm845-bwmon", "qcom,msm8998-bwmon"; - reg = <0x01436400 0x600>; + reg = <0x01436400 0x600>, <0x01436300 0x200>; + reg-names = "monitor", "global"; interrupts = ; interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_LLCC 3>; From patchwork Sat Mar 4 15:39:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 659099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FC9FC6FA99 for ; Sat, 4 Mar 2023 15:39:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229706AbjCDPje (ORCPT ); Sat, 4 Mar 2023 10:39:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbjCDPjd (ORCPT ); Sat, 4 Mar 2023 10:39:33 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC7E19687 for ; Sat, 4 Mar 2023 07:39:30 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id m6so7313076lfq.5 for ; Sat, 04 Mar 2023 07:39:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677944369; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EXY5357tFqNnM8uqY1hO5VGgznQMI6SfCbMMJByfZyo=; b=QwuBYrNGytFsO+yNLvAZ6cf6LR1BQn6IeGAE5rP9SR+zRR835P63eciWTVThHBS1JI O/pqIoma+ScdWRt3fO8DXwgWreNb1I8I9nUZJyGXda7apAM4cOyzM/muxQOKhD+0BtWe MuqGXy79XrNIc3CmSpCublmGnyi+9S+7sx/2RFxEFg+T+gz35YBymAAG4wCw13ysuvtt o3UIt4dkXZn2k0HsNldHetk1eo2sbDmSRRj1KwNKekSpgpvE57BrsjWcLdwsbV1BKBmq SBHdoQcsq2LMKEkIot4Tntckb6yNsKXY+aABB716On+TkrcD9PK792vw1dcofSsLmuaT nKqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677944369; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EXY5357tFqNnM8uqY1hO5VGgznQMI6SfCbMMJByfZyo=; b=Z/5b6e384N//am4Ls63pQSqj7lWKSHXi6DmH74fC0GV0xGM84XW7eCHGTOE3KNV/XV odT5RZYzD3x/P5BnsmC+LPsEIHK6/ru/DCHcQNqCyLZJskkJ+p8S/pmyIriGH2vkQweu MWx9uXBbBQkhROskrvBG9tA09LGOk+tnNBQUSKFESBlUez7avve6iEQqynXbF6fgBg8i +FNbdZDUYkHm/sjvjCT6OzFCwB344DYct0jNnlPfd0AQ1brZU6QPEtdoT2FvAikIVEWy v5yLefWjVivyqnDMoQnx8uG49iD3ocT1ZBy4YN5M8CDq2snt2BDHj9XciNkGaMrOg0nK xhQw== X-Gm-Message-State: AO0yUKW5QUbx5TDJS3SToc1OUIe4c0ck5Vmg6rkRs3NsnSFqMb9Z8FLk zeOsam6naw+eD1QKKKhL3ofwBQ== X-Google-Smtp-Source: AK7set+lYjScynxzf2L3Ekrzh4d5ljeeCZf5UtAx1yLSJq5Ux4yrco2apYq1hwcNoBxqVS+IsNJFVA== X-Received: by 2002:ac2:5a02:0:b0:4e7:4a3c:696 with SMTP id q2-20020ac25a02000000b004e74a3c0696mr1452960lfn.53.1677944369151; Sat, 04 Mar 2023 07:39:29 -0800 (PST) Received: from [192.168.1.101] (abym99.neoplus.adsl.tpnet.pl. [83.9.32.99]) by smtp.gmail.com with ESMTPSA id f14-20020ac2532e000000b004ab52b0bcf9sm855065lfh.207.2023.03.04.07.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 07:39:28 -0800 (PST) From: Konrad Dybcio Date: Sat, 04 Mar 2023 16:39:20 +0100 Subject: [PATCH 2/3] soc: qcom: icc-bwmon: Handle global registers correctly MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v1-2-e563837dc7d1@linaro.org> References: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677944365; l=11284; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=aNYpDL2mtgTupisZAIlUKvsOidHG4OJUMBRdq3RwREs=; b=xXvbENr6Yged13votu4x6KjUN76bmn7QdzadRn/u37EpS0dybEk68audOUdw4AZ97UcyWhoxkyoA 1e2Qr8PVC0IlkZQYwvyvJDd4NkSe2OO8E7M1WWncEXufLaP8jgUy X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The BWMON hardware has two sets of registers: one for the monitor itself and one called "global". It has what seems to be some kind of a head switch and an interrupt control register. It's usually 0x200 in size. On fairly recent SoCs (with the starting point seemingly being moving the OSM programming to the firmware) these two register sets are contiguous and overlapping, like this (on sm8450): /* notice how base.start == global_base.start+0x100 */ reg = <0x90b6400 0x300>, <0x90b6300 0x200>; reg-names = "base", "global_base"; Which led to some confusion and the assumption that since the "interesting" global registers begin right after global_base+0x100, there's no need to map two separate regions and one can simply subtract 0x100 from the offsets. This is however not the case for anything older than SDM845, as the global region can appear in seemingly random spots on the register map. Add support for it to let bwmon function on older SoCs like MSM8998 and allow operation with just one set of registers for newer platforms. Fixes: b9c2ae6cac40 ("soc: qcom: icc-bwmon: Add bandwidth monitoring driver") Signed-off-by: Konrad Dybcio --- drivers/soc/qcom/icc-bwmon.c | 136 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 118 insertions(+), 18 deletions(-) diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c index d07be3700db6..9ef632d80ee3 100644 --- a/drivers/soc/qcom/icc-bwmon.c +++ b/drivers/soc/qcom/icc-bwmon.c @@ -34,14 +34,27 @@ /* Internal sampling clock frequency */ #define HW_TIMER_HZ 19200000 -#define BWMON_V4_GLOBAL_IRQ_CLEAR 0x008 -#define BWMON_V4_GLOBAL_IRQ_ENABLE 0x00c +#define BWMON_V4_GLOBAL_IRQ_CLEAR 0x108 +#define BWMON_V4_GLOBAL_IRQ_ENABLE 0x10c /* * All values here and further are matching regmap fields, so without absolute * register offsets. */ #define BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE BIT(0) +/* + * Starting with SDM845, the BWMON4 register space has changed a bit: + * the global registers were jammed into the beginning of the monitor region. + * To keep the proper offsets, one would have to map and + * , which is straight up wrong. + * To facilitate for that, while allowing the older, arguably more proper + * implementations to work, offset the global registers by -0x100 to avoid + * having to map half of the global registers twice. + */ +#define BWMON_V4_845_OFFSET 0x100 +#define BWMON_V4_GLOBAL_IRQ_CLEAR_845 (BWMON_V4_GLOBAL_IRQ_CLEAR - BWMON_V4_845_OFFSET) +#define BWMON_V4_GLOBAL_IRQ_ENABLE_845 (BWMON_V4_GLOBAL_IRQ_ENABLE - BWMON_V4_845_OFFSET) + #define BWMON_V4_IRQ_STATUS 0x100 #define BWMON_V4_IRQ_CLEAR 0x108 @@ -118,8 +131,10 @@ #define BWMON_NEEDS_FORCE_CLEAR BIT(1) enum bwmon_fields { - F_GLOBAL_IRQ_CLEAR, - F_GLOBAL_IRQ_ENABLE, + /* Fields used only on >=SDM845 with BWMON_HAS_GLOBAL_IRQ */ + F_GLB_IRQ_CLEAR, + F_GLB_IRQ_ENABLE, + F_IRQ_STATUS, F_IRQ_CLEAR, F_IRQ_ENABLE, @@ -145,6 +160,13 @@ enum bwmon_fields { F_NUM_FIELDS }; +enum bwmon_global_fields { + F_GLOBAL_IRQ_CLEAR, + F_GLOBAL_IRQ_ENABLE, + + F_NUM_GLOBAL_FIELDS +}; + struct icc_bwmon_data { unsigned int sample_ms; unsigned int count_unit_kb; /* kbytes */ @@ -157,6 +179,9 @@ struct icc_bwmon_data { const struct regmap_config *regmap_cfg; const struct reg_field *regmap_fields; + + const struct regmap_config *global_regmap_cfg; + const struct reg_field *global_regmap_fields; }; struct icc_bwmon { @@ -166,6 +191,7 @@ struct icc_bwmon { struct regmap *regmap; struct regmap_field *regs[F_NUM_FIELDS]; + struct regmap_field *global_regs[F_NUM_FIELDS]; unsigned int max_bw_kbps; unsigned int min_bw_kbps; @@ -175,8 +201,8 @@ struct icc_bwmon { /* BWMON v4 */ static const struct reg_field msm8998_bwmon_reg_fields[] = { - [F_GLOBAL_IRQ_CLEAR] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_CLEAR, 0, 0), - [F_GLOBAL_IRQ_ENABLE] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_ENABLE, 0, 0), + [F_GLB_IRQ_CLEAR] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_CLEAR_845, 0, 0), + [F_GLB_IRQ_ENABLE] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_ENABLE_845, 0, 0), [F_IRQ_STATUS] = REG_FIELD(BWMON_V4_IRQ_STATUS, 4, 7), [F_IRQ_CLEAR] = REG_FIELD(BWMON_V4_IRQ_CLEAR, 4, 7), [F_IRQ_ENABLE] = REG_FIELD(BWMON_V4_IRQ_ENABLE, 4, 7), @@ -202,7 +228,7 @@ static const struct reg_field msm8998_bwmon_reg_fields[] = { }; static const struct regmap_range msm8998_bwmon_reg_noread_ranges[] = { - regmap_reg_range(BWMON_V4_GLOBAL_IRQ_CLEAR, BWMON_V4_GLOBAL_IRQ_CLEAR), + regmap_reg_range(BWMON_V4_GLOBAL_IRQ_CLEAR_845, BWMON_V4_GLOBAL_IRQ_CLEAR_845), regmap_reg_range(BWMON_V4_IRQ_CLEAR, BWMON_V4_IRQ_CLEAR), regmap_reg_range(BWMON_V4_CLEAR, BWMON_V4_CLEAR), }; @@ -222,16 +248,34 @@ static const struct regmap_access_table msm8998_bwmon_reg_volatile_table = { .n_yes_ranges = ARRAY_SIZE(msm8998_bwmon_reg_volatile_ranges), }; +static const struct reg_field msm8998_bwmon_global_reg_fields[] = { + [F_GLOBAL_IRQ_CLEAR] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_CLEAR, 0, 0), + [F_GLOBAL_IRQ_ENABLE] = REG_FIELD(BWMON_V4_GLOBAL_IRQ_ENABLE, 0, 0), +}; + +static const struct regmap_range msm8998_bwmon_global_reg_noread_ranges[] = { + regmap_reg_range(BWMON_V4_GLOBAL_IRQ_CLEAR, BWMON_V4_GLOBAL_IRQ_CLEAR), +}; + +static const struct regmap_access_table msm8998_bwmon_global_reg_read_table = { + .no_ranges = msm8998_bwmon_global_reg_noread_ranges, + .n_no_ranges = ARRAY_SIZE(msm8998_bwmon_global_reg_noread_ranges), +}; + /* * Fill the cache for non-readable registers only as rest does not really * matter and can be read from the device. */ static const struct reg_default msm8998_bwmon_reg_defaults[] = { - { BWMON_V4_GLOBAL_IRQ_CLEAR, 0x0 }, + { BWMON_V4_GLOBAL_IRQ_CLEAR_845, 0x0 }, { BWMON_V4_IRQ_CLEAR, 0x0 }, { BWMON_V4_CLEAR, 0x0 }, }; +static const struct reg_default msm8998_bwmon_global_reg_defaults[] = { + { BWMON_V4_GLOBAL_IRQ_CLEAR, 0x0 }, +}; + static const struct regmap_config msm8998_bwmon_regmap_cfg = { .reg_bits = 32, .reg_stride = 4, @@ -252,10 +296,27 @@ static const struct regmap_config msm8998_bwmon_regmap_cfg = { .cache_type = REGCACHE_RBTREE, }; +static const struct regmap_config msm8998_bwmon_global_regmap_cfg = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + /* + * No concurrent access expected - driver has one interrupt handler, + * regmap is not shared, no driver or user-space API. + */ + .disable_locking = true, + .rd_table = &msm8998_bwmon_global_reg_read_table, + .reg_defaults = msm8998_bwmon_global_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(msm8998_bwmon_global_reg_defaults), + /* + * Cache is necessary for using regmap fields with non-readable + * registers. + */ + .cache_type = REGCACHE_RBTREE, +}; + /* BWMON v5 */ static const struct reg_field sdm845_llcc_bwmon_reg_fields[] = { - [F_GLOBAL_IRQ_CLEAR] = {}, - [F_GLOBAL_IRQ_ENABLE] = {}, [F_IRQ_STATUS] = REG_FIELD(BWMON_V5_IRQ_STATUS, 0, 3), [F_IRQ_CLEAR] = REG_FIELD(BWMON_V5_IRQ_CLEAR, 0, 3), [F_IRQ_ENABLE] = REG_FIELD(BWMON_V5_IRQ_ENABLE, 0, 3), @@ -369,16 +430,21 @@ static void bwmon_clear_irq(struct icc_bwmon *bwmon) regmap_field_force_write(bwmon->regs[F_IRQ_CLEAR], BWMON_IRQ_ENABLE_MASK); if (bwmon->data->quirks & BWMON_NEEDS_FORCE_CLEAR) regmap_field_force_write(bwmon->regs[F_IRQ_CLEAR], 0); - if (bwmon->data->quirks & BWMON_HAS_GLOBAL_IRQ) - regmap_field_force_write(bwmon->regs[F_GLOBAL_IRQ_CLEAR], + if (bwmon->global_regs[0]) + regmap_field_force_write(bwmon->global_regs[F_GLOBAL_IRQ_CLEAR], + BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE); + else + regmap_field_force_write(bwmon->regs[F_GLB_IRQ_CLEAR], BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE); } static void bwmon_disable(struct icc_bwmon *bwmon) { /* Disable interrupts. Strict ordering, see bwmon_clear_irq(). */ - if (bwmon->data->quirks & BWMON_HAS_GLOBAL_IRQ) - regmap_field_write(bwmon->regs[F_GLOBAL_IRQ_ENABLE], 0x0); + if (bwmon->global_regs[0]) + regmap_field_write(bwmon->global_regs[F_GLOBAL_IRQ_ENABLE], 0x0); + else + regmap_field_write(bwmon->regs[F_GLB_IRQ_ENABLE], 0x0); regmap_field_write(bwmon->regs[F_IRQ_ENABLE], 0x0); /* @@ -391,9 +457,13 @@ static void bwmon_disable(struct icc_bwmon *bwmon) static void bwmon_enable(struct icc_bwmon *bwmon, unsigned int irq_enable) { /* Enable interrupts */ - if (bwmon->data->quirks & BWMON_HAS_GLOBAL_IRQ) - regmap_field_write(bwmon->regs[F_GLOBAL_IRQ_ENABLE], - BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE); + if (bwmon->global_regs[0]) + regmap_field_write(bwmon->global_regs[F_GLOBAL_IRQ_ENABLE], + BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE); + else + regmap_field_write(bwmon->regs[F_GLB_IRQ_ENABLE], + BWMON_V4_GLOBAL_IRQ_ENABLE_ENABLE); + regmap_field_write(bwmon->regs[F_IRQ_ENABLE], irq_enable); /* Enable bwmon */ @@ -556,7 +626,9 @@ static int bwmon_init_regmap(struct platform_device *pdev, struct device *dev = &pdev->dev; void __iomem *base; struct regmap *map; + int ret; + /* Map the monitor base */ base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return dev_err_probe(dev, PTR_ERR(base), @@ -567,12 +639,38 @@ static int bwmon_init_regmap(struct platform_device *pdev, return dev_err_probe(dev, PTR_ERR(map), "failed to initialize regmap\n"); + BUILD_BUG_ON(ARRAY_SIZE(msm8998_bwmon_global_reg_fields) != F_NUM_GLOBAL_FIELDS); BUILD_BUG_ON(ARRAY_SIZE(msm8998_bwmon_reg_fields) != F_NUM_FIELDS); BUILD_BUG_ON(ARRAY_SIZE(sdm845_llcc_bwmon_reg_fields) != F_NUM_FIELDS); - return devm_regmap_field_bulk_alloc(dev, map, bwmon->regs, + ret = devm_regmap_field_bulk_alloc(dev, map, bwmon->regs, bwmon->data->regmap_fields, F_NUM_FIELDS); + if (ret) + return ret; + + if (bwmon->data->quirks & BWMON_HAS_GLOBAL_IRQ) { + /* Map the global base, if separate */ + base = devm_platform_ioremap_resource(pdev, 1); + + /* If it's not, bail out early and assume the 845 register scheme */ + if (IS_ERR(base) && PTR_ERR(base) == -EINVAL) + goto exit; + else if (IS_ERR(base)) + return dev_err_probe(dev, PTR_ERR(base), + "failed to map bwmon global registers\n"); + + map = devm_regmap_init_mmio(dev, base, bwmon->data->global_regmap_cfg); + if (IS_ERR(map)) + return dev_err_probe(dev, PTR_ERR(map), + "failed to initialize global regmap\n"); + + ret = devm_regmap_field_bulk_alloc(dev, map, bwmon->global_regs, + bwmon->data->global_regmap_fields, + F_NUM_GLOBAL_FIELDS); + } +exit: + return ret; } static int bwmon_probe(struct platform_device *pdev) @@ -645,6 +743,8 @@ static const struct icc_bwmon_data msm8998_bwmon_data = { .quirks = BWMON_HAS_GLOBAL_IRQ, .regmap_fields = msm8998_bwmon_reg_fields, .regmap_cfg = &msm8998_bwmon_regmap_cfg, + .global_regmap_fields = msm8998_bwmon_global_reg_fields, + .global_regmap_cfg = &msm8998_bwmon_global_regmap_cfg, }; static const struct icc_bwmon_data sdm845_llcc_bwmon_data = { From patchwork Sat Mar 4 15:39:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 658898 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D65EDC6FA99 for ; Sat, 4 Mar 2023 15:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229725AbjCDPji (ORCPT ); Sat, 4 Mar 2023 10:39:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbjCDPjd (ORCPT ); Sat, 4 Mar 2023 10:39:33 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 052D81E2B0 for ; Sat, 4 Mar 2023 07:39:31 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id r27so7273420lfe.10 for ; Sat, 04 Mar 2023 07:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677944370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wXa/TCpVNEWyWlP7s5FovRg6HG2GrupX5kByuFYwqVw=; b=boDbMYdVX6/Y8u0jawoTUBOLG5gjvRu8THsESIJEc6NOjpPXtJ9FNhYOnwJEUwVMVS 9jt/f/c0IKfYEIAoY/sthuXAedtCvqHDweCseQKvf9sK3Devq414jrmEA3d/TErIuODZ 7TCBZEPIZxEbJs9lH4/lYsTE9+xAciG2QXV+RQf3nCLut4Ei+orI83DyJ8VDmcmcQnSj zltHBNanX12FyYqGSA/SaGlqIfUTgTE/FT/Hj6o7oQpDsmMGMZ6nB+gI8/Ns3D/D0nX1 Nar6cJO41hk0HSINJVhmJjg/O/tpsqgTLJO+VWIPpnteiJqbzNpz+XyVcf7BL+5osG9+ GsbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677944370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wXa/TCpVNEWyWlP7s5FovRg6HG2GrupX5kByuFYwqVw=; b=7YEWtM6UQn0XKh4Tun5l78QYAOa4KCMqp8DdpMsQaJ+oxvK1i9jnHLteHWmT3nQvge A5p2/z/gScaaowTkN2eWJpclgmXkw1HBW9L0DekUXCGGRP3hfAlVRZhjgfA1D9AN6YfB JJrCBvk3vyDn8l1DndRpspHXIxsZII1IbUkqw79q0cB6lKEi5joGziJ5lQoZD02ZfTmm M2qq3PnWlpQeqHHlEdHQKbiH7N/Tf8btw22paWrOb19lODStPsAnUxfxof+zXjPGggi0 9EnjgSRdH9mZFahxph099cDaO049CJHVJxbpQxvwWL0O4eQPKeRtmbeFu4B2hiyfRnbe 1Qxg== X-Gm-Message-State: AO0yUKUAO6Ae3j+n8hUt92g9PiJrf0i8i/h7k77dac0roTeIWXtrfgT/ jDRtuGcIiYRJRruhhW+TMaSvRA== X-Google-Smtp-Source: AK7set/sBMjzA4I+wi326/+Td/U5LnpEQA4QFfR9NgGBlMZNWl0tdWa5FiQiXUZ4t9njtghrh6OhfA== X-Received: by 2002:a19:5203:0:b0:4e8:28f:82fc with SMTP id m3-20020a195203000000b004e8028f82fcmr26120lfb.27.1677944370368; Sat, 04 Mar 2023 07:39:30 -0800 (PST) Received: from [192.168.1.101] (abym99.neoplus.adsl.tpnet.pl. [83.9.32.99]) by smtp.gmail.com with ESMTPSA id f14-20020ac2532e000000b004ab52b0bcf9sm855065lfh.207.2023.03.04.07.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 07:39:30 -0800 (PST) From: Konrad Dybcio Date: Sat, 04 Mar 2023 16:39:21 +0100 Subject: [PATCH 3/3] soc: qcom: icc-bwmon: Remove unused struct member MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v1-3-e563837dc7d1@linaro.org> References: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v1-0-e563837dc7d1@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677944365; l=784; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=qWo6zMTpy3xe0wyRSkH90VHxKiqh5/knTMsgd/eEzYU=; b=BB0zfXIufSgOmbYVaimXXk2UXPtwIjqh1tUplrVjqTKNuJEYIjVY+3Iwr9xtelTbkp5r/tnwgSqy 0rLjhymCBgpCo0G/gDG7YDGM1V3JGGXplngv+6wU+5UMjMUQVzVV X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org bwmon->regmap was never used, as the regmap for bwmon is registered through devres and accessed through bwmon's regmap_field members. Remove it Fixes: ec63dcd3c863 ("soc: qcom: icc-bwmon: use regmap and prepare for BWMON v5") Signed-off-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- drivers/soc/qcom/icc-bwmon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c index 9ef632d80ee3..3f88ccedde60 100644 --- a/drivers/soc/qcom/icc-bwmon.c +++ b/drivers/soc/qcom/icc-bwmon.c @@ -189,7 +189,6 @@ struct icc_bwmon { const struct icc_bwmon_data *data; int irq; - struct regmap *regmap; struct regmap_field *regs[F_NUM_FIELDS]; struct regmap_field *global_regs[F_NUM_FIELDS];