implement microchip,no-tag-protocol flag
Subsystems (5)
cover implement microchip,no-tag-protocol flag
From: Pieter Van Trappen <[email protected]>
Add and implement microchip,no-tag-protocol flag to allow disabling the switch' tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
This code was tested with a KSZ8794 chip.
Pieter Van Trappen (2):
dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
net: dsa: microchip: implement microchip,no-tag-protocol flag
.../devicetree/bindings/net/dsa/microchip,ksz.yaml | 5 +++++ drivers/net/dsa/microchip/ksz8795.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 11 ++++++++--- drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-)
base-commit: 0a658d088cc63745528cf0ec8a2c2df0f37742d9
Signature · 1 line
2.43.0
PATCH 1/2 dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
From: Pieter Van Trappen <[email protected]>
Add microchip,no-tag-protocol flag to allow disabling the switch' tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
--- Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml +5 -0
@@ -45,6 +45,11 @@ properties: description: Set if the output SYNCLKO frequency should be set to 125MHz instead of 25MHz. + microchip,no-tag-protocol: + $ref: /schemas/types.yaml#/definitions/flag + description: + Set if no switch tag protocol should be enabled. + microchip,synclko-disable: $ref: /schemas/types.yaml#/definitions/flag description:
Signature · 1 line
2.43.0
Rob Herring
maintainerRe: [PATCH net-next 1/2] dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
Quoted 3 lines · On Thu, Aug 01, 2024 at 02:31:42PM +0200, [email protected] wrote:
From: Pieter Van Trappen <[email protected]>
Add microchip,no-tag-protocol flag to allow disabling the switch'
What is the ' for?
Quoted 2 lines
tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
What is "switch tag protocol"? Not defined anywhere? Is that VLAN tagging?
It seems to me that this doesn't need to be in DT. You know you have Zynq GEM because it should have a specific compatible. If it doesn't support some feature, then that should get propagated to the switch somehow.
Rob
Re: [PATCH net-next 1/2] dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
Quoted 7 lines · Rob Herring
Quoted 3 lines · On Thu, Aug 01, 2024 at 02:31:42PM +0200, [email protected] wrote:
From: Pieter Van Trappen <[email protected]>
Add microchip,no-tag-protocol flag to allow disabling the switch'
What is the ' for?
Typo
Quoted 11 lines
Quoted 3 lines
tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
What is "switch tag protocol"? Not defined anywhere? Is that VLAN tagging?
It seems to me that this doesn't need to be in DT. You know you have Zynq GEM because it should have a specific compatible. If it doesn't support some feature, then that should get propagated to the switch somehow.
Hi Rob, indeed and as indicated by Vladimir Oltean in a reply to this patch, such a property exists already, dsa-port's dsa-tag-protocol.
Driver support is to be added but rather I'm changing the Zynq GEM driver to support MTU > 1500 as in fact it turns our the harware does.
Pieter
Quoted 2 lines
Rob
PATCH 2/2 net: dsa: microchip: implement microchip,no-tag-protocol flag
In reply to [email protected]From: Pieter Van Trappen <[email protected]>
Implement microchip,no-tag-protocol flag to allow disabling the switch' tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
This code was tested with a KSZ8794 chip.
--- drivers/net/dsa/microchip/ksz8795.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 11 ++++++++--- drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -1
@@ -1604,7 +1604,7 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) masks = dev->info->masks; regs = dev->info->regs; -ksz_cfg (dev, regs[S_TAIL_TAG_CTRL ], masks[SW_TAIL_TAG_ENABLE ], true); +ksz_cfg (dev, regs[S_TAIL_TAG_CTRL ], masks[SW_TAIL_TAG_ENABLE ], !dev->no_tag_proto);ksz8_port_setup (dev, dev->cpu_port, true);
drivers/net/dsa/microchip/ksz9477.c +1 -1
@@ -1195,7 +1195,7 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)/* enable tag tail for host port */ if (cpu_port)ksz_port_cfg (dev, port,REG_PORT_CTRL_0 ,PORT_TAIL_TAG_ENABLE , - true); + !dev->no_tag_proto);ksz9477_port_queue_split (dev, port);
drivers/net/dsa/microchip/ksz_common.c +8 -3
@@ -2882,9 +2882,7 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,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 ) +if (ksz_is_ksz87xx (dev)) proto =DSA_TAG_PROTO_KSZ8795 ; if (dev->chip_id == KSZ8830_CHIP_ID ||
@@ -2903,6 +2901,9 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,if (is_lan937x (dev)) proto =DSA_TAG_PROTO_LAN937X ; +if (dev->no_tag_proto) + proto =DSA_TAG_PROTO_NONE ; +return proto; }
@@ -2912,6 +2913,8 @@ static int ksz_connect_tag_protocol(struct dsa_switch *ds,struct ksz_tagger_data *tagger_data;switch (proto) { +case DSA_TAG_PROTO_NONE : +return 0 ;case DSA_TAG_PROTO_KSZ8795 :return 0 ;case DSA_TAG_PROTO_KSZ9893 :
@@ -4459,6 +4462,8 @@ int ksz_switch_register(struct ksz_device *dev) dev->wakeup_source =of_property_read_bool (dev->dev->of_node,"wakeup-source" ); + dev->no_tag_proto =of_property_read_bool (dev->dev->of_node, +"microchip,no-tag-protocol" ); } ret =dsa_register_switch (dev->ds);
drivers/net/dsa/microchip/ksz_common.h +1 -0
@@ -174,6 +174,7 @@ struct ksz_device {bool synclko_125;bool synclko_disable;bool wakeup_source; +bool no_tag_proto;struct vlan_table *vlan_cache;
drivers/net/dsa/microchip/lan937x_main.c +1 -1
@@ -182,7 +182,7 @@ void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port)/* enable tag tail for host port */ if (cpu_port)lan937x_port_cfg (dev, port,REG_PORT_CTRL_0 , -PORT_TAIL_TAG_ENABLE , true); +PORT_TAIL_TAG_ENABLE , !dev->no_tag_proto);/* Enable the Port Queue split */ ksz9477_port_queue_split (dev, port);
Signature · 1 line
2.43.0
Hi Pieter,
Quoted 21 lines · On Thu, Aug 01, 2024 at 02:31:41PM +0200, [email protected] wrote:
From: Pieter Van Trappen <[email protected]>
Add and implement microchip,no-tag-protocol flag to allow disabling the switch' tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
This code was tested with a KSZ8794 chip.
Pieter Van Trappen (2):
dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
net: dsa: microchip: implement microchip,no-tag-protocol flag.../devicetree/bindings/net/dsa/microchip,ksz.yaml | 5 +++++ drivers/net/dsa/microchip/ksz8795.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 11 ++++++++--- drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-)
Quoted 3 lines
base-commit:
0a658d088cc63745528cf0ec8a2c2df0f37742d9Signature · 1 line
2.43.0
Please use ./scripts/get_maintainer.pl when generating the To: and Cc: fields.
Not to say that they don't exist, but I have never seen a NIC where MTU=1500 is the absolute hard upper limit. How seriously did you study this before determining that it is impossible to raise that? We're talking about one byte for the tail tag, FWIW.
There are also alternative paths to explore, like reducing the DSA user ports MTU to 1499. This is currently not done when dev_set_mtu() fails on the conduit, because Andrew said in the past it's likelier that the conduit is coded to accept up to 1500 but will still work for small oversized packets.
Disabling DSA tagging is a very heavy hammer, because it cuts off a whole lot of functionality (the driver should no longer accept PTP hwtimestamping ioctls, etc), so the patch set gets this tag from me currently, due to very shallow justification:
Please carry it forward if you choose to resubmit.
Even assuming that a strong justification does exists, there already exists a mechanism for disabling the tagging protocol from the device tree. It is the same as for specifying any other alternative tagging protocol (applied in this case to DSA_TAG_PROTO_NONE).
ethernet-switch@N {
dsa-tag-protocol = "none";
};it just needs implementing in the driver.
The fact that you chose to add a custom device tree property suggests to me that you did not investigate the problem space very seriously.
Vladimir Oltean
maintainerQuoted 3 lines · Vladimir Oltean
ethernet-switch@N {
dsa-tag-protocol = "none";
};My mistake - this was supposed to be:
ethernet-switch@N {
ethernet-ports {
/* This is the CPU port */
ethernet-port@0 {
ethernet = <&conduit>;
dsa-tag-protocol = "none";
};
};
};Quoted 41 lines · Vladimir Oltean
Hi Pieter,
Quoted 21 lines · On Thu, Aug 01, 2024 at 02:31:41PM +0200, [email protected] wrote:
From: Pieter Van Trappen <[email protected]>
Add and implement microchip,no-tag-protocol flag to allow disabling the switch' tagging protocol. For cases where the CPU MAC does not support MTU size > 1500 such as the Zynq GEM.
This code was tested with a KSZ8794 chip.
Pieter Van Trappen (2):
dt-bindings: net: dsa: microchip: add microchip,no-tag-protocol flag
net: dsa: microchip: implement microchip,no-tag-protocol flag.../devicetree/bindings/net/dsa/microchip,ksz.yaml | 5 +++++ drivers/net/dsa/microchip/ksz8795.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 11 ++++++++--- drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-)Quoted 3 lines
base-commit:
0a658d088cc63745528cf0ec8a2c2df0f37742d9--
2.43.0Please use
./scripts/get_maintainer.plwhen generating the To: and Cc: fields.Not to say that they don't exist, but I have never seen a NIC where MTU=1500 is the absolute hard upper limit. How seriously did you study this before determining that it is impossible to raise that? We're talking about one byte for the tail tag, FWIW.
There are also alternative paths to explore, like reducing the DSA user ports MTU to 1499. This is currently not done when
dev_set_mtu()fails on the conduit, because Andrew said in the past it's likelier that the conduit is coded to accept up to 1500 but will still work for small oversized packets.
Quoted 8 lines
Disabling DSA tagging is a very heavy hammer, because it cuts off a whole lot of functionality (the driver should no longer accept PTP hwtimestamping ioctls, etc), so the patch set gets this tag from me currently, due to very shallow justification:
Nacked-by Vladimir Oltean <[email protected]>Please carry it forward if you choose to resubmit.
Hi Vladimir,
I do understand your reservation for this path, it defeats most of the advantages
of DSA but I still do need the driver to handle the PHYs over SPI and for the WoL functionality; using the switch in a bridge configuration. My reason for mainlining is that I though there might be more people like me in a similar situation.
This is actually an older issue and solution of mine so inspired by your comment I revisited the documentation and indeed hardware-wise I can't find back the MTU limitation. I see now that it's actually a limitation of the macb driver [1] so I will try to rework this one instead. Or implement dsa-tag-protocol as you propose. Or event better, both!
Patch can be thus be cancelled, sorry for the spam.
Cheers, Pieter
[1]: https://elixir.bootlin.com/linux/v6.11-rc1/source/drivers/net/ethernet/cadence/macb_main.c#L5127