Skip to content

Commit a88dc06

Browse files
author
Paul Gortmaker
committed
scsi: delete the MCA specific drivers and driver code
The support for CONFIG_MCA is being removed, since the 20 year old hardware simply isn't capable of meeting today's software demands on CPU and memory resources. This commit removes the MCA specific SCSI drivers, and the MCA specific portions of code in dual role ISA/MCA drivers. Also, the MCA specific SCSI documentation is removed. Cc: James Bottomley <JBottomley@parallels.com> Cc: linux-scsi@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
1 parent d157be8 commit a88dc06

File tree

10 files changed

+6
-5414
lines changed

10 files changed

+6
-5414
lines changed

Documentation/scsi/00-INDEX

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ g_NCR5380.txt
5656
- info on driver for NCR5380 and NCR53c400 based adapters
5757
hptiop.txt
5858
- HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
59-
ibmmca.txt
60-
- info on driver for IBM adapters with MCA bus
6159
in2000.txt
6260
- info on in2000 driver
6361
libsas.txt

Documentation/scsi/ibmmca.txt

Lines changed: 0 additions & 1402 deletions
This file was deleted.

Documentation/scsi/scsi-parameters.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ parameters may be changed at runtime by the command
3737

3838
eata= [HW,SCSI]
3939

40-
fd_mcs= [HW,SCSI]
41-
See header of drivers/scsi/fd_mcs.c.
42-
4340
fdomain= [HW,SCSI]
4441
See header of drivers/scsi/fdomain.c.
4542

@@ -48,9 +45,6 @@ parameters may be changed at runtime by the command
4845

4946
gvp11= [HW,SCSI]
5047

51-
ibmmcascsi= [HW,MCA,SCSI] IBM MicroChannel SCSI adapter
52-
See Documentation/mca.txt.
53-
5448
in2000= [HW,SCSI]
5549
See header of drivers/scsi/in2000.c.
5650

Documentation/scsi/scsi_mid_low_api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ the motherboard (or both). Some aic7xxx based HBAs are dual controllers
3030
and thus represent two hosts. Like most modern HBAs, each aic7xxx host
3131
has its own PCI device address. [The one-to-one correspondence between
3232
a SCSI host and a PCI device is common but not required (e.g. with
33-
ISA or MCA adapters).]
33+
ISA adapters).]
3434

3535
The SCSI mid level isolates an LLD from other layers such as the SCSI
3636
upper layer drivers and the block layer.

drivers/scsi/Kconfig

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -807,19 +807,6 @@ config SCSI_FUTURE_DOMAIN
807807
To compile this driver as a module, choose M here: the
808808
module will be called fdomain.
809809

810-
config SCSI_FD_MCS
811-
tristate "Future Domain MCS-600/700 SCSI support"
812-
depends on MCA_LEGACY && SCSI
813-
---help---
814-
This is support for Future Domain MCS 600/700 MCA SCSI adapters.
815-
Some PS/2 computers are equipped with IBM Fast SCSI Adapter/A which
816-
is identical to the MCS 700 and hence also supported by this driver.
817-
This driver also supports the Reply SB16/SCSI card (the SCSI part).
818-
It supports multiple adapters in the same system.
819-
820-
To compile this driver as a module, choose M here: the
821-
module will be called fd_mcs.
822-
823810
config SCSI_GDTH
824811
tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
825812
depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
@@ -889,76 +876,6 @@ config SCSI_GENERIC_NCR53C400
889876
not detect your card. See the file
890877
<file:Documentation/scsi/g_NCR5380.txt> for details.
891878

