Commit 1ccc4072 authored by Daniel Golle's avatar Daniel Golle Committed by Jakub Kicinski
Browse files

net: dsa: lantiq_gswip: make DSA tag protocol model-specific 



While the older Lantiq / Intel which are currently supported all use
the DSA_TAG_GSWIP tagging protocol, newer MaxLinear GSW1xx modules use
another 8-byte tagging protocol. Move the tag protocol information to
struct gswip_hw_info to make it possible for new models to specify
a different tagging protocol.

Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/841281b62fdb472048fa98fbad6c88dfbf512825.1755878232.git.daniel@makrotopia.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2e5311d3

drivers/net/dsa/lantiq_gswip.c

+5 −1
Original line number Diff line number Diff line
@@ -659,7 +659,9 @@ static enum dsa_tag_protocol gswip_get_tag_protocol(struct dsa_switch *ds, 
						    int port,

						    enum dsa_tag_protocol mp)

{

	return DSA_TAG_PROTO_GSWIP;

	struct gswip_priv *priv = ds->priv;



	return priv->hw_info->tag_protocol;

}



static int gswip_vlan_active_create(struct gswip_priv *priv,
@@ -2002,6 +2004,7 @@ static const struct gswip_hw_info gswip_xrx200 = { 
	.phylink_get_caps = gswip_xrx200_phylink_get_caps,

	.pce_microcode = &gswip_pce_microcode,

	.pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),

	.tag_protocol = DSA_TAG_PROTO_GSWIP,

};



static const struct gswip_hw_info gswip_xrx300 = {
@@ -2011,6 +2014,7 @@ static const struct gswip_hw_info gswip_xrx300 = { 
	.phylink_get_caps = gswip_xrx300_phylink_get_caps,

	.pce_microcode = &gswip_pce_microcode,

	.pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),

	.tag_protocol = DSA_TAG_PROTO_GSWIP,

};



static const struct of_device_id gswip_of_match[] = {

drivers/net/dsa/lantiq_gswip.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct gswip_hw_info { 
	unsigned int mii_ports;

	const struct gswip_pce_microcode (*pce_microcode)[];

	size_t pce_microcode_size;

	enum dsa_tag_protocol tag_protocol;

	void (*phylink_get_caps)(struct dsa_switch *ds, int port,

				 struct phylink_config *config);

};