net: ethernet: ti: Remove TI_CPTS_MOD workaround
Subsystems (5)
PATCH 1/1 net: ethernet: ti: Remove TI_CPTS_MOD workaround
My recent commit b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK") exposes a missing dependency in defconfigs that select TI_CPTS without selecting PTP_1588_CLOCK, leading to linker errors of the form:
drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':
cpsw.c:(.text+0x680): undefined reference to cpts_unregister' drivers/net/ethernet/ti/cpsw.o: in function cpsw_remove':
cpsw.c:(.text+0x81c): undefined reference to cpts_release' drivers/net/ethernet/ti/cpsw.o: in function cpsw_rx_handler':
cpsw.c:(.text+0x1324): undefined reference to cpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: in function cpsw_ndo_open':
cpsw.c:(.text+0x15ec): undefined reference to cpts_register' drivers/net/ethernet/ti/cpsw.o: in function cpsw_probe':
cpsw.c:(.text+0x2468): undefined reference to `cpts_release'
That's because TI_CPTS_MOD (which is the symbol gating the _compilation_ of cpts.c) now depends on PTP_1588_CLOCK, and so is not enabled in these configurations, but TI_CPTS (which is the symbol gating _calls_ to the cpts functions) _is_ enabled. So we end up compiling calls to functions that don't exist, resulting in the linker errors.
The reason we have two symbols (TI_CPTS and TI_CPTS_MOD) for the same driver is due to commit be9ca0d33c85 ("cpsw/netcp: work around reverse cpts dependency"), which introduced TI_CPTS_MOD because (quoting the commit message):
Quoted 11 lines
The dependency is reversed: cpsw and netcp call into cpts, but cpts depends on the other two in
Kconfig. This can lead to cpts being a loadable module and its callers built-in:
drivers/net/ethernet/ti/cpsw.o: In function `cpsw_remove':
cpsw.c:(.text.cpsw_remove+0xd0): undefined reference tocpts_release' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_rx_handler':
cpsw.c:(.text.cpsw_rx_handler+0x2dc): undefined reference tocpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_tx_handler':
cpsw.c:(.text.cpsw_tx_handler+0x7c): undefined reference tocpts_tx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_ndo_stop':
Both forms of linker error -- those caused by defconfigs that select TI_CPTS without PTP_1588_CLOCK and those caused by configuring TI_CPSW as a built-in and TI_CPTS as a module -- can be avoided by using the IS_REACHABLE() macro to gate calls to cpts functions, and using the TI_CPTS symbol to gate compilation of cpts.c. cpts.h already provides the no-op stub implementations of the cpts functions required to make this work, we just need to change the existing IS_ENABLED(TI_CPTS) guards to IS_REACHABLE(TI_CPTS).
With this change there is no longer any need for the TI_CPTS_MOD symbol, so we can remove it.
To preserve the existing behavior of defconfigs that select TI_CPTS, we must also select PTP_1588_CLOCK so that the dependency is satisfied. omap2plus_defconfig and keystone_defconfig have not been updated in a while, so some unrelated no-op changes appear in the diff.
--- arch/arm/configs/keystone_defconfig | 72 ++++++++++++-------------- arch/arm/configs/omap2plus_defconfig | 3 +- drivers/net/ethernet/ti/Kconfig | 13 ++--- drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/cpsw_ethtool.c | 2 +- drivers/net/ethernet/ti/cpts.h | 3 +- drivers/net/ethernet/ti/netcp_ethss.c | 10 ++-- 7 files changed, 45 insertions(+), 60 deletions(-)
arch/arm/configs/keystone_defconfig +32 -40
@@ -1,44 +1,41 @@ # CONFIG_SWAP is not set CONFIG_POSIX_MQUEUE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_SCHED=y -CONFIG_BLK_CGROUP=y CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_BASE_FULL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARM_LPAE=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_KEYSTONE=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_CMA=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_SUSPEND is not set CONFIG_PM=y +CONFIG_TI_SCI_PROTOCOL=y +CONFIG_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
@@ -65,9 +62,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V2=y CONFIG_INET_AH=y CONFIG_INET_IPCOMP=y -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y
@@ -93,7 +87,6 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NF_CONNTRACK_IPV4=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y
@@ -114,17 +107,18 @@ CONFIG_VLAN_8021Q=y CONFIG_CAN=m CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_PCI=y +CONFIG_PCI_MSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PLATRAM=y -CONFIG_MTD_M25P80=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_DAVINCI=y CONFIG_MTD_SPI_NOR=y +CONFIG_SPI_CADENCE_QUADSPI=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_SRAM=y
@@ -134,8 +128,12 @@ CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y CONFIG_TI_KEYSTONE_NETCP=y CONFIG_TI_KEYSTONE_NETCP_ETHSS=y -CONFIG_TI_CPTS=y +CONFIG_DP83867_PHY=y CONFIG_MARVELL_PHY=y +CONFIG_MICREL_PHY=y +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_GPIO_DECODER=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y
@@ -147,14 +145,16 @@ CONFIG_I2C_DAVINCI=y CONFIG_SPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_SYSCON=y -CONFIG_POWER_SUPPLY=y +CONFIG_GPIO_PCA953X=m CONFIG_POWER_RESET=y CONFIG_POWER_RESET_KEYSTONE=y +CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_DAVINCI_WATCHDOG=y
@@ -166,8 +166,8 @@ CONFIG_USB_MON=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y -CONFIG_NOP_USB_XCEIV=y CONFIG_KEYSTONE_USB_PHY=y +CONFIG_NOP_USB_XCEIV=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y
@@ -180,9 +180,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_ACTIVITY=y CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_DMADEVICES=y -CONFIG_TI_EDMA=y CONFIG_MAILBOX=y CONFIG_TI_MESSAGE_MANAGER=y CONFIG_SOC_TI=y
@@ -196,7 +197,6 @@ CONFIG_PWM_TIECAP=m CONFIG_KEYSTONE_IRQ=y CONFIG_RESET_TI_SCI=m CONFIG_RESET_TI_SYSCON=m -CONFIG_TI_SCI_PROTOCOL=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_FANOTIFY=y
@@ -217,10 +217,6 @@ CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_DEBUG_USER=y CONFIG_CRYPTO_USER=y CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_CBC=y
@@ -230,12 +226,8 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y -CONFIG_SPI_CADENCE_QUADSPI=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_GPIO_DECODER=m -CONFIG_GPIO_PCA953X=m -CONFIG_LEDS_TRIGGER_ACTIVITY=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_MICREL_PHY=y -CONFIG_DP83867_PHY=y +CONFIG_DMA_CMA=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_SHIRQ=y +CONFIG_DEBUG_USER=y
arch/arm/configs/omap2plus_defconfig +1 -2
@@ -57,7 +57,6 @@ CONFIG_CPUFREQ_DT=m CONFIG_ARM_TI_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y -CONFIG_DT_IDLE_STATES=y CONFIG_KERNEL_MODE_NEON=y CONFIG_PM_DEBUG=y CONFIG_ARM_CRYPTO=y
@@ -189,7 +188,6 @@ CONFIG_SMSC911X=y CONFIG_TI_DAVINCI_EMAC=y CONFIG_TI_CPSW=y CONFIG_TI_CPSW_SWITCHDEV=y -CONFIG_TI_CPTS=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_DP83848_PHY=y
@@ -274,6 +272,7 @@ CONFIG_SPI_TI_QSPI=m CONFIG_HSI=m CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y
drivers/net/ethernet/ti/Kconfig +4 -9
@@ -77,23 +77,18 @@ config TI_CPSW_SWITCHDEV will be called cpsw_new. config TI_CPTS - bool "TI Common Platform Time Sync (CPTS) Support" + tristate "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK - depends on POSIX_TIMERS + depends on PTP_1588_CLOCK + default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y + default m ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the driver offers a PTP Hardware Clock. -config TI_CPTS_MOD - tristate - depends on TI_CPTS - depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default m - config TI_K3_AM65_CPSW_NUSS tristate "TI K3 AM654x/J721E CPSW Ethernet driver" depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER
drivers/net/ethernet/ti/Makefile +1 -1
@@ -13,7 +13,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o -obj-$(CONFIG_TI_CPTS_MOD) += cpts.o +obj-$(CONFIG_TI_CPTS) += cpts.o obj-$(CONFIG_TI_CPSW) += ti_cpsw.o ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o cpsw_sl.o cpsw_ethtool.o obj-$(CONFIG_TI_CPSW_SWITCHDEV) += ti_cpsw_new.o
drivers/net/ethernet/ti/cpsw_ethtool.c +1 -1
@@ -709,7 +709,7 @@ int cpsw_set_ringparam(struct net_device *ndev,return ret; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )int cpsw_get_ts_info (struct net_device *ndev,struct ethtool_ts_info *info) {struct cpsw_common *cpsw =ndev_to_cpsw (ndev);
drivers/net/ethernet/ti/cpts.h +1 -2
@@ -8,7 +8,7 @@#ifndef _TI_CPTS_H_#define _TI_CPTS_H_ -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )#include <linux/clk.h> #include <linux/clkdev.h>
@@ -171,5 +171,4 @@ static inline bool cpts_can_timestamp(struct cpts *cpts, struct sk_buff *skb) }#endif -#endif
drivers/net/ethernet/ti/netcp_ethss.c +5 -5
@@ -181,7 +181,7 @@#define HOST_TX_PRI_MAP_DEFAULT 0x00000000 -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )/* Px_TS_CTL register fields */ #define TS_RX_ANX_F_EN BIT(0)#define TS_RX_VLAN_LT1_EN BIT(1)
@@ -2000,7 +2000,7 @@ static int keystone_set_link_ksettings(struct net_device *ndev,return phy_ethtool_ksettings_set (phy, cmd); } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static int keystone_get_ts_info (struct net_device *ndev,struct ethtool_ts_info *info) {
@@ -2532,7 +2532,7 @@ static int gbe_del_vid(void *intf_priv, int vid)return 0 ; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static void gbe_txtstamp (void *context,struct sk_buff *skb) {
@@ -2977,7 +2977,7 @@ static int gbe_close(void *intf_priv, struct net_device *ndev)return 0 ; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static void init_slave_ts_ctl (struct gbe_slave *slave) { slave->ts_ctl.uni =1 ;
@@ -3718,7 +3718,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, gbe_dev->cpts =cpts_create (gbe_dev->dev, gbe_dev->cpts_reg, cpts_node);of_node_put (cpts_node); -if (IS_ENABLED (CONFIG_TI_CPTS ) &&IS_ERR (gbe_dev->cpts)) { +if (IS_REACHABLE (CONFIG_TI_CPTS ) &&IS_ERR (gbe_dev->cpts)) { ret =PTR_ERR (gbe_dev->cpts); goto free_sec_ports; }
Signature · 1 line
2.20.1
Tony Lindgren
maintainerarch/arm/configs/omap2plus_defconfig CONFIG_CPUFREQ_DT=m · line 62
Quoted 12 lines · Clay McClure
arch/arm/configs/omap2plus_defconfig +0
-1@@ -57,7 +57,6 @@ CONFIG_CPUFREQ_DT=m CONFIG_ARM_TI_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y -CONFIG_DT_IDLE_STATES=y CONFIG_KERNEL_MODE_NEON=y CONFIG_PM_DEBUG=y CONFIG_ARM_CRYPTO=y
Hmm the change above does not look related. Can you please check all the defconfig related changes so you are only changing the related options?
Regards,
Tony
Quoted 4 lines · Clay McClure
To preserve the existing behavior of defconfigs that select
TI_CPTS, we must also selectPTP_1588_CLOCKso that the dependency is satisfied.omap2plus_defconfigandkeystone_defconfighave not been updated in a while, so some unrelated no-op changes appear in the diff.
Please don't do that at all. If you need to add a line to the defconfig file, add just that line, to avoid merge conflicts and dropping unrelated lines that have not been caught but need to be preserved in some way (by enabling another dependency, or renaming the option).
Arnd
PATCH v2 1/1 net: ethernet: ti: Remove TI_CPTS_MOD workaround
My recent commit b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK") exposes a missing dependency in defconfigs that select TI_CPTS without selecting PTP_1588_CLOCK, leading to linker errors of the form:
drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':
cpsw.c:(.text+0x680): undefined reference to cpts_unregister' drivers/net/ethernet/ti/cpsw.o: in function cpsw_remove':
cpsw.c:(.text+0x81c): undefined reference to cpts_release' drivers/net/ethernet/ti/cpsw.o: in function cpsw_rx_handler':
cpsw.c:(.text+0x1324): undefined reference to cpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: in function cpsw_ndo_open':
cpsw.c:(.text+0x15ec): undefined reference to cpts_register' drivers/net/ethernet/ti/cpsw.o: in function cpsw_probe':
cpsw.c:(.text+0x2468): undefined reference to `cpts_release'
That's because TI_CPTS_MOD (which is the symbol gating the _compilation_ of cpts.c) now depends on PTP_1588_CLOCK, and so is not enabled in these configurations, but TI_CPTS (which is the symbol gating _calls_ to the cpts functions) _is_ enabled. So we end up compiling calls to functions that don't exist, resulting in the linker errors.
The reason we have two symbols (TI_CPTS and TI_CPTS_MOD) for the same driver is due to commit be9ca0d33c85 ("cpsw/netcp: work around reverse cpts dependency"), which introduced TI_CPTS_MOD because (quoting the commit message):
Quoted 11 lines
The dependency is reversed: cpsw and netcp call into cpts, but cpts depends on the other two in
Kconfig. This can lead to cpts being a loadable module and its callers built-in:
drivers/net/ethernet/ti/cpsw.o: In function `cpsw_remove':
cpsw.c:(.text.cpsw_remove+0xd0): undefined reference tocpts_release' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_rx_handler':
cpsw.c:(.text.cpsw_rx_handler+0x2dc): undefined reference tocpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_tx_handler':
cpsw.c:(.text.cpsw_tx_handler+0x7c): undefined reference tocpts_tx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_ndo_stop':
Both forms of linker error -- those caused by defconfigs that select TI_CPTS without PTP_1588_CLOCK and those caused by configuring TI_CPSW as a built-in and TI_CPTS as a module -- can be avoided by using the IS_REACHABLE() macro to gate calls to cpts functions, and using the TI_CPTS symbol to gate compilation of cpts.c. cpts.h already provides the no-op stub implementations of the cpts functions required to make this work, we just need to change the existing IS_ENABLED(TI_CPTS) guards to IS_REACHABLE(TI_CPTS).
With this change there is no longer any need for the TI_CPTS_MOD symbol, so we can remove it.
To preserve the existing behavior of defconfigs that select TI_CPTS, we must also select PTP_1588_CLOCK so that the dependency is satisfied.
---
Changes in v2:
- Don't regenerate the defconfigs, just add PTP_1588_CLOCK.
arch/arm/configs/keystone_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 1 + drivers/net/ethernet/ti/Kconfig | 13 ++++--------- drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/cpsw_ethtool.c | 2 +- drivers/net/ethernet/ti/cpts.h | 3 +-- drivers/net/ethernet/ti/netcp_ethss.c | 10 +++++----- 7 files changed, 14 insertions(+), 18 deletions(-)
arch/arm/configs/keystone_defconfig +1 -0
@@ -147,6 +147,7 @@ CONFIG_I2C_DAVINCI=y CONFIG_SPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y
arch/arm/configs/omap2plus_defconfig +1 -0
@@ -274,6 +274,7 @@ CONFIG_SPI_TI_QSPI=m CONFIG_HSI=m CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y
drivers/net/ethernet/ti/Kconfig +4 -9
@@ -77,23 +77,18 @@ config TI_CPSW_SWITCHDEV will be called cpsw_new. config TI_CPTS - bool "TI Common Platform Time Sync (CPTS) Support" + tristate "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK - depends on POSIX_TIMERS + depends on PTP_1588_CLOCK + default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y + default m ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the driver offers a PTP Hardware Clock. -config TI_CPTS_MOD - tristate - depends on TI_CPTS - depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default m - config TI_K3_AM65_CPSW_NUSS tristate "TI K3 AM654x/J721E CPSW Ethernet driver" depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER
drivers/net/ethernet/ti/Makefile +1 -1
@@ -13,7 +13,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o -obj-$(CONFIG_TI_CPTS_MOD) += cpts.o +obj-$(CONFIG_TI_CPTS) += cpts.o obj-$(CONFIG_TI_CPSW) += ti_cpsw.o ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o cpsw_sl.o cpsw_ethtool.o obj-$(CONFIG_TI_CPSW_SWITCHDEV) += ti_cpsw_new.o
drivers/net/ethernet/ti/cpsw_ethtool.c +1 -1
@@ -709,7 +709,7 @@ int cpsw_set_ringparam(struct net_device *ndev,return ret; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )int cpsw_get_ts_info (struct net_device *ndev,struct ethtool_ts_info *info) {struct cpsw_common *cpsw =ndev_to_cpsw (ndev);
drivers/net/ethernet/ti/cpts.h +1 -2
@@ -8,7 +8,7 @@#ifndef _TI_CPTS_H_#define _TI_CPTS_H_ -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )#include <linux/clk.h> #include <linux/clkdev.h>
@@ -171,5 +171,4 @@ static inline bool cpts_can_timestamp(struct cpts *cpts, struct sk_buff *skb) }#endif -#endif
drivers/net/ethernet/ti/netcp_ethss.c +5 -5
@@ -181,7 +181,7 @@#define HOST_TX_PRI_MAP_DEFAULT 0x00000000 -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )/* Px_TS_CTL register fields */ #define TS_RX_ANX_F_EN BIT(0)#define TS_RX_VLAN_LT1_EN BIT(1)
@@ -2000,7 +2000,7 @@ static int keystone_set_link_ksettings(struct net_device *ndev,return phy_ethtool_ksettings_set (phy, cmd); } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static int keystone_get_ts_info (struct net_device *ndev,struct ethtool_ts_info *info) {
@@ -2532,7 +2532,7 @@ static int gbe_del_vid(void *intf_priv, int vid)return 0 ; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static void gbe_txtstamp (void *context,struct sk_buff *skb) {
@@ -2977,7 +2977,7 @@ static int gbe_close(void *intf_priv, struct net_device *ndev)return 0 ; } -#if IS_ENABLED (CONFIG_TI_CPTS ) +#if IS_REACHABLE (CONFIG_TI_CPTS )static void init_slave_ts_ctl (struct gbe_slave *slave) { slave->ts_ctl.uni =1 ;
@@ -3718,7 +3718,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, gbe_dev->cpts =cpts_create (gbe_dev->dev, gbe_dev->cpts_reg, cpts_node);of_node_put (cpts_node); -if (IS_ENABLED (CONFIG_TI_CPTS ) &&IS_ERR (gbe_dev->cpts)) { +if (IS_REACHABLE (CONFIG_TI_CPTS ) &&IS_ERR (gbe_dev->cpts)) { ret =PTR_ERR (gbe_dev->cpts); goto free_sec_ports; }
Signature · 1 line
2.20.1
Quoted 50 lines · Clay McClure
My recent commit
b6d49cab44b5("net: Make PTP-specific drivers depend onPTP_1588_CLOCK") exposes a missing dependency in defconfigs that selectTI_CPTSwithout selectingPTP_1588_CLOCK, leading to linker errors of the form:
drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':
cpsw.c:(.text+0x680): undefined reference tocpts_unregister' drivers/net/ethernet/ti/cpsw.o: in functioncpsw_remove':
cpsw.c:(.text+0x81c): undefined reference tocpts_release' drivers/net/ethernet/ti/cpsw.o: in functioncpsw_rx_handler':
cpsw.c:(.text+0x1324): undefined reference tocpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: in functioncpsw_ndo_open':
cpsw.c:(.text+0x15ec): undefined reference tocpts_register' drivers/net/ethernet/ti/cpsw.o: in functioncpsw_probe':
cpsw.c:(.text+0x2468): undefined reference to `cpts_release'That's because
TI_CPTS_MOD(which is the symbol gating the _compilation_ ofcpts.c) now depends onPTP_1588_CLOCK, and so is not enabled in these configurations, butTI_CPTS(which is the symbol gating _calls_ to the cpts functions) _is_ enabled. So we end up compiling calls to functions that don't exist, resulting in the linker errors.The reason we have two symbols (
TI_CPTSandTI_CPTS_MOD) for the same driver is due to commitbe9ca0d33c85("cpsw/netcp: work around reverse cpts dependency"), which introducedTI_CPTS_MODbecause (quoting the commit message):Quoted 11 lines
The dependency is reversed: cpsw and netcp call into cpts, but cpts depends on the other two in
Kconfig. This can lead to cpts being a loadable module and its callers built-in:
drivers/net/ethernet/ti/cpsw.o: In function `cpsw_remove':
cpsw.c:(.text.cpsw_remove+0xd0): undefined reference tocpts_release' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_rx_handler':
cpsw.c:(.text.cpsw_rx_handler+0x2dc): undefined reference tocpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_tx_handler':
cpsw.c:(.text.cpsw_tx_handler+0x7c): undefined reference tocpts_tx_timestamp' drivers/net/ethernet/ti/cpsw.o: In functioncpsw_ndo_stop':Both forms of linker error -- those caused by defconfigs that select
TI_CPTSwithoutPTP_1588_CLOCKand those caused by configuringTI_CPSWas a built-in andTI_CPTSas a module -- can be avoided by using theIS_REACHABLE()macro to gate calls to cpts functions, and using theTI_CPTSsymbol to gate compilation ofcpts.c.cpts.halready provides the no-op stub implementations of the cpts functions required to make this work, we just need to change the existingIS_ENABLED(TI_CPTS)guards toIS_REACHABLE(TI_CPTS).With this change there is no longer any need for the
TI_CPTS_MODsymbol, so we can remove it.
Quoted 6 lines
To preserve the existing behavior of defconfigs that select
TI_CPTS, we must also selectPTP_1588_CLOCKso that the dependency is satisfied.Cc Arnd Bergmann <[email protected]>Cc Grygorii Strashko <[email protected]>Fixes b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK")
It's better if you send v2 not as reply to v1.
just to clarify. After these two patches
- the PTP_1588_CLOCK can still be set to "M"
- which will cause TI_CPTS to be "M",
- but TI_CPSW will still be "Y".
and all above will build and produce built-in CPSW without CPTS support and cpts.ko which is loadable, but not functional.
Sorry, I'm a little bit lost regarding the target you'are trying to achieve. At least previously "imply PTP_1588_CLOCK" allowed to select properly PTP_1588_CLOCK without modifying every defconfig.
Quoted 46 lines
Reported-by kbuild test robot <[email protected]>Signed-off-by Clay McClure <[email protected]>---
Changes in v2:- Don't regenerate the defconfigs, just add
PTP_1588_CLOCK.arch/arm/configs/keystone_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 1 + drivers/net/ethernet/ti/Kconfig | 13 ++++--------- drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/cpsw_ethtool.c | 2 +- drivers/net/ethernet/ti/cpts.h | 3 +-- drivers/net/ethernet/ti/netcp_ethss.c | 10 +++++----- 7 files changed, 14 insertions(+), 18 deletions(-)arch/arm/configs/keystone_defconfig +1
-0@@ -147,6 +147,7 @@ CONFIG_I2C_DAVINCI=y CONFIG_SPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=yarch/arm/configs/omap2plus_defconfig +1
-0@@ -274,6 +274,7 @@ CONFIG_SPI_TI_QSPI=m CONFIG_HSI=m CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=ydrivers/net/ethernet/ti/Kconfig +0
-0@@ -77,23 +77,18 @@ config TI_CPSW_SWITCHDEV will be called cpsw_new.
drivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 85
Quoted 10 lines
drivers/net/ethernet/ti/Kconfig +3
-2config TI_CPTS - bool "TI Common Platform Time Sync (CPTS) Support" + tristate "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK - depends on POSIX_TIMERS + depends on PTP_1588_CLOCK + default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y
even with above statement it's possible to force TI_CPTS="M" while CPSW/NETCP="Y"
drivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 86
Quoted 1 line
drivers/net/ethernet/ti/Kconfig +1
-0+ default m
I could be mistaken by above 2 lines seems can be 'imply TI_CPTS' in TI_CPSW, TI_KEYSTONE_NETCP, TI_CPSW_SWITCHDEV
drivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 96
Quoted 12 lines
drivers/net/ethernet/ti/Kconfig +0
-6---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the driver offers a PTP Hardware Clock. -config TI_CPTS_MOD - tristate - depends on TI_CPTS - depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default m
and this prevented user from forcing TI_CPTS="M" while CPSW/NETCP="Y"
drivers/net/ethernet/ti/Makefile
Quoted 6 lines
drivers/net/ethernet/ti/Kconfig +0
-1- config TI_K3_AM65_CPSW_NUSS tristate "TI K3 AM654x/J721E CPSW Ethernet driver"depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYERdrivers/net/ethernet/ti/Makefile +0
-0
Below small diff should fix build fail:
drivers/net/ethernet/ti/Kconfig +1 -1
@@ -81,6 +81,7 @@ config TI_CPTS depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK depends on POSIX_TIMERS + depends on PTP_1588_CLOCK ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
@@ -90,7 +91,6 @@ config TI_CPTS config TI_CPTS_MOD tristate depends on TI_CPTS - depends on PTP_1588_CLOCK default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y default m
Then separate patch can be used to enable PTP_1588_CLOCK in defconfigs.
My personal opinion - it might be better to revert TI CPTS part from b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK") at all.
Signature · 7 lines
Best regards, grygorii _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 1 line · Grygorii Strashko
It's better if you send v2 not as reply to v1.
Noted, thank you, and thank you for taking the time to review my patch.
Quoted 11 lines
just to clarify. After these two patches
- thePTP_1588_CLOCKcan still be set to "M"
- which will causeTI_CPTSto be "M",
- butTI_CPSWwill still be "Y".and all above will build and produce built-in CPSW without CPTS support and cpts.ko which is loadable, but not functional.
Sorry, I'm a little bit lost regarding the target you'are trying to achieve. At least previously "imply
PTP_1588_CLOCK" allowed to select properlyPTP_1588_CLOCKwithout modifying every defconfig.
Well, I just wanted to squelch a WARN_ON(). As Arnd pointed out in [1], code that uses the stubbed cpts functions is supposed to gracefully handle receiving a null pointer. Splatting a warning is not graceful, and that's what I was trying to fix.
But your question in [2] prompted me to consider whether it should be possible to build TI_CPTS without PTP_1588_CLOCK at all. I think the answer is no, so I tried to fix it, but you're right, it's still possible to end up with a nonfunctional module after my patch.
If you prefer to revert, that's fine with me. Should I post a patch, or just ask David to revert?
Signature · 4 lines
Clay [1]: https://lore.kernel.org/lkml/CAK8P3a22aSbpcVK-cZ6rhnPgbYEGU3z__G9xk1EexOPZd5Hmzw@mail.gmail.com/ [2]: https://lore.kernel.org/lkml/[email protected]/
Quoted 115 lines
Quoted 46 lines
Reported-by kbuild test robot <[email protected]>Signed-off-by Clay McClure <[email protected]>---
Changes in v2:- Don't regenerate the defconfigs, just add
PTP_1588_CLOCK.arch/arm/configs/keystone_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 1 + drivers/net/ethernet/ti/Kconfig | 13 ++++--------- drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/cpsw_ethtool.c | 2 +- drivers/net/ethernet/ti/cpts.h | 3 +-- drivers/net/ethernet/ti/netcp_ethss.c | 10 +++++----- 7 files changed, 14 insertions(+), 18 deletions(-)arch/arm/configs/keystone_defconfig +1
-0@@ -147,6 +147,7 @@ CONFIG_I2C_DAVINCI=y CONFIG_SPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=yarch/arm/configs/omap2plus_defconfig +1
-0@@ -274,6 +274,7 @@ CONFIG_SPI_TI_QSPI=m CONFIG_HSI=m CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=ydrivers/net/ethernet/ti/Kconfig +0
-0drivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 84
Quoted 10 lines
drivers/net/ethernet/ti/Kconfig +3
-2@@ -77,23 +77,18 @@ config TI_CPSW_SWITCHDEV will be called cpsw_new. config TI_CPTS - bool "TI Common Platform Time Sync (CPTS) Support" + tristate "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK - depends on POSIX_TIMERS + depends on PTP_1588_CLOCK + default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=yeven with above statement it's possible to force TI_CPTS="M" while CPSW/NETCP="Y"
drivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 85
Quoted 1 line
drivers/net/ethernet/ti/Kconfig +1
-0+ default mI could be mistaken by above 2 lines seems can be 'imply
TI_CPTS' inTI_CPSW,TI_KEYSTONE_NETCP,TI_CPSW_SWITCHDEVdrivers/net/ethernet/ti/Kconfig config TI_CPSW_SWITCHDEV · line 94
Quoted 11 lines
drivers/net/ethernet/ti/Kconfig +0
-6---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the driver offers a PTP Hardware Clock. -config TI_CPTS_MOD - tristate - depends on TI_CPTS - depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default mand this prevented user from forcing TI_CPTS="M" while CPSW/NETCP="Y"
drivers/net/ethernet/ti/Makefile
Quoted 6 lines
drivers/net/ethernet/ti/Kconfig +0
-1- config TI_K3_AM65_CPSW_NUSS tristate "TI K3 AM654x/J721E CPSW Ethernet driver" depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYERdrivers/net/ethernet/ti/Makefile +0
-0Below small diff should fix build fail:
drivers/net/ethernet/ti/Kconfig +1
-1@@ -81,6 +81,7 @@ config TI_CPTS depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST depends on COMMON_CLK depends on POSIX_TIMERS + depends on PTP_1588_CLOCK ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.@@ -90,7 +91,6 @@ config TI_CPTS config TI_CPTS_MOD tristate depends on TI_CPTS - depends on PTP_1588_CLOCK default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y default mThen separate patch can be used to enable
PTP_1588_CLOCKin defconfigs.My personal opinion - it might be better to revert TI CPTS part from
b6d49cab44b5("net: Make PTP-specific drivers depend onPTP_1588_CLOCK") at all.Signature · 2 lines
Best regards, grygorii
Quoted 23 lines · Clay McClure
Quoted 1 line · Grygorii Strashko
It's better if you send v2 not as reply to v1.
Noted, thank you, and thank you for taking the time to review my patch.
Quoted 11 lines
just to clarify. After these two patches
- thePTP_1588_CLOCKcan still be set to "M"
- which will causeTI_CPTSto be "M",
- butTI_CPSWwill still be "Y".and all above will build and produce built-in CPSW without CPTS support and cpts.ko which is loadable, but not functional.
Sorry, I'm a little bit lost regarding the target you'are trying to achieve. At least previously "imply
PTP_1588_CLOCK" allowed to select properlyPTP_1588_CLOCKwithout modifying every defconfig.Well, I just wanted to squelch a
WARN_ON(). As Arnd pointed out in [1], code that uses the stubbed cpts functions is supposed to gracefully handle receiving a null pointer. Splatting a warning is not graceful, and that's what I was trying to fix.
Quoted 8 lines
But your question in [2] prompted me to consider whether it should be possible to build
TI_CPTSwithoutPTP_1588_CLOCKat all. I think the answer is no, so I tried to fix it, but you're right, it's still possible to end up with a nonfunctional module after my patch.If you prefer to revert, that's fine with me. Should I post a patch, or just ask David to revert?
Ok. After some thinking and hence you commit b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK") seems was merged in net (not net-next)
1) for-net: defconfig changes can be separated to fix build fail, but add change for multi_v7_defconfig
2) for-net-next: rest of changes plus below diff on top of it
drivers/net/ethernet/ti/Kconfig +4 -3
@@ -49,6 +49,7 @@ config TI_CPSW_PHY_SEL config TI_CPSW tristate "TI CPSW Switch Support" depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST + depends on TI_CPTS || !TI_CPTS select TI_DAVINCI_MDIO select MFD_SYSCON select PAGE_POOL
@@ -64,6 +65,7 @@ config TI_CPSW_SWITCHDEV tristate "TI CPSW Switch Support with switchdev" depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST depends on NET_SWITCHDEV + depends on TI_CPTS || !TI_CPTS select PAGE_POOL select TI_DAVINCI_MDIO select MFD_SYSCON
@@ -78,11 +80,9 @@ config TI_CPSW_SWITCHDEV config TI_CPTS tristate "TI Common Platform Time Sync (CPTS) Support" - depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST + depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST depends on COMMON_CLK depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default m ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
@@ -109,6 +109,7 @@ config TI_KEYSTONE_NETCP select TI_DAVINCI_MDIO depends on OF depends on KEYSTONE_NAVIGATOR_DMA && KEYSTONE_NAVIGATOR_QMSS + depends on TI_CPTS || !TI_CPTS ---help--- This driver supports TI's Keystone NETCP Core.
It should properly resolve "M" vs "Y" dependencies between
PTP_1588_CLOCK->TI_CPTS->TI_CPSW
On thing, TI_CPTS can be selected without TI_CPSW, but it's probably ok.
Signature · 7 lines
Best regards, grygorii _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 54 lines · Grygorii Strashko
Quoted 3 lines · Clay McClure
On Tue, May 05, 2020 at 10:41:26AM +0300, Grygorii Strashko wrote:
Ok. After some thinking and hence you commit
b6d49cab44b5("net: Make PTP-specific drivers depend onPTP_1588_CLOCK") seems was merged in net (not net-next)
1) for-net: defconfig changes can be separated to fix build fail, but add change formulti_v7_defconfig
2) for-net-next: rest of changes plus below diff on top of itdrivers/net/ethernet/ti/Kconfig +4
-3@@ -49,6 +49,7 @@ config TI_CPSW_PHY_SEL config TI_CPSW tristate "TI CPSW Switch Support" depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST + depends on TI_CPTS || !TI_CPTS select TI_DAVINCI_MDIO select MFD_SYSCON select PAGE_POOL@@ -64,6 +65,7 @@ config TI_CPSW_SWITCHDEV tristate "TI CPSW Switch Support with switchdev" depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST depends on NET_SWITCHDEV + depends on TI_CPTS || !TI_CPTS select PAGE_POOL select TI_DAVINCI_MDIO select MFD_SYSCON@@ -78,11 +80,9 @@ config TI_CPSW_SWITCHDEV config TI_CPTS tristate "TI Common Platform Time Sync (CPTS) Support" - depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST + depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST depends on COMMON_CLK depends on PTP_1588_CLOCK - default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - default m ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.@@ -109,6 +109,7 @@ config TI_KEYSTONE_NETCP select TI_DAVINCI_MDIO depends on OF depends on KEYSTONE_NAVIGATOR_DMA && KEYSTONE_NAVIGATOR_QMSS + depends on TI_CPTS || !TI_CPTS ---help--- This driver supports TI's Keystone NETCP Core.It should properly resolve "M" vs "Y" dependencies between
PTP_1588_CLOCK->TI_CPTS->TI_CPSW
Quoted 1 line
On thing,
TI_CPTScan be selected withoutTI_CPSW, but it's probably ok.
I think that solution is reasonable. I had come up with a different for when I ran
into the build failure, but I like yours better. Here is my patch, for reference:
commit 94233d78655876f735189890eb40ef33c49e8523 (HEAD -> randconfig)
Author: Arnd Bergmann <[email protected]> Date: Thu May 7 21:25:59 2020 +0200
cpsw: fix cpts link failure
When CONFIG_PTP_1588_CLOCK is a loadable module, trying to build cpts support into the built-in cpsw driver results in a link error:
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function
`cpsw_probe':
cpsw.c:(.text+0x918): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function
`cpsw_remove':
cpsw.c:(.text+0x1048): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function
`cpsw_rx_handler':
cpsw.c:(.text+0x12c0): undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function
`cpsw_ndo_open':
Add a dependency for CPTS that only allows it to be enabled when doing so does not cause link-time probles.
PTP_1588_CLOCK")
drivers/net/ethernet/ti/Kconfig +0 -0
@@ -79,6 +79,9 @@ config TI_CPSW_SWITCHDEV config TI_CPTS bool "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV
|| COMPILE_TEST + depends on TI_CPSW=n || TI_CPSW=PTP_1588_CLOCK || PTP_1588_CLOCK=y + depends on TI_KEYSTONE_NETCP=n || TI_KEYSTONE_NETCP=PTP_1588_CLOCK || PTP_1588_CLOCK=y + depends on TI_CPSW_SWITCHDEV=n || TI_CPSW_SWITCHDEV=PTP_1588_CLOCK || PTP_1588_CLOCK=y
depends on COMMON_CLK
depends on POSIX_TIMERS
---help---