Unverified Commit c98c085d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9705 net/hinic3: Add pcie device ID adaption for DPU_NIC card 

Merge Pull Request from: @ci-robot 
 
PR sync from: z00857956 <zhoushuai28@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ER4E2MLFZ3LL343SVINXGU3L2BSDK5PX/ 
 
https://gitee.com/openeuler/kernel/issues/IA9G0T?from=project-issue 
 
Link:https://gitee.com/openeuler/kernel/pulls/9705

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5467c8fd 509401a3

drivers/net/ethernet/huawei/hinic3/hinic3_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int get_nic_drv_version(void *buf_out, const u32 *out_size) 
	}



	err = snprintf(ver_info->ver, sizeof(ver_info->ver), "%s  %s",

		       HINIC3_NIC_DRV_VERSION, "2023-05-17_19:56:38");

		       HINIC3_NIC_DRV_VERSION, "2024-07-03_09:33:00");

	if (err < 0)

		return -EINVAL;

drivers/net/ethernet/huawei/hinic3/hw/hinic3_dev_mgmt.h

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
#define ULD_LOCK_MAX_USLEEP_TIME		1000



#define HINIC3_IS_VF_DEV(pdev)	((pdev)->device == HINIC3_DEV_ID_VF)

#define HINIC3_IS_SPU_DEV(pdev)	((pdev)->device == HINIC3_DEV_ID_SPU)

#define HINIC3_IS_SPU_DEV(pdev)	\

	(((pdev)->device == HINIC3_DEV_ID_SPU) || ((pdev)->device == HINIC3_DEV_ID_SDI_5_0_PF) || \

	(((pdev)->device == HINIC3_DEV_ID_DPU_PF)))



enum {

	HINIC3_NOT_PROBE = 1,