[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <IA3PR11MB8986B8F8C2526B89F3E8FD79E5F5A@IA3PR11MB8986.namprd11.prod.outlook.com>
Date: Mon, 20 Oct 2025 10:34:47 +0000
From: "Loktionov, Aleksandr" <aleksandr.loktionov@...el.com>
To: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>,
"intel-wired-lan@...ts.osuosl.org" <intel-wired-lan@...ts.osuosl.org>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "Keller, Jacob E"
<jacob.e.keller@...el.com>, Guenter Roeck <linux@...ck-us.net>
Subject: RE: [Intel-wired-lan] [PATCH iwl-net v2] libie: depend on DEBUG_FS
when building LIBIE_FWLOG
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@...osl.org> On Behalf
> Of Michal Swiatkowski
> Sent: Thursday, October 16, 2025 9:30 AM
> To: intel-wired-lan@...ts.osuosl.org
> Cc: netdev@...r.kernel.org; Keller, Jacob E
> <jacob.e.keller@...el.com>; Michal Swiatkowski
> <michal.swiatkowski@...ux.intel.com>; Guenter Roeck <linux@...ck-
> us.net>
> Subject: [Intel-wired-lan] [PATCH iwl-net v2] libie: depend on
> DEBUG_FS when building LIBIE_FWLOG
>
> LIBIE_FWLOG is unusable without DEBUG_FS. Mark it in Kconfig.
>
> Fix build error on ixgbe when DEBUG_FS is not set. To not add another
> layer of #if IS_ENABLED(LIBIE_FWLOG) in ixgbe fwlog code define
> debugfs dentry even when DEBUG_FS isn't enabled. In this case the
> dummy functions of LIBIE_FWLOG will be used, so not initialized dentry
> isn't a problem.
>
> Fixes: 641585bc978e ("ixgbe: fwlog support for e610")
> Reported-by: Guenter Roeck <linux@...ck-us.net>
> Closes: https://lore.kernel.org/lkml/f594c621-f9e1-49f2-af31-
> 23fbcb176058@...ck-us.net/
> Signed-off-by: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>
> ---
> v1 --> v2 [1]:
> * add DEBUG_FS dependency in LIBIE_FWLOG
>
> [1] https://lore.kernel.org/netdev/20251014141110.751104-1-
> michal.swiatkowski@...ux.intel.com/
> ---
> drivers/net/ethernet/intel/Kconfig | 4 ++--
> drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 --
> include/linux/net/intel/libie/fwlog.h | 12 ++++++++++++
> 3 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/Kconfig
> b/drivers/net/ethernet/intel/Kconfig
> index a563a94e2780..122ee23497e6 100644
> --- a/drivers/net/ethernet/intel/Kconfig
> +++ b/drivers/net/ethernet/intel/Kconfig
> @@ -146,7 +146,7 @@ config IXGBE
> tristate "Intel(R) 10GbE PCI Express adapters support"
> depends on PCI
> depends on PTP_1588_CLOCK_OPTIONAL
> - select LIBIE_FWLOG
> + select LIBIE_FWLOG if DEBUG_FS
> select MDIO
> select NET_DEVLINK
> select PLDMFW
> @@ -298,7 +298,7 @@ config ICE
> select DIMLIB
> select LIBIE
> select LIBIE_ADMINQ
> - select LIBIE_FWLOG
> + select LIBIE_FWLOG if DEBUG_FS
> select NET_DEVLINK
> select PACKING
> select PLDMFW
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
> b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
> index 14d275270123..dce4936708eb 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
> @@ -821,9 +821,7 @@ struct ixgbe_adapter { #ifdef CONFIG_IXGBE_HWMON
> struct hwmon_buff *ixgbe_hwmon_buff;
> #endif /* CONFIG_IXGBE_HWMON */
> -#ifdef CONFIG_DEBUG_FS
> struct dentry *ixgbe_dbg_adapter;
> -#endif /*CONFIG_DEBUG_FS*/
>
> u8 default_up;
> /* Bitmask indicating in use pools */
> diff --git a/include/linux/net/intel/libie/fwlog.h
> b/include/linux/net/intel/libie/fwlog.h
> index 36b13fabca9e..7273c78c826b 100644
> --- a/include/linux/net/intel/libie/fwlog.h
> +++ b/include/linux/net/intel/libie/fwlog.h
> @@ -78,8 +78,20 @@ struct libie_fwlog {
> );
> };
>
> +#if IS_ENABLED(CONFIG_LIBIE_FWLOG)
> int libie_fwlog_init(struct libie_fwlog *fwlog, struct
> libie_fwlog_api *api); void libie_fwlog_deinit(struct libie_fwlog
> *fwlog); void libie_fwlog_reregister(struct libie_fwlog *fwlog);
> void libie_get_fwlog_data(struct libie_fwlog *fwlog, u8 *buf, u16
> len);
> +#else
> +static inline int libie_fwlog_init(struct libie_fwlog *fwlog,
> + struct libie_fwlog_api *api)
> +{
> + return -EOPNOTSUPP;
> +}
> +static inline void libie_fwlog_deinit(struct libie_fwlog *fwlog) { }
> +static inline void libie_fwlog_reregister(struct libie_fwlog *fwlog)
> {
> +} static inline void libie_get_fwlog_data(struct libie_fwlog *fwlog,
> u8 *buf,
> + u16 len) { }
> +#endif /* CONFIG_LIBIE_FWLOG */
> #endif /* _LIBIE_FWLOG_H_ */
> --
> 2.49.0
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>
Powered by blists - more mailing lists