| Message ID | 20190429001706.7449-1-olteanv@gmail.com |
|---|---|
| Headers | show |
| Series | NXP SJA1105 DSA driver | expand |
From: Vladimir Oltean <olteanv@gmail.com> Date: Mon, 29 Apr 2019 03:16:54 +0300 > This patchset adds a DSA driver for the SPI-controlled NXP SJA1105 > switch. This patch series adds many whitespace errors, which are all reported by GIT when I try to apply your changes: Applying: lib: Add support for generic packing operations .git/rebase-apply/patch:176: new blank line at EOF. + .git/rebase-apply/patch:480: new blank line at EOF. + warning: 2 lines add whitespace errors. Applying: net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch .git/rebase-apply/patch:102: new blank line at EOF. + .git/rebase-apply/patch:117: new blank line at EOF. + .git/rebase-apply/patch:262: new blank line at EOF. + .git/rebase-apply/patch:867: new blank line at EOF. + .git/rebase-apply/patch:2905: new blank line at EOF. + warning: squelched 2 whitespace errors warning: 7 lines add whitespace errors. Applying: net: dsa: sja1105: Add support for FDB and MDB management .git/rebase-apply/patch:81: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: net: dsa: sja1105: Error out if RGMII delays are requested in DT Applying: ether: Add dedicated Ethertype for pseudo-802.1Q DSA tagging Applying: net: dsa: sja1105: Add support for VLAN operations .git/rebase-apply/patch:359: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: net: dsa: sja1105: Add support for ethtool port counters .git/rebase-apply/patch:474: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: net: dsa: sja1105: Add support for configuring address aging time Applying: net: dsa: sja1105: Prevent PHY jabbering during switch reset Applying: net: dsa: sja1105: Reject unsupported link modes for AN Applying: Documentation: net: dsa: Add details about NXP SJA1105 driver .git/rebase-apply/patch:200: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: dt-bindings: net: dsa: Add documentation for NXP SJA1105 driver .git/rebase-apply/patch:178: new blank line at EOF. + warning: 1 line adds whitespace errors.
On Mon, 29 Apr 2019 at 03:18, Vladimir Oltean <olteanv@gmail.com> wrote: > > This patchset adds a DSA driver for the SPI-controlled NXP SJA1105 > switch. Due to the hardware's unfriendliness, most of its state needs > to be shadowed in kernel memory by the driver. To support this and keep > a decent amount of cleanliness in the code, a new generic API for > converting between CPU-accessible ("unpacked") structures and > hardware-accessible ("packed") structures is proposed and used. > > The driver is GPL-2.0 licensed. The source code files which are licensed > as BSD-3-Clause are hardware support files and derivative of the > userspace NXP sja1105-tool program, which is BSD-3-Clause licensed. > > TODO items: > * Add support for traffic. > * Add full support for the P/Q/R/S series. The patches were mostly > tested on a first-generation T device. > * Add timestamping support and PTP clock manipulation. > * Figure out how the tc-taprio hardware offload that was just proposed > by Vinicius can be used to configure the switch's time-aware scheduler. > * Rework link state callbacks to use phylink once the SGMII port > is supported. > > Changes in v4: > 1. Previous patchset was broken apart, and for the moment the driver is > configuring the switch as unmanaged. Support for regular and management > traffic, as well as for PTP timestamping, will be submitted once the > basic driver is accepted. Some core DSA patches were also broken out > of the series, and are a dependency for this series: > https://patchwork.ozlabs.org/project/netdev/list/?series=105069 > 2. Addressed Jiri Pirko's feedback about too generic function and macro > naming. > 3. Re-introduced ETH_P_DSA_8021Q. > > v3 patchset can be found at: > https://lkml.org/lkml/2019/4/12/978 > > Changes in v3: > 1. Removed the patch for a dedicated Ethertype to use with 802.1Q DSA > tagging > 2. Changed the SJA1105 switch tagging protocol sysfs label from > "sja1105" to "8021q" to denote to users such as tcpdump that the > structure is more generic. > 3. Respun previous patch "net: dsa: Allow drivers to modulate between > presence and absence of tagging". Current equivalent patch is called > "net: dsa: Allow drivers to filter packets they can decode source > port from" and at least allows reception of management traffic during > the time when switch tagging is not enabled. > 4. Added DSA-level fixes for the bridge core not unsetting > vlan_filtering when ports leave. The global VLAN filtering is treated > as a special case. Made the mt7530 driver use this. This patch > benefits the SJA1105 because otherwise traffic in standalone mode > would no longer work after removing the ports from a vlan_filtering > bridge, since the driver and the hardware would be in an inconsistent > state. > 5. Restructured the documentation as rst. This depends upon the recently > submitted "[PATCH net-next] Documentation: net: dsa: transition to > the rst format": https://patchwork.ozlabs.org/patch/1084658/. > > v2 patchset can be found at: > https://www.spinics.net/lists/netdev/msg563454.html > > Changes in v2: > 1. Device ID is no longer auto-detected but enforced based on explicit DT > compatible string. This helps with stricter checking of DT bindings. > 2. Group all device-specific operations into a sja1105_info structure and > avoid using the IS_ET() and IS_PQRS() macros at runtime as much as possible. > 3. Added more verbiage to commit messages and documentation. > 4. Treat the case where RGMII internal delays are requested through DT bindings > and return error. > 5. Miscellaneous cosmetic cleanup in sja1105_clocking.c > 6. Not advertising link features that are not supported, such as pause frames > and the half duplex modes. > 7. Fixed a mistake in previous patchset where the switch tagging was not > actually enabled (lost during a rebase). This brought up another uncaught > issue where switching at runtime between tagging and no-tagging was not > supported by DSA. Fixed up the mistake in "net: dsa: sja1105: Add support > for traffic through standalone ports", and added the new patch "net: dsa: > Allow drivers to modulate between presence and absence of tagging" to > address the other issue. > 8. Added a workaround for switch resets cutting a frame in the middle of > transmission, which would throw off some link partners. > 9. Changed the TPID from ETH_P_EDSA (0xDADA) to a newly introduced one: > ETH_P_DSA_8021Q (0xDADB). Uncovered another mistake in the previous patchset > with a missing ntohs(), which was not caught because 0xDADA is > endian-agnostic. > 10. Made NET_DSA_TAG_8021Q select VLAN_8021Q > 11. Renamed __dsa_port_vlan_add to dsa_port_vid_add and not to > dsa_port_vlan_add_trans, as suggested, because the corresponding _del function > does not have a transactional phase and the naming is more uniform this way. > > v1 patchset can be found at: > https://www.spinics.net/lists/netdev/msg561589.html > > Changes from RFC: > 1. Removed the packing code for the static configuration tables that were > not currently used > 2. Removed the code for unpacking a static configuration structure from > a memory buffer (not used) > 3. Completely removed the SGMII stubs, since the configuration is not > complete anyway. > 4. Moved some code from the SJA1105 introduction commit into the patch > that used it. > 5. Made the code for checking global VLAN filtering generic and made b53 > driver use it. > 6. Made mt7530 driver use the new generic dp->vlan_filtering > 7. Fixed check for stringset in .get_sset_count > 8. Minor cleanup in sja1105_clocking.c > 9. Fixed a confusing typo in DSA > > RFC can be found at: > https://www.mail-archive.com/netdev@vger.kernel.org/msg291717.html > > Vladimir Oltean (12): > lib: Add support for generic packing operations > net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch > net: dsa: sja1105: Add support for FDB and MDB management > net: dsa: sja1105: Error out if RGMII delays are requested in DT > ether: Add dedicated Ethertype for pseudo-802.1Q DSA tagging > net: dsa: sja1105: Add support for VLAN operations > net: dsa: sja1105: Add support for ethtool port counters > net: dsa: sja1105: Add support for configuring address aging time > net: dsa: sja1105: Prevent PHY jabbering during switch reset > net: dsa: sja1105: Reject unsupported link modes for AN > Documentation: net: dsa: Add details about NXP SJA1105 driver > dt-bindings: net: dsa: Add documentation for NXP SJA1105 driver > > .../devicetree/bindings/net/dsa/sja1105.txt | 157 ++ > Documentation/networking/dsa/index.rst | 1 + > Documentation/networking/dsa/sja1105.rst | 167 ++ > Documentation/packing.txt | 150 ++ > MAINTAINERS | 14 + > drivers/net/dsa/Kconfig | 2 + > drivers/net/dsa/Makefile | 1 + > drivers/net/dsa/sja1105/Kconfig | 15 + > drivers/net/dsa/sja1105/Makefile | 10 + > drivers/net/dsa/sja1105/sja1105.h | 154 ++ > drivers/net/dsa/sja1105/sja1105_clocking.c | 602 +++++++ > .../net/dsa/sja1105/sja1105_dynamic_config.c | 533 ++++++ > .../net/dsa/sja1105/sja1105_dynamic_config.h | 43 + > drivers/net/dsa/sja1105/sja1105_ethtool.c | 418 +++++ > drivers/net/dsa/sja1105/sja1105_main.c | 1459 +++++++++++++++++ > drivers/net/dsa/sja1105/sja1105_spi.c | 591 +++++++ > .../net/dsa/sja1105/sja1105_static_config.c | 988 +++++++++++ > .../net/dsa/sja1105/sja1105_static_config.h | 254 +++ > include/linux/dsa/sja1105.h | 23 + > include/linux/packing.h | 49 + > include/uapi/linux/if_ether.h | 1 + > lib/Makefile | 2 +- > lib/packing.c | 211 +++ > 23 files changed, 5844 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/net/dsa/sja1105.txt > create mode 100644 Documentation/networking/dsa/sja1105.rst > create mode 100644 Documentation/packing.txt > create mode 100644 drivers/net/dsa/sja1105/Kconfig > create mode 100644 drivers/net/dsa/sja1105/Makefile > create mode 100644 drivers/net/dsa/sja1105/sja1105.h > create mode 100644 drivers/net/dsa/sja1105/sja1105_clocking.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_dynamic_config.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_dynamic_config.h > create mode 100644 drivers/net/dsa/sja1105/sja1105_ethtool.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_main.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_spi.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_static_config.c > create mode 100644 drivers/net/dsa/sja1105/sja1105_static_config.h > create mode 100644 include/linux/dsa/sja1105.h > create mode 100644 include/linux/packing.h > create mode 100644 lib/packing.c > > -- > 2.17.1 > Hi Dave, Just thought I'd check up on this and found something that looks like a mistake. In patchwork it looks like the series is in the "Changes Requested" state. However I didn't notice any comment that was requesting any change? Thank you, -Vladimir
On Wed, 1 May 2019 at 06:44, David Miller <davem@davemloft.net> wrote: > > From: Vladimir Oltean <olteanv@gmail.com> > Date: Mon, 29 Apr 2019 03:16:54 +0300 > > > This patchset adds a DSA driver for the SPI-controlled NXP SJA1105 > > switch. > > This patch series adds many whitespace errors, which are all reported > by GIT when I try to apply your changes: > > Applying: lib: Add support for generic packing operations > .git/rebase-apply/patch:176: new blank line at EOF. > + > .git/rebase-apply/patch:480: new blank line at EOF. > + > warning: 2 lines add whitespace errors. > Applying: net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch > .git/rebase-apply/patch:102: new blank line at EOF. > + > .git/rebase-apply/patch:117: new blank line at EOF. > + > .git/rebase-apply/patch:262: new blank line at EOF. > + > .git/rebase-apply/patch:867: new blank line at EOF. > + > .git/rebase-apply/patch:2905: new blank line at EOF. > + > warning: squelched 2 whitespace errors > warning: 7 lines add whitespace errors. > Applying: net: dsa: sja1105: Add support for FDB and MDB management > .git/rebase-apply/patch:81: new blank line at EOF. > + > warning: 1 line adds whitespace errors. > Applying: net: dsa: sja1105: Error out if RGMII delays are requested in DT > Applying: ether: Add dedicated Ethertype for pseudo-802.1Q DSA tagging > Applying: net: dsa: sja1105: Add support for VLAN operations > .git/rebase-apply/patch:359: new blank line at EOF. > + > warning: 1 line adds whitespace errors. > Applying: net: dsa: sja1105: Add support for ethtool port counters > .git/rebase-apply/patch:474: new blank line at EOF. > + > warning: 1 line adds whitespace errors. > Applying: net: dsa: sja1105: Add support for configuring address aging time > Applying: net: dsa: sja1105: Prevent PHY jabbering during switch reset > Applying: net: dsa: sja1105: Reject unsupported link modes for AN > Applying: Documentation: net: dsa: Add details about NXP SJA1105 driver > .git/rebase-apply/patch:200: new blank line at EOF. > + > warning: 1 line adds whitespace errors. > Applying: dt-bindings: net: dsa: Add documentation for NXP SJA1105 driver > .git/rebase-apply/patch:178: new blank line at EOF. > + > warning: 1 line adds whitespace errors. Wow I am sorry, Gmail apparently moved your reply to spam and I only got it when I posted my message just now. Do you know what causes these whitespace errors, so I can avoid them next time? I think I'm generating my patches rather normally, with $(git format-patch -12 --subject-prefix="PATCH v4 net-next" --cover-letter). Thanks, -Vladimir
> Wow I am sorry, Gmail apparently moved your reply to spam and I only > got it when I posted my message just now. > Do you know what causes these whitespace errors, so I can avoid them > next time? I think I'm generating my patches rather normally, with > $(git format-patch -12 --subject-prefix="PATCH v4 net-next" > --cover-letter). What happens when you run checkpatch on the patches? Does it report white space problems. Another possibility is your email system has mangled the patches. First try applying the patches you generated from format-patch to a clean tree. If you don't get any warnings, email the patches to yourself, and then apply them. Andrew
On Thu, 2 May 2019 at 19:55, Andrew Lunn <andrew@lunn.ch> wrote: > > > Wow I am sorry, Gmail apparently moved your reply to spam and I only > > got it when I posted my message just now. > > Do you know what causes these whitespace errors, so I can avoid them > > next time? I think I'm generating my patches rather normally, with > > $(git format-patch -12 --subject-prefix="PATCH v4 net-next" > > --cover-letter). > > What happens when you run checkpatch on the patches? Does it report > white space problems. > > Another possibility is your email system has mangled the patches. > First try applying the patches you generated from format-patch to a > clean tree. If you don't get any warnings, email the patches to > yourself, and then apply them. > > Andrew Hi Andrew, checkpatch.pl --strict doesn't appear to catch this. It looks like it's caused by introducing new files that are terminated in a blank line. I will stop doing that. Thanks, -Vladimir
From: Vladimir Oltean <olteanv@gmail.com> Date: Thu, 2 May 2019 19:31:50 +0300 > Do you know what causes these whitespace errors, so I can avoid them > next time? Your files have empty lines at the end of the file. Simply remove those trialing empty lines.
This patchset adds a DSA driver for the SPI-controlled NXP SJA1105 switch. Due to the hardware's unfriendliness, most of its state needs to be shadowed in kernel memory by the driver. To support this and keep a decent amount of cleanliness in the code, a new generic API for converting between CPU-accessible ("unpacked") structures and hardware-accessible ("packed") structures is proposed and used. The driver is GPL-2.0 licensed. The source code files which are licensed as BSD-3-Clause are hardware support files and derivative of the userspace NXP sja1105-tool program, which is BSD-3-Clause licensed. TODO items: * Add support for traffic. * Add full support for the P/Q/R/S series. The patches were mostly tested on a first-generation T device. * Add timestamping support and PTP clock manipulation. * Figure out how the tc-taprio hardware offload that was just proposed by Vinicius can be used to configure the switch's time-aware scheduler. * Rework link state callbacks to use phylink once the SGMII port is supported. Changes in v4: 1. Previous patchset was broken apart, and for the moment the driver is configuring the switch as unmanaged. Support for regular and management traffic, as well as for PTP timestamping, will be submitted once the basic driver is accepted. Some core DSA patches were also broken out of the series, and are a dependency for this series: https://patchwork.ozlabs.org/project/netdev/list/?series=105069 2. Addressed Jiri Pirko's feedback about too generic function and macro naming. 3. Re-introduced ETH_P_DSA_8021Q. v3 patchset can be found at: https://lkml.org/lkml/2019/4/12/978 Changes in v3: 1. Removed the patch for a dedicated Ethertype to use with 802.1Q DSA tagging 2. Changed the SJA1105 switch tagging protocol sysfs label from "sja1105" to "8021q" to denote to users such as tcpdump that the structure is more generic. 3. Respun previous patch "net: dsa: Allow drivers to modulate between presence and absence of tagging". Current equivalent patch is called "net: dsa: Allow drivers to filter packets they can decode source port from" and at least allows reception of management traffic during the time when switch tagging is not enabled. 4. Added DSA-level fixes for the bridge core not unsetting vlan_filtering when ports leave. The global VLAN filtering is treated as a special case. Made the mt7530 driver use this. This patch benefits the SJA1105 because otherwise traffic in standalone mode would no longer work after removing the ports from a vlan_filtering bridge, since the driver and the hardware would be in an inconsistent state. 5. Restructured the documentation as rst. This depends upon the recently submitted "[PATCH net-next] Documentation: net: dsa: transition to the rst format": https://patchwork.ozlabs.org/patch/1084658/. v2 patchset can be found at: https://www.spinics.net/lists/netdev/msg563454.html Changes in v2: 1. Device ID is no longer auto-detected but enforced based on explicit DT compatible string. This helps with stricter checking of DT bindings. 2. Group all device-specific operations into a sja1105_info structure and avoid using the IS_ET() and IS_PQRS() macros at runtime as much as possible. 3. Added more verbiage to commit messages and documentation. 4. Treat the case where RGMII internal delays are requested through DT bindings and return error. 5. Miscellaneous cosmetic cleanup in sja1105_clocking.c 6. Not advertising link features that are not supported, such as pause frames and the half duplex modes. 7. Fixed a mistake in previous patchset where the switch tagging was not actually enabled (lost during a rebase). This brought up another uncaught issue where switching at runtime between tagging and no-tagging was not supported by DSA. Fixed up the mistake in "net: dsa: sja1105: Add support for traffic through standalone ports", and added the new patch "net: dsa: Allow drivers to modulate between presence and absence of tagging" to address the other issue. 8. Added a workaround for switch resets cutting a frame in the middle of transmission, which would throw off some link partners. 9. Changed the TPID from ETH_P_EDSA (0xDADA) to a newly introduced one: ETH_P_DSA_8021Q (0xDADB). Uncovered another mistake in the previous patchset with a missing ntohs(), which was not caught because 0xDADA is endian-agnostic. 10. Made NET_DSA_TAG_8021Q select VLAN_8021Q 11. Renamed __dsa_port_vlan_add to dsa_port_vid_add and not to dsa_port_vlan_add_trans, as suggested, because the corresponding _del function does not have a transactional phase and the naming is more uniform this way. v1 patchset can be found at: https://www.spinics.net/lists/netdev/msg561589.html Changes from RFC: 1. Removed the packing code for the static configuration tables that were not currently used 2. Removed the code for unpacking a static configuration structure from a memory buffer (not used) 3. Completely removed the SGMII stubs, since the configuration is not complete anyway. 4. Moved some code from the SJA1105 introduction commit into the patch that used it. 5. Made the code for checking global VLAN filtering generic and made b53 driver use it. 6. Made mt7530 driver use the new generic dp->vlan_filtering 7. Fixed check for stringset in .get_sset_count 8. Minor cleanup in sja1105_clocking.c 9. Fixed a confusing typo in DSA RFC can be found at: https://www.mail-archive.com/netdev@vger.kernel.org/msg291717.html Vladimir Oltean (12): lib: Add support for generic packing operations net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch net: dsa: sja1105: Add support for FDB and MDB management net: dsa: sja1105: Error out if RGMII delays are requested in DT ether: Add dedicated Ethertype for pseudo-802.1Q DSA tagging net: dsa: sja1105: Add support for VLAN operations net: dsa: sja1105: Add support for ethtool port counters net: dsa: sja1105: Add support for configuring address aging time net: dsa: sja1105: Prevent PHY jabbering during switch reset net: dsa: sja1105: Reject unsupported link modes for AN Documentation: net: dsa: Add details about NXP SJA1105 driver dt-bindings: net: dsa: Add documentation for NXP SJA1105 driver .../devicetree/bindings/net/dsa/sja1105.txt | 157 ++ Documentation/networking/dsa/index.rst | 1 + Documentation/networking/dsa/sja1105.rst | 167 ++ Documentation/packing.txt | 150 ++ MAINTAINERS | 14 + drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/Makefile | 1 + drivers/net/dsa/sja1105/Kconfig | 15 + drivers/net/dsa/sja1105/Makefile | 10 + drivers/net/dsa/sja1105/sja1105.h | 154 ++ drivers/net/dsa/sja1105/sja1105_clocking.c | 602 +++++++ .../net/dsa/sja1105/sja1105_dynamic_config.c | 533 ++++++ .../net/dsa/sja1105/sja1105_dynamic_config.h | 43 + drivers/net/dsa/sja1105/sja1105_ethtool.c | 418 +++++ drivers/net/dsa/sja1105/sja1105_main.c | 1459 +++++++++++++++++ drivers/net/dsa/sja1105/sja1105_spi.c | 591 +++++++ .../net/dsa/sja1105/sja1105_static_config.c | 988 +++++++++++ .../net/dsa/sja1105/sja1105_static_config.h | 254 +++ include/linux/dsa/sja1105.h | 23 + include/linux/packing.h | 49 + include/uapi/linux/if_ether.h | 1 + lib/Makefile | 2 +- lib/packing.c | 211 +++ 23 files changed, 5844 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/sja1105.txt create mode 100644 Documentation/networking/dsa/sja1105.rst create mode 100644 Documentation/packing.txt create mode 100644 drivers/net/dsa/sja1105/Kconfig create mode 100644 drivers/net/dsa/sja1105/Makefile create mode 100644 drivers/net/dsa/sja1105/sja1105.h create mode 100644 drivers/net/dsa/sja1105/sja1105_clocking.c create mode 100644 drivers/net/dsa/sja1105/sja1105_dynamic_config.c create mode 100644 drivers/net/dsa/sja1105/sja1105_dynamic_config.h create mode 100644 drivers/net/dsa/sja1105/sja1105_ethtool.c create mode 100644 drivers/net/dsa/sja1105/sja1105_main.c create mode 100644 drivers/net/dsa/sja1105/sja1105_spi.c create mode 100644 drivers/net/dsa/sja1105/sja1105_static_config.c create mode 100644 drivers/net/dsa/sja1105/sja1105_static_config.h create mode 100644 include/linux/dsa/sja1105.h create mode 100644 include/linux/packing.h create mode 100644 lib/packing.c