UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
This commit is contained in:
Ofir Bitton 2022-06-27 16:59:02 +03:00 committed by Oded Gabbay
parent 9c7fde71a7
commit ccf991e4f2
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/habanalabs/common/debugfs.c
View File

@ -695,8 +695,7 @@ static int hl_access_dev_mem_by_region(struct hl_device *hdev, u64 addr,
if (addr >= mem_reg->region_base && if (addr >= mem_reg->region_base &&
addr <= mem_reg->region_base + mem_reg->region_size - acc_size) { addr <= mem_reg->region_base + mem_reg->region_size - acc_size) {
*found = true; *found = true;
return hdev->asic_funcs->access_dev_mem(hdev, mem_reg, i, return hdev->asic_funcs->access_dev_mem(hdev, i, addr, val, acc_type);
addr, val, acc_type);
} }
} }
return 0; return 0;

5
drivers/misc/habanalabs/common/device.c
View File

@ -245,14 +245,13 @@ int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val,
* hl_access_dev_mem - access device memory * hl_access_dev_mem - access device memory
* *
* @hdev: pointer to habanalabs device structure * @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 * @region_type: the type of the region the address belongs to
* @addr: the address to access * @addr: the address to access
* @val: the value to write from or read to * @val: the value to write from or read to
* @acc_type: the type of access (r/w, 32/64) * @acc_type: the type of access (r/w, 32/64)
*/ */
int hl_access_dev_mem(struct hl_device *hdev, struct pci_mem_region *region, int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,
enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type) u64 addr, u64 *val, enum debugfs_access_type acc_type)
{ {
switch (region_type) { switch (region_type) {
case PCI_REGION_CFG: case PCI_REGION_CFG:

8
drivers/misc/habanalabs/common/habanalabs.h
View File

@ -1455,8 +1455,8 @@ struct hl_asic_funcs {
u32* (*get_stream_master_qid_arr)(void); u32* (*get_stream_master_qid_arr)(void);
int (*mmu_get_real_page_size)(struct hl_device *hdev, struct hl_mmu_properties *mmu_prop, 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); u32 page_size, u32 *real_page_size, bool is_dram_addr);
int (*access_dev_mem)(struct hl_device *hdev, struct pci_mem_region *region, int (*access_dev_mem)(struct hl_device *hdev, enum pci_region region_type,
enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type); u64 addr, u64 *val, enum debugfs_access_type acc_type);
u64 (*set_dram_bar_base)(struct hl_device *hdev, u64 addr); 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); enum dma_data_direction dir);
int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val, int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val,
enum debugfs_access_type acc_type); enum debugfs_access_type acc_type);
int hl_access_dev_mem(struct hl_device *hdev, struct pci_mem_region *region, int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,
enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_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(struct inode *inode, struct file *filp);
int hl_device_open_ctrl(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, bool hl_device_operational(struct hl_device *hdev,