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

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

Merge branch 'stmmac-rework-speed-selection' 



Corentin Labbe says:

====================
net-next: stmmac: rework the speed selection

The current stmmac_adjust_link() part which handle speed have
some if (has_platform) code and my dwmac-sun8i will add more of them.

So we need to handle better speed selection.
Moreover the struct link member speed and port are hard to guess their
purpose. And their unique usage are to be combined for writing speed.

My first try was to create an adjust_link() in stmmac_ops but it duplicate some code

The current solution is to have direct value for 10/100/1000 and a mask for them.

The first 4 patchs fix some minor problem found in stmmac_adjust_link() and reported by Florian Fainelli in my previous serie.
The last patch is the real work.

This series is tested on cubieboard2 (dwmac1000) and opipc (dwmac-sun8i).

Changes since v3:
- Added the patch #4 "Convert old_link to bool" as suggested by Joe Perches
- Changed the speedmask

Changes since v2:
- Use true/false for new_state in patch #1
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 26d732ba ca84dfb9

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

+5 −3
Original line number Diff line number Diff line
@@ -549,9 +549,11 @@ extern const struct stmmac_hwtimestamp stmmac_ptp; 
extern const struct stmmac_mode_ops dwmac4_ring_mode_ops;



struct mac_link {

	int port;

	int duplex;

	int speed;

	u32 speed_mask;

	u32 speed10;

	u32 speed100;

	u32 speed1000;

	u32 duplex;

};



struct mii_regs {

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

+15 −11
Original line number Diff line number Diff line
@@ -45,15 +45,17 @@ static void dwmac1000_core_init(struct mac_device_info *hw, int mtu) 
	if (hw->ps) {

		value |= GMAC_CONTROL_TE;



		if (hw->ps == SPEED_1000) {

			value &= ~GMAC_CONTROL_PS;

		} else {

			value |= GMAC_CONTROL_PS;



			if (hw->ps == SPEED_10)

				value &= ~GMAC_CONTROL_FES;

			else

				value |= GMAC_CONTROL_FES;

		value &= ~hw->link.speed_mask;

		switch (hw->ps) {

		case SPEED_1000:

			value |= hw->link.speed1000;

			break;

		case SPEED_100:

			value |= hw->link.speed100;

			break;

		case SPEED_10:

			value |= hw->link.speed10;

			break;

		}

	}
@@ -531,9 +533,11 @@ struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins, 
	mac->mac = &dwmac1000_ops;

	mac->dma = &dwmac1000_dma_ops;



	mac->link.port = GMAC_CONTROL_PS;

	mac->link.duplex = GMAC_CONTROL_DM;

	mac->link.speed = GMAC_CONTROL_FES;

	mac->link.speed10 = GMAC_CONTROL_PS;

	mac->link.speed100 = GMAC_CONTROL_PS | GMAC_CONTROL_FES;

	mac->link.speed1000 = 0;

	mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;

	mac->mii.addr = GMAC_MII_ADDR;

	mac->mii.data = GMAC_MII_DATA;

	mac->mii.addr_shift = 11;

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

+4 −2
Original line number Diff line number Diff line
@@ -175,9 +175,11 @@ struct mac_device_info *dwmac100_setup(void __iomem *ioaddr, int *synopsys_id) 
	mac->mac = &dwmac100_ops;

	mac->dma = &dwmac100_dma_ops;



	mac->link.port = MAC_CONTROL_PS;

	mac->link.duplex = MAC_CONTROL_F;

	mac->link.speed = 0;

	mac->link.speed10 = 0;

	mac->link.speed100 = 0;

	mac->link.speed1000 = 0;

	mac->link.speed_mask = MAC_CONTROL_PS;

	mac->mii.addr = MAC_MII_ADDR;

	mac->mii.data = MAC_MII_DATA;

	mac->mii.addr_shift = 11;

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

+15 −11
Original line number Diff line number Diff line
@@ -35,15 +35,17 @@ static void dwmac4_core_init(struct mac_device_info *hw, int mtu) 
	if (hw->ps) {

		value |= GMAC_CONFIG_TE;



		if (hw->ps == SPEED_1000) {

			value &= ~GMAC_CONFIG_PS;

		} else {

			value |= GMAC_CONFIG_PS;



			if (hw->ps == SPEED_10)

				value &= ~GMAC_CONFIG_FES;

			else

				value |= GMAC_CONFIG_FES;

		value &= hw->link.speed_mask;

		switch (hw->ps) {

		case SPEED_1000:

			value |= hw->link.speed1000;

			break;

		case SPEED_100:

			value |= hw->link.speed100;

			break;

		case SPEED_10:

			value |= hw->link.speed10;

			break;

		}

	}
@@ -747,9 +749,11 @@ struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins, 
	if (mac->multicast_filter_bins)

		mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);



	mac->link.port = GMAC_CONFIG_PS;

	mac->link.duplex = GMAC_CONFIG_DM;

	mac->link.speed = GMAC_CONFIG_FES;

	mac->link.speed10 = GMAC_CONFIG_PS;

	mac->link.speed100 = GMAC_CONFIG_FES | GMAC_CONFIG_PS;

	mac->link.speed1000 = 0;

	mac->link.speed_mask = GMAC_CONFIG_FES | GMAC_CONFIG_PS;

	mac->mii.addr = GMAC_MDIO_ADDR;

	mac->mii.data = GMAC_MDIO_DATA;

	mac->mii.addr_shift = 21;

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct stmmac_priv { 
	/* TX Queue */

	struct stmmac_tx_queue tx_queue[MTL_MAX_TX_QUEUES];



	int oldlink;

	bool oldlink;

	int speed;

	int oldduplex;

	unsigned int flow_ctrl;