Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Feb 2017 23:04:26 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r313783 - in head: share/man/man4 share/man/man4/man4.i386 sys/conf sys/dev/aha sys/dev/buslogic sys/dev/ep sys/dev/mca sys/i386/bios sys/i386/conf sys/x86/isa sys/x86/x86 tools/kerneld...
Message-ID:  <201702152304.v1FN4QKA085281@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Wed Feb 15 23:04:25 2017
New Revision: 313783
URL: https://svnweb.freebsd.org/changeset/base/313783

Log:
  Remove Micro Channel Architecture support. Of the commonly available
  machines, only a few 486 machines that used it, and those haven't had
  enough memory to run FreeBSD for quite some time (often limited to
  16MB).
  
  Not to be confused with the Machine Check Architecture, which is still
  very much alive and used (and untouched by this commit).
  
  No Objection From: arch@

Deleted:
  head/sys/dev/aha/aha_mca.c
  head/sys/dev/buslogic/bt_mca.c
  head/sys/dev/ep/if_ep_mca.c
  head/sys/dev/mca/
  head/sys/i386/bios/mca_machdep.c
  head/sys/i386/bios/mca_machdep.h
  head/tools/kerneldoc/subsys/Doxyfile-dev_mca
Modified:
  head/share/man/man4/aha.4
  head/share/man/man4/le.4
  head/share/man/man4/man4.i386/ep.4
  head/sys/conf/files
  head/sys/conf/files.i386
  head/sys/conf/options
  head/sys/i386/conf/NOTES
  head/sys/x86/isa/atpic.c
  head/sys/x86/isa/clock.c
  head/sys/x86/isa/nmi.c
  head/sys/x86/x86/legacy.c

Modified: head/share/man/man4/aha.4
==============================================================================
--- head/share/man/man4/aha.4	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/share/man/man4/aha.4	Wed Feb 15 23:04:25 2017	(r313783)
@@ -74,10 +74,6 @@ locations and attaches to the first unat
 The possible
 port addresses for this card are 0x330, 0x334, 0x230, 0x234, 0x130, and
 0x134.
-.Pp
-The AHA-1640 is an MCA bus card.
-Since the MCA bus is a self-identifying bus, no setting of hints is
-required.
 .Sh HARDWARE
 The
 .Nm

Modified: head/share/man/man4/le.4
==============================================================================
--- head/share/man/man4/le.4	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/share/man/man4/le.4	Wed Feb 15 23:04:25 2017	(r313783)
@@ -204,19 +204,6 @@ bus Ethernet adapters.
 .\" .It
 .\" .Tn DEC DE422
 .\" .El
-.\" .Ss MCA
-.\" The
-.\" .Tn MCA
-.\" bus Ethernet cards supported by the
-.\" .Nm
-.\" driver are:
-.\" .Pp
-.\" .Bl -bullet -compact
-.\" .It
-.\" .Tn SKNET Personal MC2
-.\" .It
-.\" .Tn SKNET MC2+
-.\" .El
 .Ss PCI
 The
 .Tn PCI

Modified: head/share/man/man4/man4.i386/ep.4
==============================================================================
--- head/share/man/man4/man4.i386/ep.4	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/share/man/man4/man4.i386/ep.4	Wed Feb 15 23:04:25 2017	(r313783)
@@ -95,8 +95,6 @@ driver supports Ethernet adapters based 
 .It
 3Com 3C509B-TP, 3C509B-BNC, 3C509B-Combo, 3C509B-TPO, 3C509B-TPC ISA
 .It
-3Com 3C529, 3C529-TP MCA
-.It
 3Com 3C562/3C563 PCMCIA
 .It
 3Com 3C574, 3C574TX, 3C574-TX, 3CCFE574BT, 3CXFE574BT, 3C3FE574BT PCMCIA

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/conf/files	Wed Feb 15 23:04:25 2017	(r313783)
@@ -694,7 +694,6 @@ dev/agp/agp.c			optional agp pci
 dev/agp/agp_if.m		optional agp pci
 dev/aha/aha.c			optional aha
 dev/aha/aha_isa.c		optional aha isa
-dev/aha/aha_mca.c		optional aha mca
 dev/ahb/ahb.c			optional ahb eisa
 dev/ahci/ahci.c			optional ahci
 dev/ahci/ahciem.c		optional ahci
@@ -1265,7 +1264,6 @@ dev/bnxt/if_bnxt.c		optional bnxt iflib 
 dev/buslogic/bt.c		optional bt
 dev/buslogic/bt_eisa.c		optional bt eisa
 dev/buslogic/bt_isa.c		optional bt isa
-dev/buslogic/bt_mca.c		optional bt mca
 dev/buslogic/bt_pci.c		optional bt pci
 dev/bwi/bwimac.c		optional bwi
 dev/bwi/bwiphy.c		optional bwi
@@ -1609,7 +1607,6 @@ dev/en/midway.c			optional en
 dev/ep/if_ep.c			optional ep
 dev/ep/if_ep_eisa.c		optional ep eisa
 dev/ep/if_ep_isa.c		optional ep isa
-dev/ep/if_ep_mca.c		optional ep mca
 dev/ep/if_ep_pccard.c		optional ep pccard
 dev/esp/esp_pci.c		optional esp pci
 dev/esp/ncr53c9x.c		optional esp
@@ -2176,7 +2173,6 @@ dev/malo/if_malo.c		optional malo
 dev/malo/if_malohal.c		optional malo
 dev/malo/if_malo_pci.c		optional malo pci
 dev/mc146818/mc146818.c		optional mc146818
-dev/mca/mca_bus.c		optional mca
 dev/md/md.c			optional md
 dev/mdio/mdio_if.m		optional miiproxy | mdio
 dev/mdio/mdio.c			optional miiproxy | mdio

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/conf/files.i386	Wed Feb 15 23:04:25 2017	(r313783)
@@ -474,7 +474,6 @@ acpi_wakedata.h			optional acpi				\
 	clean		"acpi_wakedata.h"
 #
 i386/bios/apm.c			optional apm
-i386/bios/mca_machdep.c		optional mca
 i386/bios/smapi.c		optional smapi
 i386/bios/smapi_bios.S		optional smapi
 i386/cloudabi32/cloudabi32_sysvec.c	optional compat_cloudabi32

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/conf/options	Wed Feb 15 23:04:25 2017	(r313783)
@@ -723,7 +723,6 @@ ISAPNP			opt_isa.h
 # various 'device presence' options.
 DEV_BPF			opt_bpf.h
 DEV_CARP		opt_carp.h
-DEV_MCA			opt_mca.h
 DEV_NETMAP		opt_global.h
 DEV_PCI			opt_pci.h
 DEV_PF			opt_pf.h

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/i386/conf/NOTES	Wed Feb 15 23:04:25 2017	(r313783)
@@ -353,15 +353,6 @@ device		eisa
 options 	EISA_SLOTS=12
 
 #
-# MCA bus:
-#
-# The MCA bus device is `mca'.  It provides auto-detection and
-# configuration support for all devices on the MCA bus.
-# No hints are required for MCA.
-
-device		mca
-
-#
 # AGP GART support
 device		agp
 

Modified: head/sys/x86/isa/atpic.c
==============================================================================
--- head/sys/x86/isa/atpic.c	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/x86/isa/atpic.c	Wed Feb 15 23:04:25 2017	(r313783)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
-#include "opt_mca.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,9 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <x86/isa/icu.h>
 #include <isa/isareg.h>
 #include <isa/isavar.h>
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
 
 #ifdef __amd64__
 #define	SDT_ATPIC	SDT_SYSIGT
@@ -356,13 +352,7 @@ i8259_init(struct atpic *pic, int slave)
 
 	/* Reset the PIC and program with next four bytes. */
 	spinlock_enter();
-#ifdef DEV_MCA
-	/* MCA uses level triggered interrupts. */
-	if (MCA_system)
-		outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4 | ICW1_LTIM);
-	else
-#endif
-		outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4);
+	outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4);
 	imr_addr = pic->at_ioaddr + ICU_IMR_OFFSET;
 
 	/* Start vector. */
@@ -419,14 +409,6 @@ atpic_startup(void)
 		    ai->at_irq, ai->at_intr, SDT_ATPIC, SEL_KPL, GSEL_ATPIC);
 	}
 
-#ifdef DEV_MCA
-	/* For MCA systems, all interrupts are level triggered. */
-	if (MCA_system)
-		for (i = 0, ai = atintrs; i < NUM_ISA_IRQS; i++, ai++)
-			ai->at_trigger = INTR_TRIGGER_LEVEL;
-	else
-#endif
-
 	/*
 	 * Look for an ELCR.  If we find one, update the trigger modes.
 	 * If we don't find one, assume that IRQs 0, 1, 2, and 13 are

Modified: head/sys/x86/isa/clock.c
==============================================================================
--- head/sys/x86/isa/clock.c	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/x86/isa/clock.c	Wed Feb 15 23:04:25 2017	(r313783)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_clock.h"
 #include "opt_isa.h"
-#include "opt_mca.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,10 +72,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #endif
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 int	clkintr_pending;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
@@ -153,11 +148,6 @@ clkintr(void *arg)
 	if (sc->et.et_active && sc->mode != MODE_STOP)
 		sc->et.et_event_cb(&sc->et, sc->et.et_arg);
 
-#ifdef DEV_MCA
-	/* Reset clock interrupt by asserting bit 7 of port 0x61 */
-	if (MCA_system)
-		outb(0x61, inb(0x61) | 0x80);
-#endif
 	return (FILTER_HANDLED);
 }
 

Modified: head/sys/x86/isa/nmi.c
==============================================================================
--- head/sys/x86/isa/nmi.c	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/x86/isa/nmi.c	Wed Feb 15 23:04:25 2017	(r313783)
@@ -35,18 +35,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_mca.h"
-
 #include <sys/types.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 
 #include <machine/md_var.h>
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #define NMI_PARITY (1 << 7)
 #define NMI_IOCHAN (1 << 6)
 #define ENMI_WATCHDOG (1 << 7)
@@ -65,10 +59,6 @@ isa_nmi(int cd)
 	int eisa_port = inb(0x461);
 
 	log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port);
-#ifdef DEV_MCA
-	if (MCA_system && mca_bus_nmi())
-		return(0);
-#endif
 	
 	if (isa_port & NMI_PARITY) {
 		log(LOG_CRIT, "RAM parity error, likely hardware failure.");

Modified: head/sys/x86/x86/legacy.c
==============================================================================
--- head/sys/x86/x86/legacy.c	Wed Feb 15 20:17:55 2017	(r313782)
+++ head/sys/x86/x86/legacy.c	Wed Feb 15 23:04:25 2017	(r313783)
@@ -29,7 +29,6 @@
 
 #ifdef __i386__
 #include "opt_eisa.h"
-#include "opt_mca.h"
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -51,10 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/smp.h>
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #include <machine/clock.h>
 #include <machine/resource.h>
 #include <x86/legacyvar.h>
@@ -144,14 +139,6 @@ legacy_attach(device_t dev)
 		device_probe_and_attach(child);
 	}
 #endif
-#ifdef DEV_MCA
-	if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
-        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
-        	if (child == 0)
-                	panic("legacy_probe mca");
-		device_probe_and_attach(child);
-	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
 		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702152304.v1FN4QKA085281>