iommu/arm-smmu: Add Adreno SMMU specific implementation
Subsystems (8)
v10 cover iommu/arm-smmu: Add Adreno SMMU specific implementation
(reworded the summary to reflect ongoing changes in the code)
This series adds an Adreno SMMU implementation to arm-smmu to allow GPU hardware pagetable switching.
The Adreno GPU has built in capabilities to switch the TTBR0 pagetable during runtime to allow each individual instance or application to have its own pagetable. In order to take advantage of the HW capabilities there are certain requirements needed of the SMMU hardware.
This series adds support for an Adreno specific arm-smmu implementation. The new implementation 1) ensures that the GPU domain is always assigned context bank 0,
2) enables split pagetable support (TTBR1) so that the instance specific pagetable can be swapped while the global memory remains in place and 3) shares the current pagetable configuration with the GPU driver to allow it to create its own io-pgtable instances.
The series then adds the drm/msm code to enable these features. For targets that support it allocate new pagetables using the io-pgtable configuration shared by the arm-smmu driver and swap them in during runtime.
This version of the series merges the previous patchset(s) [1] and [2] with the following improvements:
- arm-smmu: add implementation hook to allocate context banks
- arm-smmu: Match the GPU domain by stream ID instead of compatible string
- arm-smmu: Make DOMAIN_ATTR_PGTABLE_CFG bi-directional. The leaf driver queries the configuration to create a pagetable and then sends the newly created configuration back to the smmu-driver to enable TTBR0
- drm/msm: Add context reference counting for submissions
- drm/msm: Use dummy functions to skip TLB operations on per-instance pagetables
[1] https://lists.linuxfoundation.org/pipermail/iommu/2020-June/045653.html
[2] https://lists.linuxfoundation.org/pipermail/iommu/2020-June/045659.html
Jordan Crouse (13):
iommu/arm-smmu: Pass io-pgtable config to implementation specific
function
iommu/arm-smmu: Add support for split pagetables iommu/arm-smmu: Add implementation hooks to configure contexts iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
iommu: Add a domain attribute to get/set a pagetable configuration iommu/arm-smmu-qcom: Get and set the pagetable config for split
pagetables
dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU drm/msm: Add a context pointer to the submitqueue drm/msm: Set the global virtual address range from the IOMMU domain drm/msm: Add support to create a local pagetable drm/msm: Add support for private address space instances drm/msm/a6xx: Add support for per-instance pagetables
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
.../devicetree/bindings/iommu/arm,smmu.yaml | 4 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 58 ++++- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 18 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +- drivers/gpu/drm/msm/msm_drv.c | 16 +- drivers/gpu/drm/msm/msm_drv.h | 13 ++ drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- drivers/gpu/drm/msm/msm_gem_vma.c | 9 + drivers/gpu/drm/msm/msm_gpu.c | 26 ++- drivers/gpu/drm/msm/msm_gpu.h | 12 +- drivers/gpu/drm/msm/msm_gpummu.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 198 +++++++++++++++++- drivers/gpu/drm/msm/msm_mmu.h | 16 +- drivers/gpu/drm/msm/msm_ringbuffer.h | 1 + drivers/gpu/drm/msm/msm_submitqueue.c | 8 +- drivers/iommu/arm-smmu-impl.c | 6 +- drivers/iommu/arm-smmu-qcom.c | 130 +++++++++++- drivers/iommu/arm-smmu.c | 108 +++++----- drivers/iommu/arm-smmu.h | 65 +++++- include/linux/iommu.h | 1 + 24 files changed, 619 insertions(+), 99 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 1/13 iommu/arm-smmu: Pass io-pgtable config to implementation specific function
Construct the io-pgtable config before calling the implementation specific init_context function and pass it so the implementation specific function can get a chance to change it before the io-pgtable is created.
---
drivers/iommu/arm-smmu-impl.c | 3 ++- drivers/iommu/arm-smmu.c | 11 ++++++----- drivers/iommu/arm-smmu.h | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-)
drivers/iommu/arm-smmu-impl.c +2 -1
@@ -68,7 +68,8 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu)return 0 ; } -static int cavium_init_context (struct arm_smmu_domain *smmu_domain) +static int cavium_init_context (struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *pgtbl_cfg) {struct cavium_smmu *cs =container_of (smmu_domain->smmu, struct cavium_smmu, smmu);
drivers/iommu/arm-smmu.c +6 -5
@@ -797,11 +797,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 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,
@@ -812,6 +807,12 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, .iommu_dev = smmu->dev, }; +if (smmu->impl && smmu->impl->init_context) { + ret = smmu->impl->init_context (smmu_domain, &pgtbl_cfg); +if (ret) + goto out_clear_smmu; + } +if (smmu_domain->non_strict) pgtbl_cfg.quirks |=IO_PGTABLE_QUIRK_NON_STRICT ;
drivers/iommu/arm-smmu.h +2 -1
@@ -383,7 +383,8 @@ struct arm_smmu_impl { u64 val);int (*cfg_probe)(struct arm_smmu_device *smmu);int (*reset)(struct arm_smmu_device *smmu); -int (*init_context)(struct arm_smmu_domain *smmu_domain); +int (*init_context)(struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *cfg);void (*tlb_sync)(struct arm_smmu_device *smmu,int page,int sync,int status);int (*def_domain_type)(struct device *dev);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v10 2/13 iommu/arm-smmu: Add support for split pagetables
In reply to Jordan CrouseEnable TTBR1 for a context bank if IO_PGTABLE_QUIRK_ARM_TTBR1 is selected by the io-pgtable configuration.
---
drivers/iommu/arm-smmu.c | 21 ++++++++++++++++----- drivers/iommu/arm-smmu.h | 25 +++++++++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-)
drivers/iommu/arm-smmu.c +16 -5
@@ -555,11 +555,15 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, cb->ttbr[0 ] = pgtbl_cfg->arm_v7s_cfg.ttbr; cb->ttbr[1 ] =0 ; }else { - cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; - cb->ttbr[0 ] |=FIELD_PREP (ARM_SMMU_TTBRn_ASID, - cfg->asid); + cb->ttbr[0 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, + cfg->asid); cb->ttbr[1 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, - cfg->asid); + cfg->asid); + +if (pgtbl_cfg->quirks &IO_PGTABLE_QUIRK_ARM_TTBR1 ) + cb->ttbr[1 ] |= pgtbl_cfg->arm_lpae_s1_cfg.ttbr; +else + cb->ttbr[0 ] |= pgtbl_cfg->arm_lpae_s1_cfg.ttbr; } }else { cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr;
@@ -824,7 +828,14 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,/* Update the domain's page sizes to reflect the page table format */ domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap; - domain->geometry.aperture_end = (1UL << ias) -1 ; + +if (pgtbl_cfg.quirks &IO_PGTABLE_QUIRK_ARM_TTBR1 ) { + domain->geometry.aperture_start = ~0UL << ias; + domain->geometry.aperture_end = ~0UL ; + }else { + domain->geometry.aperture_end = (1UL << ias) -1 ; + } + domain->geometry.force_aperture = true;/* Initialise the context bank with our page table cfg */
drivers/iommu/arm-smmu.h +19 -6
@@ -168,10 +168,12 @@ enum arm_smmu_cbar_type {#define ARM_SMMU_CB_TCR 0x30#define ARM_SMMU_TCR_EAE BIT(31)#define ARM_SMMU_TCR_EPD1 BIT(23) +#define ARM_SMMU_TCR_A1 BIT(22)#define ARM_SMMU_TCR_TG0 GENMASK(15, 14)#define ARM_SMMU_TCR_SH0 GENMASK(13, 12)#define ARM_SMMU_TCR_ORGN0 GENMASK(11, 10)#define ARM_SMMU_TCR_IRGN0 GENMASK(9, 8) +#define ARM_SMMU_TCR_EPD0 BIT(7)#define ARM_SMMU_TCR_T0SZ GENMASK(5, 0)#define ARM_SMMU_VTCR_RES1 BIT(31)
@@ -347,12 +349,23 @@ struct arm_smmu_domain {static inline u32 arm_smmu_lpae_tcr (struct io_pgtable_cfg *cfg) { -return ARM_SMMU_TCR_EPD1 | -FIELD_PREP (ARM_SMMU_TCR_TG0 , cfg->arm_lpae_s1_cfg.tcr.tg) | -FIELD_PREP (ARM_SMMU_TCR_SH0 , cfg->arm_lpae_s1_cfg.tcr.sh) | -FIELD_PREP (ARM_SMMU_TCR_ORGN0 , cfg->arm_lpae_s1_cfg.tcr.orgn) | -FIELD_PREP (ARM_SMMU_TCR_IRGN0 , cfg->arm_lpae_s1_cfg.tcr.irgn) | -FIELD_PREP (ARM_SMMU_TCR_T0SZ , cfg->arm_lpae_s1_cfg.tcr.tsz); +u32 tcr =FIELD_PREP (ARM_SMMU_TCR_TG0 , cfg->arm_lpae_s1_cfg.tcr.tg) | +FIELD_PREP (ARM_SMMU_TCR_SH0 , cfg->arm_lpae_s1_cfg.tcr.sh) | +FIELD_PREP (ARM_SMMU_TCR_ORGN0 , cfg->arm_lpae_s1_cfg.tcr.orgn) | +FIELD_PREP (ARM_SMMU_TCR_IRGN0 , cfg->arm_lpae_s1_cfg.tcr.irgn) | +FIELD_PREP (ARM_SMMU_TCR_T0SZ , cfg->arm_lpae_s1_cfg.tcr.tsz); + +/* +* When TTBR1 is selected shift the TCR fields by 16 bits and disable +* translation in TTBR0 +*/ +if (cfg->quirks &IO_PGTABLE_QUIRK_ARM_TTBR1 ) { + tcr = (tcr <<16 ) & ~ARM_SMMU_TCR_A1 ; + tcr |=ARM_SMMU_TCR_EPD0 ; + }else + tcr |=ARM_SMMU_TCR_EPD1 ; + +return tcr; }static inline u32 arm_smmu_lpae_tcr2 (struct io_pgtable_cfg *cfg)
Signature · 1 line
2.25.1
PATCH v10 3/13 iommu/arm-smmu: Add implementation hooks to configure contexts
In reply to Jordan CrouseAdd a new hook to allow implementations to implement their own context bank allocation scheme and update the existing init_context function to take the device pointer.
These modifications will be used by the upcoming Adreno SMMU implementation to identify the GPU device and properly configure it for pagetable switching.
---
drivers/iommu/arm-smmu-impl.c | 2 +- drivers/iommu/arm-smmu.c | 46 ++++++++++++----------------------- drivers/iommu/arm-smmu.h | 28 ++++++++++++++++++++- 3 files changed, 44 insertions(+), 32 deletions(-)
drivers/iommu/arm-smmu-impl.c +1 -1
@@ -69,7 +69,7 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu) }static int cavium_init_context (struct arm_smmu_domain *smmu_domain, -struct io_pgtable_cfg *pgtbl_cfg) +struct io_pgtable_cfg *pgtbl_cfg,struct device *dev) {struct cavium_smmu *cs =container_of (smmu_domain->smmu, struct cavium_smmu, smmu);
drivers/iommu/arm-smmu.c +16 -30
90 lines not on this page · raw message
drivers/iommu/arm-smmu.h +27 -1
@@ -347,6 +347,11 @@ struct arm_smmu_domain {struct iommu_domain domain; }; +struct arm_smmu_master_cfg { +struct arm_smmu_device *smmu; +s16 smendx[]; +}; +static inline u32 arm_smmu_lpae_tcr (struct io_pgtable_cfg *cfg) { u32 tcr = FIELD_PREP(ARM_SMMU_TCR_TG0, cfg->arm_lpae_s1_cfg.tcr.tg) |
@@ -397,12 +402,33 @@ struct arm_smmu_impl {int (*cfg_probe)(struct arm_smmu_device *smmu);int (*reset)(struct arm_smmu_device *smmu);int (*init_context)(struct arm_smmu_domain *smmu_domain, -struct io_pgtable_cfg *cfg); +struct io_pgtable_cfg *cfg,struct device *dev);void (*tlb_sync)(struct arm_smmu_device *smmu,int page,int sync,int status);int (*def_domain_type)(struct device *dev); +int (*alloc_context_bank)(struct arm_smmu_domain *smmu_domain, +struct device *dev,int start,int max); }; +#define INVALID_SMENDX -1 +#define cfg_smendx (cfg, fw, i) \ + (i >= fw->num_ids ? INVALID_SMENDX : cfg->smendx[i]) +#define for_each_cfg_sme (cfg, fw, i, idx) \ + for (i = 0; idx = cfg_smendx(cfg, fw, i), i < fw->num_ids; ++i) + +static inline int __arm_smmu_alloc_bitmap (unsigned long *map,int start,int end) +{ +int idx; + +do { + idx =find_next_zero_bit (map, end, start); +if (idx == end) +return -ENOSPC ; + }while (test_and_set_bit (idx, map)); + +return idx; +} +static inline void __iomem *arm_smmu_page (struct arm_smmu_device *smmu,int n) {return smmu->base + (n << smmu->pgshift);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v10 4/13 iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
In reply to Jordan CrouseAdd a special implementation for the SMMU attached to most Adreno GPU target triggered from the qcom,adreno-smmu compatible string.
The new Adreno SMMU implementation will enable split pagetables (TTBR1) for the domain attached to the GPU device (SID 0) and hard code it context bank 0 so the GPU hardware can implement per-instance pagetables.
---
drivers/iommu/arm-smmu-impl.c | 3 ++ drivers/iommu/arm-smmu-qcom.c | 83 ++++++++++++++++++++++++++++++++++- drivers/iommu/arm-smmu.h | 1 + 3 files changed, 85 insertions(+), 2 deletions(-)
drivers/iommu/arm-smmu-impl.c +3 -0
@@ -176,5 +176,8 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) of_device_is_compatible(np, "qcom,sc7180-smmu-500"))return qcom_smmu_impl_init (smmu); +if (of_device_is_compatible (smmu->dev->of_node,"qcom,adreno-smmu" )) +return qcom_adreno_smmu_impl_init (smmu); +return smmu; }
drivers/iommu/arm-smmu-qcom.c +81 -2
102 lines not on this page · raw message
drivers/iommu/arm-smmu.h +1 -0
@@ -491,6 +491,7 @@ static inline void arm_smmu_writeq(struct arm_smmu_device *smmu, int page,struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu); +struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu);int arm_mmu500_reset (struct arm_smmu_device *smmu);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v10 04/13] iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
Quoted 1 line · Jordan Crouse
drivers/iommu/arm-smmu-qcom.c +0
-0
[..]
Quoted 8 lines
drivers/iommu/arm-smmu-qcom.c +8
-0+static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain, +struct device *dev,int start,int count) +{ +struct arm_smmu_device *smmu = smmu_domain->smmu; + +/* +* Assign context bank 0 to the GPU device so the GPU hardware can +* switch pagetables
drivers/iommu/arm-smmu-qcom.c struct qcom_smmu { · line 54
Quoted 10 lines
drivers/iommu/arm-smmu-qcom.c +10
-0+*/ +if (qcom_adreno_smmu_is_gpu_device (dev)) { +if (start >0 ||test_bit (0 , smmu->context_map)) +return -ENOSPC ; + +set_bit (0 , smmu->context_map); +return 0 ; + } + +return __arm_smmu_alloc_bitmap (smmu->context_map, start, count);
If we end up here before the GPU device shows up this is going to steal the first context bank, causing the subsequent allocation for the GPU to always fail.
As such I think it would be appropriate for you to adjust "start" to never be 0 here. And I think it would be appropriate to write this function as:
if (gpu) {
start = 0;
count = 1;
} else {
if (start == 0)
start = 1;
}
return __arm_smmu_alloc_bitmap(smmu->context_map, start, count);Regards,
Bjorn
Re: [PATCH v10 04/13] iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
Quoted 30 lines · Bjorn Andersson
Quoted 1 line · Jordan Crouse
drivers/iommu/arm-smmu-qcom.c +0
-0[..]
Quoted 8 lines
drivers/iommu/arm-smmu-qcom.c +8
-0+static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain, +struct device *dev,int start,int count) +{ +struct arm_smmu_device *smmu = smmu_domain->smmu; + +/* +* Assign context bank 0 to the GPU device so the GPU hardware can +* switch pagetables drivers/iommu/arm-smmu-qcom.c struct qcom_smmu { · line 54
Quoted 10 lines
drivers/iommu/arm-smmu-qcom.c +10
-0+*/ +if (qcom_adreno_smmu_is_gpu_device (dev)) { +if (start >0 ||test_bit (0 , smmu->context_map)) +return -ENOSPC ; + +set_bit (0 , smmu->context_map); +return 0 ; + } + +return __arm_smmu_alloc_bitmap (smmu->context_map, start, count);If we end up here before the GPU device shows up this is going to steal the first context bank, causing the subsequent allocation for the GPU to always fail.
As such I think it would be appropriate for you to adjust "start" to never be 0 here. And I think it would be appropriate to write this function as:
Quoted 9 lines
if (gpu) {
start = 0;
count = 1;
} else {
if (start == 0)
start = 1;
}
return __arm_smmu_alloc_bitmap(smmu->context_map, start, count);Excellent suggestions. Thanks.
Jordan
Quoted 2 lines
Regards,
Bjorn
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 5/13 iommu: Add a domain attribute to get/set a pagetable configuration
In reply to Jordan CrouseAdd domain attribute DOMAIN_ATTR_PGTABLE_CFG. This will be used by arm-smmu to share the current pagetable configuration with the leaf driver and to allow the leaf driver to set up a new pagetable configuration under certain circumstances.
---
include/linux/iommu.h | 1 + 1 file changed, 1 insertion(+)
include/linux/iommu.h +1 -0
@@ -124,6 +124,7 @@ enum iommu_attr {DOMAIN_ATTR_FSL_PAMUV1 ,DOMAIN_ATTR_NESTING ,/* two stages of translation */ DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE , +DOMAIN_ATTR_PGTABLE_CFG , DOMAIN_ATTR_MAX, };
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v10 6/13 iommu/arm-smmu-qcom: Get and set the pagetable config for split pagetables
In reply to Jordan CrouseThe Adreno GPU has the capability to manage its own pagetables and switch them dynamically from the hardware. To do this the GPU uses TTBR1 for "global" GPU memory and creates local pagetables for each context and switches them dynamically with the GPU.
Use DOMAIN_ATTR_PGTABLE_CFG to get the current configuration for the TTBR1 pagetable from the smmu driver so the leaf driver can create compatible pagetables for use with TTBR0.
Because TTBR0 is disabled by default when TTBR1 is enabled the GPU driver can pass the configuration of one of the newly created pagetables back through DOMAIN_ATTR_PGTABLE_CFG as a trigger to enable translation on TTBR0.
---
drivers/iommu/arm-smmu-qcom.c | 47 +++++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 32 ++++++++++++++++++------ drivers/iommu/arm-smmu.h | 10 ++++++++ 3 files changed, 81 insertions(+), 8 deletions(-)
drivers/iommu/arm-smmu-qcom.c +47 -0
@@ -34,6 +34,52 @@ static bool qcom_adreno_smmu_is_gpu_device(struct device *dev)return false; } +/* +* Local implementation to configure TTBR0 wil the specified pagetable config. +* The GPU driver will call this to enable TTBR0 when per-instance pagetables +* are active +*/ +static int qcom_adreno_smmu_set_pgtable_cfg (struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *pgtbl_cfg) +{ +struct io_pgtable *pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); +struct arm_smmu_cfg *cfg = &smmu_domain->cfg; +struct arm_smmu_cb *cb = &smmu_domain->smmu->cbs[cfg->cbndx]; + +/* The domain must have split pagetables already enabled */ +if (cb->tcr[0 ] &ARM_SMMU_TCR_EPD1 ) +return -EINVAL ; + +/* If the pagetable config is NULL, disable TTBR0 */ +if (!pgtbl_cfg) { +/* Do nothing if it is already disabled */ +if ((cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + +/* Set TCR to the original configuration */ + cb->tcr[0 ] =arm_smmu_lpae_tcr (&pgtable->cfg); + cb->ttbr[0 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + }else { +u32 tcr = cb->tcr[0 ]; + +/* FIXME: What sort of validation do we need to do here? */ + +/* Don't call this again if TTBR0 is already enabled */ +if (!(cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + + tcr |=arm_smmu_lpae_tcr (pgtbl_cfg); + tcr &= ~(ARM_SMMU_TCR_EPD0 |ARM_SMMU_TCR_EPD1 ); + + cb->tcr[0 ] = tcr; + cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; + cb->ttbr[0 ] |=FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + } + +arm_smmu_write_context_bank (smmu_domain->smmu, cb->cfg->cbndx); +return 0 ; +} +static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int count) {
@@ -131,6 +177,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_impl = { .def_domain_type = qcom_smmu_def_domain_type, .reset = qcom_smmu500_reset, .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, + .set_pgtable_cfg = qcom_adreno_smmu_set_pgtable_cfg, }; static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,
drivers/iommu/arm-smmu.c +24 -8
@@ -86,13 +86,6 @@ struct arm_smmu_smr {bool valid; }; -struct arm_smmu_cb { -u64 ttbr[2 ]; -u32 tcr[2 ]; -u32 mair[2 ]; -struct arm_smmu_cfg *cfg; -}; -static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu)
@@ -558,7 +551,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, } } -static void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) {u32 reg;bool stage1;
@@ -1515,6 +1508,18 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case DOMAIN_ATTR_NESTING : *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED );return 0 ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct io_pgtable *pgtable; +struct io_pgtable_cfg *dest = data; + +if (!smmu_domain->pgtbl_ops) +return -ENODEV ; + + pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); + +memcpy (dest, &pgtable->cfg,sizeof (*dest)); +return 0 ; + }default :return -ENODEV ; }
@@ -1555,6 +1560,17 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,else smmu_domain->stage =ARM_SMMU_DOMAIN_S1 ;break ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct arm_smmu_device *smmu = smmu_domain->smmu; + + ret = -EPERM ; + +if (smmu) +if (smmu->impl && smmu->impl->set_pgtable_cfg) + ret = smmu->impl->set_pgtable_cfg (smmu_domain, + data); + } +break ;default : ret = -ENODEV ; }
drivers/iommu/arm-smmu.h +10 -0
@@ -328,6 +328,13 @@ struct arm_smmu_cfg { };#define ARM_SMMU_INVALID_IRPTNDX 0xff +struct arm_smmu_cb { +u64 ttbr[2 ]; +u32 tcr[2 ]; +u32 mair[2 ]; +struct arm_smmu_cfg *cfg; +}; +enum arm_smmu_domain_stage {ARM_SMMU_DOMAIN_S1 =0 ,ARM_SMMU_DOMAIN_S2 ,
@@ -408,6 +415,8 @@ struct arm_smmu_impl {int (*def_domain_type)(struct device *dev);int (*alloc_context_bank)(struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int max); +int (*set_pgtable_cfg)(struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *cfg); };#define INVALID_SMENDX -1
@@ -493,6 +502,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu); +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx);int arm_mmu500_reset (struct arm_smmu_device *smmu);#endif /* _ARM_SMMU_H */
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [Freedreno] [PATCH v10 06/13] iommu/arm-smmu-qcom: Get and set the pagetable config for split pagetables
Quoted 121 lines · Jordan Crouse
The Adreno GPU has the capability to manage its own pagetables and switch them dynamically from the hardware. To do this the GPU uses TTBR1 for "global" GPU memory and creates local pagetables for each context and switches them dynamically with the GPU.
Use
DOMAIN_ATTR_PGTABLE_CFGto get the current configuration for the TTBR1 pagetable from the smmu driver so the leaf driver can create compatible pagetables for use with TTBR0.Because TTBR0 is disabled by default when TTBR1 is enabled the GPU driver can pass the configuration of one of the newly created pagetables back through
DOMAIN_ATTR_PGTABLE_CFGas a trigger to enable translation on TTBR0.Signed-off-by Jordan Crouse <[email protected]>---
drivers/iommu/arm-smmu-qcom.c | 47 +++++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 32 ++++++++++++++++++------ drivers/iommu/arm-smmu.h | 10 ++++++++ 3 files changed, 81 insertions(+), 8 deletions(-)drivers/iommu/arm-smmu-qcom.c +47
-0@@ -34,6 +34,52 @@ static bool qcom_adreno_smmu_is_gpu_device(struct device *dev)return false; } +/* +* Local implementation to configure TTBR0 wil the specified pagetable config. +* The GPU driver will call this to enable TTBR0 when per-instance pagetables +* are active +*/ +static int qcom_adreno_smmu_set_pgtable_cfg (struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *pgtbl_cfg) +{ +struct io_pgtable *pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); +struct arm_smmu_cfg *cfg = &smmu_domain->cfg; +struct arm_smmu_cb *cb = &smmu_domain->smmu->cbs[cfg->cbndx]; + +/* The domain must have split pagetables already enabled */ +if (cb->tcr[0 ] &ARM_SMMU_TCR_EPD1 ) +return -EINVAL ; + +/* If the pagetable config is NULL, disable TTBR0 */ +if (!pgtbl_cfg) { +/* Do nothing if it is already disabled */ +if ((cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + +/* Set TCR to the original configuration */ + cb->tcr[0 ] =arm_smmu_lpae_tcr (&pgtable->cfg); + cb->ttbr[0 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + }else { +u32 tcr = cb->tcr[0 ]; + +/* FIXME: What sort of validation do we need to do here? */ + +/* Don't call this again if TTBR0 is already enabled */ +if (!(cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + + tcr |=arm_smmu_lpae_tcr (pgtbl_cfg); + tcr &= ~(ARM_SMMU_TCR_EPD0 |ARM_SMMU_TCR_EPD1 ); + + cb->tcr[0 ] = tcr; + cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; + cb->ttbr[0 ] |=FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + } + +arm_smmu_write_context_bank (smmu_domain->smmu, cb->cfg->cbndx); +return 0 ; +} +static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int count) {@@ -131,6 +177,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_impl = { .def_domain_type = qcom_smmu_def_domain_type, .reset = qcom_smmu500_reset, .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, + .set_pgtable_cfg = qcom_adreno_smmu_set_pgtable_cfg, }; static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,drivers/iommu/arm-smmu.c +3
-8@@ -86,13 +86,6 @@ struct arm_smmu_smr {bool valid; }; -struct arm_smmu_cb { -u64 ttbr[2 ]; -u32 tcr[2 ]; -u32 mair[2 ]; -struct arm_smmu_cfg *cfg; -}; -static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu)@@ -558,7 +551,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, } } -static void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) {u32 reg;bool stage1;@@ -1515,6 +1508,18 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case DOMAIN_ATTR_NESTING : *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED );return 0 ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct io_pgtable *pgtable;
drivers/iommu/arm-smmu.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain, · line 1522
Quoted 10 lines
drivers/iommu/arm-smmu.c +10
-0+struct io_pgtable_cfg *dest = data; + +if (!smmu_domain->pgtbl_ops) +return -ENODEV ; + + pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); + +memcpy (dest, &pgtable->cfg,sizeof (*dest)); +return 0 ; + }
hmm, maybe it would make sense to have impl hooks for get/set_attr, so we could handle DOMAIN_ATTR_PGTABLE_CFG inside the adreno_smmu_impl?
Having impl specific domain attrs would be useful for what I have in mind to enable stall/resume support, so we can hook in devcoredump to iova faults (which would be a huge improvement for debugability, right now iova faults are somewhat harder to debug than needed). My rough idea was to add DOMAIN_ATTR_RESUME, which could be used with set_attr() to (1) enable STALL and let drm/msm know whether the iommu supports it, and (2) resume translation from wq context after devcoredump snapshot is collected.
BR,
-R
Quoted 63 lines
drivers/iommu/arm-smmu.c +11
-0default :return -ENODEV ; }@@ -1555,6 +1560,17 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,else smmu_domain->stage =ARM_SMMU_DOMAIN_S1 ;break ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct arm_smmu_device *smmu = smmu_domain->smmu; + + ret = -EPERM ; + +if (smmu) +if (smmu->impl && smmu->impl->set_pgtable_cfg) + ret = smmu->impl->set_pgtable_cfg (smmu_domain, + data); + } +break ;default : ret = -ENODEV ; }drivers/iommu/arm-smmu.h +10
-1@@ -328,6 +328,13 @@ struct arm_smmu_cfg { };#define ARM_SMMU_INVALID_IRPTNDX 0xff +struct arm_smmu_cb { +u64 ttbr[2 ]; +u32 tcr[2 ]; +u32 mair[2 ]; +struct arm_smmu_cfg *cfg; +}; +enum arm_smmu_domain_stage {ARM_SMMU_DOMAIN_S1 =0 ,ARM_SMMU_DOMAIN_S2 ,@@ -408,6 +415,8 @@ struct arm_smmu_impl {int (*def_domain_type)(struct device *dev);int (*alloc_context_bank)(struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int max); +int (*set_pgtable_cfg)(struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *cfg); };#define INVALID_SMENDX -1@@ -493,6 +502,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu); +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx);int arm_mmu500_reset (struct arm_smmu_device *smmu);#endif /* _ARM_SMMU_H */ --2.25.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [PATCH v10 06/13] iommu/arm-smmu-qcom: Get and set the pagetable config for split pagetables
Quoted 136 lines · Rob Clark
Quoted 121 lines · Jordan Crouse
The Adreno GPU has the capability to manage its own pagetables and switch them dynamically from the hardware. To do this the GPU uses TTBR1 for "global" GPU memory and creates local pagetables for each context and switches them dynamically with the GPU.
Use
DOMAIN_ATTR_PGTABLE_CFGto get the current configuration for the TTBR1 pagetable from the smmu driver so the leaf driver can create compatible pagetables for use with TTBR0.Because TTBR0 is disabled by default when TTBR1 is enabled the GPU driver can pass the configuration of one of the newly created pagetables back through
DOMAIN_ATTR_PGTABLE_CFGas a trigger to enable translation on TTBR0.Signed-off-by Jordan Crouse <[email protected]>---
drivers/iommu/arm-smmu-qcom.c | 47 +++++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 32 ++++++++++++++++++------ drivers/iommu/arm-smmu.h | 10 ++++++++ 3 files changed, 81 insertions(+), 8 deletions(-)drivers/iommu/arm-smmu-qcom.c +47
-0@@ -34,6 +34,52 @@ static bool qcom_adreno_smmu_is_gpu_device(struct device *dev)return false; } +/* +* Local implementation to configure TTBR0 wil the specified pagetable config. +* The GPU driver will call this to enable TTBR0 when per-instance pagetables +* are active +*/ +static int qcom_adreno_smmu_set_pgtable_cfg (struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *pgtbl_cfg) +{ +struct io_pgtable *pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); +struct arm_smmu_cfg *cfg = &smmu_domain->cfg; +struct arm_smmu_cb *cb = &smmu_domain->smmu->cbs[cfg->cbndx]; + +/* The domain must have split pagetables already enabled */ +if (cb->tcr[0 ] &ARM_SMMU_TCR_EPD1 ) +return -EINVAL ; + +/* If the pagetable config is NULL, disable TTBR0 */ +if (!pgtbl_cfg) { +/* Do nothing if it is already disabled */ +if ((cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + +/* Set TCR to the original configuration */ + cb->tcr[0 ] =arm_smmu_lpae_tcr (&pgtable->cfg); + cb->ttbr[0 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + }else { +u32 tcr = cb->tcr[0 ]; + +/* FIXME: What sort of validation do we need to do here? */ + +/* Don't call this again if TTBR0 is already enabled */ +if (!(cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + + tcr |=arm_smmu_lpae_tcr (pgtbl_cfg); + tcr &= ~(ARM_SMMU_TCR_EPD0 |ARM_SMMU_TCR_EPD1 ); + + cb->tcr[0 ] = tcr; + cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; + cb->ttbr[0 ] |=FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + } + +arm_smmu_write_context_bank (smmu_domain->smmu, cb->cfg->cbndx); +return 0 ; +} +static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int count) {@@ -131,6 +177,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_impl = { .def_domain_type = qcom_smmu_def_domain_type, .reset = qcom_smmu500_reset, .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, + .set_pgtable_cfg = qcom_adreno_smmu_set_pgtable_cfg, }; static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,drivers/iommu/arm-smmu.c +3
-8@@ -86,13 +86,6 @@ struct arm_smmu_smr {bool valid; }; -struct arm_smmu_cb { -u64 ttbr[2 ]; -u32 tcr[2 ]; -u32 mair[2 ]; -struct arm_smmu_cfg *cfg; -}; -static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu)@@ -558,7 +551,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, } } -static void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) {u32 reg;bool stage1;@@ -1515,6 +1508,18 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case DOMAIN_ATTR_NESTING : *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED );return 0 ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct io_pgtable *pgtable;drivers/iommu/arm-smmu.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain, · line 1522
Quoted 10 lines
drivers/iommu/arm-smmu.c +10
-0+struct io_pgtable_cfg *dest = data; + +if (!smmu_domain->pgtbl_ops) +return -ENODEV ; + + pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); + +memcpy (dest, &pgtable->cfg,sizeof (*dest)); +return 0 ; + }hmm, maybe it would make sense to have impl hooks for get/set_attr, so we could handle
DOMAIN_ATTR_PGTABLE_CFGinside theadreno_smmu_impl?
Quoted 8 lines
Having impl specific domain attrs would be useful for what I have in mind to enable stall/resume support, so we can hook in devcoredump to iova faults (which would be a huge improvement for debugability, right now iova faults are somewhat harder to debug than needed). My rough idea was to add
DOMAIN_ATTR_RESUME, which could be used withset_attr()to (1) enable STALL and let drm/msm know whether the iommu supports it, and (2) resume translation from wq context after devcoredump snapshot is collected.
Expanding on that, maybe a DOMAIN_ATTR_IMPL with struct { int subtype; void *data } as the payload would let us add things without having to populate the generic enum. That would force us to export an arm-smmu header but at this point it might be such a bad thing.
Jordan
Quoted 66 lines
BR,
-RQuoted 63 lines
drivers/iommu/arm-smmu.c +11
-0default :return -ENODEV ; }@@ -1555,6 +1560,17 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,else smmu_domain->stage =ARM_SMMU_DOMAIN_S1 ;break ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct arm_smmu_device *smmu = smmu_domain->smmu; + + ret = -EPERM ; + +if (smmu) +if (smmu->impl && smmu->impl->set_pgtable_cfg) + ret = smmu->impl->set_pgtable_cfg (smmu_domain, + data); + } +break ;default : ret = -ENODEV ; }drivers/iommu/arm-smmu.h +10
-1@@ -328,6 +328,13 @@ struct arm_smmu_cfg { };#define ARM_SMMU_INVALID_IRPTNDX 0xff +struct arm_smmu_cb { +u64 ttbr[2 ]; +u32 tcr[2 ]; +u32 mair[2 ]; +struct arm_smmu_cfg *cfg; +}; +enum arm_smmu_domain_stage {ARM_SMMU_DOMAIN_S1 =0 ,ARM_SMMU_DOMAIN_S2 ,@@ -408,6 +415,8 @@ struct arm_smmu_impl {int (*def_domain_type)(struct device *dev);int (*alloc_context_bank)(struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int max); +int (*set_pgtable_cfg)(struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *cfg); };#define INVALID_SMENDX -1@@ -493,6 +502,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu); +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx);int arm_mmu500_reset (struct arm_smmu_device *smmu);#endif /* _ARM_SMMU_H */ --2.25.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
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
Re: [Freedreno] [PATCH v10 06/13] iommu/arm-smmu-qcom: Get and set the pagetable config for split pagetables
Quoted 147 lines · Jordan Crouse
Quoted 136 lines · Rob Clark
Quoted 121 lines · Jordan Crouse
The Adreno GPU has the capability to manage its own pagetables and switch them dynamically from the hardware. To do this the GPU uses TTBR1 for "global" GPU memory and creates local pagetables for each context and switches them dynamically with the GPU.
Use
DOMAIN_ATTR_PGTABLE_CFGto get the current configuration for the TTBR1 pagetable from the smmu driver so the leaf driver can create compatible pagetables for use with TTBR0.Because TTBR0 is disabled by default when TTBR1 is enabled the GPU driver can pass the configuration of one of the newly created pagetables back through
DOMAIN_ATTR_PGTABLE_CFGas a trigger to enable translation on TTBR0.Signed-off-by Jordan Crouse <[email protected]>---
drivers/iommu/arm-smmu-qcom.c | 47 +++++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 32 ++++++++++++++++++------ drivers/iommu/arm-smmu.h | 10 ++++++++ 3 files changed, 81 insertions(+), 8 deletions(-)drivers/iommu/arm-smmu-qcom.c +47
-0@@ -34,6 +34,52 @@ static bool qcom_adreno_smmu_is_gpu_device(struct device *dev)return false; } +/* +* Local implementation to configure TTBR0 wil the specified pagetable config. +* The GPU driver will call this to enable TTBR0 when per-instance pagetables +* are active +*/ +static int qcom_adreno_smmu_set_pgtable_cfg (struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *pgtbl_cfg) +{ +struct io_pgtable *pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); +struct arm_smmu_cfg *cfg = &smmu_domain->cfg; +struct arm_smmu_cb *cb = &smmu_domain->smmu->cbs[cfg->cbndx]; + +/* The domain must have split pagetables already enabled */ +if (cb->tcr[0 ] &ARM_SMMU_TCR_EPD1 ) +return -EINVAL ; + +/* If the pagetable config is NULL, disable TTBR0 */ +if (!pgtbl_cfg) { +/* Do nothing if it is already disabled */ +if ((cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + +/* Set TCR to the original configuration */ + cb->tcr[0 ] =arm_smmu_lpae_tcr (&pgtable->cfg); + cb->ttbr[0 ] =FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + }else { +u32 tcr = cb->tcr[0 ]; + +/* FIXME: What sort of validation do we need to do here? */ + +/* Don't call this again if TTBR0 is already enabled */ +if (!(cb->tcr[0 ] &ARM_SMMU_TCR_EPD0 )) +return -EINVAL ; + + tcr |=arm_smmu_lpae_tcr (pgtbl_cfg); + tcr &= ~(ARM_SMMU_TCR_EPD0 |ARM_SMMU_TCR_EPD1 ); + + cb->tcr[0 ] = tcr; + cb->ttbr[0 ] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; + cb->ttbr[0 ] |=FIELD_PREP (ARM_SMMU_TTBRn_ASID, cb->cfg->asid); + } + +arm_smmu_write_context_bank (smmu_domain->smmu, cb->cfg->cbndx); +return 0 ; +} +static int qcom_adreno_smmu_alloc_context_bank (struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int count) {@@ -131,6 +177,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_impl = { .def_domain_type = qcom_smmu_def_domain_type, .reset = qcom_smmu500_reset, .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, + .set_pgtable_cfg = qcom_adreno_smmu_set_pgtable_cfg, }; static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,drivers/iommu/arm-smmu.c +3
-8@@ -86,13 +86,6 @@ struct arm_smmu_smr {bool valid; }; -struct arm_smmu_cb { -u64 ttbr[2 ]; -u32 tcr[2 ]; -u32 mair[2 ]; -struct arm_smmu_cfg *cfg; -}; -static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu)@@ -558,7 +551,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, } } -static void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx) {u32 reg;bool stage1;@@ -1515,6 +1508,18 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,case DOMAIN_ATTR_NESTING : *(int *)data = (smmu_domain->stage ==ARM_SMMU_DOMAIN_NESTED );return 0 ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct io_pgtable *pgtable;drivers/iommu/arm-smmu.c static int arm_smmu_domain_get_attr(struct iommu_domain *domain, · line 1522
Quoted 10 lines
drivers/iommu/arm-smmu.c +10
-0+struct io_pgtable_cfg *dest = data; + +if (!smmu_domain->pgtbl_ops) +return -ENODEV ; + + pgtable =io_pgtable_ops_to_pgtable (smmu_domain->pgtbl_ops); + +memcpy (dest, &pgtable->cfg,sizeof (*dest)); +return 0 ; + }hmm, maybe it would make sense to have impl hooks for get/set_attr, so we could handle
DOMAIN_ATTR_PGTABLE_CFGinside theadreno_smmu_impl?Quoted 8 lines
Having impl specific domain attrs would be useful for what I have in mind to enable stall/resume support, so we can hook in devcoredump to iova faults (which would be a huge improvement for debugability, right now iova faults are somewhat harder to debug than needed). My rough idea was to add
DOMAIN_ATTR_RESUME, which could be used withset_attr()to (1) enable STALL and let drm/msm know whether the iommu supports it, and (2) resume translation from wq context after devcoredump snapshot is collected.
Quoted 4 lines
Expanding on that, maybe a
DOMAIN_ATTR_IMPLwith struct { int subtype; void *data } as the payload would let us add things without having to populate the generic enum. That would force us to export an arm-smmu header but at this point it might be such a bad thing.
That feels a bit like overkill to me, I don't expect there to be that many custom things. But I'll defer to the iommu folks as to which they prefer.
BR,
-R
Quoted 73 lines
Jordan
Quoted 58 lines
BR,
-RQuoted 55 lines
drivers/iommu/arm-smmu.c +11
-0default :return -ENODEV ; }@@ -1555,6 +1560,17 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,else smmu_domain->stage =ARM_SMMU_DOMAIN_S1 ;break ; +case DOMAIN_ATTR_PGTABLE_CFG : { +struct arm_smmu_device *smmu = smmu_domain->smmu; + + ret = -EPERM ; + +if (smmu) +if (smmu->impl && smmu->impl->set_pgtable_cfg) + ret = smmu->impl->set_pgtable_cfg (smmu_domain, + data); + } +break ;default : ret = -ENODEV ; }drivers/iommu/arm-smmu.h +10
-0@@ -328,6 +328,13 @@ struct arm_smmu_cfg { };#define ARM_SMMU_INVALID_IRPTNDX 0xff +struct arm_smmu_cb { +u64 ttbr[2 ]; +u32 tcr[2 ]; +u32 mair[2 ]; +struct arm_smmu_cfg *cfg; +}; +enum arm_smmu_domain_stage {ARM_SMMU_DOMAIN_S1 =0 ,ARM_SMMU_DOMAIN_S2 ,@@ -408,6 +415,8 @@ struct arm_smmu_impl {int (*def_domain_type)(struct device *dev);int (*alloc_context_bank)(struct arm_smmu_domain *smmu_domain,struct device *dev,int start,int max); +int (*set_pgtable_cfg)(struct arm_smmu_domain *smmu_domain, +struct io_pgtable_cfg *cfg); };#define INVALID_SMENDX -1@@ -493,6 +502,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu); +void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx);int arm_mmu500_reset (struct arm_smmu_device *smmu);Quoted 8 lines
Quoted 8 lines
drivers/iommu/arm-smmu.h +0
-1#endif /* _ARM_SMMU_H */ --2.25.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 7/13 dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
In reply to Jordan CrouseEvery Qcom Adreno GPU has an embedded SMMU for its own use. These devices depend on unique features such as split pagetables, different stall/halt requirements and other settings. Identify them with a compatible string so that they can be identified in the arm-smmu implementation specific code.
---
Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +4 -0
@@ -38,6 +38,10 @@ properties: - qcom,sc7180-smmu-500 - qcom,sdm845-smmu-500 - const: arm,mmu-500 + - description: Qcom Adreno GPUs implementing "arm,smmu-v2" + items: + - const: qcom,adreno-smmu + - const: qcom,smmu-v2 - items: - const: arm,mmu-500 - const: arm,smmu-v2
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v10 07/13] dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
Quoted 2 lines · Jordan Crouse
Every Qcom Adreno GPU has an embedded SMMU for its own use. These
minor detail: this is true for a3xx and later but not a2xx ;-)
Quoted 34 lines
devices depend on unique features such as split pagetables, different stall/halt requirements and other settings. Identify them with a compatible string so that they can be identified in the arm-smmu implementation specific code.
Signed-off-by Jordan Crouse <[email protected]>Reviewed-by Rob Herring <[email protected]>---
Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/iommu/arm,smmu.yaml +4
-1@@ -38,6 +38,10 @@ properties: - qcom,sc7180-smmu-500 - qcom,sdm845-smmu-500 - const: arm,mmu-500 + - description: Qcom Adreno GPUs implementing "arm,smmu-v2" + items: + - const: qcom,adreno-smmu + - const: qcom,smmu-v2 - items: - const: arm,mmu-500 - const: arm,smmu-v2 --2.25.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v10 8/13 drm/msm: Add a context pointer to the submitqueue
In reply to Jordan CrouseEach submitqueue is attached to a context. Add a pointer to the context to the submitqueue at create time and refcount it so that it stays around through the life of the queue.
GPU submissions can access the active context via the submitqueue instead of requiring it to be passed around from function to function.
---
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +++++------- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 ++--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 ++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +-- drivers/gpu/drm/msm/msm_drv.c | 3 ++- drivers/gpu/drm/msm/msm_drv.h | 8 ++++++++ drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 8 ++++---- drivers/gpu/drm/msm/msm_gpu.c | 9 ++++----- drivers/gpu/drm/msm/msm_gpu.h | 7 +++---- drivers/gpu/drm/msm/msm_submitqueue.c | 8 +++++++- 11 files changed, 39 insertions(+), 30 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +5 -7
@@ -43,8 +43,7 @@ static void a5xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring)gpu_write (gpu,REG_A5XX_CP_RB_WPTR , wptr); } -static void a5xx_submit_in_rb (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a5xx_submit_in_rb (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct msm_drm_private *priv = gpu->dev->dev_private;struct msm_ringbuffer *ring = submit->ring;
@@ -57,7 +56,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submitcase MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :
@@ -103,8 +102,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submitmsm_gpu_retire (gpu); } -static void a5xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a5xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a5xx_gpu *a5xx_gpu =to_a5xx_gpu (adreno_gpu);
@@ -114,7 +112,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,if (IS_ENABLED (CONFIG_DRM_MSM_GPU_SUDO ) && submit->in_rb) { priv->lastctx =NULL ; -a5xx_submit_in_rb (gpu, submit, ctx); +a5xx_submit_in_rb (gpu, submit);return ; }
@@ -148,7 +146,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,case MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -3
@@ -81,8 +81,7 @@ static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter,OUT_RING (ring,upper_32_bits (iova)); } -static void a6xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a6xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {unsigned int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;struct msm_drm_private *priv = gpu->dev->dev_private;
@@ -115,7 +114,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,case MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :
drivers/gpu/drm/msm/adreno/adreno_gpu.c +2 -3
@@ -457,8 +457,7 @@ void adreno_recover(struct msm_gpu *gpu) } } -void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct msm_drm_private *priv = gpu->dev->dev_private;
@@ -472,7 +471,7 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF :/* ignore if there has not been a ctx switch: */ -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -2
@@ -267,8 +267,7 @@ struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu, const struct firmware *fw, u64 *iova);int adreno_hw_init (struct msm_gpu *gpu);void adreno_recover (struct msm_gpu *gpu); -void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit);void adreno_flush (struct msm_gpu *gpu,struct msm_ringbuffer *ring);bool adreno_idle (struct msm_gpu *gpu,struct msm_ringbuffer *ring);#if defined(CONFIG_DEBUG_FS ) || defined(CONFIG_DEV_COREDUMP )
drivers/gpu/drm/msm/msm_drv.c +2 -1
@@ -600,6 +600,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)if (!ctx)return -ENOMEM ; +kref_init (&ctx->ref);msm_submitqueue_init (dev, ctx); ctx->aspace = priv->gpu ? priv->gpu->aspace :NULL ;
@@ -621,7 +622,7 @@ static int msm_open(struct drm_device *dev, struct drm_file *file)static void context_close (struct msm_file_private *ctx) {msm_submitqueue_close (ctx); -kfree (ctx); +kref_put (&ctx->ref, msm_file_private_destroy); }static void msm_postclose (struct drm_device *dev,struct drm_file *file)
drivers/gpu/drm/msm/msm_drv.h +8 -0
@@ -57,6 +57,7 @@ struct msm_file_private {struct list_head submitqueues;int queueid;struct msm_gem_address_space *aspace; +struct kref ref; };enum msm_mdp_plane_property {
@@ -429,6 +430,13 @@ void msm_submitqueue_close(struct msm_file_private *ctx);void msm_submitqueue_destroy (struct kref *kref); +static inline void msm_file_private_destroy (struct kref *kref) +{ +struct msm_file_private *ctx =container_of (kref, + struct msm_file_private, ref); + +kfree (ctx); +}#define DBG (fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)#define VERB (fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)
drivers/gpu/drm/msm/msm_gem.h +1 -0
@@ -142,6 +142,7 @@ struct msm_gem_submit {bool valid;/* true if no cmdstream patching needed */ bool in_rb;/* "sudo" mode, copy cmds into RB */ struct msm_ringbuffer *ring; +struct msm_file_private *ctx;unsigned int nr_cmds;unsigned int nr_bos;u32 ident;/* A "identifier" for the submit for logging */
drivers/gpu/drm/msm/msm_gem_submit.c +4 -4
@@ -27,7 +27,7 @@#define BO_PINNED 0x2000static struct msm_gem_submit *submit_create (struct drm_device *dev, -struct msm_gpu *gpu,struct msm_gem_address_space *aspace, +struct msm_gpu *gpu,struct msm_gpu_submitqueue *queue,uint32_t nr_bos,uint32_t nr_cmds) {
@@ -43,7 +43,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,return NULL ; submit->dev = dev; - submit->aspace = aspace; + submit->aspace = queue->ctx->aspace; submit->gpu = gpu; submit->fence =NULL ; submit->cmd = (void *)&submit->bos[nr_bos];
@@ -677,7 +677,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } } - submit =submit_create (dev, gpu, ctx->aspace, queue, args->nr_bos, + submit =submit_create (dev, gpu, queue, args->nr_bos, args->nr_cmds);if (!submit) { ret = -ENOMEM ;
@@ -785,7 +785,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } } -msm_gpu_submit (gpu, submit, ctx); +msm_gpu_submit (gpu, submit); args->fence = submit->fence->seqno;
drivers/gpu/drm/msm/msm_gpu.c +4 -5
@@ -520,7 +520,7 @@ static void recover_worker(struct work_struct *work)struct msm_ringbuffer *ring = gpu->rb[i];list_for_each_entry (submit, &ring->submits, node) - gpu->funcs->submit (gpu, submit,NULL ); + gpu->funcs->submit (gpu, submit); } }
@@ -747,8 +747,7 @@ void msm_gpu_retire(struct msm_gpu *gpu) }/* add bo's to gpu's ring, and kick gpu: */ -void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct drm_device *dev = gpu->dev;struct msm_drm_private *priv = dev->dev_private;
@@ -788,8 +787,8 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,msm_gem_move_to_active (&msm_obj->base, gpu, false, submit->fence); } - gpu->funcs->submit (gpu, submit, ctx); - priv->lastctx = ctx; + gpu->funcs->submit (gpu, submit); + priv->lastctx = submit->queue->ctx;hangcheck_timer_reset (gpu); }
drivers/gpu/drm/msm/msm_gpu.h +3 -4
@@ -44,8 +44,7 @@ struct msm_gpu_funcs {int (*hw_init)(struct msm_gpu *gpu);int (*pm_suspend)(struct msm_gpu *gpu);int (*pm_resume)(struct msm_gpu *gpu); -void (*submit)(struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void (*submit)(struct msm_gpu *gpu,struct msm_gem_submit *submit);void (*flush)(struct msm_gpu *gpu,struct msm_ringbuffer *ring);irqreturn_t (*irq)(struct msm_gpu *irq);struct msm_ringbuffer *(*active_ring)(struct msm_gpu *gpu);
@@ -181,6 +180,7 @@ struct msm_gpu_submitqueue {u32 flags;u32 prio;int faults; +struct msm_file_private *ctx;struct list_head node;struct kref ref; };
@@ -280,8 +280,7 @@ int msm_gpu_perfcntr_sample(struct msm_gpu *gpu, uint32_t *activetime, uint32_t *totaltime, uint32_t ncntrs, uint32_t *cntrs);void msm_gpu_retire (struct msm_gpu *gpu); -void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit); int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs,
drivers/gpu/drm/msm/msm_submitqueue.c +7 -1
@@ -49,8 +49,10 @@ void msm_submitqueue_close(struct msm_file_private *ctx)* No lock needed in close and there won't * be any more user ioctls coming our way */ -list_for_each_entry_safe (entry, tmp, &ctx->submitqueues, node) +list_for_each_entry_safe (entry, tmp, &ctx->submitqueues, node) { +kref_put (&ctx->ref, msm_file_private_destroy);msm_submitqueue_put (entry); + } } int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,
@@ -81,6 +83,9 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,write_lock (&ctx->queuelock); +kref_get (&ctx->ref); + + queue->ctx = ctx; queue->id = ctx->queueid++;if (id)
@@ -177,6 +182,7 @@ int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id)list_del (&entry->node);write_unlock (&ctx->queuelock); +kref_put (&ctx->ref, msm_file_private_destroy);msm_submitqueue_put (entry);return 0 ; }
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v10 08/13] drm/msm: Add a context pointer to the submitqueue
Quoted 306 lines · Jordan Crouse
Each submitqueue is attached to a context. Add a pointer to the context to the submitqueue at create time and refcount it so that it stays around through the life of the queue.
GPU submissions can access the active context via the submitqueue instead of requiring it to be passed around from function to function.
Signed-off-by Jordan Crouse <[email protected]>---
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +++++------- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 ++--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 ++--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +-- drivers/gpu/drm/msm/msm_drv.c | 3 ++- drivers/gpu/drm/msm/msm_drv.h | 8 ++++++++ drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 8 ++++---- drivers/gpu/drm/msm/msm_gpu.c | 9 ++++----- drivers/gpu/drm/msm/msm_gpu.h | 7 +++---- drivers/gpu/drm/msm/msm_submitqueue.c | 8 +++++++- 11 files changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +5
-7@@ -43,8 +43,7 @@ static void a5xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring)gpu_write (gpu,REG_A5XX_CP_RB_WPTR , wptr); } -static void a5xx_submit_in_rb (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a5xx_submit_in_rb (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct msm_drm_private *priv = gpu->dev->dev_private;struct msm_ringbuffer *ring = submit->ring;@@ -57,7 +56,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submitcase MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :@@ -103,8 +102,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submitmsm_gpu_retire (gpu); } -static void a5xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a5xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a5xx_gpu *a5xx_gpu =to_a5xx_gpu (adreno_gpu);@@ -114,7 +112,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,if (IS_ENABLED (CONFIG_DRM_MSM_GPU_SUDO ) && submit->in_rb) { priv->lastctx =NULL ; -a5xx_submit_in_rb (gpu, submit, ctx); +a5xx_submit_in_rb (gpu, submit);return ; }@@ -148,7 +146,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,case MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2
-3@@ -81,8 +81,7 @@ static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter,OUT_RING (ring,upper_32_bits (iova)); } -static void a6xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +static void a6xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {unsigned int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;struct msm_drm_private *priv = gpu->dev->dev_private;@@ -115,7 +114,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,case MSM_SUBMIT_CMD_IB_TARGET_BUF :break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF : -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :drivers/gpu/drm/msm/adreno/adreno_gpu.c +2
-3@@ -457,8 +457,7 @@ void adreno_recover(struct msm_gpu *gpu) } } -void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct msm_drm_private *priv = gpu->dev->dev_private;@@ -472,7 +471,7 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,break ;case MSM_SUBMIT_CMD_CTX_RESTORE_BUF :/* ignore if there has not been a ctx switch: */ -if (priv->lastctx == ctx) +if (priv->lastctx == submit->queue->ctx)break ;/* fall-thru */ case MSM_SUBMIT_CMD_BUF :drivers/gpu/drm/msm/adreno/adreno_gpu.h +1
-2@@ -267,8 +267,7 @@ struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu, const struct firmware *fw, u64 *iova);int adreno_hw_init (struct msm_gpu *gpu);void adreno_recover (struct msm_gpu *gpu); -void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void adreno_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit);void adreno_flush (struct msm_gpu *gpu,struct msm_ringbuffer *ring);bool adreno_idle (struct msm_gpu *gpu,struct msm_ringbuffer *ring);#if defined(CONFIG_DEBUG_FS ) || defined(CONFIG_DEV_COREDUMP )drivers/gpu/drm/msm/msm_drv.c +2
-1@@ -600,6 +600,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)if (!ctx)return -ENOMEM ; +kref_init (&ctx->ref);msm_submitqueue_init (dev, ctx); ctx->aspace = priv->gpu ? priv->gpu->aspace :NULL ;@@ -621,7 +622,7 @@ static int msm_open(struct drm_device *dev, struct drm_file *file)static void context_close (struct msm_file_private *ctx) {msm_submitqueue_close (ctx); -kfree (ctx); +kref_put (&ctx->ref, msm_file_private_destroy); }static void msm_postclose (struct drm_device *dev,struct drm_file *file)drivers/gpu/drm/msm/msm_drv.h +8
-0@@ -57,6 +57,7 @@ struct msm_file_private {struct list_head submitqueues;int queueid;struct msm_gem_address_space *aspace; +struct kref ref; };enum msm_mdp_plane_property {@@ -429,6 +430,13 @@ void msm_submitqueue_close(struct msm_file_private *ctx);void msm_submitqueue_destroy (struct kref *kref); +static inline void msm_file_private_destroy (struct kref *kref) +{ +struct msm_file_private *ctx =container_of (kref, + struct msm_file_private, ref); + +kfree (ctx); +}#define DBG (fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)#define VERB (fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)drivers/gpu/drm/msm/msm_gem.h +1
-0@@ -142,6 +142,7 @@ struct msm_gem_submit {bool valid;/* true if no cmdstream patching needed */ bool in_rb;/* "sudo" mode, copy cmds into RB */ struct msm_ringbuffer *ring; +struct msm_file_private *ctx;unsigned int nr_cmds;unsigned int nr_bos;u32 ident;/* A "identifier" for the submit for logging */ drivers/gpu/drm/msm/msm_gem_submit.c +4
-4@@ -27,7 +27,7 @@#define BO_PINNED 0x2000static struct msm_gem_submit *submit_create (struct drm_device *dev, -struct msm_gpu *gpu,struct msm_gem_address_space *aspace, +struct msm_gpu *gpu,struct msm_gpu_submitqueue *queue,uint32_t nr_bos,uint32_t nr_cmds) {@@ -43,7 +43,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,return NULL ; submit->dev = dev; - submit->aspace = aspace; + submit->aspace = queue->ctx->aspace; submit->gpu = gpu; submit->fence =NULL ; submit->cmd = (void *)&submit->bos[nr_bos];@@ -677,7 +677,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } } - submit =submit_create (dev, gpu, ctx->aspace, queue, args->nr_bos, + submit =submit_create (dev, gpu, queue, args->nr_bos, args->nr_cmds);if (!submit) { ret = -ENOMEM ;@@ -785,7 +785,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } } -msm_gpu_submit (gpu, submit, ctx); +msm_gpu_submit (gpu, submit); args->fence = submit->fence->seqno;drivers/gpu/drm/msm/msm_gpu.c +4
-5@@ -520,7 +520,7 @@ static void recover_worker(struct work_struct *work)struct msm_ringbuffer *ring = gpu->rb[i];list_for_each_entry (submit, &ring->submits, node) - gpu->funcs->submit (gpu, submit,NULL ); + gpu->funcs->submit (gpu, submit); } }@@ -747,8 +747,7 @@ void msm_gpu_retire(struct msm_gpu *gpu) }/* add bo's to gpu's ring, and kick gpu: */ -void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx) +void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {struct drm_device *dev = gpu->dev;struct msm_drm_private *priv = dev->dev_private;@@ -788,8 +787,8 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,msm_gem_move_to_active (&msm_obj->base, gpu, false, submit->fence); } - gpu->funcs->submit (gpu, submit, ctx); - priv->lastctx = ctx; + gpu->funcs->submit (gpu, submit); + priv->lastctx = submit->queue->ctx;hangcheck_timer_reset (gpu); }drivers/gpu/drm/msm/msm_gpu.h +3
-4@@ -44,8 +44,7 @@ struct msm_gpu_funcs {int (*hw_init)(struct msm_gpu *gpu);int (*pm_suspend)(struct msm_gpu *gpu);int (*pm_resume)(struct msm_gpu *gpu); -void (*submit)(struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void (*submit)(struct msm_gpu *gpu,struct msm_gem_submit *submit);void (*flush)(struct msm_gpu *gpu,struct msm_ringbuffer *ring);irqreturn_t (*irq)(struct msm_gpu *irq);struct msm_ringbuffer *(*active_ring)(struct msm_gpu *gpu);@@ -181,6 +180,7 @@ struct msm_gpu_submitqueue {u32 flags;u32 prio;int faults; +struct msm_file_private *ctx;struct list_head node;struct kref ref; };@@ -280,8 +280,7 @@ int msm_gpu_perfcntr_sample(struct msm_gpu *gpu, uint32_t *activetime, uint32_t *totaltime, uint32_t ncntrs, uint32_t *cntrs);void msm_gpu_retire (struct msm_gpu *gpu); -void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit, -struct msm_file_private *ctx); +void msm_gpu_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit); int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs,drivers/gpu/drm/msm/msm_submitqueue.c +0
-0
drivers/gpu/drm/msm/msm_submitqueue.c void msm_submitqueue_close(struct msm_file_private *ctx) · line 55
Quoted 8 lines
drivers/gpu/drm/msm/msm_submitqueue.c +3
-1@@ -49,8 +49,10 @@ void msm_submitqueue_close(struct msm_file_private *ctx)* No lock needed in close and there won't * be any more user ioctls coming our way */ -list_for_each_entry_safe (entry, tmp, &ctx->submitqueues, node) +list_for_each_entry_safe (entry, tmp, &ctx->submitqueues, node) { +kref_put (&ctx->ref, msm_file_private_destroy);msm_submitqueue_put (entry); + }
Seems kinda like the kref_put should happen in the final unref of the submitqueue, since the reference is taken in msm_submitqueue_create()?
(If there is something I'm overlooking, I guess that is a hint that
there should be a comment here)
Otherwise, I like this.
BR,
-R
Quoted 24 lines
drivers/gpu/drm/msm/msm_submitqueue.c +4
-1} int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,@@ -81,6 +83,9 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,write_lock (&ctx->queuelock); +kref_get (&ctx->ref); + + queue->ctx = ctx; queue->id = ctx->queueid++;if (id)@@ -177,6 +182,7 @@ int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id)list_del (&entry->node);write_unlock (&ctx->queuelock); +kref_put (&ctx->ref, msm_file_private_destroy);msm_submitqueue_put (entry);return 0 ; } --2.25.1
PATCH v10 9/13 drm/msm: Set the global virtual address range from the IOMMU domain
In reply to Jordan CrouseUse the aperture settings from the IOMMU domain to set up the virtual address range for the GPU. This allows us to transparently deal with IOMMU side features (like split pagetables).
---
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 13 +++++++++++-- drivers/gpu/drm/msm/msm_iommu.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +11 -2
@@ -192,9 +192,18 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu,struct iommu_domain *iommu =iommu_domain_alloc (&platform_bus_type);struct msm_mmu *mmu =msm_iommu_new (&pdev->dev, iommu);struct msm_gem_address_space *aspace; +u64 start, size; - aspace =msm_gem_address_space_create (mmu,"gpu" ,SZ_16M , -0xffffffff -SZ_16M ); +/* +* Use the aperture start or SZ_16M, whichever is greater. This will +* ensure that we align with the allocated pagetable range while still +* allowing room in the lower 32 bits for GMEM and whatnot +*/ + start =max_t (u64,SZ_16M , iommu->geometry.aperture_start); + size = iommu->geometry.aperture_end - start +1 ; + + aspace =msm_gem_address_space_create (mmu,"gpu" , + start &GENMASK (48 ,0 ), size);if (IS_ERR (aspace) && !IS_ERR (mmu)) mmu->funcs->destroy (mmu);
drivers/gpu/drm/msm/msm_iommu.c +7 -0
@@ -36,6 +36,10 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,struct msm_iommu *iommu =to_msm_iommu (mmu);size_t ret; +/* The arm-smmu driver expects the addresses to be sign extended */ +if (iova &BIT_ULL (48 )) + iova |=GENMASK_ULL (63 ,49 ); + ret =iommu_map_sg (iommu->domain, iova, sgt->sgl, sgt->nents, prot);WARN_ON (!ret);
@@ -46,6 +50,9 @@ static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len) {struct msm_iommu *iommu =to_msm_iommu (mmu); +if (iova &BIT_ULL (48 )) + iova |=GENMASK_ULL (63 ,49 ); +iommu_unmap (iommu->domain, iova, len);return 0 ;
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v10 10/13 drm/msm: Add support to create a local pagetable
In reply to Jordan CrouseAdd support to create a io-pgtable for use by targets that support per-instance pagetables. In order to support per-instance pagetables the GPU SMMU device needs to have the qcom,adreno-smmu compatible string and split pagetables enabled.
---
drivers/gpu/drm/msm/msm_gpummu.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 191 ++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/msm_mmu.h | 16 ++- 3 files changed, 206 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/msm_gpummu.c +1 -1
@@ -102,7 +102,7 @@ struct msm_mmu *msm_gpummu_new(struct device *dev, struct msm_gpu *gpu) } gpummu->gpu = gpu; -msm_mmu_init (&gpummu->base, dev, &funcs); +msm_mmu_init (&gpummu->base, dev, &funcs,MSM_MMU_GPUMMU );return &gpummu->base; }
drivers/gpu/drm/msm/msm_iommu.c +190 -1
214 lines not on this page · raw message
drivers/gpu/drm/msm/msm_mmu.h +15 -1
@@ -17,18 +17,26 @@ struct msm_mmu_funcs {void (*destroy)(struct msm_mmu *mmu); }; +enum msm_mmu_type { +MSM_MMU_GPUMMU , +MSM_MMU_IOMMU , +MSM_MMU_IOMMU_PAGETABLE , +}; +struct msm_mmu {const struct msm_mmu_funcs *funcs;struct device *dev;int (*handler)(void *arg,unsigned long iova,int flags);void *arg; +enum msm_mmu_type type; };static inline void msm_mmu_init (struct msm_mmu *mmu,struct device *dev, -const struct msm_mmu_funcs *funcs) +const struct msm_mmu_funcs *funcs,enum msm_mmu_type type) { mmu->dev = dev; mmu->funcs = funcs; + mmu->type = type; }struct msm_mmu *msm_iommu_new (struct device *dev,struct iommu_domain *domain);
@@ -41,7 +49,13 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, mmu->handler = handler; } +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent); +void msm_gpummu_params (struct msm_mmu *mmu,dma_addr_t *pt_base,dma_addr_t *tran_error); + +int msm_iommu_pagetable_params (struct msm_mmu *mmu,phys_addr_t *ttbr, +int *asid); +#endif /* __MSM_MMU_H__ */
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 11/13 drm/msm: Add support for private address space instances
In reply to Jordan CrouseAdd support for allocating private address space instances. Targets that support per-context pagetables should implement their own function to allocate private address spaces.
The default will return a pointer to the global address space.
---
drivers/gpu/drm/msm/msm_drv.c | 13 +++++++------ drivers/gpu/drm/msm/msm_drv.h | 5 +++++ drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++++ drivers/gpu/drm/msm/msm_gpu.c | 17 +++++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ 5 files changed, 43 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +7 -6
@@ -603,7 +603,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)kref_init (&ctx->ref);msm_submitqueue_init (dev, ctx); - ctx->aspace = priv->gpu ? priv->gpu->aspace :NULL ; + ctx->aspace =msm_gpu_create_private_address_space (priv->gpu); file->driver_priv = ctx;return 0 ;
@@ -786,18 +786,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, }static int msm_ioctl_gem_info_iova (struct drm_device *dev, -struct drm_gem_object *obj,uint64_t *iova) +struct drm_file *file,struct drm_gem_object *obj, +uint64_t *iova) { -struct msm_drm_private *priv = dev->dev_private; +struct msm_file_private *ctx = file->driver_priv; -if (!priv->gpu) +if (!ctx->aspace)return -EINVAL ;/* * Don't pin the memory here - just get an address so that userspace can * be productive */ -return msm_gem_get_iova (obj, priv->gpu->aspace, iova); +return msm_gem_get_iova (obj, ctx->aspace, iova); } static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
@@ -836,7 +837,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, args->value =msm_gem_mmap_offset (obj);break ;case MSM_INFO_GET_IOVA : - ret =msm_ioctl_gem_info_iova (dev, obj, &args->value); + ret =msm_ioctl_gem_info_iova (dev, file, obj, &args->value);break ;case MSM_INFO_SET_NAME :/* length check should leave room for terminating null: */
drivers/gpu/drm/msm/msm_drv.h +5 -0
@@ -250,6 +250,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace,void msm_gem_close_vma (struct msm_gem_address_space *aspace,struct msm_gem_vma *vma); + +struct msm_gem_address_space * +msm_gem_address_space_get (struct msm_gem_address_space *aspace); +void msm_gem_address_space_put (struct msm_gem_address_space *aspace); struct msm_gem_address_space *
@@ -435,6 +439,7 @@ static inline void msm_file_private_destroy(struct kref *kref)struct msm_file_private *ctx =container_of (kref, struct msm_file_private, ref); +msm_gem_address_space_put (ctx->aspace);kfree (ctx); }
drivers/gpu/drm/msm/msm_gem_vma.c +9 -0
@@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace)kref_put (&aspace->kref, msm_gem_address_space_destroy); } +struct msm_gem_address_space * +msm_gem_address_space_get (struct msm_gem_address_space *aspace) +{ +if (!IS_ERR_OR_NULL (aspace)) +kref_get (&aspace->kref); + +return aspace; +} +/* Actually unmap memory for the vma */ void msm_gem_purge_vma (struct msm_gem_address_space *aspace,struct msm_gem_vma *vma)
drivers/gpu/drm/msm/msm_gpu.c +17 -0
@@ -823,6 +823,23 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu)return 0 ; } +/* Return a new address space for a msm_drm_private instance */ +struct msm_gem_address_space * +msm_gpu_create_private_address_space (struct msm_gpu *gpu) +{ +if (!gpu) +return NULL ; + +/* +* If the target doesn't support private address spaces then return +* the global one +*/ +if (!gpu->funcs->create_private_address_space) +return msm_gem_address_space_get (gpu->aspace); + +return gpu->funcs->create_private_address_space (gpu); +} +int msm_gpu_init (struct drm_device *drm,struct platform_device *pdev,struct msm_gpu *gpu,const struct msm_gpu_funcs *funcs,const char *name,struct msm_gpu_config *config)
drivers/gpu/drm/msm/msm_gpu.h +5 -0
@@ -64,6 +64,8 @@ struct msm_gpu_funcs {void (*gpu_set_freq)(struct msm_gpu *gpu,struct dev_pm_opp *opp);struct msm_gem_address_space *(*create_address_space) (struct msm_gpu *gpu,struct platform_device *pdev); +struct msm_gem_address_space *(*create_private_address_space) + (struct msm_gpu *gpu); };struct msm_gpu {
@@ -286,6 +288,9 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, const char *name, struct msm_gpu_config *config); +struct msm_gem_address_space * +msm_gpu_create_private_address_space (struct msm_gpu *gpu); +void msm_gpu_cleanup (struct msm_gpu *gpu);struct msm_gpu *adreno_load_gpu (struct drm_device *dev);
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 12/13 drm/msm/a6xx: Add support for per-instance pagetables
In reply to Jordan CrouseAdd support for using per-instance pagetables if all the dependencies are available.
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 53 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/msm_ringbuffer.h | 1 + 3 files changed, 55 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +53 -0
@@ -81,6 +81,41 @@ static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter,OUT_RING (ring,upper_32_bits (iova)); } +static void a6xx_set_pagetable (struct a6xx_gpu *a6xx_gpu, +struct msm_ringbuffer *ring,struct msm_file_private *ctx) +{ +phys_addr_t ttbr; +u32 asid; +u64 memptr =rbmemptr (ring, ttbr0); + +if (ctx == a6xx_gpu->cur_ctx) +return ; + +if (msm_iommu_pagetable_params (ctx->aspace->mmu, &ttbr, &asid)) +return ; + +/* Execute the table update */ +OUT_PKT7 (ring,CP_SMMU_TABLE_UPDATE ,4 ); +OUT_RING (ring,CP_SMMU_TABLE_UPDATE_0_TTBR0_LO (lower_32_bits (ttbr))); +OUT_RING (ring, +CP_SMMU_TABLE_UPDATE_1_TTBR0_HI (upper_32_bits (ttbr)) | +CP_SMMU_TABLE_UPDATE_1_ASID (asid)); +OUT_RING (ring,CP_SMMU_TABLE_UPDATE_2_CONTEXTIDR (0 )); +OUT_RING (ring,CP_SMMU_TABLE_UPDATE_3_CONTEXTBANK (0 )); + +/* +* Write the new TTBR0 to the memstore. This is good for debugging. +*/ +OUT_PKT7 (ring,CP_MEM_WRITE ,4 ); +OUT_RING (ring,CP_MEM_WRITE_0_ADDR_LO (lower_32_bits (memptr))); +OUT_RING (ring,CP_MEM_WRITE_1_ADDR_HI (upper_32_bits (memptr))); +OUT_RING (ring,lower_32_bits (ttbr)); +OUT_RING (ring, (asid <<16 ) |upper_32_bits (ttbr)); + + + a6xx_gpu->cur_ctx = ctx; +} +static void a6xx_submit (struct msm_gpu *gpu,struct msm_gem_submit *submit) {unsigned int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;
@@ -90,6 +125,8 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)struct msm_ringbuffer *ring = submit->ring;unsigned int i; +a6xx_set_pagetable (a6xx_gpu, ring, submit->queue->ctx); +get_stats_counter (ring,REG_A6XX_RBBM_PERFCTR_CP_0_LO ,rbmemptr_stats (ring, index, cpcycles_start));
@@ -696,6 +733,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu)/* Always come up on rb 0 */ a6xx_gpu->cur_ring = gpu->rb[0 ]; + a6xx_gpu->cur_ctx =NULL ; +/* Enable the SQE_to start the CP engine */ gpu_write (gpu,REG_A6XX_CP_SQE_CNTL ,1 );
@@ -1008,6 +1047,19 @@ static unsigned long a6xx_gpu_busy(struct msm_gpu *gpu)return (unsigned long )busy_time; } +static struct msm_gem_address_space * +a6xx_create_private_address_space (struct msm_gpu *gpu) +{ +struct msm_mmu *mmu; + + mmu =msm_iommu_pagetable_create (gpu->aspace->mmu); +if (IS_ERR (mmu)) +return msm_gem_address_space_get (gpu->aspace); + +return msm_gem_address_space_create (mmu, +"gpu" ,0x100000000ULL ,0x1ffffffffULL ); +} +static const struct adreno_gpu_funcs funcs = { .base = { .get_param = adreno_get_param,
@@ -1031,6 +1083,7 @@ static const struct adreno_gpu_funcs funcs = { .gpu_state_put = a6xx_gpu_state_put, #endif .create_address_space = adreno_iommu_create_address_space, + .create_private_address_space = a6xx_create_private_address_space, }, .get_timestamp = a6xx_get_timestamp, };
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -0
@@ -19,6 +19,7 @@ struct a6xx_gpu {uint64_t sqe_iova;struct msm_ringbuffer *cur_ring; +struct msm_file_private *cur_ctx;struct a6xx_gmu gmu; };
drivers/gpu/drm/msm/msm_ringbuffer.h +1 -0
@@ -31,6 +31,7 @@ struct msm_rbmemptrs {volatile uint32_t fence;volatile struct msm_gpu_submit_stats stats[MSM_GPU_SUBMIT_STATS_COUNT ]; +volatile u64 ttbr0; };struct msm_ringbuffer {
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kernel test robot
build botRe: [PATCH v10 12/13] drm/msm/a6xx: Add support for per-instance pagetables
Thank you for the patch! Yet something to improve:
Hi Jordan,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on next-20200720]
[also build test ERROR on v5.8-rc6]
[cannot apply to iommu/next robh/for-next arm-perf/for-next/perf arm64/for-next/core linus/master v5.8-rc6 v5.8-rc5 v5.8-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jordan-Crouse/iommu-arm-smmu-Add-Adreno-SMMU-specific-implementation/20200721-004820 base: ab8be66e724ecf4bffb2895c9c91bbd44fa687c7 config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/gpu/drm/msm/adreno/a6xx_gpu.c:33:6: warning: no previous prototype for 'a6xx_idle' [-Wmissing-prototypes]
33 | bool a6xx_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring)
| ^~~~~~~~~
drivers/gpu/drm/msm/adreno/a6xx_gpu.c: In function 'a6xx_set_pagetable':
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:97:17: error: implicit declaration of function 'CP_SMMU_TABLE_UPDATE_0_TTBR0_LO' [-Werror=implicit-function-declaration]
97 | OUT_RING(ring, CP_SMMU_TABLE_UPDATE_0_TTBR0_LO(lower_32_bits(ttbr)));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:99:3: error: implicit declaration of function 'CP_SMMU_TABLE_UPDATE_1_TTBR0_HI' [-Werror=implicit-function-declaration]
99 | CP_SMMU_TABLE_UPDATE_1_TTBR0_HI(upper_32_bits(ttbr)) |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:100:3: error: implicit declaration of function 'CP_SMMU_TABLE_UPDATE_1_ASID' [-Werror=implicit-function-declaration]
100 | CP_SMMU_TABLE_UPDATE_1_ASID(asid));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:101:17: error: implicit declaration of function 'CP_SMMU_TABLE_UPDATE_2_CONTEXTIDR' [-Werror=implicit-function-declaration]
101 | OUT_RING(ring, CP_SMMU_TABLE_UPDATE_2_CONTEXTIDR(0));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:102:17: error: implicit declaration of function 'CP_SMMU_TABLE_UPDATE_3_CONTEXTBANK' [-Werror=implicit-function-declaration]
102 | OUT_RING(ring, CP_SMMU_TABLE_UPDATE_3_CONTEXTBANK(0));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:108:17: error: implicit declaration of function 'CP_MEM_WRITE_0_ADDR_LO'; did you mean 'CP_EVENT_WRITE_1_ADDR_0_LO'? [-Werror=implicit-function-declaration]
108 | OUT_RING(ring, CP_MEM_WRITE_0_ADDR_LO(lower_32_bits(memptr)));
| ^~~~~~~~~~~~~~~~~~~~~~
| CP_EVENT_WRITE_1_ADDR_0_LO
>> drivers/gpu/drm/msm/adreno/a6xx_gpu.c:109:17: error: implicit declaration of function 'CP_MEM_WRITE_1_ADDR_HI'; did you mean 'CP_EVENT_WRITE_2_ADDR_0_HI'? [-Werror=implicit-function-declaration]
109 | OUT_RING(ring, CP_MEM_WRITE_1_ADDR_HI(upper_32_bits(memptr)));
| ^~~~~~~~~~~~~~~~~~~~~~
| CP_EVENT_WRITE_2_ADDR_0_HIcc1: some warnings being treated as errors
vim +/CP_SMMU_TABLE_UPDATE_0_TTBR0_LO +97 drivers/gpu/drm/msm/adreno/a6xx_gpu.c
81
82 static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu,
83 struct msm_ringbuffer *ring, struct msm_file_private *ctx)
84 {
85 phys_addr_t ttbr;
86 u32 asid;
87 u64 memptr = rbmemptr(ring, ttbr0);
88
89 if (ctx == a6xx_gpu->cur_ctx)
90 return;
91
92 if (msm_iommu_pagetable_params(ctx->aspace->mmu, &ttbr, &asid))
93 return;
94
95 /* Execute the table update */
96 OUT_PKT7(ring, CP_SMMU_TABLE_UPDATE, 4);
> 97 OUT_RING(ring, CP_SMMU_TABLE_UPDATE_0_TTBR0_LO(lower_32_bits(ttbr)));
98 OUT_RING(ring,
> 99 CP_SMMU_TABLE_UPDATE_1_TTBR0_HI(upper_32_bits(ttbr)) |
> 100 CP_SMMU_TABLE_UPDATE_1_ASID(asid));
> 101 OUT_RING(ring, CP_SMMU_TABLE_UPDATE_2_CONTEXTIDR(0));
> 102 OUT_RING(ring, CP_SMMU_TABLE_UPDATE_3_CONTEXTBANK(0));
103
104 /*
105 * Write the new TTBR0 to the memstore. This is good for debugging.
106 */
107 OUT_PKT7(ring, CP_MEM_WRITE, 4);
> 108 OUT_RING(ring, CP_MEM_WRITE_0_ADDR_LO(lower_32_bits(memptr)));
> 109 OUT_RING(ring, CP_MEM_WRITE_1_ADDR_HI(upper_32_bits(memptr))); 110 OUT_RING(ring, lower_32_bits(ttbr));
111 OUT_RING(ring, (asid << 16) | upper_32_bits(ttbr));
112
113
114 a6xx_gpu->cur_ctx = ctx;
115 }
116
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v10 13/13 arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
In reply to Jordan CrouseSet the qcom,adreno-smmu compatible string for the GPU SMMU to enable split pagetables and per-instance pagetables for drm/msm.
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -3981,7 +3981,7 @@ opp-257000000 { }; adreno_smmu: iommu@5040000 { - compatible = "qcom,sdm845-smmu-v2", "qcom,smmu-v2"; + compatible = "qcom,adreno-smmu", "qcom,smmu-v2"; reg = <0 0x5040000 0 0x10000>; #iommu-cells = <1>; #global-interrupts = <2>;
Signature · 1 line
2.25.1