Intel-Wired-Lan Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jacob Keller <jacob.e.keller@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH] ice: fix build issue if CONFIG_1588_PTP_CLOCk=m
Date: Fri,  9 Jul 2021 14:07:26 -0700	[thread overview]
Message-ID: <20210709210726.224848-1-jacob.e.keller@intel.com> (raw)

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.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
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(-)

diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
index 1866be50095d..928572dfb3c2 100644
--- a/drivers/net/ethernet/intel/ice/Makefile
+++ b/drivers/net/ethernet/intel/ice/Makefile
@@ -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
-- 
2.31.1.331.gb0c09ab8796f


             reply	other threads:[~2021-07-09 21:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-09 21:07 Jacob Keller [this message]
     [not found] ` <BN6PR11MB392347CF9B7ACBB94ABDA9168CEC9@BN6PR11MB3923.namprd11.prod.outlook.com>
2021-07-30  9:34   ` [Intel-wired-lan] [PATCH] ice: fix build issue if CONFIG_1588_PTP_CLOCk=m G, GurucharanX
  -- strict thread matches above, loose matches on Subject: below --
2021-07-29 15:56 G, GurucharanX
2021-07-29 22:13 ` Keller, Jacob E

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210709210726.224848-1-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=intel-wired-lan@osuosl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox