[src/trunk]: src/sys/arch Retire "le* at pci?" from the shipped kernel configs:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Retire "le* at pci?" from the shipped kernel configs:
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Sat, 25 Jan 2020 21:29:42 +0000
details:   https://anonhg.NetBSD.org/src/rev/70b6398f6a52
branches:  trunk
changeset: 744149:70b6398f6a52
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 25 18:38:34 2020 +0000

description:
Retire "le* at pci?" from the shipped kernel configs:
- If the config had both an le@pci and a pcn, simply remove le@pci
  (pcn would match at a higher priority anyway).
- If the config had le@pci enabled, but no pcn, change le@pci to pcn.
- If the config had le@pci commented out, but no pcn, change le@pci
  to pcn and leave it commented out.

The pcn driver supports more chips than le@pci and does DMA directly
to/from mbufs rather than memory copies.

diffstat:

 sys/arch/algor/conf/P4032            |  6 +++---
 sys/arch/algor/conf/P5064            |  6 +++---
 sys/arch/alpha/conf/GENERIC          |  6 +++---
 sys/arch/alpha/conf/INSTALL          |  4 ++--
 sys/arch/amd64/conf/ALL              |  5 ++---
 sys/arch/amd64/conf/GENERIC          |  5 ++---
 sys/arch/amd64/conf/XEN3_DOM0        |  5 ++---
 sys/arch/arc/conf/GENERIC            |  5 ++---
 sys/arch/arc/conf/MIMORI             |  4 ++--
 sys/arch/cats/conf/GENERIC           |  4 ++--
 sys/arch/cats/conf/INSTALL           |  4 ++--
 sys/arch/cobalt/conf/GENERIC         |  6 +++---
 sys/arch/cobalt/conf/INSTALL         |  6 +++---
 sys/arch/evbarm/conf/IXDP425         |  3 +--
 sys/arch/evbarm/conf/ZAO425          |  3 +--
 sys/arch/evbmips/conf/MALTA          |  5 ++---
 sys/arch/evbppc/conf/PMPPC           |  3 +--
 sys/arch/hppa/conf/GENERIC           |  6 ++----
 sys/arch/i386/conf/ALL               |  5 ++---
 sys/arch/i386/conf/GENERIC           |  5 ++---
 sys/arch/i386/conf/GENERIC_TINY      |  4 ++--
 sys/arch/i386/conf/INSTALL_FLOPPY    |  3 +--
 sys/arch/i386/conf/INSTALL_TINY      |  4 ++--
 sys/arch/i386/conf/XEN3PAE_DOM0      |  3 +--
 sys/arch/macppc/conf/GENERIC         |  5 ++---
 sys/arch/sgimips/conf/GENERIC32_IP3x |  5 ++---
 sys/arch/sparc64/conf/GENERIC        |  6 ++----
 27 files changed, 54 insertions(+), 72 deletions(-)

diffs (truncated from 616 to 300 lines):

diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/algor/conf/P4032 Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P4032,v 1.80 2020/01/20 18:38:19 thorpej Exp $
+#      $NetBSD: P4032,v 1.81 2020/01/25 18:38:34 thorpej Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P4032-$Revision: 1.80 $"
+#ident                 "P4032-$Revision: 1.81 $"
 
 maxusers 32
 
@@ -137,7 +137,7 @@
 #fxp*  at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 #gsip* at      pci? dev ? function ?           # NS DP83820 Gigabit Ethernet
 #isp*  at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
-#le*   at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
+#pcn*  at      pci? dev ? function ?           # PCnet-PCI Ethernet
 #pcib* at      pci? dev ? function ?           # Intel PCI-ISA Bridges
 #siop* at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 #mlx*  at      pci? dev ? function ?           # Mylex DAC960 / DEC SWXCR (untested)
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/algor/conf/P5064 Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P5064,v 1.91 2020/01/20 18:38:19 thorpej Exp $
+#      $NetBSD: P5064,v 1.92 2020/01/25 18:38:34 thorpej Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P5064-$Revision: 1.91 $"
+#ident                 "P5064-$Revision: 1.92 $"
 
 maxusers 32
 
@@ -133,7 +133,7 @@
 #fxp*  at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 #gsip* at      pci? dev ? function ?           # NS DP83820 Gigabit Ethernet
 #isp*  at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
