habanalabs: add new mem ioctl op for mapping hw blocks
PATCH 1/1 habanalabs: add new mem ioctl op for mapping hw blocks
From: Ofir Bitton <[email protected]>
For future ASIC support the driver allows user to map certain regions in the device's configuration space for direct access from userspace.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/device.c | 3 + drivers/misc/habanalabs/common/habanalabs.h | 16 +++- drivers/misc/habanalabs/common/memory.c | 93 ++++++++++++++++++++- drivers/misc/habanalabs/gaudi/gaudi.c | 15 +++- drivers/misc/habanalabs/goya/goya.c | 15 +++- include/uapi/misc/habanalabs.h | 18 +++- 6 files changed, 150 insertions(+), 10 deletions(-)
drivers/misc/habanalabs/common/device.c +3 -0
@@ -142,6 +142,9 @@ static int hl_mmap(struct file *filp, struct vm_area_struct *vma)switch (vm_pgoff &HL_MMAP_TYPE_MASK ) {case HL_MMAP_TYPE_CB :return hl_cb_mmap (hpriv, vma); + +case HL_MMAP_TYPE_BLOCK : +return hl_hw_block_mmap (hpriv, vma); }return -EINVAL ;
drivers/misc/habanalabs/common/habanalabs.h +12 -4
@@ -28,17 +28,18 @@#define HL_NAME "habanalabs"/* Use upper bits of mmap offset to store habana driver specific information. -* bits[63:62] - Encode mmap type +* bits[63:61] - Encode mmap type * bits[45:0] - mmap offset value * * NOTE: struct vm_area_struct.vm_pgoff uses offset in pages. Hence, these * defines are w.r.t to PAGE_SIZE */ -#define HL_MMAP_TYPE_SHIFT (62 - PAGE_SHIFT) -#define HL_MMAP_TYPE_MASK (0x3ull << HL_MMAP_TYPE_SHIFT) +#define HL_MMAP_TYPE_SHIFT (61 - PAGE_SHIFT) +#define HL_MMAP_TYPE_MASK (0x7ull << HL_MMAP_TYPE_SHIFT) +#define HL_MMAP_TYPE_BLOCK (0x4ull << HL_MMAP_TYPE_SHIFT)#define HL_MMAP_TYPE_CB (0x2ull << HL_MMAP_TYPE_SHIFT) -#define HL_MMAP_OFFSET_VALUE_MASK (0x3FFFFFFFFFFFull >> PAGE_SHIFT) +#define HL_MMAP_OFFSET_VALUE_MASK (0x1FFFFFFFFFFFull >> PAGE_SHIFT)#define HL_MMAP_OFFSET_VALUE_GET (off) (off & HL_MMAP_OFFSET_VALUE_MASK)#define HL_PENDING_RESET_PER_SEC 10
@@ -856,6 +857,8 @@ enum div_select_defs {* @descramble_addr: Routine to de-scramble the address prior of * showing it to users. * @ack_protection_bits_errors: ack and dump all security violations +* @get_hw_block_id: retrieve a HW block id to be used by the user to mmap it. +* @hw_block_mmap: mmap a HW block with a given id. */ struct hl_asic_funcs {int (*early_init)(struct hl_device *hdev);
@@ -968,6 +971,10 @@ struct hl_asic_funcs {u64 (*scramble_addr)(struct hl_device *hdev,u64 addr);u64 (*descramble_addr)(struct hl_device *hdev,u64 addr);void (*ack_protection_bits_errors)(struct hl_device *hdev); +int (*get_hw_block_id)(struct hl_device *hdev,u64 block_addr, +u32 *block_id); +int (*hw_block_mmap)(struct hl_device *hdev,struct vm_area_struct *vma, +u32 block_id,u32 block_size); };
@@ -2167,6 +2174,7 @@ int hl_cb_create(struct hl_device *hdev, struct hl_cb_mgr *mgr, bool map_cb, u64 *handle);int hl_cb_destroy (struct hl_device *hdev,struct hl_cb_mgr *mgr,u64 cb_handle);int hl_cb_mmap (struct hl_fpriv *hpriv,struct vm_area_struct *vma); +int hl_hw_block_mmap (struct hl_fpriv *hpriv,struct vm_area_struct *vma);struct hl_cb *hl_cb_get (struct hl_device *hdev,struct hl_cb_mgr *mgr,u32 handle);void hl_cb_put (struct hl_cb *cb);
drivers/misc/habanalabs/common/memory.c +91 -2
121 lines not on this page · raw message
drivers/misc/habanalabs/gaudi/gaudi.c +14 -1
@@ -8471,6 +8471,17 @@ static u64 gaudi_get_device_time(struct hl_device *hdev)return device_time |RREG32 (mmPSOC_TIMESTAMP_CNTCVL); } +int gaudi_get_hw_block_id (struct hl_device *hdev,u64 block_addr,u32 *block_id) +{ +return -EPERM ; +} + +int gaudi_block_mmap (struct hl_device *hdev,struct vm_area_struct *vma, +u32 block_id,u32 block_size) +{ +return -EPERM ; +} +static const struct hl_asic_funcs gaudi_funcs = { .early_init = gaudi_early_init, .early_fini = gaudi_early_fini,
@@ -8550,7 +8561,9 @@ static const struct hl_asic_funcs gaudi_funcs = { .collective_wait_create_jobs = gaudi_collective_wait_create_jobs, .scramble_addr = hl_mmu_scramble_addr, .descramble_addr = hl_mmu_descramble_addr, - .ack_protection_bits_errors = gaudi_ack_protection_bits_errors + .ack_protection_bits_errors = gaudi_ack_protection_bits_errors, + .get_hw_block_id = gaudi_get_hw_block_id, + .hw_block_mmap = gaudi_block_mmap };/**
drivers/misc/habanalabs/goya/goya.c +14 -1
@@ -5382,6 +5382,17 @@ static void goya_ctx_fini(struct hl_ctx *ctx) } +int goya_get_hw_block_id (struct hl_device *hdev,u64 block_addr,u32 *block_id) +{ +return -EPERM ; +} + +int goya_block_mmap (struct hl_device *hdev,struct vm_area_struct *vma, +u32 block_id,u32 block_size) +{ +return -EPERM ; +} +static const struct hl_asic_funcs goya_funcs = { .early_init = goya_early_init, .early_fini = goya_early_fini,
@@ -5461,7 +5472,9 @@ static const struct hl_asic_funcs goya_funcs = { .collective_wait_create_jobs = goya_collective_wait_create_jobs, .scramble_addr = hl_mmu_scramble_addr, .descramble_addr = hl_mmu_descramble_addr, - .ack_protection_bits_errors = goya_ack_protection_bits_errors + .ack_protection_bits_errors = goya_ack_protection_bits_errors, + .get_hw_block_id = goya_get_hw_block_id, + .hw_block_mmap = goya_block_mmap };/*
include/uapi/misc/habanalabs.h +16 -2
@@ -718,6 +718,8 @@ union hl_wait_cs_args {#define HL_MEM_OP_MAP 2/* Opcode to unmap previously mapped host and device memory */ #define HL_MEM_OP_UNMAP 3 +/* Opcode to map a hw block */ +#define HL_MEM_OP_MAP_BLOCK 4/* Memory flags */ #define HL_MEM_CONTIGUOUS 0x1
@@ -772,6 +774,17 @@ struct hl_mem_in {__u64 mem_size; } map_host; +/* HL_MEM_OP_MAP_BLOCK - map a hw block */ +struct { +/* +* HW block address to map, a handle will be returned +* to the user and will be used to mmap the relevant +* block. Only addresses from configuration space are +* allowed. +*/ +__u64 block_addr; + } map_block; +/* HL_MEM_OP_UNMAP - unmap host memory */ struct {/* Virtual address returned from HL_MEM_OP_MAP */
@@ -798,8 +811,9 @@ struct hl_mem_out {__u64 device_virt_addr;/* -* Used for HL_MEM_OP_ALLOC. This is the assigned -* handle for the allocated memory +* Used for HL_MEM_OP_ALLOC and HL_MEM_OP_MAP_BLOCK. +* This is the assigned handle for the allocated memory +* or mapped block */ __u64 handle; };
Signature · 1 line
2.25.1