diff mbox

[1/2] brcmfmac: move strings debugging Broadcom errors to debug.c

Message ID 1431025661-8879-1-git-send-email-zajec5@gmail.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Rafał Miłecki May 7, 2015, 7:07 p.m. UTC 
They are used with CONFIG_BRCMDBG so it makes sense to put them in debug
specific file. Also they aren't really specific to fwil.c.

Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
 drivers/net/wireless/brcm80211/brcmfmac/debug.c | 64 ++++++++++++++++++++++
 drivers/net/wireless/brcm80211/brcmfmac/debug.h |  5 ++
 drivers/net/wireless/brcm80211/brcmfmac/fwil.c  | 73 +------------------------
 3 files changed, 70 insertions(+), 72 deletions(-)

Comments

Arend van Spriel May 8, 2015, 10:08 a.m. UTC | #1 
On 05/07/15 21:07, Rafa? Mi?ecki wrote:
> They are used with CONFIG_BRCMDBG so it makes sense to put them in debug
> specific file. Also they aren't really specific to fwil.c.

Actually they are. fwil is abbreviation of firmware interface layer and 
the intention is to give the error as given by firmware. However, as you 
discovered it also (wrongly) maps linux errors and that needs to be 
fixed as it can confuse people staring at the log.

Regards,
Arend

> Signed-off-by: Rafa? Mi?ecki<zajec5@gmail.com>
> ---
>   drivers/net/wireless/brcm80211/brcmfmac/debug.c | 64 ++++++++++++++++++++++
>   drivers/net/wireless/brcm80211/brcmfmac/debug.h |  5 ++
>   drivers/net/wireless/brcm80211/brcmfmac/fwil.c  | 73 +------------------------
>   3 files changed, 70 insertions(+), 72 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
> index 9b473d5..2d9a1c0 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
> @@ -115,3 +115,67 @@ int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
>
>   	return PTR_ERR_OR_ZERO(dentry);
>   }
> +
> +static const char * const brcmf_errstr[] = {
> +	"BCME_OK",
> +	"BCME_ERROR",
> +	"BCME_BADARG",
> +	"BCME_BADOPTION",
> +	"BCME_NOTUP",
> +	"BCME_NOTDOWN",
> +	"BCME_NOTAP",
> +	"BCME_NOTSTA",
> +	"BCME_BADKEYIDX",
> +	"BCME_RADIOOFF",
> +	"BCME_NOTBANDLOCKED",
> +	"BCME_NOCLK",
> +	"BCME_BADRATESET",
> +	"BCME_BADBAND",
> +	"BCME_BUFTOOSHORT",
> +	"BCME_BUFTOOLONG",
> +	"BCME_BUSY",
> +	"BCME_NOTASSOCIATED",
> +	"BCME_BADSSIDLEN",
> +	"BCME_OUTOFRANGECHAN",
> +	"BCME_BADCHAN",
> +	"BCME_BADADDR",
> +	"BCME_NORESOURCE",
> +	"BCME_UNSUPPORTED",
> +	"BCME_BADLEN",
> +	"BCME_NOTREADY",
> +	"BCME_EPERM",
> +	"BCME_NOMEM",
> +	"BCME_ASSOCIATED",
> +	"BCME_RANGE",
> +	"BCME_NOTFOUND",
> +	"BCME_WME_NOT_ENABLED",
> +	"BCME_TSPEC_NOTFOUND",
> +	"BCME_ACM_NOTSUPPORTED",
> +	"BCME_NOT_WME_ASSOCIATION",
> +	"BCME_SDIO_ERROR",
> +	"BCME_DONGLE_DOWN",
> +	"BCME_VERSION",
> +	"BCME_TXFAIL",
> +	"BCME_RXFAIL",
> +	"BCME_NODEVICE",
> +	"BCME_NMODE_DISABLED",
> +	"BCME_NONRESIDENT",
> +	"BCME_SCANREJECT",
> +	"BCME_USAGE_ERROR",
> +	"BCME_IOCTL_ERROR",
> +	"BCME_SERIAL_PORT_ERR",
> +	"BCME_DISABLED",
> +	"BCME_DECERR",
> +	"BCME_ENCERR",
> +	"BCME_MICERR",
> +	"BCME_REPLAY",
> +	"BCME_IE_NOTFOUND",
> +};
> +
> +const char *brcmf_get_errstr(u32 err)
> +{
> +	if (err>= ARRAY_SIZE(brcmf_errstr))
> +		return "(unknown)";
> +
> +	return brcmf_errstr[err];
> +}
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/brcm80211/brcmfmac/debug.h
> index eb0b8c4..d1b2a5c 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/debug.h
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.h
> @@ -111,6 +111,7 @@ void brcmf_debugfs_detach(struct brcmf_pub *drvr);
>   struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
>   int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
>   			    int (*read_fn)(struct seq_file *seq, void *data));
> +const char *brcmf_get_errstr(u32 err);
>   #else
>   static inline void brcmf_debugfs_init(void)
>   {
> @@ -131,6 +132,10 @@ int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
>   {
>   	return 0;
>   }
> +static inline const char *brcmf_get_errstr(u32 err)
> +{
> +	return "";
> +}
>   #endif
>
>   #endif /* BRCMFMAC_DEBUG_H */
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
> index dcfa0bb..bdbdc9e 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
> @@ -32,77 +32,6 @@
>
>   #define MAX_HEX_DUMP_LEN	64
>
> -#ifdef DEBUG
> -static const char * const brcmf_fil_errstr[] = {
> -	"BCME_OK",
> -	"BCME_ERROR",
> -	"BCME_BADARG",
> -	"BCME_BADOPTION",
> -	"BCME_NOTUP",
> -	"BCME_NOTDOWN",
> -	"BCME_NOTAP",
> -	"BCME_NOTSTA",
> -	"BCME_BADKEYIDX",
> -	"BCME_RADIOOFF",
> -	"BCME_NOTBANDLOCKED",
> -	"BCME_NOCLK",
> -	"BCME_BADRATESET",
> -	"BCME_BADBAND",
> -	"BCME_BUFTOOSHORT",
> -	"BCME_BUFTOOLONG",
> -	"BCME_BUSY",
> -	"BCME_NOTASSOCIATED",
> -	"BCME_BADSSIDLEN",
> -	"BCME_OUTOFRANGECHAN",
> -	"BCME_BADCHAN",
> -	"BCME_BADADDR",
> -	"BCME_NORESOURCE",
> -	"BCME_UNSUPPORTED",
> -	"BCME_BADLEN",
> -	"BCME_NOTREADY",
> -	"BCME_EPERM",
> -	"BCME_NOMEM",
> -	"BCME_ASSOCIATED",
> -	"BCME_RANGE",
> -	"BCME_NOTFOUND",
> -	"BCME_WME_NOT_ENABLED",
> -	"BCME_TSPEC_NOTFOUND",
> -	"BCME_ACM_NOTSUPPORTED",
> -	"BCME_NOT_WME_ASSOCIATION",
> -	"BCME_SDIO_ERROR",
> -	"BCME_DONGLE_DOWN",
> -	"BCME_VERSION",
> -	"BCME_TXFAIL",
> -	"BCME_RXFAIL",
> -	"BCME_NODEVICE",
> -	"BCME_NMODE_DISABLED",
> -	"BCME_NONRESIDENT",
> -	"BCME_SCANREJECT",
> -	"BCME_USAGE_ERROR",
> -	"BCME_IOCTL_ERROR",
> -	"BCME_SERIAL_PORT_ERR",
> -	"BCME_DISABLED",
> -	"BCME_DECERR",
> -	"BCME_ENCERR",
> -	"BCME_MICERR",
> -	"BCME_REPLAY",
> -	"BCME_IE_NOTFOUND",
> -};
> -
> -static const char *brcmf_fil_get_errstr(u32 err)
> -{
> -	if (err>= ARRAY_SIZE(brcmf_fil_errstr))
> -		return "(unknown)";
> -
> -	return brcmf_fil_errstr[err];
> -}
> -#else
> -static const char *brcmf_fil_get_errstr(u32 err)
> -{
> -	return "";
> -}
> -#endif /* DEBUG */
> -
>   static s32
>   brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set)
>   {
> @@ -125,7 +54,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set)
>   		return 0;
>
>   	brcmf_dbg(FIL, "Failed: %s (%d)\n",
> -		  brcmf_fil_get_errstr((u32)(-err)), err);
> +		  brcmf_get_errstr((u32)(-err)), err);
>   	return -EBADE;
>   }
>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafał Miłecki May 8, 2015, 10:24 a.m. UTC | #2 
On 8 May 2015 at 12:08, Arend van Spriel <arend@broadcom.com> wrote:
> On 05/07/15 21:07, Rafa? Mi?ecki wrote:
>>
>> They are used with CONFIG_BRCMDBG so it makes sense to put them in debug
>> specific file. Also they aren't really specific to fwil.c.
>
> Actually they are. fwil is abbreviation of firmware interface layer and the
> intention is to give the error as given by firmware. However, as you
> discovered it also (wrongly) maps linux errors and that needs to be fixed as
> it can confuse people staring at the log.

