Skip to content

Commit

Permalink
drivers/block: Remove PARIDE core and high-level protocols
Browse files Browse the repository at this point in the history
Remove PARIDE core and high level protocols, taking care not to break
low-level drivers (used by pata_parport). Also update documentation.

Signed-off-by: Ondrej Zary <linux@zary.sk>
Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
  • Loading branch information
Ondrej Zary authored and Damien Le Moal committed Jan 31, 2023
1 parent 246a1c4 commit 7750d8b
Show file tree
Hide file tree
Showing 33 changed files with 110 additions and 6,354 deletions.
440 changes: 78 additions & 362 deletions Documentation/admin-guide/blockdev/paride.rst

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Documentation/admin-guide/kernel-parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ parameter is applicable::
NFS Appropriate NFS support is enabled.
OF Devicetree is enabled.
PV_OPS A paravirtualized kernel is enabled.
PARIDE The ParIDE (parallel port IDE) subsystem is enabled.
PARISC The PA-RISC architecture is enabled.
PCI PCI bus support is enabled.
PCIE PCI Express support is enabled.
Expand Down
16 changes: 0 additions & 16 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4120,10 +4120,6 @@

pcbit= [HW,ISDN]

pcd. [PARIDE]
See header of drivers/block/paride/pcd.c.
See also Documentation/admin-guide/blockdev/paride.rst.

pci=option[,option...] [PCI] various PCI subsystem options.

Some options herein operate on a specific device
Expand Down Expand Up @@ -4386,9 +4382,6 @@
for debug and development, but should not be
needed on a platform with proper driver support.

pd. [PARIDE]
See Documentation/admin-guide/blockdev/paride.rst.

pdcchassis= [PARISC,HW] Disable/Enable PDC Chassis Status codes at
boot time.
Format: { 0 | 1 }
Expand All @@ -4401,12 +4394,6 @@
allocator. This parameter is primarily for debugging
and performance comparison.

pf. [PARIDE]
See Documentation/admin-guide/blockdev/paride.rst.

pg. [PARIDE]
See Documentation/admin-guide/blockdev/paride.rst.

pirq= [SMP,APIC] Manual mp-table setup
See Documentation/x86/i386/IO-APIC.rst.

Expand Down Expand Up @@ -4568,9 +4555,6 @@

pstore.backend= Specify the name of the pstore backend to use

pt. [PARIDE]
See Documentation/admin-guide/blockdev/paride.rst.

pti= [X86-64] Control Page Table Isolation of user and
kernel address spaces. Disabling this feature
removes hardening, but improves performance of
Expand Down
7 changes: 0 additions & 7 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -15844,13 +15844,6 @@ F: arch/*/include/asm/paravirt*.h
F: arch/*/kernel/paravirt*
F: include/linux/hypervisor.h

PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
M: Tim Waugh <tim@cyberelk.net>
L: linux-parport@lists.infradead.org (subscribers-only)
S: Maintained
F: Documentation/admin-guide/blockdev/paride.rst
F: drivers/block/paride/

PARISC ARCHITECTURE
M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
M: Helge Deller <deller@gmx.de>
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ config PATA_WINBOND_VLB

config PATA_PARPORT
tristate "Parallel port IDE device support"
depends on PARPORT_PC && PARIDE=n
depends on PARPORT_PC
help
There are many external CD-ROM and disk devices that connect through
your computer's parallel port. Most of them are actually IDE devices
Expand Down
27 changes: 0 additions & 27 deletions drivers/block/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -103,33 +103,6 @@ config GDROM
Most users will want to say "Y" here.
You can also build this as a module which will be called gdrom.

config PARIDE
tristate "Parallel port IDE device support"
depends on PARPORT_PC
help
There are many external CD-ROM and disk devices that connect through
your computer's parallel port. Most of them are actually IDE devices
using a parallel port IDE adapter. This option enables the PARIDE
subsystem which contains drivers for many of these external drives.
Read <file:Documentation/admin-guide/blockdev/paride.rst> for more information.

If you have said Y to the "Parallel-port support" configuration
option, you may share a single port between your printer and other
parallel port devices. Answer Y to build PARIDE support into your
kernel, or M if you would like to build it as a loadable module. If
your parallel port support is in a loadable module, you must build
PARIDE as a module. If you built PARIDE support into your kernel,
you may still build the individual protocol modules and high-level
drivers as loadable modules. If you build this support as a module,
it will be called paride.

To use the PARIDE support, you must say Y or M here and also to at
least one high-level driver (e.g. "Parallel port IDE disks",
"Parallel port ATAPI CD-ROMs", "Parallel port ATAPI disks" etc.) and
to at least one protocol driver (e.g. "ATEN EH-100 protocol",
"MicroSolutions backpack protocol", "DataStor Commuter protocol"
etc.).

source "drivers/block/paride/Kconfig"

source "drivers/block/mtip32xx/Kconfig"
Expand Down
121 changes: 16 additions & 105 deletions drivers/block/paride/Kconfig
Original file line number Diff line number Diff line change
@@ -1,102 +1,13 @@
# SPDX-License-Identifier: GPL-2.0
#
# PARIDE configuration
#
# PARIDE doesn't need PARPORT, but if PARPORT is configured as a module,
# PARIDE must also be a module.
# PARIDE only supports PC style parports. Tough for USB or other parports...

comment "Parallel IDE high-level drivers"
depends on PARIDE

config PARIDE_PD
tristate "Parallel port IDE disks"
depends on PARIDE
help
This option enables the high-level driver for IDE-type disk devices
connected through a parallel port. If you chose to build PARIDE
support into your kernel, you may answer Y here to build in the
parallel port IDE driver, otherwise you should answer M to build
it as a loadable module. The module will be called pd. You
must also have at least one parallel port protocol driver in your
system. Among the devices supported by this driver are the SyQuest
EZ-135, EZ-230 and SparQ drives, the Avatar Shark and the backpack
hard drives from MicroSolutions.

config PARIDE_PCD
tristate "Parallel port ATAPI CD-ROMs"
depends on PARIDE
select CDROM
help
This option enables the high-level driver for ATAPI CD-ROM devices
connected through a parallel port. If you chose to build PARIDE
support into your kernel, you may answer Y here to build in the
parallel port ATAPI CD-ROM driver, otherwise you should answer M to
build it as a loadable module. The module will be called pcd. You
must also have at least one parallel port protocol driver in your
system. Among the devices supported by this driver are the
MicroSolutions backpack CD-ROM drives and the Freecom Power CD. If
you have such a CD-ROM drive, you should also say Y or M to "ISO
9660 CD-ROM file system support" below, because that's the file
system used on CD-ROMs.

config PARIDE_PF
tristate "Parallel port ATAPI disks"
depends on PARIDE
help
This option enables the high-level driver for ATAPI disk devices
connected through a parallel port. If you chose to build PARIDE
support into your kernel, you may answer Y here to build in the
parallel port ATAPI disk driver, otherwise you should answer M
to build it as a loadable module. The module will be called pf.
You must also have at least one parallel port protocol driver in
your system. Among the devices supported by this driver are the
MicroSolutions backpack PD/CD drive and the Imation Superdisk
LS-120 drive.

config PARIDE_PT
tristate "Parallel port ATAPI tapes"
depends on PARIDE
help
This option enables the high-level driver for ATAPI tape devices
connected through a parallel port. If you chose to build PARIDE
support into your kernel, you may answer Y here to build in the
parallel port ATAPI disk driver, otherwise you should answer M
to build it as a loadable module. The module will be called pt.
You must also have at least one parallel port protocol driver in
your system. Among the devices supported by this driver is the
parallel port version of the HP 5GB drive.

config PARIDE_PG
tristate "Parallel port generic ATAPI devices"
depends on PARIDE
help
This option enables a special high-level driver for generic ATAPI
devices connected through a parallel port. The driver allows user
programs, such as cdrtools, to send ATAPI commands directly to a
device.

If you chose to build PARIDE support into your kernel, you may
answer Y here to build in the parallel port generic ATAPI driver,
otherwise you should answer M to build it as a loadable module. The
module will be called pg.

You must also have at least one parallel port protocol driver in
your system.

This driver implements an API loosely related to the generic SCSI
driver. See <file:include/linux/pg.h>. for details.

You can obtain the most recent version of cdrtools from
<ftp://ftp.berlios.de/pub/cdrecord/>. Versions 1.6.1a3 and
later fully support this driver.

comment "Parallel IDE protocol modules"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT

config PARIDE_ATEN
tristate "ATEN EH-100 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the ATEN EH-100 parallel port IDE
protocol. This protocol is used in some inexpensive low performance
Expand All @@ -109,7 +20,7 @@ config PARIDE_ATEN

config PARIDE_BPCK
tristate "MicroSolutions backpack (Series 5) protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the Micro Solutions BACKPACK
parallel port Series 5 IDE protocol. (Most BACKPACK drives made
Expand All @@ -127,7 +38,7 @@ config PARIDE_BPCK

config PARIDE_BPCK6
tristate "MicroSolutions backpack (Series 6) protocol"
depends on (PARIDE || PATA_PARPORT) && !64BIT
depends on (PATA_PARPORT) && !64BIT
help
This option enables support for the Micro Solutions BACKPACK
parallel port Series 6 IDE protocol. (Most BACKPACK drives made
Expand All @@ -146,7 +57,7 @@ config PARIDE_BPCK6

config PARIDE_COMM
tristate "DataStor Commuter protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the Commuter parallel port IDE
protocol from DataStor. If you chose to build PARIDE support
Expand All @@ -157,7 +68,7 @@ config PARIDE_COMM

config PARIDE_DSTR
tristate "DataStor EP-2000 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the EP-2000 parallel port IDE
protocol from DataStor. If you chose to build PARIDE support
Expand All @@ -168,7 +79,7 @@ config PARIDE_DSTR

config PARIDE_FIT2
tristate "FIT TD-2000 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the TD-2000 parallel port IDE
protocol from Fidelity International Technology. This is a simple
Expand All @@ -181,7 +92,7 @@ config PARIDE_FIT2

config PARIDE_FIT3
tristate "FIT TD-3000 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the TD-3000 parallel port IDE
protocol from Fidelity International Technology. This protocol is
Expand All @@ -194,7 +105,7 @@ config PARIDE_FIT3

config PARIDE_EPAT
tristate "Shuttle EPAT/EPEZ protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the EPAT parallel port IDE protocol.
EPAT is a parallel port IDE adapter manufactured by Shuttle
Expand All @@ -216,7 +127,7 @@ config PARIDE_EPATC8

config PARIDE_EPIA
tristate "Shuttle EPIA protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the (obsolete) EPIA parallel port
IDE protocol from Shuttle Technology. This adapter can still be
Expand All @@ -228,7 +139,7 @@ config PARIDE_EPIA

config PARIDE_FRIQ
tristate "Freecom IQ ASIC-2 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for version 2 of the Freecom IQ parallel
port IDE adapter. This adapter is used by the Maxell Superdisk
Expand All @@ -240,7 +151,7 @@ config PARIDE_FRIQ

config PARIDE_FRPW
tristate "FreeCom power protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the Freecom power parallel port IDE
protocol. If you chose to build PARIDE support into your kernel, you
Expand All @@ -251,7 +162,7 @@ config PARIDE_FRPW

config PARIDE_KBIC
tristate "KingByte KBIC-951A/971A protocols"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the KBIC-951A and KBIC-971A parallel
port IDE protocols from KingByte Information Corp. KingByte's
Expand All @@ -264,7 +175,7 @@ config PARIDE_KBIC

config PARIDE_KTTI
tristate "KT PHd protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the "PHd" parallel port IDE protocol
from KT Technology. This is a simple (low speed) adapter that is
Expand All @@ -277,7 +188,7 @@ config PARIDE_KTTI

config PARIDE_ON20
tristate "OnSpec 90c20 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the (obsolete) 90c20 parallel port
IDE protocol from OnSpec (often marketed under the ValuStore brand
Expand All @@ -289,7 +200,7 @@ config PARIDE_ON20

config PARIDE_ON26
tristate "OnSpec 90c26 protocol"
depends on PARIDE || PATA_PARPORT
depends on PATA_PARPORT
help
This option enables support for the 90c26 parallel port IDE protocol
from OnSpec Electronics (often marketed under the ValuStore brand
Expand Down
6 changes: 0 additions & 6 deletions drivers/block/paride/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Rewritten to use lists instead of if-statements.
#

obj-$(CONFIG_PARIDE) += paride.o
obj-$(CONFIG_PARIDE_ATEN) += aten.o
obj-$(CONFIG_PARIDE_BPCK) += bpck.o
obj-$(CONFIG_PARIDE_COMM) += comm.o
Expand All @@ -22,8 +21,3 @@ obj-$(CONFIG_PARIDE_ON20) += on20.o
obj-$(CONFIG_PARIDE_ON26) += on26.o
obj-$(CONFIG_PARIDE_KTTI) += ktti.o
obj-$(CONFIG_PARIDE_BPCK6) += bpck6.o
obj-$(CONFIG_PARIDE_PD) += pd.o
obj-$(CONFIG_PARIDE_PCD) += pcd.o
obj-$(CONFIG_PARIDE_PF) += pf.o
obj-$(CONFIG_PARIDE_PT) += pt.o
obj-$(CONFIG_PARIDE_PG) += pg.o
Loading

0 comments on commit 7750d8b

Please sign in to comment.