Date: Tue, 9 Dec 2003 23:04:23 +0100 From: Johan Karlsson <johan@freebsd.org> To: Poul-Henning Kamp <phk@phk.freebsd.dk> Cc: current@freebsd.org Subject: Re: Soekris/if_sis short cable fix, take 2 Message-ID: <20031209220423.GA33775@numeri.campus.luth.se> In-Reply-To: <13705.1070704581@critter.freebsd.dk> References: <13705.1070704581@critter.freebsd.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi
On Sat, Dec 06, 2003 at 10:56 (+0100) +0000, Poul-Henning Kamp wrote:
>
> This patch attempts to improve on the "short cable fix" thing
> with DP83815 chips, please test and report.
since I have such a card I have compiled a new module with this
patch applied. When doing a kldunload/kldload with the new module I get
ukphy0: detached
miibus0: detached
sis0: detached
sis0: <NatSemi DP8381[56] 10/100BaseTX> port 0xec00-0xecff mem 0xdffff000-0xdfffffff irq 17 at device 10.0 on pci0
sis0: Silicon Revision: DP83815C
sis0: Ethernet address: 00:a0:cc:79:2b:c6
sis0: bpf attached
miibus0: <MII bus> on sis0
ukphy0: <Generic IEEE 802.3u media interface> on miibus0
ukphy0: OUI 0x080017, model 0x0002, rev. 1
ukphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
sis0: Applying short cable fix (reg=ee)
^^ I've seen some other values here as well.
However, I have not noticed any problem before and if seems to be working
now as well. Do you want me to test anything in particular?
/Johan K
>
> (this is a repost, the first didn't seem to make it to current@)
>
> Index: if_sis.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/pci/if_sis.c,v
> retrieving revision 1.90
> diff -u -r1.90 if_sis.c
> --- if_sis.c 14 Nov 2003 19:00:31 -0000 1.90
> +++ if_sis.c 2 Dec 2003 08:46:42 -0000
> @@ -2095,6 +2095,28 @@
> sis_list_tx_init(sc);
>
> /*
> + * Page 78 of the DP83815 data sheet (september 2002 version)
> + * recommends the following register settings "for optimum
> + * performance." for rev 15C. The driver from NS also sets
> + * the PHY_CR register for later versions.
> + */
> + if (sc->sis_type == SIS_TYPE_83815) {
> + CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001);
> + /* DC speed = 01 */
> + CSR_WRITE_4(sc, NS_PHY_CR, 0x189C);
> + if (sc->sis_srr == NS_SRR_15C) {
> + /* set val for c2 */
> + CSR_WRITE_4(sc, NS_PHY_TDATA, 0x0000);
> + /* load/kill c2 */
> + CSR_WRITE_4(sc, NS_PHY_DSPCFG, 0x5040);
> + /* rais SD off, from 4 to c */
> + CSR_WRITE_4(sc, NS_PHY_SDCFG, 0x008C);
> + }
> + CSR_WRITE_4(sc, NS_PHY_PAGE, 0);
> + }
> +
> +
> + /*
> * For the NatSemi chip, we have to explicitly enable the
> * reception of ARP frames, as well as turn on the 'perfect
> * match' filter where we store the station address, otherwise
> @@ -2148,7 +2170,6 @@
> CSR_WRITE_4(sc, SIS_RX_CFG, SIS_RXCFG256);
> }
>
> -
> /* Accept Long Packets for VLAN support */
> SIS_SETBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_JABBER);
>
> @@ -2183,12 +2204,15 @@
> CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001);
>
> reg = CSR_READ_4(sc, NS_PHY_DSPCFG);
> + /* Allow coefficient to be read */
> CSR_WRITE_4(sc, NS_PHY_DSPCFG, (reg & 0xfff) | 0x1000);
> DELAY(100);
> reg = CSR_READ_4(sc, NS_PHY_TDATA);
> - if ((reg & 0x0080) == 0 || (reg & 0xff) >= 0xd8) {
> + if ((reg & 0x0080) == 0 ||
> + (reg > 0xd8 && reg <= 0xff)) {
> device_printf(sc->sis_self, "Applying short cable fix (reg=%x)\n", reg);
> CSR_WRITE_4(sc, NS_PHY_TDATA, 0x00e8);
> + /* Adjust coefficient and prevent change */
> SIS_SETBIT(sc, NS_PHY_DSPCFG, 0x20);
> }
> CSR_WRITE_4(sc, NS_PHY_PAGE, 0);
> @@ -2216,21 +2240,6 @@
> #ifdef notdef
> mii_mediachg(mii);
> #endif
> -
> - /*
> - * Page 75 of the DP83815 manual recommends the
> - * following register settings "for optimum
> - * performance." Note however that at least three
> - * of the registers are listed as "reserved" in
> - * the register map, so who knows what they do.
> - */
> - if (sc->sis_type == SIS_TYPE_83815) {
> - CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001);
> - CSR_WRITE_4(sc, NS_PHY_CR, 0x189C);
> - CSR_WRITE_4(sc, NS_PHY_TDATA, 0x0000);
> - CSR_WRITE_4(sc, NS_PHY_DSPCFG, 0x5040);
> - CSR_WRITE_4(sc, NS_PHY_SDCFG, 0x008C);
> - }
>
> ifp->if_flags |= IFF_RUNNING;
> ifp->if_flags &= ~IFF_OACTIVE;
> --
> Poul-Henning Kamp | UNIX since Zilog Zeus 3.20
> phk@FreeBSD.ORG | TCP/IP since RFC 956
> FreeBSD committer | BSD since 4.3-tahoe
> Never attribute to malice what can adequately be explained by incompetence.
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"
--
Johan Karlsson mailto:johan@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031209220423.GA33775>