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

Commit 42de047d authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Switch stmmac_desc_ops to generic HW Interface Helpers 



Switch stmmac_desc_ops to generic Hardware Interface Helpers instead of
using hard-coded callbacks. This makes the code more readable and more
flexible.

No functional change.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 309c446c

drivers/net/ethernet/stmicro/stmmac/chain_mode.c

+6 −8
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 
	tx_q->tx_skbuff_dma[entry].buf = des2;

	tx_q->tx_skbuff_dma[entry].len = bmax;

	/* do not close the descriptor and do not set own bit */

	priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE,

	stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum, STMMAC_CHAIN_MODE,

			0, false, skb->len);



	while (len != 0) {
@@ -68,9 +68,8 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 
				return -1;

			tx_q->tx_skbuff_dma[entry].buf = des2;

			tx_q->tx_skbuff_dma[entry].len = bmax;

			priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum,

							STMMAC_CHAIN_MODE, 1,

							false, skb->len);

			stmmac_prepare_tx_desc(priv, desc, 0, bmax, csum,

					STMMAC_CHAIN_MODE, 1, false, skb->len);

			len -= bmax;

			i++;

		} else {
@@ -83,9 +82,8 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 
			tx_q->tx_skbuff_dma[entry].buf = des2;

			tx_q->tx_skbuff_dma[entry].len = len;

			/* last descriptor can be set now */

			priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,

							STMMAC_CHAIN_MODE, 1,

							true, skb->len);

			stmmac_prepare_tx_desc(priv, desc, 0, len, csum,

					STMMAC_CHAIN_MODE, 1, true, skb->len);

			len = 0;

		}

	}

drivers/net/ethernet/stmicro/stmmac/common.h

+1 −54
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#endif



#include "descs.h"

#include "hwif.h"

#include "mmc.h"



/* Synopsys Core versions */
@@ -377,60 +378,6 @@ struct dma_features { 


#define JUMBO_LEN		9000



/* Descriptors helpers */

struct stmmac_desc_ops {

	/* DMA RX descriptor ring initialization */

	void (*init_rx_desc) (struct dma_desc *p, int disable_rx_ic, int mode,

			      int end);

	/* DMA TX descriptor ring initialization */

	void (*init_tx_desc) (struct dma_desc *p, int mode, int end);



	/* Invoked by the xmit function to prepare the tx descriptor */

	void (*prepare_tx_desc) (struct dma_desc *p, int is_fs, int len,

				 bool csum_flag, int mode, bool tx_own,

				 bool ls, unsigned int tot_pkt_len);

	void (*prepare_tso_tx_desc)(struct dma_desc *p, int is_fs, int len1,

				    int len2, bool tx_own, bool ls,

				    unsigned int tcphdrlen,

				    unsigned int tcppayloadlen);

	/* Set/get the owner of the descriptor */

	void (*set_tx_owner) (struct dma_desc *p);

	int (*get_tx_owner) (struct dma_desc *p);

	/* Clean the tx descriptor as soon as the tx irq is received */

	void (*release_tx_desc) (struct dma_desc *p, int mode);

	/* Clear interrupt on tx frame completion. When this bit is

	 * set an interrupt happens as soon as the frame is transmitted */

	void (*set_tx_ic)(struct dma_desc *p);

	/* Last tx segment reports the transmit status */

	int (*get_tx_ls) (struct dma_desc *p);

	/* Return the transmit status looking at the TDES1 */

	int (*tx_status) (void *data, struct stmmac_extra_stats *x,

			  struct dma_desc *p, void __iomem *ioaddr);

	/* Get the buffer size from the descriptor */

	int (*get_tx_len) (struct dma_desc *p);

	/* Handle extra events on specific interrupts hw dependent */

	void (*set_rx_owner) (struct dma_desc *p);

	/* Get the receive frame size */

	int (*get_rx_frame_len) (struct dma_desc *p, int rx_coe_type);

	/* Return the reception status looking at the RDES1 */

	int (*rx_status) (void *data, struct stmmac_extra_stats *x,

			  struct dma_desc *p);

	void (*rx_extended_status) (void *data, struct stmmac_extra_stats *x,

				    struct dma_extended_desc *p);

	/* Set tx timestamp enable bit */

	void (*enable_tx_timestamp) (struct dma_desc *p);

	/* get tx timestamp status */

	int (*get_tx_timestamp_status) (struct dma_desc *p);

	/* get timestamp value */

	 u64(*get_timestamp) (void *desc, u32 ats);

	/* get rx timestamp status */

	int (*get_rx_timestamp_status)(void *desc, void *next_desc, u32 ats);

	/* Display ring */

	void (*display_ring)(void *head, unsigned int size, bool rx);

	/* set MSS via context descriptor */

	void (*set_mss)(struct dma_desc *p, unsigned int mss);

};



extern const struct stmmac_desc_ops enh_desc_ops;

extern const struct stmmac_desc_ops ndesc_ops;

drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int dwmac4_wrback_get_tx_timestamp_status(struct dma_desc *p) 
	return 0;

}



