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

Merge branch 'dsa-microchip-checking' 



Rakesh Sankaranarayanan says:

====================
net: dsa: microchip: ksz_pwrite status check for lan937x and irq and error checking updates for ksz series

This patch series include following changes,
- Add KSZ9563 inside ksz_switch_chips. As per current structure,
KSZ9893 is reused inside ksz_switch_chips structure, but since
there is a mismatch in number of irq's, new member added for KSZ9563
and sku detected based on Global Chip ID 4 Register. Compatible
string from device tree mapped to KSZ9563 for spi and i2c mode
probes.
- Assign device interrupt during i2c probe operation.
- Add error checking for ksz_pwrite inside lan937x_change_mtu. After v6.0,
ksz_pwrite updated to have return type int instead of void, and
lan937x_change_mtu still uses ksz_pwrite without status verification.
- Add port_nirq as 3 for KSZ8563 switch family.
- Use dev_err_probe() instead of dev_err() to have more standardized error
formatting and logging.

v1 -> v2:
- Removed regmap validation patch from the series, planning to take
  up in future after checking for any better approach and studying
  the actual need for this change.
- Resolved error reported in ksz8863_smi.c file.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 380f9acd 9b183317

drivers/net/dsa/microchip/ksz8863_smi.c

+4 −5
Original line number Diff line number Diff line
@@ -152,11 +152,10 @@ static int ksz8863_smi_probe(struct mdio_device *mdiodev) 
						  &regmap_smi[i], dev,

						  &rc);

		if (IS_ERR(dev->regmap[i])) {

			ret = PTR_ERR(dev->regmap[i]);

			dev_err(&mdiodev->dev,

				"Failed to initialize regmap%i: %d\n",

				ksz8863_regmap_config[i].val_bits, ret);

			return ret;

			return dev_err_probe(&mdiodev->dev,

					     PTR_ERR(dev->regmap[i]),

					     "Failed to initialize regmap%i\n",

					     ksz8863_regmap_config[i].val_bits);

		}

	}

drivers/net/dsa/microchip/ksz9477.c

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ int ksz9477_reset_switch(struct ksz_device *dev) 


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

	if (dev->chip_id == KSZ9893_CHIP_ID ||

	    dev->chip_id == KSZ8563_CHIP_ID)

	    dev->chip_id == KSZ8563_CHIP_ID ||

	    dev->chip_id == KSZ9563_CHIP_ID)

		return 0;



	data8 = SW_ENABLE_REFCLKO;

drivers/net/dsa/microchip/ksz9477_i2c.c

+6 −6
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ static int ksz9477_i2c_probe(struct i2c_client *i2c, 
		rc.lock_arg = &dev->regmap_mutex;

		dev->regmap[i] = devm_regmap_init_i2c(i2c, &rc);

		if (IS_ERR(dev->regmap[i])) {

			ret = PTR_ERR(dev->regmap[i]);

			dev_err(&i2c->dev,

				"Failed to initialize regmap%i: %d\n",

				ksz9477_regmap_config[i].val_bits, ret);

			return ret;

			return dev_err_probe(&i2c->dev, PTR_ERR(dev->regmap[i]),

					     "Failed to initialize regmap%i\n",

					     ksz9477_regmap_config[i].val_bits);

		}

	}



	if (i2c->dev.platform_data)

		dev->pdata = i2c->dev.platform_data;



	dev->irq = i2c->irq;



	ret = ksz_switch_register(dev);



	/* Main DSA driver may not be started yet. */
@@ -101,7 +101,7 @@ static const struct of_device_id ksz9477_dt_ids[] = { 
	},

	{

		.compatible = "microchip,ksz9563",

		.data = &ksz_switch_chips[KSZ9893]

		.data = &ksz_switch_chips[KSZ9563]

	},

	{

		.compatible = "microchip,ksz8563",

drivers/net/dsa/microchip/ksz_common.c

+32 −2
Original line number Diff line number Diff line
@@ -1039,6 +1039,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.num_statics = 16,

		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 3,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1282,6 +1283,31 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.gbit_capable = {true, true, true},

	},



	[KSZ9563] = {

		.chip_id = KSZ9563_CHIP_ID,

		.dev_name = "KSZ9563",

		.num_vlans = 4096,

		.num_alus = 4096,

		.num_statics = 16,

		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 3,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.regs = ksz9477_regs,

		.masks = ksz9477_masks,

		.shifts = ksz9477_shifts,

		.xmii_ctrl0 = ksz9477_xmii_ctrl0,

		.xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */

		.supports_mii = {false, false, true},

		.supports_rmii = {false, false, true},

		.supports_rgmii = {false, false, true},

		.internal_phy = {true, true, false},

		.gbit_capable = {true, true, true},

	},



	[KSZ9567] = {

		.chip_id = KSZ9567_CHIP_ID,

		.dev_name = "KSZ9567",
@@ -2389,7 +2415,8 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, 


	if (dev->chip_id == KSZ8830_CHIP_ID ||

	    dev->chip_id == KSZ8563_CHIP_ID ||

	    dev->chip_id == KSZ9893_CHIP_ID)

	    dev->chip_id == KSZ9893_CHIP_ID ||

	    dev->chip_id == KSZ9563_CHIP_ID)

		proto = DSA_TAG_PROTO_KSZ9893;



	if (dev->chip_id == KSZ9477_CHIP_ID ||
@@ -2509,7 +2536,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int port, 
		data8 |= bitval[P_RGMII_SEL];

		/* On KSZ9893, disable RGMII in-band status support */

		if (dev->chip_id == KSZ9893_CHIP_ID ||

		    dev->chip_id == KSZ8563_CHIP_ID)

		    dev->chip_id == KSZ8563_CHIP_ID ||

		    dev->chip_id == KSZ9563_CHIP_ID)

			data8 &= ~P_MII_MAC_MODE;

		break;

	default:
@@ -2782,6 +2810,8 @@ static int ksz_switch_detect(struct ksz_device *dev) 


			if (id4 == SKU_ID_KSZ8563)

				dev->chip_id = KSZ8563_CHIP_ID;

			else if (id4 == SKU_ID_KSZ9563)

				dev->chip_id = KSZ9563_CHIP_ID;

			else

				dev->chip_id = KSZ9893_CHIP_ID;

drivers/net/dsa/microchip/ksz_common.h

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ enum ksz_model { 
	KSZ9896,

	KSZ9897,

	KSZ9893,

	KSZ9563,

	KSZ9567,

	LAN9370,

	LAN9371,
@@ -172,6 +173,7 @@ enum ksz_chip_id { 
	KSZ9896_CHIP_ID = 0x00989600,

	KSZ9897_CHIP_ID = 0x00989700,

	KSZ9893_CHIP_ID = 0x00989300,

	KSZ9563_CHIP_ID = 0x00956300,

	KSZ9567_CHIP_ID = 0x00956700,

	LAN9370_CHIP_ID = 0x00937000,

	LAN9371_CHIP_ID = 0x00937100,
@@ -551,6 +553,7 @@ static inline int is_lan937x(struct ksz_device *dev) 
/* KSZ9893, KSZ9563, KSZ8563 specific register  */

#define REG_CHIP_ID4			0x0f

#define SKU_ID_KSZ8563			0x3c

#define SKU_ID_KSZ9563			0x1c



/* Driver set switch broadcast storm protection at 10% rate. */

#define BROADCAST_STORM_PROT_RATE	10