OK, my commit message is wrong. What about change itself? Should I
just fix the commit message?
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
index 9b473d5..2d9a1c0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
@@ -115,3 +115,67 @@  int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
 
 	return PTR_ERR_OR_ZERO(dentry);
 }
+
+static const char * const brcmf_errstr[] = {
+	"BCME_OK",
+	"BCME_ERROR",
+	"BCME_BADARG",
+	"BCME_BADOPTION",
+	"BCME_NOTUP",
+	"BCME_NOTDOWN",
+	"BCME_NOTAP",
+	"BCME_NOTSTA",
+	"BCME_BADKEYIDX",
+	"BCME_RADIOOFF",
+	"BCME_NOTBANDLOCKED",
+	"BCME_NOCLK",
+	"BCME_BADRATESET",
+	"BCME_BADBAND",
+	"BCME_BUFTOOSHORT",
+	"BCME_BUFTOOLONG",
+	"BCME_BUSY",
+	"BCME_NOTASSOCIATED",
+	"BCME_BADSSIDLEN",
+	"BCME_OUTOFRANGECHAN",
+	"BCME_BADCHAN",
+	"BCME_BADADDR",
+	"BCME_NORESOURCE",
+	"BCME_UNSUPPORTED",
+	"BCME_BADLEN",
+	"BCME_NOTREADY",
+	"BCME_EPERM",
+	"BCME_NOMEM",
+	"BCME_ASSOCIATED",
+	"BCME_RANGE",
+	"BCME_NOTFOUND",
+	"BCME_WME_NOT_ENABLED",
+	"BCME_TSPEC_NOTFOUND",
+	"BCME_ACM_NOTSUPPORTED",
+	"BCME_NOT_WME_ASSOCIATION",
+	"BCME_SDIO_ERROR",
+	"BCME_DONGLE_DOWN",
+	"BCME_VERSION",
+	"BCME_TXFAIL",
+	"BCME_RXFAIL",
+	"BCME_NODEVICE",
+	"BCME_NMODE_DISABLED",
+	"BCME_NONRESIDENT",
+	"BCME_SCANREJECT",
+	"BCME_USAGE_ERROR",
+	"BCME_IOCTL_ERROR",
+	"BCME_SERIAL_PORT_ERR",
+	"BCME_DISABLED",
+	"BCME_DECERR",
+	"BCME_ENCERR",
+	"BCME_MICERR",
+	"BCME_REPLAY",
+	"BCME_IE_NOTFOUND",
+};
+
+const char *brcmf_get_errstr(u32 err)
+{
+	if (err >= ARRAY_SIZE(brcmf_errstr))
+		return "(unknown)";
+
+	return brcmf_errstr[err];
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/brcm80211/brcmfmac/debug.h
index eb0b8c4..d1b2a5c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.h
@@ -111,6 +111,7 @@  void brcmf_debugfs_detach(struct brcmf_pub *drvr);
 struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
 int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
 			    int (*read_fn)(struct seq_file *seq, void *data));
