Commit 534a0431 authored by Arun Ramadoss's avatar Arun Ramadoss Committed by Paolo Abeni
Browse files

net: dsa: microchip: move tag_protocol to ksz_common 



This patch move the dsa hook get_tag_protocol to ksz_common file. And
the tag_protocol is returned based on the dev->chip_id.

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

drivers/net/dsa/microchip/ksz8795.c

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

}



static enum dsa_tag_protocol ksz8_get_tag_protocol(struct dsa_switch *ds,

						   int port,

						   enum dsa_tag_protocol mp)

{

	struct ksz_device *dev = ds->priv;



	/* ksz88x3 uses the same tag schema as KSZ9893 */

	return ksz_is_ksz88x3(dev) ?

		DSA_TAG_PROTO_KSZ9893 : DSA_TAG_PROTO_KSZ8795;

}



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

{

	/* Silicon Errata Sheet (DS80000830A):
@@ -1394,7 +1383,7 @@ static void ksz8_get_caps(struct dsa_switch *ds, int port, 
}



static const struct dsa_switch_ops ksz8_switch_ops = {

	.get_tag_protocol	= ksz8_get_tag_protocol,

	.get_tag_protocol	= ksz_get_tag_protocol,

	.get_phy_flags		= ksz8_sw_get_phy_flags,

	.setup			= ksz8_setup,

	.phy_read		= ksz_phy_read16,

drivers/net/dsa/microchip/ksz9477.c

+1 −13
Original line number Diff line number Diff line
@@ -276,18 +276,6 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port) 
	mutex_unlock(&mib->cnt_mutex);

}



static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,

						      int port,

						      enum dsa_tag_protocol mp)

{

	enum dsa_tag_protocol proto = DSA_TAG_PROTO_KSZ9477;

	struct ksz_device *dev = ds->priv;



	if (dev->features & IS_9893)

		proto = DSA_TAG_PROTO_KSZ9893;

	return proto;

}



static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)

{

	struct ksz_device *dev = ds->priv;
@@ -1326,7 +1314,7 @@ static int ksz9477_setup(struct dsa_switch *ds) 
}



static const struct dsa_switch_ops ksz9477_switch_ops = {

	.get_tag_protocol	= ksz9477_get_tag_protocol,

	.get_tag_protocol	= ksz_get_tag_protocol,

	.setup			= ksz9477_setup,

	.phy_read		= ksz9477_phy_read16,

	.phy_write		= ksz9477_phy_write16,

drivers/net/dsa/microchip/ksz_common.c

+24 −0
Original line number Diff line number Diff line
@@ -930,6 +930,30 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, 
}

EXPORT_SYMBOL_GPL(ksz_port_stp_state_set);



enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,

					   int port, enum dsa_tag_protocol mp)

{

	struct ksz_device *dev = ds->priv;

	enum dsa_tag_protocol proto = DSA_TAG_PROTO_NONE;



	if (dev->chip_id == KSZ8795_CHIP_ID ||

	    dev->chip_id == KSZ8794_CHIP_ID ||

	    dev->chip_id == KSZ8765_CHIP_ID)

		proto = DSA_TAG_PROTO_KSZ8795;



	if (dev->chip_id == KSZ8830_CHIP_ID ||

	    dev->chip_id == KSZ9893_CHIP_ID)

		proto = DSA_TAG_PROTO_KSZ9893;



	if (dev->chip_id == KSZ9477_CHIP_ID ||

	    dev->chip_id == KSZ9897_CHIP_ID ||

	    dev->chip_id == KSZ9567_CHIP_ID)

		proto = DSA_TAG_PROTO_KSZ9477;



	return proto;

}

EXPORT_SYMBOL_GPL(ksz_get_tag_protocol);



static int ksz_switch_detect(struct ksz_device *dev)

{

	u8 id1, id2;

drivers/net/dsa/microchip/ksz_common.h

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ int ksz_port_mdb_del(struct dsa_switch *ds, int port, 
int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);

void ksz_get_strings(struct dsa_switch *ds, int port,

		     u32 stringset, uint8_t *buf);

enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,

					   int port, enum dsa_tag_protocol mp);



/* Common register access functions */