accel/habanalabs: save class in hdev

It is more concise than to pass it to device init. Once we will add the
accel class, then we won't need to change the function signatures.

Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Reviewed-by: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>

diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index ed26b7d..194c282 100644 (file)
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -617,7 +617,7 @@ static void device_release_func(struct device *dev)
  * device_init_cdev - Initialize cdev and device for habanalabs device
  *
  * @hdev: pointer to habanalabs device structure
- * @hclass: pointer to the class object of the device
+ * @class: pointer to the class object of the device
  * @minor: minor number of the specific device
  * @fpos: file operations to install for this device
  * @name: name of the device as it will appear in the filesystem
@@ -626,7 +626,7 @@ static void device_release_func(struct device *dev)
  *
  * Initialize a cdev and a Linux device for habanalabs's device.
  */
-static int device_init_cdev(struct hl_device *hdev, struct class *hclass,
+static int device_init_cdev(struct hl_device *hdev, struct class *class,
                                int minor, const struct file_operations *fops,
                                char *name, struct cdev *cdev,
                                struct device **dev)
@@ -640,7 +640,7 @@ static int device_init_cdev(struct hl_device *hdev, struct class *hclass,
 
        device_initialize(*dev);
        (*dev)->devt = MKDEV(hdev->major, minor);
-       (*dev)->class = hclass;
+       (*dev)->class = class;
        (*dev)->release = device_release_func;
        dev_set_drvdata(*dev, hdev);
        dev_set_name(*dev, "%s", name);
@@ -1939,7 +1939,7 @@ void hl_notifier_event_send_all(struct hl_device *hdev, u64 event_mask)
        mutex_unlock(&hdev->fpriv_ctrl_list_lock);
 }
 
-static int create_cdev(struct hl_device *hdev, struct class *hclass)
+static int create_cdev(struct hl_device *hdev)
 {
        char *name;
        int rc;
@@ -1953,7 +1953,7 @@ static int create_cdev(struct hl_device *hdev, struct class *hclass)
        }
 
        /* Initialize cdev and device structures */
-       rc = device_init_cdev(hdev, hclass, hdev->id, &hl_ops, name,
+       rc = device_init_cdev(hdev, hdev->hclass, hdev->id, &hl_ops, name,
                                &hdev->cdev, &hdev->dev);
 
        kfree(name);
@@ -1968,7 +1968,7 @@ static int create_cdev(struct hl_device *hdev, struct class *hclass)
        }
 
        /* Initialize cdev and device structures for control device */
-       rc = device_init_cdev(hdev, hclass, hdev->id_control, &hl_ctrl_ops,
+       rc = device_init_cdev(hdev, hdev->hclass, hdev->id_control, &hl_ctrl_ops,
                                name, &hdev->cdev_ctrl, &hdev->dev_ctrl);
 
        kfree(name);
@@ -1993,12 +1993,12 @@ out_err:
  * ASIC specific initialization functions. Finally, create the cdev and the
  * Linux device to expose it to the user
  */
-int hl_device_init(struct hl_device *hdev, struct class *hclass)
+int hl_device_init(struct hl_device *hdev)
 {
        int i, rc, cq_cnt, user_interrupt_cnt, cq_ready_cnt;
        bool add_cdev_sysfs_on_err = false;
 
-       rc = create_cdev(hdev, hclass);
+       rc = create_cdev(hdev);
        if (rc)
                goto out_disabled;
 

diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h
index fa05e76..d98e6c0 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@ -3090,6 +3090,7 @@ struct hl_reset_info {
  *                (required only for PCI address match mode)
  * @pcie_bar: array of available PCIe bars virtual addresses.
  * @rmmio: configuration area address on SRAM.
+ * @hclass: pointer to the habanalabs class.
  * @cdev: related char device.
  * @cdev_ctrl: char device for control operations only (INFO IOCTL)
  * @dev: related kernel basic device structure.
@@ -3274,6 +3275,7 @@ struct hl_device {
        u64                             pcie_bar_phys[HL_PCI_NUM_BARS];
        void __iomem                    *pcie_bar[HL_PCI_NUM_BARS];
        void __iomem                    *rmmio;
+       struct class                    *hclass;
        struct cdev                     cdev;
        struct cdev                     cdev_ctrl;
        struct device                   *dev;
@@ -3612,7 +3614,7 @@ int hl_ctx_get_fences(struct hl_ctx *ctx, u64 *seq_arr,
 void hl_ctx_mgr_init(struct hl_ctx_mgr *mgr);
 void hl_ctx_mgr_fini(struct hl_device *hdev, struct hl_ctx_mgr *mgr);
 
-int hl_device_init(struct hl_device *hdev, struct class *hclass);
+int hl_device_init(struct hl_device *hdev);
 void hl_device_fini(struct hl_device *hdev);
 int hl_device_suspend(struct hl_device *hdev);
 int hl_device_resume(struct hl_device *hdev);

diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c
index 03dae57..8ccc3d6 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs_drv.c
+++ b/drivers/accel/habanalabs/common/habanalabs_drv.c
@@ -324,6 +324,7 @@ static void copy_kernel_module_params_to_device(struct hl_device *hdev)
        hdev->asic_prop.fw_security_enabled = is_asic_secured(hdev->asic_type);
 
        hdev->major = hl_major;
+       hdev->hclass = hl_class;
        hdev->memory_scrub = memory_scrub;
        hdev->reset_on_lockup = reset_on_lockup;
        hdev->boot_error_status_mask = boot_error_status_mask;
@@ -552,7 +553,7 @@ static int hl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        pci_enable_pcie_error_reporting(pdev);
 
-       rc = hl_device_init(hdev, hl_class);
+       rc = hl_device_init(hdev);
        if (rc) {
                dev_err(&pdev->dev, "Fatal error during habanalabs device init\n");
                rc = -ENODEV;