From: Robin Murphy <robin.murphy@arm.com>
To: Zhen Lei <thunder.leizhen@huawei.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Joerg Roedel <joro@8bytes.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
iommu <iommu@lists.linux-foundation.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>,
Neil Leeder <nleeder@codeaurora.org>,
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Subject: Re: [PATCH 1/2] perf/smmuv3: Don't reserve the register space that overlaps with the SMMUv3
Date: Tue, 19 Jan 2021 12:32:21 +0000 [thread overview]
Message-ID: <30665cd6-b438-1d1d-7445-9e45e240f79a@arm.com> (raw)
In-Reply-To: <20210119015951.1042-2-thunder.leizhen@huawei.com>
On 2021-01-19 01:59, Zhen Lei wrote:
> Some SMMUv3 implementation embed the Perf Monitor Group Registers (PMCG)
> inside the first 64kB region of the SMMU. Since SMMU and PMCG are managed
> by two separate drivers, and this driver depends on ARM_SMMU_V3, so the
> SMMU driver reserves the corresponding resource first, this driver should
> not reserve the corresponding resource again. Otherwise, a resource
> reservation conflict is reported during boot.
>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
> drivers/perf/arm_smmuv3_pmu.c | 42 ++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 40 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
> index 74474bb322c3f26..dcce085431c6ce8 100644
> --- a/drivers/perf/arm_smmuv3_pmu.c
> +++ b/drivers/perf/arm_smmuv3_pmu.c
> @@ -761,6 +761,44 @@ static void smmu_pmu_get_acpi_options(struct smmu_pmu *smmu_pmu)
> dev_notice(smmu_pmu->dev, "option mask 0x%x\n", smmu_pmu->options);
> }
>
> +static void __iomem *
> +smmu_pmu_get_and_ioremap_resource(struct platform_device *pdev,
> + unsigned int index,
> + struct resource **out_res)
> +{
> + int ret;
> + void __iomem *base;
> + struct resource *res;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, index);
> + if (!res) {
> + dev_err(&pdev->dev, "invalid resource\n");
> + return IOMEM_ERR_PTR(-EINVAL);
> + }
> + if (out_res)
> + *out_res = res;
> +
> + ret = region_intersects(res->start, resource_size(res),
> + IORESOURCE_MEM, IORES_DESC_NONE);
> + if (ret == REGION_INTERSECTS) {
> + /*
> + * The resource has already been reserved by the SMMUv3 driver.
> + * Don't reserve it again, just do devm_ioremap().
> + */
> + base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + } else {
> + /*
> + * The resource may have not been reserved by any driver, or
> + * has been reserved but not type IORESOURCE_MEM. In the latter
> + * case, devm_ioremap_resource() reports a conflict and returns
> + * IOMEM_ERR_PTR(-EBUSY).
> + */
> + base = devm_ioremap_resource(&pdev->dev, res);
> + }
What if the PMCG driver simply happens to probe first?
Robin.
> +
> + return base;
> +}
> +
> static int smmu_pmu_probe(struct platform_device *pdev)
> {
> struct smmu_pmu *smmu_pmu;
> @@ -793,7 +831,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
> .capabilities = PERF_PMU_CAP_NO_EXCLUDE,
> };
>
> - smmu_pmu->reg_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res_0);
> + smmu_pmu->reg_base = smmu_pmu_get_and_ioremap_resource(pdev, 0, &res_0);
> if (IS_ERR(smmu_pmu->reg_base))
> return PTR_ERR(smmu_pmu->reg_base);
>
> @@ -801,7 +839,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
>
> /* Determine if page 1 is present */
> if (cfgr & SMMU_PMCG_CFGR_RELOC_CTRS) {
> - smmu_pmu->reloc_base = devm_platform_ioremap_resource(pdev, 1);
> + smmu_pmu->reloc_base = smmu_pmu_get_and_ioremap_resource(pdev, 1, NULL);
> if (IS_ERR(smmu_pmu->reloc_base))
> return PTR_ERR(smmu_pmu->reloc_base);
> } else {
>
next prev parent reply other threads:[~2021-01-19 12:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 1:59 [PATCH 0/2] Use another method to avoid resource conflicts between the SMMU and PMCG drivers Zhen Lei
2021-01-19 1:59 ` [PATCH 1/2] perf/smmuv3: Don't reserve the register space that overlaps with the SMMUv3 Zhen Lei
2021-01-19 12:32 ` Robin Murphy [this message]
2021-01-20 3:37 ` Leizhen (ThunderTown)
2021-01-20 9:26 ` Leizhen (ThunderTown)
2021-01-20 13:27 ` Robin Murphy
2021-01-20 14:14 ` Leizhen (ThunderTown)
2021-01-20 15:54 ` Robin Murphy
2021-01-21 2:19 ` Leizhen (ThunderTown)
2021-01-19 1:59 ` [PATCH 2/2] Revert "iommu/arm-smmu-v3: Don't reserve implementation defined register space" Zhen Lei
2021-01-20 15:02 ` Robin Murphy
2021-01-21 2:04 ` Leizhen (ThunderTown)
2021-01-21 12:50 ` Robin Murphy
2021-01-22 2:50 ` Leizhen (ThunderTown)
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=30665cd6-b438-1d1d-7445-9e45e240f79a@arm.com \
--to=robin.murphy@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nleeder@codeaurora.org \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=thunder.leizhen@huawei.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®