[PATCH] bcm43xx: Add firmware version to ethtool output

[PATCH] bcm43xx: Add firmware version to ethtool output

[Larry Finger]

As the removal of ethtool capability from bcm43xx has been NACKed,
some useful functionality should be added. This patch changes it
so that the firmware version is output.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -27,6 +27,7 @@
 */
 
 #include "bcm43xx.h"
+#include "bcm43xx_main.h"
 #include "bcm43xx_ethtool.h"
 
 #include <linux/netdevice.h>
@@ -42,6 +43,8 @@ static void bcm43xx_get_drvinfo(struct n
 	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
 	strncpy(info->version, utsname()->release, sizeof(info->version));
 	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
+	snprintf(info->fw_version, sizeof(info->fw_version), "0x%x",
+		 bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODE_REVISION));
 }
 
 const struct ethtool_ops bcm43xx_ethtool_ops = {

Re: [PATCH] bcm43xx: Add firmware version to ethtool output

[Michael Buesch]

On Sunday 04 March 2007 19:55, Larry Finger wrote:
> As the removal of ethtool capability from bcm43xx has been NACKed,
> some useful functionality should be added.

I cannot follow this logics, sorry. ;)

> This patch changes it
> so that the firmware version is output.

I don't see how this is useful.
I really want to avoid having more ethtool stuff, as it will
only create compatibility issues for the future.
This doesn't give information that's not available elsewhere.

>  #include "bcm43xx.h"
> +#include "bcm43xx_main.h"
>  #include "bcm43xx_ethtool.h"
>  
>  #include <linux/netdevice.h>
> @@ -42,6 +43,8 @@ static void bcm43xx_get_drvinfo(struct n
>  	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
>  	strncpy(info->version, utsname()->release, sizeof(info->version));
>  	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
> +	snprintf(info->fw_version, sizeof(info->fw_version), "0x%x",
> +		 bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODE_REVISION));

This will crash when the device is not up.

-- 
Greetings Michael.

Re: [PATCH] bcm43xx: Add firmware version to ethtool output

[John W. Linville]

On Sun, Mar 04, 2007 at 08:02:39PM +0100, Michael Buesch wrote:
> On Sunday 04 March 2007 19:55, Larry Finger wrote:

> > @@ -42,6 +43,8 @@ static void bcm43xx_get_drvinfo(struct n
> >  	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
> >  	strncpy(info->version, utsname()->release, sizeof(info->version));
> >  	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
> > +	snprintf(info->fw_version, sizeof(info->fw_version), "0x%x",
> > +		 bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODE_REVISION));
> 
> This will crash when the device is not up.

Larry, will you be doing a new version of this patch that accounts
for this comment?

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH] bcm43xx: Add firmware version to ethtool output

[Larry Finger]

John W. Linville wrote:
> On Sun, Mar 04, 2007 at 08:02:39PM +0100, Michael Buesch wrote:
>> On Sunday 04 March 2007 19:55, Larry Finger wrote:
> 
>>> @@ -42,6 +43,8 @@ static void bcm43xx_get_drvinfo(struct n
>>>  	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
>>>  	strncpy(info->version, utsname()->release, sizeof(info->version));
>>>  	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
>>> +	snprintf(info->fw_version, sizeof(info->fw_version), "0x%x",
>>> +		 bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, BCM43xx_UCODE_REVISION));
>> This will crash when the device is not up.
> 
> Larry, will you be doing a new version of this patch that accounts
> for this comment?

No. Just drop that patch. It doesn't add enough functionality to bother with it.

Larry