[PATCH] drivers: Fix the Raspberry Pi debug version compile

[PATCH] drivers: Fix the Raspberry Pi debug version compile

[hby]

enable the DEBUG in source code, and it will compile fail,
modify the DEBUG macro, to adapt the compile

Signed-off-by: hby <hby2003@163.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index 4146faeed..c2eb3aa67 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -60,7 +60,7 @@ void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...);
 				  ##__VA_ARGS__);			\
 	} while (0)
 
-#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
+#if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)
 
 /* For debug/tracing purposes treat info messages as errors */
 #define brcmf_info brcmf_err
@@ -114,7 +114,7 @@ extern int brcmf_msg_level;
 
 struct brcmf_bus;
 struct brcmf_pub;
-#ifdef DEBUG
+#if defined(CONFIG_BRCMDBG)
 struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
 void brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
 			     int (*read_fn)(struct seq_file *seq, void *data));
-- 
2.17.1

Re: [PATCH] drivers: Fix the Raspberry Pi debug version compile

[Kalle Valo]

byhoo <hby2003@163.com> writes:

> The steps:
> 1. add "#define DEBUG" in
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c line 61.
> 2. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux
> bcm2835_defconfig
> 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux/
> zImage modules dtbs -j8
>
> Then, it will fail, the compile log described below:
>
> Kernel: arch/arm/boot/zImage is ready MODPOST Module.symvers ERROR:
> modpost: "brcmf_debugfs_add_entry"
> [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko]
> undefined! ERROR: modpost: "brcmf_debugfs_get_devdir"
> [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko]
> undefined! ERROR: modpost: "__brcmf_dbg"
> [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko]
> undefined!
> /home/hby/gitee/linux_origin/Linux/scripts/Makefile.modpost:111:
> recipe for target 'Module.symvers' failed make[2]: ***
> [Module.symvers] Error 1 make[2]: *** Deleting file 'Module.symvers'
> /home/hby/gitee/linux_origin/Linux/Makefile:1390: recipe for target
> 'modules' failed make[1]: *** [modules] Error 2 make[1]: Leaving
> directory '/home/hby/gitee/linux_origin/Out_Linux' Makefile:185:
> recipe for target '__sub-make' failed make: *** [__sub-make] Error 2 

Please add this info to the commit log.

And please don't submit HTML emails, the lists will drop those
automatically. See the wiki below for more info.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH] drivers: Fix the Raspberry Pi debug version compile

[Kalle Valo]

hby <hby2003@163.com> writes:

> enable the DEBUG in source code, and it will compile fail,
> modify the DEBUG macro, to adapt the compile
>
> Signed-off-by: hby <hby2003@163.com>
> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

This has nothing to do with Raspberry Pi, so the title should be:

brmcfmac: fix compile when DEBUG is defined

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v2] brmcfmac: fix compile when DEBUG is defined

[hby]

I am sorry for the HTML email, and I change the email client. The patch 
update.

 From b87d429158b4efc3f6835828f495a261e17d5af4 Mon Sep 17 00:00:00 2001
From: hby <hby2003@163.com>
Date: Tue, 24 Nov 2020 09:16:24 +0800
Subject: [PATCH] brmcfmac: fix compile when DEBUG is defined

The steps:
1. add "#define DEBUG" in 
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c line 61.
2. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux 
bcm2835_defconfig
3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux/ 
zImage modules dtbs -j8

Then, it will fail, the compile log described below:

