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

Merge branch 'net-dsa-microchip-error-hndling-reg-access-validation' 



Oleksij Rempel says:

====================
net: dsa: microchip: add error handling and register access validation

changes v4:
- add Reviewed-by: Vladimir Oltean <olteanv@gmail.com> to all patches
- fix checkpatch warnings.

changes v3:
- fix build error in the middle of the patch stack.

changes v2:
- add regmap_ranges for KSZ9477
- drop output clock devicetree in driver validation patches. DTs need
  some more refactoring and can be done in a separate patch set.
- remove some unused variables.

This patch series adds error handling for the PHY read/write path and optional
register access validation.
After adding regmap_ranges for KSZ8563 some bugs was detected, so
critical bug fixes are sorted before ragmap_range patch.

Potentially this bug fixes can be ported to stable kernels, but need to be
reworked.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 21cb860c 32cbac21

drivers/net/dsa/microchip/ksz8.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ u32 ksz8_get_port_addr(int port, int offset); 
void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member);

void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port);

void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port);

void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);

void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val);

int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);

int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val);

int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,

			 u8 *fid, u8 *src_port, u8 *timestamp, u16 *entries);

int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr,

drivers/net/dsa/microchip/ksz8795.c

+87 −24
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static void ksz8_w_vlan_table(struct ksz_device *dev, u16 vid, u16 vlan) 
	ksz8_w_table(dev, TABLE_VLAN, addr, buf);

}



void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)

int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)

{

	u8 restart, speed, ctrl, link;

	int processed = true;
@@ -560,14 +560,24 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
	u8 val1, val2;

	u16 data = 0;

	u8 p = phy;

	int ret;



	regs = dev->info->regs;



	switch (reg) {

	case MII_BMCR:

		ksz_pread8(dev, p, regs[P_NEG_RESTART_CTRL], &restart);

		ksz_pread8(dev, p, regs[P_SPEED_STATUS], &speed);

		ksz_pread8(dev, p, regs[P_FORCE_CTRL], &ctrl);

		ret = ksz_pread8(dev, p, regs[P_NEG_RESTART_CTRL], &restart);

		if (ret)

			return ret;



		ret = ksz_pread8(dev, p, regs[P_SPEED_STATUS], &speed);

		if (ret)

			return ret;



		ret = ksz_pread8(dev, p, regs[P_FORCE_CTRL], &ctrl);

		if (ret)

			return ret;



		if (restart & PORT_PHY_LOOPBACK)

			data |= BMCR_LOOPBACK;

		if (ctrl & PORT_FORCE_100_MBIT)
@@ -597,7 +607,10 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
			data |= KSZ886X_BMCR_DISABLE_LED;

		break;

	case MII_BMSR:

		ksz_pread8(dev, p, regs[P_LINK_STATUS], &link);

		ret = ksz_pread8(dev, p, regs[P_LINK_STATUS], &link);

		if (ret)

			return ret;



		data = BMSR_100FULL |

		       BMSR_100HALF |

		       BMSR_10FULL |
@@ -618,7 +631,10 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
			data = KSZ8795_ID_LO;

		break;

	case MII_ADVERTISE:

		ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &ctrl);

		ret = ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &ctrl);

		if (ret)

			return ret;



		data = ADVERTISE_CSMA;

		if (ctrl & PORT_AUTO_NEG_SYM_PAUSE)

			data |= ADVERTISE_PAUSE_CAP;
@@ -632,7 +648,10 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
			data |= ADVERTISE_10HALF;

		break;

	case MII_LPA:

		ksz_pread8(dev, p, regs[P_REMOTE_STATUS], &link);

		ret = ksz_pread8(dev, p, regs[P_REMOTE_STATUS], &link);

		if (ret)

			return ret;



		data = LPA_SLCT;

		if (link & PORT_REMOTE_SYM_PAUSE)

			data |= LPA_PAUSE_CAP;
