Changes in Kconfig

f99f22e0 - net: dsa: ocelot: add PTP dependency for NET_DSA_MSCC_OCELOT_EXT

Thu, 09 Feb 2023 12:44:17 +0000

net: dsa: ocelot: add PTP dependency for NET_DSA_MSCC_OCELOT_EXTA new user of MSCC_OCELOT_SWITCH_LIB was added, bringing back an oldlink failure that was fixed with e5f31552674e ("ethernet: fixPTP_1588_CLOCK dependencies"):x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_ptp_enable':ocelot_ptp.c:(.text+0x8ee): undefined reference to `ptp_find_pin'x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_get_ts_info':ocelot_ptp.c:(.text+0xd5d): undefined reference to `ptp_clock_index'x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_init_timestamp':ocelot_ptp.c:(.text+0x15ca): undefined reference to `ptp_clock_register'x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_deinit_timestamp':ocelot_ptp.c:(.text+0x16b7): undefined reference to `ptp_clock_unregister'Add the same PTP dependency here, as well as in the MSCC_OCELOT_SWITCH_LIBsymbol itself to make it more obvious what is going on when the nextdriver selects it.Fixes: 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control")Signed-off-by: Arnd Bergmann Acked-by: Colin Foster Link: https://lore.kernel.org/r/20230209124435.1317781-1-arnd@kernel.orgSigned-off-by: Jakub Kicinski List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

e330fb14 - of: net: move of_net under net/

Thu, 07 Oct 2021 01:06:54 +0000

of: net: move of_net under net/Rob suggests to move of_net.c from under drivers/of/ somewhereto the networking code.Suggested-by: Rob Herring Signed-off-by: Jakub Kicinski Reviewed-by: Rob Herring Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

e6e12df6 - net: mscc: ocelot: convert to phylink

Sun, 15 Aug 2021 01:47:48 +0000

