Commit ce2b4ad5 authored by Jiawen Wu's avatar Jiawen Wu Committed by Jakub Kicinski
Browse files

net: txgbe: Remove structure txgbe_hw 



Remove useless structure txgbe_hw to make the codes clear.

Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7abd92a5

drivers/net/ethernet/wangxun/txgbe/txgbe.h

+0 −20
Original line number Diff line number Diff line
@@ -14,30 +14,10 @@ 
#define TXGBE_SP_RAR_ENTRIES    128

#define TXGBE_SP_MC_TBL_SIZE    128



struct txgbe_mac_addr {

	u8 addr[ETH_ALEN];

	u16 state; /* bitmask */

	u64 pools;

};



#define TXGBE_MAC_STATE_DEFAULT         0x1

#define TXGBE_MAC_STATE_MODIFIED        0x2

#define TXGBE_MAC_STATE_IN_USE          0x4



/* board specific private data structure */

struct txgbe_adapter {

	u8 __iomem *io_addr;    /* Mainly for iounmap use */

	/* OS defined structs */

	struct net_device *netdev;

	struct pci_dev *pdev;



	/* structs defined in txgbe_type.h */

	struct txgbe_hw hw;

	u16 msg_enable;

	struct txgbe_mac_addr *mac_table;

	char eeprom_id[32];

};



extern char txgbe_driver_name[];



#endif /* _TXGBE_H_ */

drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c

+16 −20
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


/**

 *  txgbe_init_thermal_sensor_thresh - Inits thermal sensor thresholds

 *  @hw: pointer to hardware structure

 *  @wxhw: pointer to hardware structure

 *

 *  Inits the thermal sensor thresholds according to the NVM map

 *  and save off the threshold and location values into mac.thermal_sensor_data

 **/

static void txgbe_init_thermal_sensor_thresh(struct txgbe_hw *hw)

static void txgbe_init_thermal_sensor_thresh(struct wx_hw *wxhw)

{

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_thermal_sensor_data *data = &wxhw->mac.sensor;



	memset(data, 0, sizeof(struct wx_thermal_sensor_data));
@@ -46,16 +45,15 @@ static void txgbe_init_thermal_sensor_thresh(struct txgbe_hw *hw) 


/**

 *  txgbe_read_pba_string - Reads part number string from EEPROM

 *  @hw: pointer to hardware structure

 *  @wxhw: pointer to hardware structure

 *  @pba_num: stores the part number string from the EEPROM

 *  @pba_num_size: part number string buffer length

 *

 *  Reads the part number string from the EEPROM.

 **/

int txgbe_read_pba_string(struct txgbe_hw *hw, u8 *pba_num, u32 pba_num_size)

int txgbe_read_pba_string(struct wx_hw *wxhw, u8 *pba_num, u32 pba_num_size)

{

	u16 pba_ptr, offset, length, data;

	struct wx_hw *wxhw = &hw->wxhw;

	int ret_val;



	if (!pba_num) {
@@ -155,14 +153,13 @@ int txgbe_read_pba_string(struct txgbe_hw *hw, u8 *pba_num, u32 pba_num_size) 


/**

 *  txgbe_calc_eeprom_checksum - Calculates and returns the checksum

 *  @hw: pointer to hardware structure

 *  @wxhw: pointer to hardware structure

 *  @checksum: pointer to cheksum

 *

 *  Returns a negative error code on error

 **/

static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum)

static int txgbe_calc_eeprom_checksum(struct wx_hw *wxhw, u16 *checksum)

{

	struct wx_hw *wxhw = &hw->wxhw;

	u16 *eeprom_ptrs = NULL;

	u32 buffer_size = 0;

	u16 *buffer = NULL;
@@ -210,15 +207,14 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum) 


/**

 *  txgbe_validate_eeprom_checksum - Validate EEPROM checksum

 *  @hw: pointer to hardware structure

 *  @wxhw: pointer to hardware structure

 *  @checksum_val: calculated checksum

 *

 *  Performs checksum calculation and validates the EEPROM checksum.  If the

 *  caller does not need checksum_val, the value can be NULL.

 **/

int txgbe_validate_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum_val)

int txgbe_validate_eeprom_checksum(struct wx_hw *wxhw, u16 *checksum_val)

{

	struct wx_hw *wxhw = &hw->wxhw;

	u16 read_checksum = 0;

	u16 checksum;

	int status;
@@ -234,7 +230,7 @@ int txgbe_validate_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum_val) 
	}



	checksum = 0;

	status = txgbe_calc_eeprom_checksum(hw, &checksum);

	status = txgbe_calc_eeprom_checksum(wxhw, &checksum);

	if (status != 0)

		return status;
