Commit 1ddee6d8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'gianfar-some-assorted-cleanup' 

Arseny Solokha says:

====================
gianfar: some assorted cleanup

This is a cleanup series for the gianfar Ethernet driver, following up a
discussion in [1]. It is intended to precede a conversion of gianfar from
PHYLIB to PHYLINK API, which will be submitted later in its version 2.
However, it won't make a conversion cleaner, except for the last patch in
this series. Obviously this series is not intended for -stable.

The first patch looks super controversial to me, as it moves lots of code
around for the sole purpose of getting rid of static forward declarations
in two translation units. On the other hand, this change is purely
mechanical and cannot do any harm other than cluttering git blame output.
I can prepare an alternative patch for only swapping adjacent functions
around, if necessary.

The second patch is a trivial follow-up to the first one, making functions
that are only called from the same translation unit static.

The third patch removes some now unused macro and structure definitions
from gianfar.h, slipped away from various cleanups in the past.

The fourth patch, also suggested in [1], makes the driver consistently use
PHY connection type value obtained from a Device Tree node, instead of
ignoring it and using the one auto-detected by MAC, when connecting to PHY.
Obviously a value has to be specified correctly in DT source, or omitted
altogether, in which case the driver will fall back to auto-detection. When
querying a DT node, the driver will also take both applicable properties
into account by making a proper API call instead of open-coding the lookup
half-way correctly.

[1] https://lore.kernel.org/netdev/CA+h21hruqt6nGG5ksDSwrGH_w5GtGF4fjAMCWJne7QJrjusERQ@mail.gmail.com/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d1e8496e 8e578e73

drivers/net/ethernet/freescale/gianfar.c

+1482 −1523

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/freescale/gianfar.h

+0 −45
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct ethtool_rx_list { 
/* Number of bytes to align the rx bufs to */

#define RXBUF_ALIGNMENT 64



#define PHY_INIT_TIMEOUT 100000



#define DRV_NAME "gfar-enet"

extern const char gfar_driver_version[];
@@ -88,10 +86,6 @@ extern const char gfar_driver_version[]; 
#define GFAR_RX_MAX_RING_SIZE   256

#define GFAR_TX_MAX_RING_SIZE   256



#define GFAR_MAX_FIFO_THRESHOLD 511

#define GFAR_MAX_FIFO_STARVE	511

#define GFAR_MAX_FIFO_STARVE_OFF 511



#define FBTHR_SHIFT        24

#define DEFAULT_RX_LFC_THR  16

#define DEFAULT_LFC_PTVVAL  4
@@ -109,9 +103,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_FIFO_TX_THR 0x100

#define DEFAULT_FIFO_TX_STARVE 0x40

#define DEFAULT_FIFO_TX_STARVE_OFF 0x80

#define DEFAULT_BD_STASH 1

#define DEFAULT_STASH_LENGTH	96

#define DEFAULT_STASH_INDEX	0



/* The number of Exact Match registers */

#define GFAR_EM_NUM	15
@@ -139,15 +130,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_RX_COALESCE 0

#define DEFAULT_RXCOUNT	0



#define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \

		| SUPPORTED_10baseT_Full \

		| SUPPORTED_100baseT_Half \

		| SUPPORTED_100baseT_Full \

		| SUPPORTED_Autoneg \

		| SUPPORTED_MII)



#define GFAR_SUPPORTED_GBIT SUPPORTED_1000baseT_Full



/* TBI register addresses */

#define MII_TBICON		0x11
@@ -185,8 +167,6 @@ extern const char gfar_driver_version[]; 
#define ECNTRL_REDUCED_MII_MODE	0x00000004

#define ECNTRL_SGMII_MODE	0x00000002



#define MRBLR_INIT_SETTINGS	DEFAULT_RX_BUFFER_SIZE



#define MINFLR_INIT_SETTINGS	0x00000040



/* Tqueue control */
@@ -266,12 +246,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_TXIC mk_ic_value(DEFAULT_TXCOUNT, DEFAULT_TXTIME)

#define DEFAULT_RXIC mk_ic_value(DEFAULT_RXCOUNT, DEFAULT_RXTIME)



#define skip_bd(bdp, stride, base, ring_size) ({ \

	typeof(bdp) new_bd = (bdp) + (stride); \

	(new_bd >= (base) + (ring_size)) ? (new_bd - (ring_size)) : new_bd; })



#define next_bd(bdp, base, ring_size) skip_bd(bdp, 1, base, ring_size)



#define RCTRL_TS_ENABLE 	0x01000000

#define RCTRL_PAL_MASK		0x001f0000

#define RCTRL_LFC		0x00004000
@@ -385,11 +359,6 @@ extern const char gfar_driver_version[]; 
#define IMASK_RX_DISABLED ((~(IMASK_RX_DEFAULT)) & IMASK_DEFAULT)

#define IMASK_TX_DISABLED ((~(IMASK_TX_DEFAULT)) & IMASK_DEFAULT)



/* Fifo management */

#define FIFO_TX_THR_MASK	0x01ff

#define FIFO_TX_STARVE_MASK	0x01ff

#define FIFO_TX_STARVE_OFF_MASK	0x01ff



/* Attribute fields */



/* This enables rx snooping for buffers and descriptors */
@@ -1326,16 +1295,9 @@ static inline u32 gfar_rxbd_dma_lastfree(struct gfar_priv_rx_q *rxq) 
	return bdp_dma;

}



irqreturn_t gfar_receive(int irq, void *dev_id);

int startup_gfar(struct net_device *dev);

void stop_gfar(struct net_device *dev);

void reset_gfar(struct net_device *dev);

void gfar_mac_reset(struct gfar_private *priv);

void gfar_halt(struct gfar_private *priv);

void gfar_start(struct gfar_private *priv);

void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev, int enable,

		   u32 regnum, u32 read);

void gfar_configure_coalescing_all(struct gfar_private *priv);

int gfar_set_features(struct net_device *dev, netdev_features_t features);



extern const struct ethtool_ops gfar_ethtool_ops;
@@ -1348,13 +1310,6 @@ extern const struct ethtool_ops gfar_ethtool_ops; 
#define RQFCR_PID_PORT_MASK 0xFFFF0000

#define RQFCR_PID_MAC_MASK 0xFF000000



struct gfar_mask_entry {

	unsigned int mask; /* The mask value which is valid form start to end */

	unsigned int start;

	unsigned int end;

	unsigned int block; /* Same block values indicate depended entries */

};



/* Represents a receive filer table entry */

struct gfar_filer_entry {

	u32 ctrl;

drivers/net/ethernet/freescale/gianfar_ethtool.c

+0 −13
Original line number Diff line number Diff line
@@ -45,19 +45,6 @@ 


#define GFAR_MAX_COAL_USECS 0xffff

#define GFAR_MAX_COAL_FRAMES 0xff

static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,

			    u64 *buf);

static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf);

static int gfar_gcoalesce(struct net_device *dev,

			  struct ethtool_coalesce *cvals);

static int gfar_scoalesce(struct net_device *dev,

			  struct ethtool_coalesce *cvals);

static void gfar_gringparam(struct net_device *dev,

			    struct ethtool_ringparam *rvals);

static int gfar_sringparam(struct net_device *dev,

			   struct ethtool_ringparam *rvals);

static void gfar_gdrvinfo(struct net_device *dev,

			  struct ethtool_drvinfo *drvinfo);



static const char stat_gstrings[][ETH_GSTRING_LEN] = {

	/* extra stats */

CRA Git | Maintained and supported by SUSTech CRA and CCSE