iommu/arm-smmu: Add Adreno SMMU specific implementation
Subsystems (9)
v11 cover iommu/arm-smmu: Add Adreno SMMU specific implementation
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:
v11:
- Add implementation specific get_attr/set_attr functions (per Rob Clark)
- Fix context bank allocation (per Bjorn Andersson)
v10:
- 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 (12):
iommu/arm-smmu: Pass io-pgtable config to implementation specific
function
iommu/arm-smmu: Add support for split pagetables iommu/arm-smmu: Prepare for the adreno-smmu implementation
iommu: Add a domain attribute to get/set a pagetable configuration iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
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/arm-smmu/arm-smmu-impl.c | 6 +- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 156 +++++++++++++- drivers/iommu/arm/arm-smmu/arm-smmu.c | 113 +++++----- drivers/iommu/arm/arm-smmu/arm-smmu.h | 82 +++++++- include/linux/iommu.h | 1 + 24 files changed, 653 insertions(+), 113 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v11 1/12 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/arm-smmu/arm-smmu-impl.c | 3 ++- drivers/iommu/arm/arm-smmu/arm-smmu.c | 11 ++++++----- drivers/iommu/arm/arm-smmu/arm-smmu.h | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-)
drivers/iommu/arm/arm-smmu/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/arm-smmu/arm-smmu.c +6 -5
@@ -795,11 +795,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,
@@ -810,6 +805,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/arm-smmu/arm-smmu.h +2 -1
@@ -386,7 +386,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 · 1 line
2.25.1
PATCH v11 2/12 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/arm-smmu/arm-smmu.c | 21 ++++++++++++++++----- drivers/iommu/arm/arm-smmu/arm-smmu.h | 25 +++++++++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu.c +16 -5
@@ -552,11 +552,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;
@@ -822,7 +826,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/arm-smmu/arm-smmu.h +19 -6
@@ -169,10 +169,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)
@@ -350,12 +352,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 v11 3/12 iommu/arm-smmu: Prepare for the adreno-smmu implementation
In reply to Jordan CrouseDo a bit of prep work to add the upcoming adreno-smmu implementation.
Add an hook to allow the implementation to choose which context banks to allocate. Then, add domain_attr_get / domain_attr_set hooks to allow for implementation specific domain attributes.
Move some of the common structs to arm-smmu.h in anticipation of them being used by the implementations and update some of the existing hooks to pass more information that the implementation will need.
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/arm-smmu/arm-smmu-impl.c | 2 +- drivers/iommu/arm/arm-smmu/arm-smmu.c | 83 ++++++++-------------- drivers/iommu/arm/arm-smmu/arm-smmu.h | 56 ++++++++++++++- 3 files changed, 87 insertions(+), 54 deletions(-)
drivers/iommu/arm/arm-smmu/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/arm-smmu/arm-smmu.c +31 -52
149 lines not on this page · raw message
drivers/iommu/arm/arm-smmu/arm-smmu.h +55 -1
94 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v11 4/12 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
@@ -118,6 +118,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 v11 5/12 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/arm-smmu/arm-smmu-impl.c | 3 + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 156 ++++++++++++++++++++- 2 files changed, 157 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu-impl.c +3 -0
@@ -223,6 +223,9 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) of_device_is_compatible(np, "qcom,sm8250-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); +if (of_device_is_compatible (np,"marvell,ap806-smmu-500" )) smmu->impl = &mrvl_mmu500_impl;
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +154 -2
175 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v11 6/12 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
@@ -49,6 +49,10 @@ properties: - enum: - nvidia,tegra194-smmu - const: nvidia,smmu-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 · 1 line
2.25.1
PATCH v11 7/12 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
@@ -594,6 +594,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 ;
@@ -615,7 +616,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 {
@@ -428,6 +429,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
PATCH v11 8/12 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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v11 9/12 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
Re: [Freedreno] [PATCH v11 09/12] drm/msm: Add support to create a local pagetable
Quoted 215 lines · Jordan Crouse
Add 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.
Signed-off-by Jordan Crouse <[email protected]>---
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 +171
-0@@ -4,15 +4,202 @@* Author: Rob Clark <[email protected]> */ +#include <linux/io-pgtable.h> #include "msm_drv.h" #include "msm_mmu.h" struct msm_iommu {struct msm_mmu base;struct iommu_domain *domain; +atomic_t pagetables; }; +#define to_msm_iommu (x) container_of(x, struct msm_iommu, base) +struct msm_iommu_pagetable { +struct msm_mmu base; +struct msm_mmu *parent; +struct io_pgtable_ops *pgtbl_ops; +phys_addr_t ttbr; +u32 asid; +}; +static struct msm_iommu_pagetable *to_pagetable (struct msm_mmu *mmu) +{ + return container_of(mmu, struct msm_iommu_pagetable, base); +} + +static int msm_iommu_pagetable_unmap (struct msm_mmu *mmu,u64 iova, +size_t size) +{ +struct msm_iommu_pagetable *pagetable =to_pagetable (mmu); +struct io_pgtable_ops *ops = pagetable->pgtbl_ops; +size_t unmapped =0 ; + +/* Unmap the block one page at a time */ +while (size) { + unmapped += ops->unmap (ops, iova,4096 ,NULL ); + iova +=4096 ; + size -=4096 ; + } + +iommu_flush_tlb_all (to_msm_iommu (pagetable->parent)->domain); + +return (unmapped == size) ?0 : -EINVAL ; +} + +static int msm_iommu_pagetable_map (struct msm_mmu *mmu,u64 iova, +struct sg_table *sgt,size_t len,int prot) +{ +struct msm_iommu_pagetable *pagetable =to_pagetable (mmu); +struct io_pgtable_ops *ops = pagetable->pgtbl_ops; +struct scatterlist *sg; +size_t mapped =0 ; +u64 addr = iova; +unsigned int i; + +for_each_sg (sgt->sgl, sg, sgt->nents, i) { +size_t size = sg->length; +phys_addr_t phys =sg_phys (sg); + +/* Map the block one page at a time */ +while (size) { +if (ops->map (ops, addr, phys,4096 , prot,GFP_KERNEL )) { +msm_iommu_pagetable_unmap (mmu, iova, mapped); +return -EINVAL ; + } + + phys +=4096 ; + addr +=4096 ; + size -=4096 ; + mapped +=4096 ; + } + } + +return 0 ; +} + +static void msm_iommu_pagetable_destroy (struct msm_mmu *mmu) +{ +struct msm_iommu_pagetable *pagetable =to_pagetable (mmu); +struct msm_iommu *iommu =to_msm_iommu (pagetable->parent); + +/* +* If this is the last attached pagetable for the parent, +* disable TTBR0 in the arm-smmu driver +*/ +if (atomic_dec_return (&iommu->pagetables) ==0 ) +iommu_domain_set_attr (iommu->domain, +DOMAIN_ATTR_PGTABLE_CFG ,NULL ); + +free_io_pgtable_ops (pagetable->pgtbl_ops); +kfree (pagetable); +} + +int msm_iommu_pagetable_params (struct msm_mmu *mmu, +phys_addr_t *ttbr,int *asid) +{ +struct msm_iommu_pagetable *pagetable; + +if (mmu->type !=MSM_MMU_IOMMU_PAGETABLE ) +return -EINVAL ; + + pagetable =to_pagetable (mmu); + +if (ttbr) + *ttbr = pagetable->ttbr; + +if (asid) + *asid = pagetable->asid; + +return 0 ; +} + +static const struct msm_mmu_funcs pagetable_funcs = { + .map = msm_iommu_pagetable_map, + .unmap = msm_iommu_pagetable_unmap, + .destroy = msm_iommu_pagetable_destroy, +}; + +static void msm_iommu_tlb_flush_all (void *cookie) +{ +} + +static void msm_iommu_tlb_flush_walk (unsigned long iova,size_t size, +size_t granule,void *cookie) +{ +} + +static void msm_iommu_tlb_add_page (struct iommu_iotlb_gather *gather, +unsigned long iova,size_t granule,void *cookie) +{ +} + +static const struct iommu_flush_ops null_tlb_ops = { + .tlb_flush_all = msm_iommu_tlb_flush_all, + .tlb_flush_walk = msm_iommu_tlb_flush_walk, + .tlb_flush_leaf = msm_iommu_tlb_flush_walk, + .tlb_add_page = msm_iommu_tlb_add_page, +}; + +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent) +{ +struct msm_iommu *iommu =to_msm_iommu (parent); +static int next_asid =16 ; +struct msm_iommu_pagetable *pagetable; +struct io_pgtable_cfg cfg; +int ret; + +/* Get the pagetable configuration from the domain */ + ret =iommu_domain_get_attr (iommu->domain, +DOMAIN_ATTR_PGTABLE_CFG , &cfg); +if (ret) +return ERR_PTR (ret); + + pagetable =kzalloc (sizeof (*pagetable),GFP_KERNEL ); +if (!pagetable) +return ERR_PTR (-ENOMEM ); + +msm_mmu_init (&pagetable->base, parent->dev, &pagetable_funcs, +MSM_MMU_IOMMU_PAGETABLE ); + +/* The incoming cfg will have the TTBR1 quirk enabled */ + cfg.quirks &= ~IO_PGTABLE_QUIRK_ARM_TTBR1 ; + cfg.tlb = &null_tlb_ops; + + pagetable->pgtbl_ops =alloc_io_pgtable_ops (ARM_64_LPAE_S1 , + &cfg, iommu->domain); + +if (!pagetable->pgtbl_ops) { +kfree (pagetable); +return ERR_PTR (-ENOMEM ); + } + +/* +* If this is the first pagetable that we've allocated, send it back to +* the arm-smmu driver as a trigger to set up TTBR0 +*/ +if (atomic_inc_return (&iommu->pagetables) ==1 ) { + ret =iommu_domain_set_attr (iommu->domain, +DOMAIN_ATTR_PGTABLE_CFG , &cfg); +if (ret) { +free_io_pgtable_ops (pagetable->pgtbl_ops); +kfree (pagetable);
drivers/gpu/drm/msm/msm_iommu.c line 196
Quoted 10 lines
drivers/gpu/drm/msm/msm_iommu.c +10
-0+return ERR_PTR (ret); + } + } + +/* Needed later for TLB flush */ + pagetable->parent = parent; + pagetable->ttbr = cfg.arm_lpae_s1_cfg.ttbr; + + pagetable->asid = next_asid; + next_asid = (next_asid +1 ) %255 ;
nit: extra space before '%'
drivers/gpu/drm/msm/msm_iommu.c line 198
Quoted 2 lines
drivers/gpu/drm/msm/msm_iommu.c +2
-0+if (next_asid <16 ) + next_asid =16 ;
nit: next_asid = min(16, next_asid)
?
BR,
-R
Quoted 73 lines
drivers/gpu/drm/msm/msm_iommu.c +7
-1+ +return &pagetable->base; +} +static int msm_fault_handler (struct iommu_domain *domain,struct device *dev,unsigned long iova,int flags,void *arg) {@@ -85,9 +272,11 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)return ERR_PTR (-ENOMEM ); iommu->domain = domain; -msm_mmu_init (&iommu->base, dev, &funcs); +msm_mmu_init (&iommu->base, dev, &funcs,MSM_MMU_IOMMU );iommu_set_fault_handler (domain, msm_fault_handler, iommu); +atomic_set (&iommu->pagetables,0 ); + ret =iommu_attach_device (iommu->domain, dev);if (ret) {kfree (iommu);drivers/gpu/drm/msm/msm_mmu.h +15
-2@@ -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__ */ --2.25.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v11 10/12 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
@@ -597,7 +597,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 ;
@@ -780,18 +780,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,
@@ -830,7 +831,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
@@ -249,6 +249,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 *
@@ -434,6 +438,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 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [Freedreno] [PATCH v11 10/12] drm/msm: Add support for private address space instances
Quoted 119 lines · Jordan Crouse
Add 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.
Signed-off-by Jordan Crouse <[email protected]>---
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@@ -597,7 +597,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 ;@@ -780,18 +780,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,@@ -830,7 +831,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@@ -249,6 +249,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 *@@ -434,6 +438,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 +5
-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)
drivers/gpu/drm/msm/msm_gpu.c static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) · line 840
Quoted 10 lines
drivers/gpu/drm/msm/msm_gpu.c +10
-0+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);
so if you flip the logic around here, you can get rid of the msm_gem_address_space_get() in per-gen backend and consolidate the error handling here, ie.
struct msm_gem_address_space *aspace = NULL;
if (gpu->funcs->create_private_address_space)
aspace = gpu->funcs->create_private_address_space(...);
if (IS_ERR_OR_NULL(aspace))
aspace = msm_gem_address_space_get(...);(and that also simplifies a bit the patch I have on top to show comm in debugfs)
BR,
-R
Quoted 35 lines
drivers/gpu/drm/msm/msm_gpu.c +2
-0+} +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
-1@@ -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); --2.25.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v11 11/12 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 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v11 12/12 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
@@ -4058,7 +4058,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 · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu