Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Tuan Phan <tuanphan@os.amperecomputing.com>
Cc:     patches@amperecomputing.com, Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] perf: arm_dsu: Support DSU ACPI devices.
Date:   Mon, 11 May 2020 13:32:40 -0700
Message-Id: <1589229160-18558-1-git-send-email-tuanphan@os.amperecomputing.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from aptiov-dev-Latitude-E7470.amperecomputing.com (4.28.12.214) by BYAPR05CA0056.namprd05.prod.outlook.com (2603:10b6:a03:74::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3000.11 via Frontend Transport; Mon, 11 May 2020 20:32:58 +0000
X-Mailer: git-send-email 2.7.4
X-Originating-IP: [4.28.12.214]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 827201bf-5b43-434d-e5f1-08d7f5ea7df5
X-MS-TrafficTypeDiagnostic: BYAPR01MB4981:|BYAPR01MB4981:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR01MB498188B557743BBF2E5A4249E0A10@BYAPR01MB4981.prod.exchangelabs.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:1332;
X-Forefront-PRVS: 04004D94E2
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: MwaKkY0gJGOH3UArFDo//Pf1o3RDRQdJuYhz6YuUeLj4aHBfBemWIJbwg602Bc0kHZZS+F9xGJ2r2k9FXJ7jMJ2y0gnomsndhfzK4QHRVfH0ITxaPdHKvfd7e2iVskS8lCJ2V4QcEx7UnajQqpX5pP17xiMQyGSxte718WZ1P+qO5muT7bKV8I6fitMcHZzQu2NYh+TyosMhbtgbCWvPNEc4JjQtrqj1/qpoaPdfMG0nHWSZHX54TqH45RP6KvVPg5DpqjNbBuGQrZAlNgD5hBmUcNtWFYZTw3BjwCTWUW5YZVA0BPEkOnhMxdT7p+AcULpiT++somOlri7pViqMU7nPwV3pFRqpddYFFuJJ4jYMgUYpA7z+qpyoed5qtBMxlgJj06nHv+O9jtytcbC3jZyLosvpPciCWlanyyUNFpOCZdmJDQRxBBcLuM8KmAW+ba46/01iSkbirWM2H5li1t9855TywHeNj5p5tG9AmQBK+grxgWlDGrTZcsMIQss7JQNlACURYx1G9JZ+9faqKp4ziGIVoA6cJlProQ/LFEU=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR01MB4598.prod.exchangelabs.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(376002)(136003)(39840400004)(396003)(33430700001)(6666004)(66476007)(2906002)(66556008)(16526019)(186003)(66946007)(26005)(86362001)(8936002)(8676002)(109986005)(5660300002)(4326008)(6486002)(6506007)(956004)(2616005)(52116002)(54906003)(33440700001)(316002)(6512007)(478600001)(266003);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: 8jD0pEwSrokQLrsu4FbQDlUgyGAVge7M5W1x4I2/XfJysOVb/fj/RGmb+L+daxgy1RcSnNIekB9fambCd5E83hlmRd1U/9QZdVVOSLMCgpD3tD2YLF0CtcewXWMwAL3Oe/VJ6eghmsxW1zUevebzrKhlaSlNkYKvPBumYoP8foEmiFcAqZu+6gpU06cPYaC7n2DQexMPMwvH1cf2V4o89YiGSxG36Lk1Qfpp+iojSQs3/lDOO7/on2CBa23I2hi9TR7X9BJdB+Y5uitl8BLbXgknqvzV2EKTPhvqomV1OB2UcWnwf9D9VH4GGEk/HP2oqeL3ROUDbLwAjYXgimSeaoxWiPndzG+rhdf4YMmcii33VYzUceAZZGtvKdGTXr7OufRW5RGNr8y5NJCr9OMpAxuD3uhvoYmxHfSZADIjCP0w7vEnjskFoFO7+2gbrtegMpGSh3ns/tZqw7RnaM7RtCQSITv0v8llEghqM46yvbQ=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 827201bf-5b43-434d-e5f1-08d7f5ea7df5
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 20:32:58.3294
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jIpNrE+sdzPV0monBQcn9ench0MpCgB2ucrUtgD9Mbl1sXRd6/Za0d6uEY4PwpagIPFI+5Oqv7cT9zymziwfBFTBct68Ok4rZj5dU6b29rx91hYbqNhbGEhv93XAYab6
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR01MB4981
To:     unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add ACPI node probing device support. Each DSU ACPI node
defines a "cpus" package with a per cpu MPIDR element.

Signed-off-by: Tuan Phan <tuanphan@os.amperecomputing.com>
---
Changes in v2:
- Removed IRQF_SHARED.
- Fixed ACPI runtime detection.

The ACPI binding spec for DSU ACPI node is under beta and located
in ARM server group under project "ACPI on ARM".

 drivers/perf/arm_dsu_pmu.c | 71 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 8 deletions(-)

diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 70968c8..784d177 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -11,6 +11,7 @@
 #define DRVNAME		PMUNAME "_pmu"
 #define pr_fmt(fmt)	DRVNAME ": " fmt
 
+#include <linux/acpi.h>
 #include <linux/bitmap.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
@@ -603,18 +604,21 @@ static struct dsu_pmu *dsu_pmu_alloc(struct platform_device *pdev)
 }
 
 /**
- * dsu_pmu_dt_get_cpus: Get the list of CPUs in the cluster.
+ * dsu_pmu_dt_get_cpus: Get the list of CPUs in the cluster
+ * from device tree.
  */
