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

Commit 219c5361 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'be2net-next' 



Sathya Perla says:

====================
be2net: patch set

v2 changes: add a new line after variable declaration in patch 12.

***
Patch 1 adds a few new log messages to help debugging in failure cases.

Patch 2 uses new macros for parsing RX/TX completions and TX wrbs to
help shorten the lines.

Patch 3 adds a description for the RX counter rx_input_fifo_overflow_drop.

Patch 4 adds TX completion error statistics reporting via ethtool.

Patch 5 adds a dma_mapping_error counter and its reporting via ethtool.

Patch 6 fixes up log messages in the Lancer FW download path.

Patch 7 replaces gotos with direct return statements.

Patch 8 cleans up be_change_mtu() code by using a new macro BE_MAX_MTU

Patch 9 makes be_cmd_get_regs() routine to return an integer status
similar to other FW cmd routines in be_cmds.c

Patch 10 gets rid of TX budget as enforcing a budget on TX completion
processing in NAPI is neither suggested nor it provides a performance benefit.

Patch 11 defines and uses a new macro for_all_tx_queues_on_eq() similar
to the RX processing code.

Patch 12 queries max_tx_qs from the FW for BE3 super-nic profiles.
For those profiles, the driver cannot assume a constant BE3_MAX_TX_QS value,
as the value may change for each function.

Please consider applying this patch set to the net-next tree. Thanks!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 364a9e93 a28277dc

drivers/net/ethernet/emulex/benet/be.h

+26 −2
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ static inline char *nic_name(struct pci_dev *pdev) 


#define BE_MAX_JUMBO_FRAME_SIZE	9018

#define BE_MIN_MTU		256

#define BE_MAX_MTU              (BE_MAX_JUMBO_FRAME_SIZE -	\

				 (ETH_HLEN + ETH_FCS_LEN))



#define BE_NUM_VLANS_SUPPORTED	64

#define BE_MAX_EQD		128u
@@ -112,7 +114,6 @@ static inline char *nic_name(struct pci_dev *pdev) 
#define MAX_ROCE_EQS		5

#define MAX_MSIX_VECTORS	32

#define MIN_MSIX_VECTORS	1

#define BE_TX_BUDGET		256

#define BE_NAPI_WEIGHT		64

#define MAX_RX_POST		BE_NAPI_WEIGHT /* Frags posted at a time */

#define RX_FRAGS_REFILL_WM	(RX_Q_LEN - MAX_RX_POST)
@@ -198,7 +199,6 @@ struct be_eq_obj { 


	u8 idx;			/* array index */

	u8 msix_idx;

	u16 tx_budget;

	u16 spurious_intr;

	struct napi_struct napi;

	struct be_adapter *adapter;
@@ -248,6 +248,13 @@ struct be_tx_stats { 
	ulong tx_jiffies;

	u32 tx_stops;

	u32 tx_drv_drops;	/* pkts dropped by driver */

	/* the error counters are described in be_ethtool.c */

	u32 tx_hdr_parse_err;

	u32 tx_dma_err;

	u32 tx_tso_err;

	u32 tx_spoof_check_err;

	u32 tx_qinq_err;

	u32 tx_internal_parity_err;

	struct u64_stats_sync sync;

	struct u64_stats_sync sync_compl;

};
@@ -316,6 +323,7 @@ struct be_rx_obj { 
struct be_drv_stats {

	u32 be_on_die_temperature;

	u32 eth_red_drops;

	u32 dma_map_errors;

	u32 rx_drops_no_pbuf;

	u32 rx_drops_no_txpb;

	u32 rx_drops_no_erx_descr;
@@ -613,6 +621,10 @@ extern const struct ethtool_ops be_ethtool_ops; 
	for (i = eqo->idx, rxo = &adapter->rx_obj[i]; i < adapter->num_rx_qs;\

		 i += adapter->num_evt_qs, rxo += adapter->num_evt_qs)



#define for_all_tx_queues_on_eq(adapter, eqo, txo, i)			\

	for (i = eqo->idx, txo = &adapter->tx_obj[i]; i < adapter->num_tx_qs;\

		i += adapter->num_evt_qs, txo += adapter->num_evt_qs)



#define is_mcc_eqo(eqo)			(eqo->idx == 0)

#define mcc_eqo(adapter)		(&adapter->eq_obj[0])
@@ -661,6 +673,18 @@ static inline u32 amap_get(void *ptr, u32 dw_offset, u32 mask, u32 offset) 
			amap_mask(sizeof(((_struct *)0)->field)),	\

			AMAP_BIT_OFFSET(_struct, field))



#define GET_RX_COMPL_V0_BITS(field, ptr)				\

		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, field, ptr)



#define GET_RX_COMPL_V1_BITS(field, ptr)				\

		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, field, ptr)



#define GET_TX_COMPL_BITS(field, ptr)					\

		AMAP_GET_BITS(struct amap_eth_tx_compl, field, ptr)



#define SET_TX_WRB_HDR_BITS(field, ptr, val)				\

		AMAP_SET_BITS(struct amap_eth_hdr_wrb, field, ptr, val)



#define be_dws_cpu_to_le(wrb, len)	swap_dws(wrb, len)

#define be_dws_le_to_cpu(wrb, len)	swap_dws(wrb, len)

static inline void swap_dws(void *wrb, int len)

drivers/net/ethernet/emulex/benet/be_cmds.c

+9 −5
Original line number Diff line number Diff line
@@ -1681,17 +1681,17 @@ int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size) 
	return status;

}



void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)

int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)

{

	struct be_dma_mem get_fat_cmd;

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_get_fat *req;

	u32 offset = 0, total_size, buf_size,

				log_offset = sizeof(u32), payload_len;

	int status;

	int status = 0;



	if (buf_len == 0)

		return;

		return -EIO;



	total_size = buf_len;
@@ -1700,10 +1700,9 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf) 
					      get_fat_cmd.size,

					      &get_fat_cmd.dma);

	if (!get_fat_cmd.va) {

		status = -ENOMEM;

		dev_err(&adapter->pdev->dev,

		"Memory allocation failure while retrieving FAT data\n");

		return;

		return -ENOMEM;

	}



	spin_lock_bh(&adapter->mcc_lock);
@@ -1746,6 +1745,7 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf) 
	pci_free_consistent(adapter->pdev, get_fat_cmd.size,

			    get_fat_cmd.va, get_fat_cmd.dma);

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}



/* Uses synchronous mcc */
@@ -1771,6 +1771,7 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter) 
	status = be_mcc_notify_wait(adapter);

	if (!status) {

		struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);



		strcpy(adapter->fw_ver, resp->firmware_version_string);

		strcpy(adapter->fw_on_flash, resp->fw_on_flash_version_string);

	}
@@ -2018,6 +2019,9 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter) 
		adapter->function_mode = le32_to_cpu(resp->function_mode);

		adapter->function_caps = le32_to_cpu(resp->function_caps);

		adapter->asic_rev = le32_to_cpu(resp->asic_revision) & 0xFF;

		dev_info(&adapter->pdev->dev,

			 "FW config: function_mode=0x%x, function_caps=0x%x\n",

			 adapter->function_mode, adapter->function_caps);

	}



	mutex_unlock(&adapter->mbox_lock);

drivers/net/ethernet/emulex/benet/be_cmds.h

+1 −1
Original line number Diff line number Diff line
@@ -2101,7 +2101,7 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter); 
int be_cmd_get_cntl_attributes(struct be_adapter *adapter);

int be_cmd_req_native_mode(struct be_adapter *adapter);

int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size);

void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf);

int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf);

int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege,

			     u32 domain);

int be_cmd_set_fn_privileges(struct be_adapter *adapter, u32 privileges,

drivers/net/ethernet/emulex/benet/be_ethtool.c

+35 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ static const struct be_ethtool_stat et_stats[] = { 
	 * fifo must never overflow.

	 */

	{DRVSTAT_INFO(rxpp_fifo_overflow_drop)},

	/* Received packets dropped when the RX block runs out of space in

	 * one of its input FIFOs. This could happen due a long burst of

	 * minimum-sized (64b) frames in the receive path.

	 * This counter may also be erroneously incremented rarely.

	 */

	{DRVSTAT_INFO(rx_input_fifo_overflow_drop)},

	{DRVSTAT_INFO(rx_ip_checksum_errs)},

	{DRVSTAT_INFO(rx_tcp_checksum_errs)},
@@ -114,6 +119,8 @@ static const struct be_ethtool_stat et_stats[] = { 
	 * is more than 9018 bytes

	 */

	{DRVSTAT_INFO(rx_drops_mtu)},

	/* Number of dma mapping errors */

	{DRVSTAT_INFO(dma_map_errors)},

	/* Number of packets dropped due to random early drop function */

	{DRVSTAT_INFO(eth_red_drops)},

	{DRVSTAT_INFO(be_on_die_temperature)},
@@ -152,6 +159,34 @@ static const struct be_ethtool_stat et_rx_stats[] = { 
 */

static const struct be_ethtool_stat et_tx_stats[] = {

	{DRVSTAT_TX_INFO(tx_compl)}, /* If moving this member see above note */

	/* This counter is incremented when the HW encounters an error while

	 * parsing the packet header of an outgoing TX request. This counter is

	 * applicable only for BE2, BE3 and Skyhawk based adapters.

	 */

	{DRVSTAT_TX_INFO(tx_hdr_parse_err)},

	/* This counter is incremented when an error occurs in the DMA

	 * operation associated with the TX request from the host to the device.

	 */

	{DRVSTAT_TX_INFO(tx_dma_err)},

	/* This counter is incremented when MAC or VLAN spoof checking is

	 * enabled on the interface and the TX request fails the spoof check

	 * in HW.

	 */

	{DRVSTAT_TX_INFO(tx_spoof_check_err)},

	/* This counter is incremented when the HW encounters an error while

	 * performing TSO offload. This counter is applicable only for Lancer

	 * adapters.

	 */

	{DRVSTAT_TX_INFO(tx_tso_err)},

	/* This counter is incremented when the HW detects Q-in-Q style VLAN

	 * tagging in a packet and such tagging is not expected on the outgoing

	 * interface. This counter is applicable only for Lancer adapters.

	 */

	{DRVSTAT_TX_INFO(tx_qinq_err)},

	/* This counter is incremented when the HW detects parity errors in the

	 * packet data. This counter is applicable only for Lancer adapters.

	 */

	{DRVSTAT_TX_INFO(tx_internal_parity_err)},

	{DRVSTAT_TX_INFO(tx_bytes)},

	{DRVSTAT_TX_INFO(tx_pkts)},

	/* Number of skbs queued for trasmission by the driver */

drivers/net/ethernet/emulex/benet/be_hw.h

+12 −0
Original line number Diff line number Diff line
@@ -315,6 +315,18 @@ struct be_eth_hdr_wrb { 
	u32 dw[4];

};



/********* Tx Compl Status Encoding *********/

#define BE_TX_COMP_HDR_PARSE_ERR	0x2

#define BE_TX_COMP_NDMA_ERR		0x3

#define BE_TX_COMP_ACL_ERR		0x5



#define LANCER_TX_COMP_LSO_ERR			0x1

#define LANCER_TX_COMP_HSW_DROP_MAC_ERR		0x3

#define LANCER_TX_COMP_HSW_DROP_VLAN_ERR	0x5

#define LANCER_TX_COMP_QINQ_ERR			0x7

#define LANCER_TX_COMP_PARITY_ERR		0xb

#define LANCER_TX_COMP_DMA_ERR			0xd



/* TX Compl Queue Descriptor */



/* Pseudo amap definition for eth_tx_compl in which each bit of the