diff mbox series

[v3,net] ionic: fix ptp support config breakage

Message ID 20210506041846.62502-1-snelson@pensando.io (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [v3,net] ionic: fix ptp support config breakage | expand

Checks

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 warning 1 maintainers not CCed: dan.carpenter@oracle.com
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, 18 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link

Commit Message

Shannon Nelson May 6, 2021, 4:18 a.m. UTC
Driver link failed with undefined references in some
kernel config variations.

Fixes: 61db421da31b ("ionic: link in the new hw timestamp code")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Allen Hubbe <allenbh@pensando.io>
Signed-off-by: Shannon Nelson <snelson@pensando.io>
---

v3 - put version notes below ---, added Allen's Cc
v2 - added Fixes tag

 drivers/net/ethernet/pensando/ionic/Makefile    | 3 +--
 drivers/net/ethernet/pensando/ionic/ionic_phc.c | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Jakub Kicinski May 7, 2021, 12:15 a.m. UTC | #1
On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
> Driver link failed with undefined references in some
> kernel config variations.

This is really vague and the patch is not very obvious.

>  ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>  	   ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
> -	   ionic_txrx.o ionic_stats.o ionic_fw.o
> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
> +	   ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o

So we'd replace a build dependency..

> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> index a87c87e86aef..30c78808c45a 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> @@ -1,6 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
>  /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>  
> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
> +
>  #include <linux/netdevice.h>
>  #include <linux/etherdevice.h>
>  
> @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>  	devm_kfree(lif->ionic->dev, lif->phc);
>  	lif->phc = NULL;
>  }
> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */

.. with an ifdef around an entire file? Does not feel very clean.

The construct of using:

	drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o

seems relatively common, why does it now work here?

Maybe the config in question has PTP as a module and ionic built in?
Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.

Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?

At the very least we need a better explanation in the commit message.
Randy Dunlap May 7, 2021, 12:21 a.m. UTC | #2
On 5/6/21 5:15 PM, Jakub Kicinski wrote:
> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>> Driver link failed with undefined references in some
>> kernel config variations.
> 
> This is really vague and the patch is not very obvious.
> 
>>  ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>  	   ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>> -	   ionic_txrx.o ionic_stats.o ionic_fw.o
>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>> +	   ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
> 
> So we'd replace a build dependency..
> 
>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> index a87c87e86aef..30c78808c45a 100644
>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> @@ -1,6 +1,8 @@
>>  // SPDX-License-Identifier: GPL-2.0
>>  /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>  
>> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>> +
>>  #include <linux/netdevice.h>
>>  #include <linux/etherdevice.h>
>>  
>> @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>  	devm_kfree(lif->ionic->dev, lif->phc);
>>  	lif->phc = NULL;
>>  }
>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
> 
> .. with an ifdef around an entire file? Does not feel very clean.
> 
> The construct of using:
> 
> 	drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> 
> seems relatively common, why does it now work here?
> 
> Maybe the config in question has PTP as a module and ionic built in?
> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
> 
> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
> 
> At the very least we need a better explanation in the commit message.
> 

I'll take a look if someone can point me to the .config file.
Shannon Nelson May 7, 2021, 12:48 a.m. UTC | #3
On 5/6/21 5:21 PM, Randy Dunlap wrote:
> On 5/6/21 5:15 PM, Jakub Kicinski wrote:
>> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>>> Driver link failed with undefined references in some
>>> kernel config variations.
>> This is really vague and the patch is not very obvious.
>>
>>>   ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>>   	   ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>>> -	   ionic_txrx.o ionic_stats.o ionic_fw.o
>>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>>> +	   ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>> So we'd replace a build dependency..
>>
>>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>> index a87c87e86aef..30c78808c45a 100644
>>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>> @@ -1,6 +1,8 @@
>>>   // SPDX-License-Identifier: GPL-2.0
>>>   /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>>   
>>> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>>> +
>>>   #include <linux/netdevice.h>
>>>   #include <linux/etherdevice.h>
>>>   
>>> @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>>   	devm_kfree(lif->ionic->dev, lif->phc);
>>>   	lif->phc = NULL;
>>>   }
>>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
>> .. with an ifdef around an entire file? Does not feel very clean.
>>
>> The construct of using:
>>
>> 	drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
>>
>> seems relatively common, why does it now work here?
>>
>> Maybe the config in question has PTP as a module and ionic built in?
>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>
>> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
>>
>> At the very least we need a better explanation in the commit message.
>>
> I'll take a look if someone can point me to the .config file.
>

These are the notes I got from kernel test robot:
https://lore.kernel.org/lkml/202105041020.efEaBOYC-lkp@intel.com/
https://lore.kernel.org/lkml/202105041154.GrLZmjGh-lkp@intel.com/
https://lore.kernel.org/lkml/202105041634.paURyDp0-lkp@intel.com/
https://lore.kernel.org/lkml/202105050636.UXXDl7m2-lkp@intel.com/

sln
Randy Dunlap May 7, 2021, 1:12 a.m. UTC | #4
On 5/6/21 5:48 PM, Shannon Nelson wrote:
> On 5/6/21 5:21 PM, Randy Dunlap wrote:
>> On 5/6/21 5:15 PM, Jakub Kicinski wrote:
>>> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>>>> Driver link failed with undefined references in some
>>>> kernel config variations.
>>> This is really vague and the patch is not very obvious.
>>>
>>>>   ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>>>          ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>>>> -       ionic_txrx.o ionic_stats.o ionic_fw.o
>>>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>>>> +       ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>>> So we'd replace a build dependency..
>>>
>>>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>> index a87c87e86aef..30c78808c45a 100644
>>>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>> @@ -1,6 +1,8 @@
>>>>   // SPDX-License-Identifier: GPL-2.0
>>>>   /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>>>   +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>>>> +
>>>>   #include <linux/netdevice.h>
>>>>   #include <linux/etherdevice.h>
>>>>   @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>>>       devm_kfree(lif->ionic->dev, lif->phc);
>>>>       lif->phc = NULL;
>>>>   }
>>>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
>>> .. with an ifdef around an entire file? Does not feel very clean.
>>>
>>> The construct of using:
>>>
>>>     drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
>>>
>>> seems relatively common, why does it now work here?
>>>
>>> Maybe the config in question has PTP as a module and ionic built in?
>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>>
>>> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
>>>
>>> At the very least we need a better explanation in the commit message.
>>>
>> I'll take a look if someone can point me to the .config file.
>>
> 
> These are the notes I got from kernel test robot:
> https://lore.kernel.org/lkml/202105041020.efEaBOYC-lkp@intel.com/
> https://lore.kernel.org/lkml/202105041154.GrLZmjGh-lkp@intel.com/
> https://lore.kernel.org/lkml/202105041634.paURyDp0-lkp@intel.com/
> https://lore.kernel.org/lkml/202105050636.UXXDl7m2-lkp@intel.com/

At first glance it looks like Jakub's suggestion of
>>> Maybe the config in question has PTP as a module and ionic built in?
>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.

is what is needed, but I'm still doing build testing ATM.
Randy Dunlap May 7, 2021, 1:16 a.m. UTC | #5
On 5/6/21 6:12 PM, Randy Dunlap wrote:
> On 5/6/21 5:48 PM, Shannon Nelson wrote:
>> On 5/6/21 5:21 PM, Randy Dunlap wrote:
>>> On 5/6/21 5:15 PM, Jakub Kicinski wrote:
>>>> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>>>>> Driver link failed with undefined references in some
>>>>> kernel config variations.
>>>> This is really vague and the patch is not very obvious.
>>>>
>>>>>   ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>>>>          ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>>>>> -       ionic_txrx.o ionic_stats.o ionic_fw.o
>>>>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>>>>> +       ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>>>> So we'd replace a build dependency..
>>>>
>>>>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>> index a87c87e86aef..30c78808c45a 100644
>>>>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>> @@ -1,6 +1,8 @@
>>>>>   // SPDX-License-Identifier: GPL-2.0
>>>>>   /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>>>>   +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>>>>> +
>>>>>   #include <linux/netdevice.h>
>>>>>   #include <linux/etherdevice.h>
>>>>>   @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>>>>       devm_kfree(lif->ionic->dev, lif->phc);
>>>>>       lif->phc = NULL;
>>>>>   }
>>>>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
>>>> .. with an ifdef around an entire file? Does not feel very clean.
>>>>
>>>> The construct of using:
>>>>
>>>>     drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
>>>>
>>>> seems relatively common, why does it now work here?
>>>>
>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>>>
>>>> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
>>>>
>>>> At the very least we need a better explanation in the commit message.
>>>>
>>> I'll take a look if someone can point me to the .config file.
>>>
>>
>> These are the notes I got from kernel test robot:
>> https://lore.kernel.org/lkml/202105041020.efEaBOYC-lkp@intel.com/
>> https://lore.kernel.org/lkml/202105041154.GrLZmjGh-lkp@intel.com/
>> https://lore.kernel.org/lkml/202105041634.paURyDp0-lkp@intel.com/
>> https://lore.kernel.org/lkml/202105050636.UXXDl7m2-lkp@intel.com/
> 
> At first glance it looks like Jakub's suggestion of
>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
> 
> is what is needed, but I'm still doing build testing ATM.

Nope, eat my words. These build issues are not about PTP.
I'm still looking.
Randy Dunlap May 7, 2021, 1:30 a.m. UTC | #6
On 5/6/21 6:16 PM, Randy Dunlap wrote:
> On 5/6/21 6:12 PM, Randy Dunlap wrote:
>> On 5/6/21 5:48 PM, Shannon Nelson wrote:
>>> On 5/6/21 5:21 PM, Randy Dunlap wrote:
>>>> On 5/6/21 5:15 PM, Jakub Kicinski wrote:
>>>>> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>>>>>> Driver link failed with undefined references in some
>>>>>> kernel config variations.
>>>>> This is really vague and the patch is not very obvious.

When IONIC=y and PTP_1588_CLOCK=m...

>>>>>>   ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>>>>>          ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>>>>>> -       ionic_txrx.o ionic_stats.o ionic_fw.o
>>>>>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>>>>>> +       ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>>>>> So we'd replace a build dependency..
>>>>>
>>>>>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>> index a87c87e86aef..30c78808c45a 100644
>>>>>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>> @@ -1,6 +1,8 @@
>>>>>>   // SPDX-License-Identifier: GPL-2.0
>>>>>>   /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>>>>>   +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>>>>>> +
>>>>>>   #include <linux/netdevice.h>
>>>>>>   #include <linux/etherdevice.h>
>>>>>>   @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>>>>>       devm_kfree(lif->ionic->dev, lif->phc);
>>>>>>       lif->phc = NULL;
>>>>>>   }
>>>>>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
>>>>> .. with an ifdef around an entire file? Does not feel very clean.
>>>>>
>>>>> The construct of using:
>>>>>
>>>>>     drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
>>>>>
>>>>> seems relatively common, why does it now work here?
>>>>>
>>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>>>>
>>>>> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
>>>>>
>>>>> At the very least we need a better explanation in the commit message.
>>>>>
>>>> I'll take a look if someone can point me to the .config file.
>>>>
>>>
>>> These are the notes I got from kernel test robot:
>>> https://lore.kernel.org/lkml/202105041020.efEaBOYC-lkp@intel.com/
>>> https://lore.kernel.org/lkml/202105041154.GrLZmjGh-lkp@intel.com/
>>> https://lore.kernel.org/lkml/202105041634.paURyDp0-lkp@intel.com/
>>> https://lore.kernel.org/lkml/202105050636.UXXDl7m2-lkp@intel.com/
>>
>> At first glance it looks like Jakub's suggestion of
>>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>
>> is what is needed, but I'm still doing build testing ATM.
> 
> Nope, eat my words. These build issues are not about PTP.
> I'm still looking.

I have been trying to go to fast.. slow down, wait for the old computer.

Back to Jakub's suggestion -- that works for me. (copy-paste, whitespace damaged)


--- linux-next-20210506.orig/drivers/net/ethernet/pensando/Kconfig
+++ linux-next-20210506/drivers/net/ethernet/pensando/Kconfig
@@ -20,6 +20,7 @@ if NET_VENDOR_PENSANDO
 config IONIC
        tristate "Pensando Ethernet IONIC Support"
        depends on 64BIT && PCI
+       depends on PTP_1588_CLOCK || !PTP_1588_CLOCK
        select NET_DEVLINK
        select DIMLIB
        help

If PTP_1588_CLOCK=m, the depends limits IONIC to =m (or disabled).
If PTP_1588_CLOCK is disabled, IONIC can be any of y/m/n.
Shannon Nelson May 7, 2021, 3:26 a.m. UTC | #7
On 5/6/21 6:30 PM, Randy Dunlap wrote:
> On 5/6/21 6:16 PM, Randy Dunlap wrote:
>> On 5/6/21 6:12 PM, Randy Dunlap wrote:
>>> On 5/6/21 5:48 PM, Shannon Nelson wrote:
>>>> On 5/6/21 5:21 PM, Randy Dunlap wrote:
>>>>> On 5/6/21 5:15 PM, Jakub Kicinski wrote:
>>>>>> On Wed,  5 May 2021 21:18:46 -0700 Shannon Nelson wrote:
>>>>>>> Driver link failed with undefined references in some
>>>>>>> kernel config variations.
>>>>>> This is really vague and the patch is not very obvious.
> When IONIC=y and PTP_1588_CLOCK=m...
>
>>>>>>>    ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>>>>>>>           ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>>>>>>> -       ionic_txrx.o ionic_stats.o ionic_fw.o
>>>>>>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>>>>>>> +       ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>>>>>> So we'd replace a build dependency..
>>>>>>
>>>>>>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>>> index a87c87e86aef..30c78808c45a 100644
>>>>>>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>>>>>>> @@ -1,6 +1,8 @@
>>>>>>>    // SPDX-License-Identifier: GPL-2.0
>>>>>>>    /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>>>>>>    +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>>>>>>> +
>>>>>>>    #include <linux/netdevice.h>
>>>>>>>    #include <linux/etherdevice.h>
>>>>>>>    @@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
>>>>>>>        devm_kfree(lif->ionic->dev, lif->phc);
>>>>>>>        lif->phc = NULL;
>>>>>>>    }
>>>>>>> +#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
>>>>>> .. with an ifdef around an entire file? Does not feel very clean.
>>>>>>
>>>>>> The construct of using:
>>>>>>
>>>>>>      drv-$(CONFIG_PTP_1588_CLOCK) += ptp.o
>>>>>>
>>>>>> seems relatively common, why does it now work here?
>>>>>>
>>>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>>>>>
>>>>>> Maybe somehow the "ionic-y" confuses kbuild and it should be ionic-objs?
>>>>>>
>>>>>> At the very least we need a better explanation in the commit message.
>>>>>>
>>>>> I'll take a look if someone can point me to the .config file.
>>>>>
>>>> These are the notes I got from kernel test robot:
>>>> https://lore.kernel.org/lkml/202105041020.efEaBOYC-lkp@intel.com/
>>>> https://lore.kernel.org/lkml/202105041154.GrLZmjGh-lkp@intel.com/
>>>> https://lore.kernel.org/lkml/202105041634.paURyDp0-lkp@intel.com/
>>>> https://lore.kernel.org/lkml/202105050636.UXXDl7m2-lkp@intel.com/
>>> At first glance it looks like Jakub's suggestion of
>>>>>> Maybe the config in question has PTP as a module and ionic built in?
>>>>>> Then you should add depends on PTP_1588_CLOCK || !PTP_1588_CLOCK.
>>> is what is needed, but I'm still doing build testing ATM.
>> Nope, eat my words. These build issues are not about PTP.
>> I'm still looking.
> I have been trying to go to fast.. slow down, wait for the old computer.
>
> Back to Jakub's suggestion -- that works for me. (copy-paste, whitespace damaged)
>
>
> --- linux-next-20210506.orig/drivers/net/ethernet/pensando/Kconfig
> +++ linux-next-20210506/drivers/net/ethernet/pensando/Kconfig
> @@ -20,6 +20,7 @@ if NET_VENDOR_PENSANDO
>   config IONIC
>          tristate "Pensando Ethernet IONIC Support"
>          depends on 64BIT && PCI
> +       depends on PTP_1588_CLOCK || !PTP_1588_CLOCK
>          select NET_DEVLINK
>          select DIMLIB
>          help
>
> If PTP_1588_CLOCK=m, the depends limits IONIC to =m (or disabled).
> If PTP_1588_CLOCK is disabled, IONIC can be any of y/m/n.
>

Thanks, I'll follow up with this.
sln
diff mbox series

Patch

diff --git a/drivers/net/ethernet/pensando/ionic/Makefile b/drivers/net/ethernet/pensando/ionic/Makefile
index 4e7642a2d25f..61c40169cb1f 100644
--- a/drivers/net/ethernet/pensando/ionic/Makefile
+++ b/drivers/net/ethernet/pensando/ionic/Makefile
@@ -5,5 +5,4 @@  obj-$(CONFIG_IONIC) := ionic.o
 
 ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
 	   ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
-	   ionic_txrx.o ionic_stats.o ionic_fw.o
-ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
+	   ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
index a87c87e86aef..30c78808c45a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
@@ -1,6 +1,8 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
 
+#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
+
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
@@ -613,3 +615,4 @@  void ionic_lif_free_phc(struct ionic_lif *lif)
 	devm_kfree(lif->ionic->dev, lif->phc);
 	lif->phc = NULL;
 }
+#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */