From patchwork Sun Jun 19 11:11:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 12886623 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 58794CCA47A for ; Sun, 19 Jun 2022 11:12:57 +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=owj3HHEizXT11vQQc6uTOmwwAXTp8KAgzgHgK5clSKM=; b=xAiXmvd5syTIZo zc2vphETImpoEsSagbgmLQoRScvBQM4kcULpi8us34Gw4H+W6NbQQthcfzEBJ9y8panI0+gLo2svD guEpfsS0r6+JTXuu7u94YDPI8x2VZhunsM6BT5QseaxhftyVlDhc+SDIxkFEOTwZu1XP73yy4VDgM qKpgNpQIzn5Kx9GTieWcCbwtTrC0pwbQj1pQwjH3jXlD8D/qElpRbIRpPa/mYAU0cNNOS98p3akc/ JGxAy8S1aEuuDBGsUC/V2SYas7xwYJjJ1NaMFXzbpp3OrDDTVPLWad2TJll+1QoM7zcHdk8vmSH8o tWKIUBdOxu++NIRjW0Sw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2sqE-00DxeC-L7; Sun, 19 Jun 2022 11:11:42 +0000 Received: from forward501j.mail.yandex.net ([2a02:6b8:0:801:2::111]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2sq0-00Dxbo-B3; Sun, 19 Jun 2022 11:11:31 +0000 Received: from vla5-415927531403.qloud-c.yandex.net (vla5-415927531403.qloud-c.yandex.net [IPv6:2a02:6b8:c18:3522:0:640:4159:2753]) by forward501j.mail.yandex.net (Yandex) with ESMTP id 7CC47623458; Sun, 19 Jun 2022 14:11:23 +0300 (MSK) Received: from vla1-62318bfe5573.qloud-c.yandex.net (vla1-62318bfe5573.qloud-c.yandex.net [2a02:6b8:c0d:3819:0:640:6231:8bfe]) by vla5-415927531403.qloud-c.yandex.net (mxback/Yandex) with ESMTP id K896SngN5y-BMf8djv8; Sun, 19 Jun 2022 14:11:23 +0300 X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1655637083; bh=Jjeli4ZyFrXVeI42kTpuwxGd5nkH6f77Wv0sKvtGi84=; h=In-Reply-To:References:Date:Subject:Cc:To:From:Message-Id; b=JFIFiWzm+eghbjkmivE0AtW0zhySyhFwEP7RqYCfeCPnTpiRnrZUzgcJXKeiymxrt zOJuGq0GJO2GmzBZ8+mYEknP2B/RX60ssMHGDZnSy4gvEkY+dnc5sRUG1DVz4xCFLV 0FsP8kljDrcmrTDoSgAYjt+G7WBks0EseSafTgNE= Authentication-Results: vla5-415927531403.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by vla1-62318bfe5573.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id VrXAFig42r-BLNq9rsj; Sun, 19 Jun 2022 14:11:21 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin To: Atish Patra , Will Deacon , Sunil V L Cc: =?utf-8?b?Sm/Do28gTcOhcmlvIERvbWluZ29z?= , linux@yadro.com, Nikita Shubin , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Mark Rutland , Geert Uytterhoeven , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/1] RISC-V: Create unique identification for SoC PMU Date: Sun, 19 Jun 2022 14:11:11 +0300 Message-Id: <20220619111115.6354-2-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220619111115.6354-1-nikita.shubin@maquefel.me> References: <20220619111115.6354-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220619_041129_324380_8B7FA79F X-CRM114-Status: GOOD ( 16.40 ) 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: Nikita Shubin Provide RISC-V SBI PMU id to distinguish different cores or SoCs via "devices/platform/riscv-pmu/id" sysfs entry. The identification is generated as string of marchid, mimpid, mvendorid in hex format separated by coma - "0x70032,0x70032,0x0". The CSRs are detailed in the RISC-V privileged spec [1]. [1] https://github.com/riscv/riscv-isa-manual Inspired-by: João Mário Domingos Signed-off-by: Nikita Shubin --- v3->v4: - use string for pmuid - rename pmu_sbi_id_show to id_show - fix error print message in id_show - fix DEVICE_ATTR to use octal permissions --- arch/riscv/kernel/sbi.c | 3 +++ drivers/perf/riscv_pmu_sbi.c | 41 ++++++++++++++++++++++++++++++++++ include/linux/perf/riscv_pmu.h | 1 + 3 files changed, 45 insertions(+) diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index 775d3322b422..50dd9b6ecc9e 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -627,16 +627,19 @@ long sbi_get_mvendorid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MVENDORID); } +EXPORT_SYMBOL(sbi_get_mvendorid); long sbi_get_marchid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MARCHID); } +EXPORT_SYMBOL(sbi_get_marchid); long sbi_get_mimpid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MIMPID); } +EXPORT_SYMBOL(sbi_get_mimpid); static void sbi_send_cpumask_ipi(const struct cpumask *target) { diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index dca3537a8dcc..be812f855617 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -693,6 +693,28 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde return 0; } +static ssize_t id_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int len; + struct riscv_pmu *pmu = container_of(dev_get_drvdata(dev), struct riscv_pmu, pmu); + + len = sprintf(buf, "%s\n", pmu->pmuid); + if (len <= 0) + dev_err(dev, "invalid sprintf len: %d\n", len); + + return len; +} + +static DEVICE_ATTR(id, 0644, id_show, NULL); + +static struct attribute *pmu_sbi_attrs[] = { + &dev_attr_id.attr, + NULL +}; + +ATTRIBUTE_GROUPS(pmu_sbi); + static int pmu_sbi_device_probe(struct platform_device *pdev) { struct riscv_pmu *pmu = NULL; @@ -714,6 +736,14 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) if (pmu_sbi_get_ctrinfo(num_counters)) goto out_free; + /* fill pmuid */ + pmu->pmuid = kasprintf(GFP_KERNEL, "0x%lx,0x%lx,0x%lx", + sbi_get_marchid(), + sbi_get_mimpid(), + sbi_get_mvendorid()); + if (!pmu->pmuid) + goto out_free_pmuid; + ret = pmu_sbi_setup_irqs(pmu, pdev); if (ret < 0) { pr_info("Perf sampling/filtering is not supported as sscof extension is not available\n"); @@ -739,8 +769,19 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) return ret; } + ret = sysfs_create_group(&pdev->dev.kobj, &pmu_sbi_group); + if (ret) { + dev_err(&pdev->dev, "sysfs creation failed\n"); + return ret; + } + + pdev->dev.groups = pmu_sbi_groups; + dev_set_drvdata(&pdev->dev, pmu); + return 0; +out_free_pmuid: + kfree(pmu->pmuid); out_free: kfree(pmu); return ret; diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_pmu.h index 46f9b6fe306e..cf3557b77fb8 100644 --- a/include/linux/perf/riscv_pmu.h +++ b/include/linux/perf/riscv_pmu.h @@ -42,6 +42,7 @@ struct cpu_hw_events { struct riscv_pmu { struct pmu pmu; char *name; + char *pmuid; irqreturn_t (*handle_irq)(int irq_num, void *dev);