Kernel: arch/arm/boot/zImage is ready
MODPOST Module.symvers
ERROR: modpost: "brcmf_debugfs_add_entry" 
[drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
ERROR: modpost: "brcmf_debugfs_get_devdir" 
[drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
ERROR: modpost: "__brcmf_dbg" 
[drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
scripts/Makefile.modpost:111: recipe for target 'Module.symvers' failed
make[2]: *** [Module.symvers] Error 1
make[2]: *** Deleting file 'Module.symvers'
Makefile:1390: recipe for target 'modules' failed
make[1]: *** [modules] Error 2
make[1]: Leaving directory '/home/hby/gitee/linux_origin/Out_Linux'
Makefile:185: recipe for target '__sub-make' failed
make: *** [__sub-make] Error 2

Signed-off-by: hby <hby2003@163.com>
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index 4146faeed..c2eb3aa67 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -60,7 +60,7 @@ void __brcmf_err(struct brcmf_bus *bus, const char 
*func, const char *fmt, ...);
                    ##__VA_ARGS__);            \
      } while (0)

-#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
+#if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)

  /* For debug/tracing purposes treat info messages as errors */
  #define brcmf_info brcmf_err
@@ -114,7 +114,7 @@ extern int brcmf_msg_level;

  struct brcmf_bus;
  struct brcmf_pub;
-#ifdef DEBUG
+#if defined(CONFIG_BRCMDBG)
  struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
  void brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
                   int (*read_fn)(struct seq_file *seq, void *data));
-- 
2.17.1

在 2020/11/23 23:59, Kalle Valo 写道:
> hby <hby2003@163.com> writes:
>
>> enable the DEBUG in source code, and it will compile fail,
>> modify the DEBUG macro, to adapt the compile
>>
>> Signed-off-by: hby <hby2003@163.com>
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
> This has nothing to do with Raspberry Pi, so the title should be:
>
> brmcfmac: fix compile when DEBUG is defined
>

Re: [PATCH v2] brmcfmac: fix compile when DEBUG is defined

[Kalle Valo]

hby <hby2003@163.com> writes:

> I am sorry for the HTML email, and I change the email client. The
> patch update.
>
> From b87d429158b4efc3f6835828f495a261e17d5af4 Mon Sep 17 00:00:00 2001
> From: hby <hby2003@163.com>
> Date: Tue, 24 Nov 2020 09:16:24 +0800
> Subject: [PATCH] brmcfmac: fix compile when DEBUG is defined
>
> The steps:
> 1. add "#define DEBUG" in
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c line 61.
> 2. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux
> bcm2835_defconfig
> 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux/
> zImage modules dtbs -j8
>
> Then, it will fail, the compile log described below:

It doesn't work like this, the patch handling is very much automated and
you can't just reply with a new patch. I strongly recommend to use git
send-email and read the wiki page below.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v2] brmcfmac: fix compile when DEBUG is defined

[Kalle Valo]

hby <hby2003@163.com> wrote:

> The steps:
> 1. add "#define DEBUG" in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c line 61.
> 2. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux bcm2835_defconfig
> 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux/ zImage modules dtbs -j8
> 
> Then, it will fail, the compile log described below:
> 
> Kernel: arch/arm/boot/zImage is ready
> MODPOST Module.symvers
> ERROR: modpost: "brcmf_debugfs_add_entry" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
> ERROR: modpost: "brcmf_debugfs_get_devdir" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
> ERROR: modpost: "__brcmf_dbg" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
> scripts/Makefile.modpost:111: recipe for target 'Module.symvers' failed
> make[2]: *** [Module.symvers] Error 1
> make[2]: *** Deleting file 'Module.symvers'
> Makefile:1390: recipe for target 'modules' failed
> make[1]: *** [modules] Error 2
> make[1]: Leaving directory '/home/hby/gitee/linux_origin/Out_Linux'
> Makefile:185: recipe for target '__sub-make' failed
> make: *** [__sub-make] Error 2
> 
> Signed-off-by: hby <hby2003@163.com>

I checked and brcmd80211/Makefile has:

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DDEBUG

I don't understand why brcm80211 uses DEBUG flag like that, but I guess there's
a reason. I think that either _all_ DEBUG uses should be removed from the
driver, or you shouldn't add "#define DEBUG" on your own to any of the files.
So this patch is not the best solution.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20201124142440.67554-1-hby2003@163.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH v2] brmcfmac: fix compile when DEBUG is defined

[hby]

The steps:
1. add "#define DEBUG" in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c line 61.
2. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux bcm2835_defconfig
3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=../Out_Linux/ zImage modules dtbs -j8

Then, it will fail, the compile log described below:

Kernel: arch/arm/boot/zImage is ready
MODPOST Module.symvers
ERROR: modpost: "brcmf_debugfs_add_entry" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
ERROR: modpost: "brcmf_debugfs_get_devdir" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
ERROR: modpost: "__brcmf_dbg" [drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko] undefined!
scripts/Makefile.modpost:111: recipe for target 'Module.symvers' failed
make[2]: *** [Module.symvers] Error 1
make[2]: *** Deleting file 'Module.symvers'
Makefile:1390: recipe for target 'modules' failed
make[1]: *** [modules] Error 2
make[1]: Leaving directory '/home/hby/gitee/linux_origin/Out_Linux'
Makefile:185: recipe for target '__sub-make' failed
make: *** [__sub-make] Error 2

Signed-off-by: hby <hby2003@163.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index 4146faeed..c2eb3aa67 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -60,7 +60,7 @@ void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...);
 				  ##__VA_ARGS__);			\
 	} while (0)
 
-#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
+#if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)
 
 /* For debug/tracing purposes treat info messages as errors */
 #define brcmf_info brcmf_err
@@ -114,7 +114,7 @@ extern int brcmf_msg_level;
 
 struct brcmf_bus;
 struct brcmf_pub;
-#ifdef DEBUG
+#if defined(CONFIG_BRCMDBG)
 struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
 void brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
 			     int (*read_fn)(struct seq_file *seq, void *data));
-- 
2.17.1