From patchwork Tue Jun 27 13:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 13294482 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D181DEB64DC for ; Tue, 27 Jun 2023 13:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=T4YCkCnWRtbbi5tgwIn7DWNgVmkhf8jB7vASpq7JlFY=; b=MSDBEUNhyWYy4B bMrua2PFbUEZVenkMJtKUfg9SdGrwcQov7WD+9idlTVmc6uZDj/YXzxsvrMRCDiLdU6bBpSg+E9fH YvVmWeCA+sBRfEmYifZpnJ+XwIhX48diLFAh1N26DyyLTnvDXjBymwYjYWF0m7kEW/tmfPFUGFoAy zV99FVB0fDvIm2KcotuOtxa/QOsDxXYHCoXfjIKWz8pveHIjMRVoVgUVeTlPUqVE6EdTB1l/0EV6F NG87wFGklKqvjvvJwE+WC7y1hOOzfbx0X88yfiveY6XRs+r8qfGaWBwowFHVZHX6IwtHvV+QkE7q2 uhuOR7kGOxnXFOu4J/Og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qE8Tx-00DFIV-2h; Tue, 27 Jun 2023 13:11:45 +0000 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qE8TF-00DEqR-0Z for linux-arm-kernel@lists.infradead.org; Tue, 27 Jun 2023 13:11:07 +0000 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f95bf5c493so5967420e87.3 for ; Tue, 27 Jun 2023 06:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1687871458; x=1690463458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WiG/GZ5uQDlr9SguQOqtiNny/kRUjio8i95/1np9ohQ=; b=4aQZFZ1dO9vcoiBcyQ8Y6duIoeGJLqswxzDbpDqu2ALW9r2EqcIHFjyxy//onsxsGQ VKV2vSz3FphT5Jo6wS7dWUqWgoCrBPV5o3vUaA+5NxzxBRQY3dl3DW+yNOMX/gLO6AXp iAmt1xt4Za/GgwAuZt1dMMjxaCntQJdVvgc1thlK9N1W0ChqsAOG5EnDUU6YSh1EzbOy mF4XhFZs/pKyb4p2f7yM8W80g7T+1jlrwcnd78y1zRKPhiiCoMoHCrJ6KGSzZtA24JBc mZ2YNJlvxEGgBqwaq4Qlja1CsxSr+0YV2DqjuQ8wfmTUU3Xv9dtWteMs78MflZcK+wVI 53ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687871458; x=1690463458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WiG/GZ5uQDlr9SguQOqtiNny/kRUjio8i95/1np9ohQ=; b=CWgf88eBAE0fpQ+KnevBloOlplmWdfkIYCMp4+9h2ycs6orQ0Uux3cqtD4PAaB/xas eteTXd+/cEqZb+Mj+cBrm0voaX7Z8OPMwg6JnscGlNuRDt06RB/V9pL+0LNW/EYyP5nM tqP9t1bzYsg2kseFv32J5smX6AFKqPQoOgTjYwb0KnN2AHl9IGxHoRF/CHK2OO6yoms2 LRLNTGqFPVdzoi5z5ZEgiWCEceTZlK0wdh2nKYVYwYKZYEReGPTYWIZWIcls+1TgJQeu Hb7WaIOyZl+5Or/QJJW4a/vuQ2TOCHURwhvc8r3MwWcRE2sfLUKERxCC88E1vyDhk86z a7DQ== X-Gm-Message-State: AC+VfDzu45kjOIckTB2HJ8OpqqTLhVZYITzT+Y1nErioQUaMxOx2UOwk amuDcdbicslBu7cwJ8yG71lYYw== X-Google-Smtp-Source: ACHHUZ7cwevS0KdJdb6ZvecNxHvDA6rxL6++7svE6BZyqrlSEnISVJkkifrhH+nu0J3+hlbIWibXWA== X-Received: by 2002:a05:6512:401b:b0:4fb:7592:7e03 with SMTP id br27-20020a056512401b00b004fb75927e03mr4492768lfb.20.1687871458533; Tue, 27 Jun 2023 06:10:58 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id z26-20020a1c4c1a000000b003f91e32b1ebsm1403196wmf.17.2023.06.27.06.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 06:10:58 -0700 (PDT) From: Markus Schneider-Pargmann To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger Cc: Chun-Jie Chen , AngeloGioacchino Del Regno , Tinghan Shen , Fabien Parent , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Alexandre Bailon , Fabien Parent , Markus Schneider-Pargmann Subject: [PATCH v6 7/8] soc: mediatek: Add support for MTK_SCPD_STRICT_BUS_PROTECTION cap Date: Tue, 27 Jun 2023 15:10:39 +0200 Message-Id: <20230627131040.3418538-8-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230627131040.3418538-1-msp@baylibre.com> References: <20230627131040.3418538-1-msp@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230627_061101_252370_C3AFFA9F X-CRM114-Status: GOOD ( 16.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alexandre Bailon This adds support for MTK_SCPD_STRICT_BUS_PROTECTION capability. It is a strict bus protection policy that requires the bus protection to be disabled before accessing the bus. This is required by the mt8365, for the MM power domain. Signed-off-by: Alexandre Bailon Signed-off-by: Fabien Parent Signed-off-by: Markus Schneider-Pargmann Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Alexandre Mergnat Tested-by: Alexandre Mergnat --- drivers/soc/mediatek/mtk-pm-domains.c | 27 +++++++++++++++++++++++---- drivers/soc/mediatek/mtk-pm-domains.h | 3 ++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c index 608b5eab8146..632285bf0d44 100644 --- a/drivers/soc/mediatek/mtk-pm-domains.c +++ b/drivers/soc/mediatek/mtk-pm-domains.c @@ -262,9 +262,17 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_ISO_BIT); regmap_set_bits(scpsys->base, pd->data->ctl_offs, PWR_RST_B_BIT); - ret = clk_bulk_prepare_enable(pd->num_subsys_clks, pd->subsys_clks); - if (ret) - goto err_pwr_ack; + /* + * In few Mediatek platforms(e.g. MT6779), the bus protect policy is + * stricter, which leads to bus protect release must be prior to bus + * access. + */ + if (!MTK_SCPD_CAPS(pd, MTK_SCPD_STRICT_BUS_PROTECTION)) { + ret = clk_bulk_prepare_enable(pd->num_subsys_clks, + pd->subsys_clks); + if (ret) + goto err_pwr_ack; + } ret = scpsys_sram_enable(pd); if (ret < 0) @@ -274,12 +282,23 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) if (ret < 0) goto err_disable_sram; + if (MTK_SCPD_CAPS(pd, MTK_SCPD_STRICT_BUS_PROTECTION)) { + ret = clk_bulk_prepare_enable(pd->num_subsys_clks, + pd->subsys_clks); + if (ret) + goto err_enable_bus_protect; + } + return 0; +err_enable_bus_protect: + scpsys_bus_protect_enable(pd); err_disable_sram: scpsys_sram_disable(pd); err_disable_subsys_clks: - clk_bulk_disable_unprepare(pd->num_subsys_clks, pd->subsys_clks); + if (!MTK_SCPD_CAPS(pd, MTK_SCPD_STRICT_BUS_PROTECTION)) + clk_bulk_disable_unprepare(pd->num_subsys_clks, + pd->subsys_clks); err_pwr_ack: clk_bulk_disable_unprepare(pd->num_clks, pd->clks); err_reg: diff --git a/drivers/soc/mediatek/mtk-pm-domains.h b/drivers/soc/mediatek/mtk-pm-domains.h index 17c033217704..aaba5e6b0536 100644 --- a/drivers/soc/mediatek/mtk-pm-domains.h +++ b/drivers/soc/mediatek/mtk-pm-domains.h @@ -12,6 +12,7 @@ #define MTK_SCPD_ALWAYS_ON BIT(5) #define MTK_SCPD_EXT_BUCK_ISO BIT(6) #define MTK_SCPD_HAS_INFRA_NAO BIT(7) +#define MTK_SCPD_STRICT_BUS_PROTECTION BIT(8) #define MTK_SCPD_CAPS(_scpd, _x) ((_scpd)->data->caps & (_x)) #define SPM_VDE_PWR_CON 0x0210 @@ -107,7 +108,7 @@ struct scpsys_domain_data { u32 sram_pdn_ack_bits; int ext_buck_iso_offs; u32 ext_buck_iso_mask; - u8 caps; + u16 caps; const struct scpsys_bus_prot_data bp_cfg[SPM_MAX_BUS_PROT_DATA]; int pwr_sta_offs; int pwr_sta2nd_offs;