Commit 4ee8afb4 authored by Mengyuan Lou's avatar Mengyuan Lou Committed by Jakub Kicinski
Browse files

net: txgbevf: add sw init pci info and reset hardware 



Add sw init and reset hw for txgbevf virtual functions
which initialize basic parameters, and then register netdev.

Signed-off-by: default avatarMengyuan Lou <mengyuanlou@net-swift.com>
Link: https://patch.msgid.link/20250704094923.652-6-mengyuanlou@net-swift.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 377d180b

drivers/net/ethernet/wangxun/libwx/wx_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -2369,7 +2369,8 @@ int wx_sw_init(struct wx *wx) 
	wx->bus.device = PCI_SLOT(pdev->devfn);

	wx->bus.func = PCI_FUNC(pdev->devfn);



	if (wx->oem_svid == PCI_VENDOR_ID_WANGXUN) {

	if (wx->oem_svid == PCI_VENDOR_ID_WANGXUN ||

	    pdev->is_virtfn) {

		wx->subsystem_vendor_id = pdev->subsystem_vendor;

		wx->subsystem_device_id = pdev->subsystem_device;

	} else {

drivers/net/ethernet/wangxun/libwx/wx_vf_common.c

+32 −0
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ EXPORT_SYMBOL(wxvf_resume); 


void wxvf_remove(struct pci_dev *pdev)

{

	struct wx *wx = pci_get_drvdata(pdev);

	struct net_device *netdev;



	netdev = wx->netdev;

	unregister_netdev(netdev);

	kfree(wx->vfinfo);

	kfree(wx->rss_key);

	kfree(wx->mac_table);

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_disable_device(pdev);
@@ -232,3 +240,27 @@ int wx_set_mac_vf(struct net_device *netdev, void *p) 
	return 0;

}

EXPORT_SYMBOL(wx_set_mac_vf);



int wxvf_open(struct net_device *netdev)

{

	return 0;

}

EXPORT_SYMBOL(wxvf_open);



static void wxvf_down(struct wx *wx)

{

	struct net_device *netdev = wx->netdev;



	netif_tx_disable(netdev);

	wx_reset_vf(wx);

}



int wxvf_close(struct net_device *netdev)

{

	struct wx *wx = netdev_priv(netdev);



	wxvf_down(wx);



	return 0;

}

EXPORT_SYMBOL(wxvf_close);

drivers/net/ethernet/wangxun/libwx/wx_vf_common.h

+2 −0
Original line number Diff line number Diff line
@@ -14,5 +14,7 @@ void wx_reset_vf(struct wx *wx); 
void wx_set_rx_mode_vf(struct net_device *netdev);

void wx_configure_vf(struct wx *wx);

int wx_set_mac_vf(struct net_device *netdev, void *p);

int wxvf_open(struct net_device *netdev);

int wxvf_close(struct net_device *netdev);



#endif /* _WX_VF_COMMON_H_ */

drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c

+111 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#include <linux/etherdevice.h>



#include "../libwx/wx_type.h"

#include "../libwx/wx_hw.h"

#include "../libwx/wx_mbx.h"

#include "../libwx/wx_vf.h"

#include "../libwx/wx_vf_common.h"

#include "txgbevf_type.h"
@@ -33,6 +36,96 @@ static const struct pci_device_id txgbevf_pci_tbl[] = { 
	{ .device = 0 }

};



static const struct net_device_ops txgbevf_netdev_ops = {

	.ndo_open               = wxvf_open,

	.ndo_stop               = wxvf_close,

	.ndo_validate_addr      = eth_validate_addr,

	.ndo_set_mac_address    = wx_set_mac_vf,

};



static void txgbevf_init_type_code(struct wx *wx)

{

	switch (wx->device_id) {

	case TXGBEVF_DEV_ID_SP1000:

	case TXGBEVF_DEV_ID_WX1820:

		wx->mac.type = wx_mac_sp;

		break;

	case TXGBEVF_DEV_ID_AML500F:

	case TXGBEVF_DEV_ID_AML510F:

	case TXGBEVF_DEV_ID_AML5024:

	case TXGBEVF_DEV_ID_AML5124:

	case TXGBEVF_DEV_ID_AML503F:

	case TXGBEVF_DEV_ID_AML513F:

		wx->mac.type = wx_mac_aml;

		break;

	default:

		wx->mac.type = wx_mac_unknown;

		break;

	}

}



static int txgbevf_sw_init(struct wx *wx)

{

	struct net_device *netdev = wx->netdev;

	struct pci_dev *pdev = wx->pdev;

	int err;



	/* Initialize pcie info and common capability flags */

	err = wx_sw_init(wx);

	if (err < 0)

		goto err_wx_sw_init;



	/* Initialize the mailbox */

	err = wx_init_mbx_params_vf(wx);

	if (err)

		goto err_init_mbx_params;



	/* Initialize the device type */

	txgbevf_init_type_code(wx);

	/* lock to protect mailbox accesses */

	spin_lock_init(&wx->mbx.mbx_lock);



	err = wx_reset_hw_vf(wx);

	if (err) {

		wx_err(wx, "PF still in reset state. Is the PF interface up?\n");

		goto err_reset_hw;

	}

	wx_init_hw_vf(wx);

	wx_negotiate_api_vf(wx);

	if (is_zero_ether_addr(wx->mac.addr))

		dev_info(&pdev->dev,

			 "MAC address not assigned by administrator.\n");

	eth_hw_addr_set(netdev, wx->mac.addr);



	if (!is_valid_ether_addr(netdev->dev_addr)) {

		dev_info(&pdev->dev, "Assigning random MAC address\n");

		eth_hw_addr_random(netdev);

		ether_addr_copy(wx->mac.addr, netdev->dev_addr);

		ether_addr_copy(wx->mac.perm_addr, netdev->dev_addr);

	}



	wx->mac.max_tx_queues = TXGBEVF_MAX_TX_QUEUES;

	wx->mac.max_rx_queues = TXGBEVF_MAX_RX_QUEUES;

	/* Enable dynamic interrupt throttling rates */

	wx->rx_itr_setting = 1;

	wx->tx_itr_setting = 1;

	/* set default ring sizes */

	wx->tx_ring_count = TXGBEVF_DEFAULT_TXD;

	wx->rx_ring_count = TXGBEVF_DEFAULT_RXD;

	/* set default work limits */

	wx->tx_work_limit = TXGBEVF_DEFAULT_TX_WORK;

	wx->rx_work_limit = TXGBEVF_DEFAULT_RX_WORK;



	return 0;

err_reset_hw:

	kfree(wx->vfinfo);

err_init_mbx_params:

	kfree(wx->rss_key);

	kfree(wx->mac_table);

err_wx_sw_init:

	return err;

}



/**

 * txgbevf_probe - Device Initialization Routine

 * @pdev: PCI device information struct
@@ -106,12 +199,30 @@ static int txgbevf_probe(struct pci_dev *pdev, 
		goto err_pci_release_regions;

	}



	netdev->netdev_ops = &txgbevf_netdev_ops;



	/* setup the private structure */

	err = txgbevf_sw_init(wx);

	if (err)

		goto err_pci_release_regions;



	netdev->features |= NETIF_F_HIGHDMA;



	eth_hw_addr_set(netdev, wx->mac.perm_addr);

	ether_addr_copy(netdev->perm_addr, wx->mac.addr);



	err = register_netdev(netdev);

	if (err)

		goto err_register;



	pci_set_drvdata(pdev, wx);



	return 0;



err_register:

	kfree(wx->vfinfo);

	kfree(wx->rss_key);

	kfree(wx->mac_table);

err_pci_release_regions:

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

drivers/net/ethernet/wangxun/txgbevf/txgbevf_type.h

+4 −0
Original line number Diff line number Diff line
@@ -16,5 +16,9 @@ 


#define TXGBEVF_MAX_RX_QUEUES                  4

#define TXGBEVF_MAX_TX_QUEUES                  4

#define TXGBEVF_DEFAULT_TXD                    128

#define TXGBEVF_DEFAULT_RXD                    128

#define TXGBEVF_DEFAULT_TX_WORK                256

#define TXGBEVF_DEFAULT_RX_WORK                256



#endif /* _TXGBEVF_TYPE_H_ */