habanalabs/goya: move dma direction enum to uapi file

The values in this enum are not used by h/w but are a contract
between userspace and the kernel driver so they must be defined
in the uapi file.

Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 25b1e3e139e859bd53f380fdc4391dbef375e43a..411a4be09aa6638dad2ec4593c9e384381f5d7e0 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -3403,7 +3403,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
 {
        u64 device_memory_addr, addr;
        enum dma_data_direction dir;
-       enum goya_dma_direction user_dir;
+       enum hl_goya_dma_direction user_dir;
        bool sram_addr = true;
        bool skip_host_mem_pin = false;
        bool user_memset;
@@ -3419,7 +3419,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
                        GOYA_PKT_LIN_DMA_CTL_MEMSET_SHIFT;
 
        switch (user_dir) {
-       case DMA_HOST_TO_DRAM:
+       case HL_DMA_HOST_TO_DRAM:
                dev_dbg(hdev->dev, "DMA direction is HOST --> DRAM\n");
                dir = DMA_TO_DEVICE;
                sram_addr = false;
@@ -3429,7 +3429,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
                        skip_host_mem_pin = true;
                break;
 
-       case DMA_DRAM_TO_HOST:
+       case HL_DMA_DRAM_TO_HOST:
                dev_dbg(hdev->dev, "DMA direction is DRAM --> HOST\n");
                dir = DMA_FROM_DEVICE;
                sram_addr = false;
@@ -3437,7 +3437,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
                device_memory_addr = le64_to_cpu(user_dma_pkt->src_addr);
                break;
 
-       case DMA_HOST_TO_SRAM:
+       case HL_DMA_HOST_TO_SRAM:
                dev_dbg(hdev->dev, "DMA direction is HOST --> SRAM\n");
                dir = DMA_TO_DEVICE;
                addr = le64_to_cpu(user_dma_pkt->src_addr);
@@ -3446,14 +3446,14 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
                        skip_host_mem_pin = true;
                break;
 
-       case DMA_SRAM_TO_HOST:
+       case HL_DMA_SRAM_TO_HOST:
                dev_dbg(hdev->dev, "DMA direction is SRAM --> HOST\n");
                dir = DMA_FROM_DEVICE;
                addr = le64_to_cpu(user_dma_pkt->dst_addr);
                device_memory_addr = le64_to_cpu(user_dma_pkt->src_addr);
                break;
        default:
-               dev_err(hdev->dev, "DMA direction is undefined\n");
+               dev_err(hdev->dev, "DMA direction %d is unsupported/undefined\n", user_dir);
                return -EFAULT;
        }
 
@@ -3505,14 +3505,14 @@ static int goya_validate_dma_pkt_no_host(struct hl_device *hdev,
                                struct packet_lin_dma *user_dma_pkt)
 {
        u64 sram_memory_addr, dram_memory_addr;
-       enum goya_dma_direction user_dir;
+       enum hl_goya_dma_direction user_dir;
        u32 ctl;
 
        ctl = le32_to_cpu(user_dma_pkt->ctl);
        user_dir = (ctl & GOYA_PKT_LIN_DMA_CTL_DMA_DIR_MASK) >>
                        GOYA_PKT_LIN_DMA_CTL_DMA_DIR_SHIFT;
 
-       if (user_dir == DMA_DRAM_TO_SRAM) {
+       if (user_dir == HL_DMA_DRAM_TO_SRAM) {
                dev_dbg(hdev->dev, "DMA direction is DRAM --> SRAM\n");
                dram_memory_addr = le64_to_cpu(user_dma_pkt->src_addr);
                sram_memory_addr = le64_to_cpu(user_dma_pkt->dst_addr);
@@ -3549,7 +3549,7 @@ static int goya_validate_dma_pkt_no_mmu(struct hl_device *hdev,
                                struct hl_cs_parser *parser,
                                struct packet_lin_dma *user_dma_pkt)
 {
-       enum goya_dma_direction user_dir;
+       enum hl_goya_dma_direction user_dir;
        u32 ctl;
        int rc;
 
@@ -3574,7 +3574,7 @@ static int goya_validate_dma_pkt_no_mmu(struct hl_device *hdev,
                return -EINVAL;
        }
 
-       if ((user_dir == DMA_DRAM_TO_SRAM) || (user_dir == DMA_SRAM_TO_DRAM))
+       if ((user_dir == HL_DMA_DRAM_TO_SRAM) || (user_dir == HL_DMA_SRAM_TO_DRAM))
                rc = goya_validate_dma_pkt_no_host(hdev, parser, user_dma_pkt);
        else
                rc = goya_validate_dma_pkt_host(hdev, parser, user_dma_pkt);
@@ -3781,7 +3781,7 @@ static int goya_patch_dma_packet(struct hl_device *hdev,
        u32 count, dma_desc_cnt;
        u64 len, len_next;
        dma_addr_t dma_addr, dma_addr_next;
-       enum goya_dma_direction user_dir;
+       enum hl_goya_dma_direction user_dir;
        u64 device_memory_addr, addr;
        enum dma_data_direction dir;
        struct sg_table *sgt;
@@ -3797,14 +3797,14 @@ static int goya_patch_dma_packet(struct hl_device *hdev,
        user_memset = (ctl & GOYA_PKT_LIN_DMA_CTL_MEMSET_MASK) >>
                        GOYA_PKT_LIN_DMA_CTL_MEMSET_SHIFT;
 
-       if ((user_dir == DMA_DRAM_TO_SRAM) || (user_dir == DMA_SRAM_TO_DRAM) ||
+       if ((user_dir == HL_DMA_DRAM_TO_SRAM) || (user_dir == HL_DMA_SRAM_TO_DRAM) ||
                        (user_dma_pkt->tsize == 0)) {
                memcpy(new_dma_pkt, user_dma_pkt, sizeof(*new_dma_pkt));
                *new_dma_pkt_size = sizeof(*new_dma_pkt);
                return 0;
        }
 
-       if ((user_dir == DMA_HOST_TO_DRAM) || (user_dir == DMA_HOST_TO_SRAM)) {
+       if ((user_dir == HL_DMA_HOST_TO_DRAM) || (user_dir == HL_DMA_HOST_TO_SRAM)) {
                addr = le64_to_cpu(user_dma_pkt->src_addr);
                device_memory_addr = le64_to_cpu(user_dma_pkt->dst_addr);
                dir = DMA_TO_DEVICE;
@@ -4804,7 +4804,7 @@ static int goya_memset_device_memory(struct hl_device *hdev, u64 addr, u64 size,
                                (1 << GOYA_PKT_LIN_DMA_CTL_WO_SHIFT) |
                                (1 << GOYA_PKT_CTL_RB_SHIFT) |
                                (1 << GOYA_PKT_CTL_MB_SHIFT));
-               ctl |= (is_dram ? DMA_HOST_TO_DRAM : DMA_HOST_TO_SRAM) <<
+               ctl |= (is_dram ? HL_DMA_HOST_TO_DRAM : HL_DMA_HOST_TO_SRAM) <<
                                GOYA_PKT_LIN_DMA_CTL_DMA_DIR_SHIFT;
                lin_dma_pkt->ctl = cpu_to_le32(ctl);
 

diff --git a/drivers/misc/habanalabs/include/goya/goya_packets.h b/drivers/misc/habanalabs/include/goya/goya_packets.h
index 50ce5175b63a6eb8efb75134d47a1102b5e28a2f..896799204fb05a506043828bdc7e4f7e9faaccba 100644 (file)
--- a/drivers/misc/habanalabs/include/goya/goya_packets.h
+++ b/drivers/misc/habanalabs/include/goya/goya_packets.h
@@ -28,18 +28,6 @@ enum packet_id {
                                PACKET_HEADER_PACKET_ID_SHIFT) + 1
 };
 
-enum goya_dma_direction {
-       DMA_HOST_TO_DRAM,
-       DMA_HOST_TO_SRAM,
-       DMA_DRAM_TO_SRAM,
-       DMA_SRAM_TO_DRAM,
-       DMA_SRAM_TO_HOST,
-       DMA_DRAM_TO_HOST,
-       DMA_DRAM_TO_DRAM,
-       DMA_SRAM_TO_SRAM,
-       DMA_ENUM_MAX
-};
-
 #define GOYA_PKT_CTL_OPCODE_SHIFT      24
 #define GOYA_PKT_CTL_OPCODE_MASK       0x1F000000
 

diff --git a/include/uapi/misc/habanalabs.h b/include/uapi/misc/habanalabs.h
index 78aecea4684d4790ae191a9d0c9554fe3c15fc4a..41a0fa345e4e4206b40e1534bce3fd658cdf7244 100644 (file)
--- a/include/uapi/misc/habanalabs.h
+++ b/include/uapi/misc/habanalabs.h
@@ -275,6 +275,33 @@ enum hl_gaudi_pll_index {
        HL_GAUDI_PLL_MAX
 };
 
+/**
+ * enum hl_goya_dma_direction - Direction of DMA operation inside a LIN_DMA packet that is
+ *                              submitted to the GOYA's DMA QMAN. This attribute is not relevant
+ *                              to the H/W but the kernel driver use it to parse the packet's
+ *                              addresses and patch/validate them.
+ * @HL_DMA_HOST_TO_DRAM: DMA operation from Host memory to GOYA's DDR.
+ * @HL_DMA_HOST_TO_SRAM: DMA operation from Host memory to GOYA's SRAM.
+ * @HL_DMA_DRAM_TO_SRAM: DMA operation from GOYA's DDR to GOYA's SRAM.
+ * @HL_DMA_SRAM_TO_DRAM: DMA operation from GOYA's SRAM to GOYA's DDR.
+ * @HL_DMA_SRAM_TO_HOST: DMA operation from GOYA's SRAM to Host memory.
+ * @HL_DMA_DRAM_TO_HOST: DMA operation from GOYA's DDR to Host memory.
+ * @HL_DMA_DRAM_TO_DRAM: DMA operation from GOYA's DDR to GOYA's DDR.
+ * @HL_DMA_SRAM_TO_SRAM: DMA operation from GOYA's SRAM to GOYA's SRAM.
+ * @HL_DMA_ENUM_MAX: number of values in enum
+ */
+enum hl_goya_dma_direction {
+       HL_DMA_HOST_TO_DRAM,
+       HL_DMA_HOST_TO_SRAM,
+       HL_DMA_DRAM_TO_SRAM,
+       HL_DMA_SRAM_TO_DRAM,
+       HL_DMA_SRAM_TO_HOST,
+       HL_DMA_DRAM_TO_HOST,
+       HL_DMA_DRAM_TO_DRAM,
+       HL_DMA_SRAM_TO_SRAM,
+       HL_DMA_ENUM_MAX
+};
+
 /**
  * enum hl_device_status - Device status information.
  * @HL_DEVICE_STATUS_OPERATIONAL: Device is operational.