Commit 8d65cdad authored by Bennie Yan's avatar Bennie Yan
Browse files

Net: nebula_matrix: fix ci build warning 

nebula_matrix-driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/oec-hardware/issues/IB23VW



--------------------------------

1. Remove unused variables;
2. Add static to partial functions;
3. Use different codes for different kernel config;

Fixes: bad535d2 ("Net:nbl_core: Add nbl_core-driver for nebula-matrix S1055AS series smart NIC.")
Signed-off-by: default avatarBennie Yan <bennie.yan@nebula-matrix.com>
parent 69181c3c

drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dev.c

+11 −11
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int nbl_dev_request_abnormal_irq(struct nbl_dev_mgt *dev_mgt) 
	return 0;

}



void nbl_dev_free_abnormal_irq(struct nbl_dev_mgt *dev_mgt)

static void nbl_dev_free_abnormal_irq(struct nbl_dev_mgt *dev_mgt)

{

	struct device *dev = NBL_DEV_MGT_TO_DEV(dev_mgt);

	struct nbl_dev_common *dev_common = NBL_DEV_MGT_TO_COMMON_DEV(dev_mgt);
@@ -1703,7 +1703,7 @@ static void nbl_dev_remove_ethtool_ops(struct net_device *netdev) 
	netdev->ethtool_ops = NULL;

}



void nbl_dev_set_eth_mac_addr(struct nbl_dev_mgt *dev_mgt, struct net_device *netdev)

static void nbl_dev_set_eth_mac_addr(struct nbl_dev_mgt *dev_mgt, struct net_device *netdev)

