Commit 1fe94f54 authored by Arun Ramadoss's avatar Arun Ramadoss Committed by Paolo Abeni
Browse files

net: dsa: microchip: move get_phy_flags & mtu to ksz_common 



This patch assigns the get_phy_flags & mtu  hook of ksz8795 and ksz9477
in dsa_switch_ops to ksz_common.  For get_phy_flags hooks,checks whether
the chip is ksz8863/kss8793 then it returns error for port1.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent e587be75

drivers/net/dsa/microchip/ksz8795.c

+1 −13
Original line number Diff line number Diff line
@@ -898,18 +898,6 @@ static void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) 
	}

}



static u32 ksz8_sw_get_phy_flags(struct dsa_switch *ds, int port)

{

	/* Silicon Errata Sheet (DS80000830A):

	 * Port 1 does not work with LinkMD Cable-Testing.

	 * Port 1 does not respond to received PAUSE control frames.

	 */

	if (!port)

		return MICREL_KSZ8_P1_ERRATA;



	return 0;

}



static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)

{

	u8 data;
@@ -1470,7 +1458,7 @@ static void ksz8_get_caps(struct ksz_device *dev, int port, 


static const struct dsa_switch_ops ksz8_switch_ops = {

	.get_tag_protocol	= ksz_get_tag_protocol,

	.get_phy_flags		= ksz8_sw_get_phy_flags,

	.get_phy_flags		= ksz_get_phy_flags,

	.setup			= ksz8_setup,

	.phy_read		= ksz_phy_read16,

	.phy_write		= ksz_phy_write16,

drivers/net/dsa/microchip/ksz9477.c

+6 −5
Original line number Diff line number Diff line
@@ -47,9 +47,8 @@ static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset, 
			   bits, set ? bits : 0);

}



static int ksz9477_change_mtu(struct dsa_switch *ds, int port, int mtu)

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

{

	struct ksz_device *dev = ds->priv;

	u16 frame_size, max_frame = 0;

	int i;
@@ -65,7 +64,7 @@ static int ksz9477_change_mtu(struct dsa_switch *ds, int port, int mtu) 
				  REG_SW_MTU_MASK, max_frame);

}



static int ksz9477_max_mtu(struct dsa_switch *ds, int port)

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

{

	return KSZ9477_MAX_FRAME_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN;

}
@@ -1315,8 +1314,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { 
	.port_mirror_add	= ksz_port_mirror_add,

	.port_mirror_del	= ksz_port_mirror_del,

	.get_stats64		= ksz_get_stats64,

	.port_change_mtu	= ksz9477_change_mtu,

	.port_max_mtu		= ksz9477_max_mtu,

	.port_change_mtu	= ksz_change_mtu,

	.port_max_mtu		= ksz_max_mtu,

};



static u32 ksz9477_get_port_addr(int port, int offset)
@@ -1399,6 +1398,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { 
	.fdb_del = ksz9477_fdb_del,

	.mdb_add = ksz9477_mdb_add,

	.mdb_del = ksz9477_mdb_del,

	.change_mtu = ksz9477_change_mtu,

	.max_mtu = ksz9477_max_mtu,

	.shutdown = ksz9477_reset_switch,

	.init = ksz9477_switch_init,

	.exit = ksz9477_switch_exit,

drivers/net/dsa/microchip/ksz_common.c

+40 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/if_bridge.h>

#include <linux/of_device.h>

#include <linux/of_net.h>

#include <linux/micrel_phy.h>

#include <net/dsa.h>

#include <net/switchdev.h>
@@ -705,6 +706,23 @@ int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val) 
}

EXPORT_SYMBOL_GPL(ksz_phy_write16);



u32 ksz_get_phy_flags(struct dsa_switch *ds, int port)

{

	struct ksz_device *dev = ds->priv;



	if (dev->chip_id == KSZ8830_CHIP_ID) {

		/* Silicon Errata Sheet (DS80000830A):

		 * Port 1 does not work with LinkMD Cable-Testing.

		 * Port 1 does not respond to received PAUSE control frames.

		 */

		if (!port)

			return MICREL_KSZ8_P1_ERRATA;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ksz_get_phy_flags);



void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,

		       phy_interface_t interface)

{
@@ -984,6 +1002,28 @@ void ksz_port_mirror_del(struct dsa_switch *ds, int port, 
}

EXPORT_SYMBOL_GPL(ksz_port_mirror_del);



int ksz_change_mtu(struct dsa_switch *ds, int port, int mtu)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->change_mtu)

		return -EOPNOTSUPP;



	return dev->dev_ops->change_mtu(dev, port, mtu);

}

EXPORT_SYMBOL_GPL(ksz_change_mtu);



int ksz_max_mtu(struct dsa_switch *ds, int port)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->max_mtu)

		return -EOPNOTSUPP;



	return dev->dev_ops->max_mtu(dev, port);

}

EXPORT_SYMBOL_GPL(ksz_max_mtu);



static int ksz_switch_detect(struct ksz_device *dev)

{

	u8 id1, id2;

drivers/net/dsa/microchip/ksz_common.h

+5 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ struct ksz_dev_ops { 
		       struct dsa_db db);

	void (*get_caps)(struct ksz_device *dev, int port,

			 struct phylink_config *config);

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

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

	void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);

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

	int (*shutdown)(struct ksz_device *dev);
@@ -227,6 +229,7 @@ extern const struct ksz_chip_data ksz_switch_chips[]; 


int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg);

int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);

u32 ksz_get_phy_flags(struct dsa_switch *ds, int port);

void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,

		       phy_interface_t interface);

int ksz_sset_count(struct dsa_switch *ds, int port, int sset);
@@ -267,6 +270,8 @@ int ksz_port_mirror_add(struct dsa_switch *ds, int port, 
			bool ingress, struct netlink_ext_ack *extack);

void ksz_port_mirror_del(struct dsa_switch *ds, int port,

			 struct dsa_mall_mirror_tc_entry *mirror);

int ksz_change_mtu(struct dsa_switch *ds, int port, int mtu);

int ksz_max_mtu(struct dsa_switch *ds, int port);



/* Common register access functions */