From: shaojijie shaojijie@huawei.com
driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I94FVZ CVE: NA
----------------------------------------------------------------------
The patch provides an interface to check whether the optical module is inserted.
Signed-off-by: shaojijie shaojijie@huawei.com Signed-off-by: Jiantao Xiao xiaojiantao1@h-partners.com --- .../net/ethernet/hisilicon/hns3/hnae3_ext.h | 1 + .../net/ethernet/hisilicon/hns3/hns3_ext.c | 7 ++++++ .../net/ethernet/hisilicon/hns3/hns3_ext.h | 1 + .../hisilicon/hns3/hns3pf/hclge_ext.c | 22 +++++++++++++++++++ .../hisilicon/hns3/hns3pf/hclge_ext.h | 6 +++++ 5 files changed, 37 insertions(+)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3_ext.h b/drivers/net/ethernet/hisilicon/hns3/hnae3_ext.h index 03b54b06c23b..3d9654883144 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3_ext.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3_ext.h @@ -39,6 +39,7 @@ enum hnae3_ext_opcode { HNAE3_EXT_OPC_GET_PORT_EXT_ID_INFO, HNAE3_EXT_OPC_GET_PORT_EXT_NUM_INFO, HNAE3_EXT_OPC_GET_PORT_NUM, + HNAE3_EXT_OPC_GET_PRESENT, };
struct hnae3_pfc_storm_para { diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ext.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ext.c index 2f3cb8e90afc..b6b0320753f6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ext.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ext.c @@ -403,3 +403,10 @@ int nic_set_tx_timeout(struct net_device *ndev, int tx_timeout) return 0; } EXPORT_SYMBOL(nic_set_tx_timeout); + +int nic_get_sfp_present(struct net_device *ndev, int *present) +{ + return nic_invoke_pri_ops(ndev, HNAE3_EXT_OPC_GET_PRESENT, + present, sizeof(*present)); +} +EXPORT_SYMBOL(nic_get_sfp_present); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ext.h b/drivers/net/ethernet/hisilicon/hns3/hns3_ext.h index 78080a7040b1..464f030da38a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ext.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ext.h @@ -37,4 +37,5 @@ int nic_get_io_die_num(struct net_device *ndev, u32 *io_die_num); int nic_get_port_num_of_die(struct net_device *ndev, u32 *port_num); int nic_get_port_num_per_chip(struct net_device *ndev, u32 *port_num); int nic_set_tx_timeout(struct net_device *ndev, int tx_timeout); +int nic_get_sfp_present(struct net_device *ndev, int *present); #endif diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.c index 12867e7a7465..bf4e607245dd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.c @@ -446,6 +446,27 @@ static int hclge_get_port_num(struct hclge_dev *hdev, void *data, return 0; }
+static int hclge_get_sfp_present(struct hclge_dev *hdev, void *data, + size_t length) +{ + struct hclge_sfp_present_cmd *resp; + struct hclge_desc desc; + int ret; + + if (length != sizeof(u32)) + return -EINVAL; + + ret = hclge_get_info_from_cmd(hdev, &desc, 1, HCLGE_OPC_SFP_GET_PRESENT); + if (ret) { + dev_err(&hdev->pdev->dev, "failed to get sfp present, ret = %d\n", ret); + return ret; + } + + resp = (struct hclge_sfp_present_cmd *)desc.data; + *(u32 *)data = le32_to_cpu(resp->sfp_present); + return 0; +} + static void hclge_ext_resotre_config(struct hclge_dev *hdev) { if (hdev->reset_type != HNAE3_IMP_RESET && @@ -608,6 +629,7 @@ static const hclge_priv_ops_fn hclge_ext_func_arr[] = { [HNAE3_EXT_OPC_GET_PORT_EXT_ID_INFO] = hclge_get_extend_port_id_info, [HNAE3_EXT_OPC_GET_PORT_EXT_NUM_INFO] = hclge_get_extend_port_num_info, [HNAE3_EXT_OPC_GET_PORT_NUM] = hclge_get_port_num, + [HNAE3_EXT_OPC_GET_PRESENT] = hclge_get_sfp_present, };
int hclge_ext_ops_handle(struct hnae3_handle *handle, int opcode, diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.h index f840129572c8..ae6f0afef1f1 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ext.h @@ -73,6 +73,11 @@ struct hclge_torus_cfg_cmd { __le32 torus_en; };
+struct hclge_sfp_present_cmd { + __le32 sfp_present; + __le32 rsv[5]; +}; + enum hclge_ext_opcode_type { HCLGE_OPC_CONFIG_SWITCH_PARAM = 0x1033, HCLGE_OPC_CONFIG_VLAN_FILTER = 0x1100, @@ -82,6 +87,7 @@ enum hclge_ext_opcode_type { HCLGE_OPC_GET_CHIP_NUM = 0x7005, HCLGE_OPC_GET_PORT_NUM = 0x7006, HCLGE_OPC_CFG_PAUSE_STORM_PARA = 0x7019, + HCLGE_OPC_SFP_GET_PRESENT = 0x7101, };
struct hclge_reset_fail_type_map {