-static int dsu_pmu_dt_get_cpus(struct device_node *dev, cpumask_t *mask)
+static int dsu_pmu_dt_get_cpus(struct platform_device *pdev)
 {
 	int i = 0, n, cpu;
 	struct device_node *cpu_node;
+	struct dsu_pmu *dsu_pmu =
+		(struct dsu_pmu *) platform_get_drvdata(pdev);
 
-	n = of_count_phandle_with_args(dev, "cpus", NULL);
+	n = of_count_phandle_with_args(pdev->dev.of_node, "cpus", NULL);
 	if (n <= 0)
 		return -ENODEV;
 	for (; i < n; i++) {
-		cpu_node = of_parse_phandle(dev, "cpus", i);
+		cpu_node = of_parse_phandle(pdev->dev.of_node, "cpus", i);
 		if (!cpu_node)
 			break;
 		cpu = of_cpu_node_to_id(cpu_node);
@@ -626,11 +630,54 @@ static int dsu_pmu_dt_get_cpus(struct device_node *dev, cpumask_t *mask)
 		 */
 		if (cpu < 0)
 			continue;
-		cpumask_set_cpu(cpu, mask);
+		cpumask_set_cpu(cpu, &dsu_pmu->associated_cpus);
 	}
 	return 0;
 }
 
+/**
+ * dsu_pmu_acpi_get_cpus: Get the list of CPUs in the cluster
+ * from ACPI.
+ */
+static int dsu_pmu_acpi_get_cpus(struct platform_device *pdev)
+{
+	int i, cpu, ret;
+	const union acpi_object *obj;
+	struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+	struct dsu_pmu *dsu_pmu =
+		(struct dsu_pmu *) platform_get_drvdata(pdev);
+
+	ret = acpi_dev_get_property(adev, "cpus", ACPI_TYPE_PACKAGE, &obj);
+	if (ret < 0)
+		return ret;
+
+	for (i = 0; i < obj->package.count; i++) {
+		/* Each element is the MPIDR of associated cpu */
+		for_each_possible_cpu(cpu) {
+			if (cpu_physical_id(cpu) ==
+				obj->package.elements[i].integer.value)
+				cpumask_set_cpu(cpu, &dsu_pmu->associated_cpus);
+		}
+	}
+	return 0;
+}
+
+static int dsu_pmu_platform_get_cpus(struct platform_device *pdev)
+{
+	int ret = -ENOENT;
+	struct fwnode_handle *fwnode = dev_fwnode(&pdev->dev);
+
+	if (IS_ERR_OR_NULL(fwnode))
+		return ret;
+
+	if (is_of_node(fwnode))
+		ret = dsu_pmu_dt_get_cpus(pdev);
+	else if (is_acpi_device_node(fwnode))
+		ret = dsu_pmu_acpi_get_cpus(pdev);
+
+	return ret;
+}
+
 /*
  * dsu_pmu_probe_pmu: Probe the PMU details on a CPU in the cluster.
  */
@@ -683,7 +730,9 @@ static int dsu_pmu_device_probe(struct platform_device *pdev)
 	if (IS_ERR(dsu_pmu))
 		return PTR_ERR(dsu_pmu);
 
-	rc = dsu_pmu_dt_get_cpus(pdev->dev.of_node, &dsu_pmu->associated_cpus);
+	platform_set_drvdata(pdev, dsu_pmu);
+
+	rc = dsu_pmu_platform_get_cpus(pdev);
 	if (rc) {
 		dev_warn(&pdev->dev, "Failed to parse the CPUs\n");
 		return rc;
@@ -707,7 +756,6 @@ static int dsu_pmu_device_probe(struct platform_device *pdev)
 	}
 
 	dsu_pmu->irq = irq;
-	platform_set_drvdata(pdev, dsu_pmu);
 	rc = cpuhp_state_add_instance(dsu_pmu_cpuhp_state,
 						&dsu_pmu->cpuhp_node);
 	if (rc)
@@ -754,11 +802,19 @@ static const struct of_device_id dsu_pmu_of_match[] = {
 	{ .compatible = "arm,dsu-pmu", },
 	{},
 };
+MODULE_DEVICE_TABLE(of, dsu_pmu_of_match);
+
+static const struct acpi_device_id dsu_pmu_acpi_match[] = {
+	{ "ARMHD500", 0},
+	{},
+};
+MODULE_DEVICE_TABLE(acpi, dsu_pmu_acpi_match);
 
 static struct platform_driver dsu_pmu_driver = {
 	.driver = {
 		.name	= DRVNAME,
 		.of_match_table = of_match_ptr(dsu_pmu_of_match),
+		.acpi_match_table = ACPI_PTR(dsu_pmu_acpi_match),
 	},
 	.probe = dsu_pmu_device_probe,
 	.remove = dsu_pmu_device_remove,
@@ -827,7 +883,6 @@ static void __exit dsu_pmu_exit(void)
 module_init(dsu_pmu_init);
 module_exit(dsu_pmu_exit);
 
-MODULE_DEVICE_TABLE(of, dsu_pmu_of_match);
 MODULE_DESCRIPTION("Perf driver for ARM DynamIQ Shared Unit");
 MODULE_AUTHOR("Suzuki K Poulose <suzuki.poulose@arm.com>");
 MODULE_LICENSE("GPL v2");
-- 
2.7.4