91e43ca009
The recent support for DPLL introduced by commit8a3a565ff2("ice: add admin commands to access cgu configuration") and commitd7999f5ea6("ice: implement dpll interface to control cgu") broke linking the ice driver if CONFIG_PTP_1588_CLOCK=n: ld: vmlinux.o: in function `ice_init_feature_support': (.text+0x8702b8): undefined reference to `ice_is_phy_rclk_present' ld: (.text+0x8702cd): undefined reference to `ice_is_cgu_present' ld: (.text+0x8702d9): undefined reference to `ice_is_clock_mux_present_e810t' ld: vmlinux.o: in function `ice_dpll_init_info_direct_pins': ice_dpll.c:(.text+0x894167): undefined reference to `ice_cgu_get_pin_freq_supp' ld: ice_dpll.c:(.text+0x894197): undefined reference to `ice_cgu_get_pin_name' ld: ice_dpll.c:(.text+0x8941a8): undefined reference to `ice_cgu_get_pin_type' ld: vmlinux.o: in function `ice_dpll_update_state': ice_dpll.c:(.text+0x894494): undefined reference to `ice_get_cgu_state' ld: vmlinux.o: in function `ice_dpll_init': (.text+0x8953d5): undefined reference to `ice_get_cgu_rclk_pin_info' The first commit broke things by calling functions in ice_init_feature_support that are compiled as part of ice_ptp_hw.o, including: * ice_is_phy_rclk_present * ice_is_clock_mux_present_e810t * ice_is_cgU_present The second commit continued the break by calling several CGU functions defined in ice_ptp_hw.c in the DPLL code. Because the ice_dpll.c file is compiled unconditionally, it will not link when CONFIG_PTP_1588_CLOCK=n. It might be possible to break this dependency and expose those functions without CONFIG_PTP_1588_CLOCK, but that is not clear to me. For the DPLL case, simply compile ice_dpll.o only when we have CONFIG_PTP_1588_CLOCK. Add stub no-op implementation of ice_dpll_init() and ice_dpll_uninit() when CONFIG_PTP_1588_CLOCK=n into ice_dpll.h The other functions are part of checking the netlist to see if hardware features are enabled. These checks don't really belong in ice_ptp_hw.c, and make more sense as part of the ice_common.c file. We already have ice_is_gps_in_netlist() in ice_common.c which is doing a similar check. Move the functions into ice_common.c and rename them to have the similar postfix of "in_netlist()" to be more expressive of what they are actually checking. This also makes the ice_find_netlist_node only called from within ice_common.c, so its safe to mark it static and stop declaring it in the ice_common.h header as well. Fixes:8a3a565ff2("ice: add admin commands to access cgu configuration") Fixes:d7999f5ea6("ice: implement dpll interface to control cgu") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202309191214.TaYEct4H-lkp@intel.com Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Simon Horman <horms@kernel.org> # build-tested Link: https://lore.kernel.org/r/20231002185132.1575271-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
51 lines
1.1 KiB
Makefile
51 lines
1.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
# Copyright (c) 2018, Intel Corporation.
|
|
|
|
#
|
|
# Makefile for the Intel(R) Ethernet Connection E800 Series Linux Driver
|
|
#
|
|
|
|
obj-$(CONFIG_ICE) += ice.o
|
|
|
|
ice-y := ice_main.o \
|
|
ice_controlq.o \
|
|
ice_common.o \
|
|
ice_nvm.o \
|
|
ice_switch.o \
|
|
ice_sched.o \
|
|
ice_base.o \
|
|
ice_lib.o \
|
|
ice_txrx_lib.o \
|
|
ice_txrx.o \
|
|
ice_fltr.o \
|
|
ice_irq.o \
|
|
ice_pf_vsi_vlan_ops.o \
|
|
ice_vsi_vlan_ops.o \
|
|
ice_vsi_vlan_lib.o \
|
|
ice_fdir.o \
|
|
ice_ethtool_fdir.o \
|
|
ice_vlan_mode.o \
|
|
ice_flex_pipe.o \
|
|
ice_flow.o \
|
|
ice_idc.o \
|
|
ice_devlink.o \
|
|
ice_ddp.o \
|
|
ice_fw_update.o \
|
|
ice_lag.o \
|
|
ice_ethtool.o \
|
|
ice_repr.o \
|
|
ice_tc_lib.o
|
|
ice-$(CONFIG_PCI_IOV) += \
|
|
ice_sriov.o \
|
|
ice_virtchnl.o \
|
|
ice_virtchnl_allowlist.o \
|
|
ice_virtchnl_fdir.o \
|
|
ice_vf_mbx.o \
|
|
ice_vf_vsi_vlan_ops.o \
|
|
ice_vf_lib.o
|
|
ice-$(CONFIG_PTP_1588_CLOCK) += ice_ptp.o ice_ptp_hw.o ice_dpll.o
|
|
ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o
|
|
ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o
|
|
ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o
|
|
ice-$(CONFIG_ICE_SWITCHDEV) += ice_eswitch.o ice_eswitch_br.o
|
|
ice-$(CONFIG_GNSS) += ice_gnss.o
|