habanalabs: make last_mask an MMU property

Currently LAST_MASK is a global, but really it is an MMU implementation
specific. We need this change for future ASICs.

Signed-off-by: Yuri Nudelman <ynudelman@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index 4f3c228c9b9d27c83d1362b44a696f3e0db33383..6dd7d9ee7a44d4c3492041f02ecf40eb70a600bf 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -382,6 +382,7 @@ enum hl_device_hw_state {
  * @hop3_mask: mask to get the PTE address in hop 3.
  * @hop4_mask: mask to get the PTE address in hop 4.
  * @hop5_mask: mask to get the PTE address in hop 5.
+ * @last_mask: mask to get the bit indicating this is the last hop.
  * @page_size: default page size used to allocate memory.
  * @num_hops: The amount of hops supported by the translation table.
  * @host_resident: Should the MMU page table reside in host memory or in the
@@ -402,6 +403,7 @@ struct hl_mmu_properties {
        u64     hop3_mask;
        u64     hop4_mask;
        u64     hop5_mask;
+       u64     last_mask;
        u32     page_size;
        u32     num_hops;
        u8      host_resident;

diff --git a/drivers/misc/habanalabs/common/mmu/mmu_v1.c b/drivers/misc/habanalabs/common/mmu/mmu_v1.c
index 0f536f79dd9c9ab35ace651deb08369f225f68bb..159da2fafd79bc1991173f734cda3cf71314c91d 100644 (file)
--- a/drivers/misc/habanalabs/common/mmu/mmu_v1.c
+++ b/drivers/misc/habanalabs/common/mmu/mmu_v1.c
@@ -573,7 +573,7 @@ static int _hl_mmu_v1_unmap(struct hl_ctx *ctx,
 
        curr_pte = *(u64 *) (uintptr_t) hop3_pte_addr;
 
-       is_huge = curr_pte & LAST_MASK;
+       is_huge = curr_pte & mmu_prop->last_mask;
 
        if (is_dram_addr && !is_huge) {
                dev_err(hdev->dev,
@@ -597,7 +597,7 @@ static int _hl_mmu_v1_unmap(struct hl_ctx *ctx,
 
        if (hdev->dram_default_page_mapping && is_dram_addr) {
                u64 default_pte = (prop->mmu_dram_default_page_addr &
-                               HOP_PHYS_ADDR_MASK) | LAST_MASK |
+                               HOP_PHYS_ADDR_MASK) | mmu_prop->last_mask |
                                        PAGE_PRESENT_MASK;
                if (curr_pte == default_pte) {
                        dev_err(hdev->dev,
@@ -729,7 +729,7 @@ static int _hl_mmu_v1_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,
 
        if (hdev->dram_default_page_mapping && is_dram_addr) {
                u64 default_pte = (prop->mmu_dram_default_page_addr &
-                                       HOP_PHYS_ADDR_MASK) | LAST_MASK |
+                                       HOP_PHYS_ADDR_MASK) | mmu_prop->last_mask |
                                                PAGE_PRESENT_MASK;
 
                if (curr_pte != default_pte) {
@@ -769,7 +769,7 @@ static int _hl_mmu_v1_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,
                goto err;
        }
 
-       curr_pte = (phys_addr & HOP_PHYS_ADDR_MASK) | LAST_MASK
+       curr_pte = (phys_addr & HOP_PHYS_ADDR_MASK) | mmu_prop->last_mask
                        | PAGE_PRESENT_MASK;
 
        if (is_huge)
@@ -930,7 +930,7 @@ static int hl_mmu_v1_get_tlb_info(struct hl_ctx *ctx, u64 virt_addr,
                if (!(hops->hop_info[i].hop_pte_val & PAGE_PRESENT_MASK))
                        return -EFAULT;
 
-               if (hops->hop_info[i].hop_pte_val & LAST_MASK)
+               if (hops->hop_info[i].hop_pte_val & mmu_prop->last_mask)
                        break;
        }
 

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 92d55a0a10c138b9fcb15e8fe178ce37a00970b0..52fffd76f5cf8cd46220e7267d00d07f64ebc49d 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -613,6 +613,7 @@ static int gaudi_set_fixed_properties(struct hl_device *hdev)
                        (VA_HOST_SPACE_START + VA_HOST_SPACE_SIZE / 2) - 1;
        prop->pmmu.page_size = PAGE_SIZE_4KB;
        prop->pmmu.num_hops = MMU_ARCH_5_HOPS;
+       prop->pmmu.last_mask = LAST_MASK;
 
        /* PMMU and HPMMU are the same except of page size */
        memcpy(&prop->pmmu_huge, &prop->pmmu, sizeof(prop->pmmu));

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 5536e8c27bd54cf91bb9819bb6d20e350528cebd..59bb12fcc935d4a4d216ed0a5385610226cb911e 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -429,6 +429,7 @@ int goya_set_fixed_properties(struct hl_device *hdev)
        prop->dmmu.end_addr = VA_DDR_SPACE_END;
        prop->dmmu.page_size = PAGE_SIZE_2MB;
        prop->dmmu.num_hops = MMU_ARCH_5_HOPS;
+       prop->dmmu.last_mask = LAST_MASK;
 
        /* shifts and masks are the same in PMMU and DMMU */
        memcpy(&prop->pmmu, &prop->dmmu, sizeof(prop->dmmu));
@@ -436,6 +437,7 @@ int goya_set_fixed_properties(struct hl_device *hdev)
        prop->pmmu.end_addr = VA_HOST_SPACE_END;
        prop->pmmu.page_size = PAGE_SIZE_4KB;
        prop->pmmu.num_hops = MMU_ARCH_5_HOPS;
+       prop->pmmu.last_mask = LAST_MASK;
 
        /* PMMU and HPMMU are the same except of page size */
        memcpy(&prop->pmmu_huge, &prop->pmmu, sizeof(prop->pmmu));