net: dsa: lantiq_gswip: make DSA tag protocol model-specific
Subsystems (3)
RFC PATCH 7/23 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 Daniel Golle <[email protected]>
--- drivers/net/dsa/lantiq_gswip.c | 6 +++++- drivers/net/dsa/lantiq_gswip.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/dsa/lantiq_gswip.c +5 -1
@@ -660,7 +660,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,
@@ -2013,6 +2015,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 = {
@@ -2023,6 +2026,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
@@ -229,6 +229,7 @@ struct gswip_hw_info {unsigned int sgmii_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); };
Signature · 1 line
2.50.1
Quoted 7 lines · Daniel Golle
While the older Lantiq / Intel which are currently supported all use the
DSA_TAG_GSWIPtagging protocol, newer MaxLinear GSW1xx modules use another 8-byte tagging protocol. Move the tag protocol information to structgswip_hw_infoto make it possible for new models to specify a different tagging protocol.Signed-off-by Daniel Golle <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Andrew