drm/amdgpu: Remap hdp coherency registers
Subsystems (3)
PATCH 1/2 drm/amdgpu: Remap hdp coherency registers
Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.
v2: Use explicit register hole location
v3: Moved remapped hdp registers into adev struct
v4: Use more generic name for remapped page
Expose register offset in kfd_ioctl.h
v5: Move hdp register remap function to nbio ip function
v6: Fixed operator precedence issue and other bugs
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +++++++ drivers/gpu/drm/amd/amdgpu/cik.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 ++++++++++++--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 ++++++++++++--- drivers/gpu/drm/amd/amdgpu/si.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +++++++++++ drivers/gpu/drm/amd/amdgpu/vi.c | 1 + include/uapi/linux/kfd_ioctl.h | 7 +++++++ 8 files changed, 52 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +7 -0
@@ -642,6 +642,11 @@ struct nbio_hdp_flush_reg {u32 ref_and_mask_sdma1; }; +struct amdgpu_mmio_remap { +u32 reg_offset; +resource_size_t bus_addr; +}; +struct amdgpu_nbio_funcs {const struct nbio_hdp_flush_reg *hdp_flush_reg;u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
@@ -669,6 +674,7 @@ struct amdgpu_nbio_funcs {void (*ih_control)(struct amdgpu_device *adev);void (*init_registers)(struct amdgpu_device *adev);void (*detect_hw_virt)(struct amdgpu_device *adev); +void (*remap_hdp_registers)(struct amdgpu_device *adev); };struct amdgpu_df_funcs {
@@ -767,6 +773,7 @@ struct amdgpu_device {void __iomem *rmmio;/* protects concurrent MM_INDEX/DATA based register access */ spinlock_t mmio_idx_lock; +struct amdgpu_mmio_remap rmmio_remap;/* protects concurrent SMC based register access */ spinlock_t smc_idx_lock;amdgpu_rreg_t smc_rreg;
drivers/gpu/drm/amd/amdgpu/cik.c +1 -0
@@ -1827,6 +1827,7 @@ static int cik_common_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.bus_addr =ULLONG_MAX ; adev->smc_rreg = &cik_smc_rreg; adev->smc_wreg = &cik_smc_wreg; adev->pcie_rreg = &cik_pcie_rreg;
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +12 -3
@@ -29,9 +29,18 @@#include "nbio/nbio_7_0_sh_mask.h" #include "nbio/nbio_7_0_smn.h" #include "vega10_enum.h" +#include <uapi/linux/kfd_ioctl.h> #define smnNBIF_MGCG_CTRL_LCLK 0x1013a05c +static void nbio_v7_0_remap_hdp_registers (struct amdgpu_device *adev) +{ +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_MEM_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ); +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_REG_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL ); +} +static u32 nbio_v7_0_get_rev_id (struct amdgpu_device *adev) {u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0);
@@ -55,10 +64,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev, struct amdgpu_ring *ring) {if (!ring || !ring->funcs->emit_wreg) -WREG32_SOC15_NO_KIQ (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL,0 ); +WREG32_NO_KIQ ((adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 );else -amdgpu_ring_emit_wreg (ring,SOC15_REG_OFFSET ( -NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +amdgpu_ring_emit_wreg (ring, (adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 ); }static u32 nbio_v7_0_get_memsize (struct amdgpu_device *adev)
@@ -283,4 +291,5 @@ const struct amdgpu_nbio_funcs nbio_v7_0_funcs = { .ih_control = nbio_v7_0_ih_control, .init_registers = nbio_v7_0_init_registers, .detect_hw_virt = nbio_v7_0_detect_hw_virt, + .remap_hdp_registers = nbio_v7_0_remap_hdp_registers, };
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +12 -3
@@ -27,9 +27,18 @@#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "nbio/nbio_7_4_0_smn.h" +#include <uapi/linux/kfd_ioctl.h> #define smnNBIF_MGCG_CTRL_LCLK 0x1013a21c +static void nbio_v7_4_remap_hdp_registers (struct amdgpu_device *adev) +{ +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_MEM_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ); +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_REG_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL ); +} +static u32 nbio_v7_4_get_rev_id (struct amdgpu_device *adev) {u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0);
@@ -53,10 +62,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev, struct amdgpu_ring *ring) {if (!ring || !ring->funcs->emit_wreg) -WREG32_SOC15_NO_KIQ (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL,0 ); +WREG32_NO_KIQ ((adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 );else -amdgpu_ring_emit_wreg (ring,SOC15_REG_OFFSET ( -NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +amdgpu_ring_emit_wreg (ring, (adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 ); }static u32 nbio_v7_4_get_memsize (struct amdgpu_device *adev)
@@ -262,4 +270,5 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .ih_control = nbio_v7_4_ih_control, .init_registers = nbio_v7_4_init_registers, .detect_hw_virt = nbio_v7_4_detect_hw_virt, + .remap_hdp_registers = nbio_v7_4_remap_hdp_registers, };
drivers/gpu/drm/amd/amdgpu/si.c +1 -0
@@ -1405,6 +1405,7 @@ static int si_common_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.bus_addr =ULLONG_MAX ; adev->smc_rreg = &si_smc_rreg; adev->smc_wreg = &si_smc_wreg; adev->pcie_rreg = &si_pcie_rreg;
drivers/gpu/drm/amd/amdgpu/soc15.c +11 -0
@@ -44,6 +44,7 @@#include "smuio/smuio_9_0_offset.h" #include "smuio/smuio_9_0_sh_mask.h" #include "nbio/nbio_7_0_default.h" +#include "nbio/nbio_7_0_offset.h" #include "nbio/nbio_7_0_sh_mask.h" #include "nbio/nbio_7_0_smn.h" #include "mp/mp_9_0_offset.h"
@@ -64,6 +65,7 @@#include "dce_virtual.h" #include "mxgpu_ai.h" #include "amdgpu_smu.h" +#include <uapi/linux/kfd_ioctl.h> #define mmMP0_MISC_CGTT_CTRL0 0x01b9#define mmMP0_MISC_CGTT_CTRL0_BASE_IDX 0
@@ -777,8 +779,11 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =static int soc15_common_early_init (void *handle) { +#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.reg_offset =MMIO_REG_HOLE_OFFSET ; + adev->rmmio_remap.bus_addr = adev->rmmio_base +MMIO_REG_HOLE_OFFSET ; adev->smc_rreg =NULL ; adev->smc_wreg =NULL ; adev->pcie_rreg = &soc15_pcie_rreg;
@@ -1007,6 +1012,12 @@ static int soc15_common_hw_init(void *handle)soc15_program_aspm (adev);/* setup nbio registers */ adev->nbio_funcs->init_registers (adev); +/* remap HDP registers to a hole in mmio space, +* for the purpose of expose those registers +* to process space +*/ +if (adev->nbio_funcs->remap_hdp_registers) + adev->nbio_funcs->remap_hdp_registers (adev);/* enable the doorbell aperture */ soc15_enable_doorbell_aperture (adev, true);/* HW doorbell routing policy: doorbell writing not
drivers/gpu/drm/amd/amdgpu/vi.c +1 -0
@@ -1037,6 +1037,7 @@ static int vi_common_early_init(void *handle) adev->smc_rreg = &vi_smc_rreg; adev->smc_wreg = &vi_smc_wreg; } + adev->rmmio_remap.bus_addr =ULLONG_MAX ; adev->pcie_rreg = &vi_pcie_rreg; adev->pcie_wreg = &vi_pcie_wreg; adev->uvd_ctx_rreg = &vi_uvd_ctx_rreg;
include/uapi/linux/kfd_ioctl.h +7 -0
@@ -426,6 +426,13 @@ struct kfd_ioctl_import_dmabuf_args {__u32 dmabuf_fd;/* to KFD */ }; +/* Register offset inside the remapped mmio page +*/ +enum kfd_mmio_remap { +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL =0 , +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL =4 , +}; +#define AMDKFD_IOCTL_BASE 'K'#define AMDKFD_IO (nr) _IO(AMDKFD_IOCTL_BASE, nr)#define AMDKFD_IOR (nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1556053179-5644-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdkfd: Expose HDP registers to user space
Introduce a new memory type (KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP) and expose mmio page of HDP registers to user space through this new memory type.
v2: moved remapped hdp regs to adev struct
v3: rename the new memory type to ALLOC_MEM_FLAGS_MMIO_REMAP
v4: use more generic function name
v5: Fail remapped mmio allocation for asics before gfx9
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 ++++--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++++++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + include/uapi/linux/kfd_ioctl.h | 1 + 6 files changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +7 -0
@@ -482,6 +482,13 @@ uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)return adev->gmc.xgmi.hive_id; } +uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr (struct kgd_dev *kgd) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)kgd; + +return adev->rmmio_remap.bus_addr; +} +int amdgpu_amdkfd_submit_ib (struct kgd_dev *kgd,enum kgd_engine_type engine,uint32_t vmid,uint64_t gpu_addr,uint32_t *ib_cmd,uint32_t ib_len)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -154,6 +154,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, uint32_t *flags);uint64_t amdgpu_amdkfd_get_vram_usage (struct kgd_dev *kgd);uint64_t amdgpu_amdkfd_get_hive_id (struct kgd_dev *kgd); +uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr (struct kgd_dev *kgd);#define read_user_wptr (mmptr, wptr, dst) \ ({ \
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -3
@@ -1087,7 +1087,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(if (!offset || !*offset)return -EINVAL ; user_addr = *offset; - }else if (flags &ALLOC_MEM_FLAGS_DOORBELL ) { + }else if (flags & (ALLOC_MEM_FLAGS_DOORBELL | +ALLOC_MEM_FLAGS_MMIO_REMAP )) { domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_domain =AMDGPU_GEM_DOMAIN_CPU ; bo_type = ttm_bo_type_sg;
@@ -1263,8 +1264,8 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(/* Free the sync object */ amdgpu_sync_free (&mem->sync); -/* If the SG is not NULL, it's one we created for a doorbell -* BO. We need to free it. +/* If the SG is not NULL, it's one we created for a doorbell or mmio +* remap BO. We need to free it. */ if (mem->bo->tbo.sg) {sg_free_table (mem->bo->tbo.sg);
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6 -0
@@ -1272,6 +1272,12 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep,if (args->size !=kfd_doorbell_process_slice (dev))return -EINVAL ; offset =kfd_get_process_doorbells (dev, p); + }else if (flags &KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP ) { +if (args->size !=PAGE_SIZE ) +return -EINVAL ; + offset =amdgpu_amdkfd_get_mmio_remap_phys_addr (dev->kgd); +if (offset ==ULLONG_MAX ) +return -ENOMEM ; }mutex_lock (&p->mutex);
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 -0
@@ -186,6 +186,7 @@ struct tile_config {#define ALLOC_MEM_FLAGS_GTT (1 << 1)#define ALLOC_MEM_FLAGS_USERPTR (1 << 2)#define ALLOC_MEM_FLAGS_DOORBELL (1 << 3) +#define ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4)/* * Allocation flags attributes/access options.
include/uapi/linux/kfd_ioctl.h +1 -0
@@ -338,6 +338,7 @@ struct kfd_ioctl_acquire_vm_args {#define KFD_IOC_ALLOC_MEM_FLAGS_GTT (1 << 1)#define KFD_IOC_ALLOC_MEM_FLAGS_USERPTR (1 << 2)#define KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL (1 << 3) +#define KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4)/* Allocation flags: attributes/access options */ #define KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE (1 << 31)#define KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE (1 << 30)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
One more nit-pick inline.
Quoted 63 lines · Oak
Remap
HDP_MEM_COHERENCY_FLUSH_CNTLandHDP_REG_COHERENCY_FLUSH_CNTLto an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.v2: Use explicit register hole location
v3: Moved remapped hdp registers into adev struct
v4: Use more generic name for remapped page
Expose register offset inkfd_ioctl.h
v5: Move hdp register remap function to nbio ip function
v6: Fixed operator precedence issue and other bugsChange-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +++++++ drivers/gpu/drm/amd/amdgpu/cik.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 ++++++++++++--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 ++++++++++++--- drivers/gpu/drm/amd/amdgpu/si.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +++++++++++ drivers/gpu/drm/amd/amdgpu/vi.c | 1 + include/uapi/linux/kfd_ioctl.h | 7 +++++++ 8 files changed, 52 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +7
-0@@ -642,6 +642,11 @@ struct nbio_hdp_flush_reg {u32 ref_and_mask_sdma1; }; +struct amdgpu_mmio_remap { +u32 reg_offset; +resource_size_t bus_addr; +}; +struct amdgpu_nbio_funcs {const struct nbio_hdp_flush_reg *hdp_flush_reg;u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);@@ -669,6 +674,7 @@ struct amdgpu_nbio_funcs {void (*ih_control)(struct amdgpu_device *adev);void (*init_registers)(struct amdgpu_device *adev);void (*detect_hw_virt)(struct amdgpu_device *adev); +void (*remap_hdp_registers)(struct amdgpu_device *adev); };struct amdgpu_df_funcs {@@ -767,6 +773,7 @@ struct amdgpu_device {void __iomem *rmmio;/* protects concurrent MM_INDEX/DATA based register access */ spinlock_t mmio_idx_lock; +struct amdgpu_mmio_remap rmmio_remap;/* protects concurrent SMC based register access */ spinlock_t smc_idx_lock;amdgpu_rreg_t smc_rreg;drivers/gpu/drm/amd/amdgpu/cik.c +0
-0
drivers/gpu/drm/amd/amdgpu/cik.c static int cik_common_early_init(void *handle) · line 1830
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/cik.c +1
-0@@ -1827,6 +1827,7 @@ static int cik_common_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.bus_addr =ULLONG_MAX ;
It would be easier to just not do this and define 0 as "no MMIO remapping". That way you don't have to change cik.c, si.c and vi.c and only need to worry about chips that actually do support it.
Then the condition in patch 2 would need to change as well:
drivers/gpu/drm/amd/amdgpu/cik.c static int cik_common_early_init(void *handle) · line 1833
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/cik.c +3
-0+ offset =amdgpu_amdkfd_get_mmio_remap_phys_addr (dev->kgd); +if (!offset) +return -ENOMEM ;
With that fixed, the series is Reviewed-by: Felix Kuehling <[email protected]>
Quoted 164 lines
drivers/gpu/drm/amd/amdgpu/cik.c +0
-0adev->smc_rreg = &cik_smc_rreg; adev->smc_wreg = &cik_smc_wreg; adev->pcie_rreg = &cik_pcie_rreg;drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +12
-3@@ -29,9 +29,18 @@#include "nbio/nbio_7_0_sh_mask.h" #include "nbio/nbio_7_0_smn.h" #include "vega10_enum.h" +#include <uapi/linux/kfd_ioctl.h> #define smnNBIF_MGCG_CTRL_LCLK 0x1013a05c +static void nbio_v7_0_remap_hdp_registers (struct amdgpu_device *adev) +{ +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_MEM_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ); +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_REG_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL ); +} +static u32 nbio_v7_0_get_rev_id (struct amdgpu_device *adev) {u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0);@@ -55,10 +64,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev, struct amdgpu_ring *ring) {if (!ring || !ring->funcs->emit_wreg) -WREG32_SOC15_NO_KIQ (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL,0 ); +WREG32_NO_KIQ ((adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 );else -amdgpu_ring_emit_wreg (ring,SOC15_REG_OFFSET ( -NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +amdgpu_ring_emit_wreg (ring, (adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 ); }static u32 nbio_v7_0_get_memsize (struct amdgpu_device *adev)@@ -283,4 +291,5 @@ const struct amdgpu_nbio_funcs nbio_v7_0_funcs = { .ih_control = nbio_v7_0_ih_control, .init_registers = nbio_v7_0_init_registers, .detect_hw_virt = nbio_v7_0_detect_hw_virt, + .remap_hdp_registers = nbio_v7_0_remap_hdp_registers, };drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +12
-3@@ -27,9 +27,18 @@#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "nbio/nbio_7_4_0_smn.h" +#include <uapi/linux/kfd_ioctl.h> #define smnNBIF_MGCG_CTRL_LCLK 0x1013a21c +static void nbio_v7_4_remap_hdp_registers (struct amdgpu_device *adev) +{ +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_MEM_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ); +WREG32_SOC15 (NBIO ,0 , mmREMAP_HDP_REG_FLUSH_CNTL, + adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL ); +} +static u32 nbio_v7_4_get_rev_id (struct amdgpu_device *adev) {u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0);@@ -53,10 +62,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev, struct amdgpu_ring *ring) {if (!ring || !ring->funcs->emit_wreg) -WREG32_SOC15_NO_KIQ (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL,0 ); +WREG32_NO_KIQ ((adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 );else -amdgpu_ring_emit_wreg (ring,SOC15_REG_OFFSET ( -NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +amdgpu_ring_emit_wreg (ring, (adev->rmmio_remap.reg_offset +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL ) >>2 ,0 ); }static u32 nbio_v7_4_get_memsize (struct amdgpu_device *adev)@@ -262,4 +270,5 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .ih_control = nbio_v7_4_ih_control, .init_registers = nbio_v7_4_init_registers, .detect_hw_virt = nbio_v7_4_detect_hw_virt, + .remap_hdp_registers = nbio_v7_4_remap_hdp_registers, };drivers/gpu/drm/amd/amdgpu/si.c +1
-0@@ -1405,6 +1405,7 @@ static int si_common_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.bus_addr =ULLONG_MAX ; adev->smc_rreg = &si_smc_rreg; adev->smc_wreg = &si_smc_wreg; adev->pcie_rreg = &si_pcie_rreg;drivers/gpu/drm/amd/amdgpu/soc15.c +11
-0@@ -44,6 +44,7 @@#include "smuio/smuio_9_0_offset.h" #include "smuio/smuio_9_0_sh_mask.h" #include "nbio/nbio_7_0_default.h" +#include "nbio/nbio_7_0_offset.h" #include "nbio/nbio_7_0_sh_mask.h" #include "nbio/nbio_7_0_smn.h" #include "mp/mp_9_0_offset.h" @@ -64,6 +65,7 @@#include "dce_virtual.h" #include "mxgpu_ai.h" #include "amdgpu_smu.h" +#include <uapi/linux/kfd_ioctl.h> #define mmMP0_MISC_CGTT_CTRL0 0x01b9#define mmMP0_MISC_CGTT_CTRL0_BASE_IDX 0@@ -777,8 +779,11 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =static int soc15_common_early_init (void *handle) { +#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->rmmio_remap.reg_offset =MMIO_REG_HOLE_OFFSET ; + adev->rmmio_remap.bus_addr = adev->rmmio_base +MMIO_REG_HOLE_OFFSET ; adev->smc_rreg =NULL ; adev->smc_wreg =NULL ; adev->pcie_rreg = &soc15_pcie_rreg;@@ -1007,6 +1012,12 @@ static int soc15_common_hw_init(void *handle)soc15_program_aspm (adev);/* setup nbio registers */ adev->nbio_funcs->init_registers (adev); +/* remap HDP registers to a hole in mmio space, +* for the purpose of expose those registers +* to process space +*/ +if (adev->nbio_funcs->remap_hdp_registers) + adev->nbio_funcs->remap_hdp_registers (adev);/* enable the doorbell aperture */ soc15_enable_doorbell_aperture (adev, true);/* HW doorbell routing policy: doorbell writing not drivers/gpu/drm/amd/amdgpu/vi.c +1
-0@@ -1037,6 +1037,7 @@ static int vi_common_early_init(void *handle) adev->smc_rreg = &vi_smc_rreg; adev->smc_wreg = &vi_smc_wreg; } + adev->rmmio_remap.bus_addr =ULLONG_MAX ; adev->pcie_rreg = &vi_pcie_rreg; adev->pcie_wreg = &vi_pcie_wreg; adev->uvd_ctx_rreg = &vi_uvd_ctx_rreg;include/uapi/linux/kfd_ioctl.h +0
-0@@ -426,6 +426,13 @@ struct kfd_ioctl_import_dmabuf_args {__u32 dmabuf_fd;/* to KFD */ };
include/uapi/linux/kfd_ioctl.h struct kfd_ioctl_import_dmabuf_args { · line 438
Quoted 10 lines
include/uapi/linux/kfd_ioctl.h +7
-0+/* Register offset inside the remapped mmio page +*/ +enum kfd_mmio_remap { +KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL =0 , +KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL =4 , +}; +#define AMDKFD_IOCTL_BASE 'K'#define AMDKFD_IO (nr) _IO(AMDKFD_IOCTL_BASE, nr)#define AMDKFD_IOR (nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx