| Message ID | 20210917210547.12578-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 87758511075ec961486fe78d7548dd709b524433 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-net] igc: fix build errors for PTP | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Randy Dunlap <rdunlap@infradead.org> writes: > When IGC=y and PTP_1588_CLOCK=m, the ptp_*() interface family is > not available to the igc driver. Make this driver depend on > PTP_1588_CLOCK_OPTIONAL so that it will build without errors. > > Various igc commits have used ptp_*() functions without checking > that PTP_1588_CLOCK is enabled. Fix all of these here. > > Fixes these build errors: > > ld: drivers/net/ethernet/intel/igc/igc_main.o: in function `igc_msix_other': > igc_main.c:(.text+0x6494): undefined reference to `ptp_clock_event' > ld: igc_main.c:(.text+0x64ef): undefined reference to `ptp_clock_event' > ld: igc_main.c:(.text+0x6559): undefined reference to `ptp_clock_event' > ld: drivers/net/ethernet/intel/igc/igc_ethtool.o: in function `igc_ethtool_get_ts_info': > igc_ethtool.c:(.text+0xc7a): undefined reference to `ptp_clock_index' > ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_feature_enable_i225': > igc_ptp.c:(.text+0x330): undefined reference to `ptp_find_pin' > ld: igc_ptp.c:(.text+0x36f): undefined reference to `ptp_find_pin' > ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_init': > igc_ptp.c:(.text+0x11cd): undefined reference to `ptp_clock_register' > ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_stop': > igc_ptp.c:(.text+0x12dd): undefined reference to `ptp_clock_unregister' > ld: drivers/platform/x86/dell/dell-wmi-privacy.o: in function `dell_privacy_wmi_probe': > > Fixes: 64433e5bf40ab ("igc: Enable internal i225 PPS") > Fixes: 60dbede0c4f3d ("igc: Add support for ethtool GET_TS_INFO command") > Fixes: 87938851b6efb ("igc: enable auxiliary PHC functions for the i225") > Fixes: 5f2958052c582 ("igc: Add basic skeleton for PTP") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Ederson de Souza <ederson.desouza@intel.com> > Cc: Tony Nguyen <anthony.l.nguyen@intel.com> > Cc: Vinicius Costa Gomes <vinicius.gomes@intel.com> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > Cc: intel-wired-lan@lists.osuosl.org > --- Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 17 Sep 2021 14:05:47 -0700 you wrote: > When IGC=y and PTP_1588_CLOCK=m, the ptp_*() interface family is > not available to the igc driver. Make this driver depend on > PTP_1588_CLOCK_OPTIONAL so that it will build without errors. > > Various igc commits have used ptp_*() functions without checking > that PTP_1588_CLOCK is enabled. Fix all of these here. > > [...] Here is the summary with links: - [-net] igc: fix build errors for PTP https://git.kernel.org/netdev/net/c/87758511075e You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
--- linux-next-20210917.orig/drivers/net/ethernet/intel/Kconfig +++ linux-next-20210917/drivers/net/ethernet/intel/Kconfig @@ -335,6 +335,7 @@ config IGC tristate "Intel(R) Ethernet Controller I225-LM/I225-V support" default n depends on PCI + depends on PTP_1588_CLOCK_OPTIONAL help This driver supports Intel(R) Ethernet Controller I225-LM/I225-V family of adapters.
When IGC=y and PTP_1588_CLOCK=m, the ptp_*() interface family is not available to the igc driver. Make this driver depend on PTP_1588_CLOCK_OPTIONAL so that it will build without errors. Various igc commits have used ptp_*() functions without checking that PTP_1588_CLOCK is enabled. Fix all of these here. Fixes these build errors: ld: drivers/net/ethernet/intel/igc/igc_main.o: in function `igc_msix_other': igc_main.c:(.text+0x6494): undefined reference to `ptp_clock_event' ld: igc_main.c:(.text+0x64ef): undefined reference to `ptp_clock_event' ld: igc_main.c:(.text+0x6559): undefined reference to `ptp_clock_event' ld: drivers/net/ethernet/intel/igc/igc_ethtool.o: in function `igc_ethtool_get_ts_info': igc_ethtool.c:(.text+0xc7a): undefined reference to `ptp_clock_index' ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_feature_enable_i225': igc_ptp.c:(.text+0x330): undefined reference to `ptp_find_pin' ld: igc_ptp.c:(.text+0x36f): undefined reference to `ptp_find_pin' ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_init': igc_ptp.c:(.text+0x11cd): undefined reference to `ptp_clock_register' ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_stop': igc_ptp.c:(.text+0x12dd): undefined reference to `ptp_clock_unregister' ld: drivers/platform/x86/dell/dell-wmi-privacy.o: in function `dell_privacy_wmi_probe': Fixes: 64433e5bf40ab ("igc: Enable internal i225 PPS") Fixes: 60dbede0c4f3d ("igc: Add support for ethtool GET_TS_INFO command") Fixes: 87938851b6efb ("igc: enable auxiliary PHC functions for the i225") Fixes: 5f2958052c582 ("igc: Add basic skeleton for PTP") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Ederson de Souza <ederson.desouza@intel.com> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Vinicius Costa Gomes <vinicius.gomes@intel.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: intel-wired-lan@lists.osuosl.org --- drivers/net/ethernet/intel/Kconfig | 1 + 1 file changed, 1 insertion(+)