CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Aug 9 16:03:13 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_et.c if_etreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #36):
sys/dev/pci/if_et.c: revision 1.25
sys/dev/pci/if_et.c: revision 1.26
sys/dev/pci/if_etreg.h: revision 1.2
sys/dev/pci/if_etreg.h: revision 1.3
Avoid undefined behavior when reset the chip. found by kUBSan.
Add missing ifioctl_common() for SIOCSIFFLAGS to make if_flags controllable.
Make et(4) work:
- Enabling TX/RX in et_init() will always fail when cable is not plugged in,
if this happens, we delay TX/RX enablement until link is up. From FreeBSD.
- Modify flow control stuff a little (from FrerBSD). It still doesn't work.
- KNF. Part of OpenBSD 1.12.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/dev/pci/if_et.c
cvs rdiff -u -r1.1 -r1.1.68.1 src/sys/dev/pci/if_etreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.24 src/sys/dev/pci/if_et.c:1.24.2.1
--- src/sys/dev/pci/if_et.c:1.24 Tue May 28 07:41:49 2019
+++ src/sys/dev/pci/if_et.c Fri Aug 9 16:03:13 2019
@@ -1,5 +1,5 @@
-/* $NetBSD: if_et.c,v 1.24 2019/05/28 07:41:49 msaitoh Exp $ */
-/* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */
+/* $NetBSD: if_et.c,v 1.24.2.1 2019/08/09 16:03:13 martin Exp $ */
+/* $OpenBSD: if_et.c,v 1.12 2008/07/11 09:29:02 kevlo $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.24 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.24.2.1 2019/08/09 16:03:13 martin Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -83,17 +83,19 @@ __KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.
int et_match(device_t, cfdata_t, void *);
void et_attach(device_t, device_t, void *);
-int et_detach(device_t, int flags);
+int et_detach(device_t, int);
int et_shutdown(device_t);
int et_miibus_readreg(device_t, int, int, uint16_t *);
int et_miibus_writereg(device_t, int, int, uint16_t);
void et_miibus_statchg(struct ifnet *);
-int et_init(struct ifnet *ifp);
+int et_init(struct ifnet *);
int et_ioctl(struct ifnet *, u_long, void *);
void et_start(struct ifnet *);
void et_watchdog(struct ifnet *);
+static int et_ifmedia_upd(struct ifnet *);
+static void et_ifmedia_sts(struct ifnet *, struct ifmediareq *);
int et_intr(void *);
void et_enable_intrs(struct et_softc *, uint32_t);
@@ -131,7 +133,6 @@ int et_start_rxdma(struct et_softc *);
int et_start_txdma(struct et_softc *);
int et_stop_rxdma(struct et_softc *);
int et_stop_txdma(struct et_softc *);
-int et_enable_txrx(struct et_softc *);
void et_reset(struct et_softc *);
int et_bus_config(struct et_softc *);
void et_get_eaddr(struct et_softc *, uint8_t[]);
@@ -190,6 +191,7 @@ et_attach(device_t parent, device_t self
const char *intrstr;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct mii_data * const mii = &sc->sc_miibus;
+ uint32_t pmcfg;
pcireg_t memtype;
int error;
char intrbuf[PCI_INTRSTR_LEN];
@@ -234,6 +236,9 @@ et_attach(device_t parent, device_t self
sc->sc_pct = pa->pa_pc;
sc->sc_pcitag = pa->pa_tag;
+ if (pa->pa_id == PCI_PRODUCT_LUCENT_ET1301)
+ sc->sc_flags |= ET_FLAG_FASTETHER;
+
error = et_bus_config(sc);
if (error)
goto fail;
@@ -243,8 +248,11 @@ et_attach(device_t parent, device_t self
aprint_normal_dev(self, "Ethernet address %s\n",
ether_sprintf(sc->sc_enaddr));
- CSR_WRITE_4(sc, ET_PM,
- ET_PM_SYSCLK_GATE | ET_PM_TXCLK_GATE | ET_PM_RXCLK_GATE);
+ /* Take PHY out of COMA and enable clocks. */
+ pmcfg = ET_PM_SYSCLK_GATE | ET_PM_TXCLK_GATE | ET_PM_RXCLK_GATE;
+ if ((sc->sc_flags & ET_FLAG_FASTETHER) == 0)
+ pmcfg |= EM_PM_GIGEPHY_ENB;
+ CSR_WRITE_4(sc, ET_PM, pmcfg);
et_reset(sc);
@@ -273,8 +281,7 @@ et_attach(device_t parent, device_t self
mii->mii_statchg = et_miibus_statchg;
sc->sc_ethercom.ec_mii = mii;
- ifmedia_init(&mii->mii_media, 0, ether_mediachange,
- ether_mediastatus);
+ ifmedia_init(&mii->mii_media, 0, et_ifmedia_upd, et_ifmedia_sts);
mii_attach(self, mii, 0x, MII_PHY_ANY, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
@@ -450,31 +457,117 @@ et_miibus_statchg(struct ifnet *ifp)
{
struct et_softc *sc = ifp->if_softc;
struct mii_data *mii = &sc->sc_miibus;
- uint32_t cfg2, ctrl;
+ uint32_t cfg1, cfg2, ctrl;
+ int i;
+
+ sc->sc_flags &= ~ET_FLAG_LINK;
+ if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
+ (IFM_ACTIVE | IFM_AVALID)) {
+ switch (IFM_SUBTYPE(mii->mii_media_active)) {
+ case IFM_10_T:
+ case IFM_100_TX:
+ sc->sc_flags |= ET_FLAG_LINK;
+ break;
+ case IFM_1000_T:
+ if ((sc->sc_flags & ET_FLA
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Aug 9 16:03:13 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_et.c if_etreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #36): sys/dev/pci/if_et.c: revision 1.25 sys/dev/pci/if_et.c: revision 1.26 sys/dev/pci/if_etreg.h: revision 1.2 sys/dev/pci/if_etreg.h: revision 1.3 Avoid undefined behavior when reset the chip. found by kUBSan. Add missing ifioctl_common() for SIOCSIFFLAGS to make if_flags controllable. Make et(4) work: - Enabling TX/RX in et_init() will always fail when cable is not plugged in, if this happens, we delay TX/RX enablement until link is up. From FreeBSD. - Modify flow control stuff a little (from FrerBSD). It still doesn't work. - KNF. Part of OpenBSD 1.12. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/dev/pci/if_et.c cvs rdiff -u -r1.1 -r1.1.68.1 src/sys/dev/pci/if_etreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Aug 18 09:58:49 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: radeonfb.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #86):
sys/dev/pci/radeonfb.c: revision 1.105
Support bitmap fonts with stride 4 (i.e., width 17 to 32).
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.4.1 src/sys/dev/pci/radeonfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.104 src/sys/dev/pci/radeonfb.c:1.104.4.1
--- src/sys/dev/pci/radeonfb.c:1.104 Wed Mar 27 22:00:33 2019
+++ src/sys/dev/pci/radeonfb.c Sun Aug 18 09:58:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.104 2019/03/27 22:00:33 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.104.4.1 2019/08/18 09:58:49 martin Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.104 2019/03/27 22:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.104.4.1 2019/08/18 09:58:49 martin Exp $");
#include
#include
@@ -2931,6 +2931,7 @@ radeonfb_putchar(void *cookie, int row,
uint32_t reg;
uint8_t *data8;
uint16_t *data16;
+ uint32_t *data32;
void *data;
if (dp->rd_wsmode != WSDISPLAYIO_MODE_EMUL)
@@ -3009,6 +3010,16 @@ radeonfb_putchar(void *cookie, int row,
}
break;
}
+ case 4: {
+ data32 = data;
+ for (i = 0; i < h; i++) {
+reg = *data32;
+bus_space_write_stream_4(sc->sc_regt,
+sc->sc_regh, RADEON_HOST_DATA0, reg);
+data32++;
+ }
+ break;
+ }
}
if (attr & 1)
radeonfb_rectfill(dp, xd, yd + h - 2, w, 1, fg);
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Aug 18 09:58:49 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: radeonfb.c Log Message: Pull up following revision(s) (requested by rin in ticket #86): sys/dev/pci/radeonfb.c: revision 1.105 Support bitmap fonts with stride 4 (i.e., width 17 to 32). To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.104.4.1 src/sys/dev/pci/radeonfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:58:19 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by mrg in ticket #112): sys/dev/pci/pcidevs: revision 1.1384 add micron/crucial SM2263 nvme. add some device found on asus x570-p with ryzen 3200G cpu. spell it "PCIe' when using the name. To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1383.2.1 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383 src/sys/dev/pci/pcidevs:1.1383.2.1 --- src/sys/dev/pci/pcidevs:1.1383 Sun Jul 28 15:20:22 2019 +++ src/sys/dev/pci/pcidevs Mon Aug 26 13:58:19 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383 2019/07/28 15:20:22 mlelstv Exp $ +$NetBSD: pcidevs,v 1.1383.2.1 2019/08/26 13:58:19 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -686,6 +686,7 @@ vendor ADP2 0x9005 Adaptec (2nd PCI Ven vendor ATRONICS 0x907f Atronics vendor NETMOS 0x9710 Netmos vendor PARALLELS 0x Parallels +vendor MICRON 0xc0a9 Micron/Crucial Technology vendor CHRYSALIS 0xcafe Chrysalis-ITS vendor MIDDLE_DIGITAL 0xdeaf Middle Digital vendor ARC 0xedd8 ARC Logic @@ -963,10 +964,10 @@ product AMAZON NVME 0x8061 NVMe SSD product AMAZON ENA 0xec20 Elastic Network Adapter /* AMD products */ -product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration -product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration -product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration -product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration +product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration +product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration +product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration +product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration product AMD AMD64_F10_HT 0x1200 AMD64 Family10h HyperTransport Configuration product AMD AMD64_F10_ADDR 0x1201 AMD64 Family10h Address Map Configuration product AMD AMD64_F10_DRAM 0x1202 AMD64 Family10h DRAM Configuration @@ -977,140 +978,145 @@ product AMD AMD64_F11_ADDR 0x1301 AMD64 product AMD AMD64_F11_DRAM 0x1302 AMD64 Family11h DRAM Configuration product AMD AMD64_F11_MISC 0x1303 AMD64 Family11h Miscellaneous Configuration product AMD AMD64_F11_LINK 0x1304 AMD64 Family11h Link Configuration -product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 -product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 -product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 -product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 -product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 -product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 -product AMD F15_10_RC 0x1410 Family15h Root Complex -product AMD F15_10_RP_2 0x1412 Family15h Root Port -product AMD F15_10_RP_3 0x1413 Family15h Root Port -product AMD F15_10_RP_4 0x1414 Family15h Root Port -product AMD F15_10_RP_5 0x1415 Family15h Root Port -product AMD F15_10_RP_6 0x1416 Family15h Root Port -product AMD F15_10_RP_7 0x1417 Family15h Root Port -product AMD F15_10_RP_8 0x1418 Family15h Root Port +product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 +product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 +product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 +product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 +product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 +product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 +product AMD F15_10_RC 0x1410 Family15h Root Complex +product AMD F15_10_RP_2 0x1412 Family15h Root Port +product AMD F15_10_RP_3 0x1413 Family15h Root Port +product AMD F15_10_RP_4 0x1414 Family15h Root Port +product AMD F15_10_RP_5 0x1415 Family15h Root Port +product AMD F15_10_RP_6 0x1416 Family15h Root Port +product AMD F15_10_RP_7 0x1417 Family15h Root Port +product AMD F15_10_RP_8 0x1418 Family15h Root Port product AMD F15_10_IOMMU 0x1419 Family15h IOMMU -product AMD F15_30_PF_0 0x141a Family15h Processor Function 0 -product AMD F15_30_PF_1 0x141b Family15h Processor Function 1 -product AMD F15_30_PF_2 0x141c Family15h Processor Function 2 -product AMD F15_30_PF_3 0x141d Family15h Processor Function 3 -product AMD F15_30_PF_4 0x141e Family15h Processor Function 4 -product AMD F15_30_PF_5 0x141f Family15h Processor Function 5 -product AMD F15_30_RC 0x1422 Family15h Root Complex +product AMD F15_30_PF_0 0x141a Family15h Processor Function 0 +product AMD F15_30_PF_1 0x141b Family15h Processor Function 1 +product AMD F15_30_PF_2 0x141c Family15h Processor Function 2 +product AMD F15_30_PF_3 0x141d Family15h Processor Function 3 +product AMD F15_30_PF_4 0x141e Family15h Processor Function 4 +product AMD F15_30_PF_5 0x141f Family15h Processor Functi
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:58:19 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by mrg in ticket #112): sys/dev/pci/pcidevs: revision 1.1384 add micron/crucial SM2263 nvme. add some device found on asus x570-p with ryzen 3200G cpu. spell it "PCIe' when using the name. To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1383.2.1 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:59:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #112 To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1371.2.1 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370 -r1.1370.2.1 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:59:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #112 To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1371.2.1 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370 -r1.1370.2.1 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Sep 22 12:15:28 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_age.c Log Message: Pull up following revision(s) (requested by maxv in ticket #216): sys/dev/pci/if_age.c: revision 1.61 Fix direction of the loop. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/dev/pci/if_age.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Sep 22 12:15:28 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_age.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #216):
sys/dev/pci/if_age.c: revision 1.61
Fix direction of the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/dev/pci/if_age.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60 src/sys/dev/pci/if_age.c:1.60.2.1
--- src/sys/dev/pci/if_age.c:1.60 Tue Jul 9 08:46:58 2019
+++ src/sys/dev/pci/if_age.c Sun Sep 22 12:15:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.60 2019/07/09 08:46:58 msaitoh Exp $ */
+/* $NetBSD: if_age.c,v 1.60.2.1 2019/09/22 12:15:28 martin Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.1 2019/09/22 12:15:28 martin Exp $");
#include "vlan.h"
@@ -575,7 +575,7 @@ age_get_macaddr(struct age_softc *sc, ui
*/
CSR_WRITE_4(sc, AGE_TWSI_CTRL, CSR_READ_4(sc, AGE_TWSI_CTRL) |
TWSI_CTRL_SW_LD_START);
- for (i = 100; i > 0; i++) {
+ for (i = 100; i > 0; i--) {
DELAY(1000);
reg = CSR_READ_4(sc, AGE_TWSI_CTRL);
if ((reg & TWSI_CTRL_SW_LD_START) == 0)
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Sep 24 02:59:35 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by jmcneill in ticket #237): sys/dev/pci/pcidevs: revision 1.1385 Add Mellanox ConnectX-4, ConnectX-4 Lx, ConnectX-5, and ConnectX-5 Ex To generate a diff of this commit: cvs rdiff -u -r1.1383.2.1 -r1.1383.2.2 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Sep 24 02:59:35 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by jmcneill in ticket #237): sys/dev/pci/pcidevs: revision 1.1385 Add Mellanox ConnectX-4, ConnectX-4 Lx, ConnectX-5, and ConnectX-5 Ex To generate a diff of this commit: cvs rdiff -u -r1.1383.2.1 -r1.1383.2.2 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.1 src/sys/dev/pci/pcidevs:1.1383.2.2 --- src/sys/dev/pci/pcidevs:1.1383.2.1 Mon Aug 26 13:58:19 2019 +++ src/sys/dev/pci/pcidevs Tue Sep 24 02:59:35 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.1 2019/08/26 13:58:19 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.2 2019/09/24 02:59:35 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5869,6 +5869,10 @@ product MATROX G550_AGP 0x2527 MGA G550 product MEDIAQ MQ200 0x0200 MQ200 /* Mellanox Technologies */ +product MELLANOX MT27700 0x1013 ConnectX-4 +product MELLANOX MT27710 0x1015 ConnectX-4 Lx +product MELLANOX MT27800 0x1017 ConnectX-5 +product MELLANOX MT28800 0x1019 ConnectX-5 Ex product MELLANOX MT23108 0x5a44 InfiniHost (Tavor) product MELLANOX MT23108_PCI 0x5a46 InfiniHost PCI Bridge (Tavor) product MELLANOX MT25204_OLD 0x5e8c InfiniHost III Lx (old Sinai)
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Sep 24 03:02:05 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen for ticket #237 (Mellanox device IDs added) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.1 -r1.1371.2.2 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.1 -r1.1370.2.2 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 26 18:52:58 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pci_subr.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #243): sys/dev/pci/pci_subr.c: revision 1.216 sys/dev/pci/pci_subr.c: revision 1.217 Whitespace fixes. No functional change. - Print some DPC register values not with %04x but with %08x because those are 32bit. To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.215.2.1 src/sys/dev/pci/pci_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Sep 26 18:52:58 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: pci_subr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #243):
sys/dev/pci/pci_subr.c: revision 1.216
sys/dev/pci/pci_subr.c: revision 1.217
Whitespace fixes. No functional change.
-
Print some DPC register values not with %04x but with %08x because those
are 32bit.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.215.2.1 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.215 src/sys/dev/pci/pci_subr.c:1.215.2.1
--- src/sys/dev/pci/pci_subr.c:1.215 Thu Jul 18 07:49:26 2019
+++ src/sys/dev/pci/pci_subr.c Thu Sep 26 18:52:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.215 2019/07/18 07:49:26 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.215.2.1 2019/09/26 18:52:57 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215 2019/07/18 07:49:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215.2.1 2019/09/26 18:52:57 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -209,7 +209,7 @@ static const struct pci_class pci_subcla
/* PCI bridge programming interface */
static const struct pci_class pci_interface_pcibridge[] = {
- { "", PCI_INTERFACE_BRIDGE_PCI_PCI, NULL, },
+ { "", PCI_INTERFACE_BRIDGE_PCI_PCI, NULL, },
{ "subtractive decode", PCI_INTERFACE_BRIDGE_PCI_SUBDEC, NULL, },
{ NULL, 0,NULL, },
};
@@ -223,8 +223,8 @@ static const struct pci_class pci_interf
/* Advanced Switching programming interface */
static const struct pci_class pci_interface_advsw[] = {
- { "custom interface", PCI_INTERFACE_ADVSW_CUSTOM, NULL, },
- { "ASI-SIG", PCI_INTERFACE_ADVSW_ASISIG, NULL, },
+ { "custom interface", PCI_INTERFACE_ADVSW_CUSTOM, NULL, },
+ { "ASI-SIG", PCI_INTERFACE_ADVSW_ASISIG, NULL, },
{ NULL, 0,NULL, },
};
@@ -304,7 +304,7 @@ static const struct pci_class pci_subcla
/*
* Class 0x08.
* Base system peripheral.
- */
+ */
/* PIC programming interface */
static const struct pci_class pci_interface_pic[] = {
@@ -429,10 +429,10 @@ static const struct pci_class pci_interf
/* IPMI programming interface */
static const struct pci_class pci_interface_ipmi[] = {
- { "SMIC", PCI_INTERFACE_IPMI_SMIC, NULL,},
- { "keyboard", PCI_INTERFACE_IPMI_KBD, NULL,},
- { "block transfer", PCI_INTERFACE_IPMI_BLOCKXFER, NULL,},
- { NULL, 0, NULL,},
+ { "SMIC", PCI_INTERFACE_IPMI_SMIC, NULL, },
+ { "keyboard", PCI_INTERFACE_IPMI_KBD, NULL, },
+ { "block transfer", PCI_INTERFACE_IPMI_BLOCKXFER, NULL, },
+ { NULL, 0,NULL, },
};
/* Subclasses */
@@ -478,8 +478,8 @@ static const struct pci_class pci_subcla
/* Intelligent IO programming interface */
static const struct pci_class pci_interface_i2o[] = {
- { "FIFO at offset 0x40", PCI_INTERFACE_I2O_FIFOAT40, NULL,},
- { NULL, 0, NULL,},
+ { "FIFO at offset 0x40", PCI_INTERFACE_I2O_FIFOAT40, NULL, },
+ { NULL, 0,NULL, },
};
/* Subclasses */
@@ -494,9 +494,9 @@ static const struct pci_class pci_subcla
* Satellite communication controller.
*/
static const struct pci_class pci_subclass_satcom[] = {
- { "TV", PCI_SUBCLASS_SATCOM_TV, NULL, },
- { "audio", PCI_SUBCLASS_SATCOM_AUDIO, NULL, },
- { "voice", PCI_SUBCLASS_SATCOM_VOICE, NULL, },
+ { "TV", PCI_SUBCLASS_SATCOM_TV, NULL, },
+ { "audio", PCI_SUBCLASS_SATCOM_AUDIO, NULL, },
+ { "voice", PCI_SUBCLASS_SATCOM_VOICE, NULL, },
{ "data", PCI_SUBCLASS_SATCOM_DATA, NULL, },
{ "miscellaneous", PCI_SUBCLASS_SATCOM_MISC, NULL, },
{ NULL, 0,NULL, },
@@ -507,9 +507,9 @@ static const struct pci_class pci_subcla
* Encryption/Decryption controller.
*/
static const struct pci_class pci_subclass_crypto[] = {
- { "network/computing", PCI_SUBCLASS_CRYPTO_NETCOMP, NULL, },
+ { "network/computing", PCI_SUBCLASS_CRYPTO_NETCOMP, NULL, },
{ "entertainment", PCI_SUBCLASS_CRYPTO_ENTERTAINMENT, NULL,},
- { "miscellaneous", PCI_SUBCLASS_CRYPTO_MISC, NULL, },
+ { "miscellaneous", PCI_SUBCLASS_CRYPTO_MISC, NULL, },
{ NULL, 0,NULL, },
};
@@ -585,7 +585,7 @@ DEV_VERBOSE_DEFINE(pci);
* a positive value if the dest buffer would have overflowed.
*/
-static int __printflike(3,4)
+static int __printflike(3, 4)
snappendf(char **dest, size_t *len, const char * restrict fmt, ...)
{
va_list ap;
@@ -609,7 +609,7 @@ snappendf(char **dest, size_t *len, cons
/* Update dest & len to point at trailing NUL */
*dest += count;
*len -= count;
-
+
return 0;
}
@@ -1285,7 +1285,7 @@ pci_conf_print_pcix_cap_2ndbusmode(int n
printf("PCI-X 266 (Mode 2)\n");
else
printf("PCI-X 533 (Mode 2)\n");
-
+
printf(" Error
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 26 19:09:58 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #247): sys/dev/pci/if_mcx.c: revision 1.2 Use IFM_50G_SR2. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 26 19:09:58 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #247): sys/dev/pci/if_mcx.c: revision 1.2 Use IFM_50G_SR2. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_mcx.c diff -u src/sys/dev/pci/if_mcx.c:1.1.2.2 src/sys/dev/pci/if_mcx.c:1.1.2.3 --- src/sys/dev/pci/if_mcx.c:1.1.2.2 Mon Sep 23 07:04:40 2019 +++ src/sys/dev/pci/if_mcx.c Thu Sep 26 19:09:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mcx.c,v 1.1.2.2 2019/09/23 07:04:40 martin Exp $ */ +/* $NetBSD: if_mcx.c,v 1.1.2.3 2019/09/26 19:09:57 martin Exp $ */ /* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */ /* @@ -2159,7 +2159,7 @@ static const uint64_t mcx_eth_cap_map[] IFM_40G_SR4, IFM_40G_LR4, 0, - 0, /* IFM_50G_SR2 */ + IFM_50G_SR2, 0, IFM_100G_CR4, IFM_100G_SR4,
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Sep 29 07:26:23 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_mcx.c
Log Message:
Pull up following revision(s) (requested by tnn in ticket #266):
sys/dev/pci/if_mcx.c: revision 1.3
sys/dev/pci/if_mcx.c: revision 1.4
mcx(4): fix rx mbuf DMA overrun
pullup-9
-
len -> m_len
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/pci/if_mcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1.2.3 src/sys/dev/pci/if_mcx.c:1.1.2.4
--- src/sys/dev/pci/if_mcx.c:1.1.2.3 Thu Sep 26 19:09:57 2019
+++ src/sys/dev/pci/if_mcx.c Sun Sep 29 07:26:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.1.2.3 2019/09/26 19:09:57 martin Exp $ */
+/* $NetBSD: if_mcx.c,v 1.1.2.4 2019/09/29 07:26:23 martin Exp $ */
/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
/*
@@ -5620,15 +5620,16 @@ mcx_rx_fill_slots(struct mcx_softc *sc,
#endif
m->m_data += ETHER_ALIGN;
- m->m_len = m->m_pkthdr.len = bufsize;
+ m->m_len = m->m_pkthdr.len = m->m_ext.ext_size - ETHER_ALIGN;
if (bus_dmamap_load_mbuf(sc->sc_dmat, ms->ms_map, m,
BUS_DMA_NOWAIT) != 0) {
m_freem(m);
break;
}
+ bus_dmamap_sync(sc->sc_dmat, ms->ms_map, 0, ms->ms_map->dm_mapsize, BUS_DMASYNC_PREREAD);
ms->ms_m = m;
- rqe[slot].rqe_byte_count = htobe32(bufsize);
+ rqe[slot].rqe_byte_count = htobe32(m->m_len);
rqe[slot].rqe_addr = htobe64(ms->ms_map->dm_segs[0].ds_addr);
rqe[slot].rqe_lkey = htobe32(sc->sc_lkey);
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Sep 29 07:26:23 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by tnn in ticket #266): sys/dev/pci/if_mcx.c: revision 1.3 sys/dev/pci/if_mcx.c: revision 1.4 mcx(4): fix rx mbuf DMA overrun pullup-9 - len -> m_len To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu May 19 16:24:20 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-9]: if_bge.c
Log Message:
Pull up following revision(s) (requested by buhrow in ticket #1456):
sys/dev/pci/if_bge.c: revision 1.353
For chips which contain an ASF/IPMI firmware, instruct the chip to shut
the host ASF firmware down when attaching the device so the IPMI BMC
can use the same physical port even when NetBSD doesn't have a
network configuration on the device.
By contrast, when the device gets a network configuration assigned to
it and bge_init() is called, the host ASF firmware is brought up so
both NetBSD and the IPMI BMc can use the same physical port.
This now matches FreeBSD behavior, as well as behavior from NetBSD-5.2.
Tested on a Sunfire X2200-M2 system with the following chip:
bge1 at pci7 dev 4 function 1: Broadcom BCM5715 Gigabit Ethernet
bge1: interrupting at ioapic0 pin 11
bge1: HW config 00d4, 0014, ,
bge1: ASIC BCM5715 A3 (0x9003), Ethernet address 00:1e:68:XX:XX:XX
bge1: setting short Tx thresholds
brgphy1 at bge1 phy 1: BCM5714 1000BASE-T/X media interface, rev. 0
brgphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT,
1000baseT-FDX, auto
To generate a diff of this commit:
cvs rdiff -u -r1.335.2.1 -r1.335.2.2 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.335.2.1 src/sys/dev/pci/if_bge.c:1.335.2.2
--- src/sys/dev/pci/if_bge.c:1.335.2.1 Wed Nov 27 11:08:24 2019
+++ src/sys/dev/pci/if_bge.c Thu May 19 16:24:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $ */
+/* $NetBSD: if_bge.c,v 1.335.2.2 2022/05/19 16:24:20 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335.2.2 2022/05/19 16:24:20 martin Exp $");
#include
#include
@@ -3646,7 +3646,7 @@ bge_attach(device_t parent, device_t sel
BGE_SETBIT_FLUSH(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
bge_stop_fw(sc);
- bge_sig_pre_reset(sc, BGE_RESET_START);
+ bge_sig_pre_reset(sc, BGE_RESET_SHUTDOWN);
if (bge_reset(sc))
aprint_error_dev(sc->bge_dev, "chip reset failed\n");
@@ -3680,8 +3680,8 @@ bge_attach(device_t parent, device_t sel
"HW config %08x, %08x, %08x, %08x %08x\n",
hwcfg, hwcfg2, hwcfg3, hwcfg4, hwcfg5);
- bge_sig_legacy(sc, BGE_RESET_START);
- bge_sig_post_reset(sc, BGE_RESET_START);
+ bge_sig_legacy(sc, BGE_RESET_SHUTDOWN);
+ bge_sig_post_reset(sc, BGE_RESET_SHUTDOWN);
if (bge_chipinit(sc)) {
aprint_error_dev(sc->bge_dev, "chip initialization failed\n");
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu May 19 16:24:20 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: if_bge.c Log Message: Pull up following revision(s) (requested by buhrow in ticket #1456): sys/dev/pci/if_bge.c: revision 1.353 For chips which contain an ASF/IPMI firmware, instruct the chip to shut the host ASF firmware down when attaching the device so the IPMI BMC can use the same physical port even when NetBSD doesn't have a network configuration on the device. By contrast, when the device gets a network configuration assigned to it and bge_init() is called, the host ASF firmware is brought up so both NetBSD and the IPMI BMc can use the same physical port. This now matches FreeBSD behavior, as well as behavior from NetBSD-5.2. Tested on a Sunfire X2200-M2 system with the following chip: bge1 at pci7 dev 4 function 1: Broadcom BCM5715 Gigabit Ethernet bge1: interrupting at ioapic0 pin 11 bge1: HW config 00d4, 0014, , bge1: ASIC BCM5715 A3 (0x9003), Ethernet address 00:1e:68:XX:XX:XX bge1: setting short Tx thresholds brgphy1 at bge1 phy 1: BCM5714 1000BASE-T/X media interface, rev. 0 brgphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT, 1000baseT-FDX, auto To generate a diff of this commit: cvs rdiff -u -r1.335.2.1 -r1.335.2.2 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Sep 3 10:20:22 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: if_vte.c Log Message: Pull up following revision(s) (requested by andvar in ticket #1339): sys/dev/pci/if_vte.c: revision 1.32 Restore original MDC speed control register value after MAC reset, if it wasn't default. Fixes PR port-i386/53494. ok riastradh To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/sys/dev/pci/if_vte.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 3 10:20:22 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-9]: if_vte.c
Log Message:
Pull up following revision(s) (requested by andvar in ticket #1339):
sys/dev/pci/if_vte.c: revision 1.32
Restore original MDC speed control register value after MAC reset, if
it wasn't default. Fixes PR port-i386/53494.
ok riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/sys/dev/pci/if_vte.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.26.2.1 src/sys/dev/pci/if_vte.c:1.26.2.2
--- src/sys/dev/pci/if_vte.c:1.26.2.1 Wed Nov 6 09:59:39 2019
+++ src/sys/dev/pci/if_vte.c Fri Sep 3 10:20:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.26.2.1 2019/11/06 09:59:39 martin Exp $ */
+/* $NetBSD: if_vte.c,v 1.26.2.2 2021/09/03 10:20:22 martin Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.26.2.1 2019/11/06 09:59:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.26.2.2 2021/09/03 10:20:22 martin Exp $");
#include
#include
@@ -1200,9 +1200,10 @@ vte_tick(void *arg)
static void
vte_reset(struct vte_softc *sc)
{
- uint16_t mcr;
+ uint16_t mcr, mdcsc;
int i;
+ mdcsc = CSR_READ_2(sc, VTE_MDCSC);
mcr = CSR_READ_2(sc, VTE_MCR1);
CSR_WRITE_2(sc, VTE_MCR1, mcr | MCR1_MAC_RESET);
for (i = VTE_RESET_TIMEOUT; i > 0; i--) {
@@ -1220,6 +1221,14 @@ vte_reset(struct vte_softc *sc)
CSR_WRITE_2(sc, VTE_MACSM, 0x0002);
CSR_WRITE_2(sc, VTE_MACSM, 0);
DELAY(5000);
+
+ /*
+ * On some SoCs (like Vortex86DX3) MDC speed control register value
+ * needs to be restored to original value instead of default one,
+ * otherwise some PHY registers may fail to be read.
+ */
+ if (mdcsc != MDCSC_DEFAULT)
+ CSR_WRITE_2(sc, VTE_MDCSC, mdcsc);
}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Oct 15 19:33:24 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pci.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #331): sys/dev/pci/pci.c: revision 1.155 The PCI Local Bus Specification says that we should probe devices by reading PCI_ID_REG. pci_enumerate_bus was incorrectly reading PCI_BHLC_REG first, which surprisingly has worked for the past 16 years. Unfortunately, this undefined behavior does the wrong thing on Amazon's Annapurna Labs PCIe host controller. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.154.4.1 src/sys/dev/pci/pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Oct 15 19:33:24 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pci.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #331): sys/dev/pci/pci.c: revision 1.155 The PCI Local Bus Specification says that we should probe devices by reading PCI_ID_REG. pci_enumerate_bus was incorrectly reading PCI_BHLC_REG first, which surprisingly has worked for the past 16 years. Unfortunately, this undefined behavior does the wrong thing on Amazon's Annapurna Labs PCIe host controller. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.154.4.1 src/sys/dev/pci/pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pci.c diff -u src/sys/dev/pci/pci.c:1.154 src/sys/dev/pci/pci.c:1.154.4.1 --- src/sys/dev/pci/pci.c:1.154 Sat Dec 15 05:38:45 2018 +++ src/sys/dev/pci/pci.c Tue Oct 15 19:33:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.154 2018/12/15 05:38:45 msaitoh Exp $ */ +/* $NetBSD: pci.c,v 1.154.4.1 2019/10/15 19:33:23 martin Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154 2018/12/15 05:38:45 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154.4.1 2019/10/15 19:33:23 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_pci.h" @@ -723,10 +723,6 @@ pci_enumerate_bus(struct pci_softc *sc, tag = pci_make_tag(pc, sc->sc_bus, device, 0); - bhlcr = pci_conf_read(pc, tag, PCI_BHLC_REG); - if (PCI_HDRTYPE_TYPE(bhlcr) > 2) - continue; - id = pci_conf_read(pc, tag, PCI_ID_REG); /* Invalid vendor ID value? */ @@ -736,6 +732,10 @@ pci_enumerate_bus(struct pci_softc *sc, if (PCI_VENDOR(id) == 0) continue; + bhlcr = pci_conf_read(pc, tag, PCI_BHLC_REG); + if (PCI_HDRTYPE_TYPE(bhlcr) > 2) + continue; + qd = pci_lookup_quirkdata(PCI_VENDOR(id), PCI_PRODUCT(id)); if (qd != NULL &&
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Oct 17 18:58:33 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_vge.c if_vgereg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #345):
sys/dev/pci/if_vgereg.h: revision 1.5
sys/dev/pci/if_vge.c: revision 1.75
Copy vge_clrwol() from FreeBSD and call it in vge_attach() to recover from
powerdown mode. Fixes PR kern/41525 reported by Aran Clauson.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/pci/if_vgereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.73 src/sys/dev/pci/if_vge.c:1.73.2.1
--- src/sys/dev/pci/if_vge.c:1.73 Tue Jul 9 08:46:59 2019
+++ src/sys/dev/pci/if_vge.c Thu Oct 17 18:58:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.73 2019/07/09 08:46:59 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -328,6 +328,7 @@ static void vge_miibus_statchg(struct if
static void vge_cam_clear(struct vge_softc *);
static int vge_cam_set(struct vge_softc *, uint8_t *);
+static void vge_clrwol(struct vge_softc *);
static void vge_setmulti(struct vge_softc *);
static void vge_reset(struct vge_softc *);
@@ -953,6 +954,9 @@ vge_attach(device_t parent, device_t sel
aprint_normal_dev(self, "Ethernet address %s\n",
ether_sprintf(eaddr));
+ /* Clear WOL and take hardware from powerdown. */
+ vge_clrwol(sc);
+
/*
* Use the 32bit tag. Hardware supports 48bit physical addresses,
* but we don't use that for now.
@@ -2156,3 +2160,30 @@ vge_shutdown(device_t self, int howto)
return true;
}
+
+static void
+vge_clrwol(struct vge_softc *sc)
+{
+ uint8_t val;
+
+ val = CSR_READ_1(sc, VGE_PWRSTAT);
+ val &= ~VGE_STICKHW_SWPTAG;
+ CSR_WRITE_1(sc, VGE_PWRSTAT, val);
+ /* Disable WOL and clear power state indicator. */
+ val = CSR_READ_1(sc, VGE_PWRSTAT);
+ val &= ~(VGE_STICKHW_DS0 | VGE_STICKHW_DS1);
+ CSR_WRITE_1(sc, VGE_PWRSTAT, val);
+
+ CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_GMII);
+ CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
+
+ /* Clear WOL on pattern match. */
+ CSR_WRITE_1(sc, VGE_WOLCR0C, VGE_WOLCR0_PATTERN_ALL);
+ /* Disable WOL on magic/unicast packet. */
+ CSR_WRITE_1(sc, VGE_WOLCR1C, 0x0F);
+ CSR_WRITE_1(sc, VGE_WOLCFGC, VGE_WOLCFG_SAB | VGE_WOLCFG_SAM |
+ VGE_WOLCFG_PMEOVR);
+ /* Clear WOL status on pattern match. */
+ CSR_WRITE_1(sc, VGE_WOLSR0C, 0xFF);
+ CSR_WRITE_1(sc, VGE_WOLSR1C, 0xFF);
+}
Index: src/sys/dev/pci/if_vgereg.h
diff -u src/sys/dev/pci/if_vgereg.h:1.4 src/sys/dev/pci/if_vgereg.h:1.4.2.1
--- src/sys/dev/pci/if_vgereg.h:1.4 Thu Jul 11 03:49:51 2019
+++ src/sys/dev/pci/if_vgereg.h Thu Oct 17 18:58:33 2019
@@ -540,6 +540,31 @@
#define VGE_TXBLOCK_128PKTS 0x08
#define VGE_TXBLOCK_8PKTS 0x0C
+/* Sticky bit shadow register */
+
+#define VGE_STICKHW_DS0 0x01
+#define VGE_STICKHW_DS1 0x02
+#define VGE_STICKHW_WOL_ENB 0x04
+#define VGE_STICKHW_WOL_STS 0x08
+#define VGE_STICKHW_SWPTAG 0x10
+
+/* WOL pattern control */
+#define VGE_WOLCR0_PATTERN0 0x01
+#define VGE_WOLCR0_PATTERN1 0x02
+#define VGE_WOLCR0_PATTERN2 0x04
+#define VGE_WOLCR0_PATTERN3 0x08
+#define VGE_WOLCR0_PATTERN4 0x10
+#define VGE_WOLCR0_PATTERN5 0x20
+#define VGE_WOLCR0_PATTERN6 0x40
+#define VGE_WOLCR0_PATTERN7 0x80
+#define VGE_WOLCR0_PATTERN_ALL 0xFF
+
+/* WOL config register */
+#define VGE_WOLCFG_PHYINT_ENB 0x01
+#define VGE_WOLCFG_SAB 0x10
+#define VGE_WOLCFG_SAM 0x20
+#define VGE_WOLCFG_PMEOVR 0x80
+
/* EEPROM control/status register */
#define VGE_EECSR_EDO 0x01 /* data out pin */
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 17 18:58:33 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_vge.c if_vgereg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #345): sys/dev/pci/if_vgereg.h: revision 1.5 sys/dev/pci/if_vge.c: revision 1.75 Copy vge_clrwol() from FreeBSD and call it in vge_attach() to recover from powerdown mode. Fixes PR kern/41525 reported by Aran Clauson. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/dev/pci/if_vge.c cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/pci/if_vgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 17 19:02:55 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_et.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #346): sys/dev/pci/if_et.c: revision 1.27 Fix a bug that multicast address filter doesn't work correctly. XXX pullup-[789]. To generate a diff of this commit: cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/pci/if_et.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Oct 17 19:02:55 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_et.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #346):
sys/dev/pci/if_et.c: revision 1.27
Fix a bug that multicast address filter doesn't work correctly.
XXX pullup-[789].
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/pci/if_et.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.24.2.1 src/sys/dev/pci/if_et.c:1.24.2.2
--- src/sys/dev/pci/if_et.c:1.24.2.1 Fri Aug 9 16:03:13 2019
+++ src/sys/dev/pci/if_et.c Thu Oct 17 19:02:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_et.c,v 1.24.2.1 2019/08/09 16:03:13 martin Exp $ */
+/* $NetBSD: if_et.c,v 1.24.2.2 2019/10/17 19:02:54 martin Exp $ */
/* $OpenBSD: if_et.c,v 1.12 2008/07/11 09:29:02 kevlo $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.24.2.1 2019/08/09 16:03:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.24.2.2 2019/10/17 19:02:54 martin Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -1304,7 +1304,6 @@ et_setmulti(struct et_softc *sc)
uint32_t rxmac_ctrl, pktfilt;
struct ether_multi *enm;
struct ether_multistep step;
- uint8_t addr[ETHER_ADDR_LEN];
int i, count;
pktfilt = CSR_READ_4(sc, ET_PKTFILT);
@@ -1316,19 +1315,13 @@ et_setmulti(struct et_softc *sc)
goto back;
}
- bcopy(etherbroadcastaddr, addr, ETHER_ADDR_LEN);
-
count = 0;
ETHER_LOCK(ec);
ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
uint32_t *hp, h;
- for (i = 0; i < ETHER_ADDR_LEN; i++) {
- addr[i] &= enm->enm_addrlo[i];
- }
-
- h = ether_crc32_be(addr, ETHER_ADDR_LEN);
+ h = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
h = (h & 0x3f80) >> 23;
hp = &hash[0];
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Oct 23 18:09:18 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: ahcisata_pci.c
Log Message:
Pull up following revision(s) (requested by tnn in ticket #358):
sys/dev/pci/ahcisata_pci.c: revision 1.56
ahcisata: make sure bus mastering and memory space are actually enabled
This makes the "ROCKPro64 PCI-e to Dual SATA-II Interface Card" work.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.4.1 src/sys/dev/pci/ahcisata_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.55 src/sys/dev/pci/ahcisata_pci.c:1.55.4.1
--- src/sys/dev/pci/ahcisata_pci.c:1.55 Sun Jan 27 02:08:42 2019
+++ src/sys/dev/pci/ahcisata_pci.c Wed Oct 23 18:09:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.55 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.55.4.1 2019/10/23 18:09:18 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.55 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.55.4.1 2019/10/23 18:09:18 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ahcisata_pci.h"
@@ -394,6 +394,7 @@ ahci_pci_attach(device_t parent, device_
struct ahci_softc *sc = &psc->ah_sc;
bool ahci_cap_64bit;
bool ahci_bad_64bit;
+ pcireg_t reg;
sc->sc_atac.atac_dev = self;
@@ -447,6 +448,10 @@ ahci_pci_attach(device_t parent, device_
AHCIDEBUG_PRINT(("%s: SATA mode\n", AHCINAME(sc)), DEBUG_PROBE);
}
+ reg = pci_conf_read(psc->sc_pc, psc->sc_pcitag, PCI_COMMAND_STATUS_REG);
+ reg |= (PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE);
+ pci_conf_write(psc->sc_pc, psc->sc_pcitag, PCI_COMMAND_STATUS_REG, reg);
+
ahci_attach(sc);
if (!pmf_device_register(self, NULL, ahci_pci_resume))
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Oct 23 18:09:18 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: ahcisata_pci.c Log Message: Pull up following revision(s) (requested by tnn in ticket #358): sys/dev/pci/ahcisata_pci.c: revision 1.56 ahcisata: make sure bus mastering and memory space are actually enabled This makes the "ROCKPro64 PCI-e to Dual SATA-II Interface Card" work. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.55.4.1 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Oct 23 19:38:52 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_bce.c if_bcereg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #370):
sys/dev/pci/if_bce.c: revision 1.55
sys/dev/pci/if_bce.c: revision 1.56
sys/dev/pci/if_bcereg.h: revision 1.5
- Add missing splnet()/splx() around mii_tick(). Same as OpenBSD rev. 1.23
- Use device_printf() instead of aprint_error_dev)() in bce_watchdog().
- Remove unnecessary inclusion.
>From OpenBSD:
- Mark ETHERCAP_VLAN_MTU.
- Clear the powerdown mode. Fixes PR kern/24911 reported by Werner Backes.
- Set proper LED modes.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/dev/pci/if_bce.c
cvs rdiff -u -r1.4 -r1.4.170.1 src/sys/dev/pci/if_bcereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.52 src/sys/dev/pci/if_bce.c:1.52.2.1
--- src/sys/dev/pci/if_bce.c:1.52 Thu May 30 02:32:18 2019
+++ src/sys/dev/pci/if_bce.c Wed Oct 23 19:38:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.52 2019/05/30 02:32:18 msaitoh Exp $ */
+/* $NetBSD: if_bce.c,v 1.52.2.1 2019/10/23 19:38:52 martin Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.52 2019/05/30 02:32:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.52.2.1 2019/10/23 19:38:52 martin Exp $");
#include "vlan.h"
@@ -63,8 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1
#include
#include
-#include
-#include
#include
@@ -423,6 +421,8 @@ bce_attach(device_t parent, device_t sel
ifp->if_stop = bce_stop;
IFQ_SET_READY(&ifp->if_snd);
+ sc->ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
+
/* Initialize our media structures and probe the MII. */
mii->mii_ifp = ifp;
@@ -653,7 +653,7 @@ bce_watchdog(struct ifnet *ifp)
{
struct bce_softc *sc = ifp->if_softc;
- aprint_error_dev(sc->bce_dev, "device timeout\n");
+ device_printf(sc->bce_dev, "device timeout\n");
ifp->if_oerrors++;
(void) bce_init(ifp);
@@ -920,10 +920,15 @@ bce_init(struct ifnet *ifp)
sc->bce_txsnext = 0;
sc->bce_txin = 0;
- /* enable crc32 generation */
+ /* enable crc32 generation and set proper LED modes */
bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_MACCTL,
bus_space_read_4(sc->bce_btag, sc->bce_bhandle, BCE_MACCTL) |
- BCE_EMC_CG);
+ BCE_EMC_CRC32_ENAB | BCE_EMC_LED);
+
+ /* reset or clear powerdown control bit */
+ bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_MACCTL,
+ bus_space_read_4(sc->bce_btag, sc->bce_bhandle, BCE_MACCTL) &
+ ~BCE_EMC_PDOWN);
/* setup DMA interrupt control */
bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_DMAI_CTL, 1 << 24); /* MAGIC */
@@ -1476,9 +1481,11 @@ static void
bce_tick(void *v)
{
struct bce_softc *sc = v;
+ int s;
- /* Tick the MII. */
+ s = splnet();
mii_tick(&sc->bce_mii);
+ splx(s);
callout_reset(&sc->bce_timeout, hz, bce_tick, sc);
}
Index: src/sys/dev/pci/if_bcereg.h
diff -u src/sys/dev/pci/if_bcereg.h:1.4 src/sys/dev/pci/if_bcereg.h:1.4.170.1
--- src/sys/dev/pci/if_bcereg.h:1.4 Sun Dec 11 12:22:49 2005
+++ src/sys/dev/pci/if_bcereg.h Wed Oct 23 19:38:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bcereg.h,v 1.4 2005/12/11 12:22:49 christos Exp $ */
+/* $NetBSD: if_bcereg.h,v 1.4.170.1 2019/10/23 19:38:52 martin Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -71,7 +71,10 @@
/* Ethernet MAC Control */
#define BCE_MACCTL 0x00A8 /* ethernet mac control */
/* mac control bits */
-#define BCE_EMC_CG 0x0001 /* crc32 generation */
+#define BCE_EMC_CRC32_ENAB 0x0001 /* crc32 generation */
+#define BCE_EMC_PDOWN 0x0004 /* PHY powerdown */
+#define BCE_EMC_EDET 0x0008 /* PHY energy detect */
+#define BCE_EMC_LED 0x00e0 /* PHY LED control */
/* DMA Interrupt control */
#define BCE_DMAI_CTL 0x0100
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Oct 23 19:38:52 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_bce.c if_bcereg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #370): sys/dev/pci/if_bce.c: revision 1.55 sys/dev/pci/if_bce.c: revision 1.56 sys/dev/pci/if_bcereg.h: revision 1.5 - Add missing splnet()/splx() around mii_tick(). Same as OpenBSD rev. 1.23 - Use device_printf() instead of aprint_error_dev)() in bce_watchdog(). - Remove unnecessary inclusion. >From OpenBSD: - Mark ETHERCAP_VLAN_MTU. - Clear the powerdown mode. Fixes PR kern/24911 reported by Werner Backes. - Set proper LED modes. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/dev/pci/if_bce.c cvs rdiff -u -r1.4 -r1.4.170.1 src/sys/dev/pci/if_bcereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:12:42 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #373): sys/dev/pci/pcidevs: revision 1.1386 sys/dev/pci/pcidevs: revision 1.1387 Modify Attansic Ethernet devices' description to clarify. Add Killer E2400 and E2500. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.2 -r1.1383.2.3 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.2 src/sys/dev/pci/pcidevs:1.1383.2.3 --- src/sys/dev/pci/pcidevs:1.1383.2.2 Tue Sep 24 02:59:35 2019 +++ src/sys/dev/pci/pcidevs Thu Oct 24 16:12:42 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.2 2019/09/24 02:59:35 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.3 2019/10/24 16:12:42 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1332,18 +1332,20 @@ product ASUSTEK HFCPCI 0x0675 ISDN /* Attansic Technology Corp. */ product ATTANSIC ETHERNET_L1E 0x1026 L1E Gigabit Ethernet Adapter product ATTANSIC ETHERNET_GIGA 0x1048 L1 Gigabit Ethernet Adapter -product ATTANSIC AR8132 0x1062 AR8132 Fast Ethernet Adapter -product ATTANSIC AR8131 0x1063 AR8131 Gigabit Ethernet Adapter -product ATTANSIC AR8151 0x1073 AR8151 v1.0 Gigabit Ethernet Adapter -product ATTANSIC AR8151_V2 0x1083 AR8151 v2.0 Gigabit Ethernet Adapter +product ATTANSIC AR8132 0x1062 AR8132 L2C Fast Ethernet Adapter +product ATTANSIC AR8131 0x1063 AR8131 L1C Gigabit Ethernet Adapter +product ATTANSIC AR8151 0x1073 AR8151 v1.0 L1D Gigabit Ethernet Adapter +product ATTANSIC AR8151_V2 0x1083 AR8151 v2.0 L1D Gigabit Ethernet Adapter product ATTANSIC AR8162 0x1090 AR8162 product ATTANSIC AR8161 0x1091 AR8161 product ATTANSIC AR8172 0x10a0 AR8172 product ATTANSIC AR8171 0x10a1 AR8171 product ATTANSIC ETHERNET_100 0x2048 L2 100 Mbit Ethernet Adapter -product ATTANSIC AR8152_B 0x2060 AR8152 v1.1 Fast Ethernet Adapter -product ATTANSIC AR8152_B2 0x2062 AR8152 v2.0 Fast Ethernet Adapter -product ATTANSIC E2200 0xe091 E2200 +product ATTANSIC AR8152_B 0x2060 AR8152 v1.1 L2C Fast Ethernet Adapter +product ATTANSIC AR8152_B2 0x2062 AR8152 v2.0 L2C Fast Ethernet Adapter +product ATTANSIC E2200 0xe091 Killer E2200 +product ATTANSIC E2400 0xe0a1 Killer E2400 +product ATTANSIC E2500 0xe0b1 Killer E2500 /* ATI products */ /* See http://www.x.org/wiki/Radeon%20ASICs */
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:12:42 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #373): sys/dev/pci/pcidevs: revision 1.1386 sys/dev/pci/pcidevs: revision 1.1387 Modify Attansic Ethernet devices' description to clarify. Add Killer E2400 and E2500. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.2 -r1.1383.2.3 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:14:11 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #373 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.2 -r1.1371.2.3 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.2 -r1.1370.2.3 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:14:11 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #373 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.2 -r1.1371.2.3 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.2 -r1.1370.2.3 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Oct 24 16:19:23 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_msk.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #374):
sys/dev/pci/if_msk.c: revision 1.92
Fix order of m_freem(). Found by kASan. OK'd by jdolecek and mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/dev/pci/if_msk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.91 src/sys/dev/pci/if_msk.c:1.91.2.1
--- src/sys/dev/pci/if_msk.c:1.91 Mon Jun 3 05:22:57 2019
+++ src/sys/dev/pci/if_msk.c Thu Oct 24 16:19:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.91 2019/06/03 05:22:57 msaitoh Exp $ */
+/* $NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91 2019/06/03 05:22:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $");
#include
#include
@@ -2118,9 +2118,6 @@ msk_txeof(struct sk_if_softc *sc_if)
if (sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf != NULL) {
entry = sc_if->sk_cdata.sk_tx_map[idx];
- m_freem(sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf);
- sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf = NULL;
-
bus_dmamap_sync(sc->sc_dmatag, entry->dmamap, 0,
entry->dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
@@ -2128,6 +2125,8 @@ msk_txeof(struct sk_if_softc *sc_if)
SIMPLEQ_INSERT_TAIL(&sc_if->sk_txmap_head, entry,
link);
sc_if->sk_cdata.sk_tx_map[idx] = NULL;
+ m_freem(sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf);
+ sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf = NULL;
}
sc_if->sk_cdata.sk_tx_cnt--;
SK_INC(idx, MSK_TX_RING_CNT);
@@ -2646,13 +2645,19 @@ msk_stop(struct ifnet *ifp, int disable)
for (i = 0; i < MSK_TX_RING_CNT; i++) {
if (sc_if->sk_cdata.sk_tx_chain[i].sk_mbuf != NULL) {
- m_freem(sc_if->sk_cdata.sk_tx_chain[i].sk_mbuf);
- sc_if->sk_cdata.sk_tx_chain[i].sk_mbuf = NULL;
+ dma = sc_if->sk_cdata.sk_tx_map[i];
+
+ bus_dmamap_sync(sc->sc_dmatag, dma->dmamap, 0,
+ dma->dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
+
+ bus_dmamap_unload(sc->sc_dmatag, dma->dmamap);
#if 1
SIMPLEQ_INSERT_HEAD(&sc_if->sk_txmap_head,
sc_if->sk_cdata.sk_tx_map[i], link);
sc_if->sk_cdata.sk_tx_map[i] = 0;
#endif
+ m_freem(sc_if->sk_cdata.sk_tx_chain[i].sk_mbuf);
+ sc_if->sk_cdata.sk_tx_chain[i].sk_mbuf = NULL;
}
}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:19:23 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_msk.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #374): sys/dev/pci/if_msk.c: revision 1.92 Fix order of m_freem(). Found by kASan. OK'd by jdolecek and mrg. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/dev/pci/if_msk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:25:33 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_jme.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #376): sys/dev/pci/if_jme.c: revision 1.46 A * is missing here. This could cause a use-after-free. Found by the lgtm bot. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/dev/pci/if_jme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 24 16:25:33 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_jme.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #376): sys/dev/pci/if_jme.c: revision 1.46 A * is missing here. This could cause a use-after-free. Found by the lgtm bot. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/dev/pci/if_jme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_jme.c diff -u src/sys/dev/pci/if_jme.c:1.44 src/sys/dev/pci/if_jme.c:1.44.2.1 --- src/sys/dev/pci/if_jme.c:1.44 Tue Jul 9 08:46:59 2019 +++ src/sys/dev/pci/if_jme.c Thu Oct 24 16:25:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_jme.c,v 1.44 2019/07/09 08:46:59 msaitoh Exp $ */ +/* $NetBSD: if_jme.c,v 1.44.2.1 2019/10/24 16:25:33 martin Exp $ */ /* * Copyright (c) 2008 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.44 2019/07/09 08:46:59 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.44.2.1 2019/10/24 16:25:33 martin Exp $"); #include @@ -1453,7 +1453,7 @@ jme_encap(struct jme_softc *sc, struct m "DMA segments, dropping...\n", device_xname(sc->jme_dev)); m_freem(*m_head); - m_head = NULL; + *m_head = NULL; } return (error); }
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 6 09:52:20 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: pci.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #401):
sys/dev/pci/pci.c: revision 1.156
PCIe downstream ports only have a single child device, so limit probing to
dev 0.
To generate a diff of this commit:
cvs rdiff -u -r1.154.4.1 -r1.154.4.2 src/sys/dev/pci/pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.154.4.1 src/sys/dev/pci/pci.c:1.154.4.2
--- src/sys/dev/pci/pci.c:1.154.4.1 Tue Oct 15 19:33:23 2019
+++ src/sys/dev/pci/pci.c Wed Nov 6 09:52:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.154.4.1 2019/10/15 19:33:23 martin Exp $ */
+/* $NetBSD: pci.c,v 1.154.4.2 2019/11/06 09:52:20 martin Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154.4.1 2019/10/15 19:33:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154.4.2 2019/11/06 09:52:20 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -695,17 +695,26 @@ pci_enumerate_bus(struct pci_softc *sc,
device_t bridgedev;
bool arien = false;
+ bool downstream_port = false;
- /* Check PCIe ARI */
+ /* Check PCIe ARI and port type */
bridgedev = device_parent(sc->sc_dev);
if (device_is_a(bridgedev, "ppb")) {
struct ppb_softc *ppbsc = device_private(bridgedev);
pci_chipset_tag_t ppbpc = ppbsc->sc_pc;
pcitag_t ppbtag = ppbsc->sc_tag;
- pcireg_t pciecap, reg;
+ pcireg_t pciecap, capreg, reg;
if (pci_get_capability(ppbpc, ppbtag, PCI_CAP_PCIEXPRESS,
- &pciecap, NULL) != 0) {
+ &pciecap, &capreg) != 0) {
+ switch (PCIE_XCAP_TYPE(capreg)) {
+ case PCIE_XCAP_TYPE_ROOT:
+ case PCIE_XCAP_TYPE_DOWN:
+ case PCIE_XCAP_TYPE_PCI2PCIE:
+downstream_port = true;
+break;
+ }
+
reg = pci_conf_read(ppbpc, ppbtag, pciecap
+ PCIE_DCSR2);
if ((reg & PCIE_DCSR2_ARI_FWD) != 0)
@@ -714,6 +723,11 @@ pci_enumerate_bus(struct pci_softc *sc,
}
n = pci_bus_devorder(sc->sc_pc, sc->sc_bus, devs, __arraycount(devs));
+ if (downstream_port) {
+ /* PCIe downstream ports only have a single child device */
+ n = 1;
+ }
+
for (i = 0; i < n; i++) {
device = devs[i];
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 6 09:52:20 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pci.c Log Message: Pull up following revision(s) (requested by mrg in ticket #401): sys/dev/pci/pci.c: revision 1.156 PCIe downstream ports only have a single child device, so limit probing to dev 0. To generate a diff of this commit: cvs rdiff -u -r1.154.4.1 -r1.154.4.2 src/sys/dev/pci/pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 6 10:07:42 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #404):
sys/dev/pci/if_wm.c: revision 1.646
sys/dev/pci/if_wm.c: revision 1.647
sys/dev/pci/if_wm.c: revision 1.649
Use unsigned to avoid undefined behavior in wm_i82543_mii_sendbits().
Found by kUBSan.
printf -> device_printf
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.645 -r1.645.2.1 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645 src/sys/dev/pci/if_wm.c:1.645.2.1
--- src/sys/dev/pci/if_wm.c:1.645 Tue Jul 30 04:42:29 2019
+++ src/sys/dev/pci/if_wm.c Wed Nov 6 10:07:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645 2019/07/30 04:42:29 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.1 2019/11/06 10:07:42 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645 2019/07/30 04:42:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.1 2019/11/06 10:07:42 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -4616,8 +4616,8 @@ wm_flush_desc_rings(struct wm_softc *sc)
return;
/* TX */
- printf("%s: Need TX flush (reg = %08x, len = %u)\n",
- device_xname(sc->sc_dev), preg, reg);
+ device_printf(sc->sc_dev, "Need TX flush (reg = %08x, len = %u)\n",
+ preg, reg);
reg = CSR_READ(sc, WMREG_TCTL);
CSR_WRITE(sc, WMREG_TCTL, reg | TCTL_EN);
@@ -4644,8 +4644,7 @@ wm_flush_desc_rings(struct wm_softc *sc)
return;
/* RX */
- printf("%s: Need RX flush (reg = %08x)\n",
- device_xname(sc->sc_dev), preg);
+ device_printf(sc->sc_dev, "Need RX flush (reg = %08x)\n", preg);
rctl = CSR_READ(sc, WMREG_RCTL);
CSR_WRITE(sc, WMREG_RCTL, rctl & ~RCTL_EN);
CSR_WRITE_FLUSH(sc);
@@ -4885,7 +4884,7 @@ wm_reset(struct wm_softc *sc)
reg |= CTRL_PHY_RESET;
phy_reset = 1;
} else
- printf("XXX reset is blocked!!!\n");
+ device_printf(sc->sc_dev, "XXX reset is blocked!!!\n");
sc->phy.acquire(sc);
CSR_WRITE(sc, WMREG_CTRL, reg);
/* Don't insert a completion barrier when reset */
@@ -9033,7 +9032,8 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
* Fiber?
* Shoud not enter here.
*/
-printf("unknown media (%x)\n", active);
+device_printf(dev, "unknown media (%x)\n",
+active);
break;
}
if (active & IFM_FDX)
@@ -9893,7 +9893,7 @@ wm_gmii_reset(struct wm_softc *sc)
* result might be incorrect.
*
* In the second call, PHY OUI and model is used to identify PHY type.
- * It might not be perfpect because of the lack of compared entry, but it
+ * It might not be perfect because of the lack of compared entry, but it
* would be better than the first call.
*
* If the detected new result and previous assumption is different,
@@ -10413,7 +10413,7 @@ wm_i82543_mii_sendbits(struct wm_softc *
v &= ~(MDI_IO | MDI_CLK | (CTRL_SWDPIO_MASK << CTRL_SWDPIO_SHIFT));
v |= MDI_DIR | CTRL_SWDPIO(3);
- for (i = 1 << (nbits - 1); i != 0; i >>= 1) {
+ for (i = __BIT(nbits - 1); i != 0; i >>= 1) {
if (data & i)
v |= MDI_IO;
else
@@ -11137,7 +11137,7 @@ wm_gmii_hv_readreg_locked(device_t dev,
* own func
*/
if ((page > 0) && (page < HV_INTC_FC_PAGE_START)) {
- printf("gmii_hv_readreg!!!\n");
+ device_printf(dev, "gmii_hv_readreg!!!\n");
return -1;
}
@@ -11205,7 +11205,7 @@ wm_gmii_hv_writereg_locked(device_t dev,
* own func
*/
if ((page > 0) && (page < HV_INTC_FC_PAGE_START)) {
- printf("gmii_hv_writereg!!!\n");
+ device_printf(dev, "gmii_hv_writereg!!!\n");
return -1;
}
@@ -11229,7 +11229,7 @@ wm_gmii_hv_writereg_locked(device_t dev,
if ((child != NULL) && (child->mii_mpd_rev >= 1)
&& (phy == 2) && ((regnum & MII_ADDRMASK) == 0)
&& ((val & (1 << 11)) != 0)) {
-printf("XXX need workaround\n");
+device_printf(dev, "XXX need workaround\n");
}
}
@@ -12851,12 +12851,12 @@ wm_ich8_cycle_init(struct wm_softc *sc)
/*
* Either we should have a hardware SPI cycle in progress bit to check
* against, in order to start a new cycle or FDONE bit should be
- * changed in the hardware so that it is 1 after harware reset, which
+ * changed in the hardware so that it is 1 after hardware reset, which
* can then be used as an indication whether a cycle is in progress or
* has been completed .. we should also have some software semaphore
* mechanism to guard FDONE or the cycle in progress bit so that two
* threads access to those bits can be sequentiallized or a way so that
- * 2 threads dont start the cycle at the same time
+ * 2 threads don't start the cycle at the same time
*/
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 6 10:07:42 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #404): sys/dev/pci/if_wm.c: revision 1.646 sys/dev/pci/if_wm.c: revision 1.647 sys/dev/pci/if_wm.c: revision 1.649 Use unsigned to avoid undefined behavior in wm_i82543_mii_sendbits(). Found by kUBSan. printf -> device_printf Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.645 -r1.645.2.1 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Nov 10 13:05:15 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_kse.c
Log Message:
Pull up following revision(s) (requested by nisimura in ticket #406):
sys/dev/pci/if_kse.c: revision 1.40
sys/dev/pci/if_kse.c: revision 1.41
sys/dev/pci/if_kse.c: revision 1.39
comment touchup
-
clarify 8842 MAC behaves 100FDX only has no alternative media selection
possible.
-
major rework to fix link control breakage
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/dev/pci/if_kse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_kse.c
diff -u src/sys/dev/pci/if_kse.c:1.38 src/sys/dev/pci/if_kse.c:1.38.2.1
--- src/sys/dev/pci/if_kse.c:1.38 Wed May 29 10:07:29 2019
+++ src/sys/dev/pci/if_kse.c Sun Nov 10 13:05:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.38 2019/05/29 10:07:29 msaitoh Exp $ */
+/* $NetBSD: if_kse.c,v 1.38.2.1 2019/11/10 13:05:15 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,9 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.38 2019/05/29 10:07:29 msaitoh Exp $");
+/*
+ * Micrel 8841/8842 10/100 ethernet driver
+ */
+#include
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.38.2.1 2019/11/10 13:05:15 martin Exp $");
#include
#include
@@ -58,6 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1
#include
#include
+#define KSE_LINKDEBUG 0
+
#define CSR_READ_4(sc, off) \
bus_space_read_4(sc->sc_st, sc->sc_sh, off)
#define CSR_WRITE_4(sc, off, val) \
@@ -93,6 +98,17 @@ __KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1
#define P1SR 0x514 /* port 1 status */
#define P2CR4 0x532 /* port 2 control 4 */
#define P2SR 0x534 /* port 2 status */
+#define PxCR_STARTNEG (1U << 9) /* restart auto negotiation */
+#define PxCR_AUTOEN (1U << 7) /* auto negotiation enable */
+#define PxCR_SPD100 (1U << 6) /* force speed 100 */
+#define PxCR_USEFDX (1U << 5) /* force full duplex */
+#define PxCR_USEFC (1U << 4) /* advertise pause flow control */
+#define PxSR_ACOMP (1U << 6) /* auto negotiation completed */
+#define PxSR_SPD100 (1U << 10) /* speed is 100Mbps */
+#define PxSR_FDX (1U << 9) /* full duplex */
+#define PxSR_LINKUP (1U << 5) /* link is good */
+#define PxSR_RXFLOW (1U << 12) /* receive flow control active */
+#define PxSR_TXFLOW (1U << 11) /* transmit flow control active */
#define TXC_BS_MSK 0x3f00 /* burst size */
#define TXC_BS_SFT (24) /* 1,2,4,8,16,32 or 0 for unlimited */
@@ -207,8 +223,8 @@ struct kse_softc {
void *sc_ih; /* interrupt cookie */
struct ifmedia sc_media; /* ifmedia information */
- int sc_media_status; /* PHY */
- int sc_media_active; /* PHY */
+ int sc_linkstatus; /* last P1SR register value */
+
callout_t sc_callout; /* MII tick callout */
callout_t sc_stat_ch; /* statistics counter callout */
@@ -313,11 +329,10 @@ static int kse_intr(void *);
static void rxintr(struct kse_softc *);
static void txreap(struct kse_softc *);
static void lnkchg(struct kse_softc *);
-static int ifmedia_upd(struct ifnet *);
-static void ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static int ksephy_change(struct ifnet *);
+static void ksephy_status(struct ifnet *, struct ifmediareq *);
+static void nopifm_status(struct ifnet *, struct ifmediareq *);
static void phy_tick(void *);
-static int ifmedia2_upd(struct ifnet *);
-static void ifmedia2_sts(struct ifnet *, struct ifmediareq *);
#ifdef KSE_EVENT_COUNTERS
static void stat_tick(void *);
static void zerostats(struct kse_softc *);
@@ -493,8 +508,9 @@ kse_attach(device_t parent, device_t sel
/* Initialize ifmedia structures. */
ifm = &sc->sc_media;
sc->sc_ethercom.ec_ifmedia = ifm;
+ sc->sc_linkstatus = 0;
if (sc->sc_chip == 0x8841) {
- ifmedia_init(ifm, 0, ifmedia_upd, ifmedia_sts);
+ ifmedia_init(ifm, 0, ksephy_change, ksephy_status);
ifmedia_add(ifm, IFM_ETHER | IFM_10_T, 0, NULL);
ifmedia_add(ifm, IFM_ETHER | IFM_10_T | IFM_FDX, 0, NULL);
ifmedia_add(ifm, IFM_ETHER | IFM_100_TX, 0, NULL);
@@ -502,9 +518,18 @@ kse_attach(device_t parent, device_t sel
ifmedia_add(ifm, IFM_ETHER | IFM_AUTO, 0, NULL);
ifmedia_set(ifm, IFM_ETHER | IFM_AUTO);
} else {
- ifmedia_init(ifm, 0, ifmedia2_upd, ifmedia2_sts);
- ifmedia_add(ifm, IFM_ETHER | IFM_AUTO, 0, NULL);
- ifmedia_set(ifm, IFM_ETHER | IFM_AUTO);
+ /*
+ * pretend 100FDX w/ no alternative media selection.
+ * 8842 MAC is tied with a builtin 3 port switch.
+ * It can do rate control over either of tx / rx direction
+ * respectively, tough, this driver leaves the rate unlimited
+ * intending 100Mbps maximum.
+ * 2 ports behave in AN mode and this driver provides no mean
+ * to see the exact details.
+ */
+ ifmedia_init(ifm, 0, NULL, nopifm_status);
+ ifmedia_add(ifm, IFM_ETHER | IFM_100_TX | I
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Nov 10 13:05:15 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_kse.c Log Message: Pull up following revision(s) (requested by nisimura in ticket #406): sys/dev/pci/if_kse.c: revision 1.40 sys/dev/pci/if_kse.c: revision 1.41 sys/dev/pci/if_kse.c: revision 1.39 comment touchup - clarify 8842 MAC behaves 100FDX only has no alternative media selection possible. - major rework to fix link control breakage To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/dev/pci/if_kse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Nov 14 15:41:04 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: pucdata.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #426):
sys/dev/pci/pucdata.c: revision 1.105
The 16C1054 and 16C1058 serial multi-port controllers need a clock
multiplier of 8, just like the 16C1050 controller.
Verified with an ExSys EX-41388.
ryo@ checked back with the hardware his original commit was based on,
and confirmed the change.
XXX Pull-up to netbsd-{7,8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.2.1 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.104 src/sys/dev/pci/pucdata.c:1.104.2.1
--- src/sys/dev/pci/pucdata.c:1.104 Thu May 2 21:33:12 2019
+++ src/sys/dev/pci/pucdata.c Thu Nov 14 15:41:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.104 2019/05/02 21:33:12 jdolecek Exp $ */
+/* $NetBSD: pucdata.c,v 1.104.2.1 2019/11/14 15:41:03 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104 2019/05/02 21:33:12 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104.2.1 2019/11/14 15:41:03 martin Exp $");
#include
#include
@@ -2883,10 +2883,10 @@ const struct puc_device_description puc_
{ PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },
{ 0x, 0x, 0, 0 },
{
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 },
},
},
@@ -2895,14 +2895,14 @@ const struct puc_device_description puc_
{ PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1058, 0, 0 },
{ 0x, 0x, 0, 0 },
{
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ * 8 },
},
},
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Nov 14 15:41:04 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: pucdata.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #426):
sys/dev/pci/pucdata.c: revision 1.105
The 16C1054 and 16C1058 serial multi-port controllers need a clock
multiplier of 8, just like the 16C1050 controller.
Verified with an ExSys EX-41388.
ryo@ checked back with the hardware his original commit was based on,
and confirmed the change.
XXX Pull-up to netbsd-{7,8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.2.1 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:03:32 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #449): sys/dev/pci/pcidevs: revision 1.1388 sys/dev/pci/pcidevs: revision 1.1389 sys/dev/pci/pcidevs: revision 1.1390 sys/dev/pci/pcidevs: revision 1.1391 Spell controller correctly Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Modify 0x0953's description to "750 or DC P3[567]00 SSD" - Add DC P4[56]00 - Add Apollo Lake TXE HECI. Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.3 -r1.1383.2.4 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.3 src/sys/dev/pci/pcidevs:1.1383.2.4 --- src/sys/dev/pci/pcidevs:1.1383.2.3 Thu Oct 24 16:12:42 2019 +++ src/sys/dev/pci/pcidevs Tue Nov 19 13:03:32 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.3 2019/10/24 16:12:42 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.4 2019/11/19 13:03:32 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2513,6 +2513,7 @@ product DLINK DL4000 0x4000 DL-4000 Gig product DLINK DGE550SX 0x4001 DGE-550SX product DLINK DFE520TX 0x4200 DFE-520TX 10/100 Ethernet product DLINK DGE528T 0x4300 DGE-528T Gigabit Ethernet +product DLINK DGE530T_C1 0x4302 DGE-530T C1 product DLINK DGE560T 0x4b00 DGE-560T Gigabit Ethernet product DLINK DGE560T_2 0x4b01 DGE-560T_2 Gigabit Ethernet product DLINK DGE560SX 0x4b02 DGE-560SX @@ -3117,7 +3118,7 @@ product INTEL X1000_HS_UART 0x0936 Quark product INTEL X1000_MAC 0x0937 Quark X1000 10/100 Ethernet MAC product INTEL X1000_EHCI 0x0939 Quark X1000 EHCI product INTEL X1000_OHCI 0x093a Quark X1000 OHCI -product INTEL PCIE_NVME_SSD 0x0953 PCIe NVMe SSD +product INTEL PCIE_NVME_SSD 0x0953 750 or DC P3[567]00 SSD product INTEL X1000_HB 0x0958 Quark X1000 Host Bridge product INTEL WIFI_LINK_7265_1 0x095a Dual Band Wireless AC 7265 product INTEL WIFI_LINK_7265_2 0x095b Dual Band Wireless AC 7265 @@ -3142,6 +3143,8 @@ product INTEL CORE4G_S_ULT_GT3 0x0a2a HD product INTEL CORE4G_R_ULT_GT3_1 0x0a2b HD Graphics product INTEL CORE4G_R_ULT_GT3_2 0x0a2e Iris Graphics 5100 product INTEL DC_P3520_SSD 0x0a53 SSD DC P3520 +product INTEL DC_P4500_SSD 0x0a54 SSD DC P4500 +product INTEL DC_P4600_SSD 0x0a55 SSD DC P4600 product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller @@ -4944,6 +4947,9 @@ product INTEL APL_P2SB 0x5a92 Apollo La product INTEL APL_PMC 0x5a94 Apollo Lake PMC product INTEL APL_FASTSPI 0x5a96 Apollo Lake Fast SPI product INTEL APL_HDA 0x5a98 Apollo Lake HD Audio +product INTEL APL_TXE_HECI_1 0x5a9a Apollo Lake TXE HECI1 +product INTEL APL_TXE_HECI_2 0x5a9c Apollo Lake TXE HECI2 +product INTEL APL_TXE_HECI_3 0x5a9e Apollo Lake TXE HECI3 product INTEL APL_ISH 0x5aa2 Apollo Lake Integrated Sensor Hub product INTEL APL_XHCI 0x5aa8 Apollo Lake USB Host (xHCI) product INTEL APL_XDCI 0x5aaa Apollo Lake USB Device (xDCI) @@ -5960,6 +5966,9 @@ product MYRICOM MYRINET 0x8043 Myrinet /* Myson-Century Technology products */ product MYSON MTD803 0x0803 MTD803 3-in-1 Fast Ethernet Controller +/* Ncube products */ +product NCUBE TG3648 0x8168 TP-Link TG-3468 v2 Gigabit Ethernet + /* National Datacomm products */ product NDC NCP130 0x0130 NCP130 Wireless NIC product NDC NCP130A2 0x0131 NCP130 rev A2 Wireless NIC @@ -6839,7 +6848,7 @@ product PROMISE PDC20271 0x6269 PDC20271 product PROMISE PDC20617 0x6617 PDC20617 Dual Ultra/133 IDE Controller product PROMISE PDC20620 0x6620 PDC20620 Dual Ultra/133 IDE Controller product PROMISE PDC20621 0x6621 PDC20621 Dual Ultra/133 IDE Controller -product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controler +product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controller product PROMISE PDC20619 0x6629 PDC20619 Dual Ultra/133 IDE Controller product PROMISE PDC20277 0x7275 PDC20277 Ultra/133 IDE Controller @@ -7031,6 +7040,7 @@ product REALTEK RTL8411 0x5289 RTL8411 product REALTEK RT8029 0x8029 8029 Ethernet product REALTEK RT8139D 0x8039 8139D 10/100 Ethernet product REALTEK RT8100 0x8100 8100 10/100 Ethernet +product REALTEK RT8125 0x8125 8129 10/100/1G/2.5G Ethernet product REALTEK RT8129 0x8129 8129 10/100 Ethernet product REALTEK RT8101E 0x8136 8100E/8101E/8102E 10/100 Ethernet product REALTEK RT8138 0x8138 8138 10/100 Ethernet
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:03:32 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #449): sys/dev/pci/pcidevs: revision 1.1388 sys/dev/pci/pcidevs: revision 1.1389 sys/dev/pci/pcidevs: revision 1.1390 sys/dev/pci/pcidevs: revision 1.1391 Spell controller correctly Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Modify 0x0953's description to "750 or DC P3[567]00 SSD" - Add DC P4[56]00 - Add Apollo Lake TXE HECI. Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.3 -r1.1383.2.4 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:04:44 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #449 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.3 -r1.1371.2.4 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.3 -r1.1370.2.4 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:07:37 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_msk.c if_skreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #450): sys/dev/pci/if_msk.c: revision 1.94 sys/dev/pci/if_skreg.h: revision 1.27 Make Yukon EX, FE+, SUPR stable. The code is mainly taken from FreeBSD. At least, this change made my own Yukon EX machine (HP ProBook 4501s) much stable than before. To generate a diff of this commit: cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/pci/if_skreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:07:37 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_msk.c if_skreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #450):
sys/dev/pci/if_msk.c: revision 1.94
sys/dev/pci/if_skreg.h: revision 1.27
Make Yukon EX, FE+, SUPR stable. The code is mainly taken from FreeBSD.
At least, this change made my own Yukon EX machine (HP ProBook 4501s) much
stable than before.
To generate a diff of this commit:
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/pci/if_skreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.91.2.1 src/sys/dev/pci/if_msk.c:1.91.2.2
--- src/sys/dev/pci/if_msk.c:1.91.2.1 Thu Oct 24 16:19:23 2019
+++ src/sys/dev/pci/if_msk.c Tue Nov 19 13:07:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $ */
+/* $NetBSD: if_msk.c,v 1.91.2.2 2019/11/19 13:07:37 martin Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91.2.2 2019/11/19 13:07:37 martin Exp $");
#include
#include
@@ -887,10 +887,27 @@ void
mskc_reset(struct sk_softc *sc)
{
uint32_t imtimer_ticks, reg1;
+ uint16_t status;
int reg;
DPRINTFN(2, ("mskc_reset\n"));
+ /* Disable ASF */
+ if ((sc->sk_type == SK_YUKON_EX) || (sc->sk_type == SK_YUKON_SUPR)) {
+ CSR_WRITE_4(sc, SK_Y2_CPU_WDOG, 0);
+ status = CSR_READ_2(sc, SK_Y2_ASF_HCU_CCSR);
+ /* Clear AHB bridge & microcontroller reset. */
+ status &= ~(SK_Y2_ASF_HCU_CSSR_ARB_RST |
+ SK_Y2_ASF_HCU_CSSR_CPU_RST_MODE);
+ /* Clear ASF microcontroller state. */
+ status &= ~SK_Y2_ASF_HCU_CSSR_UC_STATE_MSK;
+ status &= ~SK_Y2_ASF_HCU_CSSR_CPU_CLK_DIVIDE_MSK;
+ CSR_WRITE_2(sc, SK_Y2_ASF_HCU_CCSR, status);
+ CSR_WRITE_4(sc, SK_Y2_CPU_WDOG, 0);
+ } else
+ CSR_WRITE_1(sc, SK_Y2_ASF_CSR, SK_Y2_ASF_RESET);
+ CSR_WRITE_2(sc, SK_CSR, SK_CSR_ASF_OFF);
+
CSR_WRITE_1(sc, SK_CSR, SK_CSR_SW_RESET);
CSR_WRITE_1(sc, SK_CSR, SK_CSR_MASTER_RESET);
@@ -963,10 +980,6 @@ mskc_reset(struct sk_softc *sc)
DPRINTFN(2, ("mskc_reset: sk_link_ctrl=%x\n",
CSR_READ_2(sc, SK_LINK_CTRL)));
- /* Disable ASF */
- CSR_WRITE_1(sc, SK_Y2_ASF_CSR, SK_Y2_ASF_RESET);
- CSR_WRITE_2(sc, SK_CSR, SK_CSR_ASF_OFF);
-
/* Clear I2C IRQ noise */
CSR_WRITE_4(sc, SK_I2CHWIRQ, 1);
@@ -1102,9 +1115,9 @@ msk_reset(struct sk_if_softc *sc_if)
{
/* GMAC and GPHY Reset */
SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_RESET_SET);
- SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET);
+ SK_IF_WRITE_1(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET);
DELAY(1000);
- SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_CLEAR);
+ SK_IF_WRITE_1(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_CLEAR);
SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_LOOP_OFF |
SK_GMAC_PAUSE_ON | SK_GMAC_RESET_CLEAR);
}
@@ -2410,17 +2423,31 @@ msk_init_yukon(struct sk_if_softc *sc_if
/* Configure RX MAC FIFO */
SK_IF_WRITE_1(sc_if, 0, SK_RXMF1_CTRL_TEST, SK_RFCTL_RESET_CLEAR);
- SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_CTRL_TEST, SK_RFCTL_OPERATION_ON |
- SK_RFCTL_FIFO_FLUSH_ON);
-
- /* Increase flush threshold to 64 bytes */
- SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_FLUSH_THRESHOLD,
- SK_RFCTL_FIFO_THRESHOLD + 1);
+ v = SK_RFCTL_OPERATION_ON | SK_RFCTL_FIFO_FLUSH_ON;
+ if ((sc->sk_type == SK_YUKON_EX) || (sc->sk_type == SK_YUKON_FE_P))
+ v |= SK_RFCTL_RX_OVER_ON;
+ SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_CTRL_TEST, v);
+
+ if ((sc->sk_type == SK_YUKON_FE_P) &&
+ (sc->sk_rev == SK_YUKON_FE_P_REV_A0))
+ v = 0x178; /* Magic value */
+ else {
+ /* Increase flush threshold to 64 bytes */
+ v = SK_RFCTL_FIFO_THRESHOLD + 1;
+ }
+ SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_FLUSH_THRESHOLD, v);
/* Configure TX MAC FIFO */
SK_IF_WRITE_1(sc_if, 0, SK_TXMF1_CTRL_TEST, SK_TFCTL_RESET_CLEAR);
SK_IF_WRITE_2(sc_if, 0, SK_TXMF1_CTRL_TEST, SK_TFCTL_OPERATION_ON);
+ if ((sc->sk_type == SK_YUKON_FE_P) &&
+ (sc->sk_rev == SK_YUKON_FE_P_REV_A0)) {
+ v = SK_IF_READ_2(sc_if, 0, SK_TXMF1_END);
+ v &= ~SK_TXEND_WM_ON;
+ SK_IF_WRITE_2(sc_if, 0, SK_TXMF1_END, v);
+ }
+
#if 1
SK_YU_WRITE_2(sc_if, YUKON_GPCR, YU_GPCR_TXEN | YU_GPCR_RXEN);
#endif
@@ -2457,7 +2484,7 @@ msk_init(struct ifnet *ifp)
/* Configure transmit arbiter(s) */
SK_IF_WRITE_1(sc_if, 0, SK_TXAR1_COUNTERCTL, SK_TXARCTL_ON);
#if 0
- SK_TXARCTL_ON | SK_TXARCTL_FSYNC_ON);
+/* SK_TXARCTL_ON | SK_TXARCTL_FSYNC_ON); */
#endif
if (sc->sk_ramsize) {
@@ -2565,6 +2592,13 @@ msk_init(struct ifnet *ifp)
SK_IF_WRITE_2(sc_if, 0, SK_RXQ1_Y2_PREF_PUTIDX,
sc_if->sk_cdata.sk_rx_prod);
+
+ if ((sc->sk
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Nov 25 16:47:16 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_vge.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #477): sys/dev/pci/if_vge.c: revision 1.76 sys/dev/pci/if_vge.c: revision 1.77 Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout. If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO), control VGE_DIAGCTL_GMII bit. - Set duplex correctly when user setting is not IFM_AUTO. - When the link is up, set VGE_DIAGCTL not from user media setting but from the current active link status. To generate a diff of this commit: cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/pci/if_vge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:47:16 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_vge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #477):
sys/dev/pci/if_vge.c: revision 1.76
sys/dev/pci/if_vge.c: revision 1.77
Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout.
If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO),
control VGE_DIAGCTL_GMII bit.
- Set duplex correctly when user setting is not IFM_AUTO.
- When the link is up, set VGE_DIAGCTL not from user media setting but from
the current active link status.
To generate a diff of this commit:
cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/pci/if_vge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.73.2.1 src/sys/dev/pci/if_vge.c:1.73.2.2
--- src/sys/dev/pci/if_vge.c:1.73.2.1 Thu Oct 17 18:58:33 2019
+++ src/sys/dev/pci/if_vge.c Mon Nov 25 16:47:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $ */
+/* $NetBSD: if_vge.c,v 1.73.2.2 2019/11/25 16:47:16 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73.2.2 2019/11/25 16:47:16 martin Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -1916,6 +1916,7 @@ vge_miibus_statchg(struct ifnet *ifp)
struct vge_softc *sc = ifp->if_softc;
struct mii_data *mii = &sc->sc_mii;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ uint8_t dctl;
/*
* If the user manually selects a media mode, we need to turn
@@ -1927,31 +1928,37 @@ vge_miibus_statchg(struct ifnet *ifp)
* always implied, so we turn on the forced mode bit but leave
* the FDX bit cleared.
*/
+ dctl = CSR_READ_1(sc, VGE_DIAGCTL);
- switch (IFM_SUBTYPE(ife->ifm_media)) {
- case IFM_AUTO:
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- break;
- case IFM_1000_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- break;
- case IFM_100_TX:
- case IFM_10_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- if ((ife->ifm_media & IFM_FDX) != 0) {
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- } else {
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- }
- break;
- default:
- printf("%s: unknown media type: %x\n",
- device_xname(sc->sc_dev),
- IFM_SUBTYPE(ife->ifm_media));
- break;
+ if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) {
+ dctl &= ~VGE_DIAGCTL_MACFORCE;
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
+ } else {
+ u_int ifmword;
+
+ /* If the link is up, use the current active media. */
+ if ((mii->mii_media_status & IFM_ACTIVE) != 0)
+ ifmword = mii->mii_media_active;
+ else
+ ifmword = ife->ifm_media;
+
+ dctl |= VGE_DIAGCTL_MACFORCE;
+ if ((ifmword & IFM_FDX) != 0)
+ dctl |= VGE_DIAGCTL_FDXFORCE;
+ else
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
+
+ if (IFM_SUBTYPE(ifmword) == IFM_1000_T) {
+ /*
+ * It means the user setting is not auto but it's
+ * 1000baseT-FDX or 1000baseT.
+ */
+ dctl |= VGE_DIAGCTL_GMII;
+ } else
+ dctl &= ~VGE_DIAGCTL_GMII;
}
+
+ CSR_WRITE_1(sc, VGE_DIAGCTL, dctl);
}
static int
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:18:40 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_age.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #482):
sys/dev/pci/if_age.c: revision 1.63
Fix multicast handling. All Atheros controllers use big-endian form
when computing multicast hash. Same as OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.60.2.2 -r1.60.2.3 src/sys/dev/pci/if_age.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60.2.2 src/sys/dev/pci/if_age.c:1.60.2.3
--- src/sys/dev/pci/if_age.c:1.60.2.2 Wed Nov 6 09:59:39 2019
+++ src/sys/dev/pci/if_age.c Tue Nov 26 08:18:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin Exp $ */
+/* $NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $");
#include "vlan.h"
@@ -2289,7 +2289,7 @@ age_rxfilter(struct age_softc *sc)
ETHER_LOCK(ec);
ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
- crc = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
ETHER_NEXT_MULTI(step, enm);
}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 08:18:40 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_age.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #482): sys/dev/pci/if_age.c: revision 1.63 Fix multicast handling. All Atheros controllers use big-endian form when computing multicast hash. Same as OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.60.2.2 -r1.60.2.3 src/sys/dev/pci/if_age.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:20:47 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_age.c if_alc.c if_ale.c if_cas.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #483):
sys/dev/pci/if_cas.c: revision 1.36
sys/dev/pci/if_alc.c: revision 1.44
sys/dev/pci/if_ale.c: revision 1.35
sys/dev/pci/if_ale.c: revision 1.36
sys/dev/pci/if_age.c: revision 1.64
Fix a bug that IFF_ALLMULTI is almost always set.
OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt.
Remove accidentally committed debug code. Sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.60.2.3 -r1.60.2.4 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/pci/if_cas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60.2.3 src/sys/dev/pci/if_age.c:1.60.2.4
--- src/sys/dev/pci/if_age.c:1.60.2.3 Tue Nov 26 08:18:40 2019
+++ src/sys/dev/pci/if_age.c Tue Nov 26 08:20:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $ */
+/* $NetBSD: if_age.c,v 1.60.2.4 2019/11/26 08:20:47 martin Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.4 2019/11/26 08:20:47 martin Exp $");
#include "vlan.h"
@@ -2275,27 +2275,37 @@ age_rxfilter(struct age_softc *sc)
*/
rxcfg |= MAC_CFG_BCAST;
- if (ifp->if_flags & IFF_PROMISC || ec->ec_multicnt > 0) {
- ifp->if_flags |= IFF_ALLMULTI;
- if (ifp->if_flags & IFF_PROMISC)
+ /* Program new filter. */
+ if ((ifp->if_flags & IFF_PROMISC) != 0)
+ goto update;
+
+ memset(mchash, 0, sizeof(mchash));
+
+ ETHER_LOCK(ec);
+ ETHER_FIRST_MULTI(step, ec, enm);
+ while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ ETHER_UNLOCK(ec);
+ goto update;
+ }
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
+ mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+ ETHER_NEXT_MULTI(step, enm);
+ }
+ ETHER_UNLOCK(ec);
+
+update:
+ if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if (ifp->if_flags & IFF_PROMISC) {
rxcfg |= MAC_CFG_PROMISC;
- else
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ } else
rxcfg |= MAC_CFG_ALLMULTI;
mchash[0] = mchash[1] = 0x;
- } else {
- /* Program new filter. */
- memset(mchash, 0, sizeof(mchash));
-
- ETHER_LOCK(ec);
- ETHER_FIRST_MULTI(step, ec, enm);
- while (enm != NULL) {
- crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
- mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
- ETHER_NEXT_MULTI(step, enm);
- }
- ETHER_UNLOCK(ec);
}
-
CSR_WRITE_4(sc, AGE_MAR0, mchash[0]);
CSR_WRITE_4(sc, AGE_MAR1, mchash[1]);
CSR_WRITE_4(sc, AGE_MAC_CFG, rxcfg);
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.38.2.2 src/sys/dev/pci/if_alc.c:1.38.2.3
--- src/sys/dev/pci/if_alc.c:1.38.2.2 Wed Nov 6 09:59:38 2019
+++ src/sys/dev/pci/if_alc.c Tue Nov 26 08:20:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alc.c,v 1.38.2.2 2019/11/06 09:59:38 martin Exp $ */
+/* $NetBSD: if_alc.c,v 1.38.2.3 2019/11/26 08:20:47 martin Exp $ */
/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon
@@ -3443,27 +3443,37 @@ alc_iff(struct alc_softc *sc)
*/
rxcfg |= MAC_CFG_BCAST;
- if (ifp->if_flags & IFF_PROMISC || ec->ec_multicnt > 0) {
- ifp->if_flags |= IFF_ALLMULTI;
- if (ifp->if_flags & IFF_PROMISC)
+ /* Program new filter. */
+ if ((ifp->if_flags & IFF_PROMISC) != 0)
+ goto update;
+
+ memset(mchash, 0, sizeof(mchash));
+
+ ETHER_LOCK(ec);
+ ETHER_FIRST_MULTI(step, ec, enm);
+ while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ ETHER_UNLOCK(ec);
+ goto update;
+ }
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
+ mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+ ETHER_NEXT_MULTI(step, enm);
+ }
+ ETHER_UNLOCK(ec);
+
+update:
+ if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if (ifp->if_flags & IFF_PROMISC) {
rxcfg |= MAC_CFG_PROMISC;
- else
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ } else
rxcfg |= MAC_CFG_ALLMULTI;
mchash[0] = mchash[1] = 0x;
- } else {
- /* Program new filter. */
- memset(mchash, 0, sizeof(mchash));
-
- ETHER_
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 08:20:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_age.c if_alc.c if_ale.c if_cas.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #483): sys/dev/pci/if_cas.c: revision 1.36 sys/dev/pci/if_alc.c: revision 1.44 sys/dev/pci/if_ale.c: revision 1.35 sys/dev/pci/if_ale.c: revision 1.36 sys/dev/pci/if_age.c: revision 1.64 Fix a bug that IFF_ALLMULTI is almost always set. OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt. Remove accidentally committed debug code. Sorry. To generate a diff of this commit: cvs rdiff -u -r1.60.2.3 -r1.60.2.4 src/sys/dev/pci/if_age.c cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/sys/dev/pci/if_ale.c cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/pci/if_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 18:30:57 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #486): sys/dev/pci/if_mcx.c: revision 1.7 Fix IFF_ALLMULTI handling. To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 18:30:57 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_mcx.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #486):
sys/dev/pci/if_mcx.c: revision 1.7
Fix IFF_ALLMULTI handling.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/pci/if_mcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1.2.5 src/sys/dev/pci/if_mcx.c:1.1.2.6
--- src/sys/dev/pci/if_mcx.c:1.1.2.5 Mon Nov 18 19:46:33 2019
+++ src/sys/dev/pci/if_mcx.c Tue Nov 26 18:30:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.1.2.5 2019/11/18 19:46:33 martin Exp $ */
+/* $NetBSD: if_mcx.c,v 1.1.2.6 2019/11/26 18:30:57 martin Exp $ */
/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
/*
@@ -6205,8 +6205,11 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
{
struct mcx_softc *sc = (struct mcx_softc *)ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
+ struct ethercom *ec = &sc->sc_ec;
uint8_t addrhi[ETHER_ADDR_LEN], addrlo[ETHER_ADDR_LEN];
- int s, i, error = 0;
+ struct ether_multi *enm;
+ struct ether_multistep step;
+ int s, i, flags, error = 0;
s = splnet();
switch (cmd) {
@@ -6214,8 +6217,10 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
case SIOCADDMULTI:
if (ether_addmulti(ifreq_getaddr(cmd, ifr), &sc->sc_ec) == ENETRESET) {
error = ether_multiaddr(&ifr->ifr_addr, addrlo, addrhi);
- if (error != 0)
+ if (error != 0) {
+splx(s);
return (error);
+ }
for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
if (sc->sc_mcast_flows[i][0] == 0) {
@@ -6238,7 +6243,7 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
error = ENETRESET;
}
-if (sc->sc_ec.ec_multicnt > 0) {
+if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN)) {
SET(ifp->if_flags, IFF_ALLMULTI);
error = ENETRESET;
}
@@ -6249,8 +6254,10 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
case SIOCDELMULTI:
if (ether_delmulti(ifreq_getaddr(cmd, ifr), &sc->sc_ec) == ENETRESET) {
error = ether_multiaddr(&ifr->ifr_addr, addrlo, addrhi);
- if (error != 0)
+ if (error != 0) {
+splx(s);
return (error);
+ }
for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
if (memcmp(sc->sc_mcast_flows[i], addrlo,
@@ -6269,10 +6276,23 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
sc->sc_extra_mcast--;
if (ISSET(ifp->if_flags, IFF_ALLMULTI) &&
- (sc->sc_extra_mcast == 0) &&
- (sc->sc_ec.ec_multicnt == 0)) {
-CLR(ifp->if_flags, IFF_ALLMULTI);
-error = ENETRESET;
+ sc->sc_extra_mcast == 0) {
+flags = 0;
+ETHER_LOCK(ec);
+ETHER_FIRST_MULTI(step, ec, enm);
+while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo,
+ enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ SET(flags, IFF_ALLMULTI);
+ break;
+ }
+ ETHER_NEXT_MULTI(step, enm);
+}
+ETHER_UNLOCK(ec);
+if (!ISSET(flags, IFF_ALLMULTI)) {
+ CLR(ifp->if_flags, IFF_ALLMULTI);
+ error = ENETRESET;
+}
}
}
break;
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:08:24 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_bge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #487):
sys/dev/pci/if_bge.c: revision 1.340
sys/dev/pci/if_bge.c: revision 1.341
sys/dev/pci/if_bge.c: revision 1.342
sys/dev/pci/if_bge.c: revision 1.336
- Avoid undefined behavior in bge_setmulti(). found by kUBSan.
- Avoid undefined behavior when setting the MAC address in bge_init().
found by kUBSan.
Fix a bug that SK-9D41 can't detect fiber media. Check the subsystem ID
correctly. This bug was added in if_bge.c rev. 1.161.
- Use *_FLUSH() more. The main purpose is to wait following delay() correctly.
- Add missing DELAY(80) after writing BGE_MI_MODE register.
Modify PHY initialization code. This change fix a bug that SK-9D21 doesn't
detect MII PHY.
- Add error check to bge_miibus_writereg().
- Change return value of bge_miibus_readreg() when a read error occurred.
It also add error message using with aprint_debug_dev(). This error occurs
on some devices while detecting MII devices.
- Move the location of BGE_MI_MODE register's initialization to next to
bge_chipinit().
- Set BGE_MAC_MODE before calling ifmedia_init() and/or mii_attach().
- Add retry code for mii_attach() failed. Same as FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.335.2.1 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.335 src/sys/dev/pci/if_bge.c:1.335.2.1
--- src/sys/dev/pci/if_bge.c:1.335 Tue Jul 9 08:46:58 2019
+++ src/sys/dev/pci/if_bge.c Wed Nov 27 11:08:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $");
#include
#include
@@ -1027,10 +1027,10 @@ bge_eeprom_getbyte(struct bge_softc *sc,
* Enable use of auto EEPROM access so we can avoid
* having to use the bitbang method.
*/
- BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
+ BGE_SETBIT_FLUSH(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
/* Reset the EEPROM, load the clock period. */
- CSR_WRITE_4(sc, BGE_EE_ADDR,
+ CSR_WRITE_4_FLUSH(sc, BGE_EE_ADDR,
BGE_EEADDR_RESET | BGE_EEHALFCLK(BGE_HALFCLK_384SCL));
DELAY(20);
@@ -1113,9 +1113,11 @@ bge_miibus_readreg(device_t dev, int phy
if (i == BGE_TIMEOUT) {
aprint_error_dev(sc->bge_dev, "PHY read timed out\n");
rv = ETIMEDOUT;
- } else if ((data & BGE_MICOMM_READFAIL) != 0)
- rv = -1;
- else
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ /* XXX This error occurs on some devices while attaching. */
+ aprint_debug_dev(sc->bge_dev, "PHY read I/O error\n");
+ rv = EIO;
+ } else
*val = data & BGE_MICOMM_DATA;
if (autopoll & BGE_MIMODE_AUTOPOLL) {
@@ -1133,7 +1135,8 @@ static int
bge_miibus_writereg(device_t dev, int phy, int reg, uint16_t val)
{
struct bge_softc *sc = device_private(dev);
- uint32_t autopoll;
+ uint32_t data, autopoll;
+ int rv = 0;
int i;
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906 &&
@@ -1156,13 +1159,22 @@ bge_miibus_writereg(device_t dev, int ph
for (i = 0; i < BGE_TIMEOUT; i++) {
delay(10);
- if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY)) {
+ data = CSR_READ_4(sc, BGE_MI_COMM);
+ if (!(data & BGE_MICOMM_BUSY)) {
delay(5);
- CSR_READ_4(sc, BGE_MI_COMM);
+ data = CSR_READ_4(sc, BGE_MI_COMM);
break;
}
}
+ if (i == BGE_TIMEOUT) {
+ aprint_error_dev(sc->bge_dev, "PHY write timed out\n");
+ rv = ETIMEDOUT;
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ aprint_error_dev(sc->bge_dev, "PHY write I/O error\n");
+ rv = EIO;
+ }
+
if (autopoll & BGE_MIMODE_AUTOPOLL) {
BGE_STS_SETBIT(sc, BGE_STS_AUTOPOLL);
BGE_SETBIT_FLUSH(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL);
@@ -1176,7 +1188,7 @@ bge_miibus_writereg(device_t dev, int ph
return ETIMEDOUT;
}
- return 0;
+ return rv;
}
static void
@@ -1827,7 +1839,7 @@ bge_setmulti(struct bge_softc *sc)
/* Just want the 7 least-significant bits. */
h &= 0x7f;
- hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F);
+ hashes[(h & 0x60) >> 5] |= 1U << (h & 0x1F);
ETHER_NEXT_MULTI(step, enm);
}
ETHER_UNLOCK(ec);
@@ -2286,7 +2298,7 @@ bge_chipinit(struct bge_softc *sc)
#endif
/* Set the timer prescaler (always 66MHz) */
- CSR_WRITE_4(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
+ CSR_WRITE_4_FLUSH(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906) {
DELAY(40); /* XXX */
@@
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 27 11:08:24 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_bge.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #487): sys/dev/pci/if_bge.c: revision 1.340 sys/dev/pci/if_bge.c: revision 1.341 sys/dev/pci/if_bge.c: revision 1.342 sys/dev/pci/if_bge.c: revision 1.336 - Avoid undefined behavior in bge_setmulti(). found by kUBSan. - Avoid undefined behavior when setting the MAC address in bge_init(). found by kUBSan. Fix a bug that SK-9D41 can't detect fiber media. Check the subsystem ID correctly. This bug was added in if_bge.c rev. 1.161. - Use *_FLUSH() more. The main purpose is to wait following delay() correctly. - Add missing DELAY(80) after writing BGE_MI_MODE register. Modify PHY initialization code. This change fix a bug that SK-9D21 doesn't detect MII PHY. - Add error check to bge_miibus_writereg(). - Change return value of bge_miibus_readreg() when a read error occurred. It also add error message using with aprint_debug_dev(). This error occurs on some devices while detecting MII devices. - Move the location of BGE_MI_MODE register's initialization to next to bge_chipinit(). - Set BGE_MAC_MODE before calling ifmedia_init() and/or mii_attach(). - Add retry code for mii_attach() failed. Same as FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.335 -r1.335.2.1 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 14:04:38 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: esm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #493):
sys/dev/pci/esm.c: revision 1.64
add missing break.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/esm.c
diff -u src/sys/dev/pci/esm.c:1.63 src/sys/dev/pci/esm.c:1.63.2.1
--- src/sys/dev/pci/esm.c:1.63 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/esm.c Wed Nov 27 14:04:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $");
#include
#include
@@ -1482,6 +1482,7 @@ esm_match(device_t dev, cfdata_t match,
case PCI_PRODUCT_ESSTECH_MAESTRO2E:
return 1;
}
+ break;
case PCI_VENDOR_ESSTECH2:
switch (PCI_PRODUCT(pa->pa_id)) {
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 27 14:04:38 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: esm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #493): sys/dev/pci/esm.c: revision 1.64 add missing break. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jan 18 19:26:30 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs sdhc_pci.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1566): sys/dev/pci/sdhc_pci.c: revision 1.20 sys/dev/pci/pcidevs: revision 1.1469 sys/dev/pci/pcidevs: revision 1.1470 sys/dev/pci/pcidevs: revision 1.1471 sys/dev/pci/pcidevs: revision 1.1472 sys/dev/pci/pcidevs: revision 1.1473 sys/dev/pci/pcidevs: revision 1.1474 sys/dev/pci/pcidevs: revision 1.1475 sys/dev/pci/pcidevs: revision 1.1476 Add some AMD 17h/9xh devices from OpenBSD. Add AMD F17/Axh devices. Add some Xeon Scalable devices from OpenBSD. Update Intel Elkhart Lake devices. Add Elkhart Lake Shared SRAM. Fix typo. s/SSC/SCC/. Fix typo. No functional change. add Aquantia (Marvell) AQC113 ethernet devices and the variants Add AMD Family 19h/1xh devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.13 -r1.1383.2.14 src/sys/dev/pci/pcidevs cvs rdiff -u -r1.14.16.1 -r1.14.16.2 src/sys/dev/pci/sdhc_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jan 18 19:26:30 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs sdhc_pci.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1566): sys/dev/pci/sdhc_pci.c: revision 1.20 sys/dev/pci/pcidevs: revision 1.1469 sys/dev/pci/pcidevs: revision 1.1470 sys/dev/pci/pcidevs: revision 1.1471 sys/dev/pci/pcidevs: revision 1.1472 sys/dev/pci/pcidevs: revision 1.1473 sys/dev/pci/pcidevs: revision 1.1474 sys/dev/pci/pcidevs: revision 1.1475 sys/dev/pci/pcidevs: revision 1.1476 Add some AMD 17h/9xh devices from OpenBSD. Add AMD F17/Axh devices. Add some Xeon Scalable devices from OpenBSD. Update Intel Elkhart Lake devices. Add Elkhart Lake Shared SRAM. Fix typo. s/SSC/SCC/. Fix typo. No functional change. add Aquantia (Marvell) AQC113 ethernet devices and the variants Add AMD Family 19h/1xh devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.13 -r1.1383.2.14 src/sys/dev/pci/pcidevs cvs rdiff -u -r1.14.16.1 -r1.14.16.2 src/sys/dev/pci/sdhc_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.13 src/sys/dev/pci/pcidevs:1.1383.2.14 --- src/sys/dev/pci/pcidevs:1.1383.2.13 Tue Oct 11 17:49:35 2022 +++ src/sys/dev/pci/pcidevs Wed Jan 18 19:26:30 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.13 2022/10/11 17:49:35 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1028,6 +1028,7 @@ product AMD F17_IOMMU 0x1451 Family17h product AMD F17_PCIE_1 0x1452 Family17h PCIe product AMD F17_PCIE_2 0x1453 Family17h PCIe product AMD F17_PCIE_3 0x1454 Family17h PCIe +product AMD F17_AX_PCIE_DUMMY 0x1455 17h/Axh PCIe Dummy Function product AMD F17_CCP_1 0x1456 Family17h Crypto product AMD F17_HDA 0x1457 Family17h HD Audio product AMD F17_PCIE_DUMMY 0x145a Family17h PCIe Dummy Function @@ -1053,7 +1054,43 @@ product AMD F17_7X_RESV_SPP 0x1485 Famil product AMD F17_7X_CCP 0x1486 Family17h/7xh Crypto product AMD F17_3X_HDA 0x1487 17h/7xh HD Audio product AMD F17_7X_USB3 0x149c Family17h/7xh USB 3.0 Host Controller +product AMD F19_1X_IOMMU 0x149e 19h/7xh IOMMU +product AMD F19_1X_PCIE_DUMMY_HB 0x149f 19h/7xh PCIe Dummy Host Bridge +product AMD F19_1X_RC 0x14a4 19h/1xh Root Complex +product AMD F19_1X_GPPB_0 0x14a5 19h/1xh PCIe GPP Bridge +product AMD F19_1X_RCEC 0x14a6 19h/1xh RCEC +product AMD F19_1X_INTNL_GPPB 0x14a7 19h/1xh Internal PCIe GPP Bridge +product AMD F19_1X_GPPB_1 0x14aa 19h/1xh PCIe GPP Bridge +product AMD F19_1X_GPPB_2 0x14ab 19h/1xh PCIe GPP Bridge +product AMD F19_1X_PCIE_DUMMY_0 0x14ac 19h/1xh PCIe Dummy Function +product AMD F19_1X_DF_0 0x14ad 19h/1xh Data Fabric +product AMD F19_1X_DF_1 0x14ae 19h/1xh Data Fabric +product AMD F19_1X_DF_2 0x14af 19h/1xh Data Fabric +product AMD F19_1X_DF_3 0x14b0 19h/1xh Data Fabric +product AMD F19_1X_DF_4 0x14b1 19h/1xh Data Fabric +product AMD F19_1X_DF_5 0x14b2 19h/1xh Data Fabric +product AMD F19_1X_DF_6 0x14b3 19h/1xh Data Fabric +product AMD F19_1X_DF_7 0x14b4 19h/1xh Data Fabric +product AMD F17_AX_RC 0x14b5 17h/Axh Root Complex +product AMD F17_AX_IOMMU 0x14b6 17h/Axh IOMMU +product AMD F17_AX_PCIE_DUMMY_HB 0x14b7 17h/Axh PCIe Dummy Host Bridge +product AMD F17_AX_INTNL_GPPB_0 0x14b9 17h/Axh Internal GPP Bridge 0 +product AMD F17_AX_GPPB 0x14ba 17h/Axh PCIe GPP Bridge +product AMD F19_1X_NTB_0 0x14c0 19h/1xh Primary PCIe Non Transparent Bridge +product AMD F19_1X_VNTB 0x14c1 19h/1xh Secondary vNTB +product AMD F19_1X_PCIE_DUMMY_1 0x14c2 19h/1xh PCIe Dummy Function +product AMD F19_1X_NTB_1 0x14c3 19h/1xh PCIe Non Transparent Bridge +product AMD F19_1X_SWDS 0x14c4 19h/1xh Swith NBIF DS +product AMD F19_1X_NVME 0x14c5 19h/1xh NVMe +product AMD F19_1X_SWUS 0x14c6 19h/1xh Swith US in PCIe +product AMD F19_1X_PSP 0x14ca 19h/1xh PSP +product AMD F19_1X_ACP 0x14cb 19h/1xh ACP +product AMD F19_1X_HDA 0x14cc 19h/1xh HD Audio product AMD F19_6X_RC 0x14d8 19h/6xh Root Complex +product AMD F17_AX_XHCI_0 0x1503 17h/Axh USB 3.1 xHCI +product AMD F17_AX_XHCI_1 0x1504 17h/Axh USB 3.1 xHCI +product AMD F17_AX_USB_BIOM 0x1505 17h/Axh Secure USB BIOmetric +product AMD F17_AX_GFX 0x1506 17h/Axh Internal GPU product AMD F14_RC 0x1510 Family14h Root Complex product AMD F14_PCIE_1 0x1512 Family14h PCIe product AMD F14_PCIE_2 0x1513 Family14h PCIe @@ -1085,6 +1122,7 @@ product AMD F15_6X_HDA 0x157a 15h/6xh A product AMD F15_6X_HB 0x157b 15h/6xh Host Bridge product AMD F15_6X_RP 0x157c 15h/6xh Root Port product AMD F15_6X_HB_2 0x157d 15h/6xh Host Bridge +product AMD F19_1X_XHCI 0x157f 19h/1xh USB 3.2 product AMD F16_30_HT 0x1580 Family16h HyperTransport Configuration product AMD F16_30_ADDR 0x1581 Family16h
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jan 18 19:27:51 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1566 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.13 -r1.1371.2.14 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.13 -r1.1370.2.14 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jan 18 19:27:51 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1566 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.13 -r1.1371.2.14 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.13 -r1.1370.2.14 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 23 12:43:36 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: piixpm.c piixpmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1573: sys/dev/pci/piixpm.c1.66,1.68-1.72 via patch sys/dev/pci/piixpmreg.h 1.13 Add support new AMD chipsets that do not have indirect access I/O ports. To generate a diff of this commit: cvs rdiff -u -r1.54.2.2 -r1.54.2.3 src/sys/dev/pci/piixpm.c cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/dev/pci/piixpmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 23 12:43:36 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: piixpm.c piixpmreg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1573:
sys/dev/pci/piixpm.c1.66,1.68-1.72 via patch
sys/dev/pci/piixpmreg.h 1.13
Add support new AMD chipsets that do not have indirect access
I/O ports.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.2 -r1.54.2.3 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/dev/pci/piixpmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.54.2.2 src/sys/dev/pci/piixpm.c:1.54.2.3
--- src/sys/dev/pci/piixpm.c:1.54.2.2 Tue Nov 30 11:44:39 2021
+++ src/sys/dev/pci/piixpm.c Mon Jan 23 12:43:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.54.2.2 2021/11/30 11:44:39 martin Exp $ */
+/* $NetBSD: piixpm.c,v 1.54.2.3 2023/01/23 12:43:35 martin Exp $ */
/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.54.2.2 2021/11/30 11:44:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.54.2.3 2023/01/23 12:43:35 martin Exp $");
#include
#include
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1
#define PIIXPM_IS_CSB5(sc) \
(PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_SERVERWORKS && \
- PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_SERVERWORKS_CSB5)
+ PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_SERVERWORKS_CSB5)
#define PIIXPM_DELAY 200
#define PIIXPM_TIMEOUT 1
@@ -75,20 +75,20 @@ __KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1
struct piixpm_smbus {
int sda;
int sda_save;
- struct piixpm_softc *softc;
+ struct piixpm_softc *softc;
};
struct piixpm_softc {
device_t sc_dev;
bus_space_tag_t sc_iot;
-#define sc_pm_iot sc_iot
-#define sc_smb_iot sc_iot
+ bus_space_tag_t sc_sb800_bt;
bus_space_handle_t sc_pm_ioh;
- bus_space_handle_t sc_sb800_ioh;
+ bus_space_handle_t sc_sb800_bh;
bus_space_handle_t sc_smb_ioh;
void * sc_smb_ih;
int sc_poll;
+ bool sc_sb800_mmio; /* Use MMIO access */
bool sc_sb800_selen; /* Use SMBUS0SEL */
pci_chipset_tag_t sc_pc;
@@ -121,6 +121,7 @@ static void piixpm_chdet(device_t, devic
static bool piixpm_suspend(device_t, const pmf_qual_t *);
static bool piixpm_resume(device_t, const pmf_qual_t *);
+static uint8_t piixpm_sb800_pmread(struct piixpm_softc *, bus_size_t);
static int piixpm_sb800_init(struct piixpm_softc *);
static void piixpm_csb5_reset(void *);
static int piixpm_i2c_sb600_acquire_bus(void *, int);
@@ -217,7 +218,7 @@ piixpm_attach(device_t parent, device_t
/* Map I/O space */
base = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_PM_BASE);
- if (base == 0 || bus_space_map(sc->sc_pm_iot, PCI_MAPREG_IO_ADDR(base),
+ if (base == 0 || bus_space_map(sc->sc_iot, PCI_MAPREG_IO_ADDR(base),
PIIX_PM_SIZE, 0, &sc->sc_pm_ioh)) {
aprint_error_dev(self,
"can't map power management I/O space\n");
@@ -229,13 +230,22 @@ piixpm_attach(device_t parent, device_t
* PIIX4 and PIIX4E have a bug in the timer latch, see Errata #20
* in the "Specification update" (document #297738).
*/
- acpipmtimer_attach(self, sc->sc_pm_iot, sc->sc_pm_ioh, PIIX_PM_PMTMR,
+ acpipmtimer_attach(self, sc->sc_iot, sc->sc_pm_ioh, PIIX_PM_PMTMR,
(PCI_REVISION(pa->pa_class) < 3) ? ACPIPMT_BADLATCH : 0);
nopowermanagement:
/* SB800 rev 0x40+, AMD HUDSON and newer need special initialization */
if (PIIXPM_IS_FCHGRP(sc) || PIIXPM_IS_SB800GRP(sc)) {
+ /* Newer chips don't support I/O access */
+ if (PIIXPM_IS_KERNCZ(sc) && (sc->sc_rev >= 0x51)) {
+ sc->sc_sb800_mmio = true;
+ sc->sc_sb800_bt = pa->pa_memt;
+ } else {
+ sc->sc_sb800_mmio = false;
+ sc->sc_sb800_bt = pa->pa_iot;
+ }
+
if (piixpm_sb800_init(sc) == 0) {
/* Read configuration */
conf = bus_space_read_1(sc->sc_iot,
@@ -260,7 +270,7 @@ nopowermanagement:
/* Map I/O space */
base = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_BASE) & 0x;
if (base == 0 ||
- bus_space_map(sc->sc_smb_iot, PCI_MAPREG_IO_ADDR(base),
+ bus_space_map(sc->sc_iot, PCI_MAPREG_IO_ADDR(base),
PIIX_SMB_SIZE, 0, &sc->sc_smb_ioh)) {
aprint_error_dev(self, "can't map smbus I/O space\n");
return;
@@ -395,18 +405,37 @@ piixpm_resume(device_t dv, const pmf_qua
return true;
}
+static uint8_t
+piixpm_sb800_pmread(struct piixpm_softc *sc, bus_size_t offset)
+{
+ bus_space_tag_t sbt = sc->sc_sb800_bt;
+ bus_space_handle_t sbh = sc->sc_sb800_bh;
+ uint8_t val;
+
+ if (sc->sc_sb800_mmio)
+ val = bus_space_read_1(sbt, sbh, offset);
+ else {
+ bus_space_write_1(sbt, sbh, SB800_INDIRECTIO_INDEX, offset);
+ val = bus_space_read_1(sbt, sbh, SB800_INDIRECTIO_DATA);
+ }
+
+ return val;
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 23 13:59:04 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1578:
sys/dev/pci/if_wm.c 1.764-1.767 via patch
sys/dev/pci/if_wmreg.h 1.128
- Workaround for some hypervisor environments. The environments
cannot stop e1000 interrupt immediately.
- Rename nq_txdesc' member "nqrx_ctx" to "nqtx_ctx". No functional
change.
- Add comment. Modify comment.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.14 -r1.645.2.15 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.6 -r1.115.2.7 src/sys/dev/pci/if_wmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.14 src/sys/dev/pci/if_wm.c:1.645.2.15
--- src/sys/dev/pci/if_wm.c:1.645.2.14 Wed Sep 7 10:05:42 2022
+++ src/sys/dev/pci/if_wm.c Mon Jan 23 13:59:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.14 2022/09/07 10:05:42 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.15 2023/01/23 13:59:04 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.14 2022/09/07 10:05:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.15 2023/01/23 13:59:04 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -490,6 +490,7 @@ struct wm_queue {
char sysctlname[32]; /* Name for sysctl */
bool wmq_txrx_use_workqueue;
+ bool wmq_wq_enqueued;
struct work wmq_cookie;
void *wmq_si;
krndsource_t rnd_source; /* random source */
@@ -2289,7 +2290,7 @@ alloc_retry:
aprint_error_dev(sc->sc_dev,
"unable to find PCIX capability\n");
else if (sc->sc_type != WM_T_82545_3 &&
- sc->sc_type != WM_T_82546_3) {
+ sc->sc_type != WM_T_82546_3) {
/*
* Work around a problem caused by the BIOS
* setting the max memory read byte count
@@ -3673,7 +3674,7 @@ wm_watchdog_txq_locked(struct ifnet *ifp
ifp->if_oerrors++;
#ifdef WM_DEBUG
for (i = txq->txq_sdirty; i != txq->txq_snext;
- i = WM_NEXTTXS(txq, i)) {
+ i = WM_NEXTTXS(txq, i)) {
txs = &txq->txq_soft[i];
printf("txs %d tx %d -> %d\n",
i, txs->txs_firstdesc, txs->txs_lastdesc);
@@ -3834,9 +3835,9 @@ wm_tick(void *arg)
crcerrs + algnerrc + symerrc + rxerrc + sec + cexterr + rlec;
/*
- * WMREG_RNBC is incremented when there are no available buffers in host
- * memory. It does not mean the number of dropped packets, because an
- * Ethernet controller can receive packets in such case if there is
+ * WMREG_RNBC is incremented when there are no available buffers in
+ * host memory. It does not mean the number of dropped packets, because
+ * an Ethernet controller can receive packets in such case if there is
* space in the phy's FIFO.
*
* If you want to know the nubmer of WMREG_RMBC, you should use such as
@@ -4153,7 +4154,7 @@ wm_read_mac_addr(struct wm_softc *sc, ui
return 0;
- bad:
+bad:
return -1;
}
@@ -4442,10 +4443,10 @@ wm_set_filter(struct wm_softc *sc)
goto setit;
- allmulti:
+allmulti:
sc->sc_rctl |= RCTL_MPE;
- setit:
+setit:
if (sc->sc_type >= WM_T_PCH2) {
if (((ec->ec_capabilities & ETHERCAP_JUMBO_MTU) != 0)
&& (ifp->if_mtu > ETHERMTU))
@@ -4836,7 +4837,8 @@ wm_init_lcd_from_nvm(struct wm_softc *sc
* LCD Write Enable bits are set in the NVM. When both NVM bits
* are cleared, SW will configure them instead.
*/
- DPRINTF(sc, WM_DEBUG_INIT, ("%s: %s: Configure SMBus and LED\n",
+ DPRINTF(sc, WM_DEBUG_INIT,
+ ("%s: %s: Configure SMBus and LED\n",
device_xname(sc->sc_dev), __func__));
if ((rv = wm_write_smbus_addr(sc)) != 0)
goto release;
@@ -5147,15 +5149,15 @@ wm_initialize_hardware_bits(struct wm_so
CSR_WRITE(sc, WMREG_TARC0, tarc0);
switch (sc->sc_type) {
- /*
- * 8257[12] Errata No.52, 82573 Errata No.43 and some others.
- * Avoid RSS Hash Value bug.
- */
case WM_T_82571:
case WM_T_82572:
case WM_T_82573:
case WM_T_80003:
case WM_T_ICH8:
+ /*
+ * 8257[12] Errata No.52, 82573 Errata No.43 and some
+ * others to avoid RSS Hash Value bug.
+ */
reg = CSR_READ(sc, WMREG_RFCTL);
reg |= WMREG_RFCTL_NEWIPV6EXDIS |WMREG_RFCTL_IPV6EXDIS;
CSR_WRITE(sc, WMREG_RFCTL, reg);
@@ -5560,6 +5562,11 @@ wm_reset(struct wm_softc *sc)
CSR_WRITE(sc, WMREG_CTRL, reg);
/* Don't insert a completion barrier when reset */
delay(20*1000);
+ /*
+ * The EXTCNFCTR_MDIO_SW_OWNERSHIP bit is cleared by the reset,
+ * so don't use sc->phy.release(sc). Release sc_ich_phymtx
+ * only. See also wm_get_swflag_ich8lan().
+ */
mutex_exit(sc->sc_ich_phymtx);
break;
case WM_T_82580:
@@ -6
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 23 13:59:04 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1578: sys/dev/pci/if_wm.c 1.764-1.767 via patch sys/dev/pci/if_wmreg.h 1.128 - Workaround for some hypervisor environments. The environments cannot stop e1000 interrupt immediately. - Rename nq_txdesc' member "nqrx_ctx" to "nqtx_ctx". No functional change. - Add comment. Modify comment. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.645.2.14 -r1.645.2.15 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.115.2.6 -r1.115.2.7 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 23 14:04:42 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: files.pci src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe_82598.c ixgbe_api.c ixgbe_common.c ixgbe_netbsd.h ixv.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1579: sys/dev/pci/files.pci 1.442 sys/dev/pci/ixgbe/ix_txrx.c 1.99-1.100 sys/dev/pci/ixgbe/ixgbe.c 1.320-1.324 via patch sys/dev/pci/ixgbe/ixgbe_82598.c 1.19 sys/dev/pci/ixgbe/ixgbe_api.c 1.28 sys/dev/pci/ixgbe/ixgbe_common.c1.43 sys/dev/pci/ixgbe/ixgbe_netbsd.h1.17 sys/dev/pci/ixgbe/ixv.c 1.183 - Add an option for Tx to use deferred softint regardless of whether can get txq lock or not. It's off by default. - Call txeof first, then rxeof for the consistency. - Make three "Unsupported SFP+ module..." messages the same. - KNF. Modify comment. Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.413.2.5 -r1.413.2.6 src/sys/dev/pci/files.pci cvs rdiff -u -r1.54.2.10 -r1.54.2.11 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.199.2.24 -r1.199.2.25 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.12.8.5 -r1.12.8.6 src/sys/dev/pci/ixgbe/ixgbe_82598.c cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/sys/dev/pci/ixgbe/ixgbe_api.c cvs rdiff -u -r1.25.2.5 -r1.25.2.6 src/sys/dev/pci/ixgbe/ixgbe_common.c cvs rdiff -u -r1.11.4.3 -r1.11.4.4 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h cvs rdiff -u -r1.125.2.20 -r1.125.2.21 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 23 14:04:42 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: files.pci
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe_82598.c
ixgbe_api.c ixgbe_common.c ixgbe_netbsd.h ixv.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1579:
sys/dev/pci/files.pci 1.442
sys/dev/pci/ixgbe/ix_txrx.c 1.99-1.100
sys/dev/pci/ixgbe/ixgbe.c 1.320-1.324 via patch
sys/dev/pci/ixgbe/ixgbe_82598.c 1.19
sys/dev/pci/ixgbe/ixgbe_api.c 1.28
sys/dev/pci/ixgbe/ixgbe_common.c1.43
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.17
sys/dev/pci/ixgbe/ixv.c 1.183
- Add an option for Tx to use deferred softint regardless of whether
can get txq lock or not. It's off by default.
- Call txeof first, then rxeof for the consistency.
- Make three "Unsupported SFP+ module..." messages the same.
- KNF. Modify comment. Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.413.2.5 -r1.413.2.6 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.54.2.10 -r1.54.2.11 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.24 -r1.199.2.25 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.12.8.5 -r1.12.8.6 src/sys/dev/pci/ixgbe/ixgbe_82598.c
cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.25.2.5 -r1.25.2.6 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.11.4.3 -r1.11.4.4 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.125.2.20 -r1.125.2.21 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.413.2.5 src/sys/dev/pci/files.pci:1.413.2.6
--- src/sys/dev/pci/files.pci:1.413.2.5 Thu Oct 21 14:30:10 2021
+++ src/sys/dev/pci/files.pci Mon Jan 23 14:04:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.413.2.5 2021/10/21 14:30:10 martin Exp $
+# $NetBSD: files.pci,v 1.413.2.6 2023/01/23 14:04:41 martin Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -691,6 +691,7 @@ file dev/pci/ixgbe/ixgbe_phy.c ixg | ixv
file dev/pci/ixgbe/ixgbe_vf.c ixg | ixv
file dev/pci/ixgbe/if_bypass.c ixg | ixv
file dev/pci/ixgbe/if_fdir.c ixg | ixv
+defflag opt_if_ixg.h IXGBE_ALWAYS_TXDEFER
# This appears to be the driver for virtual instances of i82599.
device ixv: ether, ifnet, arp, mii, mii_phy
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.10 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.11
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.10 Mon May 30 17:01:06 2022
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Mon Jan 23 14:04:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.10 2022/05/30 17:01:06 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.11 2023/01/23 14:04:42 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.10 2022/05/30 17:01:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.11 2023/01/23 14:04:42 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -250,6 +250,11 @@ ixgbe_mq_start(struct ifnet *ifp, struct
IXGBE_EVC_ADD(&txr->pcq_drops, 1);
return ENOBUFS;
}
+#ifdef IXGBE_ALWAYS_TXDEFER
+ kpreempt_disable();
+ softint_schedule(txr->txr_si);
+ kpreempt_enable();
+#else
if (IXGBE_TX_TRYLOCK(txr)) {
ixgbe_mq_start_locked(ifp, txr);
IXGBE_TX_UNLOCK(txr);
@@ -279,6 +284,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
kpreempt_enable();
}
}
+#endif
return (0);
} /* ixgbe_mq_start */
@@ -316,7 +322,7 @@ ixgbe_mq_start_locked(struct ifnet *ifp,
#if __FreeBSD_version >= 1100036
/*
* Since we're looking at the tx ring, we can check
- * to see if we're a VF by examing our tail register
+ * to see if we're a VF by examining our tail register
* address.
*/
if ((txr->adapter->feat_en & IXGBE_FEATURE_VF) &&
@@ -1977,7 +1983,7 @@ ixgbe_rxeof(struct ix_queue *que)
* not be fragmented across sequential
* descriptors, rather the next descriptor
* is indicated in bits of the descriptor.
- * This also means that we might proceses
+ * This also means that we might process
* more than one packet at a time, something
* that has never been true before, it
* required eliminating global chain pointers
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.24 src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.25
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.24 Fri Jun 3 04:00:49 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Jan 23 14:04:42 2023
@@ -1,4 +1,
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:32:22 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #1580): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1383.2.14 -r1.1383.2.15 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:32:22 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #1580): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1383.2.14 -r1.1383.2.15 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.14 src/sys/dev/pci/pcidevs:1.1383.2.15 --- src/sys/dev/pci/pcidevs:1.1383.2.14 Wed Jan 18 19:26:30 2023 +++ src/sys/dev/pci/pcidevs Mon Jan 30 11:32:22 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3205,6 +3205,7 @@ product ES FREEDOM 0x0001 Freedom PCI-GB product EXAR XR17D152 0x0152 dual-channel Universal PCI UART product EXAR XR17D154 0x0154 quad-channel Universal PCI UART product EXAR XR17D158 0x0158 octal-channel Universal PCI UART +product EXAR XR17V354 0x0354 quad-channel Universal PCIe UART /* FORE products */ product FORE PCA200 0x0210 ATM PCA-200
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:34:21 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket #1580
To generate a diff of this commit:
cvs rdiff -u -r1.1371.2.14 -r1.1371.2.15 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1370.2.14 -r1.1370.2.15 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1371.2.14 src/sys/dev/pci/pcidevs.h:1.1371.2.15
--- src/sys/dev/pci/pcidevs.h:1.1371.2.14 Wed Jan 18 19:27:18 2023
+++ src/sys/dev/pci/pcidevs.h Mon Jan 30 11:33:45 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1371.2.14 2023/01/18 19:27:18 martin Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1371.2.15 2023/01/30 11:33:45 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp
+ * NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp
*/
/*
@@ -3212,6 +3212,7 @@
#define PCI_PRODUCT_EXAR_XR17D152 0x0152 /* dual-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D154 0x0154 /* quad-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D158 0x0158 /* octal-channel Universal PCI UART */
+#define PCI_PRODUCT_EXAR_XR17V354 0x0354 /* quad-channel Universal PCIe UART */
/* FORE products */
#define PCI_PRODUCT_FORE_PCA200 0x0210 /* ATM PCA-200 */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1370.2.14 src/sys/dev/pci/pcidevs_data.h:1.1370.2.15
--- src/sys/dev/pci/pcidevs_data.h:1.1370.2.14 Wed Jan 18 19:27:18 2023
+++ src/sys/dev/pci/pcidevs_data.h Mon Jan 30 11:33:45 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1370.2.14 2023/01/18 19:27:18 martin Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1370.2.15 2023/01/30 11:33:45 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp
+ * NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp
*/
/*
@@ -5243,6 +5243,8 @@ static const uint16_t pci_products[] = {
15140, 20295, 615, 7941, 0,
PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D158,
15153, 20295, 615, 7941, 0,
+ PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17V354,
+ 15140, 20295, 8154, 7941, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200,
7083, 20305, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200E,
@@ -18827,7 +18829,7 @@ static const char pci_words[] = { "."
"NVMe\0" /* 24 refs @ 7915 */
"SSD\0" /* 27 refs @ 7920 */
"16650-compatible\0" /* 1 refs @ 7924 */
- "UART\0" /* 96 refs @ 7941 */
+ "UART\0" /* 97 refs @ 7941 */
"Elastic\0" /* 1 refs @ 7946 */
"K8\0" /* 4 refs @ 7954 */
"AMD64\0" /* 14 refs @ 7957 */
@@ -18856,7 +18858,7 @@ static const char pci_words[] = { "."
"Fabric\0" /* 64 refs @ 8129 */
"17h/6xh\0" /* 20 refs @ 8136 */
"Family17h\0" /* 21 refs @ 8144 */
- "PCIe\0" /* 669 refs @ 8154 */
+ "PCIe\0" /* 670 refs @ 8154 */
"17h/Axh\0" /* 19 refs @ 8159 */
"Dummy\0" /* 6 refs @ 8167 */
"Crypto\0" /* 6 refs @ 8173 */
@@ -19902,7 +19904,7 @@ static const char pci_words[] = { "."
"single-channel\0" /* 2 refs @ 15105 */
"RS-485\0" /* 8 refs @ 15120 */
"dual-channel\0" /* 3 refs @ 15127 */
- "quad-channel\0" /* 3 refs @ 15140 */
+ "quad-channel\0" /* 4 refs @ 15140 */
"octal-channel\0" /* 3 refs @ 15153 */
"Isolated\0" /* 4 refs @ 15167 */
"PBlaze4\0" /* 1 refs @ 15176 */
@@ -20566,7 +20568,7 @@ static const char pci_words[] = { "."
"OZ711E0\0" /* 1 refs @ 20270 */
"Freedom\0" /* 1 refs @ 20278 */
"PCI-GBus\0" /* 1 refs @ 20286 */
- "Universal\0" /* 3 refs @ 20295 */
+ "Universal\0" /* 4 refs @ 20295 */
"PCA-200\0" /* 1 refs @ 20305 */
"PCA-200e\0" /* 1 refs @ 20313 */
"801\0" /* 1 refs @ 20322 */
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:34:21 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1580 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.14 -r1.1371.2.15 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.14 -r1.1370.2.15 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jan 29 17:08:33 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: pci_subr.c pcireg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1412: sys/dev/pci/pci_subr.c 1.232-1.239 via patch sys/dev/pci/pcireg.h1.62-1.63 - Decode link control2's Compliance Preset/De-emphasis more. - Decode Physical Layer 16.0 GT/s extended capability. - Decode Lane Margining at the Receiver extended capability. - Print "reserved" instead of "unknown" when printing equalization preset. One of them is known to be the default value. - Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.215.2.5 -r1.215.2.6 src/sys/dev/pci/pci_subr.c cvs rdiff -u -r1.147.4.3 -r1.147.4.4 src/sys/dev/pci/pcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jan 29 17:08:33 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-9]: pci_subr.c pcireg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1412:
sys/dev/pci/pci_subr.c 1.232-1.239 via patch
sys/dev/pci/pcireg.h1.62-1.63
- Decode link control2's Compliance Preset/De-emphasis more.
- Decode Physical Layer 16.0 GT/s extended capability.
- Decode Lane Margining at the Receiver extended capability.
- Print "reserved" instead of "unknown" when printing equalization
preset. One of them is known to be the default value.
- Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.215.2.5 -r1.215.2.6 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.147.4.3 -r1.147.4.4 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.215.2.5 src/sys/dev/pci/pci_subr.c:1.215.2.6
--- src/sys/dev/pci/pci_subr.c:1.215.2.5 Fri Dec 3 19:40:38 2021
+++ src/sys/dev/pci/pci_subr.c Sat Jan 29 17:08:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.215.2.5 2021/12/03 19:40:38 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.215.2.6 2022/01/29 17:08:33 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215.2.5 2021/12/03 19:40:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215.2.6 2022/01/29 17:08:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -1787,6 +1787,45 @@ pci_print_pcie_link_deemphasis(pcireg_t
}
}
+static const struct _pcie_link_preset_preshoot_deemphasis {
+ const char *preshoot;
+ const char *deemphasis;
+} pcie_link_preset_preshoot_deemphasis[] = {
+ { "0.0", "-6.0+-1.5" }, /* P0 */
+ { "0.0", "-3.5+-1" }, /* P1 */
+ { "0.0", "-4.4+-1.5" }, /* P2 */
+ { "0.0", "-2.5+-1" }, /* P3 */
+ { "0.0", "0.0" }, /* P4 */
+ { "1.9+-1", "0.0" }, /* P5 */
+ { "2.5+-1", "0.0" }, /* P6 */
+ { "3.5+-1", "-6.0+-1.5" }, /* P7 */
+ { "3.5+-1", "-3.5+-1" }, /* P8 */
+ { "3.5+-1", "0.0" }, /* P9 */
+ { "0.0", NULL } /* P10 */
+};
+
+static void
+pci_print_pcie_link_preset_preshoot_deemphasis(pcireg_t val)
+{
+ const char *deemphasis;
+
+ if (val >= __arraycount(pcie_link_preset_preshoot_deemphasis)) {
+ /*
+ * This may be printed because the default value of some
+ * register fields is 0b.
+ */
+ printf("reserved value (0x%x)", val);
+ return;
+ }
+
+ printf("Preshoot %sdB",
+ pcie_link_preset_preshoot_deemphasis[val].preshoot);
+ deemphasis = pcie_link_preset_preshoot_deemphasis[val].deemphasis;
+
+ if (deemphasis != NULL)
+ printf(", De-emphasis %sdB", deemphasis);
+}
+
static void
pci_conf_print_pcie_cap(const pcireg_t *regs, int capoff)
{
@@ -2320,8 +2359,8 @@ pci_conf_print_pcie_cap(const pcireg_t *
(unsigned int)__SHIFTOUT(reg, PCIE_LCSR2_TX_MARGIN));
onoff("Enter Modified Compliance", reg, PCIE_LCSR2_EN_MCOMP);
onoff("Compliance SOS", reg, PCIE_LCSR2_COMP_SOS);
- printf(" Compliance Present/De-emphasis: ");
- pci_print_pcie_link_deemphasis(
+ printf(" Compliance Preset/De-emphasis: ");
+ pci_print_pcie_link_preset_preshoot_deemphasis(
__SHIFTOUT(reg, PCIE_LCSR2_COMP_DEEMP));
printf("\n");
@@ -3854,7 +3893,7 @@ pci_conf_print_sec_pcie_cap(const pcireg
reg = regs[o2i(pcie_capoff + PCIE_LCAP)];
maxlinkwidth = __SHIFTOUT(reg, PCIE_LCAP_MAX_WIDTH);
} else {
- printf("error: falied to get PCIe capablity\n");
+ printf("error: failed to get PCIe capability\n");
return;
}
for (i = 0; i < maxlinkwidth; i++) {
@@ -4220,6 +4259,179 @@ pci_conf_print_dlf_cap(const pcireg_t *r
onoff("Remote DLF supported Valid", reg, PCI_DLF_STAT_RMTVALID);
}
+static void
+pci_conf_print_pl16g_cap(const pcireg_t *regs, int extcapoff)
+{
+ pcireg_t reg, lwidth;
+ int pcie_capoff;
+ unsigned int i, j;
+
+ printf("\n Physical Layer 16.0 GT/s\n");
+ reg = regs[o2i(extcapoff + PCI_PL16G_CAP)];
+ printf("Capability register: 0x%08x\n", reg);
+
+ reg = regs[o2i(extcapoff + PCI_PL16G_CTL)];
+ printf("Control register: 0x%08x\n", reg);
+
+ reg = regs[o2i(extcapoff + PCI_PL16G_STAT)];
+ printf("Status register: 0x%08x\n", reg);
+ onoff("Equalization 16.0 GT/s Complete", reg, PCI_PL16G_STAT_EQ_COMPL);
+ onoff("Equalization 16.0 GT/s Phase 1 Successful", reg,
+ PCI_PL16G_STAT_EQ_P1S);
+ onoff("Equalization 16.0 GT/s Phase 2 Successful", reg,
+ PCI_PL16G_STAT_EQ_P2S);
+ onoff("Equalization 16.0 GT/s Phase 3 Successful", reg,
+ PCI_PL16G_STAT_EQ_P3S);
+
+ reg = regs[o2i(extcapoff + PCI_PL16G_LDPMS)];
+ printf("Local Data Parity Mismatch Status register: 0x%08x\n",
+ reg);
+
+ reg = regs[o2i(extcapoff + PCI_PL16G_FRDPMS)];
+ printf("First Retimer Data Parity Mismatch Status register:
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 21 14:22:56 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions (all via patch), requested by msaitoh in ticket #1362: sys/dev/pci/pcidevs 1.1419-1.1440 - Add newer ciss(4) devices. - Add modern QUMRANET/Red Hat VIRTIO range PCI devices. - Add some more product IDs for mcx(4). - Add current generation NVIDIA graphics cards (3050-3090 etc.). - Add RDC R6022 PCI-Host bridge. - Add a whole bunch of radeon devices. - Add Realtek RTL8821CE. - Add Intel 660p SSD, and expand the 760p description. - Add Intel I219's version number. - Add Intel I219V 15-19 and I219LM 16-19. - Add Intel I225V, I225LM and WiFi 6 AX201. - Add newer Intel PCH internal devices. - Add Intel Jasper Lake devices. - PDC20265 is Ultra/100, not 66. - Fix Realtek RTL8125 description. - Sort Cavium devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.9 -r1.1383.2.10 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 21 14:22:56 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions (all via patch), requested by msaitoh in ticket #1362: sys/dev/pci/pcidevs 1.1419-1.1440 - Add newer ciss(4) devices. - Add modern QUMRANET/Red Hat VIRTIO range PCI devices. - Add some more product IDs for mcx(4). - Add current generation NVIDIA graphics cards (3050-3090 etc.). - Add RDC R6022 PCI-Host bridge. - Add a whole bunch of radeon devices. - Add Realtek RTL8821CE. - Add Intel 660p SSD, and expand the 760p description. - Add Intel I219's version number. - Add Intel I219V 15-19 and I219LM 16-19. - Add Intel I225V, I225LM and WiFi 6 AX201. - Add newer Intel PCH internal devices. - Add Intel Jasper Lake devices. - PDC20265 is Ultra/100, not 66. - Fix Realtek RTL8125 description. - Sort Cavium devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.9 -r1.1383.2.10 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.9 src/sys/dev/pci/pcidevs:1.1383.2.10 --- src/sys/dev/pci/pcidevs:1.1383.2.9 Fri Jul 10 10:23:57 2020 +++ src/sys/dev/pci/pcidevs Thu Oct 21 14:22:56 2021 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.9 2020/07/10 10:23:57 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.10 2021/10/21 14:22:56 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1678,75 +1678,298 @@ product ATI RADEON_R423_5D57 0x5d57 Rade product ATI RADEON_X850XT_S 0x5d72 Radeon X850 XT Secondary product ATI RADEON_X700 0x5e4b Radeon X700 Pro product ATI RADEON_X700_S 0x5e6b Radeon X700 Pro Secondary +product ATI RADEON_HD8670A_1 0x6600 Radeon HD 8670A/8670M/8750M +product ATI RADEON_HD8730M 0x6601 Radeon HD 8730M +product ATI RADEON_R7_M265 0x6604 Radeon R7 M265/M365X/M465 +product ATI RADEON_R7_M260X 0x6605 Radeon R7 M260X product ATI RADEON_HD8790M 0x6606 Radeon HD 8790M -product ATI RADEON_HD8530M 0x6607 Radeon HD 8530M -product ATI RADEON_HD8600 0x6610 Radeon HD 8600 -product ATI RADEON_HD8570 0x6611 Radeon HD 8570 -product ATI RADEON_HD8500 0x6613 Radeon HD 8500 +product ATI RADEON_HD8530M 0x6607 Radeon HD 8530M / R5 M240 +product ATI RADEON_FP_W2100 0x6608 FirePro W2100 +product ATI RADEON_HD8600 0x6610 Radeon HD 8670 / R7 250/350 +product ATI RADEON_HD8570 0x6611 Radeon HD 8570 / R7 240/340 / Radeon 520 OEM +product ATI RADEON_HD8500 0x6613 Radeon R7 240/340 +product ATI RADEON_FP_M6100 0x6640 FirePro M6100 +product ATI RADEON_HD8930M 0x6641 Radeon HD 8930M +product ATI RADEON_R9M280X 0x6646 Radeon R9 M280X +product ATI RADEON_R9M270X 0x6647 Radeon R9 M270X/M280X +product ATI RADEON_FP_W5100 0x6649 FirePro W5100 +product ATI RADEON_R7_260X 0x6658 Radeon R7 260X/360 +product ATI RADEON_HD7790 0x665C Radeon HD 7790/8770 / R7 360 / R9 260/360 OEM +product ATI RADEON_R7_200 0x665D Radeon R7 200 Series +product ATI RADEON_R7_360 0x665F Radeon R7 360 / R9 360 OEM +product ATI RADEON_HD8670A_2 0x6660 Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile +product ATI RADEON_HD8570A 0x6663 Radeon HD 8570A/8570M +product ATI RADEON_R5_M240 0x6664 Radeon R5 M240 +product ATI RADEON_R5_M230 0x6665 Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile +product ATI RADEON_R5_M230_2 0x6667 Radeon R5 M230 +product ATI RADEON_HD8550M 0x666F Radeon HD 8550M / R5 M230 +product ATI RADEON_INSTINCT 0x66A0 Radeon Instinct +product ATI RADEON_VEGA20_1 0x66A1 Vega 20 +product ATI RADEON_VEGA20_2 0x66A2 Vega 20 +product ATI RADEON_VEGA20_3 0x66A3 Vega 20 +product ATI RADEON_VEGA20_PRO 0x66A7 Radeon Pro Vega 20 +product ATI RADEON_VII_1 0x66AF Radeon VII +product ATI RADEON_FP_V7900 0x6704 FirePro V7900 +product ATI RADEON_FP_V5900 0x6707 FirePro V5900 product ATI RADEON_HD6970 0x6718 Radeon HD 6970 product ATI RADEON_HD6950 0x6719 Radeon HD 6950 product ATI RADEON_HD6990_1 0x671c Radeon HD 6990 product ATI RADEON_HD6990_2 0x671d Radeon HD 6990 product ATI RADEON_HD6930 0x671f Radeon HD 6930 -product ATI RADEON_HD6970M 0x6720 Radeon HD 6970M +product ATI RADEON_HD6970M 0x6720 Radeon HD 6970M/6990M product ATI RADEON_HD6900M 0x6725 Radeon HD 6900M product ATI RADEON_HD6870 0x6738 Radeon HD 6870 product ATI RADEON_HD6850 0x6739 Radeon HD 6850 product ATI RADEON_HD6790 0x673e Radeon HD 6790 -product ATI RADEON_HD6730M 0x6740 Radeon HD 6730M -product ATI RADEON_HD6600M 0x6741 Radeon HD 6600M -product ATI RADEON_HD6610M 0x6742 Radeon HD 6610M -product ATI RADEON_HD6650A 0x6750 Radeon HD 6650A -product ATI RADEON_HD7670A 0x6751 Radeon HD 7670A -product ATI RADEON_HD6670 0x6758 Radeon HD 6670 -product ATI RADEON_HD6570 0x6759 Radeon HD 6570 +product ATI RADEON_HD6730M 0x6740 Radeon HD 6730M/6770M/7690M XT +product ATI RADEON_HD6600M 0x6741 Radeon HD 6630M/6650M/6750M/7670M/7690M +product ATI RADEON_HD6610M 0x
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 21 14:24:46 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen (for ticket #1362) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.9 -r1.1371.2.10 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.9 -r1.1370.2.10 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Oct 21 14:24:46 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen (for ticket #1362) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.9 -r1.1371.2.10 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.9 -r1.1370.2.10 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 30 11:44:39 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: piixpm.c Log Message: Apply patch, requested by msaitoh in ticket #1378: sys/dev/pci/piixpm.cpatch Fix a bug that I2C access panics on old AMD chipset (e.g SB600). Fixes PR kern/56525. To generate a diff of this commit: cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/dev/pci/piixpm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 30 11:44:39 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-9]: piixpm.c
Log Message:
Apply patch, requested by msaitoh in ticket #1378:
sys/dev/pci/piixpm.cpatch
Fix a bug that I2C access panics on old AMD chipset (e.g SB600).
Fixes PR kern/56525.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/dev/pci/piixpm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.54.2.1 src/sys/dev/pci/piixpm.c:1.54.2.2
--- src/sys/dev/pci/piixpm.c:1.54.2.1 Thu Jul 16 12:39:11 2020
+++ src/sys/dev/pci/piixpm.c Tue Nov 30 11:44:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.54.2.1 2020/07/16 12:39:11 martin Exp $ */
+/* $NetBSD: piixpm.c,v 1.54.2.2 2021/11/30 11:44:39 martin Exp $ */
/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.54.2.1 2020/07/16 12:39:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.54.2.2 2021/11/30 11:44:39 martin Exp $");
#include
#include
@@ -123,6 +123,8 @@ static bool piixpm_resume(device_t, cons
static int piixpm_sb800_init(struct piixpm_softc *);
static void piixpm_csb5_reset(void *);
+static int piixpm_i2c_sb600_acquire_bus(void *, int);
+static void piixpm_i2c_sb600_release_bus(void *, int);
static int piixpm_i2c_sb800_acquire_bus(void *, int);
static void piixpm_i2c_sb800_release_bus(void *, int);
static int piixpm_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
@@ -338,8 +340,8 @@ piixpm_rescan(device_t self, const char
tag->ic_acquire_bus = piixpm_i2c_sb800_acquire_bus;
tag->ic_release_bus = piixpm_i2c_sb800_release_bus;
} else {
- tag->ic_acquire_bus = NULL;
- tag->ic_release_bus = NULL;
+ tag->ic_acquire_bus = piixpm_i2c_sb600_acquire_bus;
+ tag->ic_release_bus = piixpm_i2c_sb600_release_bus;
}
tag->ic_exec = piixpm_i2c_exec;
memset(&iba, 0, sizeof(iba));
@@ -487,6 +489,28 @@ piixpm_csb5_reset(void *arg)
}
static int
+piixpm_i2c_sb600_acquire_bus(void *cookie, int flags)
+{
+ struct piixpm_smbus *smbus = cookie;
+ struct piixpm_softc *sc = smbus->softc;
+
+ if (!cold)
+ mutex_enter(&sc->sc_i2c_mutex);
+
+ return 0;
+}
+
+static void
+piixpm_i2c_sb600_release_bus(void *cookie, int flags)
+{
+ struct piixpm_smbus *smbus = cookie;
+ struct piixpm_softc *sc = smbus->softc;
+
+ if (!cold)
+ mutex_exit(&sc->sc_i2c_mutex);
+}
+
+static int
piixpm_i2c_sb800_acquire_bus(void *cookie, int flags)
{
struct piixpm_smbus *smbus = cookie;
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Dec 3 17:32:42 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions (all via patch), requested by msaitoh in ticket #1380: sys/dev/pci/pcidevs 1.1441-1.1444 - Add Intel Gemini Lake TXE HECI 1. - Add Intel Elkhart Lake and Rocket Lake devices. - Update Jasper Lake's Processor Transaction Routers. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.10 -r1.1383.2.11 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Dec 3 17:32:42 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions (all via patch), requested by msaitoh in ticket #1380: sys/dev/pci/pcidevs 1.1441-1.1444 - Add Intel Gemini Lake TXE HECI 1. - Add Intel Elkhart Lake and Rocket Lake devices. - Update Jasper Lake's Processor Transaction Routers. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.10 -r1.1383.2.11 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.10 src/sys/dev/pci/pcidevs:1.1383.2.11 --- src/sys/dev/pci/pcidevs:1.1383.2.10 Thu Oct 21 14:22:56 2021 +++ src/sys/dev/pci/pcidevs Fri Dec 3 17:32:42 2021 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.10 2021/10/21 14:22:56 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.11 2021/12/03 17:32:42 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5158,6 +5158,7 @@ product INTEL GLK_PMC 0x3194 Gemini Lak product INTEL GLK_FASTSPI 0x3196 Gemini Lake Fast SPI product INTEL GLK_ESPI 0x3197 Gemini Lake eSPI product INTEL GLK_HDA 0x3198 Gemini Lake HD Audio +product INTEL GLK_TXE_HECI_1 0x319a Gemini Lake TXE HECI 1 product INTEL GLK_ISH 0x31a2 Gemini Lake Integrated Sensor Hub product INTEL GLK_XHCI 0x31a8 Gemini Lake USB Host (xHCI) product INTEL GLK_XDCI 0x31aa Gemini Lake USB Device (xDCI) @@ -5625,12 +5626,134 @@ product INTEL 5HS_H_CNVI 0x43f0 500 Seri product INTEL 5HS_H_GSPI_2 0x43fb 500 Series PCH-H GSPI 2 product INTEL 5HS_H_ISH 0x43fc 500 Series PCH-H Integrated Sensor Hub product INTEL 5HS_H_GSPI_3 0x43fd 500 Series PCH-H GSPI 3 +product INTEL EHL_TROUTER_3 0x4512 Elkhart Lake Transaction Router (SKU 3) +product INTEL EHL_TROUTER_3A 0x451e Elkhart Lake Transaction Router (SKU 3A) +product INTEL EHL_TROUTER_5 0x4514 Elkhart Lake Transaction Router (SKU 5) +product INTEL EHL_TROUTER_8 0x4516 Elkhart Lake Transaction Router (SKU 8) +product INTEL EHL_TROUTER_12 0x4518 Elkhart Lake Transaction Router (SKU 12) +product INTEL EHL_TROUTER_1 0x4522 Elkhart Lake Transaction Router (SKU 1) +product INTEL EHL_TROUTER_1A 0x4538 Elkhart Lake Transaction Router (SKU 1A) +product INTEL EHL_TROUTER_4 0x4526 Elkhart Lake Transaction Router (SKU 4) +product INTEL EHL_TROUTER_6 0x4528 Elkhart Lake Transaction Router (SKU 6) +product INTEL EHL_TROUTER_7 0x452a Elkhart Lake Transaction Router (SKU 7) +product INTEL EHL_TROUTER_9 0x452c Elkhart Lake Transaction Router (SKU 9) +product INTEL EHL_TROUTER_10 0x452e Elkhart Lake Transaction Router (SKU 10) +product INTEL EHL_TROUTER_11 0x4532 Elkhart Lake Transaction Router (SKU 11) +product INTEL EHL_TROUTER_2 0x453a Elkhart Lake Transaction Router (SKU 2) +product INTEL EHL_GPU_16 0x4551 Elkhart Lake GPU (16EU) +product INTEL EHL_GPU_32_SUPER 0x4551 Elkhart Lake GPU (32EU Super) +product INTEL EHL_GPU_32 0x4551 Elkhart Lake GPU (32EU) +product INTEL EHL_DPTF 0x4503 Elkhart Lake DPTF +product INTEL EHL_GNA 0x4511 Elkhart Lake GNA +product INTEL EHL_TRACE_2 0x4529 Elkhart Lake Trace Hub (Compute Die) +product INTEL EHL_ESPI 0x4b00 Elkhart Lake eSPI +product INTEL EHL_P2SB 0x4b20 Elkhart Lake P2SB +product INTEL EHL_PMC 0x4b21 Elkhart Lake PMC +product INTEL EHL_SMB 0x4b23 Elkhart Lake SMBus +product INTEL EHL_SPI_FLASH 0x4b24 Elkhart Lake SPI (FLASH & TPM) +product INTEL EHL_TRACE_1 0x4b26 Elkhart Lake Trace Hub (PCH) +product INTEL EHL_SIO_UART_0 0x4b28 Elkhart Lake SIO UART 0 +product INTEL EHL_SIO_UART_1 0x4b29 Elkhart Lake SIO UART 1 +product INTEL EHL_SIO_SPI_0 0x4b2a Elkhart Lake SIO SPI 0 +product INTEL EHL_SIO_SPI_1 0x4b2b Elkhart Lake SIO SPI 1 +product INTEL EHL_IEH 0x4b2f Elkhart Lake IEH +product INTEL EHL_ETH 0x4b32 Elkhart Lake Ethernet +product INTEL EHL_SIO_SPI_2 0x4b37 Elkhart Lake SIO SPI 2 +product INTEL EHL_PCIE_RP_0 0x4b38 Elkhart Lake PCIe Root Port 0 (PCIe 0, Single VC) +product INTEL EHL_PCIE_RP_1 0x4b39 Elkhart Lake PCIe Root Port 1 (PCIe 0, Single VC) +product INTEL EHL_PCIE_RP_2 0x4b3a Elkhart Lake PCIe Root Port 2 (PCIe 0, Single VC) +product INTEL EHL_PCIE_RP_3 0x4b3b Elkhart Lake PCIe Root Port 3 (PCIe 0, Single VC) +product INTEL EHL_PCIE_RP_4 0x4b3c Elkhart Lake PCIe Root Port 4 (PCIe 1, Multi VC) +product INTEL EHL_PCIE_RP_5 0x4b3d Elkhart Lake PCIe Root Port 5 (PCIe 2, Multi VC) +product INTEL EHL_PCIE_RP_6 0x4b3e Elkhart Lake PCIe Root Port 6 (PCIe 3, Multi VC) +product INTEL EHL_SIO_I2C_6 0x4b44 Elkhart Lake SIO I2C 6 +product INTEL EHL_SIO_I2C_7 0x4b45 Elkhart Lake SIO I2C 7 +product INTEL EHL_EMMC 0x4b47 Elkhart Lake eMMC +product INTEL EHL_SDIO 0x4b48 Elkhart Lake SDIO +product INTEL EHL_SI 0x4b4a Elkhart Lake Safety Island +product INTEL EHL_SIO_I2C_4 0x4b4b Elkhart Lake SIO I2C 4 +product INTEL EHL_SIO_I2C_5 0x4b4c Elkhart Lake SIO I2C 5 +p
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Dec 3 17:34:39 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #1380) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.10 -r1.1371.2.11 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.10 -r1.1370.2.11 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Dec 3 17:49:41 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: ichsmb.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1381: sys/dev/pci/ichsmb.c1.69, 1.71, 1.73-1.75 via patch - Add Intel 400, 495, and 500 series support. - Add Intel Jasper Lake and Elkhart Lake support. - Ignore the SMBALERT# interrupt. Same as other OSes. To generate a diff of this commit: cvs rdiff -u -r1.60.4.2 -r1.60.4.3 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Dec 3 17:49:41 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-9]: ichsmb.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1381:
sys/dev/pci/ichsmb.c1.69, 1.71, 1.73-1.75 via patch
- Add Intel 400, 495, and 500 series support.
- Add Intel Jasper Lake and Elkhart Lake support.
- Ignore the SMBALERT# interrupt. Same as other OSes.
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.2 -r1.60.4.3 src/sys/dev/pci/ichsmb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.60.4.2 src/sys/dev/pci/ichsmb.c:1.60.4.3
--- src/sys/dev/pci/ichsmb.c:1.60.4.2 Fri Jul 10 11:31:59 2020
+++ src/sys/dev/pci/ichsmb.c Fri Dec 3 17:49:41 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: ichsmb.c,v 1.60.4.2 2020/07/10 11:31:59 martin Exp $ */
-/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
+/* $NetBSD: ichsmb.c,v 1.60.4.3 2021/12/03 17:49:41 martin Exp $ */
+/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.2 2020/07/10 11:31:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.3 2021/12/03 17:49:41 martin Exp $");
#include
#include
@@ -126,6 +126,8 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_2HS_SMB:
case PCI_PRODUCT_INTEL_3HS_SMB:
case PCI_PRODUCT_INTEL_3HS_U_SMB:
+ case PCI_PRODUCT_INTEL_4HS_H_SMB:
+ case PCI_PRODUCT_INTEL_4HS_V_SMB:
case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
case PCI_PRODUCT_INTEL_CMTLK_SMB:
@@ -133,6 +135,8 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_BSW_PCU_SMB:
case PCI_PRODUCT_INTEL_APL_SMB:
case PCI_PRODUCT_INTEL_GLK_SMB:
+ case PCI_PRODUCT_INTEL_EHL_SMB:
+ case PCI_PRODUCT_INTEL_JSL_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
case PCI_PRODUCT_INTEL_C600_SMB_1:
@@ -145,6 +149,9 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_DH89XXCL_SMB:
case PCI_PRODUCT_INTEL_C2000_PCU_SMBUS:
case PCI_PRODUCT_INTEL_C3K_SMBUS_LEGACY:
+ case PCI_PRODUCT_INTEL_495_YU_SMB:
+ case PCI_PRODUCT_INTEL_5HS_H_SMB:
+ case PCI_PRODUCT_INTEL_5HS_LP_SMB:
return 1;
}
}
@@ -424,11 +431,6 @@ timeout:
/*
* Transfer timeout. Kill the transaction and clear status bits.
*/
- snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- aprint_error_dev(sc->sc_dev,
- "exec: op %d, addr 0x%02x, cmdlen %zd, len %zd, "
- "flags 0x%02x: timeout, status %s\n",
- op, addr, cmdlen, len, flags, fbuf);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HC,
LPCIB_SMB_HC_KILL);
DELAY(ICHIIC_DELAY);
@@ -455,9 +457,14 @@ ichsmb_intr(void *arg)
/* Read status */
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS);
+
+ /* Clear status bits */
+ bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);
+
+ /* XXX Ignore SMBALERT# for now */
if ((st & LPCIB_SMB_HS_BUSY) != 0 || (st & (LPCIB_SMB_HS_INTR |
LPCIB_SMB_HS_DEVERR | LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED |
- LPCIB_SMB_HS_SMBAL | LPCIB_SMB_HS_BDONE)) == 0)
+ LPCIB_SMB_HS_BDONE)) == 0)
/* Interrupt was not for us */
return (0);
@@ -466,9 +473,6 @@ ichsmb_intr(void *arg)
printf("%s: intr st %s\n", device_xname(sc->sc_dev), fbuf);
#endif
- /* Clear status bits */
- bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);
-
/* Check for errors */
if (st & (LPCIB_SMB_HS_DEVERR | LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED)) {
sc->sc_i2c_xfer.error = 1;
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Dec 3 19:40:38 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-9]: nvme_pci.c pci.c pci_subr.c pcireg.h ppb.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1384:
sys/dev/pci/pcireg.h1.152-1.154, 1.156-1.161
sys/dev/pci/pci_subr.c 1.222, 1.227-1.232 via patch
sys/dev/pci/nvme_pci.c 1.31
sys/dev/pci/pci.c 1.158, 1.163
sys/dev/pci/ppb.c 1.74
- When parsing Enhanced Allocation entries, use the correct calculation
for finding the next entry.
- Add 32.0GT/s to the list of pcie speeds (PCIe 5.x.).
- Add Some PCI config information:
- Lane Margining at the Receiver
- NVME admin interface
- UFSHCI
- InfiniBand
- Host fabric
- HDA 1.0 with vendor ext
- USB4 HCI
- MIPI I3C
- Cellular controller/modem (+ Ethernet)
- Change PCI_VENDOR_MASK and PCI_PRODUCT_MASK to unsigned values, to
prevent sign extension of product ID when shifted up into place in
PCI_ID_CODE(). Fixes PR kern/56176.
- Add LCAP & LCAP2 definitions.
- Use PCI-SIG official acronyms for some macros.
- Fix typo in some messages.
- Fix typo in comments.
- Whitespace fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.26.4.1 -r1.26.4.2 src/sys/dev/pci/nvme_pci.c
cvs rdiff -u -r1.154.4.2 -r1.154.4.3 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.215.2.4 -r1.215.2.5 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.147.4.2 -r1.147.4.3 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/dev/pci/ppb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.26.4.1 src/sys/dev/pci/nvme_pci.c:1.26.4.2
--- src/sys/dev/pci/nvme_pci.c:1.26.4.1 Mon Jun 21 17:25:48 2021
+++ src/sys/dev/pci/nvme_pci.c Fri Dec 3 19:40:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme_pci.c,v 1.26.4.1 2021/06/21 17:25:48 martin Exp $ */
+/* $NetBSD: nvme_pci.c,v 1.26.4.2 2021/12/03 19:40:38 martin Exp $ */
/* $OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.26.4.1 2021/06/21 17:25:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.26.4.2 2021/12/03 19:40:38 martin Exp $");
#include
#include
@@ -135,7 +135,7 @@ nvme_pci_match(device_t parent, cfdata_t
if (PCI_CLASS(pa->pa_class) == PCI_CLASS_MASS_STORAGE &&
PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_MASS_STORAGE_NVM &&
- PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_NVM_NVME)
+ PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_NVM_NVME_IO)
return 1;
return 0;
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.154.4.2 src/sys/dev/pci/pci.c:1.154.4.3
--- src/sys/dev/pci/pci.c:1.154.4.2 Wed Nov 6 09:52:20 2019
+++ src/sys/dev/pci/pci.c Fri Dec 3 19:40:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.154.4.2 2019/11/06 09:52:20 martin Exp $ */
+/* $NetBSD: pci.c,v 1.154.4.3 2021/12/03 19:40:38 martin Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154.4.2 2019/11/06 09:52:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.154.4.3 2021/12/03 19:40:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -708,7 +708,7 @@ pci_enumerate_bus(struct pci_softc *sc,
if (pci_get_capability(ppbpc, ppbtag, PCI_CAP_PCIEXPRESS,
&pciecap, &capreg) != 0) {
switch (PCIE_XCAP_TYPE(capreg)) {
- case PCIE_XCAP_TYPE_ROOT:
+ case PCIE_XCAP_TYPE_RP:
case PCIE_XCAP_TYPE_DOWN:
case PCIE_XCAP_TYPE_PCI2PCIE:
downstream_port = true;
@@ -934,7 +934,7 @@ pci_conf_capture(pci_chipset_tag_t pc, p
/* For MSI */
if (pci_get_capability(pc, tag, PCI_CAP_MSI, &off, NULL) != 0) {
bool bit64, pvmask;
-
+
pcs->msi_ctl = pci_conf_read(pc, tag, off + PCI_MSI_CTL);
bit64 = pcs->msi_ctl & PCI_MSI_CTL_64BIT_ADDR;
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.215.2.4 src/sys/dev/pci/pci_subr.c:1.215.2.5
--- src/sys/dev/pci/pci_subr.c:1.215.2.4 Sun Jul 26 10:46:14 2020
+++ src/sys/dev/pci/pci_subr.c Fri Dec 3 19:40:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.215.2.4 2020/07/26 10:46:14 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.215.2.5 2021/12/03 19:40:38 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215.2.4 2020/07/26 10:46:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.215.2.5 2021/12/03 19:40:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -129,7 +129,15 @@ static const struct pci_class pci_interf
static const struct pci_class pci_interface_nvm[] = {
{ "vendor specific", PCI_INTERFACE_NVM_VND, NULL, },
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Dec 3 19:40:38 UTC 2021 Modified Files: src/sys/dev/pci [netbsd-9]: nvme_pci.c pci.c pci_subr.c pcireg.h ppb.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1384: sys/dev/pci/pcireg.h1.152-1.154, 1.156-1.161 sys/dev/pci/pci_subr.c 1.222, 1.227-1.232 via patch sys/dev/pci/nvme_pci.c 1.31 sys/dev/pci/pci.c 1.158, 1.163 sys/dev/pci/ppb.c 1.74 - When parsing Enhanced Allocation entries, use the correct calculation for finding the next entry. - Add 32.0GT/s to the list of pcie speeds (PCIe 5.x.). - Add Some PCI config information: - Lane Margining at the Receiver - NVME admin interface - UFSHCI - InfiniBand - Host fabric - HDA 1.0 with vendor ext - USB4 HCI - MIPI I3C - Cellular controller/modem (+ Ethernet) - Change PCI_VENDOR_MASK and PCI_PRODUCT_MASK to unsigned values, to prevent sign extension of product ID when shifted up into place in PCI_ID_CODE(). Fixes PR kern/56176. - Add LCAP & LCAP2 definitions. - Use PCI-SIG official acronyms for some macros. - Fix typo in some messages. - Fix typo in comments. - Whitespace fixes. To generate a diff of this commit: cvs rdiff -u -r1.26.4.1 -r1.26.4.2 src/sys/dev/pci/nvme_pci.c cvs rdiff -u -r1.154.4.2 -r1.154.4.3 src/sys/dev/pci/pci.c cvs rdiff -u -r1.215.2.4 -r1.215.2.5 src/sys/dev/pci/pci_subr.c cvs rdiff -u -r1.147.4.2 -r1.147.4.3 src/sys/dev/pci/pcireg.h cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/dev/pci/ppb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jul 11 14:10:18 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1477: sys/dev/pci/if_wmreg.h 1.122-1.125 sys/dev/pci/if_wmvar.h 1.48 sys/dev/pci/if_wm.c 1.719-1.720, 1.722-1.725, 1.727-1.740 via patch - wm_tick: Add missing splx(s) when not WM_MPSAFE. - Print DMA range info if the system is booting in the verbose mode. - Micro optimization: - Call m_freem(m) only if m0 == NULL. - Call wm_xxeof() only when limit > 0. - Don't set the more flag when there is no packet to process. - No functional changes: - Call txeof first, then rxeof for the consistency. - Remove duplicated break. - Remove stray semicolons from struct declaration. - Fix value return from void function. - Use macros. - Modify comment. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.645.2.12 -r1.645.2.13 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.115.2.4 -r1.115.2.5 src/sys/dev/pci/if_wmreg.h cvs rdiff -u -r1.44.4.3 -r1.44.4.4 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jul 11 14:10:18 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1477:
sys/dev/pci/if_wmreg.h 1.122-1.125
sys/dev/pci/if_wmvar.h 1.48
sys/dev/pci/if_wm.c 1.719-1.720,
1.722-1.725,
1.727-1.740 via patch
- wm_tick: Add missing splx(s) when not WM_MPSAFE.
- Print DMA range info if the system is booting in the verbose mode.
- Micro optimization:
- Call m_freem(m) only if m0 == NULL.
- Call wm_xxeof() only when limit > 0.
- Don't set the more flag when there is no packet to process.
- No functional changes:
- Call txeof first, then rxeof for the consistency.
- Remove duplicated break.
- Remove stray semicolons from struct declaration.
- Fix value return from void function.
- Use macros.
- Modify comment.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.12 -r1.645.2.13 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.4 -r1.115.2.5 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.44.4.3 -r1.44.4.4 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.12 src/sys/dev/pci/if_wm.c:1.645.2.13
--- src/sys/dev/pci/if_wm.c:1.645.2.12 Sat Nov 20 14:59:04 2021
+++ src/sys/dev/pci/if_wm.c Mon Jul 11 14:10:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.12 2021/11/20 14:59:04 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -39,21 +39,21 @@
Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
+
3. Neither the name of the Intel Corporation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.12 2021/11/20 14:59:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -321,9 +321,9 @@ struct wm_softc;
#endif
#ifdef WM_EVENT_COUNTERS
-#define WM_Q_EVCNT_DEFINE(qname, evname)\
+#define WM_Q_EVCNT_DEFINE(qname, evname) \
char qname##_##evname##_evcnt_name[sizeof("qname##XX##evname")]; \
- struct evcnt qname##_ev_##evname;
+ struct evcnt qname##_ev_##evname
#define WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, evtype) \
do {\
@@ -342,7 +342,7 @@ struct wm_softc;
WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, EVCNT_TYPE_INTR)
#define WM_Q_EVCNT_DETACH(qname, evname, q, qnum) \
- evcnt_detach(&(q)->qname##_ev_##evname);
+ evcnt_detach(&(q)->qname##_ev_##evname)
#endif /* WM_EVENT_COUNTERS */
struct wm_txqueue {
@@ -409,27 +409,27 @@ struct wm_txqueue {
uint32_t txq_bytes; /* for AIM */
#ifdef WM_EVENT_COUNTERS
/* TX event counters */
- WM_Q_EVCNT_DEFINE(txq, txsstall)/* Stalled due to no txs */
- WM_Q_EVCNT_DEFINE(txq, txdstall)/* Stalled due to no txd */
- WM_Q_EVCNT_DEFINE(txq, fifo_stall) /* FIFO stalls (82547) */
- WM_Q_EVCNT_DEFINE(txq, txdw) /* Tx descriptor interrupts */
- WM_Q_EVCNT_DEFINE(txq, txqe) /* Tx queue empty interrupts */
+ WM_Q_EVCNT_DEFINE(txq, txsstall); /* Stalled due to no txs */
+ WM_Q_EVCNT_DEFINE(txq, txdstall); /* Stalled due to no txd */
+ WM_Q_EVCNT_DEFINE(txq, fifo_stall); /* FIFO stalls (82547) */
+ WM_Q_EVCNT_DEFINE(txq, txdw); /* Tx descriptor interrupts */
+ WM_Q_EVCNT_DEFINE(txq, txqe); /* Tx queue empty interrupts */
/* XXX not used? */
- WM_Q_EVCNT_DEFINE(txq, ipsum) /* IP checksums comp. */
- WM_Q_EVCNT_DEFINE(txq, tusum) /* TCP/UDP cksums comp. */
- WM_Q_EVCNT_DEFINE(txq, tusum6) /* TCP/UDP v6 cksums comp. */
- WM_Q_EVCNT_DEF
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 27 14:41:43 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen for ticket #1482 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.11 -r1.1371.2.12 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.11 -r1.1370.2.12 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 27 14:41:43 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen for ticket #1482 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.11 -r1.1371.2.12 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.11 -r1.1370.2.12 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Sep 7 10:05:42 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1515: sys/dev/pci/if_wm.c 1.741-1.749, 1.753-1.757, 1.762 via patch sys/dev/pci/if_wmreg.h 1.126-1.127 - Fix I219 workaround in wm_flush_desc_rings(). - Add more statistics counters. - To avoid releasing mutex temporally, use new wm_set_mdio_slow_mode_hv_locked(). - No functional changes: - Turn a locking botch (shouldn't drop lock on error) into a KASSERT in wm_deferred_start_locked(). - Remove unneeded header inclusion. - Use __BIT() a little. - Modify comment and debug messages. - Consistency use -1 instead of 1 for some error code. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.645.2.13 -r1.645.2.14 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.115.2.5 -r1.115.2.6 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
