Arm SMMU refactoring
Subsystems (2)
Robin Murphy
reviewercover Arm SMMU refactoring
Hi all,
This is a big refactoring of arm-smmu in order to help cope with the various divergent implementation details currently flying around. So far we've been accruing various quirks and errata workarounds within the main flow of the driver, but given that it's written to an architecture rather than any particular hardware implementation, after a point these start to become increasingly invasive and potentially conflict with each other.
These patches clean up the existing quirks handled by the driver to lay a foundation on which we can continue to add more in a maintainable fashion. The idea is that major vendor customisations can then be kept in arm-smmu-<vendor>.c implementation files out of each others' way.
A branch is available at:
git://linux-arm.org/linux-rm iommu/smmu-impl
which I'll probably keep tweaking until I'm happy with the names of things; I just didn't want to delay this initial posting any lomnger.
Robin.
Robin Murphy (15):
iommu/arm-smmu: Convert GR0 registers to bitfields iommu/arm-smmu: Convert GR1 registers to bitfields iommu/arm-smmu: Convert context bank registers to bitfields iommu/arm-smmu: Rework cb_base handling iommu/arm-smmu: Split arm_smmu_tlb_inv_range_nosync() iommu/arm-smmu: Get rid of weird "atomic" write iommu/arm-smmu: Abstract GR1 accesses iommu/arm-smmu: Abstract context bank accesses iommu/arm-smmu: Abstract GR0 accesses iommu/arm-smmu: Rename arm-smmu-regs.h iommu/arm-smmu: Add implementation infrastructure iommu/arm-smmu: Move Secure access quirk to implementation iommu/arm-smmu: Add configuration implementation hook iommu/arm-smmu: Add reset implementation hook iommu/arm-smmu: Add context init implementation hook
MAINTAINERS | 3 +- drivers/iommu/Makefile | 2 +- drivers/iommu/arm-smmu-impl.c | 165 ++++++++++ drivers/iommu/arm-smmu-regs.h | 210 ------------- drivers/iommu/arm-smmu.c | 570 +++++++++++----------------------- drivers/iommu/arm-smmu.h | 386 +++++++++++++++++++++++ drivers/iommu/qcom_iommu.c | 15 +- 7 files changed, 743 insertions(+), 608 deletions(-) create mode 100644 drivers/iommu/arm-smmu-impl.c delete mode 100644 drivers/iommu/arm-smmu-regs.h create mode 100644 drivers/iommu/arm-smmu.h
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 1/15 iommu/arm-smmu: Convert GR0 registers to bitfields
FIELD_PREP remains a terrible name, but the overall simplification will make further work on this stuff that much more manageable. This also serves as an audit of the header, wherein we can impose a consistent grouping and ordering of the offset and field definitions
--- drivers/iommu/arm-smmu-regs.h | 126 ++++++++++++++++------------------ drivers/iommu/arm-smmu.c | 51 +++++++------- 2 files changed, 84 insertions(+), 93 deletions(-)
drivers/iommu/arm-smmu-regs.h +58 -68
@@ -10,111 +10,101 @@#ifndef _ARM_SMMU_REGS_H#define _ARM_SMMU_REGS_H +#include <linux/bits.h> +/* Configuration registers */ #define ARM_SMMU_GR0_sCR0 0x0 -#define sCR0_CLIENTPD (1 << 0) -#define sCR0_GFRE (1 << 1) -#define sCR0_GFIE (1 << 2) -#define sCR0_EXIDENABLE (1 << 3) -#define sCR0_GCFGFRE (1 << 4) -#define sCR0_GCFGFIE (1 << 5) -#define sCR0_USFCFG (1 << 10) -#define sCR0_VMIDPNE (1 << 11) -#define sCR0_PTM (1 << 12) -#define sCR0_FB (1 << 13) -#define sCR0_VMID16EN (1 << 31) -#define sCR0_BSU_SHIFT 14 -#define sCR0_BSU_MASK 0x3 +#define sCR0_VMID16EN BIT(31) +#define sCR0_BSU GENMASK(15, 14) +#define sCR0_FB BIT(13) +#define sCR0_PTM BIT(12) +#define sCR0_VMIDPNE BIT(11) +#define sCR0_USFCFG BIT(10) +#define sCR0_GCFGFIE BIT(5) +#define sCR0_GCFGFRE BIT(4) +#define sCR0_EXIDENABLE BIT(3) +#define sCR0_GFIE BIT(2) +#define sCR0_GFRE BIT(1) +#define sCR0_CLIENTPD BIT(0)/* Auxiliary Configuration register */ #define ARM_SMMU_GR0_sACR 0x10/* Identification registers */ #define ARM_SMMU_GR0_ID0 0x20 +#define ID0_S1TS BIT(30) +#define ID0_S2TS BIT(29) +#define ID0_NTS BIT(28) +#define ID0_SMS BIT(27) +#define ID0_ATOSNS BIT(26) +#define ID0_PTFS_NO_AARCH32 BIT(25) +#define ID0_PTFS_NO_AARCH32S BIT(24) +#define ID0_CTTW BIT(14) +#define ID0_NUMIRPT GENMASK(23, 16) +#define ID0_NUMSIDB GENMASK(12, 9) +#define ID0_EXIDS BIT(8) +#define ID0_NUMSMRG GENMASK(7, 0) +#define ARM_SMMU_GR0_ID1 0x24 +#define ID1_PAGESIZE BIT(31) +#define ID1_NUMPAGENDXB GENMASK(30, 28) +#define ID1_NUMS2CB GENMASK(23, 16) +#define ID1_NUMCB GENMASK(7, 0) +#define ARM_SMMU_GR0_ID2 0x28 +#define ID2_VMID16 BIT(15) +#define ID2_PTFS_64K BIT(14) +#define ID2_PTFS_16K BIT(13) +#define ID2_PTFS_4K BIT(12) +#define ID2_UBS GENMASK(11, 8) +#define ID2_OAS GENMASK(7, 4) +#define ID2_IAS GENMASK(3, 0) +#define ARM_SMMU_GR0_ID3 0x2c#define ARM_SMMU_GR0_ID4 0x30#define ARM_SMMU_GR0_ID5 0x34#define ARM_SMMU_GR0_ID6 0x38 +#define ARM_SMMU_GR0_ID7 0x3c +#define ID7_MAJOR GENMASK(7, 4) +#define ID7_MINOR GENMASK(3, 0) +#define ARM_SMMU_GR0_sGFSR 0x48#define ARM_SMMU_GR0_sGFSYNR0 0x50#define ARM_SMMU_GR0_sGFSYNR1 0x54#define ARM_SMMU_GR0_sGFSYNR2 0x58 -#define ID0_S1TS (1 << 30) -#define ID0_S2TS (1 << 29) -#define ID0_NTS (1 << 28) -#define ID0_SMS (1 << 27) -#define ID0_ATOSNS (1 << 26) -#define ID0_PTFS_NO_AARCH32 (1 << 25) -#define ID0_PTFS_NO_AARCH32S (1 << 24) -#define ID0_CTTW (1 << 14) -#define ID0_NUMIRPT_SHIFT 16 -#define ID0_NUMIRPT_MASK 0xff -#define ID0_NUMSIDB_SHIFT 9 -#define ID0_NUMSIDB_MASK 0xf -#define ID0_EXIDS (1 << 8) -#define ID0_NUMSMRG_SHIFT 0 -#define ID0_NUMSMRG_MASK 0xff - -#define ID1_PAGESIZE (1 << 31) -#define ID1_NUMPAGENDXB_SHIFT 28 -#define ID1_NUMPAGENDXB_MASK 7 -#define ID1_NUMS2CB_SHIFT 16 -#define ID1_NUMS2CB_MASK 0xff -#define ID1_NUMCB_SHIFT 0 -#define ID1_NUMCB_MASK 0xff - -#define ID2_OAS_SHIFT 4 -#define ID2_OAS_MASK 0xf -#define ID2_IAS_SHIFT 0 -#define ID2_IAS_MASK 0xf -#define ID2_UBS_SHIFT 8 -#define ID2_UBS_MASK 0xf -#define ID2_PTFS_4K (1 << 12) -#define ID2_PTFS_16K (1 << 13) -#define ID2_PTFS_64K (1 << 14) -#define ID2_VMID16 (1 << 15) - -#define ID7_MAJOR_SHIFT 4 -#define ID7_MAJOR_MASK 0xf -/* Global TLB invalidation */ #define ARM_SMMU_GR0_TLBIVMID 0x64#define ARM_SMMU_GR0_TLBIALLNSNH 0x68#define ARM_SMMU_GR0_TLBIALLH 0x6c#define ARM_SMMU_GR0_sTLBGSYNC 0x70 +#define ARM_SMMU_GR0_sTLBGSTATUS 0x74 -#define sTLBGSTATUS_GSACTIVE (1 << 0) +#define sTLBGSTATUS_GSACTIVE BIT(0)/* Stream mapping registers */ #define ARM_SMMU_GR0_SMR (n) (0x800 + ((n) << 2)) -#define SMR_VALID (1 << 31) -#define SMR_MASK_SHIFT 16 -#define SMR_ID_SHIFT 0 +#define SMR_VALID BIT(31) +#define SMR_MASK GENMASK(31, 16) +#define SMR_ID GENMASK(15, 0)#define ARM_SMMU_GR0_S2CR (n) (0xc00 + ((n) << 2)) -#define S2CR_CBNDX_SHIFT 0 -#define S2CR_CBNDX_MASK 0xff -#define S2CR_EXIDVALID (1 << 10) -#define S2CR_TYPE_SHIFT 16 -#define S2CR_TYPE_MASK 0x3 -enum arm_smmu_s2cr_type { -S2CR_TYPE_TRANS , -S2CR_TYPE_BYPASS , -S2CR_TYPE_FAULT , -}; - -#define S2CR_PRIVCFG_SHIFT 24 -#define S2CR_PRIVCFG_MASK 0x3 +#define S2CR_PRIVCFG GENMASK(25, 24)enum arm_smmu_s2cr_privcfg {S2CR_PRIVCFG_DEFAULT ,S2CR_PRIVCFG_DIPAN ,S2CR_PRIVCFG_UNPRIV ,S2CR_PRIVCFG_PRIV , }; +#define S2CR_TYPE GENMASK(17, 16) +enum arm_smmu_s2cr_type { +S2CR_TYPE_TRANS , +S2CR_TYPE_BYPASS , +S2CR_TYPE_FAULT , +}; +#define S2CR_EXIDVALID BIT(10) +#define S2CR_CBNDX GENMASK(7, 0)/* Context bank attribute registers */ #define ARM_SMMU_GR1_CBAR (n) (0x0 + ((n) << 2))
drivers/iommu/arm-smmu.c +26 -25
150 lines not on this page · raw message
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH 01/15] iommu/arm-smmu: Convert GR0 registers to bitfields
Quoted 53 lines · Robin Murphy
FIELD_PREPremains a terrible name, but the overall simplification will make further work on this stuff that much more manageable. This also serves as an audit of the header, wherein we can impose a consistent grouping and ordering of the offset and field definitionsSigned-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu-regs.h | 126 ++++++++++++++++------------------ drivers/iommu/arm-smmu.c | 51 +++++++------- 2 files changed, 84 insertions(+), 93 deletions(-)drivers/iommu/arm-smmu-regs.h +14
-13@@ -10,111 +10,101 @@#ifndef _ARM_SMMU_REGS_H#define _ARM_SMMU_REGS_H +#include <linux/bits.h> +/* Configuration registers */ #define ARM_SMMU_GR0_sCR0 0x0 -#define sCR0_CLIENTPD (1 << 0) -#define sCR0_GFRE (1 << 1) -#define sCR0_GFIE (1 << 2) -#define sCR0_EXIDENABLE (1 << 3) -#define sCR0_GCFGFRE (1 << 4) -#define sCR0_GCFGFIE (1 << 5) -#define sCR0_USFCFG (1 << 10) -#define sCR0_VMIDPNE (1 << 11) -#define sCR0_PTM (1 << 12) -#define sCR0_FB (1 << 13) -#define sCR0_VMID16EN (1 << 31) -#define sCR0_BSU_SHIFT 14 -#define sCR0_BSU_MASK 0x3 +#define sCR0_VMID16EN BIT(31) +#define sCR0_BSU GENMASK(15, 14) +#define sCR0_FB BIT(13) +#define sCR0_PTM BIT(12) +#define sCR0_VMIDPNE BIT(11) +#define sCR0_USFCFG BIT(10) +#define sCR0_GCFGFIE BIT(5) +#define sCR0_GCFGFRE BIT(4) +#define sCR0_EXIDENABLE BIT(3) +#define sCR0_GFIE BIT(2) +#define sCR0_GFRE BIT(1) +#define sCR0_CLIENTPD BIT(0)/* Auxiliary Configuration register */ #define ARM_SMMU_GR0_sACR 0x10/* Identification registers */
drivers/iommu/arm-smmu-regs.h line 43
Quoted 10 lines
drivers/iommu/arm-smmu-regs.h +9
-0#define ARM_SMMU_GR0_ID0 0x20 +#define ID0_S1TS BIT(30) +#define ID0_S2TS BIT(29) +#define ID0_NTS BIT(28) +#define ID0_SMS BIT(27) +#define ID0_ATOSNS BIT(26) +#define ID0_PTFS_NO_AARCH32 BIT(25) +#define ID0_PTFS_NO_AARCH32S BIT(24) +#define ID0_CTTW BIT(14) +#define ID0_NUMIRPT GENMASK(23, 16)
nit: assuming this should be above ID0_CTTW so things are in descending bit order?
Other than that, looks good to me.
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH 01/15] iommu/arm-smmu: Convert GR0 registers to bitfields
Quoted 53 lines · Will Deacon
Quoted 52 lines · Robin Murphy
FIELD_PREPremains a terrible name, but the overall simplification will make further work on this stuff that much more manageable. This also serves as an audit of the header, wherein we can impose a consistent grouping and ordering of the offset and field definitionsSigned-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu-regs.h | 126 ++++++++++++++++------------------ drivers/iommu/arm-smmu.c | 51 +++++++------- 2 files changed, 84 insertions(+), 93 deletions(-)drivers/iommu/arm-smmu-regs.h +14
-13@@ -10,111 +10,101 @@#ifndef _ARM_SMMU_REGS_H#define _ARM_SMMU_REGS_H +#include <linux/bits.h> +/* Configuration registers */ #define ARM_SMMU_GR0_sCR0 0x0 -#define sCR0_CLIENTPD (1 << 0) -#define sCR0_GFRE (1 << 1) -#define sCR0_GFIE (1 << 2) -#define sCR0_EXIDENABLE (1 << 3) -#define sCR0_GCFGFRE (1 << 4) -#define sCR0_GCFGFIE (1 << 5) -#define sCR0_USFCFG (1 << 10) -#define sCR0_VMIDPNE (1 << 11) -#define sCR0_PTM (1 << 12) -#define sCR0_FB (1 << 13) -#define sCR0_VMID16EN (1 << 31) -#define sCR0_BSU_SHIFT 14 -#define sCR0_BSU_MASK 0x3 +#define sCR0_VMID16EN BIT(31) +#define sCR0_BSU GENMASK(15, 14) +#define sCR0_FB BIT(13) +#define sCR0_PTM BIT(12) +#define sCR0_VMIDPNE BIT(11) +#define sCR0_USFCFG BIT(10) +#define sCR0_GCFGFIE BIT(5) +#define sCR0_GCFGFRE BIT(4) +#define sCR0_EXIDENABLE BIT(3) +#define sCR0_GFIE BIT(2) +#define sCR0_GFRE BIT(1) +#define sCR0_CLIENTPD BIT(0)/* Auxiliary Configuration register */ #define ARM_SMMU_GR0_sACR 0x10
Quoted 14 lines
drivers/iommu/arm-smmu-regs.h line 43
Quoted 11 lines
drivers/iommu/arm-smmu-regs.h +9
-0/* Identification registers */ #define ARM_SMMU_GR0_ID0 0x20 +#define ID0_S1TS BIT(30) +#define ID0_S2TS BIT(29) +#define ID0_NTS BIT(28) +#define ID0_SMS BIT(27) +#define ID0_ATOSNS BIT(26) +#define ID0_PTFS_NO_AARCH32 BIT(25) +#define ID0_PTFS_NO_AARCH32S BIT(24) +#define ID0_CTTW BIT(14) +#define ID0_NUMIRPT GENMASK(23, 16)nit: assuming this should be above
ID0_CTTWso things are in descending bit order?
Bah, indeed it should. Fixed now.
Quoted 1 line
Other than that, looks good to me.
Thanks!
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 2/15 iommu/arm-smmu: Convert GR1 registers to bitfields
In reply to Robin MurphyAs for GR0, use the bitfield helpers to make GR1 usage a little cleaner, and use it as an opportunity to audit and tidy the definitions. This tweaks the handling of CBAR types to match what we did for S2CR a while back, and fixes a couple of names which didn't quite match the latest architecture spec (IHI0062D.c).
--- drivers/iommu/arm-smmu-regs.h | 33 ++++++++++++++------------------- drivers/iommu/arm-smmu.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 28 deletions(-)
drivers/iommu/arm-smmu-regs.h +14 -19
@@ -108,30 +108,25 @@ enum arm_smmu_s2cr_type {/* Context bank attribute registers */ #define ARM_SMMU_GR1_CBAR (n) (0x0 + ((n) << 2)) -#define CBAR_VMID_SHIFT 0 -#define CBAR_VMID_MASK 0xff -#define CBAR_S1_BPSHCFG_SHIFT 8 -#define CBAR_S1_BPSHCFG_MASK 3 -#define CBAR_S1_BPSHCFG_NSH 3 -#define CBAR_S1_MEMATTR_SHIFT 12 -#define CBAR_S1_MEMATTR_MASK 0xf +#define CBAR_IRPTNDX GENMASK(31, 24) +#define CBAR_TYPE GENMASK(17, 16) +enum arm_smmu_cbar_type { +CBAR_TYPE_S2_TRANS , +CBAR_TYPE_S1_TRANS_S2_BYPASS , +CBAR_TYPE_S1_TRANS_S2_FAULT , +CBAR_TYPE_S1_TRANS_S2_TRANS , +}; +#define CBAR_S1_MEMATTR GENMASK(15, 12)#define CBAR_S1_MEMATTR_WB 0xf -#define CBAR_TYPE_SHIFT 16 -#define CBAR_TYPE_MASK 0x3 -#define CBAR_TYPE_S2_TRANS (0 << CBAR_TYPE_SHIFT) -#define CBAR_TYPE_S1_TRANS_S2_BYPASS (1 << CBAR_TYPE_SHIFT) -#define CBAR_TYPE_S1_TRANS_S2_FAULT (2 << CBAR_TYPE_SHIFT) -#define CBAR_TYPE_S1_TRANS_S2_TRANS (3 << CBAR_TYPE_SHIFT) -#define CBAR_IRPTNDX_SHIFT 24 -#define CBAR_IRPTNDX_MASK 0xff +#define CBAR_S1_BPSHCFG GENMASK(9, 8) +#define CBAR_S1_BPSHCFG_NSH 3 +#define CBAR_VMID GENMASK(7, 0)#define ARM_SMMU_GR1_CBFRSYNRA (n) (0x400 + ((n) << 2))#define ARM_SMMU_GR1_CBA2R (n) (0x800 + ((n) << 2)) -#define CBA2R_RW64_32BIT (0 << 0) -#define CBA2R_RW64_64BIT (1 << 0) -#define CBA2R_VMID_SHIFT 16 -#define CBA2R_VMID_MASK 0xffff +#define CBA2R_VMID16 GENMASK(31, 16) +#define CBA2R_VA64 BIT(0)#define ARM_SMMU_CB_SCTLR 0x0#define ARM_SMMU_CB_ACTLR 0x4
drivers/iommu/arm-smmu.c +9 -9
@@ -237,7 +237,7 @@ struct arm_smmu_cfg {u16 asid;u16 vmid; }; -u32 cbar; +enum arm_smmu_cbar_type cbar;enum arm_smmu_context_fmt fmt; };#define INVALID_IRPTNDX 0xff
@@ -692,31 +692,31 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)/* CBA2R */ if (smmu->version >ARM_SMMU_V1 ) {if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) - reg =CBA2R_RW64_64BIT ; + reg =CBA2R_VA64 ;else - reg =CBA2R_RW64_32BIT ; + reg =0 ;/* 16-bit VMIDs live in CBA2R */ if (smmu->features &ARM_SMMU_FEAT_VMID16 ) - reg |= cfg->vmid <<CBA2R_VMID_SHIFT ; + reg |=FIELD_PREP (CBA2R_VMID16 , cfg->vmid);writel_relaxed (reg, gr1_base +ARM_SMMU_GR1_CBA2R (idx)); }/* CBAR */ - reg = cfg->cbar; + reg =FIELD_PREP (CBAR_TYPE , cfg->cbar);if (smmu->version <ARM_SMMU_V2 ) - reg |= cfg->irptndx <<CBAR_IRPTNDX_SHIFT ; + reg |=FIELD_PREP (CBAR_IRPTNDX , cfg->irptndx);/* * Use the weakest shareability/memory types, so they are * overridden by the ttbcr/pte. */ if (stage1) { - reg |= (CBAR_S1_BPSHCFG_NSH <<CBAR_S1_BPSHCFG_SHIFT ) | - (CBAR_S1_MEMATTR_WB <<CBAR_S1_MEMATTR_SHIFT ); + reg |=FIELD_PREP (CBAR_S1_BPSHCFG ,CBAR_S1_BPSHCFG_NSH ) | +FIELD_PREP (CBAR_S1_MEMATTR ,CBAR_S1_MEMATTR_WB ); }else if (!(smmu->features &ARM_SMMU_FEAT_VMID16 )) {/* 8-bit VMIDs live in CBAR */ - reg |= cfg->vmid <<CBAR_VMID_SHIFT ; + reg |=FIELD_PREP (CBAR_VMID , cfg->vmid); }writel_relaxed (reg, gr1_base +ARM_SMMU_GR1_CBAR (idx));
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 3/15 iommu/arm-smmu: Convert context bank registers to bitfields
In reply to Robin MurphyFinish the final part of the job, once again updating some names to match the current spec.
--- drivers/iommu/arm-smmu-regs.h | 86 ++++++++++++++++++----------------- drivers/iommu/arm-smmu.c | 16 +++---- drivers/iommu/qcom_iommu.c | 13 +++--- 3 files changed, 59 insertions(+), 56 deletions(-)
drivers/iommu/arm-smmu-regs.h +44 -42
@@ -129,19 +129,59 @@ enum arm_smmu_cbar_type {#define CBA2R_VA64 BIT(0)#define ARM_SMMU_CB_SCTLR 0x0 +#define SCTLR_S1_ASIDPNE BIT(12) +#define SCTLR_CFCFG BIT(7) +#define SCTLR_CFIE BIT(6) +#define SCTLR_CFRE BIT(5) +#define SCTLR_E BIT(4) +#define SCTLR_AFE BIT(2) +#define SCTLR_TRE BIT(1) +#define SCTLR_M BIT(0) +#define ARM_SMMU_CB_ACTLR 0x4 +#define ARM_SMMU_CB_RESUME 0x8 -#define ARM_SMMU_CB_TTBCR2 0x10 +#define RESUME_TERMINATE BIT(0) + +#define ARM_SMMU_CB_TCR2 0x10 +#define TCR2_SEP GENMASK(17, 15) +#define TCR2_SEP_UPSTREAM 0x7 +#define TCR2_AS BIT(4) +#define ARM_SMMU_CB_TTBR0 0x20#define ARM_SMMU_CB_TTBR1 0x28 -#define ARM_SMMU_CB_TTBCR 0x30 +#define TTBRn_ASID GENMASK_ULL(63, 48) + +#define ARM_SMMU_CB_TCR 0x30#define ARM_SMMU_CB_CONTEXTIDR 0x34#define ARM_SMMU_CB_S1_MAIR0 0x38#define ARM_SMMU_CB_S1_MAIR1 0x3c +#define ARM_SMMU_CB_PAR 0x50 +#define CB_PAR_F BIT(0) +#define ARM_SMMU_CB_FSR 0x58 +#define FSR_MULTI BIT(31) +#define FSR_SS BIT(30) +#define FSR_UUT BIT(8) +#define FSR_ASF BIT(7) +#define FSR_TLBLKF BIT(6) +#define FSR_TLBMCF BIT(5) +#define FSR_EF BIT(4) +#define FSR_PF BIT(3) +#define FSR_AFF BIT(2) +#define FSR_TF BIT(1) + +#define FSR_IGN (FSR_AFF | FSR_ASF | \ + FSR_TLBMCF | FSR_TLBLKF) +#define FSR_FAULT (FSR_MULTI | FSR_SS | FSR_UUT | \ + FSR_EF | FSR_PF | FSR_TF | FSR_IGN) +#define ARM_SMMU_CB_FAR 0x60 +#define ARM_SMMU_CB_FSYNR0 0x68 +#define FSYNR0_WNR BIT(4) +#define ARM_SMMU_CB_S1_TLBIVA 0x600#define ARM_SMMU_CB_S1_TLBIASID 0x610#define ARM_SMMU_CB_S1_TLBIVAL 0x620
@@ -150,46 +190,8 @@ enum arm_smmu_cbar_type {#define ARM_SMMU_CB_TLBSYNC 0x7f0#define ARM_SMMU_CB_TLBSTATUS 0x7f4#define ARM_SMMU_CB_ATS1PR 0x800 +#define ARM_SMMU_CB_ATSR 0x8f0 - -#define SCTLR_S1_ASIDPNE (1 << 12) -#define SCTLR_CFCFG (1 << 7) -#define SCTLR_CFIE (1 << 6) -#define SCTLR_CFRE (1 << 5) -#define SCTLR_E (1 << 4) -#define SCTLR_AFE (1 << 2) -#define SCTLR_TRE (1 << 1) -#define SCTLR_M (1 << 0) - -#define CB_PAR_F (1 << 0) - -#define ATSR_ACTIVE (1 << 0) - -#define RESUME_RETRY (0 << 0) -#define RESUME_TERMINATE (1 << 0) - -#define TTBCR2_SEP_SHIFT 15 -#define TTBCR2_SEP_UPSTREAM (0x7 << TTBCR2_SEP_SHIFT) -#define TTBCR2_AS (1 << 4) - -#define TTBRn_ASID_SHIFT 48 - -#define FSR_MULTI (1 << 31) -#define FSR_SS (1 << 30) -#define FSR_UUT (1 << 8) -#define FSR_ASF (1 << 7) -#define FSR_TLBLKF (1 << 6) -#define FSR_TLBMCF (1 << 5) -#define FSR_EF (1 << 4) -#define FSR_PF (1 << 3) -#define FSR_AFF (1 << 2) -#define FSR_TF (1 << 1) - -#define FSR_IGN (FSR_AFF | FSR_ASF | \ - FSR_TLBMCF | FSR_TLBLKF) -#define FSR_FAULT (FSR_MULTI | FSR_SS | FSR_UUT | \ - FSR_EF | FSR_PF | FSR_TF | FSR_IGN) - -#define FSYNR0_WNR (1 << 4) +#define ATSR_ACTIVE BIT(0)#endif /* _ARM_SMMU_REGS_H */
drivers/iommu/arm-smmu.c +8 -8
@@ -628,16 +628,16 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, cb->cfg = cfg; -/* TTBCR */ +/* TCR */ if (stage1) {if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH32_S ) { cb->tcr[0 ] = pgtbl_cfg->arm_v7s_cfg.tcr; }else { cb->tcr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.tcr; cb->tcr[1 ] = pgtbl_cfg->arm_lpae_s1_cfg.tcr >>32 ; - cb->tcr[1 ] |=TTBCR2_SEP_UPSTREAM ; + cb->tcr[1 ] |=FIELD_PREP (TCR2_SEP ,TCR2_SEP_UPSTREAM );if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) - cb->tcr[1 ] |=TTBCR2_AS ; + cb->tcr[1 ] |=TCR2_AS ; } }else { cb->tcr[0 ] = pgtbl_cfg->arm_lpae_s2_cfg.vtcr;
@@ -650,9 +650,9 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, cb->ttbr[1 ] = pgtbl_cfg->arm_v7s_cfg.ttbr[1 ]; }else { cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0 ]; - cb->ttbr[0 ] |= (u64 )cfg->asid << TTBRn_ASID_SHIFT; + cb->ttbr[0 ] |=FIELD_PREP (TTBRn_ASID, cfg->asid); cb->ttbr[1 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1 ]; - cb->ttbr[1 ] |= (u64 )cfg->asid << TTBRn_ASID_SHIFT; + cb->ttbr[1 ] |=FIELD_PREP (TTBRn_ASID, cfg->asid); } }else { cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr;
@@ -721,13 +721,13 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)writel_relaxed (reg, gr1_base +ARM_SMMU_GR1_CBAR (idx));/* -* TTBCR +* TCR * We must write this before the TTBRs, since it determines the * access behaviour of some fields (in particular, ASID[15:8]). */ if (stage1 && smmu->version >ARM_SMMU_V1 ) -writel_relaxed (cb->tcr[1 ], cb_base +ARM_SMMU_CB_TTBCR2 ); -writel_relaxed (cb->tcr[0 ], cb_base +ARM_SMMU_CB_TTBCR ); +writel_relaxed (cb->tcr[1 ], cb_base +ARM_SMMU_CB_TCR2 ); +writel_relaxed (cb->tcr[0 ], cb_base +ARM_SMMU_CB_TCR );/* TTBRs */ if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH32_S ) {
drivers/iommu/qcom_iommu.c +7 -6
@@ -7,6 +7,7 @@*/ #include <linux/atomic.h> +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> #include <linux/dma-iommu.h>
@@ -247,16 +248,16 @@ 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 ] | - ((u64 )ctx->asid << TTBRn_ASID_SHIFT)); +FIELD_PREP (TTBRn_ASID, ctx->asid));iommu_writeq (ctx,ARM_SMMU_CB_TTBR1 , pgtbl_cfg.arm_lpae_s1_cfg.ttbr[1 ] | - ((u64 )ctx->asid << TTBRn_ASID_SHIFT)); +FIELD_PREP (TTBRn_ASID, ctx->asid)); -/* TTBCR */ -iommu_writel (ctx,ARM_SMMU_CB_TTBCR2 , +/* TCR */ +iommu_writel (ctx,ARM_SMMU_CB_TCR2 , (pgtbl_cfg.arm_lpae_s1_cfg.tcr >>32 ) | -TTBCR2_SEP_UPSTREAM ); -iommu_writel (ctx,ARM_SMMU_CB_TTBCR , +FIELD_PREP (TCR2_SEP ,TCR2_SEP_UPSTREAM )); +iommu_writel (ctx,ARM_SMMU_CB_TCR , pgtbl_cfg.arm_lpae_s1_cfg.tcr);/* MAIRs (stage-1 only) */
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 4/15 iommu/arm-smmu: Rework cb_base handling
In reply to Robin MurphyTo keep register-access quirks manageable, we want to structure things to avoid needing too many individual overrides. It seems fairly clean to have a single interface which handles both global and context registers in terms of the architectural pages, so the first preparatory step is to rework cb_base into a page number rather than an absolute address.
--- drivers/iommu/arm-smmu.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/iommu/arm-smmu.c +12 -10
@@ -95,7 +95,7 @@#endif /* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->cb_base + ((n) << (smmu)->pgshift)) +#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift))#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000
@@ -168,8 +168,8 @@ struct arm_smmu_device {struct device *dev;void __iomem *base; -void __iomem *cb_base; -unsigned long pgshift; +unsigned int cb_base; +unsigned int pgshift;#define ARM_SMMU_FEAT_COHERENT_WALK (1 << 0)#define ARM_SMMU_FEAT_STREAM_MATCH (1 << 1)
@@ -1815,7 +1815,7 @@ static int arm_smmu_id_size_to_bits(int size)static int arm_smmu_device_cfg_probe (struct arm_smmu_device *smmu) { -unsigned long size; +unsigned int size;void __iomem *gr0_base =ARM_SMMU_GR0 (smmu);u32 id;bool cttw_reg, cttw_fw = smmu->features &ARM_SMMU_FEAT_COHERENT_WALK ;
@@ -1899,7 +1899,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)return -ENOMEM ;dev_notice (smmu->dev, -"\tstream matching with %lu register groups" , size); +"\tstream matching with %u register groups" , size); }/* s2cr->type == 0 means translation, so initialise explicitly */ smmu->s2crs = devm_kmalloc_array(smmu->dev, size, sizeof(*smmu->s2crs),
@@ -1925,11 +1925,12 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)/* Check for size mismatch of SMMU address space from mapped region */ size =1 << (FIELD_GET (ID1_NUMPAGENDXB , id) +1 ); - size <<= smmu->pgshift; -if (smmu->cb_base != gr0_base + size) +if (smmu->cb_base !=2 * size << smmu->pgshift)dev_warn (smmu->dev, -"SMMU address space size (0x%lx) differs from mapped region size (0x%tx)!\n" , - size *2 , (smmu->cb_base - gr0_base) *2 ); +"SMMU address space size (0x%x) differs from mapped region size (0x%x)!\n" , +2 * size << smmu->pgshift, smmu->cb_base); +/* Now cb_base can reach its final form: a page number */ + smmu->cb_base = size; smmu->num_s2_context_banks =FIELD_GET (ID1_NUMS2CB , id); smmu->num_context_banks =FIELD_GET (ID1_NUMCB , id);
@@ -2200,7 +2201,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) smmu->base =devm_ioremap_resource (dev, res);if (IS_ERR (smmu->base))return PTR_ERR (smmu->base); - smmu->cb_base = smmu->base +resource_size (res) /2 ; +/* We'll finish calculating this later once we know the page size */ + smmu->cb_base =resource_size (res); num_irqs =0 ;while ((res =platform_get_resource (pdev,IORESOURCE_IRQ , num_irqs))) {
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH 04/15] iommu/arm-smmu: Rework cb_base handling
Quoted 25 lines · Robin Murphy
To keep register-access quirks manageable, we want to structure things to avoid needing too many individual overrides. It seems fairly clean to have a single interface which handles both global and context registers in terms of the architectural pages, so the first preparatory step is to rework
cb_baseinto a page number rather than an absolute address.Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)drivers/iommu/arm-smmu.c +1
-1@@ -95,7 +95,7 @@#endif /* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->cb_base + ((n) << (smmu)->pgshift)) +#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift))#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000
drivers/iommu/arm-smmu.c struct arm_smmu_device { · line 171
Quoted 6 lines
drivers/iommu/arm-smmu.c +1
-2@@ -168,8 +168,8 @@ struct arm_smmu_device {struct device *dev;void __iomem *base; -void __iomem *cb_base; -unsigned long pgshift; +unsigned int cb_base;
I think this is now a misnomer. Would you be able to rename it cb_pfn or something, please?
Otherwise, this seems fine.
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH 04/15] iommu/arm-smmu: Rework cb_base handling
Quoted 28 lines · Will Deacon
Quoted 27 lines · Robin Murphy
To keep register-access quirks manageable, we want to structure things to avoid needing too many individual overrides. It seems fairly clean to have a single interface which handles both global and context registers in terms of the architectural pages, so the first preparatory step is to rework
cb_baseinto a page number rather than an absolute address.Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)drivers/iommu/arm-smmu.c +1
-1@@ -95,7 +95,7 @@#endif /* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->cb_base + ((n) << (smmu)->pgshift)) +#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift))#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000@@ -168,8 +168,8 @@ struct arm_smmu_device {struct device *dev;
Quoted 7 lines
drivers/iommu/arm-smmu.c struct arm_smmu_device { · line 171
Quoted 4 lines
drivers/iommu/arm-smmu.c +1
-2void __iomem *base; -void __iomem *cb_base; -unsigned long pgshift; +unsigned int cb_base;I think this is now a misnomer. Would you be able to rename it
cb_pfnor something, please?
Good point; in the architectural terms (section 8.1 of the spec), SMMU_CB_BASE is strictly a byte offset from SMMU_BASE, and the quantity we now have here is actually NUMPAGE. I've renamed it as such and tweaked the comments to be a bit more useful too.
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 5/15 iommu/arm-smmu: Split arm_smmu_tlb_inv_range_nosync()
In reply to Robin MurphySince we now use separate iommu_gather_ops for stage 1 and stage 2 contexts, we may as well divide up the monolithic callback into its respective stage 1 and stage 2 parts.
--- drivers/iommu/arm-smmu.c | 66 ++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-)
drivers/iommu/arm-smmu.c +37 -29
@@ -490,46 +490,54 @@ static void arm_smmu_tlb_inv_context_s2(void *cookie)arm_smmu_tlb_sync_global (smmu); } -static void arm_smmu_tlb_inv_range_nosync (unsigned long iova,size_t size, -size_t granule,bool leaf,void *cookie) +static void arm_smmu_tlb_inv_range_s1 (unsigned long iova,size_t size, +size_t granule,bool leaf,void *cookie) {struct arm_smmu_domain *smmu_domain = cookie; +struct arm_smmu_device *smmu = smmu_domain->smmu;struct arm_smmu_cfg *cfg = &smmu_domain->cfg; -bool stage1 = cfg->cbar !=CBAR_TYPE_S2_TRANS ; -void __iomem *reg =ARM_SMMU_CB (smmu_domain->smmu, cfg->cbndx); +void __iomem *reg =ARM_SMMU_CB (smmu, cfg->cbndx); -if (smmu_domain->smmu->features &ARM_SMMU_FEAT_COHERENT_WALK ) +if (smmu->features &ARM_SMMU_FEAT_COHERENT_WALK )wmb (); -if (stage1) { - reg += leaf ?ARM_SMMU_CB_S1_TLBIVAL :ARM_SMMU_CB_S1_TLBIVA ; + reg += leaf ?ARM_SMMU_CB_S1_TLBIVAL :ARM_SMMU_CB_S1_TLBIVA ; -if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { - iova &= ~12UL ; - iova |= cfg->asid; -do { -writel_relaxed (iova, reg); - iova += granule; - }while (size -= granule); - }else { - iova >>=12 ; - iova |= (u64 )cfg->asid <<48 ; -do { -writeq_relaxed (iova, reg); - iova += granule >>12 ; - }while (size -= granule); - } - }else { - reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L : -ARM_SMMU_CB_S2_TLBIIPAS2 ; - iova >>=12 ; +if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { + iova &= ~12UL ; + iova |= cfg->asid;do { -smmu_write_atomic_lq (iova, reg); +writel_relaxed (iova, reg); + iova += granule; + }while (size -= granule); + }else { + iova >>=12 ; + iova |= (u64 )cfg->asid <<48 ; +do { +writeq_relaxed (iova, reg); iova += granule >>12 ; }while (size -= granule); } } +static void arm_smmu_tlb_inv_range_s2 (unsigned long iova,size_t size, +size_t granule,bool leaf,void *cookie) +{ +struct arm_smmu_domain *smmu_domain = cookie; +struct arm_smmu_device *smmu = smmu_domain->smmu; +void __iomem *reg =ARM_SMMU_CB (smmu, smmu_domain->cfg.cbndx); + +if (smmu->features &ARM_SMMU_FEAT_COHERENT_WALK ) +wmb (); + + reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L :ARM_SMMU_CB_S2_TLBIIPAS2 ; + iova >>=12 ; +do { +smmu_write_atomic_lq (iova, reg); + iova += granule >>12 ; + }while (size -= granule); +} +/* * On MMU-401 at least, the cost of firing off multiple TLBIVMIDs appears * almost negligible, but the benefit of getting the first one in as far ahead
@@ -550,13 +558,13 @@ static void arm_smmu_tlb_inv_vmid_nosync(unsigned long iova, size_t size,static const struct iommu_gather_ops arm_smmu_s1_tlb_ops = { .tlb_flush_all = arm_smmu_tlb_inv_context_s1, - .tlb_add_flush = arm_smmu_tlb_inv_range_nosync, + .tlb_add_flush = arm_smmu_tlb_inv_range_s1, .tlb_sync = arm_smmu_tlb_sync_context, };static const struct iommu_gather_ops arm_smmu_s2_tlb_ops_v2 = { .tlb_flush_all = arm_smmu_tlb_inv_context_s2, - .tlb_add_flush = arm_smmu_tlb_inv_range_nosync, + .tlb_add_flush = arm_smmu_tlb_inv_range_s2, .tlb_sync = arm_smmu_tlb_sync_context, };
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH 05/15] iommu/arm-smmu: Split arm_smmu_tlb_inv_range_nosync()
Quoted 8 lines · Robin Murphy
Since we now use separate
iommu_gather_opsfor stage 1 and stage 2 contexts, we may as well divide up the monolithic callback into its respective stage 1 and stage 2 parts.Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 66 ++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-)
This will conflict with my iommu API batching stuff, but I can sort that out if/when it gets queued by Joerg.
Quoted 11 lines
drivers/iommu/arm-smmu.c +0
-11-if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { - iova &= ~12UL ; - iova |= cfg->asid; -do { -writel_relaxed (iova, reg); - iova += granule; - }while (size -= granule); - }else { - iova >>=12 ; - iova |= (u64 )cfg->asid <<48 ; - do {
drivers/iommu/arm-smmu.c static void arm_smmu_tlb_inv_context_s2(void *cookie) · line 507
Quoted 10 lines
drivers/iommu/arm-smmu.c +2
-8-writeq_relaxed (iova, reg); - iova += granule >>12 ; - }while (size -= granule); - } - }else { - reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L : -ARM_SMMU_CB_S2_TLBIIPAS2 ; - iova >>=12 ; +if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { + iova &= ~12UL ;
Oh baby. You should move code around more often, so I'm forced to take a second look!
Can you cook a fix for this that we can route separately, please? I see it also made its way into qcom_iommu.c...
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH 05/15] iommu/arm-smmu: Split arm_smmu_tlb_inv_range_nosync()
Quoted 29 lines · Will Deacon
Quoted 8 lines · Robin Murphy
Since we now use separate
iommu_gather_opsfor stage 1 and stage 2 contexts, we may as well divide up the monolithic callback into its respective stage 1 and stage 2 parts.Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 66 ++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-)This will conflict with my iommu API batching stuff, but I can sort that out if/when it gets queued by Joerg.
Quoted 16 lines
drivers/iommu/arm-smmu.c +0
-16-if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { - iova &= ~12UL ; - iova |= cfg->asid; -do { -writel_relaxed (iova, reg); - iova += granule; - }while (size -= granule); - }else { - iova >>=12 ; - iova |= (u64 )cfg->asid <<48 ; -do { -writeq_relaxed (iova, reg); - iova += granule >>12 ; - }while (size -= granule); - } - }else {
Quoted 8 lines
drivers/iommu/arm-smmu.c static void arm_smmu_tlb_inv_context_s2(void *cookie) · line 507
Quoted 5 lines
drivers/iommu/arm-smmu.c +2
-3- reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L : -ARM_SMMU_CB_S2_TLBIIPAS2 ; - iova >>=12 ; +if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { + iova &= ~12UL ;Oh baby. You should move code around more often, so I'm forced to take a second look!
Oh dear lord... The worst part is that I do now remember seeing this and having a similar moment of disbelief, but apparently I was easily distracted with rebasing and forgot about it too quickly :(
Quoted 2 lines
Can you cook a fix for this that we can route separately, please? I see it also made its way into
qcom_iommu.c...
Sure, I'll split it out to the front of the series for the moment.
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 6/15 iommu/arm-smmu: Get rid of weird "atomic" write
In reply to Robin MurphyThe smmu_write_atomic_lq oddity made some sense when the context format was effectively tied to CONFIG_64BIT, but these days it's simpler to just pick an explicit access size based on the format for the one-and-a-half times we actually care.
--- drivers/iommu/arm-smmu.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/iommu/arm-smmu.c +7 -16
@@ -83,17 +83,6 @@ ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ ? 0x400 : 0)) -/* -* Some 64-bit registers only make sense to write atomically, but in such -* cases all the data relevant to AArch32 formats lies within the lower word, -* therefore this actually makes more sense than it might first appear. -*/ -#ifdef CONFIG_64BIT -#define smmu_write_atomic_lq writeq_relaxed -#else -#define smmu_write_atomic_lq writel_relaxed -#endif -/* Translation context bank */ #define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift))
@@ -533,7 +522,10 @@ static void arm_smmu_tlb_inv_range_s2(unsigned long iova, size_t size, reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L :ARM_SMMU_CB_S2_TLBIIPAS2 ; iova >>=12 ;do { -smmu_write_atomic_lq (iova, reg); +if (smmu_domain->cfg.fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) +writeq_relaxed (iova, reg); +else +writel_relaxed (iova, reg); iova += granule >>12 ; }while (size -= granule); }
@@ -1371,11 +1363,10 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain, cb_base =ARM_SMMU_CB (smmu, cfg->cbndx);spin_lock_irqsave (&smmu_domain->cb_lock, flags); -/* ATS1 registers can only be written atomically */ va = iova & ~0xfffUL ; -if (smmu->version ==ARM_SMMU_V2 ) -smmu_write_atomic_lq (va, cb_base +ARM_SMMU_CB_ATS1PR ); -else /* Register is only 32-bit in v1 */ +if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) +writeq_relaxed (va, cb_base +ARM_SMMU_CB_ATS1PR ); +else writel_relaxed (va, cb_base +ARM_SMMU_CB_ATS1PR ); if (readl_poll_timeout_atomic(cb_base + ARM_SMMU_CB_ATSR, tmp,
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 7/15 iommu/arm-smmu: Abstract GR1 accesses
In reply to Robin MurphyIntroduce some register access abstractions which we will later use to encapsulate various quirks. GR1 is the easiest page to start with.
--- drivers/iommu/arm-smmu.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/iommu/arm-smmu.c +23 -7
@@ -71,7 +71,6 @@/* SMMU global address space */ #define ARM_SMMU_GR0 (smmu) ((smmu)->base) -#define ARM_SMMU_GR1 (smmu) ((smmu)->base + (1 << (smmu)->pgshift))/* * SMMU global address space with conditional offset to access secure
@@ -250,6 +249,25 @@ struct arm_smmu_domain {struct iommu_domain domain; }; +static void __iomem *arm_smmu_page (struct arm_smmu_device *smmu,int n) +{ +return smmu->base + (n << smmu->pgshift); +} + +static u32 arm_smmu_readl (struct arm_smmu_device *smmu,int page,int offset) +{ +return readl_relaxed (arm_smmu_page (smmu, page) + offset); +} + +static void arm_smmu_writel (struct arm_smmu_device *smmu,int page,int offset, +u32 val) +{ +writel_relaxed (val,arm_smmu_page (smmu, page) + offset); +} + +#define arm_smmu_read_gr1 (s, r) arm_smmu_readl((s), 1, (r)) +#define arm_smmu_write_gr1 (s, r, v) arm_smmu_writel((s), 1, (r), (v)) +struct arm_smmu_option_prop {u32 opt;const char *prop;
@@ -574,7 +592,6 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev)struct arm_smmu_domain *smmu_domain =to_smmu_domain (domain);struct arm_smmu_cfg *cfg = &smmu_domain->cfg;struct arm_smmu_device *smmu = smmu_domain->smmu; -void __iomem *gr1_base =ARM_SMMU_GR1 (smmu);void __iomem *cb_base; cb_base =ARM_SMMU_CB (smmu, cfg->cbndx);
@@ -585,7 +602,7 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) fsynr =readl_relaxed (cb_base +ARM_SMMU_CB_FSYNR0 ); iova =readq_relaxed (cb_base +ARM_SMMU_CB_FAR ); - cbfrsynra =readl_relaxed (gr1_base +ARM_SMMU_GR1_CBFRSYNRA (cfg->cbndx)); + cbfrsynra =arm_smmu_read_gr1 (smmu,ARM_SMMU_GR1_CBFRSYNRA (cfg->cbndx)); dev_err_ratelimited(smmu->dev, "Unhandled context fault: fsr=0x%x, iova=0x%08lx, fsynr=0x%x, cbfrsynra=0x%x, cb=%d\n",
@@ -676,7 +693,7 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)bool stage1;struct arm_smmu_cb *cb = &smmu->cbs[idx];struct arm_smmu_cfg *cfg = cb->cfg; -void __iomem *cb_base, *gr1_base; +void __iomem *cb_base; cb_base =ARM_SMMU_CB (smmu, idx);
@@ -686,7 +703,6 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)return ; } - gr1_base =ARM_SMMU_GR1 (smmu); stage1 = cfg->cbar !=CBAR_TYPE_S2_TRANS ;/* CBA2R */
@@ -699,7 +715,7 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)if (smmu->features &ARM_SMMU_FEAT_VMID16 ) reg |=FIELD_PREP (CBA2R_VMID16 , cfg->vmid); -writel_relaxed (reg, gr1_base +ARM_SMMU_GR1_CBA2R (idx)); +arm_smmu_write_gr1 (smmu,ARM_SMMU_GR1_CBA2R (idx), reg); }/* CBAR */
@@ -718,7 +734,7 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)/* 8-bit VMIDs live in CBAR */ reg |=FIELD_PREP (CBAR_VMID , cfg->vmid); } -writel_relaxed (reg, gr1_base +ARM_SMMU_GR1_CBAR (idx)); +arm_smmu_write_gr1 (smmu,ARM_SMMU_GR1_CBAR (idx), reg);/* * TCR
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 8/15 iommu/arm-smmu: Abstract context bank accesses
In reply to Robin MurphyContext bank accesses are fiddly enough to deserve a number of extra helpers to keep the callsites looking sane, even though there are only one or two of each.
--- drivers/iommu/arm-smmu.c | 137 ++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 65 deletions(-)
drivers/iommu/arm-smmu.c +72 -65
@@ -82,9 +82,6 @@ ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ ? 0x400 : 0)) -/* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift)) -#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000
@@ -265,9 +262,29 @@ static void arm_smmu_writel(struct arm_smmu_device *smmu, int page, int offset,writel_relaxed (val,arm_smmu_page (smmu, page) + offset); } +static u64 arm_smmu_readq (struct arm_smmu_device *smmu,int page,int offset) +{ +return readq_relaxed (arm_smmu_page (smmu, page) + offset); +} + +static void arm_smmu_writeq (struct arm_smmu_device *smmu,int page,int offset, +u64 val) +{ +writeq_relaxed (val,arm_smmu_page (smmu, page) + offset); +} +#define arm_smmu_read_gr1 (s, r) arm_smmu_readl((s), 1, (r))#define arm_smmu_write_gr1 (s, r, v) arm_smmu_writel((s), 1, (r), (v)) +#define arm_smmu_read_cb (s, n, r) \ + arm_smmu_readl((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb (s, n, r, v) \ + arm_smmu_writel((s), (s)->cb_base + (n), (r), (v)) +#define arm_smmu_read_cb_q (s, n, r) \ + arm_smmu_readq((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb_q (s, n, r, v) \ + arm_smmu_writeq((s), (s)->cb_base + (n), (r), (v)) +struct arm_smmu_option_prop {u32 opt;const char *prop;
@@ -423,15 +440,17 @@ static void __arm_smmu_free_bitmap(unsigned long *map, int idx) }/* Wait for any pending TLB invalidations to complete */ -static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu, -void __iomem *sync,void __iomem *status) +static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu,int page, +int sync,int status) {unsigned int spin_cnt, delay; +u32 reg; -writel_relaxed (QCOM_DUMMY_VAL , sync); +arm_smmu_writel (smmu, page, sync,QCOM_DUMMY_VAL );for (delay =1 ; delay <TLB_LOOP_TIMEOUT ; delay *=2 ) {for (spin_cnt =TLB_SPIN_COUNT ; spin_cnt >0 ; spin_cnt--) { -if (!(readl_relaxed (status) & sTLBGSTATUS_GSACTIVE)) + reg =arm_smmu_readl (smmu, page, status); +if (!(reg & sTLBGSTATUS_GSACTIVE))return ;cpu_relax (); }
@@ -443,12 +462,11 @@ static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu,static void arm_smmu_tlb_sync_global (struct arm_smmu_device *smmu) { -void __iomem *base =ARM_SMMU_GR0 (smmu);unsigned long flags;spin_lock_irqsave (&smmu->global_sync_lock, flags); -__arm_smmu_tlb_sync (smmu, base + ARM_SMMU_GR0_sTLBGSYNC, - base + ARM_SMMU_GR0_sTLBGSTATUS); +__arm_smmu_tlb_sync (smmu,0 , ARM_SMMU_GR0_sTLBGSYNC, + ARM_SMMU_GR0_sTLBGSTATUS);spin_unlock_irqrestore (&smmu->global_sync_lock, flags); }
@@ -456,12 +474,11 @@ static void arm_smmu_tlb_sync_context(void *cookie) {struct arm_smmu_domain *smmu_domain = cookie;struct arm_smmu_device *smmu = smmu_domain->smmu; -void __iomem *base =ARM_SMMU_CB (smmu, smmu_domain->cfg.cbndx);unsigned long flags;spin_lock_irqsave (&smmu_domain->cb_lock, flags); -__arm_smmu_tlb_sync (smmu, base +ARM_SMMU_CB_TLBSYNC , - base +ARM_SMMU_CB_TLBSTATUS ); +__arm_smmu_tlb_sync (smmu, smmu->cb_base + smmu_domain->cfg.cbndx, +ARM_SMMU_CB_TLBSYNC ,ARM_SMMU_CB_TLBSTATUS );spin_unlock_irqrestore (&smmu_domain->cb_lock, flags); }
@@ -475,14 +492,13 @@ static void arm_smmu_tlb_sync_vmid(void *cookie)static void arm_smmu_tlb_inv_context_s1 (void *cookie) {struct arm_smmu_domain *smmu_domain = cookie; -struct arm_smmu_cfg *cfg = &smmu_domain->cfg; -void __iomem *base =ARM_SMMU_CB (smmu_domain->smmu, cfg->cbndx); -/* -* NOTE: this is not a relaxed write; it needs to guarantee that PTEs -* cleared by the current CPU are visible to the SMMU before the TLBI. +* The TLBI write may be relaxed, so ensure that PTEs cleared by the +* current CPU are visible beforehand. */ -writel (cfg->asid, base +ARM_SMMU_CB_S1_TLBIASID ); +wmb (); +arm_smmu_write_cb (smmu_domain->smmu, smmu_domain->cfg.cbndx, +ARM_SMMU_CB_S1_TLBIASID , smmu_domain->cfg.asid);arm_smmu_tlb_sync_context (cookie); }
@@ -503,25 +519,25 @@ static void arm_smmu_tlb_inv_range_s1(unsigned long iova, size_t size,struct arm_smmu_domain *smmu_domain = cookie;struct arm_smmu_device *smmu = smmu_domain->smmu;struct arm_smmu_cfg *cfg = &smmu_domain->cfg; -void __iomem *reg =ARM_SMMU_CB (smmu, cfg->cbndx); +int reg, idx = cfg->cbndx;if (smmu->features &ARM_SMMU_FEAT_COHERENT_WALK )wmb (); - reg += leaf ?ARM_SMMU_CB_S1_TLBIVAL :ARM_SMMU_CB_S1_TLBIVA ; + reg = leaf ?ARM_SMMU_CB_S1_TLBIVAL :ARM_SMMU_CB_S1_TLBIVA ;if (cfg->fmt !=ARM_SMMU_CTX_FMT_AARCH64 ) { iova &= ~12UL ; iova |= cfg->asid;do { -writel_relaxed (iova, reg); +arm_smmu_write_cb (smmu, idx, reg, iova); iova += granule; }while (size -= granule); }else { iova >>=12 ; iova |= (u64 )cfg->asid <<48 ;do { -writeq_relaxed (iova, reg); +arm_smmu_write_cb_q (smmu, idx, reg, iova); iova += granule >>12 ; }while (size -= granule); }
@@ -532,18 +548,18 @@ static void arm_smmu_tlb_inv_range_s2(unsigned long iova, size_t size, {struct arm_smmu_domain *smmu_domain = cookie;struct arm_smmu_device *smmu = smmu_domain->smmu; -void __iomem *reg =ARM_SMMU_CB (smmu, smmu_domain->cfg.cbndx); +int reg, idx = smmu_domain->cfg.cbndx;if (smmu->features &ARM_SMMU_FEAT_COHERENT_WALK )wmb (); - reg += leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L :ARM_SMMU_CB_S2_TLBIIPAS2 ; + reg = leaf ?ARM_SMMU_CB_S2_TLBIIPAS2L :ARM_SMMU_CB_S2_TLBIIPAS2 ; iova >>=12 ;do {if (smmu_domain->cfg.fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) -writeq_relaxed (iova, reg); +arm_smmu_write_cb_q (smmu, idx, reg, iova);else -writel_relaxed (iova, reg); +arm_smmu_write_cb (smmu, idx, reg, iova); iova += granule >>12 ; }while (size -= granule); }
@@ -590,25 +606,22 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev)unsigned long iova;struct iommu_domain *domain = dev;struct arm_smmu_domain *smmu_domain =to_smmu_domain (domain); -struct arm_smmu_cfg *cfg = &smmu_domain->cfg;struct arm_smmu_device *smmu = smmu_domain->smmu; -void __iomem *cb_base; - - cb_base =ARM_SMMU_CB (smmu, cfg->cbndx); - fsr =readl_relaxed (cb_base +ARM_SMMU_CB_FSR ); +int idx = smmu_domain->cfg.cbndx; + fsr =arm_smmu_read_cb (smmu, idx,ARM_SMMU_CB_FSR );if (!(fsr &FSR_FAULT ))return IRQ_NONE ; - fsynr =readl_relaxed (cb_base +ARM_SMMU_CB_FSYNR0 ); - iova =readq_relaxed (cb_base +ARM_SMMU_CB_FAR ); - cbfrsynra =arm_smmu_read_gr1 (smmu,ARM_SMMU_GR1_CBFRSYNRA (cfg->cbndx)); + fsynr =arm_smmu_read_cb (smmu, idx,ARM_SMMU_CB_FSYNR0 ); + iova =arm_smmu_read_cb_q (smmu, idx,ARM_SMMU_CB_FAR ); + cbfrsynra =arm_smmu_read_gr1 (smmu,ARM_SMMU_GR1_CBFRSYNRA (idx));dev_err_ratelimited (smmu->dev,"Unhandled context fault: fsr=0x%x, iova=0x%08lx, fsynr=0x%x, cbfrsynra=0x%x, cb=%d\n" , - fsr, iova, fsynr, cbfrsynra, cfg->cbndx); + fsr, iova, fsynr, cbfrsynra, idx); -writel (fsr, cb_base +ARM_SMMU_CB_FSR ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_FSR , fsr);return IRQ_HANDLED ; }
@@ -693,13 +706,10 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)bool stage1;struct arm_smmu_cb *cb = &smmu->cbs[idx];struct arm_smmu_cfg *cfg = cb->cfg; -void __iomem *cb_base; - - cb_base =ARM_SMMU_CB (smmu, idx);/* Unassigned context banks only need disabling */ if (!cfg) { -writel_relaxed (0 , cb_base +ARM_SMMU_CB_SCTLR ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_SCTLR ,0 );return ; }
@@ -742,24 +752,25 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)* access behaviour of some fields (in particular, ASID[15:8]). */ if (stage1 && smmu->version >ARM_SMMU_V1 ) -writel_relaxed (cb->tcr[1 ], cb_base +ARM_SMMU_CB_TCR2 ); -writel_relaxed (cb->tcr[0 ], cb_base +ARM_SMMU_CB_TCR ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_TCR2 , cb->tcr[1 ]); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_TCR , cb->tcr[0 ]);/* TTBRs */ if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH32_S ) { -writel_relaxed (cfg->asid, cb_base +ARM_SMMU_CB_CONTEXTIDR ); -writel_relaxed (cb->ttbr[0 ], cb_base +ARM_SMMU_CB_TTBR0 ); -writel_relaxed (cb->ttbr[1 ], cb_base +ARM_SMMU_CB_TTBR1 ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_CONTEXTIDR , cfg->asid); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_TTBR0 , cb->ttbr[0 ]); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_TTBR1 , cb->ttbr[1 ]); }else { -writeq_relaxed (cb->ttbr[0 ], cb_base +ARM_SMMU_CB_TTBR0 ); +arm_smmu_write_cb_q (smmu, idx,ARM_SMMU_CB_TTBR0 , cb->ttbr[0 ]);if (stage1) -writeq_relaxed (cb->ttbr[1 ], cb_base +ARM_SMMU_CB_TTBR1 ); +arm_smmu_write_cb_q (smmu, idx,ARM_SMMU_CB_TTBR1 , + cb->ttbr[1 ]); }/* MAIRs (stage-1 only) */ if (stage1) { -writel_relaxed (cb->mair[0 ], cb_base +ARM_SMMU_CB_S1_MAIR0 ); -writel_relaxed (cb->mair[1 ], cb_base +ARM_SMMU_CB_S1_MAIR1 ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_S1_MAIR0 , cb->mair[0 ]); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_S1_MAIR1 , cb->mair[1 ]); }/* SCTLR */
@@ -769,7 +780,7 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)if (IS_ENABLED (CONFIG_CPU_BIG_ENDIAN )) reg |=SCTLR_E ; -writel_relaxed (reg, cb_base +ARM_SMMU_CB_SCTLR ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_SCTLR , reg); } static int arm_smmu_init_domain_context(struct iommu_domain *domain,
@@ -1366,27 +1377,25 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,struct arm_smmu_cfg *cfg = &smmu_domain->cfg;struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;struct device *dev = smmu->dev; -void __iomem *cb_base; +void __iomem *reg;u32 tmp;u64 phys;unsigned long va, flags; -int ret; +int ret, idx = cfg->cbndx; ret =arm_smmu_rpm_get (smmu);if (ret <0 )return 0 ; - cb_base =ARM_SMMU_CB (smmu, cfg->cbndx); -spin_lock_irqsave (&smmu_domain->cb_lock, flags); va = iova & ~0xfffUL ;if (cfg->fmt ==ARM_SMMU_CTX_FMT_AARCH64 ) -writeq_relaxed (va, cb_base +ARM_SMMU_CB_ATS1PR ); +arm_smmu_write_cb_q (smmu, idx,ARM_SMMU_CB_ATS1PR , va);else -writel_relaxed (va, cb_base +ARM_SMMU_CB_ATS1PR ); +arm_smmu_write_cb (smmu, idx,ARM_SMMU_CB_ATS1PR , va); -if (readl_poll_timeout_atomic (cb_base +ARM_SMMU_CB_ATSR , tmp, - !(tmp &ATSR_ACTIVE ),5 ,50 )) { + reg =arm_smmu_page (smmu, smmu->cb_base + idx) +ARM_SMMU_CB_ATSR ; +if (readl_poll_timeout_atomic (reg, tmp, !(tmp &ATSR_ACTIVE ),5 ,50 )) {spin_unlock_irqrestore (&smmu_domain->cb_lock, flags); dev_err(dev, "iova to phys timed out on %pad. Falling back to software table walk.\n",
@@ -1394,7 +1403,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,return ops->iova_to_phys (ops, iova); } - phys =readq_relaxed (cb_base +ARM_SMMU_CB_PAR ); + phys =arm_smmu_read_cb_q (smmu, idx,ARM_SMMU_CB_PAR );spin_unlock_irqrestore (&smmu_domain->cb_lock, flags);if (phys &CB_PAR_F ) {dev_err (dev,"translation fault!\n" );
@@ -1758,18 +1767,16 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)/* Make sure all context banks are disabled and clear CB_FSR */ for (i =0 ; i < smmu->num_context_banks; ++i) { -void __iomem *cb_base =ARM_SMMU_CB (smmu, i); -arm_smmu_write_context_bank (smmu, i); -writel_relaxed (FSR_FAULT , cb_base +ARM_SMMU_CB_FSR ); +arm_smmu_write_cb (smmu, i,ARM_SMMU_CB_FSR ,FSR_FAULT );/* * Disable MMU-500's not-particularly-beneficial next-page * prefetcher for the sake of errata #841119 and #826419. */ if (smmu->model ==ARM_MMU500 ) { - reg =readl_relaxed (cb_base +ARM_SMMU_CB_ACTLR ); + reg =arm_smmu_read_cb (smmu, i,ARM_SMMU_CB_ACTLR ); reg &= ~ARM_MMU500_ACTLR_CPRE ; -writel_relaxed (reg, cb_base +ARM_SMMU_CB_ACTLR ); +arm_smmu_write_cb (smmu, i,ARM_SMMU_CB_ACTLR , reg); } }
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH 08/15] iommu/arm-smmu: Abstract context bank accesses
Quoted 39 lines · Robin Murphy
Context bank accesses are fiddly enough to deserve a number of extra helpers to keep the callsites looking sane, even though there are only one or two of each.
Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 137 ++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 65 deletions(-)drivers/iommu/arm-smmu.c +11
-3@@ -82,9 +82,6 @@ ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ ? 0x400 : 0)) -/* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift)) -#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000@@ -265,9 +262,29 @@ static void arm_smmu_writel(struct arm_smmu_device *smmu, int page, int offset,writel_relaxed (val,arm_smmu_page (smmu, page) + offset); } +static u64 arm_smmu_readq (struct arm_smmu_device *smmu,int page,int offset) +{ +return readq_relaxed (arm_smmu_page (smmu, page) + offset); +} + +static void arm_smmu_writeq (struct arm_smmu_device *smmu,int page,int offset, +u64 val) +{ +writeq_relaxed (val,arm_smmu_page (smmu, page) + offset); +} +#define arm_smmu_read_gr1 (s, r) arm_smmu_readl((s), 1, (r))
drivers/iommu/arm-smmu.c static void arm_smmu_writel(struct arm_smmu_device *smmu, int page, int offset, · line 286
Quoted 10 lines
drivers/iommu/arm-smmu.c +8
-0#define arm_smmu_write_gr1 (s, r, v) arm_smmu_writel((s), 1, (r), (v)) +#define arm_smmu_read_cb (s, n, r) \ + arm_smmu_readl((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb (s, n, r, v) \ + arm_smmu_writel((s), (s)->cb_base + (n), (r), (v)) +#define arm_smmu_read_cb_q (s, n, r) \ + arm_smmu_readq((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb_q (s, n, r, v) \ + arm_smmu_writeq((s), (s)->cb_base + (n), (r), (v))
'r' for 'offset'? (maybe just rename offset => register in the helpers).
Quoted 26 lines
drivers/iommu/arm-smmu.c +6
-4struct arm_smmu_option_prop {u32 opt;const char *prop;@@ -423,15 +440,17 @@ static void __arm_smmu_free_bitmap(unsigned long *map, int idx) }/* Wait for any pending TLB invalidations to complete */ -static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu, -void __iomem *sync,void __iomem *status) +static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu,int page, +int sync,int status) {unsigned int spin_cnt, delay; +u32 reg; -writel_relaxed (QCOM_DUMMY_VAL , sync); +arm_smmu_writel (smmu, page, sync,QCOM_DUMMY_VAL );for (delay =1 ; delay <TLB_LOOP_TIMEOUT ; delay *=2 ) {for (spin_cnt =TLB_SPIN_COUNT ; spin_cnt >0 ; spin_cnt--) { -if (!(readl_relaxed (status) & sTLBGSTATUS_GSACTIVE)) + reg =arm_smmu_readl (smmu, page, status); +if (!(reg & sTLBGSTATUS_GSACTIVE))return ;cpu_relax (); }
drivers/iommu/arm-smmu.c static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu, · line 468
Quoted 10 lines
drivers/iommu/arm-smmu.c +1
-3@@ -443,12 +462,11 @@ static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu,static void arm_smmu_tlb_sync_global (struct arm_smmu_device *smmu) { -void __iomem *base =ARM_SMMU_GR0 (smmu);unsigned long flags;spin_lock_irqsave (&smmu->global_sync_lock, flags); -__arm_smmu_tlb_sync (smmu, base + ARM_SMMU_GR0_sTLBGSYNC, - base + ARM_SMMU_GR0_sTLBGSTATUS); + __arm_smmu_tlb_sync(smmu, 0, ARM_SMMU_GR0_sTLBGSYNC,
Can we have a #define for page zero, please?
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH 08/15] iommu/arm-smmu: Abstract context bank accesses
Quoted 42 lines · Will Deacon
Quoted 41 lines · Robin Murphy
Context bank accesses are fiddly enough to deserve a number of extra helpers to keep the callsites looking sane, even though there are only one or two of each.
Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu.c | 137 ++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 65 deletions(-)drivers/iommu/arm-smmu.c +11
-3@@ -82,9 +82,6 @@ ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ ? 0x400 : 0)) -/* Translation context bank */ -#define ARM_SMMU_CB (smmu, n) ((smmu)->base + (((smmu)->cb_base + (n)) << (smmu)->pgshift)) -#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000@@ -265,9 +262,29 @@ static void arm_smmu_writel(struct arm_smmu_device *smmu, int page, int offset,writel_relaxed (val,arm_smmu_page (smmu, page) + offset); } +static u64 arm_smmu_readq (struct arm_smmu_device *smmu,int page,int offset) +{ +return readq_relaxed (arm_smmu_page (smmu, page) + offset); +} + +static void arm_smmu_writeq (struct arm_smmu_device *smmu,int page,int offset, +u64 val) +{ +writeq_relaxed (val,arm_smmu_page (smmu, page) + offset); +} +#define arm_smmu_read_gr1 (s, r) arm_smmu_readl((s), 1, (r))#define arm_smmu_write_gr1 (s, r, v) arm_smmu_writel((s), 1, (r), (v))
Quoted 10 lines
drivers/iommu/arm-smmu.c static void arm_smmu_writel(struct arm_smmu_device *smmu, int page, int offset, · line 286
Quoted 8 lines
drivers/iommu/arm-smmu.c +8
-0+#define arm_smmu_read_cb (s, n, r) \ + arm_smmu_readl((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb (s, n, r, v) \ + arm_smmu_writel((s), (s)->cb_base + (n), (r), (v)) +#define arm_smmu_read_cb_q (s, n, r) \ + arm_smmu_readq((s), (s)->cb_base + (n), (r)) +#define arm_smmu_write_cb_q (s, n, r, v) \ + arm_smmu_writeq((s), (s)->cb_base + (n), (r), (v))'r' for 'offset'? (maybe just rename offset => register in the helpers).
I think this all represents the mangled remains of an underlying notion of 'register offset' ;)
Quoted 32 lines
Quoted 32 lines
drivers/iommu/arm-smmu.c +6
-5struct arm_smmu_option_prop {u32 opt;const char *prop;@@ -423,15 +440,17 @@ static void __arm_smmu_free_bitmap(unsigned long *map, int idx) }/* Wait for any pending TLB invalidations to complete */ -static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu, -void __iomem *sync,void __iomem *status) +static void __arm_smmu_tlb_sync (struct arm_smmu_device *smmu,int page, +int sync,int status) {unsigned int spin_cnt, delay; +u32 reg; -writel_relaxed (QCOM_DUMMY_VAL , sync); +arm_smmu_writel (smmu, page, sync,QCOM_DUMMY_VAL );for (delay =1 ; delay <TLB_LOOP_TIMEOUT ; delay *=2 ) {for (spin_cnt =TLB_SPIN_COUNT ; spin_cnt >0 ; spin_cnt--) { -if (!(readl_relaxed (status) & sTLBGSTATUS_GSACTIVE)) + reg =arm_smmu_readl (smmu, page, status); +if (!(reg & sTLBGSTATUS_GSACTIVE))return ;cpu_relax (); }@@ -443,12 +462,11 @@ static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu,static void arm_smmu_tlb_sync_global (struct arm_smmu_device *smmu) { -void __iomem *base =ARM_SMMU_GR0 (smmu);unsigned long flags;
Quoted 6 lines
drivers/iommu/arm-smmu.c static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu, · line 468
Quoted 4 lines
drivers/iommu/arm-smmu.c +1
-2spin_lock_irqsave (&smmu->global_sync_lock, flags); -__arm_smmu_tlb_sync (smmu, base + ARM_SMMU_GR0_sTLBGSYNC, - base + ARM_SMMU_GR0_sTLBGSTATUS); + __arm_smmu_tlb_sync(smmu, 0, ARM_SMMU_GR0_sTLBGSYNC,Can we have a #define for page zero, please?
Again, now I recall pondering the exact same thought, so clearly I don't have any grounds to object. I guess it's worth reworking the previous ARM_SMMU_{GR0,GR1,CB()} macros into the page number scheme rather than just killing them off - let me give that a try.
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 9/15 iommu/arm-smmu: Abstract GR0 accesses
In reply to Robin MurphyClean up the remaining accesses to GR0 registers, so that everything is now neatly abstracted. This folds up the Non-Secure alias quirk as the first step towards moving it out of the way entirely. Although GR0 does technically contain some 64-bit registers (sGFAR and the weird SMMUv2 HYPC and MONC stuff), they're not ones we have any need to access.
--- drivers/iommu/arm-smmu.c | 101 +++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 47 deletions(-)
drivers/iommu/arm-smmu.c +54 -47
@@ -69,19 +69,6 @@/* Maximum number of context banks per SMMU */ #define ARM_SMMU_MAX_CBS 128 -/* SMMU global address space */ -#define ARM_SMMU_GR0 (smmu) ((smmu)->base) - -/* -* SMMU global address space with conditional offset to access secure -* aliases of non-secure registers (e.g. nsCR0: 0x400, nsGFSR: 0x448, -* nsGFSYNR0: 0x450) -*/ -#define ARM_SMMU_GR0_NS (smmu) \ - ((smmu)->base + \ - ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ - ? 0x400 : 0)) -#define MSI_IOVA_BASE 0x8000000#define MSI_IOVA_LENGTH 0x100000
@@ -246,6 +233,21 @@ struct arm_smmu_domain {struct iommu_domain domain; }; +static int arm_smmu_gr0_ns (int offset) +{ +switch (offset) { +case ARM_SMMU_GR0_sCR0: +case ARM_SMMU_GR0_sACR: +case ARM_SMMU_GR0_sGFSR: +case ARM_SMMU_GR0_sGFSYNR0: +case ARM_SMMU_GR0_sGFSYNR1: +case ARM_SMMU_GR0_sGFSYNR2: +return offset +0x400 ; +default : +return offset; + } +} +static void __iomem *arm_smmu_page (struct arm_smmu_device *smmu,int n) {return smmu->base + (n << smmu->pgshift);
@@ -253,12 +255,18 @@ static void __iomem *arm_smmu_page(struct arm_smmu_device *smmu, int n)static u32 arm_smmu_readl (struct arm_smmu_device *smmu,int page,int offset) { +if ((smmu->options &ARM_SMMU_OPT_SECURE_CFG_ACCESS ) && page ==0 ) + offset =arm_smmu_gr0_ns (offset); +return readl_relaxed (arm_smmu_page (smmu, page) + offset); }static void arm_smmu_writel (struct arm_smmu_device *smmu,int page,int offset,u32 val) { +if ((smmu->options &ARM_SMMU_OPT_SECURE_CFG_ACCESS ) && page ==0 ) + offset =arm_smmu_gr0_ns (offset); +writel_relaxed (val,arm_smmu_page (smmu, page) + offset); }
@@ -273,6 +281,9 @@ static void arm_smmu_writeq(struct arm_smmu_device *smmu, int page, int offset,writeq_relaxed (val,arm_smmu_page (smmu, page) + offset); } +#define arm_smmu_read_gr0 (s, r) arm_smmu_readl((s), 0, (r)) +#define arm_smmu_write_gr0 (s, r, v) arm_smmu_writel((s), 0, (r), (v)) +#define arm_smmu_read_gr1 (s, r) arm_smmu_readl((s), 1, (r))#define arm_smmu_write_gr1 (s, r, v) arm_smmu_writel((s), 1, (r), (v))
@@ -506,10 +517,10 @@ static void arm_smmu_tlb_inv_context_s2(void *cookie) {struct arm_smmu_domain *smmu_domain = cookie;struct arm_smmu_device *smmu = smmu_domain->smmu; -void __iomem *base =ARM_SMMU_GR0 (smmu); -/* NOTE: see above */ -writel (smmu_domain->cfg.vmid, base +ARM_SMMU_GR0_TLBIVMID ); +/* See above */ +wmb (); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_TLBIVMID , smmu_domain->cfg.vmid);arm_smmu_tlb_sync_global (smmu); }
@@ -574,12 +585,12 @@ static void arm_smmu_tlb_inv_vmid_nosync(unsigned long iova, size_t size, size_t granule, bool leaf, void *cookie) { struct arm_smmu_domain *smmu_domain = cookie; -void __iomem *base =ARM_SMMU_GR0 (smmu_domain->smmu); +struct arm_smmu_device *smmu = smmu_domain->smmu; -if (smmu_domain->smmu->features &ARM_SMMU_FEAT_COHERENT_WALK ) +if (smmu->features &ARM_SMMU_FEAT_COHERENT_WALK )wmb (); -writel_relaxed (smmu_domain->cfg.vmid, base +ARM_SMMU_GR0_TLBIVMID ); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_TLBIVMID , smmu_domain->cfg.vmid); } static const struct iommu_gather_ops arm_smmu_s1_tlb_ops = {
@@ -629,12 +640,11 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev) {u32 gfsr, gfsynr0, gfsynr1, gfsynr2;struct arm_smmu_device *smmu = dev; -void __iomem *gr0_base =ARM_SMMU_GR0_NS (smmu); - gfsr =readl_relaxed (gr0_base + ARM_SMMU_GR0_sGFSR); - gfsynr0 =readl_relaxed (gr0_base + ARM_SMMU_GR0_sGFSYNR0); - gfsynr1 =readl_relaxed (gr0_base + ARM_SMMU_GR0_sGFSYNR1); - gfsynr2 =readl_relaxed (gr0_base + ARM_SMMU_GR0_sGFSYNR2); + gfsr =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSR); + gfsynr0 =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSYNR0); + gfsynr1 =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSYNR1); + gfsynr2 =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSYNR2);if (!gfsr)return IRQ_NONE ;
@@ -645,7 +655,7 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev)"\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n" , gfsr, gfsynr0, gfsynr1, gfsynr2); -writel (gfsr, gr0_base + ARM_SMMU_GR0_sGFSR); +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sGFSR, gfsr);return IRQ_HANDLED ; }
@@ -1051,7 +1061,7 @@ static void arm_smmu_write_smr(struct arm_smmu_device *smmu, int idx)if (!(smmu->features &ARM_SMMU_FEAT_EXIDS ) && smr->valid) reg |=SMR_VALID ; -writel_relaxed (reg,ARM_SMMU_GR0 (smmu) +ARM_SMMU_GR0_SMR (idx)); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_SMR (idx), reg); }static void arm_smmu_write_s2cr (struct arm_smmu_device *smmu,int idx)
@@ -1064,7 +1074,7 @@ static void arm_smmu_write_s2cr(struct arm_smmu_device *smmu, int idx)if (smmu->features &ARM_SMMU_FEAT_EXIDS && smmu->smrs && smmu->smrs[idx].valid) reg |=S2CR_EXIDVALID ; -writel_relaxed (reg,ARM_SMMU_GR0 (smmu) +ARM_SMMU_GR0_S2CR (idx)); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_S2CR (idx), reg); }static void arm_smmu_write_sme (struct arm_smmu_device *smmu,int idx)
@@ -1080,7 +1090,6 @@ static void arm_smmu_write_sme(struct arm_smmu_device *smmu, int idx)*/ static void arm_smmu_test_smr_masks (struct arm_smmu_device *smmu) { -void __iomem *gr0_base =ARM_SMMU_GR0 (smmu);u32 smr;if (!smmu->smrs)
@@ -1092,13 +1101,13 @@ static void arm_smmu_test_smr_masks(struct arm_smmu_device *smmu)* masters later if they try to claim IDs outside these masks. */ smr =FIELD_PREP (SMR_ID , smmu->streamid_mask); -writel_relaxed (smr, gr0_base +ARM_SMMU_GR0_SMR (0 )); - smr =readl_relaxed (gr0_base +ARM_SMMU_GR0_SMR (0 )); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_SMR (0 ), smr); + smr =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_SMR (0 )); smmu->streamid_mask =FIELD_GET (SMR_ID , smr); smr =FIELD_PREP (SMR_MASK , smmu->streamid_mask); -writel_relaxed (smr, gr0_base +ARM_SMMU_GR0_SMR (0 )); - smr =readl_relaxed (gr0_base +ARM_SMMU_GR0_SMR (0 )); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_SMR (0 ), smr); + smr =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_SMR (0 )); smmu->smr_mask_mask =FIELD_GET (SMR_MASK , smr); }
@@ -1731,13 +1740,12 @@ static struct iommu_ops arm_smmu_ops = {static void arm_smmu_device_reset (struct arm_smmu_device *smmu) { -void __iomem *gr0_base =ARM_SMMU_GR0 (smmu);int i;u32 reg, major;/* clear global FSR */ - reg =readl_relaxed (ARM_SMMU_GR0_NS (smmu) + ARM_SMMU_GR0_sGFSR); -writel (reg,ARM_SMMU_GR0_NS (smmu) + ARM_SMMU_GR0_sGFSR); + reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSR); +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sGFSR, reg);/* * Reset stream mapping groups: Initial values mark all SMRn as
@@ -1752,9 +1760,9 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)* clear CACHE_LOCK bit of ACR first. And, CACHE_LOCK * bit is only present in MMU-500r2 onwards. */ - reg =readl_relaxed (gr0_base +ARM_SMMU_GR0_ID7 ); + reg =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID7 ); major =FIELD_GET (ID7_MAJOR , reg); - reg =readl_relaxed (gr0_base + ARM_SMMU_GR0_sACR); + reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sACR);if (major >=2 ) reg &= ~ARM_MMU500_ACR_CACHE_LOCK ;/*
@@ -1762,7 +1770,7 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)* TLB entries for reduced latency. */ reg |=ARM_MMU500_ACR_SMTNMB_TLBEN |ARM_MMU500_ACR_S2CRB_TLBEN ; -writel_relaxed (reg, gr0_base + ARM_SMMU_GR0_sACR); +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sACR, reg); }/* Make sure all context banks are disabled and clear CB_FSR */
@@ -1781,10 +1789,10 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) }/* Invalidate the TLB, just in case */ -writel_relaxed (QCOM_DUMMY_VAL , gr0_base +ARM_SMMU_GR0_TLBIALLH ); -writel_relaxed (QCOM_DUMMY_VAL , gr0_base +ARM_SMMU_GR0_TLBIALLNSNH ); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_TLBIALLH ,QCOM_DUMMY_VAL ); +arm_smmu_write_gr0 (smmu,ARM_SMMU_GR0_TLBIALLNSNH ,QCOM_DUMMY_VAL ); - reg =readl_relaxed (ARM_SMMU_GR0_NS (smmu) + ARM_SMMU_GR0_sCR0); + reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sCR0);/* Enable fault reporting */ reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE);
@@ -1813,7 +1821,7 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)/* Push the button */ arm_smmu_tlb_sync_global (smmu); -writel (reg,ARM_SMMU_GR0_NS (smmu) + ARM_SMMU_GR0_sCR0); +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sCR0, reg); }static int arm_smmu_id_size_to_bits (int size)
@@ -1838,7 +1846,6 @@ static int arm_smmu_id_size_to_bits(int size)static int arm_smmu_device_cfg_probe (struct arm_smmu_device *smmu) {unsigned int size; -void __iomem *gr0_base =ARM_SMMU_GR0 (smmu);u32 id;bool cttw_reg, cttw_fw = smmu->features &ARM_SMMU_FEAT_COHERENT_WALK ;int i;
@@ -1848,7 +1855,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) smmu->version == ARM_SMMU_V2 ? 2 : 1);/* ID0 */ - id =readl_relaxed (gr0_base +ARM_SMMU_GR0_ID0 ); + id =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID0 );/* Restrict available stages based on module parameter */ if (force_stage ==1 )
@@ -1942,7 +1949,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) }/* ID1 */ - id =readl_relaxed (gr0_base +ARM_SMMU_GR0_ID1 ); + id =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID1 ); smmu->pgshift = (id &ID1_PAGESIZE ) ?16 :12 ;/* Check for size mismatch of SMMU address space from mapped region */
@@ -1980,7 +1987,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)return -ENOMEM ;/* ID2 */ - id =readl_relaxed (gr0_base +ARM_SMMU_GR0_ID2 ); + id =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID2 ); size =arm_smmu_id_size_to_bits (FIELD_GET (ID2_IAS , id)); smmu->ipa_size = size;
@@ -2364,7 +2371,7 @@ static void arm_smmu_device_shutdown(struct platform_device *pdev)arm_smmu_rpm_get (smmu);/* Turn the thing off */ -writel (sCR0_CLIENTPD,ARM_SMMU_GR0_NS (smmu) + ARM_SMMU_GR0_sCR0); +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sCR0, sCR0_CLIENTPD);arm_smmu_rpm_put (smmu);if (pm_runtime_enabled (smmu->dev))
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 10/15 iommu/arm-smmu: Rename arm-smmu-regs.h
In reply to Robin MurphyWe're about to start using it for more than just register definitions, so generalise the name.
---
drivers/iommu/arm-smmu.c | 2 +-
drivers/iommu/{arm-smmu-regs.h => arm-smmu.h} | 6 +++---
drivers/iommu/qcom_iommu.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/iommu/{arm-smmu-regs.h => arm-smmu.h} (98%)drivers/iommu/arm-smmu.c +1 -1
@@ -46,7 +46,7 @@#include <linux/amba/bus.h> #include <linux/fsl/mc.h> -#include "arm-smmu-regs.h" +#include "arm-smmu.h" /* * Apparently, some Qualcomm arm64 platforms which appear to expose their SMMU
drivers/iommu/arm-smmu.h renamed from drivers/iommu/arm-smmu-regs.h +3 -3
@@ -7,8 +7,8 @@* Author: Will Deacon <[email protected]> */ -#ifndef _ARM_SMMU_REGS_H -#define _ARM_SMMU_REGS_H +#ifndef _ARM_SMMU_H +#define _ARM_SMMU_H#include <linux/bits.h>
@@ -194,4 +194,4 @@ enum arm_smmu_cbar_type {#define ARM_SMMU_CB_ATSR 0x8f0#define ATSR_ACTIVE BIT(0) -#endif /* _ARM_SMMU_REGS_H */ +#endif /* _ARM_SMMU_H */
drivers/iommu/qcom_iommu.c +1 -1
@@ -33,7 +33,7 @@#include <linux/slab.h> #include <linux/spinlock.h> -#include "arm-smmu-regs.h" +#include "arm-smmu.h" #define SMMU_INTR_SEL_NS 0x2000
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 11/15 iommu/arm-smmu: Add implementation infrastructure
In reply to Robin MurphyAdd some nascent infrastructure for handling implementation-specific details outside the flow of the architectural code. This will allow us to keep mutually-incompatible vendor-specific hooks in their own files where the respective interested parties can maintain them with minimal chance of conflicts. As somewhat of a template, we'll start with a general place to collect the relatively trivial existing quirks.
--- MAINTAINERS | 3 +- drivers/iommu/Makefile | 2 +- drivers/iommu/arm-smmu-impl.c | 13 +++++ drivers/iommu/arm-smmu.c | 82 ++------------------------------ drivers/iommu/arm-smmu.h | 89 +++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 81 deletions(-) create mode 100644 drivers/iommu/arm-smmu-impl.c
MAINTAINERS +1 -2
@@ -1350,8 +1350,7 @@ M: Will Deacon <[email protected]> R: Robin Murphy <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained -F: drivers/iommu/arm-smmu.c -F: drivers/iommu/arm-smmu-v3.c +F: drivers/iommu/arm-smmu* F: drivers/iommu/io-pgtable-arm.c F: drivers/iommu/io-pgtable-arm-v7s.c
drivers/iommu/Makefile +1 -1
@@ -13,7 +13,7 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o -obj-$(CONFIG_ARM_SMMU) += arm-smmu.o +obj-$(CONFIG_ARM_SMMU) += arm-smmu.o arm-smmu-impl.o obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o
drivers/iommu/arm-smmu-impl.c new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Miscellaneous Arm SMMU implementation and integration quirks +// Copyright (C) 2019 Arm Limited + +#define pr_fmt (fmt) "arm-smmu: " fmt + +#include "arm-smmu.h" + + +struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu) +{ +return smmu; +}
drivers/iommu/arm-smmu.c +4 -78
124 lines not on this page · raw message
drivers/iommu/arm-smmu.h +89 -0
100 lines not on this page · raw message
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 12/15 iommu/arm-smmu: Move Secure access quirk to implementation
In reply to Robin MurphyMove detection of the Secure access quirk to its new home, trimming it down in the process - time has proven that boolean DT flags are neither ideal nor necessarily sufficient, so it's highly unlikely we'll ever add more, let alone enough to justify the frankly overengineered parsing machinery.
--- drivers/iommu/arm-smmu-impl.c | 44 +++++++++++++++++ drivers/iommu/arm-smmu.c | 89 ----------------------------------- drivers/iommu/arm-smmu.h | 64 ++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 91 deletions(-)
drivers/iommu/arm-smmu-impl.c +44 -0
@@ -4,10 +4,54 @@#define pr_fmt (fmt) "arm-smmu: " fmt +#include <linux/of.h> +#include "arm-smmu.h" +static int arm_smmu_gr0_ns (int offset) +{ +switch (offset) { +case ARM_SMMU_GR0_sCR0: +case ARM_SMMU_GR0_sACR: +case ARM_SMMU_GR0_sGFSR: +case ARM_SMMU_GR0_sGFSYNR0: +case ARM_SMMU_GR0_sGFSYNR1: +case ARM_SMMU_GR0_sGFSYNR2: +return offset +0x400 ; +default : +return offset; + } +} + +static u32 arm_smmu_read_ns (struct arm_smmu_device *smmu,int page, +int offset) +{ +if (page ==0 ) + offset =arm_smmu_gr0_ns (offset); +return readl_relaxed (arm_smmu_page (smmu, page) + offset); +} + +static void arm_smmu_write_ns (struct arm_smmu_device *smmu,int page, +int offset,u32 val) +{ +if (page ==0 ) + offset =arm_smmu_gr0_ns (offset); +writel_relaxed (val,arm_smmu_page (smmu, page) + offset); +} + +/* Since we don't care for sGFAR, we can do without 64-bit accessors */ +const struct arm_smmu_impl calxeda_impl = { + .read_reg = arm_smmu_read_ns, + .write_reg = arm_smmu_write_ns, +}; + +struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu) { +if (of_property_read_bool (smmu->dev->of_node, +"calxeda,smmu-secure-config-access" )) + smmu->impl = &calxeda_impl; +return smmu; }
drivers/iommu/arm-smmu.c +0 -89
111 lines not on this page · raw message
drivers/iommu/arm-smmu.h +62 -2
78 lines not on this page · raw message
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 13/15 iommu/arm-smmu: Add configuration implementation hook
In reply to Robin MurphyProbing the ID registers and setting up the SMMU configuration is an area where overrides and workarounds may well be needed. Indeed, the Cavium workaround detection lives there at the moment, so let's break that out.
--- drivers/iommu/arm-smmu-impl.c | 24 ++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 17 +++-------------- drivers/iommu/arm-smmu.h | 1 + 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/iommu/arm-smmu-impl.c +24 -0
@@ -47,11 +47,35 @@ const struct arm_smmu_impl calxeda_impl = { }; +static int cavium_cfg_probe (struct arm_smmu_device *smmu) +{ +static atomic_t context_count =ATOMIC_INIT (0 ); +/* +* Cavium CN88xx erratum #27704. +* Ensure ASID and VMID allocation is unique across all SMMUs in +* the system. +*/ + smmu->cavium_id_base =atomic_fetch_add (smmu->num_context_banks, + &context_count); +dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" ); + +return 0 ; +} + +const struct arm_smmu_impl cavium_impl = { + .cfg_probe = cavium_cfg_probe, +}; + +struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu) { +/* The current quirks happen to be mutually-exclusive */ if (of_property_read_bool (smmu->dev->of_node,"calxeda,smmu-secure-config-access" )) smmu->impl = &calxeda_impl; +if (smmu->model ==CAVIUM_SMMUV2 ) + smmu->impl = &cavium_impl; +return smmu; }
drivers/iommu/arm-smmu.c +3 -14
@@ -155,8 +155,6 @@ struct arm_smmu_domain {struct iommu_domain domain; }; -static atomic_t cavium_smmu_context_count =ATOMIC_INIT (0 ); -static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu)
@@ -1804,18 +1802,6 @@ 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; -dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" ); - } smmu->cbs =devm_kcalloc (smmu->dev, smmu->num_context_banks,sizeof (*smmu->cbs),GFP_KERNEL );if (!smmu->cbs)
@@ -1884,6 +1870,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)dev_notice (smmu->dev,"\tStage-2: %lu-bit IPA -> %lu-bit PA\n" , smmu->ipa_size, smmu->pa_size); +if (smmu->impl && smmu->impl->cfg_probe) +return smmu->impl->cfg_probe (smmu); +return 0 ; }
drivers/iommu/arm-smmu.h +1 -0
@@ -287,6 +287,7 @@ struct arm_smmu_impl {u64 (*read_reg64)(struct arm_smmu_device *smmu,int page,int offset);void (*write_reg64)(struct arm_smmu_device *smmu,int page,int offset,u64 val); +int (*cfg_probe)(struct arm_smmu_device *smmu); };static inline void __iomem *arm_smmu_page (struct arm_smmu_device *smmu,int n)
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 14/15 iommu/arm-smmu: Add reset implementation hook
In reply to Robin MurphyReset is an activity rife with implementation-defined poking. Add a corresponding hook, and use it to encapsulate the existing MMU-500 details.
--- drivers/iommu/arm-smmu-impl.c | 49 +++++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 39 +++------------------------- drivers/iommu/arm-smmu.h | 1 + 3 files changed, 54 insertions(+), 35 deletions(-)
drivers/iommu/arm-smmu-impl.c +49 -0
@@ -4,6 +4,7 @@#define pr_fmt (fmt) "arm-smmu: " fmt +#include <linux/bitfield.h> #include <linux/of.h> #include "arm-smmu.h"
@@ -67,6 +68,51 @@ const struct arm_smmu_impl cavium_impl = { }; +#define ARM_MMU500_ACTLR_CPRE (1 << 1) + +#define ARM_MMU500_ACR_CACHE_LOCK (1 << 26) +#define ARM_MMU500_ACR_S2CRB_TLBEN (1 << 10) +#define ARM_MMU500_ACR_SMTNMB_TLBEN (1 << 8) + +static int arm_mmu500_reset (struct arm_smmu_device *smmu) +{ +u32 reg, major; +int i; +/* +* On MMU-500 r2p0 onwards we need to clear ACR.CACHE_LOCK before +* writes to the context bank ACTLRs will stick. And we just hope that +* Secure has also cleared SACR.CACHE_LOCK for this to take effect... +*/ + reg =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID7 ); + major =FIELD_GET (ID7_MAJOR , reg); + reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sACR); +if (major >=2 ) + reg &= ~ARM_MMU500_ACR_CACHE_LOCK ; +/* +* Allow unmatched Stream IDs to allocate bypass +* TLB entries for reduced latency. +*/ + reg |=ARM_MMU500_ACR_SMTNMB_TLBEN |ARM_MMU500_ACR_S2CRB_TLBEN ; +arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sACR, reg); + +/* +* Disable MMU-500's not-particularly-beneficial next-page +* prefetcher for the sake of errata #841119 and #826419. +*/ +for (i =0 ; i < smmu->num_context_banks; ++i) { + reg =arm_smmu_read_cb (smmu, i,ARM_SMMU_CB_ACTLR ); + reg &= ~ARM_MMU500_ACTLR_CPRE ; +arm_smmu_write_cb (smmu, i,ARM_SMMU_CB_ACTLR , reg); + } + +return 0 ; +} + +const struct arm_smmu_impl arm_mmu500_impl = { + .reset = arm_mmu500_reset, +}; + +struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu) {/* The current quirks happen to be mutually-exclusive */
@@ -77,5 +123,8 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)if (smmu->model ==CAVIUM_SMMUV2 ) smmu->impl = &cavium_impl; +if (smmu->model ==ARM_MMU500 ) + smmu->impl = &arm_mmu500_impl; +return smmu; }
drivers/iommu/arm-smmu.c +4 -35
@@ -54,12 +54,6 @@*/ #define QCOM_DUMMY_VAL -1 -#define ARM_MMU500_ACTLR_CPRE (1 << 1) - -#define ARM_MMU500_ACR_CACHE_LOCK (1 << 26) -#define ARM_MMU500_ACR_S2CRB_TLBEN (1 << 10) -#define ARM_MMU500_ACR_SMTNMB_TLBEN (1 << 8) -#define TLB_LOOP_TIMEOUT 1000000/* 1s! */ #define TLB_SPIN_COUNT 10
@@ -1574,7 +1568,7 @@ static struct iommu_ops arm_smmu_ops = {static void arm_smmu_device_reset (struct arm_smmu_device *smmu) {int i; -u32 reg, major; +u32 reg;/* clear global FSR */ reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sGFSR);
@@ -1587,38 +1581,10 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)for (i =0 ; i < smmu->num_mapping_groups; ++i)arm_smmu_write_sme (smmu, i); -if (smmu->model ==ARM_MMU500 ) { -/* -* Before clearing ARM_MMU500_ACTLR_CPRE, need to -* clear CACHE_LOCK bit of ACR first. And, CACHE_LOCK -* bit is only present in MMU-500r2 onwards. -*/ - reg =arm_smmu_read_gr0 (smmu,ARM_SMMU_GR0_ID7 ); - major =FIELD_GET (ID7_MAJOR , reg); - reg =arm_smmu_read_gr0 (smmu, ARM_SMMU_GR0_sACR); -if (major >=2 ) - reg &= ~ARM_MMU500_ACR_CACHE_LOCK ; -/* -* Allow unmatched Stream IDs to allocate bypass -* TLB entries for reduced latency. -*/ - reg |=ARM_MMU500_ACR_SMTNMB_TLBEN |ARM_MMU500_ACR_S2CRB_TLBEN ; -arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sACR, reg); - } -/* Make sure all context banks are disabled and clear CB_FSR */ for (i =0 ; i < smmu->num_context_banks; ++i) {arm_smmu_write_context_bank (smmu, i);arm_smmu_write_cb (smmu, i,ARM_SMMU_CB_FSR ,FSR_FAULT ); -/* -* Disable MMU-500's not-particularly-beneficial next-page -* prefetcher for the sake of errata #841119 and #826419. -*/ -if (smmu->model ==ARM_MMU500 ) { - reg =arm_smmu_read_cb (smmu, i,ARM_SMMU_CB_ACTLR ); - reg &= ~ARM_MMU500_ACTLR_CPRE ; -arm_smmu_write_cb (smmu, i,ARM_SMMU_CB_ACTLR , reg); - } }/* Invalidate the TLB, just in case */
@@ -1652,6 +1618,9 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)if (smmu->features &ARM_SMMU_FEAT_EXIDS ) reg |= sCR0_EXIDENABLE; +if (smmu->impl && smmu->impl->reset) + smmu->impl->reset (smmu); +/* Push the button */ arm_smmu_tlb_sync_global (smmu);arm_smmu_write_gr0 (smmu, ARM_SMMU_GR0_sCR0, reg);
drivers/iommu/arm-smmu.h +1 -0
@@ -288,6 +288,7 @@ struct arm_smmu_impl {void (*write_reg64)(struct arm_smmu_device *smmu,int page,int offset,u64 val);int (*cfg_probe)(struct arm_smmu_device *smmu); +int (*reset)(struct arm_smmu_device *smmu); };static inline void __iomem *arm_smmu_page (struct arm_smmu_device *smmu,int n)
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerPATCH 15/15 iommu/arm-smmu: Add context init implementation hook
In reply to Robin MurphyAllocating and initialising a context for a domain is another point where certain implementations are known to want special behaviour. Currently the other half of the Cavium workaround comes into play here, so let's finish the job to get the whole thing right out of the way.
--- drivers/iommu/arm-smmu-impl.c | 39 +++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 51 +++++++---------------------------- drivers/iommu/arm-smmu.h | 42 +++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 46 deletions(-)
drivers/iommu/arm-smmu-impl.c +37 -2
@@ -48,6 +48,12 @@ const struct arm_smmu_impl calxeda_impl = { }; +struct cavium_smmu { +struct arm_smmu_device smmu; +u32 id_base; +}; +#define to_csmmu (s) container_of(s, struct cavium_smmu, smmu) +static int cavium_cfg_probe (struct arm_smmu_device *smmu) {static atomic_t context_count =ATOMIC_INIT (0 );
@@ -56,17 +62,46 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu)* Ensure ASID and VMID allocation is unique across all SMMUs in * the system. */ - smmu->cavium_id_base =atomic_fetch_add (smmu->num_context_banks, +to_csmmu (smmu)->id_base =atomic_fetch_add (smmu->num_context_banks, &context_count);dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" );return 0 ; } +int cavium_init_context (struct arm_smmu_domain *smmu_domain) +{ +u32 id_base =to_csmmu (smmu_domain->smmu)->id_base; + +if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S2 ) + smmu_domain->cfg.vmid += id_base; +else + smmu_domain->cfg.asid += id_base; + +return 0 ; +} +const struct arm_smmu_impl cavium_impl = { .cfg_probe = cavium_cfg_probe, + .init_context = cavium_init_context, }; +struct arm_smmu_device *cavium_smmu_impl_init (struct arm_smmu_device *smmu) +{ +struct cavium_smmu *csmmu; + + csmmu =devm_kzalloc (smmu->dev,sizeof (*csmmu),GFP_KERNEL ); +if (!csmmu) +return ERR_PTR (-ENOMEM ); + + csmmu->smmu = *smmu; + csmmu->smmu.impl = &cavium_impl; + +devm_kfree (smmu->dev, smmu); + +return &csmmu->smmu; +} +#define ARM_MMU500_ACTLR_CPRE (1 << 1)
@@ -121,7 +156,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) smmu->impl = &calxeda_impl;if (smmu->model ==CAVIUM_SMMUV2 ) - smmu->impl = &cavium_impl; +return cavium_smmu_impl_init (smmu);if (smmu->model ==ARM_MMU500 ) smmu->impl = &arm_mmu500_impl;
drivers/iommu/arm-smmu.c +9 -42
76 lines not on this page · raw message
drivers/iommu/arm-smmu.h +40 -2
66 lines not on this page · raw message
Signature · 6 lines
2.21.0.dirty _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH 15/15] iommu/arm-smmu: Add context init implementation hook
Validated the entire patch set on Tegra194 SOC based platform and confirmed that arm-smmu driver is functional as it has been.
-KR
-----Original Message-----
From: Robin Murphy <[email protected]>
Sent: Friday, August 9, 2019 10:08 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Krishna Reddy <[email protected]>; [email protected]; [email protected]
Subject: [PATCH 15/15] iommu/arm-smmu: Add context init implementation hook
Allocating and initialising a context for a domain is another point where certain implementations are known to want special behaviour. Currently the other half of the Cavium workaround comes into play here, so let's finish the job to get the whole thing right out of the way.
--- drivers/iommu/arm-smmu-impl.c | 39 +++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 51 +++++++---------------------------- drivers/iommu/arm-smmu.h | 42 +++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 46 deletions(-)
drivers/iommu/arm-smmu-impl.c +6 -0
@@ -48,6 +48,12 @@ const struct arm_smmu_impl calxeda_impl = { }; +struct cavium_smmu { +struct arm_smmu_device smmu; +u32 id_base; +}; +#define to_csmmu (s) container_of(s, struct cavium_smmu, smmu) +static int cavium_cfg_probe (struct arm_smmu_device *smmu) { static atomic_t context_count = ATOMIC_INIT(0); @@ -56,17 +62,46 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu) * Ensure ASID and VMID allocation is unique across all SMMUs in * the system.
*/
- smmu->cavium_id_base = atomic_fetch_add(smmu->num_context_banks,
+ to_csmmu(smmu)->id_base = atomic_fetch_add(smmu->num_context_banks,
&context_count);
dev_notice(smmu->dev, "\tenabling workaround for Cavium erratum 27704\n");
return 0;
}
+int cavium_init_context(struct arm_smmu_domain *smmu_domain) {
+ u32 id_base = to_csmmu(smmu_domain->smmu)->id_base;
+
+ if (smmu_domain->stage == ARM_SMMU_DOMAIN_S2)
+ smmu_domain->cfg.vmid += id_base;
+ else
+ smmu_domain->cfg.asid += id_base;
+
+ return 0;
+}
+
const struct arm_smmu_impl cavium_impl = {
.cfg_probe = cavium_cfg_probe,
+ .init_context = cavium_init_context,
};
+struct arm_smmu_device *cavium_smmu_impl_init(struct arm_smmu_device +*smmu) {
+ struct cavium_smmu *csmmu;
+
+ csmmu = devm_kzalloc(smmu->dev, sizeof(*csmmu), GFP_KERNEL);
+ if (!csmmu)
+ return ERR_PTR(-ENOMEM);
+
+ csmmu->smmu = *smmu;
+ csmmu->smmu.impl = &cavium_impl;
+
+ devm_kfree(smmu->dev, smmu);
+
+ return &csmmu->smmu;
+}
+
#define ARM_MMU500_ACTLR_CPRE (1 << 1)
@@ -121,7 +156,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)
smmu->impl = &calxeda_impl;
if (smmu->model == CAVIUM_SMMUV2)
- smmu->impl = &cavium_impl;
+ return cavium_smmu_impl_init(smmu);
if (smmu->model == ARM_MMU500)
smmu->impl = &arm_mmu500_impl;
drivers/iommu/arm-smmu.c +0 -2
@@ -27,7 +27,6 @@#include <linux/interrupt.h> #include <linux/io.h> #include <linux/io-64-nonatomic-hi-lo.h> -#include <linux/io-pgtable.h> #include <linux/iopoll.h> #include <linux/init.h> #include <linux/moduleparam.h> @@ -111,44 +110,6 @@ struct arm_smmu_master_cfg { #define for_each_cfg_sme(fw, i, idx) \ for (i = 0; idx = fwspec_smendx(fw, i), i < fw->num_ids; ++i) -enum arm_smmu_context_fmt { - ARM_SMMU_CTX_FMT_NONE,
- ARM_SMMU_CTX_FMT_AARCH64,
- ARM_SMMU_CTX_FMT_AARCH32_L,
- ARM_SMMU_CTX_FMT_AARCH32_S,
-};
-
-struct arm_smmu_cfg {
- u8 cbndx;
- u8 irptndx;
- union {
- u16 asid;
- u16 vmid;
- };
- enum arm_smmu_cbar_type cbar;
- enum arm_smmu_context_fmt fmt;
-};
-#define INVALID_IRPTNDX 0xff
-
-enum arm_smmu_domain_stage {
- ARM_SMMU_DOMAIN_S1 = 0,
- ARM_SMMU_DOMAIN_S2,
- ARM_SMMU_DOMAIN_NESTED,
- ARM_SMMU_DOMAIN_BYPASS,
-};
-
-struct arm_smmu_domain {
- struct arm_smmu_device *smmu;
- struct io_pgtable_ops *pgtbl_ops;
- const struct iommu_gather_ops *tlb_ops;
- struct arm_smmu_cfg cfg;
- enum arm_smmu_domain_stage stage;
- bool non_strict;
- struct mutex init_mutex; /* Protects smmu pointer */
- spinlock_t cb_lock; /* Serialises ATS1* ops and TLB syncs */
- struct iommu_domain domain;
-};
-
static bool using_legacy_binding, using_generic_binding;
static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu) @@ -749,9 +710,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
}
if (smmu_domain->stage == ARM_SMMU_DOMAIN_S2)
- cfg->vmid = cfg->cbndx + 1 + smmu->cavium_id_base;
+ cfg->vmid = cfg->cbndx + 1;
else
- cfg->asid = cfg->cbndx + smmu->cavium_id_base;
+ cfg->asid = cfg->cbndx;
+
+ smmu_domain->smmu = smmu;
+ if (smmu->impl && smmu->impl->init_context) {
+ ret = smmu->impl->init_context(smmu_domain);
+ if (ret)
+ goto out_unlock;
+ }
pgtbl_cfg = (struct io_pgtable_cfg) {
.pgsize_bitmap = smmu->pgsize_bitmap,
@@ -765,7 +733,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
if (smmu_domain->non_strict)
pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;
- smmu_domain->smmu = smmu;
pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain); if (!pgtbl_ops) {
ret = -ENOMEM;
drivers/iommu/arm-smmu.h +40 -2
66 lines not on this page · raw message
--
2.21.0.dirty
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerRe: [PATCH 15/15] iommu/arm-smmu: Add context init implementation hook
In reply to Robin MurphyQuoted 17 lines · Robin Murphy
Allocating and initialising a context for a domain is another point where certain implementations are known to want special behaviour. Currently the other half of the Cavium workaround comes into play here, so let's finish the job to get the whole thing right out of the way.
Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu-impl.c | 39 +++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 51 +++++++---------------------------- drivers/iommu/arm-smmu.h | 42 +++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 46 deletions(-)drivers/iommu/arm-smmu-impl.c +0
-0
drivers/iommu/arm-smmu-impl.c const struct arm_smmu_impl calxeda_impl = { · line 55
Quoted 8 lines
drivers/iommu/arm-smmu-impl.c +5
-0@@ -48,6 +48,12 @@ const struct arm_smmu_impl calxeda_impl = { }; +struct cavium_smmu { +struct arm_smmu_device smmu; +u32 id_base; +}; +#define to_csmmu (s) container_of(s, struct cavium_smmu, smmu)
To be honest with you, I'd just use container_of directly for the two callsites that need it. "to_csmmu" isn't a great name when we're also got the calxeda thing in here.
Quoted 52 lines
drivers/iommu/arm-smmu-impl.c +30
-1static int cavium_cfg_probe (struct arm_smmu_device *smmu) {static atomic_t context_count =ATOMIC_INIT (0 );@@ -56,17 +62,46 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu)* Ensure ASID and VMID allocation is unique across all SMMUs in * the system. */ - smmu->cavium_id_base =atomic_fetch_add (smmu->num_context_banks, +to_csmmu (smmu)->id_base =atomic_fetch_add (smmu->num_context_banks, &context_count);dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" );return 0 ; } +int cavium_init_context (struct arm_smmu_domain *smmu_domain) +{ +u32 id_base =to_csmmu (smmu_domain->smmu)->id_base; + +if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S2 ) + smmu_domain->cfg.vmid += id_base; +else + smmu_domain->cfg.asid += id_base; + +return 0 ; +} +const struct arm_smmu_impl cavium_impl = { .cfg_probe = cavium_cfg_probe, + .init_context = cavium_init_context, }; +struct arm_smmu_device *cavium_smmu_impl_init (struct arm_smmu_device *smmu) +{ +struct cavium_smmu *csmmu; + + csmmu =devm_kzalloc (smmu->dev,sizeof (*csmmu),GFP_KERNEL ); +if (!csmmu) +return ERR_PTR (-ENOMEM ); + + csmmu->smmu = *smmu; + csmmu->smmu.impl = &cavium_impl; + +devm_kfree (smmu->dev, smmu); + +return &csmmu->smmu; +} +#define ARM_MMU500_ACTLR_CPRE (1 << 1)
drivers/iommu/arm-smmu-impl.c struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) · line 162
Quoted 8 lines
drivers/iommu/arm-smmu-impl.c +1
-1@@ -121,7 +156,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) smmu->impl = &calxeda_impl;if (smmu->model ==CAVIUM_SMMUV2 ) - smmu->impl = &cavium_impl; +return cavium_smmu_impl_init (smmu);if (smmu->model ==ARM_MMU500 ) smmu->impl = &arm_mmu500_impl;
Maybe rework this so we do the calxeda detection first (and return if we match), followed by a switch on smmu->model to make it crystal clear that we match only one?
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH 15/15] iommu/arm-smmu: Add context init implementation hook
Quoted 21 lines · Will Deacon
Quoted 20 lines · Robin Murphy
Allocating and initialising a context for a domain is another point where certain implementations are known to want special behaviour. Currently the other half of the Cavium workaround comes into play here, so let's finish the job to get the whole thing right out of the way.
Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu-impl.c | 39 +++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 51 +++++++---------------------------- drivers/iommu/arm-smmu.h | 42 +++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 46 deletions(-)drivers/iommu/arm-smmu-impl.c +0
-0@@ -48,6 +48,12 @@ const struct arm_smmu_impl calxeda_impl = { };
Quoted 9 lines
drivers/iommu/arm-smmu-impl.c const struct arm_smmu_impl calxeda_impl = { · line 55
Quoted 5 lines
drivers/iommu/arm-smmu-impl.c +5
-0+struct cavium_smmu { +struct arm_smmu_device smmu; +u32 id_base; +}; +#define to_csmmu (s) container_of(s, struct cavium_smmu, smmu)To be honest with you, I'd just use
container_ofdirectly for the two callsites that need it. "to_csmmu" isn't a great name when we're also got the calxeda thing in here.
Sure, by this point I was mostly just going for completeness in terms of sketching out an example for subclassing arm_smmu_device. The Tegra patches will now serve as a more complete example anyway, so indeed we can live without it here.
Quoted 58 lines
Quoted 58 lines
drivers/iommu/arm-smmu-impl.c +31
-2static int cavium_cfg_probe (struct arm_smmu_device *smmu) {static atomic_t context_count =ATOMIC_INIT (0 );@@ -56,17 +62,46 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu)* Ensure ASID and VMID allocation is unique across all SMMUs in * the system. */ - smmu->cavium_id_base =atomic_fetch_add (smmu->num_context_banks, +to_csmmu (smmu)->id_base =atomic_fetch_add (smmu->num_context_banks, &context_count);dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" );return 0 ; } +int cavium_init_context (struct arm_smmu_domain *smmu_domain) +{ +u32 id_base =to_csmmu (smmu_domain->smmu)->id_base; + +if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S2 ) + smmu_domain->cfg.vmid += id_base; +else + smmu_domain->cfg.asid += id_base; + +return 0 ; +} +const struct arm_smmu_impl cavium_impl = { .cfg_probe = cavium_cfg_probe, + .init_context = cavium_init_context, }; +struct arm_smmu_device *cavium_smmu_impl_init (struct arm_smmu_device *smmu) +{ +struct cavium_smmu *csmmu; + + csmmu =devm_kzalloc (smmu->dev,sizeof (*csmmu),GFP_KERNEL ); +if (!csmmu) +return ERR_PTR (-ENOMEM ); + + csmmu->smmu = *smmu; + csmmu->smmu.impl = &cavium_impl; + +devm_kfree (smmu->dev, smmu); + +return &csmmu->smmu; +} +#define ARM_MMU500_ACTLR_CPRE (1 << 1)@@ -121,7 +156,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) smmu->impl = &calxeda_impl;if (smmu->model ==CAVIUM_SMMUV2 ) - smmu->impl = &cavium_impl; +return cavium_smmu_impl_init (smmu);
Quoted 6 lines
drivers/iommu/arm-smmu-impl.c struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) · line 162
Quoted 2 lines
drivers/iommu/arm-smmu-impl.c +0
-0if (smmu->model ==ARM_MMU500 ) smmu->impl = &arm_mmu500_impl;Maybe rework this so we do the calxeda detection first (and return if we match), followed by a switch on
smmu->modelto make it crystal clear that we match only one?
As I see it, "match only one" is really only a short-term thing, though, so I didn't want to get *too* hung up on it. Ultimately we're going to have cases where we need to combine e.g. MMU-500 implementation quirks with platform integration quirks - I've been mostly planning on coming back to think about that (and potentially rework this whole logic) later, but I guess it wouldn't hurt to plan out a bit more structure from the start.
I'll have a hack on that (and all the other comments) today and hopefully have a v2 by tomorrow.
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 15/15] iommu/arm-smmu: Add context init implementation hook
Quoted 93 lines · Robin Murphy
Quoted 13 lines · Will Deacon
Quoted 12 lines · Robin Murphy
Allocating and initialising a context for a domain is another point where certain implementations are known to want special behaviour. Currently the other half of the Cavium workaround comes into play here, so let's finish the job to get the whole thing right out of the way.
Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/arm-smmu-impl.c | 39 +++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 51 +++++++---------------------------- drivers/iommu/arm-smmu.h | 42 +++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 46 deletions(-)Quoted 15 lines
drivers/iommu/arm-smmu-impl.c const struct arm_smmu_impl calxeda_impl = { · line 53
Quoted 11 lines
drivers/iommu/arm-smmu-impl.c +5
-0@@ -48,6 +48,12 @@ const struct arm_smmu_impl calxeda_impl = { }; +struct cavium_smmu { +struct arm_smmu_device smmu; +u32 id_base; +}; +#define to_csmmu (s) container_of(s, struct cavium_smmu, smmu)To be honest with you, I'd just use
container_ofdirectly for the two callsites that need it. "to_csmmu" isn't a great name when we're also got the calxeda thing in here.Sure, by this point I was mostly just going for completeness in terms of sketching out an example for subclassing
arm_smmu_device. The Tegra patches will now serve as a more complete example anyway, so indeed we can live without it here.Quoted 49 lines
Quoted 49 lines
drivers/iommu/arm-smmu-impl.c +30
-1static int cavium_cfg_probe (struct arm_smmu_device *smmu) {static atomic_t context_count =ATOMIC_INIT (0 );@@ -56,17 +62,46 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu)* Ensure ASID and VMID allocation is unique across all SMMUs in * the system. */ - smmu->cavium_id_base =atomic_fetch_add (smmu->num_context_banks, +to_csmmu (smmu)->id_base =atomic_fetch_add (smmu->num_context_banks, &context_count);dev_notice (smmu->dev,"\tenabling workaround for Cavium erratum 27704\n" );return 0 ; } +int cavium_init_context (struct arm_smmu_domain *smmu_domain) +{ +u32 id_base =to_csmmu (smmu_domain->smmu)->id_base; + +if (smmu_domain->stage ==ARM_SMMU_DOMAIN_S2 ) + smmu_domain->cfg.vmid += id_base; +else + smmu_domain->cfg.asid += id_base; + +return 0 ; +} +const struct arm_smmu_impl cavium_impl = { .cfg_probe = cavium_cfg_probe, + .init_context = cavium_init_context, }; +struct arm_smmu_device *cavium_smmu_impl_init (struct arm_smmu_device *smmu) +{ +struct cavium_smmu *csmmu; + + csmmu =devm_kzalloc (smmu->dev,sizeof (*csmmu),GFP_KERNEL ); +if (!csmmu) +return ERR_PTR (-ENOMEM ); + + csmmu->smmu = *smmu; + csmmu->smmu.impl = &cavium_impl; + +devm_kfree (smmu->dev, smmu); + +return &csmmu->smmu; +} +#define ARM_MMU500_ACTLR_CPRE (1 << 1)@@ -121,7 +156,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) smmu->impl = &calxeda_impl;if (smmu->model ==CAVIUM_SMMUV2 )Quoted 8 lines
drivers/iommu/arm-smmu-impl.c struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) · line 162
Quoted 4 lines
drivers/iommu/arm-smmu-impl.c +1
-1- smmu->impl = &cavium_impl; +return cavium_smmu_impl_init (smmu);if (smmu->model ==ARM_MMU500 ) smmu->impl = &arm_mmu500_impl;Maybe rework this so we do the calxeda detection first (and return if we match), followed by a switch on
smmu->modelto make it crystal clear that we match only one?
Quoted 6 lines
As I see it, "match only one" is really only a short-term thing, though, so I didn't want to get *too* hung up on it. Ultimately we're going to have cases where we need to combine e.g. MMU-500 implementation quirks with platform integration quirks - I've been mostly planning on coming back to think about that (and potentially rework this whole logic) later, but I guess it wouldn't hurt to plan out a bit more structure from the start.
I was going to ask something similar. I'm guessing that the intent is that we'll eventually we'll have a couple of arm-smmu-<vendor>.c files and we'll need some sort of centralized place to set up the smmu->impl pointer. I had figured that it would be table based or something, but you make a good point about mixing and matching different workarounds. I don't really have a solution, just something I'm pondering while I'm thinking about how to start merging some of the qcom stuff into this.
Jordan
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewer...and of course I had to forget someone's cc - sorry Jordan! :(
Robin.
Quoted 50 lines · Robin Murphy
Hi all,
This is a big refactoring of arm-smmu in order to help cope with the various divergent implementation details currently flying around. So far we've been accruing various quirks and errata workarounds within the main flow of the driver, but given that it's written to an architecture rather than any particular hardware implementation, after a point these start to become increasingly invasive and potentially conflict with each other.
These patches clean up the existing quirks handled by the driver to lay a foundation on which we can continue to add more in a maintainable fashion. The idea is that major vendor customisations can then be kept in arm-smmu-<vendor>.c implementation files out of each others' way.
A branch is available at:
git://linux-arm.org/linux-rmiommu/smmu-implwhich I'll probably keep tweaking until I'm happy with the names of things; I just didn't want to delay this initial posting any lomnger.
Robin.
Robin Murphy (15):
iommu/arm-smmu: Convert GR0 registers to bitfields iommu/arm-smmu: Convert GR1 registers to bitfields iommu/arm-smmu: Convert context bank registers to bitfields iommu/arm-smmu: Reworkcb_basehandling iommu/arm-smmu: Splitarm_smmu_tlb_inv_range_nosync()iommu/arm-smmu: Get rid of weird "atomic" write iommu/arm-smmu: Abstract GR1 accesses iommu/arm-smmu: Abstract context bank accesses iommu/arm-smmu: Abstract GR0 accesses iommu/arm-smmu: Renamearm-smmu-regs.hiommu/arm-smmu: Add implementation infrastructure iommu/arm-smmu: Move Secure access quirk to implementation iommu/arm-smmu: Add configuration implementation hook iommu/arm-smmu: Add reset implementation hook iommu/arm-smmu: Add context init implementation hookMAINTAINERS | 3 +- drivers/iommu/Makefile | 2 +- drivers/iommu/arm-smmu-impl.c | 165 ++++++++++ drivers/iommu/arm-smmu-regs.h | 210 ------------- drivers/iommu/arm-smmu.c | 570 +++++++++++----------------------- drivers/iommu/arm-smmu.h | 386 +++++++++++++++++++++++ drivers/iommu/qcom_iommu.c | 15 +- 7 files changed, 743 insertions(+), 608 deletions(-)
Quoted 4 lines
create mode 100644
drivers/iommu/arm-smmu-impl.cdelete mode 100644drivers/iommu/arm-smmu-regs.hcreate mode 100644drivers/iommu/arm-smmu.h
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerHi Robin,
Quoted 13 lines · Robin Murphy
This is a big refactoring of arm-smmu in order to help cope with the various divergent implementation details currently flying around. So far we've been accruing various quirks and errata workarounds within the main flow of the driver, but given that it's written to an architecture rather than any particular hardware implementation, after a point these start to become increasingly invasive and potentially conflict with each other.
These patches clean up the existing quirks handled by the driver to lay a foundation on which we can continue to add more in a maintainable fashion. The idea is that major vendor customisations can then be kept in arm-smmu-<vendor>.c implementation files out of each others' way.
Quoted 6 lines
A branch is available at:
git://linux-arm.org/linux-rmiommu/smmu-implwhich I'll probably keep tweaking until I'm happy with the names of things; I just didn't want to delay this initial posting any lomnger.
Thanks, this all looks pretty decent to me. I've mainly left you a bunch of nits (hey, it's a refactoring series!) but I did spot one pre-existing howler that we should address.
When do you think you'll have stopped tweaking this so that I can pick it up? I'd really like to see it in 5.4 so that others can start working on top of it.
Cheers,
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu