Commit 42172f44 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'dpaa_eth-buffer-layout-fixes' 

Camelia Groza says:

====================
dpaa_eth: buffer layout fixes

The patches are related to the software workaround for the A050385 erratum.
The first patch ensures optimal buffer usage for non-erratum scenarios. The
second patch fixes a currently inconsequential discrepancy between the
FMan and Ethernet drivers.

Changes in v3:
- refactor defines for clarity in 1/2
- add more details on the user impact in 1/2
- remove unnecessary inline identifier in 2/2

Changes in v2:
- make the returned value for TX ports explicit in 2/2
- simplify the buf_layout reference in 2/2
====================

Link: https://lore.kernel.org/r/cover.1604339942.git.camelia.groza@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 04a55c94 7834e494

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+18 −10
Original line number Diff line number Diff line
@@ -174,12 +174,17 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms"); 
#define DPAA_PARSE_RESULTS_SIZE sizeof(struct fman_prs_result)

#define DPAA_TIME_STAMP_SIZE 8

#define DPAA_HASH_RESULTS_SIZE 8

#define DPAA_HWA_SIZE (DPAA_PARSE_RESULTS_SIZE + DPAA_TIME_STAMP_SIZE \

		       + DPAA_HASH_RESULTS_SIZE)

#define DPAA_RX_PRIV_DATA_DEFAULT_SIZE (DPAA_TX_PRIV_DATA_SIZE + \

					dpaa_rx_extra_headroom)

#ifdef CONFIG_DPAA_ERRATUM_A050385

#define DPAA_RX_PRIV_DATA_SIZE (DPAA_A050385_ALIGN - (DPAA_PARSE_RESULTS_SIZE\

	 + DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE))

#define DPAA_RX_PRIV_DATA_A050385_SIZE (DPAA_A050385_ALIGN - DPAA_HWA_SIZE)

#define DPAA_RX_PRIV_DATA_SIZE (fman_has_errata_a050385() ? \

				DPAA_RX_PRIV_DATA_A050385_SIZE : \

				DPAA_RX_PRIV_DATA_DEFAULT_SIZE)

#else

#define DPAA_RX_PRIV_DATA_SIZE	(u16)(DPAA_TX_PRIV_DATA_SIZE + \

					dpaa_rx_extra_headroom)

#define DPAA_RX_PRIV_DATA_SIZE DPAA_RX_PRIV_DATA_DEFAULT_SIZE

#endif



#define DPAA_ETH_PCD_RXQ_NUM	128
@@ -2840,7 +2845,8 @@ static int dpaa_ingress_cgr_init(struct dpaa_priv *priv) 
	return err;

}



static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl)

static u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl,

			     enum port_type port)

{

	u16 headroom;
@@ -2854,9 +2860,11 @@ static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl) 
	 *

	 * Also make sure the headroom is a multiple of data_align bytes

	 */

	headroom = (u16)(bl->priv_data_size + DPAA_PARSE_RESULTS_SIZE +

		DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE);

	headroom = (u16)(bl[port].priv_data_size + DPAA_HWA_SIZE);



	if (port == RX)

		return ALIGN(headroom, DPAA_FD_RX_DATA_ALIGNMENT);

	else

		return ALIGN(headroom, DPAA_FD_DATA_ALIGNMENT);

}
@@ -3025,8 +3033,8 @@ static int dpaa_eth_probe(struct platform_device *pdev) 
			goto free_dpaa_fqs;

	}



	priv->tx_headroom = dpaa_get_headroom(&priv->buf_layout[TX]);

	priv->rx_headroom = dpaa_get_headroom(&priv->buf_layout[RX]);

	priv->tx_headroom = dpaa_get_headroom(priv->buf_layout, TX);

	priv->rx_headroom = dpaa_get_headroom(priv->buf_layout, RX);



	/* All real interfaces need their ports initialized */

	err = dpaa_eth_init_ports(mac_dev, dpaa_bp, &port_fqs,