static inline u64 dwmac4_get_timestamp(void *desc, u32 ats)

static inline void dwmac4_get_timestamp(void *desc, u32 ats, u64 *ts)

{

	struct dma_desc *p = (struct dma_desc *)desc;

	u64 ns;
@@ -232,7 +232,7 @@ static inline u64 dwmac4_get_timestamp(void *desc, u32 ats) 
	/* convert high/sec time stamp value to nanosecond */

	ns += le32_to_cpu(p->des1) * 1000000000ULL;



	return ns;

	*ts = ns;

}



static int dwmac4_rx_check_timestamp(void *desc)

drivers/net/ethernet/stmicro/stmmac/enh_desc.c

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int enh_desc_get_tx_timestamp_status(struct dma_desc *p) 
	return (le32_to_cpu(p->des0) & ETDES0_TIME_STAMP_STATUS) >> 17;

}



static u64 enh_desc_get_timestamp(void *desc, u32 ats)

static void enh_desc_get_timestamp(void *desc, u32 ats, u64 *ts)

{

	u64 ns;
@@ -397,7 +397,7 @@ static u64 enh_desc_get_timestamp(void *desc, u32 ats) 
		ns += le32_to_cpu(p->des3) * 1000000000ULL;

	}



	return ns;

	*ts = ns;

}