@@ -258,25 +254,25 @@ int txgbe_validate_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum_val) 
	return status;

}



static void txgbe_reset_misc(struct txgbe_hw *hw)

static void txgbe_reset_misc(struct txgbe_adapter *adapter)

{

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;



	wx_reset_misc(wxhw);

	txgbe_init_thermal_sensor_thresh(hw);

	txgbe_init_thermal_sensor_thresh(wxhw);

}



/**

 *  txgbe_reset_hw - Perform hardware reset

 *  @hw: pointer to hardware structure

 *  @adapter: pointer to adapter structure

 *

 *  Resets the hardware by resetting the transmit and receive units, masks

 *  and clears all interrupts, perform a PHY reset, and perform a link (MAC)

 *  reset.

 **/

int txgbe_reset_hw(struct txgbe_hw *hw)

int txgbe_reset_hw(struct txgbe_adapter *adapter)

{

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	int status;



	/* Call adapter stop to disable tx/rx and clear interrupts */
@@ -294,7 +290,7 @@ int txgbe_reset_hw(struct txgbe_hw *hw) 
	if (status != 0)

		return status;



	txgbe_reset_misc(hw);

	txgbe_reset_misc(adapter);



	/* Store the permanent mac address */

	wx_get_mac_addr(wxhw, wxhw->mac.perm_addr);

drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#ifndef _TXGBE_HW_H_

#define _TXGBE_HW_H_



int txgbe_read_pba_string(struct txgbe_hw *hw, u8 *pba_num, u32 pba_num_size);

int txgbe_validate_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum_val);

int txgbe_reset_hw(struct txgbe_hw *hw);

int txgbe_read_pba_string(struct wx_hw *wxhw, u8 *pba_num, u32 pba_num_size);

int txgbe_validate_eeprom_checksum(struct wx_hw *wxhw, u16 *checksum_val);

int txgbe_reset_hw(struct txgbe_adapter *adapter);



#endif /* _TXGBE_HW_H_ */

drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

+15 −22
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ static int txgbe_enumerate_functions(struct txgbe_adapter *adapter) 


static void txgbe_sync_mac_table(struct txgbe_adapter *adapter)

