Date: Thu, 21 Oct 2004 15:35:25 -0700 From: Brooks Davis <brooks@one-eyed-alien.net> To: Brooks Davis <brooks@one-eyed-alien.net> Cc: freebsd-hackers@freebsd.org Subject: Re: [PATCH] Re: Linksys PCM200 Message-ID: <20041021223525.GB4730@odin.ac.hmc.edu> In-Reply-To: <20041021173456.GA20517@odin.ac.hmc.edu> References: <200410132110.09915.soralx@cydem.org> <200410171122.28021.soralx@cydem.org> <20041021173456.GA20517@odin.ac.hmc.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--A6N2fC+uXW/VQSAv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Oct 21, 2004 at 10:34:56AM -0700, Brooks Davis wrote:
> On Wed, Oct 20, 2004 at 10:59:50PM -0600, soralx@cydem.org wrote:
> >=20
> > [got no answer on hardware@]
> >=20
> > I've tested this on 5.3-BETA7 - works OK, no more watchdog timeouts.
> > So could someone review those patches and add them to the source tree?
> > It's probably a good idea to update dc(4) and supported hw list also.
>=20
> I'm looking at this, though I have no hardware to test with.
Could some people with dc(4) devices please test the following patch?
It compiles for me and is trivial, but a quick test is probalby in order
before I commit it. This differs from soralx's patch in that it adds
comments on the 0xab08 collisions and shortens the description string to
something that will fit in one line on the console.
Thanks,
Brooks
Index: if_dc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sys/pci/if_dc.c,v
retrieving revision 1.152
diff -u -p -r1.152 if_dc.c
--- if_dc.c 1 Oct 2004 15:23:31 -0000 1.152
+++ if_dc.c 21 Oct 2004 22:32:39 -0000
@@ -218,6 +218,10 @@ static struct dc_type dc_devs[] =3D {
"Microsoft MN-130 10/100" },
{ DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130_FAKE,
"Microsoft MN-130 10/100" },
+ { DC_VENDORID_LINKSYS, DC_DEVICEID_PCM200_AB08,
+ "Linksys PCM200 EtherFast CardBus 10/100" },
+ { DC_VENDORID_LINKSYS, DC_DEVICEID_PCM200_AB09,
+ "Linksys PCM200 EtherFast CardBus 10/100" },
{ 0, 0, NULL }
};
=20
@@ -1917,10 +1921,16 @@ dc_attach(device_t dev)
case DC_DEVICEID_FA511:
case DC_DEVICEID_FE2500:
case DC_DEVICEID_EN2242:
- case DC_DEVICEID_HAWKING_PN672TX:
+ case DC_DEVICEID_HAWKING_PN672TX:=09
+#if 0 /* DC_DEVICEID_HAWKING_PN672TX has the same ID as the following */
+ case DC_DEVICEID_FE2500MX:
+ case DC_DEVICEID_FNW3602T:
+ case DC_DEVICEID_PCM200_AB08:
+#endif
case DC_DEVICEID_3CSOHOB:
case DC_DEVICEID_MSMN120:
case DC_DEVICEID_MSMN130_FAKE: /* XXX avoid collision with PNIC*/
+ case DC_DEVICEID_PCM200_AB09:
sc->dc_type =3D DC_TYPE_AN985;
sc->dc_flags |=3D DC_64BIT_HASH;
sc->dc_flags |=3D DC_TX_USE_TX_INTR;
Index: if_dcreg.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sys/pci/if_dcreg.h,v
retrieving revision 1.42
diff -u -p -r1.42 if_dcreg.h
--- if_dcreg.h 29 Jun 2004 20:38:44 -0000 1.42
+++ if_dcreg.h 21 Oct 2004 22:32:40 -0000
@@ -998,6 +998,17 @@ struct dc_softc {
#define DC_DEVICEID_MSMN130_FAKE 0xFFF2
=20
/*
+ * Linksys vendor ID
+ */
+#define DC_VENDORID_LINKSYS 0x1737
+
+/*
+ * Linksys device IDs
+ */
+#define DC_DEVICEID_PCM200_AB08 0xab08
+#define DC_DEVICEID_PCM200_AB09 0xab09
+
+/*
* PCI low memory base and low I/O base register, and
* other PCI registers.
*/
--=20
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4
--A6N2fC+uXW/VQSAv
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQFBeDmsXY6L6fI4GtQRAq8CAKDSAzixBQOrWoBlWSvnyU7vRMYuswCdGWLO
SDTQvy/R41NdK3iNVAJASOw=
=IGaH
-----END PGP SIGNATURE-----
--A6N2fC+uXW/VQSAv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041021223525.GB4730>