From patchwork Thu Feb 16 08:17:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 57917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp176796wrn; Thu, 16 Feb 2023 00:21:49 -0800 (PST) X-Google-Smtp-Source: AK7set8Ut5YZMsErY1eOwZxPhcDBzkoyq8zoMjbljP5kqaHg9gRLZ4jrauO+Y6pzGA0Q5WrldUDT X-Received: by 2002:a05:6a20:7ab0:b0:c7:34af:65ac with SMTP id u48-20020a056a207ab000b000c734af65acmr359794pzh.14.1676535709260; Thu, 16 Feb 2023 00:21:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676535709; cv=none; d=google.com; s=arc-20160816; b=dl5heWUR8UlB4dEhpgyJPBQBWlU5/VGVdQDIBGRMFOlcgnSXO8xrpp2bv8npRTaVEH qMNn/6Yrc9pyHHgxk4YM+huoQVe7DuV6+52vhZr9QwSFMAdOW/1in/VDK4NVvuatbMyC moyIvW2OFyB/QI4+G19NzPFu1ZuZLgEpQEId/+h6DNe59pwHdeP3GSoLC9iCA0wV3nx+ eANs6q8J9HuSyYeayt2q+Zf5O3VXp5GSvUjZOF2al79pl4oxnx0ANn8KBCILB+ndeloB p3Fdn3O67JWhnzffyK7YfErOL5KHIqiD6GVZb/y96mx/2EZyQqBkfEw736RgEs2ShcKd xn3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=akhGF43wLnFQziNO2SFHL8r1QesXuZrX9eFcIZ+gxc0=; b=1A2ubeTVlRcqI4suaqX7KmCuLStuHw7fVejtQ0fojt+/1EEcSBYq2dW0jY55TXzQS2 i5iwd4GOMxf772rEAzjuTDuPBtMxox592dIiSeZuIT8aK5IWFsQtEca4MzRyCVJz/wnf COX1C7pWBss4EK91pyLOblia+dQVtmNLGfVulLQafc31RNNOETFHCfqFRxftHGPkqQPx AvvDsQvuYXURXs423IvRV+R4BDwbszPz5T2+J1SeninXs6BQMSMd4/eUfFcsWB5Nu6yj 2n0V5AzxABugbo1A9z5QdkgJkGYy032erS6Uaigz8vQhpr0/05PvSMnvBxpSR/tf2Oeb tw5g== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j191-20020a636ec8000000b004fb988c78f0si999868pgc.242.2023.02.16.00.21.37; Thu, 16 Feb 2023 00:21:49 -0800 (PST) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbjBPITF (ORCPT + 99 others); Thu, 16 Feb 2023 03:19:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbjBPIS7 (ORCPT ); Thu, 16 Feb 2023 03:18:59 -0500 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F5D530197 for ; Thu, 16 Feb 2023 00:18:55 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R811e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0VbnmOMt_1676535472; Received: from srmbuffer011165236051.sqa.eu95(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VbnmOMt_1676535472) by smtp.aliyun-inc.com; Thu, 16 Feb 2023 16:18:53 +0800 From: Jing Zhang To: Will Deacon , Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Shuai Xue , Zhuo Song , Jing Zhang Subject: [PATCH] perf/arm-cmn: Fix and refactor device mapping resource Date: Thu, 16 Feb 2023 16:17:50 +0800 Message-Id: <1676535470-120560-1-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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?1757975107804185834?= X-GMAIL-MSGID: =?utf-8?q?1757975107804185834?= The devm_platform_ioremap_resource() won't let the platform device claim resource when the ACPI companion device has already claimed it. If CMN-ANY except CMN600 is ACPI companion device, it will return -EBUSY in devm_platform_ioremap_resource(), and the driver cannot be successfully installed. So let ACPI companion device call arm_cmn_acpi_probe and not claim resource again. In addition, the arm_cmn_acpi_probe() and arm_cmn_of_probe() functions are refactored to make them compatible with both CMN600 and CMN-ANY. Fixes: 61ec1d875812 ("perf/arm-cmn: Demarcate CMN-600 specifics") Signed-off-by: Jing Zhang --- drivers/perf/arm-cmn.c | 57 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 1deb61b..beb3b37 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -2206,7 +2206,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset) return 0; } -static int arm_cmn600_acpi_probe(struct platform_device *pdev, struct arm_cmn *cmn) +static int arm_cmn_acpi_probe(struct platform_device *pdev, struct arm_cmn *cmn) { struct resource *cfg, *root; @@ -2214,12 +2214,21 @@ static int arm_cmn600_acpi_probe(struct platform_device *pdev, struct arm_cmn *c if (!cfg) return -EINVAL; - root = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!root) - return -EINVAL; + /* If ACPI defines more than one resource, such as cmn-600, then there may be + * a deviation between ROOTNODEBASE and PERIPHBASE, and ROOTNODEBASE can + * be obtained from the second resource. Otherwise, it can be considered that + * ROOT NODE BASE is PERIPHBASE. This is compatible with cmn-600 and cmn-any. + */ + if (pdev->num_resources > 1) { + root = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!root) + return -EINVAL; - if (!resource_contains(cfg, root)) - swap(cfg, root); + if (!resource_contains(cfg, root)) + swap(cfg, root); + } else { + root = cfg; + } /* * Note that devm_ioremap_resource() is dumb and won't let the platform * device claim cfg when the ACPI companion device has already claimed @@ -2227,17 +2236,30 @@ static int arm_cmn600_acpi_probe(struct platform_device *pdev, struct arm_cmn *c * appropriate name, we don't really need to do it again here anyway. */ cmn->base = devm_ioremap(cmn->dev, cfg->start, resource_size(cfg)); - if (!cmn->base) - return -ENOMEM; + if (IS_ERR(cmn->base)) + return PTR_ERR(cmn->base); return root->start - cfg->start; } -static int arm_cmn600_of_probe(struct device_node *np) +static int arm_cmn_of_probe(struct platform_device *pdev, struct arm_cmn *cmn) { u32 rootnode; + int ret; + + cmn->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(cmn->base)) + return PTR_ERR(cmn->base); - return of_property_read_u32(np, "arm,root-node", &rootnode) ?: rootnode; + /* If of_property_read_u32() return EINVAL, it means that device tree has + * not define root-node, and root-node will return 0, which is compatible + * with cmn-600 and cmn-any. + */ + ret = of_property_read_u32(pdev->dev.of_node, "arm,root-node", &rootnode); + if (ret == -EINVAL) + return 0; + + return rootnode; } static int arm_cmn_probe(struct platform_device *pdev) @@ -2255,16 +2277,11 @@ static int arm_cmn_probe(struct platform_device *pdev) cmn->model = (unsigned long)device_get_match_data(cmn->dev); platform_set_drvdata(pdev, cmn); - if (cmn->model == CMN600 && has_acpi_companion(cmn->dev)) { - rootnode = arm_cmn600_acpi_probe(pdev, cmn); - } else { - rootnode = 0; - cmn->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(cmn->base)) - return PTR_ERR(cmn->base); - if (cmn->model == CMN600) - rootnode = arm_cmn600_of_probe(pdev->dev.of_node); - } + if (has_acpi_companion(cmn->dev)) + rootnode = arm_cmn_acpi_probe(pdev, cmn); + else + rootnode = arm_cmn_of_probe(pdev, cmn); + if (rootnode < 0) return rootnode;