Changes in Kconfig

e5f31552 - ethernet: fix PTP_1588_CLOCK dependencies

Thu, 12 Aug 2021 18:33:58 +0000

ethernet: fix PTP_1588_CLOCK dependenciesThe 'imply' keyword does not do what most people think it does, it onlypolitely asks Kconfig to turn on another symbol, but does not preventit from being disabled manually or built as a loadable module when theuser is built-in. In the ICE driver, the latter now causes a link failure:aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_eth_ioctl':ice_main.c:(.text+0x13b0): undefined reference to `ice_ptp_get_ts_config'ice_main.c:(.text+0x13b0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_get_ts_config'aarch64-linux-ld: ice_main.c:(.text+0x13bc): undefined reference to `ice_ptp_set_ts_config'ice_main.c:(.text+0x13bc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_set_ts_config'aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_prepare_for_reset':ice_main.c:(.text+0x31fc): undefined reference to `ice_ptp_release'ice_main.c:(.text+0x31fc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_release'aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_rebuild':This is a recurring problem in many drivers, and we have discussedit several times befores, without reaching a consensus. I'm providinga link to the previous email thread for reference, which discussessome related problems.To solve the dependency issue better than the 'imply' keyword, introduce aseparate Kconfig symbol "CONFIG_PTP_1588_CLOCK_OPTIONAL" that any drivercan depend on if it is able to use PTP support when available, but worksfine without it. Whenever CONFIG_PTP_1588_CLOCK=m, those drivers arethen prevented from being built-in, the same way as with a 'depends onPTP_1588_CLOCK || !PTP_1588_CLOCK' dependency that does the same trick,but that can be rather confusing when you first see it.Since this should cover the dependencies correctly, the IS_REACHABLE()hack in the header is no longer needed now, and can be turned backinto a normal IS_ENABLED() check. Any driver that gets the dependencywrong will now cause a link time failure rather than being unable to usePTP support when that is in a loadable module.However, the two recently added ptp_get_vclocks_index() andptp_convert_timestamp() interfaces are only called from builtin code withethtool and socket timestamps, so keep the current behavior by stubbingthose out completely when PTP is in a loadable module. This should beaddressed properly in a follow-up.As Richard suggested, we may want to actually turn PTP support into a'bool' option later on, preventing it from being a loadable modulealtogether, which would be one way to solve the problem with the ethtoolinterface.Fixes: 06c16d89d2cb ("ice: register 1588 PTP clock device object for E810 devices")Link: https://lore.kernel.org/netdev/20210804121318.337276-1-arnd@kernel.org/Link: https://lore.kernel.org/netdev/CAK8P3a06enZOf=XyZ+zcAwBczv41UuCTz+=0FMf2gBz1_cOnZQ@mail.gmail.com/Link: https://lore.kernel.org/netdev/CAK8P3a3=eOxE-K25754+fB_-i_0BZzf9a9RfPTX3ppSwu9WZXw@mail.gmail.com/Link: https://lore.kernel.org/netdev/20210726084540.3282344-1-arnd@kernel.org/Acked-by: Shannon Nelson Acked-by: Jacob Keller Acked-by: Richard Cochran Reviewed-by: Vladimir Oltean Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210812183509.1362782-1-arnd@kernel.orgSigned-off-by: Jakub Kicinski List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

75e99470 - net: dsa: sja1105: document the SJA1110 in the Kconfig

Thu, 24 Jun 2021 14:55:24 +0000

net: dsa: sja1105: document the SJA1110 in the KconfigMention support for the SJA1110 in menuconfig.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

3ad1d171 - net: dsa: sja1105: migrate to xpcs for SGMII

Fri, 11 Jun 2021 20:05:28 +0000

net: dsa: sja1105: migrate to xpcs for SGMIIThere is a desire to use the generic driver for the Synopsys XPCSlocated in drivers/net/pcs, and to achieve that, the sja1105 driver mustexpose an MDIO bus for the SGMII PCS, because the XPCS probes as anmdio_device.In preparation of the SJA1110 which in fact has a different accessprocedure for the SJA1105, we register this PCS MDIO bus once in thecommon code, but we implement function pointers for the read and writemethods. In this patch there is a single implementation for them.There is exactly one MDIO bus for the PCS, this will contain all PCSesat MDIO addresses equal to the port number.We delete a bunch of hardware support code because the xpcs driveralready does what we need.We need to hack up the MDIO reads for the PHY ID, since our XPCSinstantiation returns zeroes and there are some specific fixups whichneed to be applied by the xpcs driver.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

dfacc5a2 - net: dsa: sja1105: support flow-based redirection via virtual links

Tue, 05 May 2020 19:20:55 +0000

net: dsa: sja1105: support flow-based redirection via virtual linksImplement tc-flower offloads for redirect, trap and drop usingnon-critical virtual links.Commands which were tested to work are: # Send frames received on swp2 with a DA of 42:be:24:9b:76:20 to the # CPU and to swp3. This type of key (DA only) when the port's VLAN # awareness state is off. tc qdisc add dev swp2 clsact tc filter add dev swp2 ingress flower skip_sw dst_mac 42:be:24:9b:76:20 \ action mirred egress redirect dev swp3 \ action trap # Drop frames received on swp2 with a DA of 42:be:24:9b:76:20, a VID # of 100 and a PCP of 0. tc filter add dev swp2 ingress protocol 802.1Q flower skip_sw \ dst_mac 42:be:24:9b:76:20 vlan_id 100 vlan_prio 0 action dropUnder the hood, all rules match on DMAC, VID and PCP, but when VLANfiltering is disabled, those are set internally by the driver to theport-based defaults. Because we would be put in an awkward situation ifthe user were to change the VLAN filtering state while there are activerules (packets would no longer match on the specified keys), we simplydeny changing vlan_filtering unless the list of flows offloaded viavirtual links is empty. Then the user can re-add new rules.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

b6d49cab - net: Make PTP-specific drivers depend on PTP_1588_CLOCK

Wed, 29 Apr 2020 07:59:00 +0000

net: Make PTP-specific drivers depend on PTP_1588_CLOCKCommit d1cbfd771ce8 ("ptp_clock: Allow for it to be optional") changedall PTP-capable Ethernet drivers from `select PTP_1588_CLOCK` to `implyPTP_1588_CLOCK`, "in order to break the hard dependency between the PTPclock subsystem and ethernet drivers capable of being clock providers."As a result it is possible to build PTP-capable Ethernet drivers withoutthe PTP subsystem by deselecting PTP_1588_CLOCK. Drivers are required tohandle the missing dependency gracefully.Some PTP-capable Ethernet drivers (e.g., TI_CPSW) factor their PTP codeout into separate drivers (e.g., TI_CPTS_MOD). The above commit alsochanged these PTP-specific drivers to `imply PTP_1588_CLOCK`, making itpossible to build them without the PTP subsystem. But as GrygoriiStrashko noted in [1]:On Wed, Apr 22, 2020 at 02:16:11PM +0300, Grygorii Strashko wrote:> Another question is that CPTS completely nonfunctional in this case and> it was never expected that somebody will even try to use/run such> configuration (except for random build purposes).In my view, enabling a PTP-specific driver without the PTP subsystem isa configuration error made possible by the above commit. Kconfig shouldnot allow users to create a configuration with missing dependencies thatresults in "completely nonfunctional" drivers.I audited all network drivers that call ptp_clock_register() but merely`imply PTP_1588_CLOCK` and found five PTP-specific drivers that arelikely nonfunctional without PTP_1588_CLOCK: NET_DSA_MV88E6XXX_PTP NET_DSA_SJA1105_PTP MACB_USE_HWSTAMP CAVIUM_PTP TI_CPTS_MODNote how these symbols all reference PTP or timestamping in their name;this is a clue that they depend on PTP_1588_CLOCK.Change them from `imply PTP_1588_CLOCK` [2] to `depends on PTP_1588_CLOCK`.I'm not using `select PTP_1588_CLOCK` here because PTP_1588_CLOCK hasits own dependencies, which `select` would not transitively apply.Additionally, remove the `select NET_PTP_CLASSIFY` from CPTS_TI_MOD;PTP_1588_CLOCK already selects that.[1]: https://lore.kernel.org/lkml/c04458ed-29ee-1797-3a11-7f3f560553e6@ti.com/[2]: NET_DSA_SJA1105_PTP had never declared any type of dependency onPTP_1588_CLOCK (`imply` or otherwise); adding a `depends on PTP_1588_CLOCK`here seems appropriate.Cc: Arnd Bergmann Cc: Richard Cochran Cc: Nicolas Pitre Cc: Grygorii Strashko Cc: Geert Uytterhoeven Fixes: d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")Signed-off-by: Clay McClure Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

86db36a3 - net: dsa: sja1105: Implement state machine for TAS with PTP clock source

Tue, 12 Nov 2019 00:11:54 +0000

net: dsa: sja1105: Implement state machine for TAS with PTP clock sourceTested using the following bash script and the tc from iproute2-next: #!/bin/bash set -e -u -o pipefail NSEC_PER_SEC="1000000000" gatemask() { local tc_list="$1" local mask=0 for tc in ${tc_list}; do mask=$((${mask} | (1 << ${tc}))) done printf "%02x" ${mask} } if ! systemctl is-active --quiet ptp4l; then echo "Please start the ptp4l service" exit fi now=$(phc_ctl /dev/ptp1 get | gawk '/clock time is/ { print $5; }') # Phase-align the base time to the start of the next second. sec=$(echo "${now}" | gawk -F. '{ print $1; }') base_time="$(((${sec} + 1) * ${NSEC_PER_SEC}))" tc qdisc add dev swp5 parent root handle 100 taprio \ num_tc 8 \ map 0 1 2 3 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \ base-time ${base_time} \ sched-entry S $(gatemask 7) 100000 \ sched-entry S $(gatemask "0 1 2 3 4 5 6") 400000 \ clockid CLOCK_TAI flags 2The "state machine" is a workqueue invoked after each manipulationcommand on the PTP clock (reset, adjust time, set time, adjustfrequency) which checks over the state of the time-aware scheduler.So it is not monitored periodically, only in reaction to a PTP commandtypically triggered from a userspace daemon (linuxptp). Otherwise thereis no reason for things to go wrong.Now that the timecounter/cyclecounter has been replaced with hardwareoperations on the PTP clock, the TAS Kconfig now depends upon PTP andthe standalone clocksource operating mode has been removed.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

5d294fc4 - net: dsa: sja1105: improve NET_DSA_SJA1105_TAS dependency

Fri, 25 Oct 2019 07:26:35 +0000

net: dsa: sja1105: improve NET_DSA_SJA1105_TAS dependencyAn earlier bugfix introduced a dependency on CONFIG_NET_SCH_TAPRIO,but this missed the case of NET_SCH_TAPRIO=m and NET_DSA_SJA1105=y,which still causes a link error:drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_setup_tc_taprio':sja1105_tas.c:(.text+0x5c): undefined reference to `taprio_offload_free'sja1105_tas.c:(.text+0x3b4): undefined reference to `taprio_offload_get'drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_tas_teardown':sja1105_tas.c:(.text+0x6ec): undefined reference to `taprio_offload_free'Change the dependency to only allow selecting the TAS code when itcan link against the taprio code.Fixes: a8d570de0cc6 ("net: dsa: sja1105: Add dependency for NET_DSA_SJA1105_TAS")Fixes: 317ab5b86c8e ("net: dsa: sja1105: Configure the Time-Aware Scheduler via tc-taprio offload")Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

a8d570de - net: dsa: sja1105: Add dependency for NET_DSA_SJA1105_TAS

Thu, 19 Sep 2019 06:38:19 +0000

net: dsa: sja1105: Add dependency for NET_DSA_SJA1105_TASIf CONFIG_NET_DSA_SJA1105_TAS=y and CONFIG_NET_SCH_TAPRIO=n,below error can be found:drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_setup_tc_taprio':sja1105_tas.c:(.text+0x318): undefined reference to `taprio_offload_free'sja1105_tas.c:(.text+0x590): undefined reference to `taprio_offload_get'drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_tas_teardown':sja1105_tas.c:(.text+0x610): undefined reference to `taprio_offload_free'make: *** [vmlinux] Error 1sja1105_tas needs tc-taprio, so this patch add the dependency for it.Fixes: 317ab5b86c8e ("net: dsa: sja1105: Configure the Time-Aware Scheduler via tc-taprio offload")Signed-off-by: Mao Wenan Reviewed-by: Vladimir Oltean Signed-off-by: Jakub Kicinski List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

317ab5b8 - net: dsa: sja1105: Configure the Time-Aware Scheduler via tc-taprio offload

Sun, 15 Sep 2019 02:00:02 +0000

net: dsa: sja1105: Configure the Time-Aware Scheduler via tc-taprio offloadThis qdisc offload is the closest thing to what the SJA1105 supports inhardware for time-based egress shaping. The switch core really is builtaround SAE AS6802/TTEthernet (a TTTech standard) but can be made tooperate similarly to IEEE 802.1Qbv with some constraints:- The gate control list is a global list for all ports. There are 8 execution threads that iterate through this global list in parallel. I don't know why 8, there are only 4 front-panel ports.- Care must be taken by the user to make sure that two execution threads never get to execute a GCL entry simultaneously. I created a O(n^4) checker for this hardware limitation, prior to accepting a taprio offload configuration as valid.- The spec says that if a GCL entry's interval is shorter than the frame length, you shouldn't send it (and end up in head-of-line blocking). Well, this switch does anyway.- The switch has no concept of ADMIN and OPER configurations. Because it's so simple, the TAS settings are loaded through the static config tables interface, so there isn't even place for any discussion about 'graceful switchover between ADMIN and OPER'. You just reset the switch and upload a new OPER config.- The switch accepts multiple time sources for the gate events. Right now I am using the standalone clock source as opposed to PTP. So the base time parameter doesn't really do much. Support for the PTP clock source will be added in a future series.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

78fe8a28 - net: dsa: sja1105: fix ptp link error

Mon, 17 Jun 2019 13:14:10 +0000

net: dsa: sja1105: fix ptp link errorDue to a reversed dependency, it is possible to buildthe lower ptp driver as a loadable module and the actualdriver using it as built-in, causing a link error:drivers/net/dsa/sja1105/sja1105_spi.o: In function `sja1105_static_config_upload':sja1105_spi.c:(.text+0x6f0): undefined reference to `sja1105_ptp_reset'drivers/net/dsa/sja1105/sja1105_spi.o:(.data+0x2d4): undefined reference to `sja1105et_ptp_cmd'drivers/net/dsa/sja1105/sja1105_spi.o:(.data+0x604): undefined reference to `sja1105pqrs_ptp_cmd'drivers/net/dsa/sja1105/sja1105_main.o: In function `sja1105_remove':sja1105_main.c:(.text+0x8d4): undefined reference to `sja1105_ptp_clock_unregister'drivers/net/dsa/sja1105/sja1105_main.o: In function `sja1105_rxtstamp_work':sja1105_main.c:(.text+0x964): undefined reference to `sja1105_tstamp_reconstruct'drivers/net/dsa/sja1105/sja1105_main.o: In function `sja1105_setup':sja1105_main.c:(.text+0xb7c): undefined reference to `sja1105_ptp_clock_register'drivers/net/dsa/sja1105/sja1105_main.o: In function `sja1105_port_deferred_xmit':sja1105_main.c:(.text+0x1fa0): undefined reference to `sja1105_ptpegr_ts_poll'sja1105_main.c:(.text+0x1fc4): undefined reference to `sja1105_tstamp_reconstruct'drivers/net/dsa/sja1105/sja1105_main.o:(.rodata+0x5b0): undefined reference to `sja1105_get_ts_info'Change the Makefile logic to always build the ptp modulethe same way as the rest. Another option would be tojust add it to the same module and remove the exports,but I don't know if there was a good reason to keep themseparate.Fixes: bb77f36ac21d ("net: dsa: sja1105: Add support for the PTP clock")Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

1fd4a173 - net: dsa: sja1105: Update some comments about PHYLIB

Sat, 08 Jun 2019 13:03:42 +0000

net: dsa: sja1105: Update some comments about PHYLIBSince the driver is now using PHYLINK exclusively, it makes sense toremove all references to it and replace them with PHYLINK.Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

bb77f36a - net: dsa: sja1105: Add support for the PTP clock

Sat, 08 Jun 2019 12:04:34 +0000

net: dsa: sja1105: Add support for the PTP clockThe design of this PHC driver is influenced by the switch's behaviorw.r.t. timestamping. It exposes two PTP counters, one free-running(PTPTSCLK) and the other offset- and frequency-corrected in hardwarethrough PTPCLKVAL, PTPCLKADD and PTPCLKRATE. The MACs can sample eitherof these for frame timestamps.However, the user manual warns that taking timestamps based on thecorrected clock is less than useful, as the switch can deliver corruptedtimestamps in a variety of circumstances.Therefore, this PHC uses the free-running PTPTSCLK together with atimecounter/cyclecounter structure that translates it into a softwaretime domain. Thus, the settime/adjtime and adjfine callbacks arehardware no-ops.The timestamps (introduced in a further patch) will also be translatedto the correct time domain before being handed over to the userspace PTPstack.The introduction of a second set of PHC operations that operate on thehardware PTPCLKVAL/PTPCLKADD/PTPCLKRATE in the future is somewhatunavoidable, as the TTEthernet core uses the corrected PTP time domain.However, the free-running counter + timecounter structure combinationwill suffice for now, as the resulting timestamps yield a sub-50 nssynchronization offset in steady state using linuxptp.For this patch, in absence of frame timestamping, the operations of theswitch PHC were tested by syncing it to the system time as a local slaveclock with:phc2sys -s CLOCK_REALTIME -c swp2 -O 0 -m -S 0.01Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

ec8f24b7 - treewide: Add SPDX license identifier - Makefile/Kconfig

Sun, 19 May 2019 12:07:45 +0000

treewide: Add SPDX license identifier - Makefile/KconfigAdd SPDX license identifiers to all Make/Kconfig files which: - Have no license information of any formThese files fall under the project license, GPL v2 only. The resulting SPDXlicense identifier is: GPL-2.0-onlySigned-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

227d07a0 - net: dsa: sja1105: Add support for traffic through standalone ports

Sun, 05 May 2019 10:19:27 +0000

net: dsa: sja1105: Add support for traffic through standalone portsIn order to support this, we are creating a make-shift switch tag out ofa VLAN trunk configured on the CPU port. Termination of normal trafficon switch ports only works when not under a vlan_filtering bridge.Termination of management (PTP, BPDU) traffic works under allcircumstances because it uses a different tagging mechanism(incl_srcpt). We are making use of the generic CONFIG_NET_DSA_TAG_8021Qcode and leveraging it from our own CONFIG_NET_DSA_TAG_SJA1105.There are two types of traffic: regular and link-local.The link-local traffic received on the CPU port is trapped from theswitch's regular forwarding decisions because it matched one of the twoDMAC filters for management traffic.On transmission, the switch requires special massaging for theselink-local frames. Due to a weird implementation of the switching IP, bydefault it drops link-local frames that originate on the CPU port.It needs to be told where to forward them to, through an SPI command("management route") that is valid for only a single frame.So when we're sending link-local traffic, we are using thedsa_defer_xmit mechanism.Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig

8aa9ebcc - net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch

Thu, 02 May 2019 20:23:30 +0000

net: dsa: Introduce driver for NXP SJA1105 5-port L2 switchAt this moment the following is supported:* Link state management through phylib* Autonomous L2 forwarding managed through iproute2 bridge commands.IP termination must be done currently through the master netdevice,since the switch is unmanaged at this point and usingDSA_TAG_PROTO_NONE.Signed-off-by: Vladimir Oltean Signed-off-by: Georg Waibel Acked-by: Florian Fainelli Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/dsa/sja1105/Kconfig