892-
config SCSI_IBMMCA
893-
tristate "IBMMCA SCSI support"
894-
depends on MCA && SCSI
895-
---help---
896-
This is support for the IBM SCSI adapter found in many of the PS/2
897-
series computers. These machines have an MCA bus, so you need to
898-
answer Y to "MCA support" as well and read
899-
<file:Documentation/mca.txt>.
900-
901-
If the adapter isn't found during boot (a common problem for models
902-
56, 57, 76, and 77) you'll need to use the 'ibmmcascsi=<pun>' kernel
903-
option, where <pun> is the id of the SCSI subsystem (usually 7, but
904-
if that doesn't work check your reference diskette). Owners of
905-
model 95 with a LED-matrix-display can in addition activate some
906-
activity info like under OS/2, but more informative, by setting
907-
'ibmmcascsi=display' as an additional kernel parameter. Try "man
908-
bootparam" or see the documentation of your boot loader about how to
909-
pass options to the kernel.
910-
911-
To compile this driver as a module, choose M here: the
912-
module will be called ibmmca.
913-
914-
config IBMMCA_SCSI_ORDER_STANDARD
915-
bool "Standard SCSI-order"
916-
depends on SCSI_IBMMCA
917-
---help---
918-
In the PC-world and in most modern SCSI-BIOS-setups, SCSI-hard disks
919-
are assigned to the drive letters, starting with the lowest SCSI-id
920-
(physical number -- pun) to be drive C:, as seen from DOS and
921-
similar operating systems. When looking into papers describing the
922-
ANSI-SCSI-standard, this assignment of drives appears to be wrong.
923-
The SCSI-standard follows a hardware-hierarchy which says that id 7
924-
has the highest priority and id 0 the lowest. Therefore, the host
925-
adapters are still today everywhere placed as SCSI-id 7 by default.
926-
In the SCSI-standard, the drive letters express the priority of the
927-
disk. C: should be the hard disk, or a partition on it, with the
928-
highest priority. This must therefore be the disk with the highest
929-
SCSI-id (e.g. 6) and not the one with the lowest! IBM-BIOS kept the
930-
original definition of the SCSI-standard as also industrial- and
931-
process-control-machines, like VME-CPUs running under realtime-OSes
932-
(e.g. LynxOS, OS9) do.
933-
934-
If you like to run Linux on your MCA-machine with the same
935-
assignment of hard disks as seen from e.g. DOS or OS/2 on your
936-
machine, which is in addition conformant to the SCSI-standard, you
937-
must say Y here. This is also necessary for MCA-Linux users who want
938-
to keep downward compatibility to older releases of the
939-
IBM-MCA-SCSI-driver (older than driver-release 2.00 and older than
940-
June 1997).
941-
942-
If you like to have the lowest SCSI-id assigned as drive C:, as
943-
modern SCSI-BIOSes do, which does not conform to the standard, but
944-
is widespread and common in the PC-world of today, you must say N
945-
here. If unsure, say Y.
946-
947-
config IBMMCA_SCSI_DEV_RESET
948-
bool "Reset SCSI-devices at boottime"
949-
depends on SCSI_IBMMCA
950-
---help---
951-
By default, SCSI-devices are reset when the machine is powered on.
952-
However, some devices exist, like special-control-devices,
953-
SCSI-CNC-machines, SCSI-printer or scanners of older type, that do
954-
not reset when switched on. If you say Y here, each device connected
955-
to your SCSI-bus will be issued a reset-command after it has been
956-
probed, while the kernel is booting. This may cause problems with
957-
more modern devices, like hard disks, which do not appreciate these
958-
reset commands, and can cause your system to hang. So say Y only if
959-
you know that one of your older devices needs it; N is the safe
960-
answer.
961-
962879
config SCSI_IPS
963880
tristate "IBM ServeRAID support"
964881
depends on PCI && SCSI

drivers/scsi/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ obj-$(CONFIG_SCSI_AIC94XX) += aic94xx/
7575
obj-$(CONFIG_SCSI_PM8001) += pm8001/
7676
obj-$(CONFIG_SCSI_ISCI) += isci/
7777
obj-$(CONFIG_SCSI_IPS) += ips.o
78-
obj-$(CONFIG_SCSI_FD_MCS) += fd_mcs.o
7978
obj-$(CONFIG_SCSI_FUTURE_DOMAIN)+= fdomain.o
8079
obj-$(CONFIG_SCSI_IN2000) += in2000.o
8180
obj-$(CONFIG_SCSI_GENERIC_NCR5380) += g_NCR5380.o
@@ -100,7 +99,6 @@ obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/
10099
obj-$(CONFIG_SCSI_ZALON) += zalon7xx.o
101100
obj-$(CONFIG_SCSI_EATA_PIO) += eata_pio.o
102101
obj-$(CONFIG_SCSI_7000FASST) += wd7000.o
103-
obj-$(CONFIG_SCSI_IBMMCA) += ibmmca.o
104102
obj-$(CONFIG_SCSI_EATA) += eata.o
105103
obj-$(CONFIG_SCSI_DC395x) += dc395x.o
106104
obj-$(CONFIG_SCSI_DC390T) += tmscsim.o

drivers/scsi/aha1542.c

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Added module command-line options
2323
* 19-Jul-99
2424
* Modified by Adam Fritzler
25-
* Added proper detection of the AHA-1640 (MCA version of AHA-1540)
25+
* Added proper detection of the AHA-1640 (MCA, now deleted)
2626
*/
2727

2828
#include <linux/module.h>
@@ -37,8 +37,6 @@
3737
#include <linux/spinlock.h>
3838
#include <linux/isapnp.h>
3939
#include <linux/blkdev.h>
40-
#include <linux/mca.h>
41-
#include <linux/mca-legacy.h>
4240
#include <linux/slab.h>
4341

4442
#include <asm/dma.h>
@@ -71,7 +69,7 @@
7169
#define MAXBOARDS 4 /* Increase this and the sizes of the
7270
arrays below, if you need more.. */
7371

74-
/* Boards 3,4 slots are reserved for ISAPnP/MCA scans */
72+
/* Boards 3,4 slots are reserved for ISAPnP scans */
7573

7674
static unsigned int bases[MAXBOARDS] __initdata = {0x330, 0x334, 0, 0};
7775

@@ -1008,66 +1006,6 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)
10081006
}
10091007
#endif
10101008