-#le*   at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
+#pcn*  at      pci? dev ? function ?           # PCInet-PCI Ethernet
 pcib*  at      pci? dev ? function ?           # Intel PCI-ISA Bridges
 siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 #mlx*  at      pci? dev ? function ?           # Mylex DAC960 / DEC SWXCR (untested)
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.399 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.400 2020/01/25 18:38:34 thorpej Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.399 $"
+ident          "GENERIC-$Revision: 1.400 $"
 
 maxusers 32
 
@@ -313,7 +313,7 @@
 gsip*  at      pci? dev ? function ?           # NS DP83820 Gigabit Ethernet
 iha*   at      pci? dev ? function ?           # Initio INIC-940/950 SCSI
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
-le*    at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
+pcn*   at      pci? dev ? function ?           # PCnet-PCI Ethernet
 sf*    at      pci? dev ? function ?           # Adaptec AIC-6915 Ethernet
 siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 esiop* at      pci? dev ? function ?           # Symbios 53c875 SCSI and newer
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/alpha/conf/INSTALL
--- a/sys/arch/alpha/conf/INSTALL       Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/alpha/conf/INSTALL       Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.112 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: INSTALL,v 1.113 2020/01/25 18:38:34 thorpej Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -191,7 +191,7 @@
 gsip*  at      pci? dev ? function ?           # NS DP83820 Gigabit Ethernet
 iha*   at      pci? dev ? function ?           # Initio INIC-940/950 SCSI
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
-le*    at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
+pcn*   at      pci? dev ? function ?           # PCnet-PCI Ethernet
 sf*    at      pci? dev ? function ?           # Adaptec AIC-6915 Ethernet
 siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 mlx*   at      pci? dev ? function ?           # Mylex DAC960 / DEC SWXCR (untested)
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/amd64/conf/ALL   Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.141 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: ALL,v 1.142 2020/01/25 18:38:34 thorpej Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.141 $"
+#ident         "ALL-$Revision: 1.142 $"
 
 maxusers       64              # estimated number of users
 
@@ -989,7 +989,6 @@
 ixv*   at pci? dev ? function ?        # Intel 8259x 10G virtual function
 jme*   at pci? dev ? function ?        # JMicron JMC2[56]0 ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
-le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lii*   at pci? dev ? function ?        # Atheros L2 Fast-Ethernet
 malo*  at pci? dev ? function ?        # Marvell Libertas Wireless
 mcx*   at pci? dev ? function ?        # Mellanox 5th generation Ethernet
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.559 2020/01/24 18:58:46 nia Exp $
+# $NetBSD: GENERIC,v 1.560 2020/01/25 18:38:34 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.559 $"
+#ident         "GENERIC-$Revision: 1.560 $"
 
 maxusers       64              # estimated number of users
 
@@ -809,7 +809,6 @@
 ixv*   at pci? dev ? function ?        # Intel 8259x 10G virtual function
 jme*   at pci? dev ? function ?        # JMicron JMC2[56]0 ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
-le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lii*   at pci? dev ? function ?        # Atheros L2 Fast-Ethernet
 malo*  at pci? dev ? function ?        # Marvell Libertas Wireless
 mcx*   at pci? dev ? function ?        # Mellanox 5th generation Ethernet
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.172 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: XEN3_DOM0,v 1.173 2020/01/25 18:38:34 thorpej Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -11,7 +11,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOM0-$Revision: 1.172 $"
+#ident         "XEN3_DOM0-$Revision: 1.173 $"
 
 maxusers       32              # estimated number of users
 
@@ -351,7 +351,6 @@
 iwm*   at pci? dev ? function ?        # Intel Wireless WiFi Link 7xxx
 ixg*   at pci? dev ? function ?        # Intel 8259x 10 gigabit
 jme*   at pci? dev ? function ?        # JMicron JMC2[56]0 ethernet
-le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lii*   at pci? dev ? function ?        # Atheros L2 Fast-Ethernet
 mskc*  at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
 msk*   at mskc?                        # Marvell Yukon 2 Gigabit Ethernet
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/arc/conf/GENERIC Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.196 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.197 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.196 $"
+#ident         "GENERIC-$Revision: 1.197 $"
 
 maxusers       32              # estimated number of users
 
@@ -323,7 +323,6 @@
 fxp*           at pci? dev ? function ?        # Intel EtherExpress PRO
 gsip*          at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 #hme*          at pci? dev ? function ?        # Sun STP2002-STQ
