Commit f82389ee authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-dsa-microchip-add-mtu-support-for-ksz8-series' 

Oleksij Rempel says:

====================
net: dsa: microchip: add MTU support for KSZ8 series
====================

Link: https://lore.kernel.org/r/20221205052232.2834166-1-o.rempel@pengutronix.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents e22dcbc9 55a952ee

drivers/net/dsa/microchip/ksz8.h

+1 −0
Original line number Diff line number Diff line
@@ -57,5 +57,6 @@ int ksz8_reset_switch(struct ksz_device *dev); 
int ksz8_switch_detect(struct ksz_device *dev);

int ksz8_switch_init(struct ksz_device *dev);

void ksz8_switch_exit(struct ksz_device *dev);

int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu);



#endif

drivers/net/dsa/microchip/ksz8795.c

+63 −12
Original line number Diff line number Diff line
@@ -76,6 +76,57 @@ int ksz8_reset_switch(struct ksz_device *dev) 
	return 0;

}



static int ksz8863_change_mtu(struct ksz_device *dev, int frame_size)

{

	u8 ctrl2 = 0;



	if (frame_size <= KSZ8_LEGAL_PACKET_SIZE)

		ctrl2 |= KSZ8863_LEGAL_PACKET_ENABLE;

	else if (frame_size > KSZ8863_NORMAL_PACKET_SIZE)

		ctrl2 |= KSZ8863_HUGE_PACKET_ENABLE;



	return ksz_rmw8(dev, REG_SW_CTRL_2, KSZ8863_LEGAL_PACKET_ENABLE |

			KSZ8863_HUGE_PACKET_ENABLE, ctrl2);

}



static int ksz8795_change_mtu(struct ksz_device *dev, int frame_size)

{

	u8 ctrl1 = 0, ctrl2 = 0;

	int ret;



	if (frame_size > KSZ8_LEGAL_PACKET_SIZE)

		ctrl2 |= SW_LEGAL_PACKET_DISABLE;

	else if (frame_size > KSZ8863_NORMAL_PACKET_SIZE)

		ctrl1 |= SW_HUGE_PACKET;



	ret = ksz_rmw8(dev, REG_SW_CTRL_1, SW_HUGE_PACKET, ctrl1);

	if (ret)

		return ret;



	return ksz_rmw8(dev, REG_SW_CTRL_2, SW_LEGAL_PACKET_DISABLE, ctrl2);

}



int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu)

{

	u16 frame_size;



	if (!dsa_is_cpu_port(dev->ds, port))

		return 0;



	frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;



	switch (dev->chip_id) {

	case KSZ8795_CHIP_ID:

	case KSZ8794_CHIP_ID:

	case KSZ8765_CHIP_ID:

		return ksz8795_change_mtu(dev, frame_size);

	case KSZ8830_CHIP_ID:

		return ksz8863_change_mtu(dev, frame_size);

	}



	return -EOPNOTSUPP;

}



static void ksz8795_set_prio_queue(struct ksz_device *dev, int port, int queue)

{

	u8 hi, lo;
@@ -1233,8 +1284,6 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) 
	masks = dev->info->masks;

	regs = dev->info->regs;



	/* Switch marks the maximum frame with extra byte as oversize. */

	ksz_cfg(dev, REG_SW_CTRL_2, SW_LEGAL_PACKET_DISABLE, true);

	ksz_cfg(dev, regs[S_TAIL_TAG_CTRL], masks[SW_TAIL_TAG_ENABLE], true);



	p = &dev->ports[dev->cpu_port];
@@ -1308,6 +1357,18 @@ int ksz8_setup(struct dsa_switch *ds) 
	struct ksz_device *dev = ds->priv;

	int i;



	ds->mtu_enforcement_ingress = true;



	/* We rely on software untagging on the CPU port, so that we

	 * can support both tagged and untagged VLANs

	 */

	ds->untag_bridge_pvid = true;



	/* VLAN filtering is partly controlled by the global VLAN

	 * Enable flag

	 */

	ds->vlan_filtering_is_global = true;



	ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);



	/* Enable automatic fast aging when link changed detected. */
@@ -1367,16 +1428,6 @@ int ksz8_switch_init(struct ksz_device *dev) 
	dev->phy_port_cnt = dev->info->port_cnt - 1;

	dev->port_mask = (BIT(dev->phy_port_cnt) - 1) | dev->info->cpu_ports;



	/* We rely on software untagging on the CPU port, so that we

	 * can support both tagged and untagged VLANs

	 */

	dev->ds->untag_bridge_pvid = true;



	/* VLAN filtering is partly controlled by the global VLAN

	 * Enable flag

	 */

	dev->ds->vlan_filtering_is_global = true;



	return 0;

}

drivers/net/dsa/microchip/ksz8795_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 
#define NO_EXC_COLLISION_DROP		BIT(3)

#define SW_LEGAL_PACKET_DISABLE		BIT(1)



#define KSZ8863_HUGE_PACKET_ENABLE	BIT(2)

#define KSZ8863_LEGAL_PACKET_ENABLE	BIT(1)



#define REG_SW_CTRL_3			0x05

 #define WEIGHTED_FAIR_QUEUE_ENABLE	BIT(3)

drivers/net/dsa/microchip/ksz9477.c

+7 −14
Original line number Diff line number Diff line
@@ -45,24 +45,15 @@ static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset, 


int ksz9477_change_mtu(struct ksz_device *dev, int port, int mtu)

{

	u16 frame_size, max_frame = 0;

	int i;



	frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;

	u16 frame_size;



	/* Cache the per-port MTU setting */

	dev->ports[port].max_frame = frame_size;

	if (!dsa_is_cpu_port(dev->ds, port))

		return 0;



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

		max_frame = max(max_frame, dev->ports[i].max_frame);

	frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;



	return regmap_update_bits(dev->regmap[1], REG_SW_MTU__2,

				  REG_SW_MTU_MASK, max_frame);

}



int ksz9477_max_mtu(struct ksz_device *dev, int port)

{

	return KSZ9477_MAX_FRAME_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN;

				  REG_SW_MTU_MASK, frame_size);

}



static int ksz9477_wait_vlan_ctrl_ready(struct ksz_device *dev)
@@ -1143,6 +1134,8 @@ int ksz9477_setup(struct dsa_switch *ds) 
	struct ksz_device *dev = ds->priv;

	int ret = 0;



	ds->mtu_enforcement_ingress = true;



	/* Required for port partitioning. */

	ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY,

		      true);

drivers/net/dsa/microchip/ksz9477.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ int ksz9477_mdb_add(struct ksz_device *dev, int port, 
int ksz9477_mdb_del(struct ksz_device *dev, int port,

		    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);

int ksz9477_change_mtu(struct ksz_device *dev, int port, int mtu);

int ksz9477_max_mtu(struct ksz_device *dev, int port);

void ksz9477_config_cpu_port(struct dsa_switch *ds);

int ksz9477_enable_stp_addr(struct ksz_device *dev);

int ksz9477_reset_switch(struct ksz_device *dev);