Patchwork ethtool: Add version check for et131x regs

login
register
mail settings
Submitter Mark Einon
Date Jan. 5, 2013, 9:57 a.m.
Message ID <1357379851-5298-1-git-send-email-mark.einon@gmail.com>
Download mbox | patch
Permalink /patch/209657/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Mark Einon - Jan. 5, 2013, 9:57 a.m.
Added a version check for the et131x reg dump, in case the dump format
needs to be changed later.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
 et131x.c |    4 ++++
 1 file changed, 4 insertions(+)
Ben Hutchings - Jan. 22, 2013, 8:44 p.m.
On Sat, 2013-01-05 at 09:57 +0000, Mark Einon wrote:
> Added a version check for the et131x reg dump, in case the dump format
> needs to be changed later.
> 
> Signed-off-by: Mark Einon <mark.einon@gmail.com>
> ---
>  et131x.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/et131x.c b/et131x.c
> index b36c184..8cdbec0 100644
> --- a/et131x.c
> +++ b/et131x.c
> @@ -4,8 +4,12 @@
>  
>  int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
>  {
> +	u8 version = (u8)(regs->version >> 24);
>  	u32 *reg = (u32 *)regs->data;
>  
> +	if(version != 1)

Needs a space before the open-parentheis.

Ben.

> +		return -1;
> +
>  	fprintf(stdout, "PHY Registers\n");
>  	fprintf(stdout, "0x0, Basic Control Reg          = 0x%04X\n", *reg++);
>  	fprintf(stdout, "0x1, Basic Status Reg           = 0x%04X\n", *reg++);
Mark Einon - Jan. 22, 2013, 9:03 p.m.
On 22 January 2013 20:44, Ben Hutchings <bhutchings@solarflare.com> wrote:
> On Sat, 2013-01-05 at 09:57 +0000, Mark Einon wrote:
>> Added a version check for the et131x reg dump, in case the dump format
>> needs to be changed later.
>>
>> Signed-off-by: Mark Einon <mark.einon@gmail.com>
>> ---
>>  et131x.c |    4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/et131x.c b/et131x.c
>> index b36c184..8cdbec0 100644
>> --- a/et131x.c
>> +++ b/et131x.c
>> @@ -4,8 +4,12 @@
>>
>>  int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
>>  {
>> +     u8 version = (u8)(regs->version >> 24);
>>       u32 *reg = (u32 *)regs->data;
>>
>> +     if(version != 1)
>
> Needs a space before the open-parentheis.
>
> Ben.

You're right - I cut and pasted the code from another file without
checking. I'll send a separate patch for fixing them, if you want this
patch re-submitted as well, then just let me know.

cheers,

Mark

>
>> +             return -1;
>> +
>>       fprintf(stdout, "PHY Registers\n");
>>       fprintf(stdout, "0x0, Basic Control Reg          = 0x%04X\n", *reg++);
>>       fprintf(stdout, "0x1, Basic Status Reg           = 0x%04X\n", *reg++);
>
> --
> Ben Hutchings, Staff Engineer, Solarflare
> Not speaking for my employer; that's the marketing department's job.
> They asked us to note that Solarflare product names are trademarked.
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/et131x.c b/et131x.c
index b36c184..8cdbec0 100644
--- a/et131x.c
+++ b/et131x.c
@@ -4,8 +4,12 @@ 
 
 int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
 {
+	u8 version = (u8)(regs->version >> 24);
 	u32 *reg = (u32 *)regs->data;
 
+	if(version != 1)
+		return -1;
+
 	fprintf(stdout, "PHY Registers\n");
 	fprintf(stdout, "0x0, Basic Control Reg          = 0x%04X\n", *reg++);
 	fprintf(stdout, "0x1, Basic Status Reg           = 0x%04X\n", *reg++);