Author: np
Date: Mon Apr 5 23:29:27 2010
New Revision: 206220
URL: http://svn.freebsd.org/changeset/base/206220
Log:
cxgb(4) MFCs:
r204271,r204274,r204348,r204921,r205944,r205945,r205946,r205947,r205948,r205949,r205950,r206109
r204271:
Accessing an mbuf after it has been handed off to the hardware is a bad
race as it could already have been tx'd and freed by that time. Place
the bpf tap just _before_ writing the gen bit.
This fixes a panic when running tcpdump on a cxgb interface.
r204274:
There is no need to test __FreeBSD_version for features that have
been around for a long time now (7.1-ish or even earlier); assume
they are present. These includes MSI, TSO, LRO, VLAN, INTR_FILTERS,
FIRMWARE, etc.
Also, eliminate some dead code and clean up in other places as part
of this quick once-over.
r204348:
Support IFCAP_VLANHWTSO in cxgb(4). It works with or without vlanhwtag.
While here, remove old DPRINTFs and tidy up the capability code a bit.
r204921:
Better TwinAx transceiver detection.
Originally submitted by: <Bruno dot Bittner at isilon dot com>
(This is a rewritten, corrected version of that patch)
r205944:
Refresh the firmware version immediately after it is upgraded (or downgraded).
r205945:
Improved PHY EDC settings.
r205946:
Do not attempt to retrieve interrupt information before it is available.
r205947:
Fix build with "nooptions INET"
r205948:
Fix tx drop statistics.
r205949:
Fix signed/unsigned mix-up that allowed txq->in_use to grow beyond txq->size.
r205950:
Multiple fixes related to queue set sizing and resources:
- Only the tunnelq (TXQ_ETH) requires a buf_ring, an ifq, and the
watchdog/timer
callouts. Do not allocate these for the other tx queues.
- Use 16k jumbo clusters only on offload capable cards by default.
- Do not allocate a full tx ring for the offload queue if the card is not
offload capable.
- Slightly better freelist size calculation.
- Fix nmbjumbo4 typo, remove unneeded global variables.
r206109:
Increase response queue size to avoid starvation, add a counter
to track it when it does occur.
Deleted:
stable/8/sys/dev/cxgb/common/cxgb_version.h
stable/8/sys/dev/cxgb/cxgb_config.h
Modified:
stable/8/sys/dev/cxgb/common/cxgb_ael1002.c
stable/8/sys/dev/cxgb/common/cxgb_common.h
stable/8/sys/dev/cxgb/common/cxgb_t3_hw.c
stable/8/sys/dev/cxgb/cxgb_adapter.h
stable/8/sys/dev/cxgb/cxgb_main.c
stable/8/sys/dev/cxgb/cxgb_offload.h
stable/8/sys/dev/cxgb/cxgb_osdep.h
stable/8/sys/dev/cxgb/cxgb_sge.c
stable/8/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
stable/8/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
stable/8/sys/modules/cxgb/cxgb/Makefile
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/cxgb/common/cxgb_ael1002.c
==============================================================================
--- stable/8/sys/dev/cxgb/common/cxgb_ael1002.c Mon Apr 5 22:15:06 2010
(r206219)
+++ stable/8/sys/dev/cxgb/common/cxgb_ael1002.c Mon Apr 5 23:29:27 2010
(r206220)
@@ -446,7 +446,7 @@ static int ael2xxx_get_module_type(struc
return v;
if (v == 0x1)
- return phy_modtype_twinax;
+ goto twinax;
if (v == 0x10)
return phy_modtype_sr;
if (v == 0x20)
@@ -454,6 +454,17 @@ static int ael2xxx_get_module_type(struc
if (v == 0x40)
return phy_modtype_lrm;
+ v = ael_i2c_rd(phy, MODULE_DEV_ADDR, 8);
+ if (v < 0)
+ return v;
+ if (v == 4) {
+ v = ael_i2c_rd(phy, MODULE_DEV_ADDR, 60);
+ if (v < 0)
+ return v;
+ if (v & 0x1)
+ goto twinax;
+ }
+
v = ael_i2c_rd(phy, MODULE_DEV_ADDR, 6);
if (v < 0)
return v;
@@ -465,6 +476,7 @@ static int ael2xxx_get_module_type(struc
return v;
if (v & 0x80) {
+twinax:
v = ael_i2c_rd(phy, MODULE_DEV_ADDR, 0x12);
if (v < 0)
return v;
@@ -1435,395 +1447,439 @@ static int ael2020_setup_twinax_edc(stru
0xd803, 0x40aa,
0xd804, 0x401c,
0xd805, 0x401e,
- 0xd806, 0x2ff4,
- 0xd807, 0x3dc4,
- 0xd808, 0x2035,
- 0xd809, 0x3035,
- 0xd80a, 0x6524,
- 0xd80b, 0x2cb2,
- 0xd80c, 0x3012,
- 0xd80d, 0x1002,
- 0xd80e, 0x26e2,
- 0xd80f, 0x3022,
- 0xd810, 0x1002,
- 0xd811, 0x27d2,
- 0xd812, 0x3022,
+ 0xd806, 0x20c5,
+ 0xd807, 0x3c05,
+ 0xd808, 0x6536,
+ 0xd809, 0x2fe4,
+ 0xd80a, 0x3dc4,
+ 0xd80b, 0x6624,
+ 0xd80c, 0x2ff4,
+ 0xd80d, 0x3dc4,
+ 0xd80e, 0x2035,
+ 0xd80f, 0x30a5,
+ 0xd810, 0x6524,
+ 0xd811, 0x2ca2,
+ 0xd812, 0x3012,
0xd813, 0x1002,
- 0xd814, 0x2822,
- 0xd815, 0x3012,
+ 0xd814, 0x27e2,
+ 0xd815, 0x3022,
0xd816, 0x1002,
- 0xd817, 0x2492,
+ 0xd817, 0x28d2,
0xd818, 0x3022,
0xd819, 0x1002,
- 0xd81a, 0x2772,
+ 0xd81a, 0x2892,
0xd81b, 0x3012,
0xd81c, 0x1002,
- 0xd81d, 0x23d2,
+ 0xd81d, 0x24e2,
0xd81e, 0x3022,
0xd81f, 0x1002,
- 0xd820, 0x22cd,
- 0xd821, 0x301d,
- 0xd822, 0x27f2,
- 0xd823, 0x3022,
- 0xd824, 0x1002,
- 0xd825, 0x5553,
- 0xd826, 0x0307,
- 0xd827, 0x2522,
- 0xd828, 0x3022,
- 0xd829, 0x1002,
- 0xd82a, 0x2142,
- 0xd82b, 0x3012,
- 0xd82c, 0x1002,
- 0xd82d, 0x4016,
- 0xd82e, 0x5e63,
- 0xd82f, 0x0344,
- 0xd830, 0x2142,
+ 0xd820, 0x27e2,
+ 0xd821, 0x3012,
+ 0xd822, 0x1002,
+ 0xd823, 0x2422,
+ 0xd824, 0x3022,
+ 0xd825, 0x1002,
+ 0xd826, 0x22cd,
+ 0xd827, 0x301d,
+ 0xd828, 0x28f2,
+ 0xd829, 0x3022,
+ 0xd82a, 0x1002,
+ 0xd82b, 0x5553,
+ 0xd82c, 0x0307,
+ 0xd82d, 0x2572,
+ 0xd82e, 0x3022,
+ 0xd82f, 0x1002,
+ 0xd830, 0x21a2,
0xd831, 0x3012,
0xd832, 0x1002,
- 0xd833, 0x400e,
- 0xd834, 0x2522,
- 0xd835, 0x3022,
- 0xd836, 0x1002,
- 0xd837, 0x2b52,
- 0xd838, 0x3012,
- 0xd839, 0x1002,
- 0xd83a, 0x2742,
+ 0xd833, 0x4016,
+ 0xd834, 0x5e63,
+ 0xd835, 0x0344,
+ 0xd836, 0x21a2,
+ 0xd837, 0x3012,
+ 0xd838, 0x1002,
+ 0xd839, 0x400e,
+ 0xd83a, 0x2572,
0xd83b, 0x3022,
0xd83c, 0x1002,
- 0xd83d, 0x25e2,
- 0xd83e, 0x3022,
+ 0xd83d, 0x2b22,
+ 0xd83e, 0x3012,
0xd83f, 0x1002,
- 0xd840, 0x2fa4,
- 0xd841, 0x3dc4,
- 0xd842, 0x6624,
- 0xd843, 0x414b,
- 0xd844, 0x56b3,
- 0xd845, 0x03c6,
- 0xd846, 0x866b,
- 0xd847, 0x400c,
- 0xd848, 0x2712,
- 0xd849, 0x3012,
- 0xd84a, 0x1002,
- 0xd84b, 0x2c4b,
- 0xd84c, 0x309b,
- 0xd84d, 0x56b3,
- 0xd84e, 0x03c3,
- 0xd84f, 0x866b,
- 0xd850, 0x400c,
- 0xd851, 0x2272,
- 0xd852, 0x3022,
- 0xd853, 0x1002,
- 0xd854, 0x2742,
- 0xd855, 0x3022,
- 0xd856, 0x1002,
- 0xd857, 0x25e2,
- 0xd858, 0x3022,
- 0xd859, 0x1002,
- 0xd85a, 0x2fb4,
- 0xd85b, 0x3dc4,
- 0xd85c, 0x6624,
- 0xd85d, 0x56b3,
- 0xd85e, 0x03c3,
- 0xd85f, 0x866b,
- 0xd860, 0x401c,
- 0xd861, 0x2c45,
- 0xd862, 0x3095,
- 0xd863, 0x5b53,
- 0xd864, 0x2372,
- 0xd865, 0x3012,
- 0xd866, 0x13c2,
- 0xd867, 0x5cc3,
- 0xd868, 0x2712,
- 0xd869, 0x3012,
- 0xd86a, 0x1312,
- 0xd86b, 0x2b52,
+ 0xd840, 0x2842,
+ 0xd841, 0x3022,
+ 0xd842, 0x1002,
+ 0xd843, 0x26e2,
+ 0xd844, 0x3022,
+ 0xd845, 0x1002,
+ 0xd846, 0x2fa4,
+ 0xd847, 0x3dc4,
+ 0xd848, 0x6624,
+ 0xd849, 0x2e8b,
+ 0xd84a, 0x303b,
+ 0xd84b, 0x56b3,
+ 0xd84c, 0x03c6,
+ 0xd84d, 0x866b,
+ 0xd84e, 0x400c,
+ 0xd84f, 0x2782,
+ 0xd850, 0x3012,
+ 0xd851, 0x1002,
+ 0xd852, 0x2c4b,
+ 0xd853, 0x309b,
+ 0xd854, 0x56b3,
+ 0xd855, 0x03c3,
+ 0xd856, 0x866b,
+ 0xd857, 0x400c,
+ 0xd858, 0x22a2,
+ 0xd859, 0x3022,
+ 0xd85a, 0x1002,
+ 0xd85b, 0x2842,
+ 0xd85c, 0x3022,
+ 0xd85d, 0x1002,
+ 0xd85e, 0x26e2,
+ 0xd85f, 0x3022,
+ 0xd860, 0x1002,
+ 0xd861, 0x2fb4,
+ 0xd862, 0x3dc4,
+ 0xd863, 0x6624,
+ 0xd864, 0x56b3,
+ 0xd865, 0x03c3,
+ 0xd866, 0x866b,
+ 0xd867, 0x401c,
+ 0xd868, 0x2c45,
+ 0xd869, 0x3095,
+ 0xd86a, 0x5b53,
+ 0xd86b, 0x23d2,
0xd86c, 0x3012,
- 0xd86d, 0x1002,
- 0xd86e, 0x2742,
- 0xd86f, 0x3022,
- 0xd870, 0x1002,
- 0xd871, 0x2582,
- 0xd872, 0x3022,
- 0xd873, 0x1002,
- 0xd874, 0x2142,
- 0xd875, 0x3012,
- 0xd876, 0x1002,
- 0xd877, 0x628f,
- 0xd878, 0x2985,
- 0xd879, 0x33a5,
- 0xd87a, 0x25e2,
- 0xd87b, 0x3022,
- 0xd87c, 0x1002,
- 0xd87d, 0x5653,
- 0xd87e, 0x03d2,
- 0xd87f, 0x401e,
- 0xd880, 0x6f72,
- 0xd881, 0x1002,
- 0xd882, 0x628f,
- 0xd883, 0x2304,
- 0xd884, 0x3c84,
- 0xd885, 0x6436,
- 0xd886, 0xdff4,
- 0xd887, 0x6436,
- 0xd888, 0x2ff5,
- 0xd889, 0x3005,
- 0xd88a, 0x8656,
- 0xd88b, 0xdfba,
- 0xd88c, 0x56a3,
- 0xd88d, 0xd05a,
- 0xd88e, 0x2972,
- 0xd88f, 0x3012,
- 0xd890, 0x1392,
- 0xd891, 0xd05a,
- 0xd892, 0x56a3,
- 0xd893, 0xdfba,
- 0xd894, 0x0383,
- 0xd895, 0x6f72,
- 0xd896, 0x1002,
- 0xd897, 0x2b45,
- 0xd898, 0x3005,
- 0xd899, 0x4178,
- 0xd89a, 0x5653,
- 0xd89b, 0x0384,
- 0xd89c, 0x2a62,
- 0xd89d, 0x3012,
- 0xd89e, 0x1002,
- 0xd89f, 0x2f05,
- 0xd8a0, 0x3005,
- 0xd8a1, 0x41c8,
- 0xd8a2, 0x5653,
- 0xd8a3, 0x0382,
- 0xd8a4, 0x0002,
- 0xd8a5, 0x4218,
- 0xd8a6, 0x2474,
- 0xd8a7, 0x3c84,
- 0xd8a8, 0x6437,
- 0xd8a9, 0xdff4,
- 0xd8aa, 0x6437,
- 0xd8ab, 0x2ff5,
- 0xd8ac, 0x3c05,
- 0xd8ad, 0x8757,
- 0xd8ae, 0xb888,
- 0xd8af, 0x9787,
- 0xd8b0, 0xdff4,
- 0xd8b1, 0x6724,
- 0xd8b2, 0x866a,
- 0xd8b3, 0x6f72,
- 0xd8b4, 0x1002,
- 0xd8b5, 0x2641,
- 0xd8b6, 0x3021,
- 0xd8b7, 0x1001,
- 0xd8b8, 0xc620,
- 0xd8b9, 0x0000,
- 0xd8ba, 0xc621,
- 0xd8bb, 0x0000,
- 0xd8bc, 0xc622,
- 0xd8bd, 0x00ce,
- 0xd8be, 0xc623,
- 0xd8bf, 0x007f,
- 0xd8c0, 0xc624,
- 0xd8c1, 0x0032,
- 0xd8c2, 0xc625,
- 0xd8c3, 0x0000,
- 0xd8c4, 0xc627,
- 0xd8c5, 0x0000,
- 0xd8c6, 0xc628,
- 0xd8c7, 0x0000,
- 0xd8c8, 0xc62c,
+ 0xd86d, 0x13c2,
+ 0xd86e, 0x5cc3,
+ 0xd86f, 0x2782,
+ 0xd870, 0x3012,
+ 0xd871, 0x1312,
+ 0xd872, 0x2b22,
+ 0xd873, 0x3012,
+ 0xd874, 0x1002,
+ 0xd875, 0x2842,
+ 0xd876, 0x3022,
+ 0xd877, 0x1002,
+ 0xd878, 0x2622,
+ 0xd879, 0x3022,
+ 0xd87a, 0x1002,
+ 0xd87b, 0x21a2,
+ 0xd87c, 0x3012,
+ 0xd87d, 0x1002,
+ 0xd87e, 0x628f,
+ 0xd87f, 0x2985,
+ 0xd880, 0x33a5,
+ 0xd881, 0x26e2,
+ 0xd882, 0x3022,
+ 0xd883, 0x1002,
+ 0xd884, 0x5653,
+ 0xd885, 0x03d2,
+ 0xd886, 0x401e,
+ 0xd887, 0x6f72,
+ 0xd888, 0x1002,
+ 0xd889, 0x628f,
+ 0xd88a, 0x2304,
+ 0xd88b, 0x3c84,
+ 0xd88c, 0x6436,
+ 0xd88d, 0xdff4,
+ 0xd88e, 0x6436,
+ 0xd88f, 0x2ff5,
+ 0xd890, 0x3005,
+ 0xd891, 0x8656,
+ 0xd892, 0xdfba,
+ 0xd893, 0x56a3,
+ 0xd894, 0xd05a,
+ 0xd895, 0x29e2,
+ 0xd896, 0x3012,
+ 0xd897, 0x1392,
+ 0xd898, 0xd05a,
+ 0xd899, 0x56a3,
+ 0xd89a, 0xdfba,
+ 0xd89b, 0x0383,
+ 0xd89c, 0x6f72,
+ 0xd89d, 0x1002,
+ 0xd89e, 0x2a64,
+ 0xd89f, 0x3014,
+ 0xd8a0, 0x2005,
+ 0xd8a1, 0x3d75,
+ 0xd8a2, 0xc451,
+ 0xd8a3, 0x29a2,
+ 0xd8a4, 0x3022,
+ 0xd8a5, 0x1002,
+ 0xd8a6, 0x178c,
+ 0xd8a7, 0x1898,
+ 0xd8a8, 0x19a4,
+ 0xd8a9, 0x1ab0,
+ 0xd8aa, 0x1bbc,
+ 0xd8ab, 0x1cc8,
+ 0xd8ac, 0x1dd3,
+ 0xd8ad, 0x1ede,
+ 0xd8ae, 0x1fe9,
+ 0xd8af, 0x20f4,
+ 0xd8b0, 0x21ff,
+ 0xd8b1, 0x0000,
+ 0xd8b2, 0x2741,
+ 0xd8b3, 0x3021,
+ 0xd8b4, 0x1001,
+ 0xd8b5, 0xc620,
+ 0xd8b6, 0x0000,
+ 0xd8b7, 0xc621,
+ 0xd8b8, 0x0000,
+ 0xd8b9, 0xc622,
+ 0xd8ba, 0x00e2,
+ 0xd8bb, 0xc623,
+ 0xd8bc, 0x007f,
+ 0xd8bd, 0xc624,
+ 0xd8be, 0x00ce,
+ 0xd8bf, 0xc625,
+ 0xd8c0, 0x0000,
+ 0xd8c1, 0xc627,
+ 0xd8c2, 0x0000,
+ 0xd8c3, 0xc628,
+ 0xd8c4, 0x0000,
+ 0xd8c5, 0xc90a,
+ 0xd8c6, 0x3a7c,
+ 0xd8c7, 0xc62c,
+ 0xd8c8, 0x0000,
0xd8c9, 0x0000,
- 0xd8ca, 0x0000,
- 0xd8cb, 0x2641,
- 0xd8cc, 0x3021,
- 0xd8cd, 0x1001,
- 0xd8ce, 0xc502,
- 0xd8cf, 0x53ac,
- 0xd8d0, 0xc503,
- 0xd8d1, 0x2cd3,
- 0xd8d2, 0xc600,
- 0xd8d3, 0x2a6e,
- 0xd8d4, 0xc601,
- 0xd8d5, 0x2a2c,
- 0xd8d6, 0xc605,
- 0xd8d7, 0x5557,
- 0xd8d8, 0xc60c,
- 0xd8d9, 0x5400,
- 0xd8da, 0xc710,
- 0xd8db, 0x0700,
- 0xd8dc, 0xc711,
- 0xd8dd, 0x0f06,
- 0xd8de, 0xc718,
- 0xd8df, 0x0700,
- 0xd8e0, 0xc719,
- 0xd8e1, 0x0f06,
- 0xd8e2, 0xc720,
- 0xd8e3, 0x4700,
- 0xd8e4, 0xc721,
- 0xd8e5, 0x0f06,
- 0xd8e6, 0xc728,
- 0xd8e7, 0x0700,
- 0xd8e8, 0xc729,
- 0xd8e9, 0x1207,
- 0xd8ea, 0xc801,
- 0xd8eb, 0x7f50,
- 0xd8ec, 0xc802,
- 0xd8ed, 0x7760,
- 0xd8ee, 0xc803,
- 0xd8ef, 0x7fce,
- 0xd8f0, 0xc804,
- 0xd8f1, 0x520e,
- 0xd8f2, 0xc805,
- 0xd8f3, 0x5c11,
- 0xd8f4, 0xc806,
- 0xd8f5, 0x3c51,
- 0xd8f6, 0xc807,
- 0xd8f7, 0x4061,
- 0xd8f8, 0xc808,
- 0xd8f9, 0x49c1,
- 0xd8fa, 0xc809,
- 0xd8fb, 0x3840,
- 0xd8fc, 0xc80a,
- 0xd8fd, 0x0000,
- 0xd8fe, 0xc821,
- 0xd8ff, 0x0002,
- 0xd900, 0xc822,
- 0xd901, 0x0046,
- 0xd902, 0xc844,
- 0xd903, 0x182f,
- 0xd904, 0xc013,
- 0xd905, 0xf341,
- 0xd906, 0xc084,
- 0xd907, 0x0030,
- 0xd908, 0xc904,
- 0xd909, 0x1401,
- 0xd90a, 0xcb0c,
- 0xd90b, 0x0004,
- 0xd90c, 0xcb0e,
- 0xd90d, 0xa00a,
- 0xd90e, 0xcb0f,
- 0xd90f, 0xc0c0,
- 0xd910, 0xcb10,
- 0xd911, 0xc0c0,
- 0xd912, 0xcb11,
- 0xd913, 0x00a0,
- 0xd914, 0xcb12,
- 0xd915, 0x0007,
- 0xd916, 0xc241,
- 0xd917, 0xa000,
- 0xd918, 0xc243,
- 0xd919, 0x7fe0,
- 0xd91a, 0xc604,
- 0xd91b, 0x000e,
- 0xd91c, 0xc609,
- 0xd91d, 0x00f5,
- 0xd91e, 0xc611,
- 0xd91f, 0x000e,
- 0xd920, 0xc660,
- 0xd921, 0x9600,
- 0xd922, 0xc687,
- 0xd923, 0x0004,
- 0xd924, 0xc60a,
- 0xd925, 0x04f5,
- 0xd926, 0x0000,
- 0xd927, 0x2641,
- 0xd928, 0x3021,
- 0xd929, 0x1001,
- 0xd92a, 0xc620,
- 0xd92b, 0x14e5,
- 0xd92c, 0xc621,
- 0xd92d, 0xc53d,
- 0xd92e, 0xc622,
- 0xd92f, 0x3cbe,
- 0xd930, 0xc623,
- 0xd931, 0x4452,
- 0xd932, 0xc624,
- 0xd933, 0xc5c5,
- 0xd934, 0xc625,
- 0xd935, 0xe01e,
- 0xd936, 0xc627,
- 0xd937, 0x0000,
- 0xd938, 0xc628,
- 0xd939, 0x0000,
- 0xd93a, 0xc62c,
- 0xd93b, 0x0000,
+ 0xd8ca, 0x2741,
+ 0xd8cb, 0x3021,
+ 0xd8cc, 0x1001,
+ 0xd8cd, 0xc502,
+ 0xd8ce, 0x53ac,
+ 0xd8cf, 0xc503,
+ 0xd8d0, 0x2cd3,
+ 0xd8d1, 0xc600,
+ 0xd8d2, 0x2a6e,
+ 0xd8d3, 0xc601,
+ 0xd8d4, 0x2a2c,
+ 0xd8d5, 0xc605,
+ 0xd8d6, 0x5557,
+ 0xd8d7, 0xc60c,
+ 0xd8d8, 0x5400,
+ 0xd8d9, 0xc710,
+ 0xd8da, 0x0700,
+ 0xd8db, 0xc711,
+ 0xd8dc, 0x0f06,
+ 0xd8dd, 0xc718,
+ 0xd8de, 0x700,
+ 0xd8df, 0xc719,
+ 0xd8e0, 0x0f06,
+ 0xd8e1, 0xc720,
+ 0xd8e2, 0x4700,
+ 0xd8e3, 0xc721,
+ 0xd8e4, 0x0f06,
+ 0xd8e5, 0xc728,
+ 0xd8e6, 0x0700,
+ 0xd8e7, 0xc729,
+ 0xd8e8, 0x1207,
+ 0xd8e9, 0xc801,
+ 0xd8ea, 0x7f50,
+ 0xd8eb, 0xc802,
+ 0xd8ec, 0x7760,
+ 0xd8ed, 0xc803,
+ 0xd8ee, 0x7fce,
+ 0xd8ef, 0xc804,
+ 0xd8f0, 0x520e,
+ 0xd8f1, 0xc805,
+ 0xd8f2, 0x5c11,
+ 0xd8f3, 0xc806,
+ 0xd8f4, 0x3c51,
+ 0xd8f5, 0xc807,
+ 0xd8f6, 0x4061,
+ 0xd8f7, 0xc808,
+ 0xd8f8, 0x49c1,
+ 0xd8f9, 0xc809,
+ 0xd8fa, 0x3840,
+ 0xd8fb, 0xc80a,
+ 0xd8fc, 0x0000,
+ 0xd8fd, 0xc821,
+ 0xd8fe, 0x0002,
+ 0xd8ff, 0xc822,
+ 0xd900, 0x0046,
+ 0xd901, 0xc844,
+ 0xd902, 0x182f,
+ 0xd903, 0xc849,
+ 0xd904, 0x0400,
+ 0xd905, 0xc84a,
+ 0xd906, 0x0002,
+ 0xd907, 0xc013,
+ 0xd908, 0xf341,
+ 0xd909, 0xc084,
+ 0xd90a, 0x0030,
+ 0xd90b, 0xc904,
+ 0xd90c, 0x1401,
+ 0xd90d, 0xcb0c,
+ 0xd90e, 0x0004,
+ 0xd90f, 0xcb0e,
+ 0xd910, 0xa00a,
+ 0xd911, 0xcb0f,
+ 0xd912, 0xc0c0,
+ 0xd913, 0xcb10,
+ 0xd914, 0xc0c0,
+ 0xd915, 0xcb11,
+ 0xd916, 0x00a0,
+ 0xd917, 0xcb12,
+ 0xd918, 0x0007,
+ 0xd919, 0xc241,
+ 0xd91a, 0xa000,
+ 0xd91b, 0xc243,
+ 0xd91c, 0x7fe0,
+ 0xd91d, 0xc604,
+ 0xd91e, 0x000e,
+ 0xd91f, 0xc609,
+ 0xd920, 0x00f5,
+ 0xd921, 0xc611,
+ 0xd922, 0x000e,
+ 0xd923, 0xc660,
+ 0xd924, 0x9600,
+ 0xd925, 0xc687,
+ 0xd926, 0x0004,
+ 0xd927, 0xc60a,
+ 0xd928, 0x04f5,
+ 0xd929, 0x0000,
+ 0xd92a, 0x2741,
+ 0xd92b, 0x3021,
+ 0xd92c, 0x1001,
+ 0xd92d, 0xc620,
+ 0xd92e, 0x14e5,
+ 0xd92f, 0xc621,
+ 0xd930, 0xc53d,
+ 0xd931, 0xc622,
+ 0xd932, 0x3cbe,
+ 0xd933, 0xc623,
+ 0xd934, 0x4452,
+ 0xd935, 0xc624,
+ 0xd936, 0xc5c5,
+ 0xd937, 0xc625,
+ 0xd938, 0xe01e,
+ 0xd939, 0xc627,
+ 0xd93a, 0x0000,
+ 0xd93b, 0xc628,
0xd93c, 0x0000,
- 0xd93d, 0x2b84,
- 0xd93e, 0x3c74,
- 0xd93f, 0x6435,
- 0xd940, 0xdff4,
- 0xd941, 0x6435,
- 0xd942, 0x2806,
- 0xd943, 0x3006,
- 0xd944, 0x8565,
- 0xd945, 0x2b24,
- 0xd946, 0x3c24,
- 0xd947, 0x6436,
- 0xd948, 0x1002,
- 0xd949, 0x2b24,
- 0xd94a, 0x3c24,
- 0xd94b, 0x6436,
- 0xd94c, 0x4045,
- 0xd94d, 0x8656,
- 0xd94e, 0x5663,
- 0xd94f, 0x0302,
- 0xd950, 0x401e,
- 0xd951, 0x1002,
- 0xd952, 0x2807,
- 0xd953, 0x31a7,
- 0xd954, 0x20c4,
- 0xd955, 0x3c24,
- 0xd956, 0x6724,
- 0xd957, 0x1002,
- 0xd958, 0x2807,
- 0xd959, 0x3187,
- 0xd95a, 0x20c4,
- 0xd95b, 0x3c24,
- 0xd95c, 0x6724,
- 0xd95d, 0x1002,
- 0xd95e, 0x24f4,
- 0xd95f, 0x3c64,
- 0xd960, 0x6436,
- 0xd961, 0xdff4,
- 0xd962, 0x6436,
- 0xd963, 0x1002,
- 0xd964, 0x2006,
- 0xd965, 0x3d76,
- 0xd966, 0xc161,
- 0xd967, 0x6134,
- 0xd968, 0x6135,
- 0xd969, 0x5443,
- 0xd96a, 0x0303,
- 0xd96b, 0x6524,
- 0xd96c, 0x00fb,
+ 0xd93d, 0xc62c,
+ 0xd93e, 0x0000,
+ 0xd93f, 0xc90a,
+ 0xd940, 0x3a7c,
+ 0xd941, 0x0000,
+ 0xd942, 0x2b84,
+ 0xd943, 0x3c74,
+ 0xd944, 0x6435,
+ 0xd945, 0xdff4,
+ 0xd946, 0x6435,
+ 0xd947, 0x2806,
+ 0xd948, 0x3006,
+ 0xd949, 0x8565,
+ 0xd94a, 0x2b24,
+ 0xd94b, 0x3c24,
+ 0xd94c, 0x6436,
+ 0xd94d, 0x1002,
+ 0xd94e, 0x2b24,
+ 0xd94f, 0x3c24,
+ 0xd950, 0x6436,
+ 0xd951, 0x4045,
+ 0xd952, 0x8656,
+ 0xd953, 0x5663,
+ 0xd954, 0x0302,
+ 0xd955, 0x401e,
+ 0xd956, 0x1002,
+ 0xd957, 0x2807,
+ 0xd958, 0x31a7,
+ 0xd959, 0x20c4,
+ 0xd95a, 0x3c24,
+ 0xd95b, 0x6724,
+ 0xd95c, 0x2ff7,
+ 0xd95d, 0x30f7,
+ 0xd95e, 0x20c4,
+ 0xd95f, 0x3c04,
+ 0xd960, 0x6724,
+ 0xd961, 0x1002,
+ 0xd962, 0x2807,
+ 0xd963, 0x3187,
+ 0xd964, 0x20c4,
+ 0xd965, 0x3c24,
+ 0xd966, 0x6724,
+ 0xd967, 0x2fe4,
+ 0xd968, 0x3dc4,
+ 0xd969, 0x6437,
+ 0xd96a, 0x20c4,
+ 0xd96b, 0x3c04,
+ 0xd96c, 0x6724,
0xd96d, 0x1002,
- 0xd96e, 0x20d4,
- 0xd96f, 0x3c24,
- 0xd970, 0x2025,
- 0xd971, 0x3005,
- 0xd972, 0x6524,
+ 0xd96e, 0x24f4,
+ 0xd96f, 0x3c64,
+ 0xd970, 0x6436,
+ 0xd971, 0xdff4,
+ 0xd972, 0x6436,
0xd973, 0x1002,
- 0xd974, 0xd019,
- 0xd975, 0x2104,
- 0xd976, 0x3c24,
- 0xd977, 0x2105,
- 0xd978, 0x3805,
- 0xd979, 0x6524,
- 0xd97a, 0xdff4,
- 0xd97b, 0x4005,
- 0xd97c, 0x6524,
- 0xd97d, 0x2e8d,
- 0xd97e, 0x303d,
- 0xd97f, 0x2408,
- 0xd980, 0x35d8,
- 0xd981, 0x5dd3,
- 0xd982, 0x0307,
- 0xd983, 0x8887,
- 0xd984, 0x63a7,
- 0xd985, 0x8887,
- 0xd986, 0x63a7,
- 0xd987, 0xdffd,
- 0xd988, 0x00f9,
- 0xd989, 0x1002,
- 0xd98a, 0x0000,
+ 0xd974, 0x2006,
+ 0xd975, 0x3d76,
+ 0xd976, 0xc161,
+ 0xd977, 0x6134,
+ 0xd978, 0x6135,
+ 0xd979, 0x5443,
+ 0xd97a, 0x0303,
+ 0xd97b, 0x6524,
+ 0xd97c, 0x00fb,
+ 0xd97d, 0x1002,
+ 0xd97e, 0x20d4,
+ 0xd97f, 0x3c24,
+ 0xd980, 0x2025,
+ 0xd981, 0x3005,
+ 0xd982, 0x6524,
+ 0xd983, 0x1002,
+ 0xd984, 0xd019,
+ 0xd985, 0x2104,
+ 0xd986, 0x3c24,
+ 0xd987, 0x2105,
+ 0xd988, 0x3805,
+ 0xd989, 0x6524,
+ 0xd98a, 0xdff4,
+ 0xd98b, 0x4005,
+ 0xd98c, 0x6524,
+ 0xd98d, 0x2e8d,
+ 0xd98e, 0x303d,
+ 0xd98f, 0x2408,
+ 0xd990, 0x35d8,
+ 0xd991, 0x5dd3,
+ 0xd992, 0x0307,
+ 0xd993, 0x8887,
+ 0xd994, 0x63a7,
+ 0xd995, 0x8887,
+ 0xd996, 0x63a7,
+ 0xd997, 0xdffd,
+ 0xd998, 0x00f9,
+ 0xd999, 0x1002,
+ 0xd99a, 0x866a,
+ 0xd99b, 0x6138,
+ 0xd99c, 0x5883,
+ 0xd99d, 0x2aa2,
+ 0xd99e, 0x3022,
+ 0xd99f, 0x1302,
+ 0xd9a0, 0x2ff7,
+ 0xd9a1, 0x3007,
+ 0xd9a2, 0x8785,
+ 0xd9a3, 0xb887,
+ 0xd9a4, 0x8786,
+ 0xd9a5, 0xb8c6,
+ 0xd9a6, 0x5a53,
+ 0xd9a7, 0x29b2,
+ 0xd9a8, 0x3022,
+ 0xd9a9, 0x13c2,
+ 0xd9aa, 0x2474,
+ 0xd9ab, 0x3c84,
+ 0xd9ac, 0x64d7,
+ 0xd9ad, 0x64d7,
+ 0xd9ae, 0x2ff5,
+ 0xd9af, 0x3c05,
+ 0xd9b0, 0x8757,
+ 0xd9b1, 0xb886,
+ 0xd9b2, 0x9767,
+ 0xd9b3, 0x67c4,
+ 0xd9b4, 0x6f72,
+ 0xd9b5, 0x1002,
+ 0xd9b6, 0x0000,
};
int i, err;
@@ -1944,10 +2000,14 @@ static struct reg_val ael2020_reset_regs
{ MDIO_DEV_PMA_PMD, 0xcd40, 0xffff, 0x0001 },
+ { MDIO_DEV_PMA_PMD, 0xca12, 0xffff, 0x0100 },
+ { MDIO_DEV_PMA_PMD, 0xca22, 0xffff, 0x0100 },
+ { MDIO_DEV_PMA_PMD, 0xca42, 0xffff, 0x0100 },
{ MDIO_DEV_PMA_PMD, 0xff02, 0xffff, 0x0023 },
{ MDIO_DEV_PMA_PMD, 0xff03, 0xffff, 0x0000 },
{ MDIO_DEV_PMA_PMD, 0xff04, 0xffff, 0x0000 },
+ { MDIO_DEV_PMA_PMD, 0xc20d, 0xffff, 0x0002 },
/* end */
{ 0, 0, 0, 0 }
};
@@ -1975,6 +2035,7 @@ static int ael2020_reset(struct cphy *ph
err = set_phy_regs(phy, ael2020_reset_regs);
if (err)
return err;
+ msleep(100);
/* determine module type and perform appropriate initialization */
err = ael2020_get_module_type(phy, 0);
@@ -2079,6 +2140,8 @@ int t3_ael2020_phy_prep(pinfo_t *pinfo,
err = set_phy_regs(phy, ael2020_reset_regs);
if (err)
return err;
+ msleep(100);
+
err = ael2020_get_module_type(phy, 0);
if (err >= 0)
phy->modtype = err;
Modified: stable/8/sys/dev/cxgb/common/cxgb_common.h
==============================================================================
--- stable/8/sys/dev/cxgb/common/cxgb_common.h Mon Apr 5 22:15:06 2010
(r206219)
+++ stable/8/sys/dev/cxgb/common/cxgb_common.h Mon Apr 5 23:29:27 2010
(r206220)
@@ -314,6 +314,7 @@ struct qset_params { /
unsigned int rspq_size; /* # of entries in response queue */
unsigned int fl_size; /* # of entries in regular free list */
unsigned int jumbo_size; /* # of entries in jumbo free list */
+ unsigned int jumbo_buf_size; /* buffer size of jumbo entry */
unsigned int txq_size[SGE_TXQ_PER_SET]; /* Tx queue sizes */
unsigned int cong_thres; /* FL congestion threshold */
unsigned int vector; /* Interrupt (line or vector) number */
@@ -392,11 +393,9 @@ struct adapter_params {
const struct adapter_info *info;
-#ifdef CONFIG_CHELSIO_T3_CORE
unsigned short mtus[NMTUS];
unsigned short a_wnd[NCCTRL_WIN];
unsigned short b_wnd[NCCTRL_WIN];
-#endif
unsigned int nports; /* # of ethernet ports */
unsigned int chan_map; /* bitmap of in-use Tx channels */
unsigned int stats_update_period; /* MAC stats accumulation period */
@@ -650,11 +649,7 @@ static inline int is_10G(const adapter_t
static inline int is_offload(const adapter_t *adap)
{
-#if defined(CONFIG_CHELSIO_T3_CORE)
return adap->params.offload;
-#else
- return 0;
-#endif
}
static inline unsigned int core_ticks_per_usec(const adapter_t *adap)
@@ -772,7 +767,6 @@ void t3_mc5_intr_handler(struct mc5 *mc5
int t3_read_mc5_range(const struct mc5 *mc5, unsigned int start, unsigned int
n,
u32 *buf);
-#ifdef CONFIG_CHELSIO_T3_CORE
int t3_tp_set_coalescing_size(adapter_t *adap, unsigned int size, int psh);
void t3_tp_set_max_rxsize(adapter_t *adap, unsigned int size);
void t3_tp_get_mib_stats(adapter_t *adap, struct tp_mib_stats *tps);
@@ -793,7 +787,6 @@ void t3_get_tx_sched(adapter_t *adap, un
void t3_read_pace_tbl(adapter_t *adap, unsigned int pace_vals[NTX_SCHED]);
void t3_set_pace_tbl(adapter_t *adap, unsigned int *pace_vals,
unsigned int start, unsigned int n);
-#endif
int t3_get_up_la(adapter_t *adapter, u32 *stopped, u32 *index,
u32 *size, void *data);
Modified: stable/8/sys/dev/cxgb/common/cxgb_t3_hw.c
==============================================================================
--- stable/8/sys/dev/cxgb/common/cxgb_t3_hw.c Mon Apr 5 22:15:06 2010
(r206219)
+++ stable/8/sys/dev/cxgb/common/cxgb_t3_hw.c Mon Apr 5 23:29:27 2010
(r206220)
@@ -3263,7 +3263,6 @@ static void tp_set_timers(adapter_t *ada
#undef SECONDS
}
-#ifdef CONFIG_CHELSIO_T3_CORE
/**
* t3_tp_set_coalescing_size - set receive coalescing size
* @adap: the adapter
@@ -3566,7 +3565,6 @@ int t3_set_proto_sram(adapter_t *adap, c
}
return 0;
}
-#endif
/**
* t3_config_trace_filter - configure one of the tracing filters
@@ -4150,14 +4148,12 @@ int t3_init_hw(adapter_t *adapter, u32 f
if (tp_init(adapter, &adapter->params.tp))
goto out_err;
-#ifdef CONFIG_CHELSIO_T3_CORE
t3_tp_set_coalescing_size(adapter,
min(adapter->params.sge.max_pkt_size,
MAX_RX_COALESCING_LEN), 1);
t3_tp_set_max_rxsize(adapter,
min(adapter->params.sge.max_pkt_size, 16384U));
ulp_config(adapter, &adapter->params.tp);
-#endif
if (is_pcie(adapter))
config_pcie(adapter);
else
@@ -4471,8 +4467,6 @@ int __devinit t3_prep_adapter(adapter_t
if (reset && t3_reset_adapter(adapter))
return -1;
- t3_sge_prep(adapter, &adapter->params.sge);
-
if (adapter->params.vpd.mclk) {
struct tp_params *p = &adapter->params.tp;
@@ -4501,6 +4495,8 @@ int __devinit t3_prep_adapter(adapter_t
t3_mc7_size(&adapter->pmtx) &&
t3_mc7_size(&adapter->cm);
+ t3_sge_prep(adapter, &adapter->params.sge);
+
if (is_offload(adapter)) {
adapter->params.mc5.nservers = DEFAULT_NSERVERS;
/* PR 6487. TOE and filtering are mutually exclusive */
@@ -4508,10 +4504,8 @@ int __devinit t3_prep_adapter(adapter_t
adapter->params.mc5.nroutes = 0;
t3_mc5_prep(adapter, &adapter->mc5, MC5_MODE_144_BIT);
-#ifdef CONFIG_CHELSIO_T3_CORE
init_mtus(adapter->params.mtus);
init_cong_ctrl(adapter->params.a_wnd, adapter->params.b_wnd);
-#endif
}
early_hw_init(adapter, ai);
Modified: stable/8/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_adapter.h Mon Apr 5 22:15:06 2010
(r206219)
+++ stable/8/sys/dev/cxgb/cxgb_adapter.h Mon Apr 5 23:29:27 2010
(r206220)
@@ -46,6 +46,7 @@ $FreeBSD$
#include <net/if.h>
#include <net/if_media.h>
#include <net/if_dl.h>
+#include <netinet/tcp_lro.h>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
