Commit 02338c48 authored by Mengyuan Lou's avatar Mengyuan Lou Committed by David S. Miller
Browse files

net: ngbe: Initialize sw info and register netdev 



Initialize ngbe mac/phy type.
Check whether the firmware is initialized.
Initialize ngbe hw and register netdev.

Signed-off-by: default avatarMengyuan Lou <mengyuanlou@net-swift.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 049fe536

drivers/net/ethernet/wangxun/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config LIBWX 
config NGBE

	tristate "Wangxun(R) GbE PCI Express adapters support"

	depends on PCI

	select LIBWX

	help

	  This driver supports Wangxun(R) GbE PCI Express family of

	  adapters.

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

+38 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int wx_acquire_sw_sync(struct wx_hw *wxhw, u32 mask) 
 *   So we will leave this up to the caller to read back the data

 *   in these cases.

 **/

static int wx_host_interface_command(struct wx_hw *wxhw, u32 *buffer,

int wx_host_interface_command(struct wx_hw *wxhw, u32 *buffer,

			      u32 length, u32 timeout, bool return_data)

{

	u32 hdr_size = sizeof(struct wx_hic_hdr);
@@ -265,6 +265,7 @@ static int wx_host_interface_command(struct wx_hw *wxhw, u32 *buffer, 
	wx_release_sw_sync(wxhw, WX_MNG_SWFW_SYNC_SW_MB);

	return status;

}

EXPORT_SYMBOL(wx_host_interface_command);



/**

 *  wx_read_ee_hostif_data - Read EEPROM word using a host interface cmd
@@ -870,6 +871,41 @@ void wx_reset_misc(struct wx_hw *wxhw) 
}

EXPORT_SYMBOL(wx_reset_misc);



/**

 *  wx_get_pcie_msix_counts - Gets MSI-X vector count

 *  @wxhw: pointer to hardware structure

 *  @msix_count: number of MSI interrupts that can be obtained

 *  @max_msix_count: number of MSI interrupts that mac need

 *

 *  Read PCIe configuration space, and get the MSI-X vector count from

 *  the capabilities table.

 **/

int wx_get_pcie_msix_counts(struct wx_hw *wxhw, u16 *msix_count, u16 max_msix_count)

{

	struct pci_dev *pdev = wxhw->pdev;

	struct device *dev = &pdev->dev;

	int pos;



	*msix_count = 1;

	pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);

	if (!pos) {

		dev_err(dev, "Unable to find MSI-X Capabilities\n");

		return -EINVAL;

	}

	pci_read_config_word(pdev,

			     pos + PCI_MSIX_FLAGS,

			     msix_count);

	*msix_count &= WX_PCIE_MSIX_TBL_SZ_MASK;

	/* MSI-X count is zero-based in HW */

	*msix_count += 1;



	if (*msix_count > max_msix_count)

		*msix_count = max_msix_count;



	return 0;

}

EXPORT_SYMBOL(wx_get_pcie_msix_counts);



int wx_sw_init(struct wx_hw *wxhw)

{

	struct pci_dev *pdev = wxhw->pdev;

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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
int wx_check_flash_load(struct wx_hw *hw, u32 check_bit);

void wx_control_hw(struct wx_hw *wxhw, bool drv);

int wx_mng_present(struct wx_hw *wxhw);

int wx_host_interface_command(struct wx_hw *wxhw, u32 *buffer,

			      u32 length, u32 timeout, bool return_data);

int wx_read_ee_hostif(struct wx_hw *wxhw, u16 offset, u16 *data);

int wx_read_ee_hostif_buffer(struct wx_hw *wxhw,

			     u16 offset, u16 words, u16 *data);
@@ -20,6 +22,7 @@ void wx_disable_rx(struct wx_hw *wxhw); 
int wx_disable_pcie_master(struct wx_hw *wxhw);

int wx_stop_adapter(struct wx_hw *wxhw);

void wx_reset_misc(struct wx_hw *wxhw);

int wx_get_pcie_msix_counts(struct wx_hw *wxhw, u16 *msix_count, u16 max_msix_count);

int wx_sw_init(struct wx_hw *wxhw);



#endif /* _WX_HW_H_ */

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

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#define WX_WOL_SUP                              0x4000

#define WX_WOL_MASK                             0x4000



/* MSI-X capability fields masks */

#define WX_PCIE_MSIX_TBL_SZ_MASK                0x7FF

#define WX_PCI_LINK_STATUS                      0xB2



/**************** Global Registers ****************************/

/* chip control Registers */

#define WX_MIS_PWR                   0x10000
@@ -255,6 +259,8 @@ struct wx_mac_info { 
	u32 num_rar_entries;

	u32 max_tx_queues;

	u32 max_rx_queues;



	u16 max_msix_vectors;

	struct wx_thermal_sensor_data sensor;

};

drivers/net/ethernet/wangxun/ngbe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ 


obj-$(CONFIG_NGBE) += ngbe.o



ngbe-objs := ngbe_main.o
 
ngbe-objs := ngbe_main.o ngbe_hw.o