{

	struct nbl_service_ops *serv_ops = NBL_DEV_MGT_TO_SERV_OPS(dev_mgt);

	struct nbl_common_info *common = NBL_DEV_MGT_TO_COMMON(dev_mgt);
@@ -1773,7 +1773,9 @@ static int nbl_dev_register_net(struct nbl_dev_mgt *dev_mgt, 
{

	struct nbl_service_ops *serv_ops = NBL_DEV_MGT_TO_SERV_OPS(dev_mgt);

	struct pci_dev *pdev = NBL_COMMON_TO_PDEV(NBL_DEV_MGT_TO_COMMON(dev_mgt));

#ifdef CONFIG_PCI_IOV

	struct resource *res;

#endif

	u16 pf_bdf;

	u64 pf_bar_start;

	u64 vf_bar_start, vf_bar_size;
@@ -1802,10 +1804,12 @@ static int nbl_dev_register_net(struct nbl_dev_mgt *dev_mgt, 
		vf_bar_start = (u64)(val & PCI_BASE_ADDRESS_MEM_MASK);

		pci_read_config_dword(pdev, pos + PCI_SRIOV_BAR + 4, &val);

		vf_bar_start |= ((u64)val << 32);



#ifdef CONFIG_PCI_IOV

		res = &pdev->resource[PCI_IOV_RESOURCES];

		vf_bar_size = resource_size(res);



#else

		vf_bar_size = 0;

#endif

		if (total_vfs) {

			register_param.pf_bdf = pf_bdf;

			register_param.vf_bar_start = vf_bar_start;
@@ -1825,7 +1829,7 @@ static int nbl_dev_register_net(struct nbl_dev_mgt *dev_mgt, 
	return ret;

}



void nbl_dev_unregister_net(struct nbl_adapter *adapter)

static void nbl_dev_unregister_net(struct nbl_adapter *adapter)

{

	struct nbl_service_ops_tbl *serv_ops_tbl = NBL_ADAPTER_TO_SERV_OPS_TBL(adapter);

	struct device *dev = NBL_ADAPTER_TO_DEV(adapter);
@@ -2406,14 +2410,12 @@ static void nbl_dev_remove_net_dev(struct nbl_adapter *adapter) 
	struct device *dev = NBL_ADAPTER_TO_DEV(adapter);

	struct nbl_dev_mgt *dev_mgt = NBL_ADAPTER_TO_DEV_MGT(adapter);

	struct nbl_dev_net **net_dev = &NBL_DEV_MGT_TO_NET_DEV(dev_mgt);

	struct net_device *netdev;

	struct nbl_dev_vsi *vsi;

	int i = 0;



	if (!*net_dev)

		return;



	netdev = (*net_dev)->netdev;



	for (i = 0; i < NBL_VSI_MAX; i++) {

		vsi = (*net_dev)->vsi_ctrl.vsi_list[i];
@@ -2743,13 +2745,11 @@ static void nbl_dev_stop_net_dev(struct nbl_adapter *adapter) 
	struct nbl_event_callback callback = {0};

	struct nbl_dev_vsi *vsi;

	struct net_device *netdev;

	struct nbl_netdev_priv *net_priv;



	if (!net_dev)

		return;



	netdev = net_dev->netdev;

	net_priv = netdev_priv(netdev);



	vsi = net_dev->vsi_ctrl.vsi_list[NBL_VSI_DATA];

	if (!vsi)
@@ -2923,7 +2923,7 @@ static int nbl_dev_start_common_dev(struct nbl_adapter *adapter, struct nbl_init 
	return ret;

}



void nbl_dev_stop_common_dev(struct nbl_adapter *adapter)

static void nbl_dev_stop_common_dev(struct nbl_adapter *adapter)

{

	struct nbl_dev_mgt *dev_mgt = (struct nbl_dev_mgt *)NBL_ADAPTER_TO_DEV_MGT(adapter);
@@ -2953,7 +2953,7 @@ static int nbl_dev_resume_common_dev(struct nbl_adapter *adapter, struct nbl_ini 
	return 0;

}



void nbl_dev_suspend_common_dev(struct nbl_adapter *adapter)

static void nbl_dev_suspend_common_dev(struct nbl_adapter *adapter)

{

	struct nbl_dev_mgt *dev_mgt = (struct nbl_dev_mgt *)NBL_ADAPTER_TO_DEV_MGT(adapter);

drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_adminq.c

+5 −3
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ static void nbl_res_adminq_add_cmd_filter_res_write(struct nbl_resource_mgt *res 
{

	struct nbl_adminq_mgt *adminq_mgt = NBL_RES_MGT_TO_ADMINQ_MGT(res_mgt);

	struct nbl_common_info *common = NBL_RES_MGT_TO_COMMON(res_mgt);

	struct nbl_res_fw_cmd_filter filter = {0};

	struct nbl_res_fw_cmd_filter filter = {

		.in = nbl_res_fw_cmd_filter_rw_in,

		.out = NULL,

	};

	u16 key = 0;



	key = NBL_CHAN_MSG_ADMINQ_RESOURCE_WRITE;

	filter.in = nbl_res_fw_cmd_filter_rw_in;



	if (nbl_common_alloc_hash_node(adminq_mgt->cmd_filter, &key, &filter))

		nbl_warn(common, NBL_DEBUG_ADMINQ, "Fail to register res_write in filter");
@@ -1571,7 +1573,7 @@ static int nbl_res_adminq_pt_filter_out(struct nbl_resource_mgt *res_mgt, 
	if (filter && filter->out)

		ret = filter->out(res_mgt, param->data, param->out_size);



	return 0;

	return ret;

}



static int nbl_res_adminq_passthrough(void *priv, struct nbl_passthrough_fw_cmd_param *param,

drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_phy_leonis.c

+5 −3
Original line number Diff line number Diff line
@@ -2846,13 +2846,15 @@ static void nbl_phy_disable_rx_err_report(struct pci_dev *pdev) 
#define  NBL_BAD_TLP_BIT	6

#define  NBL_BAD_DLLP_BIT	7

	u8 mask = 0;

	int pos = 0;



	if (!pdev->aer_cap)

	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);

	if (!pos)

		return;



	pci_read_config_byte(pdev, pdev->aer_cap + PCI_ERR_COR_MASK, &mask);

	pci_read_config_byte(pdev, pos + PCI_ERR_COR_MASK, &mask);

	mask |= BIT(NBL_RX_ERR_BIT) | BIT(NBL_BAD_TLP_BIT) | BIT(NBL_BAD_DLLP_BIT);

	pci_write_config_byte(pdev, pdev->aer_cap + PCI_ERR_COR_MASK, mask);

	pci_write_config_byte(pdev, pos + PCI_ERR_COR_MASK, mask);

}



int nbl_phy_init_leonis(void *p, struct nbl_init_param *param)

drivers/net/ethernet/nebula-matrix/nbl/nbl_main.c

+5 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void nbl_core_stop(struct nbl_adapter *adapter) 
	nbl_dev_stop(adapter);

}



void nbl_core_setup_product_ops(struct nbl_adapter *adapter, struct nbl_init_param *param,

static void nbl_core_setup_product_ops(struct nbl_adapter *adapter, struct nbl_init_param *param,

				       struct nbl_product_base_ops **product_base_ops)

{

	adapter->product_base_ops = &nbl_product_base_ops[param->product_type];
@@ -120,14 +120,12 @@ struct nbl_adapter *nbl_core_init(struct pci_dev *pdev, struct nbl_init_param *p 
void nbl_core_remove(struct nbl_adapter *adapter)

{

	struct device *dev;

	struct nbl_common_info *common;

	struct nbl_product_base_ops *product_base_ops;



	if (!adapter)

		return;



	dev = NBL_ADAPTER_TO_DEV(adapter);

	common = NBL_ADAPTER_TO_COMMON(adapter);

	product_base_ops = NBL_ADAPTER_TO_RPDUCT_BASE_OPS(adapter);



	nbl_debugfs_func_remove(adapter);
@@ -418,7 +416,7 @@ static const struct pci_device_id nbl_id_table[] = { 
};

MODULE_DEVICE_TABLE(pci, nbl_id_table);



static int nbl_suspend(struct device *dev)

static int __maybe_unused nbl_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct nbl_adapter *adapter = pci_get_drvdata(pdev);
@@ -426,7 +424,7 @@ static int nbl_suspend(struct device *dev) 
	return nbl_dev_suspend(adapter);

}



static int nbl_resume(struct device *dev)

static int __maybe_unused nbl_resume(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct nbl_adapter *adapter = pci_get_drvdata(pdev);
@@ -435,6 +433,7 @@ static int nbl_resume(struct device *dev) 
}



static SIMPLE_DEV_PM_OPS(nbl_pm_ops, nbl_suspend, nbl_resume);



static struct pci_driver nbl_driver = {

	.name = NBL_DRIVER_NAME,

	.id_table = nbl_id_table,