net: mscc: ocelot: convert to phylinkThe felix DSA driver, which is a wrapper over the same hardware class asocelot, is integrated with phylink, but ocelot is using the plain PHYlibrary. It makes sense to bring together the two implementations, whichis what this patch achieves.This is a large patch and hard to break up, but it does the following:The existing ocelot_adjust_link writes some registers, andfelix_phylink_mac_link_up writes some registers, some of them arecommon, but both functions write to some registers to which the otherdoesn't.The main reasons for this are:- Felix switches so far have used an NXP PCS so they had no need to write the PCS1G registers that ocelot_adjust_link writes- Felix switches have the MAC fixed at 1G, so some of the MAC speed changes actually break the link and must be avoided.The naming conventions for the functions introduced in this patch are:- vsc7514_phylink_{mac_config,validate} are specific to the Ocelot instantiations and placed in ocelot_net.c which is built only for the ocelot switchdev driver.- ocelot_phylink_mac_link_{up,down} are shared between the ocelot switchdev driver and the felix DSA driver (they are put in the common lib).One by one, the registers written by ocelot_adjust_link are:DEV_MAC_MODE_CFG - felix_phylink_mac_link_up had no need to write this register since its out-of-reset value was fine and did not need changing. The write is moved to the common ocelot_phylink_mac_link_up and on felix it is guarded by a quirk bit that makes the written value identical with the out-of-reset oneDEV_PORT_MISC - runtime invariant, was moved to vsc7514_phylink_mac_configPCS1G_MODE_CFG - same as abovePCS1G_SD_CFG - same as abovePCS1G_CFG - same as abovePCS1G_ANEG_CFG - same as abovePCS1G_LB_CFG - same as aboveDEV_MAC_ENA_CFG - both ocelot_adjust_link and ocelot_port_disable touched this. felix_phylink_mac_link_{up,down} also do. We go with what felix does and put it in ocelot_phylink_mac_link_up.DEV_CLOCK_CFG - ocelot_adjust_link and felix_phylink_mac_link_up both write this, but to different values. Move to the common ocelot_phylink_mac_link_up and make sure via the quirk that the old values are preserved for both.ANA_PFC_PFC_CFG - ocelot_adjust_link wrote this, felix_phylink_mac_link_up did not. Runtime invariant, speed does not matter since PFC is disabled via the RX_PFC_ENA bits which are cleared. Move to vsc7514_phylink_mac_config.QSYS_SWITCH_PORT_MODE_PORT_ENA - both ocelot_adjust_link and felix_phylink_mac_link_{up,down} wrote this. Ocelot also wrote this register from ocelot_port_disable. Keep what felix did, move in ocelot_phylink_mac_link_{up,down} and delete ocelot_port_disable.ANA_POL_FLOWC - same as aboveSYS_MAC_FC_CFG - same as above, except slight behavior change. Whereas ocelot always enabled RX and TX flow control, felix listened to phylink (for the most part, at least - see the 2500base-X comment).The registers which only felix_phylink_mac_link_up wrote are:SYS_PAUSE_CFG_PAUSE_ENA - this is why I am not sure that flow control worked on ocelot. Not it should, since the code is shared with felix where it does.ANA_PORT_PORT_CFG - this is a Frame Analyzer block register, phylink should be the one touching them, deleted.Other changes:- The old phylib registration code was in mscc_ocelot_init_ports. It is hard to work with 2 levels of indentation already in, and with hard to follow teardown logic. The new phylink registration code was moved inside ocelot_probe_port(), right between alloc_etherdev() and register_netdev(). It could not be done before (=> outside of) ocelot_probe_port() because ocelot_probe_port() allocates the struct ocelot_port which we then use to assign ocelot_port->phy_mode to. It is more preferable to me to have all PHY handling logic inside the same function.- On the same topic: struct ocelot_port_private :: serdes is only used in ocelot_port_open to set the SERDES protocol to Ethernet. This is logically a runtime invariant and can be done just once, when the port registers with phylink. We therefore don't even need to keep the serdes reference inside struct ocelot_port_private, or to use the devm variant of of_phy_get().- Phylink needs a valid phy-mode for phylink_create() to succeed, and the existing device tree bindings in arch/mips/boot/dts/mscc/ocelot_pcb120.dts don't define one for the internal PHY ports. So we patch PHY_INTERFACE_MODE_NA into PHY_INTERFACE_MODE_INTERNAL.- There was a strategically placed: switch (priv->phy_mode) { case PHY_INTERFACE_MODE_NA: continue; which made the code skip the serdes initialization for the internal PHY ports. Frankly that is not all that obvious, so now we explicitly initialize the serdes under an "if" condition and not rely on code jumps, so everything is clearer.- There was a write of OCELOT_SPEED_1000 to DEV_CLOCK_CFG for QSGMII ports. Since that is in fact the default value for the register field DEV_CLOCK_CFG_LINK_SPEED, I can only guess the intention was to clear the adjacent fields, MAC_TX_RST and MAC_RX_RST, aka take the port out of reset, which does match the comment. I don't even want to know why this code is placed there, but if there is indeed an issue that all ports that share a QSGMII lane must all be up, then this logic is already buggy, since mscc_ocelot_init_ports iterates using for_each_available_child_of_node, so nobody prevents the user from putting a 'status = "disabled";' for some QSGMII ports which would break the driver's assumption. In any case, in the eventuality that I'm right, we would have yet another issue if ocelot_phylink_mac_link_down would reset those ports and that would be forbidden, so since the ocelot_adjust_link logic did not do that (maybe for a reason), add another quirk to preserve the old logic.The ocelot driver teardown goes through all ports in one fell swoop.When initialization of one port fails, the ocelot->ports[port] pointerfor that is reset to NULL, and teardown is done only for non-NULL ports,so there is no reason to do partial teardowns, let the centralmscc_ocelot_release_ports() do its job.Tested bind, unbind, rebind, link up, link down, speed change on mock-uphardware (modified the driver to probe on Felix VSC9959). Alsoregression tested the felix DSA driver. Could not test the Ocelotspecific bits (PCS1G, SERDES, device tree bindings).Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/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/ethernet/mscc/Kconfig

e4bd44e8 - net: ocelot: replay switchdev events when joining bridge

Mon, 22 Mar 2021 23:51:52 +0000

