From: "Chalamarla, Tirumalesh" <Tirumalesh.Chalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> To: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>, "will.deacon-5wv7dgnIgG8@public.gmane.org" <will.deacon-5wv7dgnIgG8@public.gmane.org>, "joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org" <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> Cc: "iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" <iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>, "brian.starkey-5wv7dgnIgG8@public.gmane.org" <brian.starkey-5wv7dgnIgG8@public.gmane.org>, "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> Subject: Re: [PATCH 2/7] iommu/arm-smmu: Convert ThunderX workaround to new method Date: Wed, 13 Apr 2016 21:16:14 +0000 [thread overview] Message-ID: <6BD36166-69D0-498D-A021-870AD5698FE5@caviumnetworks.com> (raw) In-Reply-To: <98b8079ee3ede4427b045214a60ba77f1cb3552c.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> On 4/13/16, 10:12 AM, "Robin Murphy" <robin.murphy-5wv7dgnIgG8@public.gmane.org> wrote: >With a framework for implementation-specific funtionality in place, the >currently-FDT-dependent ThunderX workaround gets to be the first user. > >Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> >--- > drivers/iommu/arm-smmu.c | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > >diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c >index 2d5f357..d8bc20a 100644 >--- a/drivers/iommu/arm-smmu.c >+++ b/drivers/iommu/arm-smmu.c >@@ -280,6 +280,7 @@ enum arm_smmu_arch_version { > > enum arm_smmu_implementation { > GENERIC_SMMU, >+ CAVIUM_SMMUV2, > }; > > struct arm_smmu_smr { >@@ -1686,6 +1687,17 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) > } > dev_notice(smmu->dev, "\t%u context banks (%u stage-2 only)\n", > smmu->num_context_banks, smmu->num_s2_context_banks); >+ /* >+ * Cavium CN88xx erratum #27704. >+ * Ensure ASID and VMID allocation is unique across all SMMUs in >+ * the system. >+ */ >+ if (smmu->model == CAVIUM_SMMUV2) { >+ smmu->cavium_id_base = >+ atomic_add_return(smmu->num_context_banks, >+ &cavium_smmu_context_count); >+ smmu->cavium_id_base -= smmu->num_context_banks; >+ } > > /* ID2 */ > id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID2); >@@ -1750,6 +1762,7 @@ static struct arm_smmu_match_data name = { .version = ver, .model = imp } > > ARM_SMMU_MATCH_DATA(smmu_generic_v1, ARM_SMMU_V1, GENERIC_SMMU); > ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU); >+ARM_SMMU_MATCH_DATA(cavium_smmuv2, ARM_SMMU_V2, CAVIUM_SMMUV2); > > static const struct of_device_id arm_smmu_of_match[] = { > { .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 }, >@@ -1757,7 +1770,7 @@ static const struct of_device_id arm_smmu_of_match[] = { > { .compatible = "arm,mmu-400", .data = &smmu_generic_v1 }, > { .compatible = "arm,mmu-401", .data = &smmu_generic_v1 }, > { .compatible = "arm,mmu-500", .data = &smmu_generic_v2 }, >- { .compatible = "cavium,smmu-v2", .data = &smmu_generic_v2 }, >+ { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, > { }, > }; > MODULE_DEVICE_TABLE(of, arm_smmu_of_match); >@@ -1871,18 +1884,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) > } > } > >- /* >- * Cavium CN88xx erratum #27704. >- * Ensure ASID and VMID allocation is unique across all SMMUs in >- * the system. >- */ >- if (of_device_is_compatible(dev->of_node, "cavium,smmu-v2")) { >- smmu->cavium_id_base = >- atomic_add_return(smmu->num_context_banks, >- &cavium_smmu_context_count); >- smmu->cavium_id_base -= smmu->num_context_banks; >- } >- > INIT_LIST_HEAD(&smmu->list); > spin_lock(&arm_smmu_devices_lock); > list_add(&smmu->list, &arm_smmu_devices); >-- >2.7.3.dirty This looks fine too. Acked-by: Tirumalesh Chalamarla<tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> >
WARNING: multiple messages have this Message-ID (diff)
From: Tirumalesh.Chalamarla@caviumnetworks.com (Chalamarla, Tirumalesh) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] iommu/arm-smmu: Convert ThunderX workaround to new method Date: Wed, 13 Apr 2016 21:16:14 +0000 [thread overview] Message-ID: <6BD36166-69D0-498D-A021-870AD5698FE5@caviumnetworks.com> (raw) In-Reply-To: <98b8079ee3ede4427b045214a60ba77f1cb3552c.1460391217.git.robin.murphy@arm.com> On 4/13/16, 10:12 AM, "Robin Murphy" <robin.murphy@arm.com> wrote: >With a framework for implementation-specific funtionality in place, the >currently-FDT-dependent ThunderX workaround gets to be the first user. > >Signed-off-by: Robin Murphy <robin.murphy@arm.com> >--- > drivers/iommu/arm-smmu.c | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > >diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c >index 2d5f357..d8bc20a 100644 >--- a/drivers/iommu/arm-smmu.c >+++ b/drivers/iommu/arm-smmu.c >@@ -280,6 +280,7 @@ enum arm_smmu_arch_version { > > enum arm_smmu_implementation { > GENERIC_SMMU, >+ CAVIUM_SMMUV2, > }; > > struct arm_smmu_smr { >@@ -1686,6 +1687,17 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) > } > dev_notice(smmu->dev, "\t%u context banks (%u stage-2 only)\n", > smmu->num_context_banks, smmu->num_s2_context_banks); >+ /* >+ * Cavium CN88xx erratum #27704. >+ * Ensure ASID and VMID allocation is unique across all SMMUs in >+ * the system. >+ */ >+ if (smmu->model == CAVIUM_SMMUV2) { >+ smmu->cavium_id_base = >+ atomic_add_return(smmu->num_context_banks, >+ &cavium_smmu_context_count); >+ smmu->cavium_id_base -= smmu->num_context_banks; >+ } > > /* ID2 */ > id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID2); >@@ -1750,6 +1762,7 @@ static struct arm_smmu_match_data name = { .version = ver, .model = imp } > > ARM_SMMU_MATCH_DATA(smmu_generic_v1, ARM_SMMU_V1, GENERIC_SMMU); > ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU); >+ARM_SMMU_MATCH_DATA(cavium_smmuv2, ARM_SMMU_V2, CAVIUM_SMMUV2); > > static const struct of_device_id arm_smmu_of_match[] = { > { .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 }, >@@ -1757,7 +1770,7 @@ static const struct of_device_id arm_smmu_of_match[] = { > { .compatible = "arm,mmu-400", .data = &smmu_generic_v1 }, > { .compatible = "arm,mmu-401", .data = &smmu_generic_v1 }, > { .compatible = "arm,mmu-500", .data = &smmu_generic_v2 }, >- { .compatible = "cavium,smmu-v2", .data = &smmu_generic_v2 }, >+ { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, > { }, > }; > MODULE_DEVICE_TABLE(of, arm_smmu_of_match); >@@ -1871,18 +1884,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) > } > } > >- /* >- * Cavium CN88xx erratum #27704. >- * Ensure ASID and VMID allocation is unique across all SMMUs in >- * the system. >- */ >- if (of_device_is_compatible(dev->of_node, "cavium,smmu-v2")) { >- smmu->cavium_id_base = >- atomic_add_return(smmu->num_context_banks, >- &cavium_smmu_context_count); >- smmu->cavium_id_base -= smmu->num_context_banks; >- } >- > INIT_LIST_HEAD(&smmu->list); > spin_lock(&arm_smmu_devices_lock); > list_add(&smmu->list, &arm_smmu_devices); >-- >2.7.3.dirty This looks fine too. Acked-by: Tirumalesh Chalamarla<tchalamarla@caviumnetworks.com> >
next prev parent reply other threads:[~2016-04-13 21:16 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-13 17:12 [PATCH 0/7] arm-smmu: Implementation and context format differentiation Robin Murphy 2016-04-13 17:12 ` Robin Murphy [not found] ` <cover.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-13 17:12 ` [PATCH 1/7] iommu/arm-smmu: Differentiate specific implementations Robin Murphy 2016-04-13 17:12 ` Robin Murphy [not found] ` <cc1789284c5efa05514231fa3dede9d1d5f2df18.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-13 21:15 ` Chalamarla, Tirumalesh 2016-04-13 21:15 ` Chalamarla, Tirumalesh 2016-04-13 17:12 ` [PATCH 2/7] iommu/arm-smmu: Convert ThunderX workaround to new method Robin Murphy 2016-04-13 17:12 ` Robin Murphy [not found] ` <98b8079ee3ede4427b045214a60ba77f1cb3552c.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-13 21:16 ` Chalamarla, Tirumalesh [this message] 2016-04-13 21:16 ` Chalamarla, Tirumalesh 2016-04-13 17:12 ` [PATCH 3/7] iommu/arm-smmu: Work around MMU-500 prefetch errata Robin Murphy 2016-04-13 17:12 ` Robin Murphy [not found] ` <0484444b6257bfb6adb68405a72c64fc4fc98142.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-21 16:15 ` Will Deacon 2016-04-21 16:15 ` Will Deacon 2016-04-21 16:16 ` Will Deacon 2016-04-21 16:16 ` Will Deacon 2016-04-13 17:13 ` [PATCH 4/7] io-64-nonatomic: Add relaxed accessor variants Robin Murphy 2016-04-13 17:13 ` Robin Murphy [not found] ` <44173fd4e8efd27d670cadc6b30e215243a14099.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-21 16:18 ` Will Deacon 2016-04-21 16:18 ` Will Deacon [not found] ` <20160421161859.GK929-5wv7dgnIgG8@public.gmane.org> 2016-04-22 17:08 ` Robin Murphy 2016-04-22 17:08 ` Robin Murphy [not found] ` <571A5A9E.7040305-5wv7dgnIgG8@public.gmane.org> 2016-04-25 13:32 ` Will Deacon 2016-04-25 13:32 ` Will Deacon [not found] ` <20160425133242.GC30830-5wv7dgnIgG8@public.gmane.org> 2016-04-25 15:21 ` Arnd Bergmann 2016-04-25 15:21 ` Arnd Bergmann 2016-04-25 15:28 ` Robin Murphy 2016-04-25 15:28 ` Robin Murphy [not found] ` <571E3781.3070609-5wv7dgnIgG8@public.gmane.org> 2016-04-25 15:41 ` Arnd Bergmann 2016-04-25 15:41 ` Arnd Bergmann 2016-04-25 16:11 ` Will Deacon 2016-04-25 16:11 ` Will Deacon 2016-04-25 16:11 ` Arnd Bergmann 2016-04-25 16:11 ` Arnd Bergmann 2016-04-26 10:38 ` [PATCH v2] " Robin Murphy 2016-04-26 10:38 ` Robin Murphy 2016-04-13 17:13 ` [PATCH 5/7] iommu/arm-smmu: Tidy up 64-bit/atomic I/O accesses Robin Murphy 2016-04-13 17:13 ` Robin Murphy 2016-04-13 17:13 ` [PATCH 6/7] iommu/arm-smmu: Decouple context format from kernel config Robin Murphy 2016-04-13 17:13 ` Robin Murphy [not found] ` <173006777218859d1671ae517c70592c6c02f630.1460391217.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-04-21 16:30 ` Will Deacon 2016-04-21 16:30 ` Will Deacon [not found] ` <20160421163019.GL929-5wv7dgnIgG8@public.gmane.org> 2016-04-22 17:38 ` Robin Murphy 2016-04-22 17:38 ` Robin Murphy [not found] ` <571A617C.3020102-5wv7dgnIgG8@public.gmane.org> 2016-04-25 11:02 ` Will Deacon 2016-04-25 11:02 ` Will Deacon [not found] ` <20160425110219.GH16065-5wv7dgnIgG8@public.gmane.org> 2016-04-25 13:14 ` Robin Murphy 2016-04-25 13:14 ` Robin Murphy [not found] ` <571E1851.2030400-5wv7dgnIgG8@public.gmane.org> 2016-04-25 13:41 ` Will Deacon 2016-04-25 13:41 ` Will Deacon [not found] ` <20160425134108.GD30830-5wv7dgnIgG8@public.gmane.org> 2016-04-25 16:21 ` Robin Murphy 2016-04-25 16:21 ` Robin Murphy 2016-04-28 16:12 ` [PATCH v2] " Robin Murphy 2016-04-28 16:12 ` Robin Murphy 2016-04-13 17:13 ` [PATCH 7/7] iommu/arm-smmu: Support SMMUv1 64KB supplement Robin Murphy 2016-04-13 17:13 ` Robin Murphy
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=6BD36166-69D0-498D-A021-870AD5698FE5@caviumnetworks.com \ --to=tirumalesh.chalamarla-m3mlkvoiwjvv6pq1l3v1odbpr1lh4cv8@public.gmane.org \ --cc=brian.starkey-5wv7dgnIgG8@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.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: 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.