[v3,1/2] realtek: convert to per-chip mask

The previous HW_REVID macro did not make identifiers more readable
(compared to hex values like 0x12345678) and only allowed for one static
mask. To make it easier to update the chips list, let's use similar
structures as r8169 and remove HW_REVID.

Names are removed and separated from the table and separated because the
mac_version does not have to be unique.

While at it, change "RTL-xxxx" to "RTLxxxx" to match the names of
Realtek and r8169 driver. Besides that, the only output change is when
a chip is not recognized in which case "TxConfig" is now mentioned
instead of "mask". Since the mask can be anything, the displayed word is
not masked either.

Signed-off-by: Peter Wu <lekensteyn@gmail.com>
---
 realtek.c | 108 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 45 deletions(-)

On Thu, 2013-07-25 at 15:36 +0200, Peter Wu wrote:
[...]
> @@ -35,36 +32,62 @@ enum chip_type {
>  	RTL8100E2,
>  };
>  
> -enum {
> -	chip_type_mask = HW_REVID(1, 1, 1, 1, 1, 1, 1, 1)
> +static const char * const chip_names[] = {
> +	[RTL8139] =		"8139",
> +	[RTL8139_K] =		"8139-K",
> +	[RTL8139A] =		"8139A",
> +	[RTL8139A_G] =		"8139A-G",
> +	[RTL8139B] =		"8139B",
> +	[RTL8130] =		"8130",
> +	[RTL8139C] =		"8139C",
> +	[RTL8100] =		"8100",
> +	[RTL8100B_8139D] =	"8100B/8139D",
> +	[RTL8139C] =		"8139C+",

Shouldn't the index here be RTL8139Cp?

[...]
>  static struct chip_info {
> -	const char *name;
>  	u32 id_mask;
> +	u32 id_val;
> +	int mac_version;
>  } rtl_info_tbl[] = {
[...]
> -	{ "RTL-8169/8110SCe",	HW_REVID(1, 0, 0, 1, 1, 0, 0, 0) },
[...]
> +	{ 0xfcc00000, 0x68000000,	RTL8169_8110SCe },
[...]

The old value would be converted to 0x98000000; is this a fix or a
mistake?

Ben.

On Thursday 08 August 2013 20:25:41 Ben Hutchings wrote:
> On Thu, 2013-07-25 at 15:36 +0200, Peter Wu wrote:
> [...]
> 
> > @@ -35,36 +32,62 @@ enum chip_type {
> > 
> >  	RTL8100E2,
> >  
> >  };
> > 
> > -enum {
> > -	chip_type_mask = HW_REVID(1, 1, 1, 1, 1, 1, 1, 1)
> > +static const char * const chip_names[] = {
> > +	[RTL8139] =		"8139",
> > +	[RTL8139_K] =		"8139-K",
> > +	[RTL8139A] =		"8139A",
> > +	[RTL8139A_G] =		"8139A-G",
> > +	[RTL8139B] =		"8139B",
> > +	[RTL8130] =		"8130",
> > +	[RTL8139C] =		"8139C",
> > +	[RTL8100] =		"8100",
> > +	[RTL8100B_8139D] =	"8100B/8139D",
> > +	[RTL8139C] =		"8139C+",
> 
> Shouldn't the index here be RTL8139Cp?

The specifications mention "RTL8139C+", I took pre-8169 names from the previous 
rtl_info_tbl contents:

-       { "RTL-8139C+",         HW_REVID(0, 1, 1, 1, 0, 1, 1, 0) },


> [...]
> 
> >  static struct chip_info {
> > 
> > -	const char *name;
> > 
> >  	u32 id_mask;
> > 
> > +	u32 id_val;
> > +	int mac_version;
> > 
> >  } rtl_info_tbl[] = {
> 
> [...]
> 
> > -	{ "RTL-8169/8110SCe",	HW_REVID(1, 0, 0, 1, 1, 0, 0, 0) },
> 
> [...]
> 
> > +	{ 0xfcc00000, 0x68000000,	RTL8169_8110SCe },
> 
> [...]
> 
> The old value would be converted to 0x98000000; is this a fix or a
> mistake?

I made a mistake here, I pre-processed it to some Javascript code, but 
apparantly (1 << 31) overflows to -0x80000000 which is what you are seeing 
here. I'll fix it up in a next revision.

In the following patch (2/2), I inserted automatically extracted values from 
the r8169 driver using an AWK script (see bottom of this message). At that 
point, "8169sc/8110sc" is restored again:

    [RTL_GIGA_MAC_VER_06] = "8169sc/8110sc",
    ...
    { 0xfc800000, 0x98000000,       RTL_GIGA_MAC_VER_06 },

Thanks for reviewing.

Regards,
Peter

--

#!/usr/bin/awk -f
# Usage: $0 drivers/net/ethernet/realtek/r8169.c
BEGIN {
	# stage 0: copy enum for chip version
	# stage 1: grab names
	# stage 2: grab masks and mappings to name
	stage = -1;
	ver = "";
}
/enum mac_version/ {
	stage = 0;
}
/struct rtl_mac_info/ {
	stage = 2;
	print "};\n"
}
{
	if (stage == 0) {
		print
	}
	if (stage == 1 && ver) {
		split($1, a, "\"");
		name = a[2];
		print "\t" ver " = \"" name "\","
		ver = "";
	}
	if (stage == 2) {
		sub("\t", "");
		print
	}
}
/};/ {
	if (stage == 0) {
		stage = 1;
		print "\nstatic const char *chip_names[] = {"
	}
	if (stage == 2) exit
}
/\[RTL_GIGA_MAC_VER_/ {
	ver = $1
}
--
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

On Fri, 2013-08-09 at 10:51 +0200, Peter Wu wrote:
> On Thursday 08 August 2013 20:25:41 Ben Hutchings wrote:
> > On Thu, 2013-07-25 at 15:36 +0200, Peter Wu wrote:
> > [...]
> > 
> > > @@ -35,36 +32,62 @@ enum chip_type {
> > > 
> > >  	RTL8100E2,
> > >  
> > >  };
> > > 
> > > -enum {
> > > -	chip_type_mask = HW_REVID(1, 1, 1, 1, 1, 1, 1, 1)
> > > +static const char * const chip_names[] = {
> > > +	[RTL8139] =		"8139",
> > > +	[RTL8139_K] =		"8139-K",
> > > +	[RTL8139A] =		"8139A",
> > > +	[RTL8139A_G] =		"8139A-G",
> > > +	[RTL8139B] =		"8139B",
> > > +	[RTL8130] =		"8130",
> > > +	[RTL8139C] =		"8139C",
> > > +	[RTL8100] =		"8100",
> > > +	[RTL8100B_8139D] =	"8100B/8139D",
> > > +	[RTL8139C] =		"8139C+",
> > 
> > Shouldn't the index here be RTL8139Cp?
> 
> The specifications mention "RTL8139C+", I took pre-8169 names from the previous 
> rtl_info_tbl contents:
[...]

I'm talking about the index, not the name.  This has an index of
RTL8139C which is also used 3 lines up.

Ben.

On Friday 09 August 2013 11:44:50 Ben Hutchings wrote:
> On Fri, 2013-08-09 at 10:51 +0200, Peter Wu wrote:
> > On Thursday 08 August 2013 20:25:41 Ben Hutchings wrote:
> > > On Thu, 2013-07-25 at 15:36 +0200, Peter Wu wrote:
> > > [...]
> > >
> > > 
> > >
> > > > @@ -35,36 +32,62 @@ enum chip_type {
> > > >
> > > > 
> > > >   RTL8100E2,
> > > >  
> > > >  };
> > > > 
> > > >
> > > > -enum {
> > > > - chip_type_mask = HW_REVID(1, 1, 1, 1, 1, 1, 1, 1)
> > > > +static const char * const chip_names[] = {
> > > > + [RTL8139] =             "8139",
> > > > + [RTL8139_K] =           "8139-K",
> > > > + [RTL8139A] =            "8139A",
> > > > + [RTL8139A_G] =          "8139A-G",
> > > > + [RTL8139B] =            "8139B",
> > > > + [RTL8130] =             "8130",
> > > > + [RTL8139C] =            "8139C",
> > > > + [RTL8100] =             "8100",
> > > > + [RTL8100B_8139D] =      "8100B/8139D",
> > > > + [RTL8139C] =            "8139C+",
> > >
> > > 
> > >
> > > Shouldn't the index here be RTL8139Cp?
> >
> > 
> >
> > The specifications mention "RTL8139C+", I took pre-8169 names from the
> > previous 
> > rtl_info_tbl contents:
> [...]
> 
> I'm talking about the index, not the name.  This has an index of
> RTL8139C which is also used 3 lines up.

Oh oops, my sed expression missed this one. I'll fix this in the next version.

Regards,
Peter
--
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