@@ -648,8 +667,14 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
			data |= LPA_LPACK;

		break;

	case PHY_REG_LINK_MD:

		ksz_pread8(dev, p, REG_PORT_LINK_MD_CTRL, &val1);

		ksz_pread8(dev, p, REG_PORT_LINK_MD_RESULT, &val2);

		ret = ksz_pread8(dev, p, REG_PORT_LINK_MD_CTRL, &val1);

		if (ret)

			return ret;



		ret = ksz_pread8(dev, p, REG_PORT_LINK_MD_RESULT, &val2);

		if (ret)

			return ret;



		if (val1 & PORT_START_CABLE_DIAG)

			data |= PHY_START_CABLE_DIAG;
@@ -664,7 +689,10 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
				FIELD_GET(PORT_CABLE_FAULT_COUNTER_L, val2));

		break;

	case PHY_REG_PHY_CTRL:

		ksz_pread8(dev, p, regs[P_LINK_STATUS], &link);

		ret = ksz_pread8(dev, p, regs[P_LINK_STATUS], &link);

		if (ret)

			return ret;



		if (link & PORT_MDIX_STATUS)

			data |= KSZ886X_CTRL_MDIX_STAT;

		break;
@@ -674,13 +702,16 @@ void ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) 
	}

	if (processed)

		*val = data;



	return 0;

}



void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)

int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)

{

	u8 restart, speed, ctrl, data;

	const u16 *regs;

	u8 p = phy;

	int ret;



	regs = dev->info->regs;
@@ -690,15 +721,26 @@ void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
		/* Do not support PHY reset function. */

		if (val & BMCR_RESET)

			break;

		ksz_pread8(dev, p, regs[P_SPEED_STATUS], &speed);

		ret = ksz_pread8(dev, p, regs[P_SPEED_STATUS], &speed);

		if (ret)

			return ret;



		data = speed;

		if (val & KSZ886X_BMCR_HP_MDIX)

			data |= PORT_HP_MDIX;

		else

			data &= ~PORT_HP_MDIX;

		if (data != speed)

			ksz_pwrite8(dev, p, regs[P_SPEED_STATUS], data);

		ksz_pread8(dev, p, regs[P_FORCE_CTRL], &ctrl);



		if (data != speed) {

			ret = ksz_pwrite8(dev, p, regs[P_SPEED_STATUS], data);

			if (ret)

				return ret;

		}



		ret = ksz_pread8(dev, p, regs[P_FORCE_CTRL], &ctrl);

		if (ret)

			return ret;



		data = ctrl;

		if (ksz_is_ksz88x3(dev)) {

			if ((val & BMCR_ANENABLE))
@@ -724,9 +766,17 @@ void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
			data |= PORT_FORCE_FULL_DUPLEX;

		else

			data &= ~PORT_FORCE_FULL_DUPLEX;

		if (data != ctrl)

			ksz_pwrite8(dev, p, regs[P_FORCE_CTRL], data);

		ksz_pread8(dev, p, regs[P_NEG_RESTART_CTRL], &restart);



		if (data != ctrl) {

			ret = ksz_pwrite8(dev, p, regs[P_FORCE_CTRL], data);

			if (ret)

				return ret;

		}



		ret = ksz_pread8(dev, p, regs[P_NEG_RESTART_CTRL], &restart);

		if (ret)

			return ret;



		data = restart;

		if (val & KSZ886X_BMCR_DISABLE_LED)

			data |= PORT_LED_OFF;
@@ -756,11 +806,19 @@ void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
			data |= PORT_PHY_LOOPBACK;

		else

			data &= ~PORT_PHY_LOOPBACK;

		if (data != restart)

			ksz_pwrite8(dev, p, regs[P_NEG_RESTART_CTRL], data);



		if (data != restart) {

			ret = ksz_pwrite8(dev, p, regs[P_NEG_RESTART_CTRL],

					  data);

			if (ret)

				return ret;

		}

		break;

	case MII_ADVERTISE:

		ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &ctrl);

		ret = ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &ctrl);

		if (ret)

			return ret;



		data = ctrl;

		data &= ~(PORT_AUTO_NEG_SYM_PAUSE |

			  PORT_AUTO_NEG_100BTX_FD |
@@ -777,8 +835,12 @@ void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
			data |= PORT_AUTO_NEG_10BT_FD;

		if (val & ADVERTISE_10HALF)

			data |= PORT_AUTO_NEG_10BT;

		if (data != ctrl)

			ksz_pwrite8(dev, p, regs[P_LOCAL_CTRL], data);



		if (data != ctrl) {

			ret = ksz_pwrite8(dev, p, regs[P_LOCAL_CTRL], data);

			if (ret)

				return ret;

		}

		break;

	case PHY_REG_LINK_MD:

		if (val & PHY_START_CABLE_DIAG)
@@ -787,6 +849,8 @@ void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
	default:

		break;

	}



	return 0;

}