{

	struct txgbe_hw *hw = &adapter->hw;

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	int i;



	for (i = 0; i < wxhw->mac.num_rar_entries; i++) {
@@ -98,7 +97,7 @@ static void txgbe_sync_mac_table(struct txgbe_adapter *adapter) 
static void txgbe_mac_set_default_filter(struct txgbe_adapter *adapter,

					 u8 *addr)

{

	struct wx_hw *wxhw = &adapter->hw.wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;



	memcpy(&adapter->mac_table[0].addr, addr, ETH_ALEN);

	adapter->mac_table[0].pools = 1ULL;
@@ -111,7 +110,7 @@ static void txgbe_mac_set_default_filter(struct txgbe_adapter *adapter, 


static void txgbe_flush_sw_mac_table(struct txgbe_adapter *adapter)

{

	struct wx_hw *wxhw = &adapter->hw.wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	u32 i;



	for (i = 0; i < wxhw->mac.num_rar_entries; i++) {
@@ -125,7 +124,7 @@ static void txgbe_flush_sw_mac_table(struct txgbe_adapter *adapter) 


static int txgbe_del_mac_filter(struct txgbe_adapter *adapter, u8 *addr, u16 pool)

{

	struct wx_hw *wxhw = &adapter->hw.wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	u32 i;



	if (is_zero_ether_addr(addr))
@@ -160,8 +159,7 @@ static int txgbe_del_mac_filter(struct txgbe_adapter *adapter, u8 *addr, u16 poo 


static void txgbe_up_complete(struct txgbe_adapter *adapter)

{

	struct txgbe_hw *hw = &adapter->hw;

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;



	wx_control_hw(wxhw, true);

}
@@ -169,11 +167,10 @@ static void txgbe_up_complete(struct txgbe_adapter *adapter) 
static void txgbe_reset(struct txgbe_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct txgbe_hw *hw = &adapter->hw;

	u8 old_addr[ETH_ALEN];

	int err;



	err = txgbe_reset_hw(hw);

	err = txgbe_reset_hw(adapter);

	if (err != 0)

		dev_err(&adapter->pdev->dev, "Hardware Error: %d\n", err);
@@ -186,7 +183,7 @@ static void txgbe_reset(struct txgbe_adapter *adapter) 
static void txgbe_disable_device(struct txgbe_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct wx_hw *wxhw = &adapter->hw.wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;



	wx_disable_pcie_master(wxhw);

	/* disable receives */
@@ -225,8 +222,7 @@ static void txgbe_down(struct txgbe_adapter *adapter) 
static int txgbe_sw_init(struct txgbe_adapter *adapter)

{

	struct pci_dev *pdev = adapter->pdev;

	struct txgbe_hw *hw = &adapter->hw;

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	int err;



	wxhw->hw_addr = adapter->io_addr;
@@ -313,7 +309,7 @@ static int txgbe_close(struct net_device *netdev) 
	struct txgbe_adapter *adapter = netdev_priv(netdev);



	txgbe_down(adapter);

	wx_control_hw(&adapter->hw.wxhw, false);

	wx_control_hw(&adapter->wxhw, false);



	return 0;

}
@@ -322,8 +318,7 @@ static void txgbe_dev_shutdown(struct pci_dev *pdev, bool *enable_wake) 
{

	struct txgbe_adapter *adapter = pci_get_drvdata(pdev);

	struct net_device *netdev = adapter->netdev;

	struct txgbe_hw *hw = &adapter->hw;

	struct wx_hw *wxhw = &hw->wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;



	netif_device_detach(netdev);
@@ -365,7 +360,7 @@ static netdev_tx_t txgbe_xmit_frame(struct sk_buff *skb, 
static int txgbe_set_mac(struct net_device *netdev, void *p)

{

	struct txgbe_adapter *adapter = netdev_priv(netdev);

	struct wx_hw *wxhw = &adapter->hw.wxhw;

	struct wx_hw *wxhw = &adapter->wxhw;

	struct sockaddr *addr = p;

	int retval;
@@ -405,7 +400,6 @@ static int txgbe_probe(struct pci_dev *pdev, 
		       const struct pci_device_id __always_unused *ent)

{

	struct txgbe_adapter *adapter = NULL;

	struct txgbe_hw *hw = NULL;

	struct wx_hw *wxhw = NULL;

	struct net_device *netdev;

	int err, expected_gts;
@@ -453,8 +447,7 @@ static int txgbe_probe(struct pci_dev *pdev, 
	adapter = netdev_priv(netdev);

	adapter->netdev = netdev;

	adapter->pdev = pdev;

	hw = &adapter->hw;

	wxhw = &hw->wxhw;

	wxhw = &adapter->wxhw;

	adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;



	adapter->io_addr = devm_ioremap(&pdev->dev,
@@ -486,7 +479,7 @@ static int txgbe_probe(struct pci_dev *pdev, 
		goto err_free_mac_table;

	}



	err = txgbe_reset_hw(hw);

	err = txgbe_reset_hw(adapter);

	if (err) {

		dev_err(&pdev->dev, "HW Init failed: %d\n", err);

		goto err_free_mac_table;
@@ -495,7 +488,7 @@ static int txgbe_probe(struct pci_dev *pdev, 
	netdev->features |= NETIF_F_HIGHDMA;



	/* make sure the EEPROM is good */

	err = txgbe_validate_eeprom_checksum(hw, NULL);

	err = txgbe_validate_eeprom_checksum(wxhw, NULL);

	if (err != 0) {

		dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");

		wr32(wxhw, WX_MIS_RST, WX_MIS_RST_SW_RST);
@@ -565,7 +558,7 @@ static int txgbe_probe(struct pci_dev *pdev, 
		dev_warn(&pdev->dev, "Failed to enumerate PF devices.\n");



	/* First try to read PBA as a string */

	err = txgbe_read_pba_string(hw, part_str, TXGBE_PBANUM_LENGTH);

	err = txgbe_read_pba_string(wxhw, part_str, TXGBE_PBANUM_LENGTH);

	if (err)

		strncpy(part_str, "Unknown", TXGBE_PBANUM_LENGTH);

drivers/net/ethernet/wangxun/txgbe/txgbe_type.h

+15 −1
Original line number Diff line number Diff line
@@ -67,8 +67,22 @@ 
#define TXGBE_PBANUM1_PTR                       0x06

#define TXGBE_PBANUM_PTR_GUARD                  0xFAFA



struct txgbe_hw {

struct txgbe_mac_addr {

	u8 addr[ETH_ALEN];

	u16 state; /* bitmask */

	u64 pools;

};



/* board specific private data structure */

struct txgbe_adapter {

	u8 __iomem *io_addr;

	/* OS defined structs */

	struct net_device *netdev;

	struct pci_dev *pdev;

	struct wx_hw wxhw;

	u16 msg_enable;

	struct txgbe_mac_addr *mac_table;

	char eeprom_id[32];

};



#endif /* _TXGBE_TYPE_H_ */