From: Neil Leeder <nleeder@codeaurora.org> To: Will Deacon <will.deacon@arm.com>, Mark Rutland <mark.rutland@arm.com> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Langsdorf <mlangsdo@redhat.com>, Mark Salter <msalter@redhat.com>, Jon Masters <jcm@redhat.com>, Timur Tabi <timur@codeaurora.org>, Mark Brown <broonie@kernel.org>, nleeder@codeaurora.org Subject: [PATCH 1/2] acpi: arm64: add iort support for PMCG Date: Fri, 4 Aug 2017 15:59:13 -0400 [thread overview] Message-ID: <1501876754-1064-2-git-send-email-nleeder@codeaurora.org> (raw) In-Reply-To: <1501876754-1064-1-git-send-email-nleeder@codeaurora.org> Add support for the SMMU Performance Monitor Counter Group information from ACPI. This is in preparation for its use in the SMMU v3 PMU driver. Signed-off-by: Neil Leeder <nleeder@codeaurora.org> --- drivers/acpi/arm64/iort.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ include/acpi/actbl2.h | 9 +++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index a3215ee..5a998cd 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -970,6 +970,40 @@ static bool __init arm_smmu_is_coherent(struct acpi_iort_node *node) return smmu->flags & ACPI_IORT_SMMU_COHERENT_WALK; } +static int __init arm_smmu_pmu_count_resources(struct acpi_iort_node *node) +{ + struct acpi_iort_pmcg *pmcg; + + /* Retrieve PMCG specific data */ + pmcg = (struct acpi_iort_pmcg *)node->node_data; + + /* + * There are always 2 memory resources. + * If the overflow_gsiv is present then add that for a total of 3. + */ + return pmcg->overflow_gsiv > 0 ? 3 : 2; +} + +static void __init arm_smmu_pmu_init_resources(struct resource *res, + struct acpi_iort_node *node) +{ + struct acpi_iort_pmcg *pmcg; + + /* Retrieve PMCG specific data */ + pmcg = (struct acpi_iort_pmcg *)node->node_data; + + res[0].start = pmcg->base_address; + res[0].end = pmcg->base_address + SZ_4K - 1; + res[0].flags = IORESOURCE_MEM; + res[1].start = pmcg->base_address + SZ_64K; + res[1].end = pmcg->base_address + SZ_64K + SZ_4K - 1; + res[1].flags = IORESOURCE_MEM; + + if (pmcg->overflow_gsiv) + acpi_iort_register_irq(pmcg->overflow_gsiv, "overflow", + ACPI_EDGE_SENSITIVE, &res[2]); +} + struct iort_iommu_config { const char *name; int (*iommu_init)(struct acpi_iort_node *node); @@ -993,6 +1027,12 @@ struct iort_iommu_config { .iommu_init_resources = arm_smmu_init_resources }; +static const struct iort_iommu_config iort_arm_smmu_pmcg_cfg __initconst = { + .name = "arm-smmu-pmu", + .iommu_count_resources = arm_smmu_pmu_count_resources, + .iommu_init_resources = arm_smmu_pmu_init_resources +}; + static __init const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node) { @@ -1001,6 +1041,8 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node) return &iort_arm_smmu_v3_cfg; case ACPI_IORT_NODE_SMMU: return &iort_arm_smmu_cfg; + case ACPI_IORT_NODE_PMCG: + return &iort_arm_smmu_pmcg_cfg; default: return NULL; } @@ -1056,6 +1098,15 @@ static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node) if (ret) goto dev_put; + /* End of init for PMCG */ + if (node->type == ACPI_IORT_NODE_PMCG) { + ret = platform_device_add(pdev); + if (ret) + goto dev_put; + + return 0; + } + /* * We expect the dma masks to be equivalent for * all SMMUs set-ups @@ -1131,6 +1182,9 @@ static void __init iort_init_platform_devices(void) acpi_free_fwnode_static(fwnode); return; } + } else if (iort_node->type == ACPI_IORT_NODE_PMCG) { + if (iort_add_smmu_platform_device(iort_node)) + return; } iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node, diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 707dda74..2169b6f 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -695,7 +695,8 @@ enum acpi_iort_node_type { ACPI_IORT_NODE_NAMED_COMPONENT = 0x01, ACPI_IORT_NODE_PCI_ROOT_COMPLEX = 0x02, ACPI_IORT_NODE_SMMU = 0x03, - ACPI_IORT_NODE_SMMU_V3 = 0x04 + ACPI_IORT_NODE_SMMU_V3 = 0x04, + ACPI_IORT_NODE_PMCG = 0x05 }; struct acpi_iort_id_mapping { @@ -811,6 +812,12 @@ struct acpi_iort_smmu_v3 { #define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE (1) #define ACPI_IORT_SMMU_V3_HTTU_OVERRIDE (1<<1) +struct acpi_iort_pmcg { + u64 base_address; /* PMCG base address */ + u32 overflow_gsiv; + u32 node_reference; +}; + /******************************************************************************* * * IVRS - I/O Virtualization Reporting Structure -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
WARNING: multiple messages have this Message-ID (diff)
From: nleeder@codeaurora.org (Neil Leeder) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] acpi: arm64: add iort support for PMCG Date: Fri, 4 Aug 2017 15:59:13 -0400 [thread overview] Message-ID: <1501876754-1064-2-git-send-email-nleeder@codeaurora.org> (raw) In-Reply-To: <1501876754-1064-1-git-send-email-nleeder@codeaurora.org> Add support for the SMMU Performance Monitor Counter Group information from ACPI. This is in preparation for its use in the SMMU v3 PMU driver. Signed-off-by: Neil Leeder <nleeder@codeaurora.org> --- drivers/acpi/arm64/iort.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ include/acpi/actbl2.h | 9 +++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index a3215ee..5a998cd 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -970,6 +970,40 @@ static bool __init arm_smmu_is_coherent(struct acpi_iort_node *node) return smmu->flags & ACPI_IORT_SMMU_COHERENT_WALK; } +static int __init arm_smmu_pmu_count_resources(struct acpi_iort_node *node) +{ + struct acpi_iort_pmcg *pmcg; + + /* Retrieve PMCG specific data */ + pmcg = (struct acpi_iort_pmcg *)node->node_data; + + /* + * There are always 2 memory resources. + * If the overflow_gsiv is present then add that for a total of 3. + */ + return pmcg->overflow_gsiv > 0 ? 3 : 2; +} + +static void __init arm_smmu_pmu_init_resources(struct resource *res, + struct acpi_iort_node *node) +{ + struct acpi_iort_pmcg *pmcg; + + /* Retrieve PMCG specific data */ + pmcg = (struct acpi_iort_pmcg *)node->node_data; + + res[0].start = pmcg->base_address; + res[0].end = pmcg->base_address + SZ_4K - 1; + res[0].flags = IORESOURCE_MEM; + res[1].start = pmcg->base_address + SZ_64K; + res[1].end = pmcg->base_address + SZ_64K + SZ_4K - 1; + res[1].flags = IORESOURCE_MEM; + + if (pmcg->overflow_gsiv) + acpi_iort_register_irq(pmcg->overflow_gsiv, "overflow", + ACPI_EDGE_SENSITIVE, &res[2]); +} + struct iort_iommu_config { const char *name; int (*iommu_init)(struct acpi_iort_node *node); @@ -993,6 +1027,12 @@ struct iort_iommu_config { .iommu_init_resources = arm_smmu_init_resources }; +static const struct iort_iommu_config iort_arm_smmu_pmcg_cfg __initconst = { + .name = "arm-smmu-pmu", + .iommu_count_resources = arm_smmu_pmu_count_resources, + .iommu_init_resources = arm_smmu_pmu_init_resources +}; + static __init const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node) { @@ -1001,6 +1041,8 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node) return &iort_arm_smmu_v3_cfg; case ACPI_IORT_NODE_SMMU: return &iort_arm_smmu_cfg; + case ACPI_IORT_NODE_PMCG: + return &iort_arm_smmu_pmcg_cfg; default: return NULL; } @@ -1056,6 +1098,15 @@ static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node) if (ret) goto dev_put; + /* End of init for PMCG */ + if (node->type == ACPI_IORT_NODE_PMCG) { + ret = platform_device_add(pdev); + if (ret) + goto dev_put; + + return 0; + } + /* * We expect the dma masks to be equivalent for * all SMMUs set-ups @@ -1131,6 +1182,9 @@ static void __init iort_init_platform_devices(void) acpi_free_fwnode_static(fwnode); return; } + } else if (iort_node->type == ACPI_IORT_NODE_PMCG) { + if (iort_add_smmu_platform_device(iort_node)) + return; } iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node, diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 707dda74..2169b6f 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -695,7 +695,8 @@ enum acpi_iort_node_type { ACPI_IORT_NODE_NAMED_COMPONENT = 0x01, ACPI_IORT_NODE_PCI_ROOT_COMPLEX = 0x02, ACPI_IORT_NODE_SMMU = 0x03, - ACPI_IORT_NODE_SMMU_V3 = 0x04 + ACPI_IORT_NODE_SMMU_V3 = 0x04, + ACPI_IORT_NODE_PMCG = 0x05 }; struct acpi_iort_id_mapping { @@ -811,6 +812,12 @@ struct acpi_iort_smmu_v3 { #define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE (1) #define ACPI_IORT_SMMU_V3_HTTU_OVERRIDE (1<<1) +struct acpi_iort_pmcg { + u64 base_address; /* PMCG base address */ + u32 overflow_gsiv; + u32 node_reference; +}; + /******************************************************************************* * * IVRS - I/O Virtualization Reporting Structure -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2017-08-04 19:59 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-04 19:59 [PATCH 0/2] arm64 SMMUv3 PMU driver with IORT support Neil Leeder 2017-08-04 19:59 ` Neil Leeder 2017-08-04 19:59 ` Neil Leeder [this message] 2017-08-04 19:59 ` [PATCH 1/2] acpi: arm64: add iort support for PMCG Neil Leeder 2017-08-07 11:17 ` Robin Murphy 2017-08-07 11:17 ` Robin Murphy 2017-08-07 20:52 ` Leeder, Neil 2017-08-07 20:52 ` Leeder, Neil 2017-08-07 16:44 ` Lorenzo Pieralisi 2017-08-07 16:44 ` Lorenzo Pieralisi 2017-08-07 21:00 ` Leeder, Neil 2017-08-07 21:00 ` Leeder, Neil 2018-01-30 10:39 ` Shameerali Kolothum Thodi 2018-01-30 10:39 ` Shameerali Kolothum Thodi 2018-01-30 18:00 ` Lorenzo Pieralisi 2018-01-30 18:00 ` Lorenzo Pieralisi 2018-01-31 12:10 ` Shameerali Kolothum Thodi 2018-01-31 12:10 ` Shameerali Kolothum Thodi 2018-01-31 12:34 ` Lorenzo Pieralisi 2018-01-31 12:34 ` Lorenzo Pieralisi 2017-08-04 19:59 ` [PATCH 2/2] perf: add arm64 smmuv3 pmu driver Neil Leeder 2017-08-04 19:59 ` Neil Leeder 2017-08-07 14:31 ` Robin Murphy 2017-08-07 14:31 ` Robin Murphy 2017-08-07 21:18 ` Leeder, Neil 2017-08-07 21:18 ` Leeder, Neil 2017-12-05 5:01 ` Linu Cherian 2017-12-05 5:01 ` Linu Cherian 2018-03-29 7:03 ` Yisheng Xie 2018-03-29 7:03 ` Yisheng Xie [not found] ` <e55ab4404143ea0b3cc4795a93e37480@codeaurora.org> 2018-04-01 5:44 ` Neil Leeder 2018-04-01 5:44 ` Neil Leeder 2018-04-02 6:37 ` Yisheng Xie 2018-04-02 6:37 ` Yisheng Xie 2018-04-02 14:24 ` Hanjun Guo 2018-04-02 14:24 ` Hanjun Guo 2018-04-02 17:59 ` Neil Leeder 2018-04-02 17:59 ` Neil Leeder 2018-04-03 1:15 ` Hanjun Guo 2018-04-03 1:15 ` Hanjun Guo 2018-04-04 11:35 ` Lorenzo Pieralisi 2018-04-04 11:35 ` Lorenzo Pieralisi 2018-05-02 14:20 ` Agustin Vega-Frias 2018-05-02 14:20 ` Agustin Vega-Frias 2018-05-03 9:22 ` Shameerali Kolothum Thodi 2018-05-03 9:22 ` Shameerali Kolothum Thodi 2018-04-18 11:05 ` Shameerali Kolothum Thodi 2018-04-18 11:05 ` Shameerali Kolothum Thodi 2018-04-19 1:17 ` Yisheng Xie 2018-04-19 1:17 ` Yisheng Xie 2017-08-09 7:56 ` [PATCH 0/2] arm64 SMMUv3 PMU driver with IORT support Hanjun Guo 2017-08-09 7:56 ` Hanjun Guo 2017-08-09 15:48 ` Leeder, Neil 2017-08-09 15:48 ` Leeder, Neil 2017-08-10 1:26 ` Hanjun Guo 2017-08-10 1:26 ` Hanjun Guo 2017-08-11 3:28 ` Leeder, Neil 2017-08-11 3:28 ` Leeder, Neil 2017-10-12 10:58 ` Hanjun Guo 2017-10-12 10:58 ` Hanjun Guo 2017-10-12 11:05 ` Lorenzo Pieralisi 2017-10-12 11:05 ` Lorenzo Pieralisi 2017-10-12 11:11 ` Hanjun Guo 2017-10-12 11:11 ` Hanjun Guo 2017-10-31 23:33 ` Yury Norov 2017-10-31 23:33 ` Yury Norov 2017-11-02 20:38 ` Leeder, Neil 2017-11-02 20:38 ` Leeder, Neil 2017-12-10 2:35 ` Linu Cherian 2017-12-10 2:35 ` Linu Cherian 2017-12-18 14:48 ` Robin Murphy 2017-12-18 14:48 ` Robin Murphy 2017-12-18 15:39 ` Marc Zyngier 2017-12-18 15:39 ` Marc Zyngier 2017-12-19 6:55 ` Linu Cherian 2017-12-19 6:55 ` Linu Cherian 2017-12-19 12:11 ` Marc Zyngier 2017-12-19 12:11 ` Marc Zyngier 2017-12-19 6:36 ` Linu Cherian 2017-12-19 6:36 ` Linu Cherian
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1501876754-1064-2-git-send-email-nleeder@codeaurora.org \ --to=nleeder@codeaurora.org \ --cc=broonie@kernel.org \ --cc=jcm@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mlangsdo@redhat.com \ --cc=msalter@redhat.com \ --cc=timur@codeaurora.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.