void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)
@@ -1187,7 +1251,6 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) 
		if (i == dev->phy_port_cnt)

			break;

		p->on = 1;

		p->phy = 1;

	}

	for (i = 0; i < dev->phy_port_cnt; i++) {

		p = &dev->ports[i];

drivers/net/dsa/microchip/ksz9477.c

+34 −51
Original line number Diff line number Diff line
@@ -193,6 +193,11 @@ int ksz9477_reset_switch(struct ksz_device *dev) 
	ksz_write32(dev, REG_SW_PORT_INT_MASK__4, 0x7F);

	ksz_read32(dev, REG_SW_PORT_INT_STATUS__4, &data32);



	/* KSZ9893 compatible chips do not support refclk configuration */

	if (dev->chip_id == KSZ9893_CHIP_ID ||

	    dev->chip_id == KSZ8563_CHIP_ID)

		return 0;



	data8 = SW_ENABLE_REFCLKO;

	if (dev->synclko_disable)

		data8 = 0;
@@ -264,9 +269,20 @@ void ksz9477_port_init_cnt(struct ksz_device *dev, int port) 
	mutex_unlock(&mib->cnt_mutex);

}



void ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)

static void ksz9477_r_phy_quirks(struct ksz_device *dev, u16 addr, u16 reg,

				 u16 *data)

{

	/* KSZ8563R do not have extended registers but BMSR_ESTATEN and

	 * BMSR_ERCAP bits are set.

	 */

	if (dev->chip_id == KSZ8563_CHIP_ID && reg == MII_BMSR)

		*data &= ~(BMSR_ESTATEN | BMSR_ERCAP);

}



int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)

{

	u16 val = 0xffff;

	int ret;



	/* No real PHY after this. Simulate the PHY.

	 * A fixed PHY can be setup in the device tree, but this function is
@@ -274,7 +290,7 @@ void ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data) 
	 * For RGMII PHY there is no way to access it so the fixed PHY should

	 * be used.  For SGMII PHY the supporting code will be added later.

	 */

	if (addr >= dev->phy_port_cnt) {

	if (!dev->info->internal_phy[addr]) {

		struct ksz_port *p = &dev->ports[addr];



		switch (reg) {
@@ -307,23 +323,25 @@ void ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data) 
			break;

		}

	} else {

		ksz_pread16(dev, addr, 0x100 + (reg << 1), &val);

		ret = ksz_pread16(dev, addr, 0x100 + (reg << 1), &val);

		if (ret)

			return ret;



		ksz9477_r_phy_quirks(dev, addr, reg, &val);

	}



	*data = val;



	return 0;

}



void ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)

int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)

{

	/* No real PHY after this. */

	if (addr >= dev->phy_port_cnt)

		return;



	/* No gigabit support.  Do not write to this register. */

	if (!(dev->features & GBIT_SUPPORT) && reg == MII_CTRL1000)

		return;

	if (!dev->info->internal_phy[addr])

		return 0;



	ksz_pwrite16(dev, addr, 0x100 + (reg << 1), val);

	return ksz_pwrite16(dev, addr, 0x100 + (reg << 1), val);

}



