RFC: Removing Visual Workstation and NUMAQ
Subsystems (8)
H. Peter Anvin
reviewerI would like to remove Visual Workstation and NUMAQ from the x86 kernel.
This removes a fair bit of code which from the current looks is only
being made to suffer general patches:
Visual Workstation:
Documentation/sgi-visws.txt | 13 - MAINTAINERS | 7 - arch/x86/Kconfig | 13 - arch/x86/include/asm/visws/cobalt.h | 127 ----- arch/x86/include/asm/visws/lithium.h | 53 -- arch/x86/include/asm/visws/piix4.h | 107 ---- arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/pci/Makefile | 2 - arch/x86/pci/visws.c | 87 ---- arch/x86/platform/Makefile | 1 - arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 ----------------------- 12 files changed, 1024 deletions(-)
NUMAQ:
arch/x86/include/asm/numaq.h | 171 ---------- arch/x86/kernel/apic/Makefile | 1 - arch/x86/kernel/apic/numaq_32.c | 524 ------------------------------ arch/x86/pci/Makefile | 1 - arch/x86/pci/numaq_32.c | 165 ---------- 5 files changed, 862 deletions(-)
If there still are people who care about these platforms, please speak up.
-hpa
Paul E. McKenney
Acked-byQuoted 30 lines · H. Peter Anvin
I would like to remove Visual Workstation and NUMAQ from the x86 kernel.
This removes a fair bit of code which from the current looks is only
being made to suffer general patches:Visual Workstation:
Documentation/sgi-visws.txt | 13 - MAINTAINERS | 7 - arch/x86/Kconfig | 13 - arch/x86/include/asm/visws/cobalt.h | 127 ----- arch/x86/include/asm/visws/lithium.h | 53 -- arch/x86/include/asm/visws/piix4.h | 107 ---- arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/pci/Makefile | 2 - arch/x86/pci/visws.c | 87 ---- arch/x86/platform/Makefile | 1 - arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 ----------------------- 12 files changed, 1024 deletions(-)NUMAQ:
arch/x86/include/asm/numaq.h | 171 ---------- arch/x86/kernel/apic/Makefile | 1 - arch/x86/kernel/apic/numaq_32.c | 524 ------------------------------ arch/x86/pci/Makefile | 1 - arch/x86/pci/numaq_32.c | 165 ---------- 5 files changed, 862 deletions(-)
Quoted 3 lines
If there still are people who care about these platforms, please speak up.
From a NUMAQ viewpoint:
Thanx, Paul
tip-bot for H. Peter Anvin
merge bot[tip:x86/nuke-platforms] x86, platforms: Remove SGI Visual Workstation
In reply to H. Peter Anvinx86, platforms: Remove SGI Visual Workstation
Commit-ID: 10f032c61d12fc4df9c9632ee08e71f1152e1691 Gitweb: http://git.kernel.org/tip/10f032c61d12fc4df9c9632ee08e71f1152e1691 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 25 Feb 2014 12:05:34 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 25 Feb 2014 13:38:27 -0800
x86, platforms: Remove SGI Visual Workstation
The SGI Visual Workstation seems to be dead; remove support so we don't have to continue maintaining it.
--- Documentation/sgi-visws.txt | 13 - MAINTAINERS | 7 - arch/x86/Kconfig | 13 - arch/x86/include/asm/visws/cobalt.h | 127 ------- arch/x86/include/asm/visws/lithium.h | 53 --- arch/x86/include/asm/visws/piix4.h | 107 ------ arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/pci/Makefile | 2 - arch/x86/pci/visws.c | 87 ----- arch/x86/platform/Makefile | 1 - arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 --------------------------------- 12 files changed, 1024 deletions(-)
Documentation/sgi-visws.txt deleted +0 -13
@@ -1,13 +0,0 @@ - -The SGI Visual Workstations (models 320 and 540) are based around -the Cobalt, Lithium, and Arsenic ASICs. The Cobalt ASIC is the -main system ASIC which interfaces the 1-4 IA32 cpus, the memory -system, and the I/O system in the Lithium ASIC. The Cobalt ASIC -also contains the 3D gfx rendering engine which renders to main -system memory -- part of which is used as the frame buffer which -is DMA'ed to a video connector using the Arsenic ASIC. A PIIX4 -chip and NS87307 are used to provide legacy device support (IDE, -serial, floppy, and parallel). - -The Visual Workstation chipset largely conforms to the PC architecture -with some notable exceptions such as interrupt handling.
MAINTAINERS +0 -7
@@ -7757,13 +7757,6 @@ F: Documentation/ia64/serial.txt F: drivers/tty/serial/ioc?_serial.c F: include/linux/ioc?.h -SGI VISUAL WORKSTATION 320 AND 540 -M: Andrey Panin <[email protected]> -L: [email protected] -W: http://linux-visws.sf.net -S: Maintained for 2.6. -F: Documentation/sgi-visws.txt - SGI XP/XPC/XPNET DRIVER M: Cliff Whickman <[email protected]> M: Robin Holt <[email protected]>
arch/x86/Kconfig +0 -13
@@ -517,19 +517,6 @@ config X86_SUPPORTS_MEMORY_FAILURE depends on X86_64 || !SPARSEMEM select ARCH_SUPPORTS_MEMORY_FAILURE -config X86_VISWS - bool "SGI 320/540 (Visual Workstation)" - depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT - depends on X86_32_NON_STANDARD - ---help--- - The SGI Visual Workstation series is an IA32-based workstation - based on SGI systems chips with some legacy PC hardware attached. - - Say Y here to create a kernel to run on the SGI 320 or 540. - - A kernel compiled for the Visual Workstation will run on general - PCs as well. See <file:Documentation/sgi-visws.txt> for details. - config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI
arch/x86/include/asm/visws/cobalt.h deleted +0 -127
127 lines not on this page · raw message
arch/x86/include/asm/visws/lithium.h deleted +0 -53
53 lines not on this page · raw message
arch/x86/include/asm/visws/piix4.h deleted +0 -107
107 lines not on this page · raw message
arch/x86/include/asm/visws/sgivw.h deleted +0 -5
@@ -1,5 +0,0 @@ -/* -* Frame buffer position and size: -*/ -extern unsigned long sgivwfb_mem_phys; -extern unsigned long sgivwfb_mem_size;
arch/x86/pci/Makefile +0 -2
@@ -13,8 +13,6 @@ obj-y += legacy.o irq.o obj-$(CONFIG_STA2X11) += sta2x11-fixup.o -obj-$(CONFIG_X86_VISWS) += visws.o - obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o
arch/x86/pci/visws.c deleted +0 -87
87 lines not on this page · raw message
arch/x86/platform/Makefile +0 -1
@@ -9,5 +9,4 @@ obj-y += olpc/ obj-y += scx200/ obj-y += sfi/ obj-y += ts5500/ -obj-y += visws/ obj-y += uv/
arch/x86/platform/visws/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-$(CONFIG_X86_VISWS) += visws_quirks.o
arch/x86/platform/visws/visws_quirks.c deleted +0 -608
608 lines not on this page · raw message
Paul Gortmaker
Acked-byQuoted 30 lines · H. Peter Anvin
I would like to remove Visual Workstation and NUMAQ from the x86 kernel.
This removes a fair bit of code which from the current looks is only
being made to suffer general patches:Visual Workstation:
Documentation/sgi-visws.txt | 13 - MAINTAINERS | 7 - arch/x86/Kconfig | 13 - arch/x86/include/asm/visws/cobalt.h | 127 ----- arch/x86/include/asm/visws/lithium.h | 53 -- arch/x86/include/asm/visws/piix4.h | 107 ---- arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/pci/Makefile | 2 - arch/x86/pci/visws.c | 87 ---- arch/x86/platform/Makefile | 1 - arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 ----------------------- 12 files changed, 1024 deletions(-)NUMAQ:
arch/x86/include/asm/numaq.h | 171 ---------- arch/x86/kernel/apic/Makefile | 1 - arch/x86/kernel/apic/numaq_32.c | 524 ------------------------------ arch/x86/pci/Makefile | 1 - arch/x86/pci/numaq_32.c | 165 ---------- 5 files changed, 862 deletions(-)
Quoted 1 line
If there still are people who care about these platforms, please speak up.
Yay, more ancient stuff removed; less wasted time on all the coverage builds done around the world.
I see the tip bot mail ; so I'll pull that and have a look around for any additional visws/NUMAQ stuff that may still be present but orphaned. In the meantime...
Thanks,
Paul.
--
Quoted 3 lines
-hpa
tip-bot for H. Peter Anvin
merge bot[tip:x86/nuke-platforms] x86, platforms: Remove SGI Visual Workstation
In reply to H. Peter Anvinx86, platforms: Remove SGI Visual Workstation
Commit-ID: c5f9ee3d665a7660b296aa1e91949ae3376f0d07 Gitweb: http://git.kernel.org/tip/c5f9ee3d665a7660b296aa1e91949ae3376f0d07 Author: H. Peter Anvin <[email protected]> AuthorDate: Tue, 25 Feb 2014 12:05:34 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 27 Feb 2014 08:07:39 -0800
x86, platforms: Remove SGI Visual Workstation
The SGI Visual Workstation seems to be dead; remove support so we don't have to continue maintaining it.
--- Documentation/00-INDEX | 2 - Documentation/sgi-visws.txt | 13 - Documentation/sound/oss/vwsnd | 293 --- MAINTAINERS | 7 - arch/x86/Kconfig | 17 - arch/x86/include/asm/fixmap.h | 6 - arch/x86/include/asm/hw_irq.h | 1 - arch/x86/include/asm/setup.h | 6 - arch/x86/include/asm/visws/cobalt.h | 127 -- arch/x86/include/asm/visws/lithium.h | 53 - arch/x86/include/asm/visws/piix4.h | 107 - arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/kernel/apic/apic.c | 1 - arch/x86/kernel/setup.c | 1 - arch/x86/pci/Makefile | 2 - arch/x86/pci/common.c | 5 +- arch/x86/pci/visws.c | 87 - arch/x86/platform/Makefile | 1 - arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 ------ arch/x86/xen/Kconfig | 2 +- drivers/pci/Makefile | 1 - drivers/scsi/qla1280.c | 7 - drivers/video/Kconfig | 11 +- drivers/video/Makefile | 1 - drivers/video/gbefb.c | 4 - drivers/video/logo/Kconfig | 2 +- drivers/video/logo/logo.c | 2 +- drivers/video/sgivwfb.c | 889 -------- include/video/sgivw.h | 681 ------- sound/oss/Kconfig | 9 - sound/oss/Makefile | 1 - sound/oss/vwsnd.c | 3506 -------------------------------- 33 files changed, 5 insertions(+), 6454 deletions(-)
Documentation/00-INDEX +0 -2
@@ -401,8 +401,6 @@ serial-console.txt - how to set up Linux with a serial line console as the default. sgi-ioc4.txt - description of the SGI IOC4 PCI (multi function) device. -sgi-visws.txt - - short blurb on the SGI Visual Workstations. sh/ - directory with info on porting Linux to a new architecture. smsc_ece1099.txt
Documentation/sgi-visws.txt deleted +0 -13
@@ -1,13 +0,0 @@ - -The SGI Visual Workstations (models 320 and 540) are based around -the Cobalt, Lithium, and Arsenic ASICs. The Cobalt ASIC is the -main system ASIC which interfaces the 1-4 IA32 cpus, the memory -system, and the I/O system in the Lithium ASIC. The Cobalt ASIC -also contains the 3D gfx rendering engine which renders to main -system memory -- part of which is used as the frame buffer which -is DMA'ed to a video connector using the Arsenic ASIC. A PIIX4 -chip and NS87307 are used to provide legacy device support (IDE, -serial, floppy, and parallel). - -The Visual Workstation chipset largely conforms to the PC architecture -with some notable exceptions such as interrupt handling.
Documentation/sound/oss/vwsnd deleted +0 -293
293 lines not on this page · raw message
MAINTAINERS +0 -7
@@ -7757,13 +7757,6 @@ F: Documentation/ia64/serial.txt F: drivers/tty/serial/ioc?_serial.c F: include/linux/ioc?.h -SGI VISUAL WORKSTATION 320 AND 540 -M: Andrey Panin <[email protected]> -L: [email protected] -W: http://linux-visws.sf.net -S: Maintained for 2.6. -F: Documentation/sgi-visws.txt - SGI XP/XPC/XPNET DRIVER M: Cliff Whickman <[email protected]> M: Robin Holt <[email protected]>
arch/x86/Kconfig +0 -17
@@ -517,19 +517,6 @@ config X86_SUPPORTS_MEMORY_FAILURE depends on X86_64 || !SPARSEMEM select ARCH_SUPPORTS_MEMORY_FAILURE -config X86_VISWS - bool "SGI 320/540 (Visual Workstation)" - depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT - depends on X86_32_NON_STANDARD - ---help--- - The SGI Visual Workstation series is an IA32-based workstation - based on SGI systems chips with some legacy PC hardware attached. - - Say Y here to create a kernel to run on the SGI 320 or 540. - - A kernel compiled for the Visual Workstation will run on general - PCs as well. See <file:Documentation/sgi-visws.txt> for details. - config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI
@@ -860,10 +847,6 @@ config X86_IO_APIC def_bool y depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI -config X86_VISWS_APIC - def_bool y - depends on X86_32 && X86_VISWS - config X86_REROUTE_FOR_BROKEN_BOOT_IRQS bool "Reroute for broken boot IRQs" depends on X86_IO_APIC
arch/x86/include/asm/fixmap.h +0 -6
@@ -98,12 +98,6 @@ enum fixed_addresses {FIX_IO_APIC_BASE_0 ,FIX_IO_APIC_BASE_END =FIX_IO_APIC_BASE_0 +MAX_IO_APICS -1 , #endif -#ifdef CONFIG_X86_VISWS_APIC -FIX_CO_CPU ,/* Cobalt timer */ -FIX_CO_APIC ,/* Cobalt APIC Redirection Table */ -FIX_LI_PCIA ,/* Lithium PCI Bridge A */ -FIX_LI_PCIB ,/* Lithium PCI Bridge B */ -#endifFIX_RO_IDT ,/* Virtual mapping for read-only IDT */ #ifdef CONFIG_X86_32 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
arch/x86/include/asm/hw_irq.h +0 -1
@@ -98,7 +98,6 @@ extern void trace_call_function_single_interrupt(void);#define IO_APIC_IRQ (x) (((x) >= NR_IRQS_LEGACY) || ((1<<(x)) & io_apic_irqs))extern unsigned long io_apic_irqs; -extern void init_VISWS_APIC_irqs (void );extern void setup_IO_APIC (void );extern void disable_IO_APIC (void );
arch/x86/include/asm/setup.h +0 -6
@@ -39,12 +39,6 @@ static inline void vsmp_init(void) { }void setup_bios_corruption_check (void ); -#ifdef CONFIG_X86_VISWS -extern void visws_early_detect (void ); -#else -static inline void visws_early_detect (void ) { } -#endif -extern unsigned long saved_video_mode;extern void reserve_standard_io_resources (void );
arch/x86/include/asm/visws/cobalt.h deleted +0 -127
127 lines not on this page · raw message
arch/x86/include/asm/visws/lithium.h deleted +0 -53
53 lines not on this page · raw message
arch/x86/include/asm/visws/piix4.h deleted +0 -107
107 lines not on this page · raw message
arch/x86/include/asm/visws/sgivw.h deleted +0 -5
@@ -1,5 +0,0 @@ -/* -* Frame buffer position and size: -*/ -extern unsigned long sgivwfb_mem_phys; -extern unsigned long sgivwfb_mem_size;
arch/x86/kernel/apic/apic.c +0 -1
@@ -2132,7 +2132,6 @@ int generic_processor_info(int apicid, int version)* * - arch/x86/kernel/mpparse.c: MP_processor_info() * - arch/x86/mm/amdtopology.c: amd_numa_init() -* - arch/x86/platform/visws/visws_quirks.c: MP_processor_info() * * This function is executed with the modified * boot_cpu_physical_apicid. So, disabled_cpu_apicid kernel
arch/x86/kernel/setup.c +0 -1
@@ -869,7 +869,6 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_32 memcpy (&boot_cpu_data, &new_cpu_data,sizeof (new_cpu_data)); -visws_early_detect ();/* * copy kernel address range established so far and switch
arch/x86/pci/Makefile +0 -2
@@ -13,8 +13,6 @@ obj-y += legacy.o irq.o obj-$(CONFIG_STA2X11) += sta2x11-fixup.o -obj-$(CONFIG_X86_VISWS) += visws.o - obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o
arch/x86/pci/common.c +1 -4
@@ -561,7 +561,6 @@ char * __init pcibios_setup(char *str) pci_probe |=PCI_PROBE_NOEARLY ;return NULL ; } -#ifndef CONFIG_X86_VISWS else if (!strcmp (str,"usepirqmask" )) { pci_probe |=PCI_USE_PIRQ_MASK ;return NULL ;
@@ -571,9 +570,7 @@ char * __init pcibios_setup(char *str) }else if (!strncmp (str,"lastbus=" ,8 )) { pcibios_last_bus =simple_strtol (str+8 ,NULL ,0 );return NULL ; - } -#endif - else if (!strcmp(str, "rom")) { + }else if (!strcmp (str,"rom" )) { pci_probe |=PCI_ASSIGN_ROMS ;return NULL ; }else if (!strcmp (str,"norom" )) {
arch/x86/pci/visws.c deleted +0 -87
87 lines not on this page · raw message
arch/x86/platform/Makefile +0 -1
@@ -9,5 +9,4 @@ obj-y += olpc/ obj-y += scx200/ obj-y += sfi/ obj-y += ts5500/ -obj-y += visws/ obj-y += uv/
arch/x86/platform/visws/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-$(CONFIG_X86_VISWS) += visws_quirks.o
arch/x86/platform/visws/visws_quirks.c deleted +0 -608
608 lines not on this page · raw message
arch/x86/xen/Kconfig +1 -1
@@ -7,7 +7,7 @@ config XEN depends on PARAVIRT select PARAVIRT_CLOCK select XEN_HAVE_PVMMU - depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS) + depends on X86_64 || (X86_32 && X86_PAE) depends on X86_TSC help This is the Linux Xen port. Enabling this will allow the
drivers/pci/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o obj-$(CONFIG_PPC) += setup-bus.o obj-$(CONFIG_FRV) += setup-bus.o obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o -obj-$(CONFIG_X86_VISWS) += setup-irq.o obj-$(CONFIG_MN10300) += setup-bus.o obj-$(CONFIG_MICROBLAZE) += setup-bus.o obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
drivers/scsi/qla1280.c +0 -7
@@ -379,14 +379,7 @@#define DEBUG_PRINT_NVRAM 0#define DEBUG_QLA1280 0 -/* -* The SGI VISWS is broken and doesn't support MMIO ;-( -*/ -#ifdef CONFIG_X86_VISWS -#define MEMORY_MAPPED_IO 0 -#else #define MEMORY_MAPPED_IO 1 -#endif #include "qla1280.h"
drivers/video/Kconfig +1 -10
@@ -802,18 +802,9 @@ config FB_HGA As this card technology is at least 25 years old, most people will answer N here. -config FB_SGIVW - tristate "SGI Visual Workstation framebuffer support" - depends on FB && X86_VISWS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - SGI Visual Workstation support for framebuffer graphics. - config FB_GBE bool "SGI Graphics Backend frame buffer support" - depends on (FB = y) && (SGI_IP32 || X86_VISWS) + depends on (FB = y) && SGI_IP32 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
drivers/video/Makefile +0 -1
@@ -75,7 +75,6 @@ obj-$(CONFIG_FB_CG14) += cg14.o sbuslib.o obj-$(CONFIG_FB_P9100) += p9100.o sbuslib.o obj-$(CONFIG_FB_TCX) += tcx.o sbuslib.o obj-$(CONFIG_FB_LEO) += leo.o sbuslib.o -obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o obj-$(CONFIG_FB_ATARI) += atafb.o c2p_iplan2.o atafb_mfb.o \ atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
drivers/video/gbefb.c +0 -4
@@ -45,10 +45,6 @@ struct gbefb_par {#define GBE_BASE 0x16000000/* SGI O2 */ #endif -#ifdef CONFIG_X86_VISWS -#define GBE_BASE 0xd0000000/* SGI Visual Workstation */ -#endif -/* macro for fastest write-though access to the framebuffer */ #ifdef CONFIG_MIPS #ifdef CONFIG_CPU_R10000
drivers/video/logo/Kconfig +1 -1
@@ -54,7 +54,7 @@ config LOGO_PARISC_CLUT224 config LOGO_SGI_CLUT224 bool "224-color SGI Linux logo" - depends on SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS + depends on SGI_IP22 || SGI_IP27 || SGI_IP32 default y config LOGO_SUN_CLUT224
drivers/video/logo/logo.c +1 -1
@@ -81,7 +81,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) logo = &logo_parisc_clut224;#endif #ifdef CONFIG_LOGO_SGI_CLUT224 -/* SGI Linux logo on MIPS/MIPS64 and VISWS */ +/* SGI Linux logo on MIPS/MIPS64 */ logo = &logo_sgi_clut224;#endif #ifdef CONFIG_LOGO_SUN_CLUT224
drivers/video/sgivwfb.c deleted +0 -889
889 lines not on this page · raw message
include/video/sgivw.h deleted +0 -681
611 lines not on this page · raw message
sound/oss/vwsnd.c deleted +0 -3506
3,506 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.