Commit ccf991e4 authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay
Browse files

habanalabs: remove redundant argument in access_dev_mem APIs 



Region structure is derived from region type, hence no need to pass
it as an argument.

Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 9c7fde71

drivers/misc/habanalabs/common/debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -695,8 +695,7 @@ static int hl_access_dev_mem_by_region(struct hl_device *hdev, u64 addr, 
		if (addr >= mem_reg->region_base &&

			addr <= mem_reg->region_base + mem_reg->region_size - acc_size) {

			*found = true;

			return hdev->asic_funcs->access_dev_mem(hdev, mem_reg, i,

				addr, val, acc_type);

			return hdev->asic_funcs->access_dev_mem(hdev, i, addr, val, acc_type);

		}

	}

	return 0;

drivers/misc/habanalabs/common/device.c

+2 −3
Original line number Diff line number Diff line
@@ -245,14 +245,13 @@ int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val, 
 * hl_access_dev_mem - access device memory

 *

 * @hdev: pointer to habanalabs device structure

 * @region: the memory region the address belongs to

 * @region_type: the type of the region the address belongs to

 * @addr: the address to access

 * @val: the value to write from or read to

 * @acc_type: the type of access (r/w, 32/64)

 */

int hl_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)

int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,

			u64 addr, u64 *val, enum debugfs_access_type acc_type)

{

	switch (region_type) {

	case PCI_REGION_CFG:

drivers/misc/habanalabs/common/habanalabs.h

+4 −4
Original line number Diff line number Diff line
@@ -1455,8 +1455,8 @@ 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);

	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);

	int (*access_dev_mem)(struct hl_device *hdev, 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);

};
@@ -3133,8 +3133,8 @@ void hl_dma_unmap_sgtable(struct hl_device *hdev, struct sg_table *sgt, 
				enum dma_data_direction dir);

int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val,

	enum debugfs_access_type acc_type);

int hl_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);

int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,

			u64 addr, u64 *val, enum debugfs_access_type acc_type);

int hl_device_open(struct inode *inode, struct file *filp);

int hl_device_open_ctrl(struct inode *inode, struct file *filp);

bool hl_device_operational(struct hl_device *hdev,