Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a4a2d9 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

amd-xgbe: Check for Tx hardware queue flushing support 



The flushing of the Tx hardware queues is only supported at a certain
level of the hardware.  Retrieve the current version of the hardware
and use that to determine if flushing is supported.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e148e1bf

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+3 −0
Original line number Diff line number Diff line
@@ -1633,6 +1633,9 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata) 
{

	unsigned int i, count;



	if (XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) < 0x21)

		return 0;



	for (i = 0; i < pdata->tx_q_count; i++)

		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, FTQ, 1);

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata) 


	memset(hw_feat, 0, sizeof(*hw_feat));



	hw_feat->version = XGMAC_IOREAD(pdata, MAC_VR);



	/* Hardware feature register 0 */

	hw_feat->gmii        = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, GMIISEL);

	hw_feat->vlhash      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, VLHASH);

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+4 −3
Original line number Diff line number Diff line
@@ -361,15 +361,16 @@ static void xgbe_get_drvinfo(struct net_device *netdev, 
			     struct ethtool_drvinfo *drvinfo)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	struct xgbe_hw_features *hw_feat = &pdata->hw_feat;



	strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version));

	strlcpy(drvinfo->bus_info, dev_name(pdata->dev),

		sizeof(drvinfo->bus_info));

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",

		 XGMAC_IOREAD_BITS(pdata, MAC_VR, USERVER),

		 XGMAC_IOREAD_BITS(pdata, MAC_VR, DEVID),

		 XGMAC_IOREAD_BITS(pdata, MAC_VR, SNPSVER));

		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),

		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),

		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));

	drvinfo->n_stats = XGBE_STATS_COUNT;

}

drivers/net/ethernet/amd/xgbe/xgbe.h

+3 −0
Original line number Diff line number Diff line
@@ -526,6 +526,9 @@ struct xgbe_desc_if { 
 * or configurations are present in the device.

 */

struct xgbe_hw_features {

	/* HW Version */

	unsigned int version;



	/* HW Feature Register0 */

	unsigned int gmii;		/* 1000 Mbps support */

	unsigned int vlhash;		/* VLAN Hash Filter */