habanalabs: communicate supported page sizes to user

Because in future ASICs the driver will allow the user to set the
page size we need to make sure this data is propagated in all APIs.

In addition, since this is already an ASIC property we no longer need
ASIC function for it.

Signed-off-by: Ohad Sharabi <osharabi@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 df8d1038723d2aaa591e68a3a2f1550bd9952859..c5f9501b1113ba2973c4734ac7cfc68de4bf2e8f 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -401,6 +401,8 @@ enum hl_device_hw_state {
  * @hop_masks: array holds HOPs masks.
  * @last_mask: mask to get the bit indicating this is the last hop.
  * @pgt_size: size for page tables.
+ * @supported_pages_mask: bitmask for supported page size (relevant only for MMUs
+ *                        supporting multiple page size).
  * @page_size: default page size used to allocate memory.
  * @num_hops: The amount of hops supported by the translation table.
  * @hop_table_size: HOP table size.
@@ -415,6 +417,7 @@ struct hl_mmu_properties {
        u64     hop_masks[MMU_HOP_MAX];
        u64     last_mask;
        u64     pgt_size;
+       u64     supported_pages_mask;
        u32     page_size;
        u32     num_hops;
        u32     hop_table_size;
@@ -1332,7 +1335,6 @@ struct fw_load_mgr {
  * @get_sob_addr: get SOB base address offset.
  * @set_pci_memory_regions: setting properties of PCI memory regions
  * @get_stream_master_qid_arr: get pointer to stream masters QID array
- * @get_valid_dram_page_orders: get valid device memory allocation page orders
  * @access_dev_mem: access device memory
  * @set_dram_bar_base: set the base of the DRAM BAR
  */
@@ -1453,7 +1455,6 @@ struct hl_asic_funcs {
        u32* (*get_stream_master_qid_arr)(void);
        int (*mmu_get_real_page_size)(struct hl_device *hdev, struct hl_mmu_properties *mmu_prop,
                                        u32 page_size, u32 *real_page_size, bool is_dram_addr);
-       void (*get_valid_dram_page_orders)(struct hl_info_dev_memalloc_page_sizes *info);
        int (*access_dev_mem)(struct hl_device *hdev, struct pci_mem_region *region,
                enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type);
        u64 (*set_dram_bar_base)(struct hl_device *hdev, u64 addr);

diff --git a/drivers/misc/habanalabs/common/habanalabs_ioctl.c b/drivers/misc/habanalabs/common/habanalabs_ioctl.c
index fe7ed46cd1c502f2714b661e23eecf49a8b2162d..e66dec385ba69b61c03be9a84092739d36f22709 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs_ioctl.c
+++ b/drivers/misc/habanalabs/common/habanalabs_ioctl.c
@@ -648,7 +648,7 @@ static int dev_mem_alloc_page_sizes_info(struct hl_fpriv *hpriv, struct hl_info_
         * For this reason for all ASICs that not support multiple page size the function will
         * return an empty bitmask indicating that multiple page sizes is not supported.
         */
-       hdev->asic_funcs->get_valid_dram_page_orders(&info);
+       info.page_order_bitmask = hdev->asic_prop.dmmu.supported_pages_mask;
 
        return copy_to_user(out, &info, min_t(size_t, max_size, sizeof(info))) ? -EFAULT : 0;
 }

diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c
index bc921f32716a3855bb3e2a7f8b38dc6af93b7806..0964c26d717c495caca425f9d852a6a34bcea295 100644 (file)
--- a/drivers/misc/habanalabs/common/memory.c
+++ b/drivers/misc/habanalabs/common/memory.c
@@ -27,7 +27,7 @@ static int allocate_timestamps_buffers(struct hl_fpriv *hpriv,
 static int set_alloc_page_size(struct hl_device *hdev, struct hl_mem_in *args, u32 *page_size)
 {
        struct asic_fixed_properties *prop = &hdev->asic_prop;
-       u32 psize;
+       u64 psize;
 
        /*
         * for ASIC that supports setting the allocation page size by user we will address
@@ -37,7 +37,7 @@ static int set_alloc_page_size(struct hl_device *hdev, struct hl_mem_in *args, u
                psize = args->alloc.page_size;
 
                if (!is_power_of_2(psize)) {
-                       dev_err(hdev->dev, "user page size (%#x) is not power of 2\n", psize);
+                       dev_err(hdev->dev, "user page size (%#llx) is not power of 2\n", psize);
                        return -EINVAL;
                }
        } else {

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 33ad7226dd8cfa34056151e9881cf3e995136e7d..584feac7ee8375c58a941f9ec1a600b3f7a3a432 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -9237,12 +9237,6 @@ static u32 *gaudi_get_stream_master_qid_arr(void)
        return gaudi_stream_master;
 }
 
-static void gaudi_get_valid_dram_page_orders(struct hl_info_dev_memalloc_page_sizes *info)
-{
-       /* set 0 since multiple pages are not supported */
-       info->page_order_bitmask = 0;
-}
-
 static ssize_t infineon_ver_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct hl_device *hdev = dev_get_drvdata(dev);
@@ -9351,7 +9345,6 @@ static const struct hl_asic_funcs gaudi_funcs = {
        .set_pci_memory_regions = gaudi_set_pci_memory_regions,
        .get_stream_master_qid_arr = gaudi_get_stream_master_qid_arr,
        .mmu_get_real_page_size = hl_mmu_get_real_page_size,
-       .get_valid_dram_page_orders = gaudi_get_valid_dram_page_orders,
        .access_dev_mem = hl_access_dev_mem,
        .set_dram_bar_base = gaudi_set_hbm_bar_base,
 };

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 49f859a1f07a5bce104cbd0936e9c4d7814ce825..9bde01de4fcfca71c6dfb8df0a268337c942f3d0 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -5405,12 +5405,6 @@ static u32 *goya_get_stream_master_qid_arr(void)
        return NULL;
 }
 
-static void goya_get_valid_dram_page_orders(struct hl_info_dev_memalloc_page_sizes *info)
-{
-       /* set 0 since multiple pages are not supported */
-       info->page_order_bitmask = 0;
-}
-
 static int goya_get_monitor_dump(struct hl_device *hdev, void *data)
 {
        return -EOPNOTSUPP;
@@ -5505,7 +5499,6 @@ static const struct hl_asic_funcs goya_funcs = {
        .set_pci_memory_regions = goya_set_pci_memory_regions,
        .get_stream_master_qid_arr = goya_get_stream_master_qid_arr,
        .mmu_get_real_page_size = hl_mmu_get_real_page_size,
-       .get_valid_dram_page_orders = goya_get_valid_dram_page_orders,
        .access_dev_mem = hl_access_dev_mem,
        .set_dram_bar_base = goya_set_ddr_bar_base,
 };