Re: [PATCH] pds_core: fix linking without CONFIG_DEBUG_FS

From: Shannon Nelson
Date: Tue May 02 2023 - 00:01:51 EST


On 5/1/23 3:35 PM, Jakub Kicinski wrote:
On Mon, 1 May 2023 17:06:14 +0200 Arnd Bergmann wrote:
From: Arnd Bergmann <arnd@xxxxxxxx>

The debugfs.o file is only built when the fs is enabled:

main.c:(.text+0x47c): undefined reference to `pdsc_debugfs_del_dev'
main.c:(.text+0x8dc): undefined reference to `pdsc_debugfs_add_dev'
main.c:(.exit.text+0x14): undefined reference to `pdsc_debugfs_destroy'
main.c:(.init.text+0x8): undefined reference to `pdsc_debugfs_create'
dev.c:(.text+0x988): undefined reference to `pdsc_debugfs_add_ident'
core.c:(.text+0x6b0): undefined reference to `pdsc_debugfs_del_qcq'
core.c:(.text+0x998): undefined reference to `pdsc_debugfs_add_qcq'
core.c:(.text+0xf0c): undefined reference to `pdsc_debugfs_add_viftype'

Add dummy helper functions for these interfaces.

Debugfs should wrap itself. Doesn't this work:

diff --git a/drivers/net/ethernet/amd/pds_core/Makefile b/drivers/net/ethernet/amd/pds_core/Makefile
index 0abc33ce826c..54d1d5b375ce 100644
--- a/drivers/net/ethernet/amd/pds_core/Makefile
+++ b/drivers/net/ethernet/amd/pds_core/Makefile
@@ -9,6 +9,5 @@ pds_core-y := main.o \
dev.o \
adminq.o \
core.o \
- fw.o
-
-pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
+ fw.o \
+ debugfs.o

Yes, that should do it, and should have been done in the rest of the change that I made after Leon suggested removing the dummy functions that I originally had there [0].

Tomorrow when I'm back from vacation I can do a couple of follow-up patches for this and for the other config tags that Simon pointed out.

sln

[0] https://lore.kernel.org/netdev/20230409112645.GS14869@unreal/