-#le*           at pci? dev ? function ?        # PCnet-PCI Ethernet
 #mtd*          at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet
 ne*            at pci? dev ? function ?        # NE2000-compatible
 #ntwoc*                at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/arc/conf/MIMORI
--- a/sys/arch/arc/conf/MIMORI  Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/arc/conf/MIMORI  Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MIMORI,v 1.74 2020/01/19 01:25:04 thorpej Exp $
+#      $NetBSD: MIMORI,v 1.75 2020/01/25 18:38:35 thorpej Exp $
 #      NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #      MIMORI -- My NEC RISCstation 2250 (ur)
@@ -179,7 +179,7 @@
 
 ex*            at pci? dev ? function ?        # 3Com 90x[BC]
 fxp*           at pci? dev ? function ?        # Intel EtherExpress PRO
-le*            at pci? dev ? function ?        # PCnet-PCI
+pcn*           at pci? dev ? function ?        # PCnet-PCI
 ne*            at pci? dev ? function ?        # NE2000-compatible
 tlp*           at pci? dev ? function ?        # DECchip 21x4x and clones
 
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC        Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/cats/conf/GENERIC        Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.176 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.177 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -289,7 +289,7 @@
 ex*    at pci? dev ? function ?        # 3Com 90x[B]
 epic*  at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
-#le*   at pci? dev ? function ?        # PCnet-PCI Ethernet
+#pcn*  at pci? dev ? function ?        # PCnet-PCI Ethernet
 ne*    at pci? dev ? function ?        # NE2000 compat ethernet
 #ntwoc*        at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial
 sip*   at pci? dev ? function ?        # SiS 900 Ethernet
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/cats/conf/INSTALL
--- a/sys/arch/cats/conf/INSTALL        Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/cats/conf/INSTALL        Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.113 2020/01/20 18:38:19 thorpej Exp $
+#      $NetBSD: INSTALL,v 1.114 2020/01/25 18:38:35 thorpej Exp $
 #
 #      CATSINST -- CHALTECH CATS Install kernel
 #
@@ -235,7 +235,7 @@
 ex*    at pci? dev ? function ?        # 3Com 90x[B]
 epic*  at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
-#le*   at pci? dev ? function ?        # PCnet-PCI Ethernet
+#pcn*  at pci? dev ? function ?        # PCnet-PCI Ethernet
 ne*    at pci? dev ? function ?        # NE2000 compat ethernet
 #ntwoc*        at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial
 sip*   at pci? dev ? function ?        # SiS 900 Ethernet
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/cobalt/conf/GENERIC
--- a/sys/arch/cobalt/conf/GENERIC      Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/cobalt/conf/GENERIC      Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.165 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.166 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.165 $"
+#ident                 "GENERIC-$Revision: 1.166 $"
 
 maxusers       32
 
@@ -239,7 +239,7 @@
 #ex*           at pci? dev ? function ?        # 3Com 90x[BC]
 #epic*         at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 #fxp*          at pci? dev ? function ?        # Intel EtherExpress PRO10+/100B
-#le*           at pci? dev ? function ?        # PCnet-PCI Ethernet
+#pcn*          at pci? dev ? function ?        # PCnet-PCI Ethernet
 #ne*           at pci? dev ? function ?        # NE2000-compatible Ethernet
 #ntwoc*                at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial
 ral*           at pci? dev ? function ?        # ralink wifi
diff -r 81b89b82f414 -r 70b6398f6a52 sys/arch/cobalt/conf/INSTALL
--- a/sys/arch/cobalt/conf/INSTALL      Sat Jan 25 18:30:41 2020 +0000
+++ b/sys/arch/cobalt/conf/INSTALL      Sat Jan 25 18:38:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.73 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: INSTALL,v 1.74 2020/01/25 18:38:35 thorpej Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "INSTALL-$Revision: 1.73 $"
+#ident                 "INSTALL-$Revision: 1.74 $"
Prev by Date: [src/trunk]: src/lib/libpthread Adjustment to previous: don't call _lwp_unpar...
Next by Date: [src/trunk]: src/share/man/man4 Remove references to le@pci, and direct users...
Previous by Thread: [src/trunk]: src/lib/libpthread Adjustment to previous: don't call _lwp_unpar...
Next by Thread: [src/trunk]: src/share/man/man4 Remove references to le@pci, and direct users...
Indexes:
Home | Main Index | Thread Index | Old Index