Date: Sun, 16 Aug 2015 20:56:23 +0900 From: Yonghyeon PYUN <pyunyh@gmail.com> To: Kim Culhan <w8hdkim@gmail.com> Cc: sbruno@freebsd.org, freebsd-net@freebsd.org Subject: Re: RE not working on 10.2-RELEASE #0 r286731M Message-ID: <20150816115623.GA1288@michelle.fasterthan.com> In-Reply-To: <CAKZxVQU1_g%2BYf71Z%2BkoGnVW8anH%2Bh3dYhUOducTVP5_p%2Brq0_A@mail.gmail.com> References: <CAKZxVQU1_g%2BYf71Z%2BkoGnVW8anH%2Bh3dYhUOducTVP5_p%2Brq0_A@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Fri, Aug 14, 2015 at 06:29:08PM -0400, Kim Culhan wrote:
[...]
> > On 08/14/15 13:34, Kim Culhan wrote:
> >> RE on 10.2-RELEASE #0 r286731M appears to pass only arp traffic.
> >>
> >> Replaced if_re.c with version from 273757, appears to work
> >> normally.
> >>
> >> The diff:
> >>
> >> 34c34 < __FBSDID("$FreeBSD: stable/10/sys/dev/re/if_re.c 273757
> >> 2014-10-28 00:43:00Z yongari $"); ---
> >>> __FBSDID("$FreeBSD: releng/10.2/sys/dev/re/if_re.c 285177
> >>> 2015-07-05
> >> 20:16:38Z marius $"); 3198,3202d3197 < * Enable transmit and
> >> receive. < */ < CSR_WRITE_1(sc, RL_COMMAND,
> >> RL_CMD_TX_ENB|RL_CMD_RX_ENB); < < /* 3227a3223,3227
> >>> /* * Enable transmit and receive. */ CSR_WRITE_1(sc, RL_COMMAND,
> >>> RL_CMD_TX_ENB | RL_CMD_RX_ENB);
> >>>
> >> 3251,3254d3250 < #ifdef notdef < /* Enable receiver and
> >> transmitter. */ < CSR_WRITE_1(sc, RL_COMMAND,
> >> RL_CMD_TX_ENB|RL_CMD_RX_ENB); < #endif
> >>
> >> Let me know what additional info I can provide.
[...]
> > I'm running -current with all changes in place, I'm not seeing the
> > issues noted here with my hardware. Can you post your hardware from
> > pciconf -lv?
> >
> > re0@pci0:3:0:0: class=0x020000 card=0x84321043 chip=0x816810ec
> > rev=0x06 hdr=0x00
> > vendor = 'Realtek Semiconductor Co., Ltd.'
> > device = 'RTL8111/8168B PCI Express Gigabit Ethernet controller'
> > class = network
> > subclass = ethernet
> > re1@pci0:4:5:0: class=0x020000 card=0x43021186 chip=0x43021186
> > rev=0x10 hdr=0x00
> > vendor = 'D-Link System Inc'
> > device = 'DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek
> > RTL8169]'
> > class = network
> > subclass = ethernet
> >
> >
> > sean
>
> pciconf -lv
>
> re0@pci0:2:0:0: class=0x020000 card=0x83671043 chip=0x816810ec rev=0x02
> hdr=0x00
> vendor = 'Realtek Semiconductor Co., Ltd.'
> device = 'RTL8111/8168B PCI Express Gigabit Ethernet controller'
> class = network
> subclass = ethernet
> re1@pci0:6:0:0: class=0x020000 card=0x816910ec chip=0x816910ec rev=0x10
> hdr=0x00
> vendor = 'Realtek Semiconductor Co., Ltd.'
> device = 'RTL8169 PCI Gigabit Ethernet Controller'
> class = network
> subclass = ethernet
> re2@pci0:6:1:0: class=0x020000 card=0x4c001186 chip=0x43001186 rev=0x10
> hdr=0x00
> vendor = 'D-Link System Inc'
> device = 'DGE-528T Gigabit Ethernet Adapter'
> class = network
> subclass = ethernet
>
> The problem was noted on re2, re0 and re1 appeared to be working normally.
>
Hmm, it seems your PCI controller does not work.
I can't explain why Sean's re1 still works though.
Would you try attached patch?
BTW, it would be better to see the re(4) related dmesg output.
Driver will show Chip/MAC revision and that is the only way to
identify each MAC revision.
[-- Attachment #2 --]
Index: sys/dev/re/if_re.c
===================================================================
--- sys/dev/re/if_re.c (revision 286823)
+++ sys/dev/re/if_re.c (working copy)
@@ -3197,6 +3197,12 @@ re_init_locked(struct rl_softc *sc)
~0x00080000);
/*
+ * Enable transmit and receive for non-PCIe controllers.
+ * RX/TX MACs should be enabled before RX/TX configuration.
+ */
+ if ((sc->rl_flags & RL_FLAG_PCIE) == 0)
+ CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
+ /*
* Set the initial TX configuration.
*/
if (sc->rl_testmode) {
@@ -3223,9 +3229,11 @@ re_init_locked(struct rl_softc *sc)
}
/*
- * Enable transmit and receive.
+ * Enable transmit and receive for PCIe controllers.
+ * RX/TX MACs should be enabled after RX/TX configuration.
*/
- CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
+ if ((sc->rl_flags & RL_FLAG_PCIE) != 0)
+ CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
#ifdef DEVICE_POLLING
/*
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150816115623.GA1288>