From patchwork Sun Jun 6 20:16:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Dudziak X-Patchwork-Id: 455089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58AE6C48BCF for ; Sun, 6 Jun 2021 20:17:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AE9A613CB for ; Sun, 6 Jun 2021 20:17:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230175AbhFFUTH (ORCPT ); Sun, 6 Jun 2021 16:19:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230183AbhFFUTD (ORCPT ); Sun, 6 Jun 2021 16:19:03 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B12C061787 for ; Sun, 6 Jun 2021 13:16:59 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id cb9so17670876edb.1 for ; Sun, 06 Jun 2021 13:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=snejp.pl; s=gmail; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=O9ZRLR7Ot8Lsx1jsDhH7FGYDbrZdMu5Zb2VpXOb1xQc=; b=N1UVhLrqamh+j37H/CDIXyb9wNotOeqY8s7ZhQKgR8OXEErVi8u36Z/aVUfitvBm7q vTzY1BNbpCX0npKT5OFB61G8V4MVlPWoxW4Gk5nl+6kvavgIvKjuiVFvbQ2PdrhyhIe3 UjgpurD7vaZG9U6KniLkS1K81h53Buquee8qH1Xgkkh5vXa/dFmjjuXqpNlbd+VUviP9 8SNtxBK+1L9V2nUSgTJMyT83z9B2ROutFkqmnjHGljGadKkfeds+lk0ks2ZrdvP/1gAW gzGZqV7Pane9zcDf21MzxJipP24NrC9EonsWFHnsvpy3LrQ3TZKUyOXLBat0O6xseh0n SISg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O9ZRLR7Ot8Lsx1jsDhH7FGYDbrZdMu5Zb2VpXOb1xQc=; b=hS81xUMSzXjhCNhmcbKyuxlgn3HJz0RQm0o6vXrm4c1YbYz6rdsH0PFg8l0BonpZs3 PGmHOX7A6Ib1qwKqg1crq5TJibfJmj1vrysvfW7pj23lLdWS58ysXD5kA/6Lp/Vxq44V kHLySWKDSwPv3avZx2LXvn6nkWwPygoT0JvGe/x/Jyldm9JqvcoDU3L0GEbLD18iBMTc 40Etp4Tq8ei58sK3BqddcpWgjP6mIDY8UjMWxjndjjBAdLEwxL5Nyy39N4jiKe2eGnR6 W/3FDPfQUh4gAjcD0QCIOq4zU3dKr9rzGzm24i83DxngbS7c/Sk5k8BxsG8MrKBdd4WA ggeg== X-Gm-Message-State: AOAM531kHMCkWx7AWJZ43Umpo6KA53fUvxRWOf6g5rLR0k7yNiz17xZd jhNUMh3OAoLgLSavmdLqBvwPEg== X-Google-Smtp-Source: ABdhPJxn6NWckN7q1uCOM6LS0V8FJjs1rgHxW5ZZ6tI+96nCM4aSmz/RXIcLLRXQ6fatx18IzDKWZw== X-Received: by 2002:aa7:d5c6:: with SMTP id d6mr16311535eds.290.1623010617652; Sun, 06 Jun 2021 13:16:57 -0700 (PDT) Received: from PackardBell (192038129059.mbb.telenor.dk. [192.38.129.59]) by smtp.googlemail.com with ESMTPSA id v8sm2211623edc.59.2021.06.06.13.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 13:16:57 -0700 (PDT) Received: from localhost (PackardBell [local]) by PackardBell (OpenSMTPD) with ESMTPA id 271784dc; Sun, 6 Jun 2021 20:16:53 +0000 (UTC) From: Bartosz Dudziak To: Rob Herring , Andy Gross , Bjorn Andersson , Russell King , David Sterba , Jens Axboe , Bartosz Dudziak , Lorenzo Pieralisi , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/2] dt-bindings: arm: Add SMP enable-method for MSM8226 Date: Sun, 6 Jun 2021 22:16:11 +0200 Message-Id: <20210606201612.100752-2-bartosz.dudziak@snejp.pl> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210606201612.100752-1-bartosz.dudziak@snejp.pl> References: <20210606201612.100752-1-bartosz.dudziak@snejp.pl> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add binding in enable-method property for MSM8226 SoC SMP support. Signed-off-by: Bartosz Dudziak Acked-by: Rob Herring --- Documentation/devicetree/bindings/arm/cpus.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml index 26b886b20b..96912f1a26 100644 --- a/Documentation/devicetree/bindings/arm/cpus.yaml +++ b/Documentation/devicetree/bindings/arm/cpus.yaml @@ -207,6 +207,7 @@ properties: - qcom,gcc-msm8660 - qcom,kpss-acc-v1 - qcom,kpss-acc-v2 + - qcom,msm8226-smp - renesas,apmu - renesas,r9a06g032-smp - rockchip,rk3036-smp @@ -286,7 +287,7 @@ properties: Specifies the ACC* node associated with this CPU. Required for systems that have an "enable-method" property - value of "qcom,kpss-acc-v1" or "qcom,kpss-acc-v2" + value of "qcom,kpss-acc-v1", "qcom,kpss-acc-v2" or "qcom,msm8226-smp" * arm/msm/qcom,kpss-acc.txt From patchwork Sun Jun 6 20:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Dudziak X-Patchwork-Id: 455462 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7BFAC48BC2 for ; Sun, 6 Jun 2021 20:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA75C613CB for ; Sun, 6 Jun 2021 20:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230104AbhFFUTG (ORCPT ); Sun, 6 Jun 2021 16:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbhFFUSv (ORCPT ); Sun, 6 Jun 2021 16:18:51 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73914C061795 for ; Sun, 6 Jun 2021 13:17:00 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id r11so17585143edt.13 for ; Sun, 06 Jun 2021 13:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=snejp.pl; s=gmail; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qqv/zIOjF7NIyGSn6gjOvY+easTFG+SbModa0mydre0=; b=ngi3GO87bf82JBszh9x1WrlJpUMr6tKYc5Xpyf18N0WQ1Qp8qC8vgwBtn/bCmUA6Gw cti4hDldWE9EH+zn1CNBeo1amj+evmleTIlWX7UUW1wEA3i9xpl+Oo0qGMhWgBXyvBuH DveCYykijKUCf/7xbNgK9QThElkjeyoxyhIY9FVcs+0diw0jpi5Wi+7qP464idM0QGx7 j/ROBJGdaP7ejmz8ie25IGLSRBdWsVzsgJFf4EaGGJ11pAp/maPO9lKp7pmZwWXSrZmX CP7bOkTgYn8trQ5FnN6+OTBbt9R4qXhINwU9bQeAq5QZQFv81RlNASLsY55WZMWRLzev bNJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qqv/zIOjF7NIyGSn6gjOvY+easTFG+SbModa0mydre0=; b=eyFn4MgLJsU1qeyeYaokUMurOiznb/RSfUOBGFy+3iEACLNXMCo6lJ4M0IdSB7ldHg yQ6WYLWPNS72Jnp0doS+TETz2OXiXcy/NbqgDaaB2l92dqnxz23mf2le5pev/YZYNEVy CzRRJ/0lbL3/YqqlIKKIRLcn9qT+5IhaS8kpcnQmB22/Wr8Ym5OT7LAKKyCnEgmp0N7V InQcdZL/9bR3PlqtMMGeMjP6pAfKUNsoq2m4jsaguciB/4lTo/wNIx1s2I8a8q+fw3kj 71Y3YEhBVK+r9vSY8/NVh+1TVa8b7CB07G/9pBBBumP6rHp3uWkXdIHU6Wc1XQKfe7cg Eqzw== X-Gm-Message-State: AOAM533iwf6LW+zD6DqOvul7IQRmoYyvJt5lp6zdSd4heH2hCjgkdigY 0Y9qi4qK7Jjb1wa1OjxV7etZDdfl69mHGZZSt28= X-Google-Smtp-Source: ABdhPJyC8Za9uHMXOdmHWNxp1ZB/q/0EUA8vonNdpV64QvjM9o48iCAQzT/b02iu7HThSlhwOoNWzw== X-Received: by 2002:aa7:d590:: with SMTP id r16mr16850650edq.355.1623010619108; Sun, 06 Jun 2021 13:16:59 -0700 (PDT) Received: from PackardBell (192038129059.mbb.telenor.dk. [192.38.129.59]) by smtp.googlemail.com with ESMTPSA id v8sm2211623edc.59.2021.06.06.13.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 13:16:58 -0700 (PDT) Received: from localhost (PackardBell [local]) by PackardBell (OpenSMTPD) with ESMTPA id 49482cf5; Sun, 6 Jun 2021 20:16:53 +0000 (UTC) From: Bartosz Dudziak To: Rob Herring , Andy Gross , Bjorn Andersson , Russell King , David Sterba , Jens Axboe , Bartosz Dudziak , Lorenzo Pieralisi , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/2] arm: qcom: Add SMP support for MSM8226 Date: Sun, 6 Jun 2021 22:16:12 +0200 Message-Id: <20210606201612.100752-3-bartosz.dudziak@snejp.pl> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210606201612.100752-1-bartosz.dudziak@snejp.pl> References: <20210606201612.100752-1-bartosz.dudziak@snejp.pl> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Implement support for Cortex-A7 CPU release sequence in MSM8226 SoC. Signed-off-by: Bartosz Dudziak Reviewed-by: Stephan Gerhold --- arch/arm/mach-qcom/platsmp.c | 71 ++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index 630a038f45..60496554c6 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -29,6 +29,7 @@ #define COREPOR_RST BIT(5) #define CORE_RST BIT(4) #define L2DT_SLP BIT(3) +#define CORE_MEM_CLAMP BIT(1) #define CLAMP BIT(0) #define APC_PWR_GATE_CTL 0x14 @@ -75,6 +76,62 @@ static int scss_release_secondary(unsigned int cpu) return 0; } +static int cortex_a7_release_secondary(unsigned int cpu) +{ + int ret = 0; + void __iomem *reg; + struct device_node *cpu_node, *acc_node; + u32 reg_val; + + cpu_node = of_get_cpu_node(cpu, NULL); + if (!cpu_node) + return -ENODEV; + + acc_node = of_parse_phandle(cpu_node, "qcom,acc", 0); + if (!acc_node) { + ret = -ENODEV; + goto out_acc; + } + + reg = of_iomap(acc_node, 0); + if (!reg) { + ret = -ENOMEM; + goto out_acc_map; + } + + /* Put the CPU into reset. */ + reg_val = CORE_RST | COREPOR_RST | CLAMP | CORE_MEM_CLAMP; + writel(reg_val, reg + APCS_CPU_PWR_CTL); + + /* Turn on the BHS and set the BHS_CNT to 16 XO clock cycles */ + writel(BHS_EN | (0x10 << BHS_CNT_SHIFT), reg + APC_PWR_GATE_CTL); + /* Wait for the BHS to settle */ + udelay(2); + + reg_val &= ~CORE_MEM_CLAMP; + writel(reg_val, reg + APCS_CPU_PWR_CTL); + reg_val |= L2DT_SLP; + writel(reg_val, reg + APCS_CPU_PWR_CTL); + udelay(2); + + reg_val = (reg_val | BIT(17)) & ~CLAMP; + writel(reg_val, reg + APCS_CPU_PWR_CTL); + udelay(2); + + /* Release CPU out of reset and bring it to life. */ + reg_val &= ~(CORE_RST | COREPOR_RST); + writel(reg_val, reg + APCS_CPU_PWR_CTL); + reg_val |= CORE_PWRD_UP; + writel(reg_val, reg + APCS_CPU_PWR_CTL); + + iounmap(reg); +out_acc_map: + of_node_put(acc_node); +out_acc: + of_node_put(cpu_node); + return ret; +} + static int kpssv1_release_secondary(unsigned int cpu) { int ret = 0; @@ -281,6 +338,11 @@ static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle) return qcom_boot_secondary(cpu, scss_release_secondary); } +static int cortex_a7_boot_secondary(unsigned int cpu, struct task_struct *idle) +{ + return qcom_boot_secondary(cpu, cortex_a7_release_secondary); +} + static int kpssv1_boot_secondary(unsigned int cpu, struct task_struct *idle) { return qcom_boot_secondary(cpu, kpssv1_release_secondary); @@ -315,6 +377,15 @@ static const struct smp_operations smp_msm8660_ops __initconst = { }; CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops); +static const struct smp_operations qcom_smp_cortex_a7_ops __initconst = { + .smp_prepare_cpus = qcom_smp_prepare_cpus, + .smp_boot_secondary = cortex_a7_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = qcom_cpu_die, +#endif +}; +CPU_METHOD_OF_DECLARE(qcom_smp_msm8226, "qcom,msm8226-smp", &qcom_smp_cortex_a7_ops); + static const struct smp_operations qcom_smp_kpssv1_ops __initconst = { .smp_prepare_cpus = qcom_smp_prepare_cpus, .smp_boot_secondary = kpssv1_boot_secondary,