Module Name:src
Committed By: msaitoh
Date: Thu Apr 20 09:03:05 UTC 2017
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Fix device timeout problem when MSI is used on BCM57762, BCM57765 and
BCM57785. Check correctly for BGEF_TAGGED_STATUS. These devices' ASCI
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:42:38 UTC 2012
Modified Files:
src/sys/dev/mii: miidevs
Log Message:
Add another Broadcom OUI and BCM57765 1000BASE-T media interface.
Per PR kern/46961.
To generate a diff of this commit:
cvs rdiff -u -r1.108
:50 2019
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.149 2019/03/15 04:00:06 msaitoh Exp $
+$NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -209,7 +209,7 @@ model BROADCOM3 BCM57765 0x0024 BCM57765
model BROADCOM3 BCM5720C 0x0036
2020
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.162 2020/02/05 06:38:20 msaitoh Exp $
+$NetBSD: miidevs,v 1.163 2020/02/22 18:56:57 jmcneill Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -219,6 +219,7 @@ model BROADCOM3 BCM5719C 0x0022 BCM5719C
model BROADCOM3 BCM57765 0x0024
:
@@ -651,14 +651,6 @@ dist/ipf/tools/ipmon_y.y patch
Fix alignment issues in ipmon. PR#47101.
[nakayama, ticket #651]
-sys/dev/mii/brgphy.c1.60
-sys/dev/pci/if_bge.c1.202
-sys/dev/pci/if_bgereg.h1.57
-
- Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt
- to Gigabit
BCM5719C 1000BASE-T media interface
model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface
+model BROADCOM3 BCM5720C 0x0036 BCM5720C 1000BASE-T media interface
model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface
/* Cicada Semiconductor PHYs (now owned
BCM57786 10/100/1000 Ethernet
product BROADCOM BCM57765 0x16b4 BCM57765 Integrated Gigabit Ethernet
product BROADCOM BCM57785 0x16b5 BCM57785 Integrated Gigabit Ethernet
product BROADCOM BCM57795 0x16b6 BCM57795 10/100/1000 Ethernet
+product BROADCOM BCM57782 0x16b7 BCM57782 10/100/1000 Ethernet
57761 Gigabit Ethernet",
},
{ PCI_VENDOR_BROADCOM,
PCI_PRODUCT_BROADCOM_BCM57762,
@@ -597,47 +597,47 @@ static const struct bge_product {
},
{ PCI_VENDOR_BROADCOM,
PCI_PRODUCT_BROADCOM_BCM57765,
- "Broadcom BCM57765 Fast Ethernet",
+ "Broadcom BCM57765 Gigabit E
/miidevs: revision 1.107
sys/dev/mii/miidevs: revision 1.108
sys/dev/mii/miidevs: revision 1.109
Sync a comment with a fact.
There is MII_OUI() in miivar.h not mii.h after 2001.
Add VSC8221
Add AR8035
Add another Broadcom OUI and BCM57765 1000BASE-T media interface.
Per PR kern/46961
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:43:50 UTC 2012
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen from miidevs rev 1.109:
Add another Broadcom OUI and BCM57765 1000BASE-T media interface.
Per PR kern/46961
ure.
.Pp
The BCM5700, BCM5701, BCM5702, BCM5703, BCM5704, BCM5714, BCM5717, BCM5719,
-BCM5720, BCM5780, BCM57765 and BCM57766 also support jumbo frames, which can be
-configured via the
-interface MTU setting.
+BCM5720, BCM5762, BCM5780, BCM57765 and BCM57766 also support jumbo frames,
+which can be
s
+oui BROADCOM4 0x18c086 Broadcom Corporation
/* Some Intel 82553's use an alternative OUI. */
oui xxINTEL 0x001f00 Intel
@@ -194,6 +198,7 @@ model BROADCOM3 BCM5717C 0x0020 BCM5717C
model BROADCOM3 BCM5719C 0x0022 BCM5719C 1000BASE-T media interface
model BROADCOM3 BCM57765 0x0024 BC
1000baseSX Ethernet
product BROADCOM BCM5706S 0x16aa BCM5706 NetXtreme II 1000baseSX
product BROADCOM BCM5708S 0x16ac BCM5708 NetXtreme II 1000baseSX
-product BROADCOM BCM57761 0x16b0 BCM57761
-product BROADCOM BCM57781 0x16b1 BCM57781
-product BROADCOM BCM57791 0x16b2 BCM57791
-product BROADCOM BCM57765
for BCM57762 and BCM57765, found in Apple's Thunderbolt
to Gigabit Ethernet adapter. PR kern/46961
[tsutsui, ticket #652]
+
sys/fs/udf/udf_allocation.c 1.34
Fix 32 bit issue in main file read-in function. On both 32 bit and
@@ -694,6 +695,7 @@ sys/net/npf/npf_inet.c1.23
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:45:56 UTC 2012
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
Add support for BCM57765. PR kern/46961
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/brgphy.c
Please note
for BCM57762 and BCM57765, found in Apple's Thunderbolt
+ to Gigabit Ethernet adapter. PR kern/46961
+ [tsutsui, ticket #652]
+
+lib/libnpf/npf.c1.14
+usr.sbin/npf/npfctl/npf_var.h 1.5
+
+ Fix for npfctl show.
+ [rmind, ticket #653]
+
/pci/pcidevs Thu Apr 13 04:04:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1284 2017/03/31 09:27:30 skrll Exp $
+$NetBSD: pcidevs,v 1.1285 2017/04/13 04:04:13 msaitoh Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1797,6 +1797,9 @@ product BROADCOM BCM57765 0x16b4 BCM5776
etBSD: brgphy.c,v 1.86 2019/11/27 10:19:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.87 2020/02/22 18:57:31 jmcneill Exp $");
#include
#include
@@ -178,6 +178,7 @@ static const struct mii_phydesc brgphys[
MII_PHY_DESC(BROADCOM3, BCM5720C),
MII_PHY_DESC
BCM57781
+product BROADCOM BCM57791 0x16b2 BCM57791
+product BROADCOM BCM57765 0x16b4 BCM57765
+product BROADCOM BCM57785 0x16b5 BCM57785
+product BROADCOM BCM57795 0x16b6 BCM57795
product BROADCOM BCM5702_ALT 0x16c6 BCM5702 10/100/1000 Ethernet
product BROADCOM BCM5703_ALT 0x16c7 BCM5703 10/100/1000
");
#include
#include
@@ -743,6 +743,7 @@ static const struct bge_revision {
{ BGE_CHIPID_BCM5906_A2, "BCM5906 A2" },
{ BGE_CHIPID_BCM57765_A0, "BCM57765 A0" },
{ BGE_CHIPID_BCM57765_B0, "BCM57765 B0" },
+ { BGE_CHIPID_BCM57766_A0, "B
, BCM57765, BCM57780
+ - Add Atheros AR8021, AR8035
+ - Add RDC Semiconductor R6040 10/100 integrated PHY
+ - Add Vitesse VSC8221
+ - Add SMSC LAN 87[012]0
+ - Add Intel I21[07].
+ - Add IC Plus IP100, IP1000A and IP1001
+ - Add Micrel KSZ9021RN
+ - Add Relatek RTL8251
+ - Update comment.
+ [msaitoh
):
sys/dev/mii/brgphy.c1.60
sys/dev/pci/if_bge.c1.202
sys/dev/pci/if_bgereg.h 1.57
Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt
to Gigabit Ethernet adapter. PR kern/46961
p $");
#include
#include
@@ -178,6 +178,7 @@ static const struct mii_phydesc brgphys[
MII_PHY_DESC(BROADCOM3, BCM5720C),
MII_PHY_DESC(BROADCOM3, BCM57765),
MII_PHY_DESC(BROADCOM3, BCM57780),
+ MII_PHY_DESC(BROADCOM4, BCM54213PE),
MII_PHY_DESC(BROADCOM4, BCM5725C),
MII_PHY_DESC(x
/if_bge.c1.202
-sys/dev/pci/if_bgereg.h1.57
-
- Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt
- to Gigabit Ethernet adapter. PR kern/46961
- [tsutsui, ticket #652]
-
lib/libnpf/npf.c1.14
usr.sbin/npf/npfctl/npf_var.h 1.5
@@ -9012,4 +9004,3 @@ sys/sys/param.h
+sys/dev/pci/pcidevs_data.h regen
+
+ Update bge(4)/brgphy(4): support for BCM5705F,BCM5714,SBCM5715S,
+ BCM5717,BCM5718,BCM5720,BCM5723,BCM5724,BCM5751F,BCM5753F,
+ BCM5756,BCM5761,BCM5761E,BCM5761S,BCM5761SE,BCM5764,BCM5781,BCM5784M,
+ BCM5903M,BCM57760,BCM57761,BCM57765,BCM57780,BCM57781,BCM57785
755, BCM5761, BCM5762, BCM5764,
+BCM5784, BCM5785, BCM5787 and BCM577xx chips also support IPv6 receive TCP/UDP
checksum offload.
The
.Nm
@@ -132,9 +132,8 @@ See
for information on how to enable this feature.
.Pp
The BCM5700, BCM5701, BCM5702, BCM5703, BCM5704, BCM5714, BCM5717, BCM5719,
-BCM5
,
+ },
+ { PCI_VENDOR_BROADCOM,
PCI_PRODUCT_BROADCOM_BCM57765,
Broadcom BCM57765 Fast Ethernet,
},
@@ -728,6 +732,7 @@ static const struct bge_revision bge_maj
{ BGE_ASICREV_BCM57780, unknown BCM57780 },
{ BGE_ASICREV_BCM5717, unknown BCM5717 },
{ BGE_ASICREV_BCM57765, unknown
Broadcom BCM5325, BCM5365, BCM548[12], BCM5706, BCM570[89]S,
- BCM571[79]C, BCM5720C, BCM5756, BCM5785, BCM57765, BCM57780
- Add Atheros AR8021, AR8035
- Add RDC Semiconductor R6040 10/100 integrated PHY
- Add Vitesse VSC8221
- Add SMSC LAN 87[012]0
- Add Intel I21[07].
- Add IC Plus IP100, IP1000A
",
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_BCM5901A2,
- "Broadcom BCM5901A2 Fast Ethernet",
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_BCM5903M,
- "Broadcom BCM5903M Fast Ethernet",
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_BCM5906,
- "Broadcom
MII_MODEL_BROADCOM3_BCM57765 0x0024
#define MII_STR_BROADCOM3_BCM57765 BCM57765 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5720C 0x0036
+#define MII_STR_BROADCOM3_BCM5720C BCM5720C 1000BASE-T media interface
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 BCM5906
MII_MODEL_BROADCOM3_BCM57765 0x0024
#define MII_STR_BROADCOM3_BCM57765 BCM57765 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5720C 0x0036
+#define MII_STR_BROADCOM3_BCM5720C BCM5720C 1000BASE-T media interface
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define
*/
#define MII_OUI_TI 0x080028 /* Texas Instruments */
+#define MII_OUI_BROADCOM4 0x18c086 /* Broadcom Corporation */
/* Some Intel 82553's use an alternative OUI. */
#define MII_OUI_xxINTEL 0x001f00 /* Intel */
@@ -264,6 +275,8 @@
#define MII_STR_BROADCOM3_BCM57765 "BCM57765 1000BASE-T media inte
},
{ BGE_CHIPID_BCM5906_A2, BCM5906 A2 },
+ { BGE_CHIPID_BCM57765_A0, BCM57765 A0 },
+ { BGE_CHIPID_BCM57765_B0, BCM57765 B0 },
{ BGE_CHIPID_BCM57780_A0, BCM57780 A0 },
{ BGE_CHIPID_BCM57780_A1, BCM57780 A1 },
@@ -1793,6 +1797,11 @@ bge_poll_fw(struct bge_softc *sc)
}
}
+ if (sc
PCI_PRODUCT_BROADCOM_BCM57791 0x16b2 /* BCM57791 10/100/1000 Ethernet */
+#define PCI_PRODUCT_BROADCOM_BCM57765 0x16b4 /* BCM57765 Integrated Gigabit Ethernet */
+#define PCI_PRODUCT_BROADCOM_BCM57785 0x16b5 /* BCM57785 Integrated Gigabit Ethernet */
+#define PCI_PRODUCT_BROADCOM_BCM57795 0x16b6 /* BCM57795 10/100/1000
Ethernet */
#define PCI_PRODUCT_BROADCOM_BCM57765 0x16b4 /* BCM57765 Integrated Gigabit Ethernet */
#define PCI_PRODUCT_BROADCOM_BCM57785 0x16b5 /* BCM57785 Integrated Gigabit Ethernet */
#define PCI_PRODUCT_BROADCOM_BCM57795 0x16b6 /* BCM57795 10/100/1000 Ethernet */
+#define
quot;,
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_BCM5903M,
- "Broadcom BCM5903M Fast Ethernet",
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_BCM5906,
- "Broadcom BCM5906 Fast Ethernet",
- },
- { PCI_VENDOR_BROADCOM,
- PCI_PRODUCT_BROADCOM_
Ethernet
product BROADCOM BCM57781 0x16b1 BCM57781 10/100/1000 Ethernet
product BROADCOM BCM57791 0x16b2 BCM57791 10/100/1000 Ethernet
+product BROADCOM BCM57786 0x16b3 BCM57786 10/100/1000 Ethernet
product BROADCOM BCM57765 0x16b4 BCM57765 Integrated Gigabit Ethernet
product BROADCOM BCM57785 0x16b5
media interface
@@ -194,6 +211,7 @@ model BROADCOM3 BCM5717C 0x0020 BCM5717C
model BROADCOM3 BCM5719C 0x0022 BCM5719C 1000BASE-T media interface
model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface
model BROADCOM3 BCM5720C 0x0036 BCM5720C 1000BASE-T media interface
+model BROADCOM4
GXL internal PHY
-/* Atheros PHYs */
-model ATHEROS F1 0x0001 F1 10/100/1000 PHY
-model ATHEROS F2 0x0002 F2 10/100 PHY
-
-/* Attansic PHYs */
+/* Attansic/Atheros PHYs */
model ATTANSIC L1 0x0001 L1 10/100/1000 PHY
model ATTANSIC L2 0x0002 L2 10/100 PHY
model ATTANSIC AR8021 0x0004 Atheros AR8021 10/1
, BCM5703, BCM5704, BCM5714, BCM5717, BCM5719,
+BCM5720, BCM5780, BCM57765 and BCM57766 also support jumbo frames, which can be
+configured via the
+interface MTU setting.
+Selecting an MTU larger than 1500 bytes with the
+.Xr ifconfig 8
+utility configures the adapter to receive and transmit Jumbo frames
om FreeBSD.
+ - Add BCM5481, BCM5709S, BCM5756, BCM5717C, BCM5720C, BCM5785,
+ BCM57765(PR#46961), BCM57780
+ - In brgphyattach(), set sc_isbge, sc_isbnx and sc_phyflags before
+ PHY_RESET() because brgphy_reset() refers those flags.
+ - Call brgpy specific autonego function in MII_TI
0x16b2 /* BCM57791 */
-#define PCI_PRODUCT_BROADCOM_BCM57765 0x16b4 /* BCM57765 */
-#define PCI_PRODUCT_BROADCOM_BCM57785 0x16b5 /* BCM57785 */
-#define PCI_PRODUCT_BROADCOM_BCM57795 0x16b6 /* BCM57795 */
+#define PCI_PRODUCT_BROADCOM_BCM57761 0x16b0 /* BCM57761 10/100/1000 Ethernet */
+#define
/if_bgereg.h1.57
Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt
to Gigabit Ethernet adapter. PR kern/46961
[tsutsui, ticket #652]
+sys/fs/udf/udf_allocation.c 1.34
+
+ Fix 32 bit issue in main file read-in function. On both 32 bit and
+ 64 bit hosts a missing cast would result
ine MII_MODEL_BROADCOM3_BCM57780 0x0019
+#define MII_STR_BROADCOM3_BCM57780 "BCM57780 1000BASE-T media interface"
+#define MII_MODEL_BROADCOM3_BCM5717C 0x0020
+#define MII_STR_BROADCOM3_BCM5717C "BCM5717C 1000BASE-T media interface"
+#define MII_MODEL_BROADCOM3_BCM5719C 0x0022
+#define MII_STR_BROAD
06 "BCM5906 10/100baseTX media interface"
+#define MII_MODEL_BROADCOM2_BCM5478 0x0008
+#define MII_STR_BROADCOM2_BCM5478 "BCM5478 1000BASE-T media interface"
+#define MII_MODEL_BROADCOM2_BCM5488 0x0009
+#define MII_STR_BROADCOM2_BCM5488 "BCM5488 1000BASE-T media interface&
1000/2500baseSX PHY */
#define MII_STR_BROADCOM2_BCM5709S "BCM5709S 1000/2500baseSX PHY"
-#define MII_MODEL_BROADCOM3_BCM57780 0x0019
+#define MII_MODEL_BROADCOM3_BCM57780 0x0019 /* BCM57780 1000BASE-T media interface */
#define MII_STR_BROADCOM3_BCM57780 "BCM57780 1000BASE-T media
NP_T2 from FreeBSD.
- Add BCM5481, BCM5709S, BCM5756, BCM5717C, BCM5720C, BCM5785,
BCM57765(PR#46961), BCM57780
- In brgphyattach(), set sc_isbge, sc_isbnx and sc_phyflags before
PHY_RESET() because brgphy_reset() refers those flags.
- Call brgpy specific autonego function in MII_TICK. Before this
co
(BROADCOM2, BCM5785),
+ MII_PHY_DESC(BROADCOM3, BCM5717C),
+ MII_PHY_DESC(BROADCOM3, BCM5719C),
+ MII_PHY_DESC(BROADCOM3, BCM5720C),
+ MII_PHY_DESC(BROADCOM3, BCM57765),
+ MII_PHY_DESC(BROADCOM3, BCM57780),
+ MII_PHY_DESC(BROADCOM4, BCM5725C),
+ MII_PHY_DESC(xxBROADCOM_ALT1, BCM5906),
+ MII_PHY_END,
};
48 matches
Mail list logo