static int enh_desc_get_rx_timestamp_status(void *desc, void *next_desc,

drivers/net/ethernet/stmicro/stmmac/hwif.h

0 → 100644
+125 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

// Copyright (c) 2018 Synopsys, Inc. and/or its affiliates.

// stmmac HW Interface Callbacks



#ifndef __STMMAC_HWIF_H__

#define __STMMAC_HWIF_H__



#define stmmac_do_void_callback(__priv, __module, __cname,  __arg0, __args...) \

({ \

	int __result = -EINVAL; \

	if ((__priv)->hw->__module->__cname) { \

		(__priv)->hw->__module->__cname((__arg0), ##__args); \

		__result = 0; \

	} \

	__result; \

})

#define stmmac_do_callback(__priv, __module, __cname,  __arg0, __args...) \

({ \

	int __result = -EINVAL; \

	if ((__priv)->hw->__module->__cname) \

		__result = (__priv)->hw->__module->__cname((__arg0), ##__args); \

	__result; \

})



struct stmmac_extra_stats;

struct stmmac_safety_stats;

struct dma_desc;

struct dma_extended_desc;



/* Descriptors helpers */

struct stmmac_desc_ops {

	/* DMA RX descriptor ring initialization */

	void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic, int mode,

			int end);

	/* DMA TX descriptor ring initialization */

	void (*init_tx_desc)(struct dma_desc *p, int mode, int end);

	/* Invoked by the xmit function to prepare the tx descriptor */

	void (*prepare_tx_desc)(struct dma_desc *p, int is_fs, int len,

			bool csum_flag, int mode, bool tx_own, bool ls,

			unsigned int tot_pkt_len);

	void (*prepare_tso_tx_desc)(struct dma_desc *p, int is_fs, int len1,

			int len2, bool tx_own, bool ls, unsigned int tcphdrlen,

			unsigned int tcppayloadlen);

	/* Set/get the owner of the descriptor */

	void (*set_tx_owner)(struct dma_desc *p);

	int (*get_tx_owner)(struct dma_desc *p);

	/* Clean the tx descriptor as soon as the tx irq is received */

	void (*release_tx_desc)(struct dma_desc *p, int mode);

	/* Clear interrupt on tx frame completion. When this bit is

	 * set an interrupt happens as soon as the frame is transmitted */

	void (*set_tx_ic)(struct dma_desc *p);

	/* Last tx segment reports the transmit status */

	int (*get_tx_ls)(struct dma_desc *p);

	/* Return the transmit status looking at the TDES1 */

	int (*tx_status)(void *data, struct stmmac_extra_stats *x,

			struct dma_desc *p, void __iomem *ioaddr);

	/* Get the buffer size from the descriptor */

	int (*get_tx_len)(struct dma_desc *p);

	/* Handle extra events on specific interrupts hw dependent */

	void (*set_rx_owner)(struct dma_desc *p);

	/* Get the receive frame size */

	int (*get_rx_frame_len)(struct dma_desc *p, int rx_coe_type);

	/* Return the reception status looking at the RDES1 */

	int (*rx_status)(void *data, struct stmmac_extra_stats *x,

			struct dma_desc *p);

	void (*rx_extended_status)(void *data, struct stmmac_extra_stats *x,

			struct dma_extended_desc *p);

	/* Set tx timestamp enable bit */

	void (*enable_tx_timestamp) (struct dma_desc *p);

	/* get tx timestamp status */

	int (*get_tx_timestamp_status) (struct dma_desc *p);

	/* get timestamp value */

	void (*get_timestamp)(void *desc, u32 ats, u64 *ts);

	/* get rx timestamp status */

	int (*get_rx_timestamp_status)(void *desc, void *next_desc, u32 ats);

	/* Display ring */

	void (*display_ring)(void *head, unsigned int size, bool rx);

	/* set MSS via context descriptor */

	void (*set_mss)(struct dma_desc *p, unsigned int mss);

};



#define stmmac_init_rx_desc(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, init_rx_desc, __args)

#define stmmac_init_tx_desc(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, init_tx_desc, __args)

#define stmmac_prepare_tx_desc(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, prepare_tx_desc, __args)

#define stmmac_prepare_tso_tx_desc(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, prepare_tso_tx_desc, __args)

#define stmmac_set_tx_owner(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_tx_owner, __args)

#define stmmac_get_tx_owner(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_tx_owner, __args)

#define stmmac_release_tx_desc(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, release_tx_desc, __args)

#define stmmac_set_tx_ic(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_tx_ic, __args)

#define stmmac_get_tx_ls(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_tx_ls, __args)

#define stmmac_tx_status(__priv, __args...) \

	stmmac_do_callback(__priv, desc, tx_status, __args)

#define stmmac_get_tx_len(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_tx_len, __args)

#define stmmac_set_rx_owner(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_rx_owner, __args)

#define stmmac_get_rx_frame_len(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_rx_frame_len, __args)

#define stmmac_rx_status(__priv, __args...) \

	stmmac_do_callback(__priv, desc, rx_status, __args)

#define stmmac_rx_extended_status(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, rx_extended_status, __args)

#define stmmac_enable_tx_timestamp(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, enable_tx_timestamp, __args)

#define stmmac_get_tx_timestamp_status(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_tx_timestamp_status, __args)

#define stmmac_get_timestamp(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, get_timestamp, __args)

#define stmmac_get_rx_timestamp_status(__priv, __args...) \

	stmmac_do_callback(__priv, desc, get_rx_timestamp_status, __args)

#define stmmac_display_ring(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, display_ring, __args)

#define stmmac_set_mss(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_mss, __args)



#endif /* __STMMAC_HWIF_H__ */