| Message ID | 74ada0e6c488a2310206a553eb108cc28fd52457.1572024120.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iommu/io-pgtable: Cleanup and prep for split tables | expand |
On 25/10/2019 19:08, Robin Murphy wrote: > TTBR1 values have so far been redundant since no users implement any > support for split address spaces. Crucially, though, one of the main > reasons for wanting to do so is to be able to manage each half entirely > independently, e.g. context-switching one set of mappings without > disturbing the other. Thus it seems unlikely that tying two tables > together in a single io_pgtable_cfg would ever be particularly desirable > or useful. > > Streamline the configs to just a single conceptual TTBR value > representing the allocated table. This paves the way for future users to > support split address spaces by simply allocating a table and dealing > with the detailed TTBRn logistics themselves. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/iommu/arm-smmu-v3.c | 2 +- > drivers/iommu/arm-smmu.c | 9 ++++----- > drivers/iommu/io-pgtable-arm-v7s.c | 16 +++++++--------- > drivers/iommu/io-pgtable-arm.c | 5 ++--- > drivers/iommu/ipmmu-vmsa.c | 2 +- > drivers/iommu/msm_iommu.c | 4 ++-- > drivers/iommu/mtk_iommu.c | 4 ++-- > drivers/iommu/qcom_iommu.c | 3 +-- > include/linux/io-pgtable.h | 4 ++-- > 9 files changed, 22 insertions(+), 27 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 3f20e548f1ec..da31e607698f 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -2170,7 +2170,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, > } > > cfg->cd.asid = (u16)asid; > - cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > + cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; > cfg->cd.tcr = pgtbl_cfg->arm_lpae_s1_cfg.tcr; > cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; > return 0; > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 2bc3e93b11e6..a249e4e49ead 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -534,13 +534,12 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, > /* TTBRs */ > if (stage1) { > if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) { > - cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr[0]; > - cb->ttbr[1] = pgtbl_cfg->arm_v7s_cfg.ttbr[1]; > + cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr; > + cb->ttbr[1] = 0; > } else { > - cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > + cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; > cb->ttbr[0] |= FIELD_PREP(TTBRn_ASID, cfg->asid); > - cb->ttbr[1] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1]; > - cb->ttbr[1] |= FIELD_PREP(TTBRn_ASID, cfg->asid); > + cb->ttbr[1] = FIELD_PREP(TTBRn_ASID, cfg->asid); > } > } else { > cb->ttbr[0] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > index 7c3bd2c3cdca..4d2c1e7f67c4 100644 > --- a/drivers/iommu/io-pgtable-arm-v7s.c > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, > /* Ensure the empty pgd is visible before any actual TTBR write */ > wmb(); > > - /* TTBRs */ > - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | > - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | > - (cfg->coherent_walk ? > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > - cfg->arm_v7s_cfg.ttbr[1] = 0; > + /* TTBR */ > + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | > + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | > + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); ARM_V7S_TTBR_NOS seems to have sneaked into the cfg->coherent_walk condition here - which you haven't mentioned in the commit log, so it doesn't look like it should be in this commit. Steve > return &data->iop; > > out_free_data: > diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c > index 1795df8f7a51..bc0841040ebe 100644 > --- a/drivers/iommu/io-pgtable-arm.c > +++ b/drivers/iommu/io-pgtable-arm.c > @@ -872,9 +872,8 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg, void *cookie) > /* Ensure the empty pgd is visible before any actual TTBR write */ > wmb(); > > - /* TTBRs */ > - cfg->arm_lpae_s1_cfg.ttbr[0] = virt_to_phys(data->pgd); > - cfg->arm_lpae_s1_cfg.ttbr[1] = 0; > + /* TTBR */ > + cfg->arm_lpae_s1_cfg.ttbr = virt_to_phys(data->pgd); > return &data->iop; > > out_free_data: > diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c > index e4da6efbda49..4fe0ff3216ce 100644 > --- a/drivers/iommu/ipmmu-vmsa.c > +++ b/drivers/iommu/ipmmu-vmsa.c > @@ -416,7 +416,7 @@ static void ipmmu_domain_setup_context(struct ipmmu_vmsa_domain *domain) > u32 tmp; > > /* TTBR0 */ > - ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr[0]; > + ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr; > ipmmu_ctx_write_root(domain, IMTTLBR0, ttbr); > ipmmu_ctx_write_root(domain, IMTTUBR0, ttbr >> 32); > > diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c > index be99d408cf35..9ceec140fa67 100644 > --- a/drivers/iommu/msm_iommu.c > +++ b/drivers/iommu/msm_iommu.c > @@ -279,8 +279,8 @@ static void __program_context(void __iomem *base, int ctx, > SET_V2PCFG(base, ctx, 0x3); > > SET_TTBCR(base, ctx, priv->cfg.arm_v7s_cfg.tcr); > - SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[0]); > - SET_TTBR1(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[1]); > + SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr); > + SET_TTBR1(base, ctx, 0); > > /* Set prrr and nmrr */ > SET_PRRR(base, ctx, priv->cfg.arm_v7s_cfg.prrr); > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 67a483c1a935..ef0b36eeb83d 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -392,7 +392,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, > /* Update the pgtable base address register of the M4U HW */ > if (!data->m4u_dom) { > data->m4u_dom = dom; > - writel(dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, > + writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, > data->base + REG_MMU_PT_BASE_ADDR); > } > > @@ -797,7 +797,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) > writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); > writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG); > if (m4u_dom) > - writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, > + writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, > base + REG_MMU_PT_BASE_ADDR); > return 0; > } > diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c > index 66e9b40e9275..9a57eb6c253c 100644 > --- a/drivers/iommu/qcom_iommu.c > +++ b/drivers/iommu/qcom_iommu.c > @@ -269,10 +269,9 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, > > /* TTBRs */ > iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, > - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[0] | > + pgtbl_cfg.arm_lpae_s1_cfg.ttbr | > FIELD_PREP(TTBRn_ASID, ctx->asid)); > iommu_writeq(ctx, ARM_SMMU_CB_TTBR1, > - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[1] | > FIELD_PREP(TTBRn_ASID, ctx->asid)); > > /* TCR */ > diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h > index ee21eedafe98..53bca5343f52 100644 > --- a/include/linux/io-pgtable.h > +++ b/include/linux/io-pgtable.h > @@ -100,7 +100,7 @@ struct io_pgtable_cfg { > /* Low-level data specific to the table format */ > union { > struct { > - u64 ttbr[2]; > + u64 ttbr; > u64 tcr; > u64 mair; > } arm_lpae_s1_cfg; > @@ -111,7 +111,7 @@ struct io_pgtable_cfg { > } arm_lpae_s2_cfg; > > struct { > - u32 ttbr[2]; > + u32 ttbr; > u32 tcr; > u32 nmrr; > u32 prrr; >
On 28/10/2019 15:09, Steven Price wrote: [...] >> --- a/drivers/iommu/io-pgtable-arm-v7s.c >> +++ b/drivers/iommu/io-pgtable-arm-v7s.c >> @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, >> /* Ensure the empty pgd is visible before any actual TTBR write */ >> wmb(); >> >> - /* TTBRs */ >> - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | >> - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | >> - (cfg->coherent_walk ? >> - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | >> - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : >> - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | >> - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); >> - cfg->arm_v7s_cfg.ttbr[1] = 0; >> + /* TTBR */ >> + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | >> + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | >> + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | >> + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : >> + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | >> + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > > ARM_V7S_TTBR_NOS seems to have sneaked into the cfg->coherent_walk > condition here - which you haven't mentioned in the commit log, so it > doesn't look like it should be in this commit. Ah, yes, it's taken a while to remember whether this was something important that got muddled up in rebasing, but it's actually just trivial cleanup. For !coherent_walk, the non-cacheable output attribute makes shareable accesses implicitly outer-shareable, so setting TTBR.NOS for that case actually does nothing except look misleading. Thus this is essentially just a cosmetic change included in the reformatting for clarity and consistency with the LPAE version. I'll call that out in the commit message, thanks for spotting! Robin.
On Mon, Oct 28, 2019 at 06:51:55PM +0000, Robin Murphy wrote: > On 28/10/2019 15:09, Steven Price wrote: > [...] > > > --- a/drivers/iommu/io-pgtable-arm-v7s.c > > > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > > > @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, > > > /* Ensure the empty pgd is visible before any actual TTBR write */ > > > wmb(); > > > - /* TTBRs */ > > > - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | > > > - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | > > > - (cfg->coherent_walk ? > > > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > > > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > > > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > > > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > > > - cfg->arm_v7s_cfg.ttbr[1] = 0; > > > + /* TTBR */ > > > + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | > > > + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | > > > + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > > > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > > > + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > > > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > > > > ARM_V7S_TTBR_NOS seems to have sneaked into the cfg->coherent_walk > > condition here - which you haven't mentioned in the commit log, so it > > doesn't look like it should be in this commit. > > Ah, yes, it's taken a while to remember whether this was something important > that got muddled up in rebasing, but it's actually just trivial cleanup. For > !coherent_walk, the non-cacheable output attribute makes shareable accesses > implicitly outer-shareable, so setting TTBR.NOS for that case actually does > nothing except look misleading. Thus this is essentially just a cosmetic > change included in the reformatting for clarity and consistency with the > LPAE version. I'll call that out in the commit message, thanks for spotting! I vaguely remember a case where you had to mark non-cacheable accesses as outer-shareable explicitly to avoid unpredictable behaviour. Hmm. /me looks at the Arm ARM Ok, it looks like this changed between ARMv7 and ARMv8. The ARMv7 ARM states: | A memory region with a resultant memory type attribute of Normal, and a | resultant cacheability attribute of Inner Non-cacheable, Outer | Non-cacheable, must have a resultant shareability attribute of Outer | Shareable, otherwise shareability is UNPREDICTABLE. Although this only seems to be the case for LPAE! The short descriptor docs are less clear, but I think it might be wise to ensure that non-cacheable mappings are always outer-shareable for consistency. Will
On 04/11/2019 18:36, Will Deacon wrote: > On Mon, Oct 28, 2019 at 06:51:55PM +0000, Robin Murphy wrote: >> On 28/10/2019 15:09, Steven Price wrote: >> [...] >>>> --- a/drivers/iommu/io-pgtable-arm-v7s.c >>>> +++ b/drivers/iommu/io-pgtable-arm-v7s.c >>>> @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, >>>> /* Ensure the empty pgd is visible before any actual TTBR write */ >>>> wmb(); >>>> - /* TTBRs */ >>>> - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | >>>> - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | >>>> - (cfg->coherent_walk ? >>>> - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | >>>> - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : >>>> - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | >>>> - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); >>>> - cfg->arm_v7s_cfg.ttbr[1] = 0; >>>> + /* TTBR */ >>>> + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | >>>> + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | >>>> + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | >>>> + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : >>>> + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | >>>> + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); >>> >>> ARM_V7S_TTBR_NOS seems to have sneaked into the cfg->coherent_walk >>> condition here - which you haven't mentioned in the commit log, so it >>> doesn't look like it should be in this commit. >> >> Ah, yes, it's taken a while to remember whether this was something important >> that got muddled up in rebasing, but it's actually just trivial cleanup. For >> !coherent_walk, the non-cacheable output attribute makes shareable accesses >> implicitly outer-shareable, so setting TTBR.NOS for that case actually does >> nothing except look misleading. Thus this is essentially just a cosmetic >> change included in the reformatting for clarity and consistency with the >> LPAE version. I'll call that out in the commit message, thanks for spotting! > > I vaguely remember a case where you had to mark non-cacheable accesses as > outer-shareable explicitly to avoid unpredictable behaviour. Hmm. > > /me looks at the Arm ARM > > Ok, it looks like this changed between ARMv7 and ARMv8. The ARMv7 ARM > states: > > | A memory region with a resultant memory type attribute of Normal, and a > | resultant cacheability attribute of Inner Non-cacheable, Outer > | Non-cacheable, must have a resultant shareability attribute of Outer > | Shareable, otherwise shareability is UNPREDICTABLE. > Although, SMMUv2 does go a bit further in saying: "In SMMUv2, the SMMU treats final attributes that are Normal Inner Non-cacheable or Normal Outer Non-cacheable as Outer Shareable. In SMMUv1, it is IMPLEMENTATION DEFINED how the SMMU treats such attributes." and SMMUv3 follows similar lines: "The SMMU does not output inconsistent attributes as a result of misconfiguration. Outer Shareable is used as the effective Shareability when Device or Normal Inner Non-cacheable Outer Non-cacheable types are configured." > Although this only seems to be the case for LPAE! The short descriptor docs are > less clear, but I think it might be wise to ensure that non-cacheable mappings > are always outer-shareable for consistency. Agreed, despite the above I think it does make sense to be explicit and not rely on subtleties. Between 9e6ea59f3ff3 and this patch we should have walks covered, so I can spin a followup to fix actual mappings as well. Robin.
On Fri, Oct 25, 2019 at 07:08:37PM +0100, Robin Murphy wrote: > TTBR1 values have so far been redundant since no users implement any > support for split address spaces. Crucially, though, one of the main > reasons for wanting to do so is to be able to manage each half entirely > independently, e.g. context-switching one set of mappings without > disturbing the other. Thus it seems unlikely that tying two tables > together in a single io_pgtable_cfg would ever be particularly desirable > or useful. > > Streamline the configs to just a single conceptual TTBR value > representing the allocated table. This paves the way for future users to > support split address spaces by simply allocating a table and dealing > with the detailed TTBRn logistics themselves. Tested-by: Jordan Crouse <jcrouse@codeaurora.org> > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/iommu/arm-smmu-v3.c | 2 +- > drivers/iommu/arm-smmu.c | 9 ++++----- > drivers/iommu/io-pgtable-arm-v7s.c | 16 +++++++--------- > drivers/iommu/io-pgtable-arm.c | 5 ++--- > drivers/iommu/ipmmu-vmsa.c | 2 +- > drivers/iommu/msm_iommu.c | 4 ++-- > drivers/iommu/mtk_iommu.c | 4 ++-- > drivers/iommu/qcom_iommu.c | 3 +-- > include/linux/io-pgtable.h | 4 ++-- > 9 files changed, 22 insertions(+), 27 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 3f20e548f1ec..da31e607698f 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -2170,7 +2170,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, > } > > cfg->cd.asid = (u16)asid; > - cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > + cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; > cfg->cd.tcr = pgtbl_cfg->arm_lpae_s1_cfg.tcr; > cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; > return 0; > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 2bc3e93b11e6..a249e4e49ead 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -534,13 +534,12 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, > /* TTBRs */ > if (stage1) { > if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) { > - cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr[0]; > - cb->ttbr[1] = pgtbl_cfg->arm_v7s_cfg.ttbr[1]; > + cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr; > + cb->ttbr[1] = 0; > } else { > - cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; > + cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; > cb->ttbr[0] |= FIELD_PREP(TTBRn_ASID, cfg->asid); > - cb->ttbr[1] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1]; > - cb->ttbr[1] |= FIELD_PREP(TTBRn_ASID, cfg->asid); > + cb->ttbr[1] = FIELD_PREP(TTBRn_ASID, cfg->asid); > } > } else { > cb->ttbr[0] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > index 7c3bd2c3cdca..4d2c1e7f67c4 100644 > --- a/drivers/iommu/io-pgtable-arm-v7s.c > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, > /* Ensure the empty pgd is visible before any actual TTBR write */ > wmb(); > > - /* TTBRs */ > - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | > - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | > - (cfg->coherent_walk ? > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > - cfg->arm_v7s_cfg.ttbr[1] = 0; > + /* TTBR */ > + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | > + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | > + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : > + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | > + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); > return &data->iop; > > out_free_data: > diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c > index 1795df8f7a51..bc0841040ebe 100644 > --- a/drivers/iommu/io-pgtable-arm.c > +++ b/drivers/iommu/io-pgtable-arm.c > @@ -872,9 +872,8 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg, void *cookie) > /* Ensure the empty pgd is visible before any actual TTBR write */ > wmb(); > > - /* TTBRs */ > - cfg->arm_lpae_s1_cfg.ttbr[0] = virt_to_phys(data->pgd); > - cfg->arm_lpae_s1_cfg.ttbr[1] = 0; > + /* TTBR */ > + cfg->arm_lpae_s1_cfg.ttbr = virt_to_phys(data->pgd); > return &data->iop; > > out_free_data: > diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c > index e4da6efbda49..4fe0ff3216ce 100644 > --- a/drivers/iommu/ipmmu-vmsa.c > +++ b/drivers/iommu/ipmmu-vmsa.c > @@ -416,7 +416,7 @@ static void ipmmu_domain_setup_context(struct ipmmu_vmsa_domain *domain) > u32 tmp; > > /* TTBR0 */ > - ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr[0]; > + ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr; > ipmmu_ctx_write_root(domain, IMTTLBR0, ttbr); > ipmmu_ctx_write_root(domain, IMTTUBR0, ttbr >> 32); > > diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c > index be99d408cf35..9ceec140fa67 100644 > --- a/drivers/iommu/msm_iommu.c > +++ b/drivers/iommu/msm_iommu.c > @@ -279,8 +279,8 @@ static void __program_context(void __iomem *base, int ctx, > SET_V2PCFG(base, ctx, 0x3); > > SET_TTBCR(base, ctx, priv->cfg.arm_v7s_cfg.tcr); > - SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[0]); > - SET_TTBR1(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[1]); > + SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr); > + SET_TTBR1(base, ctx, 0); > > /* Set prrr and nmrr */ > SET_PRRR(base, ctx, priv->cfg.arm_v7s_cfg.prrr); > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 67a483c1a935..ef0b36eeb83d 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -392,7 +392,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, > /* Update the pgtable base address register of the M4U HW */ > if (!data->m4u_dom) { > data->m4u_dom = dom; > - writel(dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, > + writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, > data->base + REG_MMU_PT_BASE_ADDR); > } > > @@ -797,7 +797,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) > writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); > writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG); > if (m4u_dom) > - writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, > + writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, > base + REG_MMU_PT_BASE_ADDR); > return 0; > } > diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c > index 66e9b40e9275..9a57eb6c253c 100644 > --- a/drivers/iommu/qcom_iommu.c > +++ b/drivers/iommu/qcom_iommu.c > @@ -269,10 +269,9 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, > > /* TTBRs */ > iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, > - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[0] | > + pgtbl_cfg.arm_lpae_s1_cfg.ttbr | > FIELD_PREP(TTBRn_ASID, ctx->asid)); > iommu_writeq(ctx, ARM_SMMU_CB_TTBR1, > - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[1] | > FIELD_PREP(TTBRn_ASID, ctx->asid)); > > /* TCR */ > diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h > index ee21eedafe98..53bca5343f52 100644 > --- a/include/linux/io-pgtable.h > +++ b/include/linux/io-pgtable.h > @@ -100,7 +100,7 @@ struct io_pgtable_cfg { > /* Low-level data specific to the table format */ > union { > struct { > - u64 ttbr[2]; > + u64 ttbr; > u64 tcr; > u64 mair; > } arm_lpae_s1_cfg; > @@ -111,7 +111,7 @@ struct io_pgtable_cfg { > } arm_lpae_s2_cfg; > > struct { > - u32 ttbr[2]; > + u32 ttbr; > u32 tcr; > u32 nmrr; > u32 prrr; > -- > 2.21.0.dirty >
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 3f20e548f1ec..da31e607698f 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2170,7 +2170,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, } cfg->cd.asid = (u16)asid; - cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; + cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; cfg->cd.tcr = pgtbl_cfg->arm_lpae_s1_cfg.tcr; cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; return 0; diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 2bc3e93b11e6..a249e4e49ead 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -534,13 +534,12 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, /* TTBRs */ if (stage1) { if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) { - cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr[0]; - cb->ttbr[1] = pgtbl_cfg->arm_v7s_cfg.ttbr[1]; + cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr; + cb->ttbr[1] = 0; } else { - cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0]; + cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; cb->ttbr[0] |= FIELD_PREP(TTBRn_ASID, cfg->asid); - cb->ttbr[1] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1]; - cb->ttbr[1] |= FIELD_PREP(TTBRn_ASID, cfg->asid); + cb->ttbr[1] = FIELD_PREP(TTBRn_ASID, cfg->asid); } } else { cb->ttbr[0] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 7c3bd2c3cdca..4d2c1e7f67c4 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -822,15 +822,13 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, /* Ensure the empty pgd is visible before any actual TTBR write */ wmb(); - /* TTBRs */ - cfg->arm_v7s_cfg.ttbr[0] = virt_to_phys(data->pgd) | - ARM_V7S_TTBR_S | ARM_V7S_TTBR_NOS | - (cfg->coherent_walk ? - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : - (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | - ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); - cfg->arm_v7s_cfg.ttbr[1] = 0; + /* TTBR */ + cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S | + (cfg->coherent_walk ? (ARM_V7S_TTBR_NOS | + ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) | + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) : + (ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) | + ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC))); return &data->iop; out_free_data: diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 1795df8f7a51..bc0841040ebe 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -872,9 +872,8 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg, void *cookie) /* Ensure the empty pgd is visible before any actual TTBR write */ wmb(); - /* TTBRs */ - cfg->arm_lpae_s1_cfg.ttbr[0] = virt_to_phys(data->pgd); - cfg->arm_lpae_s1_cfg.ttbr[1] = 0; + /* TTBR */ + cfg->arm_lpae_s1_cfg.ttbr = virt_to_phys(data->pgd); return &data->iop; out_free_data: diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index e4da6efbda49..4fe0ff3216ce 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -416,7 +416,7 @@ static void ipmmu_domain_setup_context(struct ipmmu_vmsa_domain *domain) u32 tmp; /* TTBR0 */ - ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr[0]; + ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr; ipmmu_ctx_write_root(domain, IMTTLBR0, ttbr); ipmmu_ctx_write_root(domain, IMTTUBR0, ttbr >> 32); diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index be99d408cf35..9ceec140fa67 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -279,8 +279,8 @@ static void __program_context(void __iomem *base, int ctx, SET_V2PCFG(base, ctx, 0x3); SET_TTBCR(base, ctx, priv->cfg.arm_v7s_cfg.tcr); - SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[0]); - SET_TTBR1(base, ctx, priv->cfg.arm_v7s_cfg.ttbr[1]); + SET_TTBR0(base, ctx, priv->cfg.arm_v7s_cfg.ttbr); + SET_TTBR1(base, ctx, 0); /* Set prrr and nmrr */ SET_PRRR(base, ctx, priv->cfg.arm_v7s_cfg.prrr); diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 67a483c1a935..ef0b36eeb83d 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -392,7 +392,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, /* Update the pgtable base address register of the M4U HW */ if (!data->m4u_dom) { data->m4u_dom = dom; - writel(dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, + writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, data->base + REG_MMU_PT_BASE_ADDR); } @@ -797,7 +797,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG); if (m4u_dom) - writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK, + writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR); return 0; } diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index 66e9b40e9275..9a57eb6c253c 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -269,10 +269,9 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, /* TTBRs */ iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[0] | + pgtbl_cfg.arm_lpae_s1_cfg.ttbr | FIELD_PREP(TTBRn_ASID, ctx->asid)); iommu_writeq(ctx, ARM_SMMU_CB_TTBR1, - pgtbl_cfg.arm_lpae_s1_cfg.ttbr[1] | FIELD_PREP(TTBRn_ASID, ctx->asid)); /* TCR */ diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index ee21eedafe98..53bca5343f52 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -100,7 +100,7 @@ struct io_pgtable_cfg { /* Low-level data specific to the table format */ union { struct { - u64 ttbr[2]; + u64 ttbr; u64 tcr; u64 mair; } arm_lpae_s1_cfg; @@ -111,7 +111,7 @@ struct io_pgtable_cfg { } arm_lpae_s2_cfg; struct { - u32 ttbr[2]; + u32 ttbr; u32 tcr; u32 nmrr; u32 prrr;
TTBR1 values have so far been redundant since no users implement any support for split address spaces. Crucially, though, one of the main reasons for wanting to do so is to be able to manage each half entirely independently, e.g. context-switching one set of mappings without disturbing the other. Thus it seems unlikely that tying two tables together in a single io_pgtable_cfg would ever be particularly desirable or useful. Streamline the configs to just a single conceptual TTBR value representing the allocated table. This paves the way for future users to support split address spaces by simply allocating a table and dealing with the detailed TTBRn logistics themselves. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/arm-smmu-v3.c | 2 +- drivers/iommu/arm-smmu.c | 9 ++++----- drivers/iommu/io-pgtable-arm-v7s.c | 16 +++++++--------- drivers/iommu/io-pgtable-arm.c | 5 ++--- drivers/iommu/ipmmu-vmsa.c | 2 +- drivers/iommu/msm_iommu.c | 4 ++-- drivers/iommu/mtk_iommu.c | 4 ++-- drivers/iommu/qcom_iommu.c | 3 +-- include/linux/io-pgtable.h | 4 ++-- 9 files changed, 22 insertions(+), 27 deletions(-)