From patchwork Tue Dec 12 14:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 177384 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7769171vqy; Tue, 12 Dec 2023 06:44:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrUyIQDGk3faMcuSNGA/J4PyzPIKLMzGi6n9fsh/4AssWAQ+apQO6/7yLX11ZutKXPy+pS X-Received: by 2002:a05:6a00:1408:b0:6cd:fb72:1262 with SMTP id l8-20020a056a00140800b006cdfb721262mr3029081pfu.9.1702392275769; Tue, 12 Dec 2023 06:44:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702392275; cv=none; d=google.com; s=arc-20160816; b=vs177/QA23dU/pEvUHS0wM7QxgBm//SksgAEiSZVGXXW/QdjbuyqVb0tn/lr25DZMN Lu7iaqjuyx4WfjlZPgDvvx0263bQH8SfhGuoSce+7qPiTg73FwEPKLXGLtDJVJDZKna1 bWCA8ERFoIfLBHARv5i2WQNwtYVhVwRx0JmYWBBiPOkhSq3MaxpDY9MpHby5Xosm9QDu 6EmT+bXVILd12PldMa603juS/6VEWCGQeHQD83cn4hjmTd+v59lGC6/RkFWKoiD6bqEg CVnPnm6qyrD6DmqUZIvNYOOD8UPegi73sxC6AnbDJh7LdPA83YEjkrGQ3buZEijb0BpC aevg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=CPE1TxfztaCUJ8c67Q6iVKgI7+m5XFqGsRpjgNaFBhA=; fh=/He5CilCH9NLxYyUdSWHq+zJU/XYjpqZCRHFJsjNvZA=; b=0PGpwVKg7yq5NzZCv3VPEnmxO8OKI2GyWIclDmDLr5YVGwBrnenBTCcTASPVW8U2jx DYovrPdzaxsTEBQNo2omY5kxJiocoPZk2TaovYlJNtAwVFaOL2TWFeqf6T27AY/jLD16 OWeBxbFeck8IZ1BbTDCZRTCNXwB7ShCv2qFVY7SeHsPdUX6nIHNlzMwd4RSw/I+pT0jp pDM4Zv5dIdvA7ODR0oAQaBvwvrd9xA6grj2JG/tudcElBA+u2Bf1+VHH3zKGNp4nC0cZ ra7YTqZfKsigUF3dAk3z1dMxtOKNwHy61OX5IrRyrYhSDvaREa8uiAfgsh/4nMTuzTqe cI/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xDbofv7U; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=2Rd3tXeU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id ay20-20020a056a00301400b006cdd83f45c0si7978004pfb.229.2023.12.12.06.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 06:44:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xDbofv7U; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=2Rd3tXeU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 45D9F80A235E; Tue, 12 Dec 2023 06:44:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376895AbjLLOoR (ORCPT + 99 others); Tue, 12 Dec 2023 09:44:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376853AbjLLOoQ (ORCPT ); Tue, 12 Dec 2023 09:44:16 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ECC7F2; Tue, 12 Dec 2023 06:44:22 -0800 (PST) Date: Tue, 12 Dec 2023 14:44:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1702392260; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CPE1TxfztaCUJ8c67Q6iVKgI7+m5XFqGsRpjgNaFBhA=; b=xDbofv7U9/y5e8vJo4YOLZCjgvvbFtG7caAFnqU75p5RKA5mF+PwCU1MDEDuM7fscadzzj 9+/DZxnDIShhPLRnsBrrVrn5oNlDb/aq9Uv3xEMzid/i+QbV3rRR4HW/ezVFmZB2zgvmrh E/6ZulsnB6Aa7hNS+P3gbjbD4cq33bHnAtW3Ik5Lb01sq80gCodYuw0Shl8zOnm2FpVpiJ DGlVBeD1JgpsmQ/r05rQ3kPsy9240XVre3K2zgUvNkUnLemzvnhVyvFFF2EhHPIpyuEB5D nkHqmOBgdNyElLcmPFLKSxnFB7kxGMY9Tndr3ehGv8ECGXBbVIB1JAJ2kiNM5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1702392260; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CPE1TxfztaCUJ8c67Q6iVKgI7+m5XFqGsRpjgNaFBhA=; b=2Rd3tXeUE92TOmpW1kpuroJHZnX0y+X76NRkhS3g76aSIYvXIS2fm7AEX3xaEbmcwDVRTZ hjILWrI8Ez/5JEBA== From: "tip-bot2 for Konrad Dybcio" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/qcom-mpm: Support passing a slice of SRAM as reg space Cc: Konrad Dybcio , Thomas Gleixner , "Bryan O'Donoghue" , Shawn Guo , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20230328-topic-msgram_mpm-v7-2-6ee2bfeaac2c@linaro.org> References: <20230328-topic-msgram_mpm-v7-2-6ee2bfeaac2c@linaro.org> MIME-Version: 1.0 Message-ID: <170239225978.398.6776352456083979765.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 12 Dec 2023 06:44:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784749849933027542 X-GMAIL-MSGID: 1785087682761571911 The following commit has been merged into the irq/core branch of tip: Commit-ID: 221b110d87c2d3ea113ad784b2c6505726a3e157 Gitweb: https://git.kernel.org/tip/221b110d87c2d3ea113ad784b2c6505726a3e157 Author: Konrad Dybcio AuthorDate: Mon, 27 Nov 2023 16:52:13 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 12 Dec 2023 15:40:42 +01:00 irqchip/qcom-mpm: Support passing a slice of SRAM as reg space The MPM hardware is accessible from the ARM CPUs through a shared memory region (RPM MSG RAM) which is also concurrently accessed by other kinds of cores on the system like modem, ADSP etc. Modeling this relation in a (somewhat) sane manner in the device tree requires to - either present the MPM as a child of said memory region, which makes little sense, as a mapped memory carveout is not a bus. - define nodes which bleed their register spaces into one another - or passing their slice of the MSG RAM through a property Go with the third option and add a way to map a region passed through the "qcom,rpm-msg-ram" property as register space for the MPM interrupt controller. The current way of using 'reg' is preserved for backwards compatibility reasons. [ tglx: Massaged changelog ] Signed-off-by: Konrad Dybcio Signed-off-by: Thomas Gleixner Reviewed-by: Bryan O'Donoghue Acked-by: Shawn Guo Link: https://lore.kernel.org/r/20230328-topic-msgram_mpm-v7-2-6ee2bfeaac2c@linaro.org --- drivers/irqchip/irq-qcom-mpm.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-qcom-mpm.c b/drivers/irqchip/irq-qcom-mpm.c index 7124565..cda5838 100644 --- a/drivers/irqchip/irq-qcom-mpm.c +++ b/drivers/irqchip/irq-qcom-mpm.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -322,8 +323,10 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) struct device *dev = &pdev->dev; struct irq_domain *parent_domain; struct generic_pm_domain *genpd; + struct device_node *msgram_np; struct qcom_mpm_priv *priv; unsigned int pin_cnt; + struct resource res; int i, irq; int ret; @@ -374,9 +377,26 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) raw_spin_lock_init(&priv->lock); - priv->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(priv->base)) - return PTR_ERR(priv->base); + /* If we have a handle to an RPM message ram partition, use it. */ + msgram_np = of_parse_phandle(np, "qcom,rpm-msg-ram", 0); + if (msgram_np) { + ret = of_address_to_resource(msgram_np, 0, &res); + if (ret) { + of_node_put(msgram_np); + return ret; + } + + /* Don't use devm_ioremap_resource, as we're accessing a shared region. */ + priv->base = devm_ioremap(dev, res.start, resource_size(&res)); + of_node_put(msgram_np); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + } else { + /* Otherwise, fall back to simple MMIO. */ + priv->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + } for (i = 0; i < priv->reg_stride; i++) { qcom_mpm_write(priv, MPM_REG_ENABLE, i, 0);