+const char *brcmf_get_errstr(u32 err);
 #else
 static inline void brcmf_debugfs_init(void)
 {
@@ -131,6 +132,10 @@  int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
 {
 	return 0;
 }
+static inline const char *brcmf_get_errstr(u32 err)
+{
+	return "";
+}
 #endif
 
 #endif /* BRCMFMAC_DEBUG_H */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
index dcfa0bb..bdbdc9e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
@@ -32,77 +32,6 @@ 
 
 #define MAX_HEX_DUMP_LEN	64
 
-#ifdef DEBUG
-static const char * const brcmf_fil_errstr[] = {
-	"BCME_OK",
-	"BCME_ERROR",
-	"BCME_BADARG",
-	"BCME_BADOPTION",
-	"BCME_NOTUP",
-	"BCME_NOTDOWN",
-	"BCME_NOTAP",
-	"BCME_NOTSTA",
-	"BCME_BADKEYIDX",
-	"BCME_RADIOOFF",
-	"BCME_NOTBANDLOCKED",
-	"BCME_NOCLK",
-	"BCME_BADRATESET",
-	"BCME_BADBAND",
-	"BCME_BUFTOOSHORT",
-	"BCME_BUFTOOLONG",
-	"BCME_BUSY",
-	"BCME_NOTASSOCIATED",
-	"BCME_BADSSIDLEN",
-	"BCME_OUTOFRANGECHAN",
-	"BCME_BADCHAN",
-	"BCME_BADADDR",
-	"BCME_NORESOURCE",
-	"BCME_UNSUPPORTED",
-	"BCME_BADLEN",
-	"BCME_NOTREADY",
-	"BCME_EPERM",
-	"BCME_NOMEM",
-	"BCME_ASSOCIATED",
-	"BCME_RANGE",
-	"BCME_NOTFOUND",
-	"BCME_WME_NOT_ENABLED",
-	"BCME_TSPEC_NOTFOUND",
-	"BCME_ACM_NOTSUPPORTED",
-	"BCME_NOT_WME_ASSOCIATION",
-	"BCME_SDIO_ERROR",
-	"BCME_DONGLE_DOWN",
-	"BCME_VERSION",
-	"BCME_TXFAIL",
-	"BCME_RXFAIL",
-	"BCME_NODEVICE",
-	"BCME_NMODE_DISABLED",
-	"BCME_NONRESIDENT",
-	"BCME_SCANREJECT",
-	"BCME_USAGE_ERROR",
-	"BCME_IOCTL_ERROR",
-	"BCME_SERIAL_PORT_ERR",
-	"BCME_DISABLED",
-	"BCME_DECERR",
-	"BCME_ENCERR",
-	"BCME_MICERR",
-	"BCME_REPLAY",
-	"BCME_IE_NOTFOUND",
-};
-
-static const char *brcmf_fil_get_errstr(u32 err)
-{
-	if (err >= ARRAY_SIZE(brcmf_fil_errstr))
-		return "(unknown)";
-
-	return brcmf_fil_errstr[err];
-}
-#else
-static const char *brcmf_fil_get_errstr(u32 err)
-{
-	return "";
-}
-#endif /* DEBUG */
-
 static s32
 brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set)
 {
@@ -125,7 +54,7 @@  brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set)
 		return 0;
 
 	brcmf_dbg(FIL, "Failed: %s (%d)\n",
-		  brcmf_fil_get_errstr((u32)(-err)), err);
+		  brcmf_get_errstr((u32)(-err)), err);
 	return -EBADE;
 }