net: ocelot: replay switchdev events when joining bridgeThe premise of this change is that the switchdev port attributes andobjects offloaded by ocelot might have been missed when we are joiningan already existing bridge port, such as a bonding interface.The patch pulls these switchdev attributes and objects from the bridge,on behalf of the 'bridge port' net device which might be either theocelot switch interface, or the bonding upper interface.The ocelot_net.c belongs strictly to the switchdev ocelot driver, whileocelot.c is part of a library shared with the DSA felix driver.The ocelot_port_bridge_leave function (part of the common library) usedto call ocelot_port_vlan_filtering(false), something which is notnecessary for DSA, since the framework deals with that already there.So we move this function to ocelot_switchdev_unsync, which is specificto the switchdev driver.The code movement described above makes ocelot_port_bridge_leave nolonger return an error code, so we change its type from int to void.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

907310ce - net: mscc: ocelot: select NET_DEVLINK

Thu, 25 Feb 2021 14:38:31 +0000

net: mscc: ocelot: select NET_DEVLINKWithout this option, the driver fails to link:ld.lld: error: undefined symbol: devlink_sb_register>>> referenced by ocelot_devlink.c>>> net/ethernet/mscc/ocelot_devlink.o:(ocelot_devlink_sb_register) in archive drivers/built-in.a>>> referenced by ocelot_devlink.c>>> net/ethernet/mscc/ocelot_devlink.o:(ocelot_devlink_sb_register) in archive drivers/built-in.aFixes: f59fd9cab730 ("net: mscc: ocelot: configure watermarks using devlink-sb")Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210225143910.3964364-1-arnd@kernel.orgSigned-off-by: Jakub Kicinski List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

59756555 - net: mscc: ocelot: select PACKING in the Kconfig

Wed, 17 Feb 2021 20:33:48 +0000

net: mscc: ocelot: select PACKING in the KconfigOcelot now uses include/linux/dsa/ocelot.h which makes use ofCONFIG_PACKING to pack/unpack bits into the Injection/Extraction FrameHeaders. So it needs to explicitly select it, otherwise there might bebuild errors due to the missing dependency.Fixes: 40d3f295b5fe ("net: mscc: ocelot: use common tag parsing code with DSA")Reported-by: Naresh Kamboju Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

89e35f66 - net: mscc: ocelot: rethink Kconfig dependencies again

Sun, 12 Jul 2020 21:28:33 +0000

net: mscc: ocelot: rethink Kconfig dependencies againHaving the users of MSCC_OCELOT_SWITCH_LIB depend on REGMAP_MMIO was abad idea, since that symbol is not user-selectable. So we should havekept a 'select REGMAP_MMIO'.When we do that, we run into 2 more problems:- By depending on GENERIC_PHY, we are causing a recursive dependency. But it looks like GENERIC_PHY has no other dependencies, and other drivers select it, so we can select it too:drivers/of/Kconfig:69:error: recursive dependency detected!drivers/of/Kconfig:69: symbol OF_IRQ depends on IRQ_DOMAINkernel/irq/Kconfig:68: symbol IRQ_DOMAIN is selected by REGMAPdrivers/base/regmap/Kconfig:7: symbol REGMAP default is visible depending on REGMAP_MMIOdrivers/base/regmap/Kconfig:39: symbol REGMAP_MMIO is selected by MSCC_OCELOT_SWITCH_LIBdrivers/net/ethernet/mscc/Kconfig:15: symbol MSCC_OCELOT_SWITCH_LIB is selected by MSCC_OCELOT_SWITCHdrivers/net/ethernet/mscc/Kconfig:22: symbol MSCC_OCELOT_SWITCH depends on GENERIC_PHYdrivers/phy/Kconfig:8: symbol GENERIC_PHY is selected by PHY_BCM_NS_USB3drivers/phy/broadcom/Kconfig:41: symbol PHY_BCM_NS_USB3 depends on MDIO_BUSdrivers/net/phy/Kconfig:13: symbol MDIO_BUS depends on MDIO_DEVICEdrivers/net/phy/Kconfig:6: symbol MDIO_DEVICE is selected by PHYLIBdrivers/net/phy/Kconfig:254: symbol PHYLIB is selected by ARC_EMAC_COREdrivers/net/ethernet/arc/Kconfig:19: symbol ARC_EMAC_CORE is selected by ARC_EMACdrivers/net/ethernet/arc/Kconfig:25: symbol ARC_EMAC depends on OF_IRQ- By depending on PHYLIB, we are causing a recursive dependency. PHYLIB only has a single dependency, "depends on NETDEVICES", which we are already depending on, so we can again hack our way into conformance by turning the PHYLIB dependency into a select.drivers/of/Kconfig:69:error: recursive dependency detected!drivers/of/Kconfig:69: symbol OF_IRQ depends on IRQ_DOMAINkernel/irq/Kconfig:68: symbol IRQ_DOMAIN is selected by REGMAPdrivers/base/regmap/Kconfig:7: symbol REGMAP default is visible depending on REGMAP_MMIOdrivers/base/regmap/Kconfig:39: symbol REGMAP_MMIO is selected by MSCC_OCELOT_SWITCH_LIBdrivers/net/ethernet/mscc/Kconfig:15: symbol MSCC_OCELOT_SWITCH_LIB is selected by MSCC_OCELOT_SWITCHdrivers/net/ethernet/mscc/Kconfig:22: symbol MSCC_OCELOT_SWITCH depends on PHYLIBdrivers/net/phy/Kconfig:254: symbol PHYLIB is selected by ARC_EMAC_COREdrivers/net/ethernet/arc/Kconfig:19: symbol ARC_EMAC_CORE is selected by ARC_EMACdrivers/net/ethernet/arc/Kconfig:25: symbol ARC_EMAC depends on OF_IRQFixes: f4d0323bae4e ("net: mscc: ocelot: convert MSCC_OCELOT_SWITCH into a library")Signed-off-by: Vladimir Oltean Signed-off-by: Jakub Kicinski List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