void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member)
@@ -869,7 +887,7 @@ static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port) 
	phy_interface_t interface;

	bool gbit;



	if (port < dev->phy_port_cnt)

	if (dev->info->internal_phy[port])

		return PHY_INTERFACE_MODE_NA;



	gbit = ksz_get_gbit(dev, port);
@@ -914,7 +932,7 @@ static void ksz9477_phy_errata_setup(struct ksz_device *dev, int port) 
	/* Energy Efficient Ethernet (EEE) feature select must

	 * be manually disabled (except on KSZ8565 which is 100Mbit)

	 */

	if (dev->features & GBIT_SUPPORT)

	if (dev->info->gbit_capable[port])

		ksz9477_port_mmd_write(dev, port, 0x07, 0x3c, 0x0000);



	/* Register settings are required to meet data sheet
@@ -941,7 +959,7 @@ void ksz9477_get_caps(struct ksz_device *dev, int port, 
	config->mac_capabilities = MAC_10 | MAC_100 | MAC_ASYM_PAUSE |

				   MAC_SYM_PAUSE;



	if (dev->features & GBIT_SUPPORT)

	if (dev->info->gbit_capable[port])

		config->mac_capabilities |= MAC_1000FD;

}
@@ -976,7 +994,7 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) 
	/* enable 802.1p priority */

	ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);



	if (port < dev->phy_port_cnt) {

	if (dev->info->internal_phy[port]) {

		/* do not force flow control */

		ksz_port_cfg(dev, port, REG_PORT_CTRL_0,

			     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,
@@ -999,7 +1017,7 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) 
	ksz9477_cfg_port_member(dev, port, member);



	/* clear pending interrupts */

	if (port < dev->phy_port_cnt)

	if (dev->info->internal_phy[port])

		ksz_pread16(dev, port, REG_PORT_PHY_INT_ENABLE, &data16);

}
@@ -1051,25 +1069,13 @@ void ksz9477_config_cpu_port(struct dsa_switch *ds) 


			/* enable cpu port */

			ksz9477_port_setup(dev, i, true);

			p->on = 1;

		}

	}



	for (i = 0; i < dev->info->port_cnt; i++) {

		if (i == dev->cpu_port)

			continue;

		p = &dev->ports[i];



		ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED);

		p->on = 1;

		if (i < dev->phy_port_cnt)

			p->phy = 1;

		if (dev->chip_id == 0x00947700 && i == 6) {

			p->sgmii = 1;



			/* SGMII PHY detection code is not implemented yet. */

			p->phy = 0;

		}

	}

}
@@ -1158,29 +1164,6 @@ int ksz9477_switch_init(struct ksz_device *dev) 
	if (ret)

		return ret;



	ret = ksz_read8(dev, REG_GLOBAL_OPTIONS, &data8);

	if (ret)

		return ret;



	/* Number of ports can be reduced depending on chip. */

	dev->phy_port_cnt = 5;



	/* Default capability is gigabit capable. */

	dev->features = GBIT_SUPPORT;



	if (dev->chip_id == KSZ9893_CHIP_ID) {

		dev->features |= IS_9893;



		/* Chip does not support gigabit. */

		if (data8 & SW_QW_ABLE)

			dev->features &= ~GBIT_SUPPORT;

		dev->phy_port_cnt = 2;

	} else {

		/* Chip does not support gigabit. */

		if (!(data8 & SW_GIGABIT_ABLE))

			dev->features &= ~GBIT_SUPPORT;

	}



	return 0;

}

drivers/net/dsa/microchip/ksz9477.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ u32 ksz9477_get_port_addr(int port, int offset); 
void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member);

void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port);

void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port);

void ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data);

void ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);

int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data);

int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);

void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt);

void ksz9477_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,

		       u64 *dropped, u64 *cnt);

drivers/net/dsa/microchip/ksz_common.c

+445 −5

File changed.

Preview size limit exceeded, changes collapsed.