1011-
/*
1012-
* Find MicroChannel cards (AHA1640)
1013-
*/
1014-
#ifdef CONFIG_MCA_LEGACY
1015-
if(MCA_bus) {
1016-
int slot = 0;
1017-
int pos = 0;
1018-
1019-
for (indx = 0; (slot != MCA_NOTFOUND) && (indx < ARRAY_SIZE(bases)); indx++) {
1020-
1021-
if (bases[indx])
1022-
continue;
1023-
1024-
/* Detect only AHA-1640 cards -- MCA ID 0F1F */
1025-
slot = mca_find_unused_adapter(0x0f1f, slot);
1026-
if (slot == MCA_NOTFOUND)
1027-
break;
1028-
1029-
/* Found one */
1030-
pos = mca_read_stored_pos(slot, 3);
1031-
1032-
/* Decode address */
1033-
if (pos & 0x80) {
1034-
if (pos & 0x02) {
1035-
if (pos & 0x01)
1036-
bases[indx] = 0x334;
1037-
else
1038-
bases[indx] = 0x234;
1039-
} else {
1040-
if (pos & 0x01)
1041-
bases[indx] = 0x134;
1042-
}
1043-
} else {
1044-
if (pos & 0x02) {
1045-
if (pos & 0x01)
1046-
bases[indx] = 0x330;
1047-
else
1048-
bases[indx] = 0x230;
1049-
} else {
1050-
if (pos & 0x01)
1051-
bases[indx] = 0x130;
1052-
}
1053-
}
1054-
1055-
/* No need to decode IRQ and Arb level -- those are
1056-
* read off the card later.
1057-
*/
1058-
printk(KERN_INFO "Found an AHA-1640 in MCA slot %d, I/O 0x%04x\n", slot, bases[indx]);
1059-
1060-
mca_set_adapter_name(slot, "Adapter AHA-1640");
1061-
mca_set_adapter_procfn(slot, NULL, NULL);
1062-
mca_mark_as_used(slot);
1063-
1064-
/* Go on */
1065-
slot++;
1066-
}
1067-
1068-
}
1069-
#endif
1070-
10711009
/*
10721010
* Hunt for ISA Plug'n'Pray Adaptecs (AHA1535)
10731011
*/

0 commit comments

Comments
 (0)