Skip to contentSkip to conversation

ice: fix build issue if CONFIG_1588_PTP_CLOCk=m

PATCH New Jacob Keller 2 participants 2 messages Jul 9, 2021 – Jul 30, 2021 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice: fix build issue if CONFIG_1588_PTP_CLOCk=m

If the CONFIG_1588_PTP_CLOCK symbol is set to m, then the driver will not compile ice_ptp.o and ice_ptp_hw.o because it adds them to ice-m instead of ice-y, and nothing includes ice-m into the final kernel objects.

Fix this by using the ':m=y' so that we always compile the files and link them to ice.o when CONFIG_1588_PTP_CLOCK is a module or a builtin.

---
This fixes the compilation errors that have appeared from lkp on Tony's dev-queue. The lkp complains about other patches, but the root cause is this issue. If we apply this, it should fix all of the lkp issues I've seen so far.

 drivers/net/ethernet/intel/ice/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/Makefile +1 -1
index 1866be50095d..928572dfb3c2 100644
@@ -30,7 +30,7 @@ ice-y := ice_main.o	\
 	 ice_repr.o
 ice-$(CONFIG_PCI_IOV) += ice_virtchnl_allowlist.o
 ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o ice_virtchnl_fdir.o
-ice-$(CONFIG_PTP_1588_CLOCK) += ice_ptp.o ice_ptp_hw.o
+ice-$(CONFIG_PTP_1588_CLOCK:m=y) += ice_ptp.o ice_ptp_hw.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
Signature · 1 line
2.31.1.331.gb0c09ab8796f

A message that is not in the archive (sent off-list or not yet received): BN6PR11MB392347CF9B7ACBB94ABDA9168CEC9@BN6PR11MB3923.namprd11.prod.outlook.com

#2 lore raw

PATCH 1/1 ice: fix build issue if CONFIG_1588_PTP_CLOCk=m

Quoted 15 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Saturday, July 10, 2021 2:37 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH] ice: fix build issue if CONFIG_1588_PTP_CLOCk=m

If the CONFIG_1588_PTP_CLOCK symbol is set to m, then the driver will not compile ice_ptp.o and ice_ptp_hw.o because it adds them to ice-m instead of ice-y, and nothing includes ice-m into the final kernel objects.

Fix this by using the ':m=y' so that we always compile the files and link them to ice.o when CONFIG_1588_PTP_CLOCK is a module or a builtin.

Quoted 9 lines

---
This fixes the compilation errors that have appeared from lkp on Tony's dev- queue. The lkp complains about other patches, but the root cause is this issue. If we apply this, it should fix all of the lkp issues I've seen so far.

 drivers/net/ethernet/intel/ice/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)