14addfb6 - net: mscc: ocelot: rename MSCC_OCELOT_SWITCH_OCELOT to MSCC_OCELOT_SWITCH

Sat, 20 Jun 2020 15:43:42 +0000

net: mscc: ocelot: rename MSCC_OCELOT_SWITCH_OCELOT to MSCC_OCELOT_SWITCHPutting 'ocelot' in the config's name twice just to say that 'it's theocelot driver running on the ocelot SoC' is a bit confusing. Instead,it's just the ocelot driver. Now that we've renamed the previous symbolthat was holding the MSCC_OCELOT_SWITCH_OCELOT into *_LIB (becausethat's what it is), we're free to use this name for the driver.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

f4d0323b - net: mscc: ocelot: convert MSCC_OCELOT_SWITCH into a library

Sat, 20 Jun 2020 15:43:41 +0000

net: mscc: ocelot: convert MSCC_OCELOT_SWITCH into a libraryHide the CONFIG_MSCC_OCELOT_SWITCH option from users. It is meant to beonly a hardware library which is selected by the drivers that use it(ocelot, felix).Since it is "selected" from Kconfig, all its dependencies are manuallytransferred to the driver that selects it. This is because "select" inKconfig language is a bit of a mess, and doesn't handle dependencies ofselected options quite right.Signed-off-by: Vladimir Oltean Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

71e32a20 - net: mscc: ocelot: make use of SerDes PHYs for handling their configuration

Thu, 04 Oct 2018 12:22:08 +0000

net: mscc: ocelot: make use of SerDes PHYs for handling their configurationPreviously, the SerDes muxing was hardcoded to a given mode in the MACcontroller driver. Now, the SerDes muxing is configured within theDevice Tree and is enforced in the MAC controller driver so we can havea lot of different SerDes configurations.Make use of the SerDes PHYs in the MAC controller to set up the SerDesaccording to the SerDes<->switch port mapping and the communication modewith the Ethernet PHY.Signed-off-by: Quentin Schulz Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig

a556c76a - net: mscc: Add initial Ocelot switch support

Mon, 14 May 2018 20:04:57 +0000

net: mscc: Add initial Ocelot switch supportAdd a driver for Microsemi Ocelot Ethernet switch support.This makes two modules:mscc_ocelot_common handles all the common features that doesn't depend onhow the switch is integrated in the SoC. Currently, it handles offloadingbridging to the hardware. ocelot_io.c handles register accesses. This isunfortunately needed because the register layout is packed and then dependson the number of ports available on the switch. The register definitionfiles are automatically generated.ocelot_board handles the switch integration on the SoC and on the board.Frame injection and extraction to/from the CPU port is currently done usingregister accesses which is quite slow. DMA is possible but the port is notable to absorb the whole switch bandwidth.Signed-off-by: Alexandre Belloni Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller List of files: /linux-6.15/drivers/net/ethernet/mscc/Kconfig