RFC: remove sn2, hpsim and ia64 machvecs
Subsystems (13)
Hi Tony,
let me know what you think of this series. This drops the pretty much dead sn2 and hpsim support, which then allows us to build a single ia64 kernel image that supports all remaining systems without extra indirections in the fast path.
A git tree is also available at:
git://git.infradead.org/users/hch/misc.git ia64-remove-machvecs
Gitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/ia64-remove-machvecs
PATCH 1/29 char: remove the SGI snsc driver
The SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/char/Kconfig | 8 - drivers/char/Makefile | 1 - drivers/char/snsc.c | 469 -------------------------- drivers/char/snsc.h | 92 ----- drivers/char/snsc_event.c | 303 ----------------- 7 files changed, 875 deletions(-) delete mode 100644 drivers/char/snsc.c delete mode 100644 drivers/char/snsc.h delete mode 100644 drivers/char/snsc_event.c
arch/ia64/configs/generic_defconfig +0 -1
@@ -90,7 +90,6 @@ CONFIG_IGB=y # CONFIG_SERIO_SERPORT is not set CONFIG_GAMEPORT=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SGI_SNSC=y CONFIG_SGI_TIOCX=y CONFIG_SGI_MBCS=m CONFIG_SERIAL_8250=y
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_E1000=y # CONFIG_SERIO_SERPORT is not set CONFIG_GAMEPORT=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SGI_SNSC=y CONFIG_SGI_TIOCX=y CONFIG_SGI_MBCS=m CONFIG_SERIAL_8250=y
drivers/char/Kconfig +0 -8
@@ -26,14 +26,6 @@ config DEVKMEM kind of kernel debugging operations. When in doubt, say "N". -config SGI_SNSC - bool "SGI Altix system controller communication support" - depends on (IA64_SGI_SN2 || IA64_GENERIC) - help - If you have an SGI Altix and you want to enable system - controller communication from user space (you want this!), - say Y. Otherwise, say N. - config SGI_TIOCX bool "SGI TIO CX driver support" depends on (IA64_SGI_SN2 || IA64_GENERIC)
drivers/char/Makefile +0 -1
@@ -9,7 +9,6 @@ obj-y += misc.o obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o -obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MSPEC) += mspec.o obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o obj-$(CONFIG_IBM_BSR) += bsr.o
drivers/char/snsc.c deleted +0 -469
469 lines not on this page · raw message
drivers/char/snsc.h deleted +0 -92
92 lines not on this page · raw message
drivers/char/snsc_event.c deleted +0 -303
303 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/29 char: remove the SGI tiocx/mbcs driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 2 - arch/ia64/configs/gensparse_defconfig | 2 - arch/ia64/sn/kernel/Makefile | 1 - arch/ia64/sn/kernel/tiocx.c | 569 ------------------ drivers/char/Kconfig | 14 - drivers/char/Makefile | 1 - drivers/char/mbcs.c | 831 -------------------------- drivers/char/mbcs.h | 553 ----------------- 8 files changed, 1973 deletions(-) delete mode 100644 arch/ia64/sn/kernel/tiocx.c delete mode 100644 drivers/char/mbcs.c delete mode 100644 drivers/char/mbcs.h
arch/ia64/configs/generic_defconfig +0 -2
@@ -90,8 +90,6 @@ CONFIG_IGB=y # CONFIG_SERIO_SERPORT is not set CONFIG_GAMEPORT=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SGI_TIOCX=y -CONFIG_SGI_MBCS=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6
arch/ia64/configs/gensparse_defconfig +0 -2
@@ -79,8 +79,6 @@ CONFIG_E1000=y # CONFIG_SERIO_SERPORT is not set CONFIG_GAMEPORT=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SGI_TIOCX=y -CONFIG_SGI_MBCS=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6
arch/ia64/sn/kernel/Makefile +0 -1
@@ -14,5 +14,4 @@ obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \ io_init.o iomv.o klconflib.o pio_phys.o \ sn2/ obj-$(CONFIG_IA64_GENERIC) += machvec.o -obj-$(CONFIG_SGI_TIOCX) += tiocx.o obj-$(CONFIG_PCI_MSI) += msi_sn.o
arch/ia64/sn/kernel/tiocx.c deleted +0 -568
568 lines not on this page · raw message
drivers/char/Kconfig +0 -14
@@ -26,20 +26,6 @@ config DEVKMEM kind of kernel debugging operations. When in doubt, say "N". -config SGI_TIOCX - bool "SGI TIO CX driver support" - depends on (IA64_SGI_SN2 || IA64_GENERIC) - help - If you have an SGI Altix and you have fpga devices attached - to your TIO, say Y here, otherwise say N. - -config SGI_MBCS - tristate "SGI FPGA Core Services driver support" - depends on SGI_TIOCX - help - If you have an SGI Altix with an attached SABrick - say Y or M here, otherwise say N. - source "drivers/tty/serial/Kconfig" source "drivers/tty/serdev/Kconfig"
drivers/char/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_MSPEC) += mspec.o obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o obj-$(CONFIG_IBM_BSR) += bsr.o -obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_PRINTER) += lp.o
drivers/char/mbcs.c deleted +0 -825
825 lines not on this page · raw message
drivers/char/mbcs.h deleted +0 -553
553 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 3/29 char/agp: remove the sgi-agp driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/char/agp/Kconfig | 7 - drivers/char/agp/Makefile | 1 - drivers/char/agp/sgi-agp.c | 338 -------------------------- 5 files changed, 348 deletions(-) delete mode 100644 drivers/char/agp/sgi-agp.c
arch/ia64/configs/generic_defconfig +0 -1
@@ -104,7 +104,6 @@ CONFIG_HPET=y CONFIG_AGP=m CONFIG_AGP_I460=m CONFIG_AGP_HP_ZX1=m -CONFIG_AGP_SGI_TIOCA=m CONFIG_DRM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -94,7 +94,6 @@ CONFIG_HPET=y CONFIG_AGP=m CONFIG_AGP_I460=m CONFIG_AGP_HP_ZX1=m -CONFIG_AGP_SGI_TIOCA=m CONFIG_DRM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m
drivers/char/agp/Kconfig +0 -7
@@ -150,13 +150,6 @@ config AGP_EFFICEON This option gives you AGP support for the Transmeta Efficeon series processors with integrated northbridges. -config AGP_SGI_TIOCA - tristate "SGI TIO chipset AGP support" - depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC) - help - This option gives you AGP GART support for the SGI TIO chipset - for IA64 processors. - config INTEL_GTT tristate depends on X86 && PCI
drivers/char/agp/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_AGP_I460) += i460-agp.o obj-$(CONFIG_AGP_INTEL) += intel-agp.o obj-$(CONFIG_INTEL_GTT) += intel-gtt.o obj-$(CONFIG_AGP_NVIDIA) += nvidia-agp.o -obj-$(CONFIG_AGP_SGI_TIOCA) += sgi-agp.o obj-$(CONFIG_AGP_SIS) += sis-agp.o obj-$(CONFIG_AGP_SWORKS) += sworks-agp.o obj-$(CONFIG_AGP_UNINORTH) += uninorth-agp.o
drivers/char/agp/sgi-agp.c deleted +0 -331
331 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 4/29 ide: remove the sgiioc4 driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/Kconfig | 2 - drivers/ide/Kconfig | 9 - drivers/ide/Makefile | 1 - drivers/ide/sgiioc4.c | 630 -------------------------- 6 files changed, 644 deletions(-) delete mode 100644 drivers/ide/sgiioc4.c
arch/ia64/configs/generic_defconfig +0 -1
@@ -51,7 +51,6 @@ CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_CMD64X=y CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_SGIIOC4=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=m
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -44,7 +44,6 @@ CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_CMD64X=y CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_SGIIOC4=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m
drivers/Kconfig +0 -2
@@ -30,8 +30,6 @@ source "drivers/block/Kconfig" source "drivers/nvme/Kconfig" -# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4 - source "drivers/misc/Kconfig" source "drivers/ide/Kconfig"
drivers/ide/Kconfig +0 -9
@@ -567,15 +567,6 @@ config BLK_DEV_SVWKS This driver adds PIO/(U)DMA support for the ServerWorks OSB4/CSB5 chipsets. -config BLK_DEV_SGIIOC4 - tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support" - depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4 - select BLK_DEV_IDEDMA_PCI - help - This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4 - chipset, which has one channel and can support two devices. - Please say Y here if you have an Altix System from SGI. - config BLK_DEV_SIIMAGE tristate "Silicon Image chipset support" select BLK_DEV_IDEDMA_PCI
drivers/ide/Makefile +0 -1
@@ -59,7 +59,6 @@ obj-$(CONFIG_BLK_DEV_PDC202XX_NEW) += pdc202xx_new.o obj-$(CONFIG_BLK_DEV_PIIX) += piix.o obj-$(CONFIG_BLK_DEV_RZ1000) += rz1000.o obj-$(CONFIG_BLK_DEV_SVWKS) += serverworks.o -obj-$(CONFIG_BLK_DEV_SGIIOC4) += sgiioc4.o obj-$(CONFIG_BLK_DEV_SIIMAGE) += siimage.o obj-$(CONFIG_BLK_DEV_SIS5513) += sis5513.o obj-$(CONFIG_BLK_DEV_SL82C105) += sl82c105.o
drivers/ide/sgiioc4.c deleted +0 -627
627 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 5/29 PCI/hotplug: remove the sgi_hotplug driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- drivers/pci/hotplug/Kconfig | 9 - drivers/pci/hotplug/Makefile | 1 - drivers/pci/hotplug/sgi_hotplug.c | 700 ------------------------------ 3 files changed, 710 deletions(-) delete mode 100644 drivers/pci/hotplug/sgi_hotplug.c
drivers/pci/hotplug/Kconfig +0 -9
@@ -147,15 +147,6 @@ config HOTPLUG_PCI_RPA_DLPAR When in doubt, say N. -config HOTPLUG_PCI_SGI - tristate "SGI PCI Hotplug Support" - depends on IA64_SGI_SN2 || IA64_GENERIC - help - Say Y here if you want to use the SGI Altix Hotplug - Driver for PCI devices. - - When in doubt, say N. - config HOTPLUG_PCI_S390 bool "System z PCI Hotplug Support" depends on S390 && 64BIT
drivers/pci/hotplug/Makefile +0 -1
@@ -18,7 +18,6 @@ obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o obj-$(CONFIG_HOTPLUG_PCI_POWERNV) += pnv-php.o obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o -obj-$(CONFIG_HOTPLUG_PCI_SGI) += sgi_hotplug.o obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o obj-$(CONFIG_HOTPLUG_PCI_S390) += s390_pci_hpc.o
drivers/pci/hotplug/sgi_hotplug.c deleted +0 -700
700 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 6/29 tty/serial: remove the sn_console driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - arch/ia64/kernel/setup.c | 7 - drivers/tty/serial/Kconfig | 10 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/sn_console.c | 1036 ------------------------- 6 files changed, 1056 deletions(-) delete mode 100644 drivers/tty/serial/sn_console.c
arch/ia64/configs/generic_defconfig +0 -1
@@ -94,7 +94,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_SERIAL_SGI_IOC4=y # CONFIG_HW_RANDOM is not set CONFIG_EFI_RTC=y
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -83,7 +83,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_SERIAL_SGI_IOC4=y CONFIG_SERIAL_SGI_IOC3=y # CONFIG_HW_RANDOM is not set
arch/ia64/kernel/setup.c +0 -7
@@ -463,13 +463,6 @@ early_console_setup (char *cmdline) {int earlycons =0 ; -#ifdef CONFIG_SERIAL_SGI_L1_CONSOLE - { -extern int sn_serial_console_early_setup (void ); -if (!sn_serial_console_early_setup ()) - earlycons++; - } -#endif #ifdef CONFIG_EFI_PCDP if (!efi_setup_pcdp_console (cmdline)) earlycons++;
drivers/tty/serial/Kconfig +0 -10
@@ -855,16 +855,6 @@ config SERIAL_CPM_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) -config SERIAL_SGI_L1_CONSOLE - bool "SGI Altix L1 serial console support" - depends on IA64_GENERIC || IA64_SGI_SN2 - select SERIAL_CORE - select SERIAL_CORE_CONSOLE - help - If you have an SGI Altix and you would like to use the system - controller serial port as your console (you want this!), - say Y. Otherwise, say N. - config SERIAL_PIC32 tristate "Microchip PIC32 serial support" depends on MACH_PIC32
drivers/tty/serial/Makefile +0 -1
@@ -41,7 +41,6 @@ obj-$(CONFIG_SERIAL_HS_LPC32XX) += lpc32xx_hs.o obj-$(CONFIG_SERIAL_DZ) += dz.o obj-$(CONFIG_SERIAL_ZS) += zs.o obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o -obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o obj-$(CONFIG_SERIAL_CPM) += cpm_uart/ obj-$(CONFIG_SERIAL_IMX) += imx.o obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o
drivers/tty/serial/sn_console.c deleted +0 -1030
1,030 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 7/29 tty/serial: remove the ioc4_serial driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/tty/serial/Kconfig | 9 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/ioc4_serial.c | 2955 ------------------------- 5 files changed, 2967 deletions(-) delete mode 100644 drivers/tty/serial/ioc4_serial.c
arch/ia64/configs/generic_defconfig +0 -1
@@ -94,7 +94,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SGI_IOC4=y # CONFIG_HW_RANDOM is not set CONFIG_EFI_RTC=y CONFIG_RAW_DRIVER=m
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -83,7 +83,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SGI_IOC4=y CONFIG_SERIAL_SGI_IOC3=y # CONFIG_HW_RANDOM is not set CONFIG_EFI_RTC=y
drivers/tty/serial/Kconfig +0 -9
@@ -972,15 +972,6 @@ config SERIAL_JSM To compile this driver as a module, choose M here: the module will be called jsm. -config SERIAL_SGI_IOC4 - tristate "SGI IOC4 controller serial support" - depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC4 - select SERIAL_CORE - help - If you have an SGI Altix with an IOC4 based Base IO card - and wish to use the serial ports on this card, say Y. - Otherwise, say N. - config SERIAL_SGI_IOC3 tristate "SGI Altix IOC3 serial support" depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC3
drivers/tty/serial/Makefile +0 -1
@@ -52,7 +52,6 @@ obj-$(CONFIG_SERIAL_SC16IS7XX_CORE) += sc16is7xx.o obj-$(CONFIG_SERIAL_JSM) += jsm/ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o -obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
drivers/tty/serial/ioc4_serial.c deleted +0 -2952
2,952 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 8/29 tty/serial: remove the ioc3_serial driver
In reply to Christoph HellwigThe SGI SN2 support is about to be removed. Remove this driver that depends on the SN2 support.
--- MAINTAINERS | 6 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/tty/serial/Kconfig | 8 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/ioc3_serial.c | 2195 ------------------------- 5 files changed, 2211 deletions(-) delete mode 100644 drivers/tty/serial/ioc3_serial.c
MAINTAINERS +0 -6
@@ -8399,12 +8399,6 @@ L: [email protected] S: Maintained F: drivers/net/ethernet/sgi/ioc3-eth.c -IOC3 SERIAL DRIVER -M: Pat Gefre <[email protected]> -L: [email protected] -S: Maintained -F: drivers/tty/serial/ioc3_serial.c - IOMAP FILESYSTEM LIBRARY M: Christoph Hellwig <[email protected]> M: Darrick J. Wong <[email protected]>
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -83,7 +83,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SGI_IOC3=y # CONFIG_HW_RANDOM is not set CONFIG_EFI_RTC=y CONFIG_RAW_DRIVER=m
drivers/tty/serial/Kconfig +0 -8
@@ -972,14 +972,6 @@ config SERIAL_JSM To compile this driver as a module, choose M here: the module will be called jsm. -config SERIAL_SGI_IOC3 - tristate "SGI Altix IOC3 serial support" - depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC3 - select SERIAL_CORE - help - If you have an SGI Altix with an IOC3 serial card, - say Y or M. Otherwise, say N. - config SERIAL_MSM tristate "MSM on-chip serial port support" depends on ARCH_QCOM
drivers/tty/serial/Makefile +0 -1
@@ -52,7 +52,6 @@ obj-$(CONFIG_SERIAL_SC16IS7XX_CORE) += sc16is7xx.o obj-$(CONFIG_SERIAL_JSM) += jsm/ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o -obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o obj-$(CONFIG_SERIAL_MSM) += msm_serial.o
drivers/tty/serial/ioc3_serial.c deleted +0 -2193
2,193 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 9/29 char/mspec: remove SGI SN2 support
In reply to Christoph HellwigThe SGI SN2 support is about to be removed, so drops the bits specific to it from this driver.
--- drivers/char/mspec.c | 155 +++---------------------------------------- 1 file changed, 11 insertions(+), 144 deletions(-)
drivers/char/mspec.c +11 -144
@@ -9,11 +9,8 @@* * This driver exports the SN special memory (mspec) facility to user * processes. -* There are three types of memory made available thru this driver: -* fetchops, uncached and cached. -* -* Fetchops are atomic memory operations that are implemented in the -* memory controller on SGI SN hardware. +* There are two types of memory made available thru this driver: +* uncached and cached. * * Uncached are used for memory write combining feature of the ia64 * cpu.
@@ -46,16 +43,8 @@#include <linux/atomic.h> #include <asm/tlbflush.h> #include <asm/uncached.h> -#include <asm/sn/addrs.h> -#include <asm/sn/arch.h> -#include <asm/sn/mspec.h> -#include <asm/sn/sn_cpuid.h> -#include <asm/sn/io.h> -#include <asm/sn/bte.h> -#include <asm/sn/shubio.h> -#define FETCHOP_ID "SGI Fetchop,"#define CACHED_ID "Cached,"#define UNCACHED_ID "Uncached"#define REVISION "4.0"
@@ -65,17 +54,10 @@* Page types allocated by the device. */ enum mspec_page_type { -MSPEC_FETCHOP =1 , -MSPEC_CACHED , +MSPEC_CACHED =2 ,MSPEC_UNCACHED }; -#ifdef CONFIG_SGI_SN -static int is_sn2; -#else -#define is_sn2 0 -#endif -/* * One of these structures is allocated when an mspec region is mmaped. The * structure is pointed to by the vma->vm_private_data field in the vma struct.
@@ -96,39 +78,6 @@ struct vma_data {unsigned long maddr[0 ];/* Array of MSPEC addresses. */ }; -/* used on shub2 to clear FOP cache in the HUB */ -static unsigned long scratch_page[MAX_NUMNODES ]; -#define SH2_AMO_CACHE_ENTRIES 4 - -static inline int -mspec_zero_block (unsigned long addr,int len) -{ -int status; - -if (is_sn2) { -if (is_shub2 ()) { -int nid; -void *p; -int i; - - nid =nasid_to_cnodeid (get_node_number (__pa (addr))); - p = (void *)TO_AMO (scratch_page[nid]); - -for (i=0 ; i <SH2_AMO_CACHE_ENTRIES ; i++) { -FETCHOP_LOAD_OP (p,FETCHOP_LOAD ); - p +=FETCHOP_VAR_SIZE ; - } - } - - status =bte_copy (0 , addr & ~__IA64_UNCACHED_OFFSET, len, -BTE_WACQUIRE |BTE_ZERO_FILL ,NULL ); - }else { -memset ((char *) addr,0 , len); - status =0 ; - } -return status; -} -/* * mspec_open *
@@ -173,11 +122,8 @@ mspec_close(struct vm_area_struct *vma)*/ my_page = vdata->maddr[index]; vdata->maddr[index] =0 ; -if (!mspec_zero_block (my_page,PAGE_SIZE )) -uncached_free_page (my_page,1 ); -else -printk (KERN_WARNING "mspec_close(): " -"failed to zero page %ld\n" , my_page); +memset ((char *)my_page,0 ,PAGE_SIZE ); +uncached_free_page (my_page,1 ); }kvfree (vdata);
@@ -213,11 +159,7 @@ mspec_fault(struct vm_fault *vmf)spin_unlock (&vdata->lock); } -if (vdata->type =MSPEC_FETCHOP ) - paddr =TO_AMO (maddr); -else - paddr = maddr & ~__IA64_UNCACHED_OFFSET; - + paddr = maddr & ~__IA64_UNCACHED_OFFSET; pfn = paddr >>PAGE_SHIFT ;return vmf_insert_pfn (vmf->vma, vmf->address, pfn);
@@ -269,19 +211,13 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, vma->vm_private_data = vdata; vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; -if (vdata->type =MSPEC_FETCHOP || vdata->type =MSPEC_UNCACHED ) +if (vdata->type =MSPEC_UNCACHED ) vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); vma->vm_ops = &mspec_vm_ops;return 0 ; } -static int -fetchop_mmap (struct file *file,struct vm_area_struct *vma) -{ -return mspec_mmap (file, vma,MSPEC_FETCHOP ); -} -static int cached_mmap (struct file *file,struct vm_area_struct *vma) {
@@ -294,18 +230,6 @@ uncached_mmap(struct file *file, struct vm_area_struct *vma)return mspec_mmap (file, vma,MSPEC_UNCACHED ); } -static const struct file_operations fetchop_fops = { - .owner =THIS_MODULE , - .mmap = fetchop_mmap, - .llseek = noop_llseek, -}; - -static struct miscdevice fetchop_miscdev = { - .minor =MISC_DYNAMIC_MINOR , - .name ="sgi_fetchop" , - .fops = &fetchop_fops -}; -static const struct file_operations cached_fops = { .owner =THIS_MODULE , .mmap = cached_mmap,
@@ -339,89 +263,32 @@ static int __initmspec_init (void) {int ret; -int nid; - -/* -* The fetchop device only works on SN2 hardware, uncached and cached -* memory drivers should both be valid on all ia64 hardware -*/ -#ifdef CONFIG_SGI_SN -if (ia64_platform_is ("sn2" )) { - is_sn2 =1 ; -if (is_shub2 ()) { - ret = -ENOMEM ; -for_each_node_state (nid,N_ONLINE ) { -int actual_nid; -int nasid; -unsigned long phys; - - scratch_page[nid] =uncached_alloc_page (nid,1 ); -if (scratch_page[nid] =0 ) - goto free_scratch_pages; - phys =__pa (scratch_page[nid]); - nasid =get_node_number (phys); - actual_nid =nasid_to_cnodeid (nasid); -if (actual_nid != nid) - goto free_scratch_pages; - } - } - ret =misc_register (&fetchop_miscdev); -if (ret) { -printk (KERN_ERR -"%s: failed to register device %i\n" , -FETCHOP_ID , ret); - goto free_scratch_pages; - } - } -#endif ret =misc_register (&cached_miscdev);if (ret) {printk (KERN_ERR "%s: failed to register device %i\n" ,CACHED_ID , ret); -if (is_sn2) -misc_deregister (&fetchop_miscdev); - goto free_scratch_pages; +return ret; } ret =misc_register (&uncached_miscdev);if (ret) {printk (KERN_ERR "%s: failed to register device %i\n" ,UNCACHED_ID , ret);misc_deregister (&cached_miscdev); -if (is_sn2) -misc_deregister (&fetchop_miscdev); - goto free_scratch_pages; +return ret; } -printk (KERN_INFO "%s %s initialized devices: %s %s %s\n" , -MSPEC_BASENAME ,REVISION , is_sn2 ?FETCHOP_ID :"" , -CACHED_ID ,UNCACHED_ID ); +printk (KERN_INFO "%s %s initialized devices: %s %s\n" , +MSPEC_BASENAME ,REVISION ,CACHED_ID ,UNCACHED_ID );return 0 ; - - free_scratch_pages: -for_each_node (nid) { -if (scratch_page[nid] !=0 ) -uncached_free_page (scratch_page[nid],1 ); - } -return ret; } static void __exitmspec_exit (void ) { -int nid; -misc_deregister (&uncached_miscdev);misc_deregister (&cached_miscdev); -if (is_sn2) { -misc_deregister (&fetchop_miscdev); - -for_each_node (nid) { -if (scratch_page[nid] !=0 ) -uncached_free_page (scratch_page[nid],1 ); - } - } }module_init (mspec_init);
Signature · 1 line
2.20.1
PATCH 10/29 misc/sgi-xp: remove SGI SN2 support
In reply to Christoph HellwigNote this also marks xp broken on ia64 now, as the UV support, which was disable in generic kernels before actually never compiled due to undefined uv_gpa_to_soc_phys_ram and uv_gpa_in_mmr_space symbols since at least commit c2c9f1157414 ("x86: uv: update XPC to handle updated BIOS interface").
--- arch/ia64/uv/kernel/setup.c | 4 - drivers/misc/Kconfig | 5 +- drivers/misc/sgi-xp/Makefile | 13 +- drivers/misc/sgi-xp/xp.h | 19 - drivers/misc/sgi-xp/xp_main.c | 8 +- drivers/misc/sgi-xp/xp_nofault.S | 35 - drivers/misc/sgi-xp/xp_sn2.c | 190 --- drivers/misc/sgi-xp/xp_uv.c | 3 +- drivers/misc/sgi-xp/xpc.h | 273 --- drivers/misc/sgi-xp/xpc_main.c | 31 +- drivers/misc/sgi-xp/xpc_partition.c | 5 - drivers/misc/sgi-xp/xpc_sn2.c | 2459 --------------------------- drivers/misc/sgi-xp/xpc_uv.c | 2 + drivers/misc/sgi-xp/xpnet.c | 2 +- 14 files changed, 15 insertions(+), 3034 deletions(-) delete mode 100644 drivers/misc/sgi-xp/xp_nofault.S delete mode 100644 drivers/misc/sgi-xp/xp_sn2.c delete mode 100644 drivers/misc/sgi-xp/xpc_sn2.c
arch/ia64/uv/kernel/setup.c +0 -4
@@ -19,12 +19,8 @@ EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);#ifdef CONFIG_IA64_SGI_UV int sn_prom_type; -long sn_partition_id; -EXPORT_SYMBOL (sn_partition_id);long sn_coherency_id;EXPORT_SYMBOL_GPL (sn_coherency_id); -long sn_region_size; -EXPORT_SYMBOL (sn_region_size);#endif struct redir_addr {
drivers/misc/Kconfig +2 -3
@@ -200,9 +200,8 @@ config ENCLOSURE_SERVICES config SGI_XP tristate "Support communication between SGI SSIs" depends on NET - depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP - select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2 - select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2 + depends on (IA64_GENERIC || IA64_SGI_UV || X86_UV) && SMP + depends on X86_64 || BROKEN select SGI_GRU if X86_64 && SMP ---help--- An SGI machine can be divided into multiple Single System
drivers/misc/sgi-xp/Makefile +3 -10
@@ -4,17 +4,10 @@ # obj-$(CONFIG_SGI_XP) += xp.o -xp-y := xp_main.o -xp-$(CONFIG_IA64_SGI_SN2) += xp_sn2.o xp_nofault.o -xp-$(CONFIG_IA64_GENERIC) += xp_sn2.o xp_nofault.o -xp-$(CONFIG_IA64_SGI_UV) += xp_uv.o -xp-$(CONFIG_X86_64) += xp_uv.o +xp-y := xp_main.o xp_uv.o obj-$(CONFIG_SGI_XP) += xpc.o -xpc-y := xpc_main.o xpc_channel.o xpc_partition.o -xpc-$(CONFIG_IA64_SGI_SN2) += xpc_sn2.o -xpc-$(CONFIG_IA64_GENERIC) += xpc_sn2.o -xpc-$(CONFIG_IA64_SGI_UV) += xpc_uv.o -xpc-$(CONFIG_X86_64) += xpc_uv.o +xpc-y := xpc_main.o xpc_channel.o xpc_partition.o \ + xpc_uv.o obj-$(CONFIG_SGI_XP) += xpnet.o
drivers/misc/sgi-xp/xp.h +0 -19
@@ -24,23 +24,6 @@#define is_uv () 0#endif -#if definedCONFIG_IA64 -#include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */ -#define is_shub () ia64_platform_is("sn2") -#endif - -#ifndef is_shub1 -#define is_shub1 () 0 -#endif - -#ifndef is_shub2 -#define is_shub2 () 0 -#endif - -#ifndef is_shub -#define is_shub () 0 -#endif -#ifdef USE_DBUG_ON #define DBUG_ON (condition) BUG_ON(condition)#else
@@ -360,9 +343,7 @@ extern int xp_nofault_PIOR(void *);extern int xp_error_PIOR (void );extern struct device *xp; -extern enum xp_retval xp_init_sn2 (void );extern enum xp_retval xp_init_uv (void ); -extern void xp_exit_sn2 (void );extern void xp_exit_uv (void );#endif /* _DRIVERS_MISC_SGIXP_XP_H */
drivers/misc/sgi-xp/xp_main.c +2 -6
@@ -233,9 +233,7 @@ xp_init(void)for (ch_number =0 ; ch_number <XPC_MAX_NCHANNELS ; ch_number++)mutex_init (&xpc_registrations[ch_number].mutex); -if (is_shub ()) - ret =xp_init_sn2 (); -else if (is_uv ()) +if (is_uv ()) ret =xp_init_uv ();else ret =0 ;
@@ -251,9 +249,7 @@ module_init(xp_init); void __exitxp_exit (void ) { -if (is_shub ()) -xp_exit_sn2 (); -else if (is_uv ()) +if (is_uv ())xp_exit_uv (); }
drivers/misc/sgi-xp/xp_nofault.S deleted +0 -35
@@ -1,35 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. - */ - -/* - * The xp_nofault_PIOR function takes a pointer to a remote PIO register - * and attempts to load and consume a value from it. This function - * will be registered as a nofault code block. In the event that the - * PIO read fails, the MCA handler will force the error to look - * corrected and vector to the xp_error_PIOR which will return an error. - * - * The definition of "consumption" and the time it takes for an MCA - * to surface is processor implementation specific. This code - * is sufficient on Itanium through the Montvale processor family. - * It may need to be adjusted for future processor implementations. - * - * extern int xp_nofault_PIOR(void *remote_register); - */ - - .global xp_nofault_PIOR -xp_nofault_PIOR: - mov r8=r0 // Stage a success return value - ld8.acq r9=[r32];; // PIO Read the specified register - adds r9=1,r9;; // Add to force consumption - srlz.i;; // Allow time for MCA to surface - br.ret.sptk.many b0;; // Return success - - .global xp_error_PIOR -xp_error_PIOR: - mov r8=1 // Return value of 1 - br.ret.sptk.many b0;; // Return failure
drivers/misc/sgi-xp/xp_sn2.c deleted +0 -190
190 lines not on this page · raw message
drivers/misc/sgi-xp/xp_uv.c +2 -1
@@ -151,9 +151,10 @@ xp_init_uv(void)BUG_ON (!is_uv ()); xp_max_npartitions =XP_MAX_NPARTITIONS_UV ; +#ifdef CONFIG_X86 xp_partition_id = sn_partition_id; xp_region_size = sn_region_size; - +#endif xp_pa = xp_pa_uv; xp_socket_pa = xp_socket_pa_uv; xp_remote_memcpy = xp_remote_memcpy_uv;
drivers/misc/sgi-xp/xpc.h +0 -273
357 lines not on this page · raw message
drivers/misc/sgi-xp/xpc_main.c +3 -28
@@ -279,13 +279,6 @@ xpc_hb_checker(void *ignore)dev_dbg (xpc_part,"checking remote heartbeats\n" );xpc_check_remote_hb (); - -/* -* On sn2 we need to periodically recheck to ensure no -* IRQ/amo pairs have been missed. -*/ -if (is_shub ()) - force_IRQ =1 ; }/* check for outstanding IRQs */
@@ -1050,9 +1043,7 @@ xpc_do_exit(enum xp_retval reason)xpc_teardown_partitions (); -if (is_shub ()) -xpc_exit_sn2 (); -else if (is_uv ()) +if (is_uv ())xpc_exit_uv (); }
@@ -1235,21 +1226,7 @@ xpc_init(void)dev_set_name (xpc_part,"part" );dev_set_name (xpc_chan,"chan" ); -if (is_shub ()) { -/* -* The ia64-sn2 architecture supports at most 64 partitions. -* And the inability to unregister remote amos restricts us -* further to only support exactly 64 partitions on this -* architecture, no less. -*/ -if (xp_max_npartitions !=64 ) { -dev_err (xpc_part,"max #of partitions not set to 64\n" ); - ret = -EINVAL ; - }else { - ret =xpc_init_sn2 (); - } - - }else if (is_uv ()) { +if (is_uv ()) { ret =xpc_init_uv (); }else {
@@ -1335,9 +1312,7 @@ xpc_init(void)xpc_teardown_partitions (); out_1: -if (is_shub ()) -xpc_exit_sn2 (); -else if (is_uv ()) +if (is_uv ())xpc_exit_uv ();return ret; }
drivers/misc/sgi-xp/xpc_partition.c +0 -5
@@ -93,10 +93,6 @@ xpc_get_rsvd_page_pa(int nasid)if (ret != xpNeedMoreInfo)break ; -/* !!! L1_CACHE_ALIGN() is only a sn2-bte_copy requirement */ -if (is_shub ()) - len =L1_CACHE_ALIGN (len); -if (len > buf_len) {kfree (buf_base); buf_len =L1_CACHE_ALIGN (len);
@@ -452,7 +448,6 @@ xpc_discovery(void)case 32 : max_regions *=2 ; region_size =16 ; -DBUG_ON (!is_shub2 ()); } }
drivers/misc/sgi-xp/xpc_sn2.c deleted +0 -2459
2,240 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.20.1
Part of the diff is not shown here. View the raw message.
PATCH 11/29 qla1280: remove SGI SN2 support
In reply to Christoph HellwigThe SGI SN2 support is about to be removed, so drops the bits specific to it from this driver.
--- drivers/scsi/qla1280.c | 37 ------------------------------------- drivers/scsi/qla1280.h | 3 --- 2 files changed, 40 deletions(-)
drivers/scsi/qla1280.c +0 -31
@@ -357,10 +357,6 @@#include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_SGI_SN2 ) -#include <asm/sn/io.h> -#endif -/* * Compile time Options:
@@ -380,11 +376,6 @@#define NVRAM_DELAY () udelay(500)/* 2 microseconds */ -#if defined(__ia64__) && !defined(ia64_platform_is) -#define ia64_platform_is (foo) (!strcmp(x, platform_name)) -#endif - -#define IS_ISP1040 (ha) (ha->pdev->device = PCI_DEVICE_ID_QLOGIC_ISP1020)#define IS_ISP1x40 (ha) (ha->pdev->device = PCI_DEVICE_ID_QLOGIC_ISP1020 || \ ha->pdev->device = PCI_DEVICE_ID_QLOGIC_ISP1240)
@@ -1427,15 +1418,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha) ha->flags.reset_active =0 ; ha->flags.abort_isp_active =0 ; -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_SGI_SN2 ) -if (ia64_platform_is ("sn2" )) { -printk (KERN_INFO "scsi(%li): Enabling SN2 PCI DMA " -"dual channel lockup workaround\n" , ha->host_no); - ha->flags.use_pci_vchannel =1 ; - driver_setup.no_nvram =1 ; - } -#endif -/* TODO: implement support for the 1040 nvram format */ if (IS_ISP1040 (ha)) driver_setup.no_nvram =1 ;
@@ -2251,13 +2233,6 @@ qla1280_nvram_config(struct scsi_qla_host *ha) mb[1 ] = nv->firmware_feature.f.enable_fast_posting; mb[1 ] |= nv->firmware_feature.f.report_lvd_bus_transition <<1 ; mb[1 ] |= nv->firmware_feature.f.disable_synchronous_backoff <<5 ; -#if defined(CONFIG_IA64_GENERIC ) || defined (CONFIG_IA64_SGI_SN2 ) -if (ia64_platform_is ("sn2" )) { -printk (KERN_INFO "scsi(%li): Enabling SN2 PCI DMA " -"workaround\n" , ha->host_no); - mb[1 ] |= nv->firmware_feature.f.unused_9 <<9 ;/* XXX */ - } -#endif status |=qla1280_mailbox_command (ha,BIT_1 |BIT_0 , mb);/* Retry count and delay. */
@@ -2888,12 +2863,6 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)break ; dma_handle =sg_dma_address (s); -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_SGI_SN2 ) -if (ha->flags.use_pci_vchannel) -sn_pci_set_vchan (ha->pdev, - (unsigned long *)&dma_handle, -SCSI_BUS_32 (cmd)); -#endif *dword_ptr++ cpu_to_le32(lower_32_bits(dma_handle)); *dword_ptr++ @@ -2950,12 +2919,6 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp) if (cnt = 5)
break;
dma_handle = sg_dma_address(s);
-#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
- if (ha->flags.use_pci_vchannel)
- sn_pci_set_vchan(ha->pdev,
- (unsigned long *)&dma_handle,
- SCSI_BUS_32(cmd));
-#endif
*dword_ptr++ cpu_to_le32(lower_32_bits(dma_handle));
*dword_ptr++ diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index b496206362a9..a1a8aefc7cc3 100644
drivers/scsi/qla1280.h +0 -3
@@ -1055,9 +1055,6 @@ struct scsi_qla_host { uint32_t reset_active:1; /* 3 */ uint32_t abort_isp_active:1; /* 4 */ uint32_t disable_risc_code_load:1; /* 5 */ -#ifdef __ia64__ - uint32_t use_pci_vchannel:1; -#endif } flags;struct nvram nvram;
Signature · 1 line
2.20.1
PATCH 12/29 qla2xxx: remove SGI SN2 support
In reply to Christoph HellwigThe SGI SN2 support is about to be removed, so drops the bits specific to it from this driver.
--- drivers/scsi/qla2xxx/qla_init.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +0 -14
@@ -4575,20 +4575,6 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) rval =1 ; } -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_SGI_SN2 ) -/* -* The SN2 does not provide BIOS emulation which means you can't change -* potentially bogus BIOS settings. Force the use of default settings -* for link rate and frame size. Hope that the rest of the settings -* are valid. -*/ -if (ia64_platform_is ("sn2" )) { - nv->frame_payload_size =2048 ; -if (IS_QLA23XX (ha)) - nv->special_options[1 ] =BIT_7 ; - } -#endif -/* Reset Initialization control block */ memset (icb,0 , ha->init_cb_size);
Signature · 1 line
2.20.1
PATCH 13/29 drivers: remove the SGI SN2 IOC3 base support
In reply to Christoph HellwigThe IOC3 is a multi-function chip seen on SGI SN2 and some SGI MIPS systems. This removes the last bit of SN2 specific support, while the bits used by the mips ports are still around (and being substantially rewritten at the moment).
--- arch/ia64/Kconfig | 2 - arch/ia64/configs/gensparse_defconfig | 1 - drivers/Makefile | 1 - drivers/sn/Kconfig | 22 - drivers/sn/Makefile | 7 - drivers/sn/ioc3.c | 844 -------------------------- 6 files changed, 877 deletions(-) delete mode 100644 drivers/sn/Kconfig delete mode 100644 drivers/sn/Makefile delete mode 100644 drivers/sn/ioc3.c
arch/ia64/Kconfig +0 -2
@@ -493,8 +493,6 @@ config IA64_HP_AML_NFW the "force" module parameter, e.g., with the "aml_nfw.force" kernel command line option. -source "drivers/sn/Kconfig" - config KEXEC bool "kexec system call" depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -19,7 +19,6 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y -CONFIG_SGI_IOC3=y CONFIG_EFI_VARS=y CONFIG_BINFMT_MISC=m CONFIG_ACPI_BUTTON=m
drivers/Makefile +0 -1
@@ -132,7 +132,6 @@ obj-y += mmc/ obj-$(CONFIG_MEMSTICK) += memstick/ obj-$(CONFIG_NEW_LEDS) += leds/ obj-$(CONFIG_INFINIBAND) += infiniband/ -obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/
drivers/sn/Kconfig deleted +0 -22
@@ -1,22 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Miscellaneous SN-specific devices -# - -menu "SN Devices" - depends on SGI_SN - -config SGI_IOC3 - tristate "SGI IOC3 Base IO support" - default m - ---help--- - This option enables basic support for the SGI IOC3-based Base IO - controller card. This option does not enable any specific - functions on such a card, but provides necessary infrastructure - for other drivers to utilize. - - If you have an SGI Altix with an IOC3-based - I/O controller or a PCI IOC3 serial card say Y. - Otherwise say N. - -endmenu
drivers/sn/Makefile deleted +0 -7
@@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Makefile for the Altix device drivers. -# -# - -obj-$(CONFIG_SGI_IOC3) += ioc3.o
drivers/sn/ioc3.c deleted +0 -844
844 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 14/29 drivers: remove the SGI SN2 IOC4 base support
In reply to Christoph HellwigThe IOC4 is a multi-function chip seen on SGI SN2 and some SGI MIPS systems. This removes the base driver, which while not having an SN2 Kconfig dependency was only for sub-drivers that had one.
--- Documentation/driver-api/sgi-ioc4.rst | 49 --- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/gensparse_defconfig | 1 - arch/mips/configs/bigsur_defconfig | 1 - arch/mips/configs/ip32_defconfig | 1 - arch/mips/configs/markeins_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/mips/configs/sb1250_swarm_defconfig | 1 - drivers/misc/Kconfig | 12 - drivers/misc/Makefile | 1 - drivers/misc/ioc4.c | 498 ----------------------- include/linux/ioc4.h | 184 --------- include/linux/pci_ids.h | 1 - 13 files changed, 752 deletions(-) delete mode 100644 Documentation/driver-api/sgi-ioc4.rst delete mode 100644 drivers/misc/ioc4.c delete mode 100644 include/linux/ioc4.h
Documentation/driver-api/sgi-ioc4.rst deleted +0 -47
@@ -1,49 +0,0 @@ -================== -SGI IOC4 PCI (multi function) device -================== - -The SGI IOC4 PCI device is a bit of a strange beast, so some notes on -it are in order. - -First, even though the IOC4 performs multiple functions, such as an -IDE controller, a serial controller, a PS/2 keyboard/mouse controller, -and an external interrupt mechanism, it's not implemented as a -multifunction device. The consequence of this from a software -standpoint is that all these functions share a single IRQ, and -they can't all register to own the same PCI device ID. To make -matters a bit worse, some of the register blocks (and even registers -themselves) present in IOC4 are mixed-purpose between these several -functions, meaning that there's no clear "owning" device driver. - -The solution is to organize the IOC4 driver into several independent -drivers, "ioc4", "sgiioc4", and "ioc4_serial". Note that there is no -PS/2 controller driver as this functionality has never been wired up -on a shipping IO card. - -ioc4 -== -This is the core (or shim) driver for IOC4. It is responsible for -initializing the basic functionality of the chip, and allocating -the PCI resources that are shared between the IOC4 functions. - -This driver also provides registration functions that the other -IOC4 drivers can call to make their presence known. Each driver -needs to provide a probe and remove function, which are invoked -by the core driver at appropriate times. The interface of these -IOC4 function probe and remove operations isn't precisely the same -as PCI device probe and remove operations, but is logically the -same operation. - -sgiioc4 -===-This is the IDE driver for IOC4. Its name isn't very descriptive -simply for historical reasons (it used to be the only IOC4 driver -component). There's not much to say about it other than it hooks -up to the ioc4 driver via the appropriate registration, probe, and -remove functions. - -ioc4_serial -=====-This is the serial driver for IOC4. There's not much to say about it -other than it hooks up to the ioc4 driver via the appropriate registration, -probe, and remove functions.
arch/ia64/configs/generic_defconfig +0 -1
@@ -44,7 +44,6 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y -CONFIG_SGI_IOC4=y CONFIG_SGI_XP=m CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y
arch/ia64/configs/gensparse_defconfig +0 -1
@@ -36,7 +36,6 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y -CONFIG_SGI_IOC4=y CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y CONFIG_IDE_GENERIC=y
arch/mips/configs/bigsur_defconfig +0 -1
@@ -103,7 +103,6 @@ CONFIG_FW_LOADER=m CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_SGI_IOC4=m CONFIG_EEPROM_LEGACY=y CONFIG_EEPROM_MAX6875=y CONFIG_IDE=y
arch/mips/configs/ip32_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_CONNECTOR=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_SGI_IOC4=y CONFIG_RAID_ATTRS=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
arch/mips/configs/markeins_defconfig +0 -1
@@ -117,7 +117,6 @@ CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_SGI_IOC4=m CONFIG_SCSI=m # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=m
arch/mips/configs/rm200_defconfig +0 -1
@@ -198,7 +198,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=m CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m -CONFIG_SGI_IOC4=m CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
arch/mips/configs/sb1250_swarm_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE’20 CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m -CONFIG_SGI_IOC4=m CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=y
drivers/misc/Kconfig +0 -12
@@ -126,18 +126,6 @@ config INTEL_MID_PTI an Intel Atom (non-netbook) mobile device containing a MIPI P1149.7 standard implementation. -config SGI_IOC4 - tristate "SGI IOC4 Base IO support" - depends on PCI - ---help--- - This option enables basic support for the IOC4 chip on certain - SGI IO controller cards (IO9, IO10, and PCI-RT). This option - does not enable any specific functions on such a card, but provides - necessary infrastructure for other drivers to utilize. - - If you have an SGI Altix with an IOC4-based card say Y. - Otherwise say N. - config TIFM_CORE tristate "TI Flash Media interface support" depends on PCI
drivers/misc/Makefile +0 -1
@@ -21,7 +21,6 @@ obj-$(CONFIG_QCOM_COINCELL) += qcom-coincell.o obj-$(CONFIG_QCOM_FASTRPC) += fastrpc.o obj-$(CONFIG_SENSORS_BH1770) += bh1770glc.o obj-$(CONFIG_SENSORS_APDS990X) += apds990x.o -obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o obj-$(CONFIG_KGDB_TESTS) += kgdbts.o obj-$(CONFIG_SGI_XP) += sgi-xp/
drivers/misc/ioc4.c deleted +0 -498
498 lines not on this page · raw message
include/linux/ioc4.h deleted +0 -184
184 lines not on this page · raw message
include/linux/pci_ids.h +0 -1
@@ -1070,7 +1070,6 @@#define PCI_VENDOR_ID_SGI 0x10a9#define PCI_DEVICE_ID_SGI_IOC3 0x0003#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002 -#define PCI_DEVICE_ID_SGI_IOC4 0x100a#define PCI_VENDOR_ID_WINBOND 0x10ad#define PCI_DEVICE_ID_WINBOND_82C105 0x0105
Signature · 1 line
2.20.1
PATCH 16/29 ia64: remove now unused machvec indirections
In reply to Christoph HellwigWith the SGI SN2 machvec removal most of the indirections are unused now, so remove them. This includes the entire removal of the mmio read*/write* macros as the generic ones are identical to the asm-generic/io.h version.
--- arch/ia64/include/asm/hw_irq.h | 22 +-- arch/ia64/include/asm/io.h | 221 ++++-------------------- arch/ia64/include/asm/machvec.h | 241 --------------------------- arch/ia64/include/asm/machvec_init.h | 24 --- arch/ia64/include/asm/mmiowb.h | 12 +- arch/ia64/include/asm/pci.h | 6 +- arch/ia64/include/asm/switch_to.h | 1 - arch/ia64/kernel/iosapic.c | 5 +- arch/ia64/kernel/irq.c | 12 -- arch/ia64/kernel/irq_ia64.c | 2 +- arch/ia64/kernel/machine_kexec.c | 1 - arch/ia64/kernel/machvec.c | 7 - arch/ia64/kernel/mca.c | 10 +- arch/ia64/kernel/msi_ia64.c | 21 +-- arch/ia64/kernel/sal.c | 2 +- arch/ia64/kernel/setup.c | 1 - arch/ia64/kernel/smp.c | 8 +- arch/ia64/kernel/smpboot.c | 2 +- arch/ia64/kernel/time.c | 2 - arch/ia64/lib/io.c | 114 ------------- arch/ia64/mm/discontig.c | 3 +- arch/ia64/mm/tlb.c | 4 +- arch/ia64/pci/pci.c | 13 +- 23 files changed, 65 insertions(+), 669 deletions(-)
arch/ia64/include/asm/hw_irq.h +3 -19
@@ -137,25 +137,9 @@ static inline void irq_complete_move(unsigned int irq) {}static inline void ia64_native_resend_irq (unsigned int vector) { -platform_send_ipi (smp_processor_id (), vector,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (smp_processor_id (), vector,IA64_IPI_DM_INT ,0 ); } -/* -* Default implementations for the irq-descriptor API: -*/ -#ifndef CONFIG_IA64_GENERIC -static inline ia64_vector __ia64_irq_to_vector (int irq) -{ -return irq_cfg[irq].vector; -} - -static inline unsigned int -__ia64_local_vector_to_irq (ia64_vector vec) -{ -return __this_cpu_read (vector_irq[vec]); -} -#endif -/* * Next follows the irq descriptor interface. On IA-64, each CPU supports 256 interrupt * vectors. On smaller systems, there is a one-to-one correspondence between interrupt
@@ -170,7 +154,7 @@ __ia64_local_vector_to_irq (ia64_vector vec)static inline ia64_vector irq_to_vector (int irq) { -return platform_irq_to_vector (irq); +return irq_cfg[irq].vector; }/*
@@ -181,7 +165,7 @@ irq_to_vector (int irq)static inline unsigned int local_vector_to_irq (ia64_vector vec) { -return platform_local_vector_to_irq (vec); +return __this_cpu_read (vector_irq[vec]); }#endif /* _ASM_IA64_HW_IRQ_H */
arch/ia64/include/asm/io.h +33 -188
305 lines not on this page · raw message
arch/ia64/include/asm/machvec.h +0 -241
301 lines not on this page · raw message
arch/ia64/include/asm/machvec_init.h +0 -24
@@ -2,30 +2,6 @@#include <asm/iommu.h> #include <asm/machvec.h> -extern ia64_mv_send_ipi_t ia64_send_ipi; -extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; -extern ia64_mv_irq_to_vector __ia64_irq_to_vector; -extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq; -extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem; -extern ia64_mv_pci_legacy_read_t ia64_pci_legacy_read; -extern ia64_mv_pci_legacy_write_t ia64_pci_legacy_write; - -extern ia64_mv_inb_t __ia64_inb; -extern ia64_mv_inw_t __ia64_inw; -extern ia64_mv_inl_t __ia64_inl; -extern ia64_mv_outb_t __ia64_outb; -extern ia64_mv_outw_t __ia64_outw; -extern ia64_mv_outl_t __ia64_outl; -extern ia64_mv_mmiowb_t __ia64_mmiowb; -extern ia64_mv_readb_t __ia64_readb; -extern ia64_mv_readw_t __ia64_readw; -extern ia64_mv_readl_t __ia64_readl; -extern ia64_mv_readq_t __ia64_readq; -extern ia64_mv_readb_t __ia64_readb_relaxed; -extern ia64_mv_readw_t __ia64_readw_relaxed; -extern ia64_mv_readl_t __ia64_readl_relaxed; -extern ia64_mv_readq_t __ia64_readq_relaxed; -#define MACHVEC_HELPER (name) \ struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec"))) \ = MACHVEC_INIT(name);
arch/ia64/include/asm/mmiowb.h +2 -10
@@ -3,22 +3,14 @@#ifndef _ASM_IA64_MMIOWB_H#define _ASM_IA64_MMIOWB_H -#include <asm/machvec.h> -/** -* ___ia64_mmiowb - I/O write barrier +* mmiowb - I/O write barrier * * Ensure ordering of I/O space writes. This will make sure that writes * following the barrier will arrive after all previous writes. For most * ia64 platforms, this is a simple 'mf.a' instruction. */ -static inline void ___ia64_mmiowb (void ) -{ -ia64_mfa (); -} - -#define __ia64_mmiowb ___ia64_mmiowb -#define mmiowb () platform_mmiowb() +#define mmiowb () ia64_mfa()#include <asm-generic/mmiowb.h>
arch/ia64/include/asm/pci.h +3 -3
@@ -39,9 +39,9 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,struct vm_area_struct *vma, enum pci_mmap_state mmap_state); -#define pci_get_legacy_mem platform_pci_get_legacy_mem -#define pci_legacy_read platform_pci_legacy_read -#define pci_legacy_write platform_pci_legacy_write +char *pci_get_legacy_mem (struct pci_bus *bus); +int pci_legacy_read (struct pci_bus *bus,u16 port,u32 *val,u8 size); +int pci_legacy_write (struct pci_bus *bus,u16 port,u32 val,u8 size);struct pci_controller {struct acpi_device *companion;
arch/ia64/include/asm/switch_to.h +0 -1
@@ -69,7 +69,6 @@ extern void ia64_load_extra (struct task_struct *task);if (unlikely ((current->thread.flags &IA64_THREAD_MIGRATION ) && \ (task_cpu (current) != \task_thread_info (current)->last_cpu))) { \ -platform_migrate (current); \task_thread_info (current)->last_cpu =task_cpu (current); \ } \ }while (0 )
arch/ia64/kernel/iosapic.c +1 -4
@@ -67,10 +67,7 @@* used as architecture-independent interrupt handling mechanism in Linux. * As an IRQ is a number, we have to have * IA-64 interrupt vector number <-> IRQ number mapping. On smaller -* systems, we use one-to-one mapping between IA-64 vector and IRQ. A -* platform can implement platform_irq_to_vector(irq) and -* platform_local_vector_to_irq(vector) APIs to differentiate the mapping. -* Please see also arch/ia64/include/asm/hw_irq.h for those APIs. +* systems, we use one-to-one mapping between IA-64 vector and IRQ. * * To sum up, there are three levels of mappings involved: *
arch/ia64/kernel/irq.c +0 -12
@@ -35,18 +35,6 @@ void ack_bad_irq(unsigned int irq)printk (KERN_ERR "Unexpected irq vector 0x%x on CPU %u!\n" , irq,smp_processor_id ()); } -#ifdef CONFIG_IA64_GENERIC -ia64_vector __ia64_irq_to_vector (int irq) -{ -return irq_cfg[irq].vector; -} - -unsigned int __ia64_local_vector_to_irq (ia64_vector vec) -{ -return __this_cpu_read (vector_irq[vec]); -} -#endif -/* * Interrupt statistics: */
arch/ia64/kernel/irq_ia64.c +1 -1
@@ -314,7 +314,7 @@ void irq_complete_move(unsigned irq)cpumask_and (&cleanup_mask, &cfg->old_domain, cpu_online_mask); cfg->move_cleanup_count =cpumask_weight (&cleanup_mask);for_each_cpu (i, &cleanup_mask) -platform_send_ipi (i,IA64_IRQ_MOVE_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (i,IA64_IRQ_MOVE_VECTOR ,IA64_IPI_DM_INT ,0 ); cfg->move_in_progress =0 ; }
arch/ia64/kernel/machine_kexec.c +0 -1
@@ -127,7 +127,6 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)ia64_srlz_d ();while (ia64_get_ivr () !=IA64_SPURIOUS_INT_VECTOR )ia64_eoi (); -platform_kernel_launch_event (); rnk = (relocate_new_kernel_t)&code_addr; (*rnk)(image->head, image->start, ia64_boot_param,GRANULEROUNDDOWN ((unsigned long ) pal_addr));
arch/ia64/kernel/machvec.c +0 -7
@@ -11,7 +11,6 @@#include <asm/page.h> struct ia64_machine_vector ia64_mv = { - .mmiowb = ___ia64_mmiowb };EXPORT_SYMBOL (ia64_mv);
@@ -69,9 +68,3 @@ machvec_setup (char **arg) { }EXPORT_SYMBOL (machvec_setup); - -void -machvec_timer_interrupt (int irq,void *dev_id) -{ -} -EXPORT_SYMBOL (machvec_timer_interrupt);
arch/ia64/kernel/mca.c +5 -5
@@ -744,7 +744,7 @@ ia64_mca_cmc_vector_enable_keventd(struct work_struct *unused)static void ia64_mca_wakeup (int cpu) { -platform_send_ipi (cpu,IA64_MCA_WAKEUP_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpu,IA64_MCA_WAKEUP_VECTOR ,IA64_IPI_DM_INT ,0 ); }/*
@@ -1490,7 +1490,7 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg) cpuid =cpumask_next (cpuid+1 , cpu_online_mask);if (cpuid < nr_cpu_ids) { -platform_send_ipi (cpuid,IA64_CMCP_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpuid,IA64_CMCP_VECTOR ,IA64_IPI_DM_INT ,0 ); }else {/* If no log record, switch out of polling mode */ if (start_count =IA64_LOG_COUNT (SAL_INFO_TYPE_CMC )) {
@@ -1523,7 +1523,7 @@ static void ia64_mca_cmc_poll (struct timer_list *unused) {/* Trigger a CMC interrupt cascade */ -platform_send_ipi (cpumask_first (cpu_online_mask),IA64_CMCP_VECTOR , +ia64_send_ipi (cpumask_first (cpu_online_mask),IA64_CMCP_VECTOR ,IA64_IPI_DM_INT ,0 ); }
@@ -1560,7 +1560,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg) cpuid =cpumask_next (cpuid+1 , cpu_online_mask);if (cpuid <NR_CPUS ) { -platform_send_ipi (cpuid,IA64_CPEP_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpuid,IA64_CPEP_VECTOR ,IA64_IPI_DM_INT ,0 ); }else {/* * If a log was recorded, increase our polling frequency,
@@ -1600,7 +1600,7 @@ static void ia64_mca_cpe_poll (struct timer_list *unused) {/* Trigger a CPE interrupt cascade */ -platform_send_ipi (cpumask_first (cpu_online_mask),IA64_CPEP_VECTOR , +ia64_send_ipi (cpumask_first (cpu_online_mask),IA64_CPEP_VECTOR ,IA64_IPI_DM_INT ,0 ); }
arch/ia64/kernel/msi_ia64.c +2 -19
@@ -43,7 +43,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, }#endif /* CONFIG_SMP */ -int ia64_setup_msi_irq (struct pci_dev *pdev,struct msi_desc *desc) +int arch_setup_msi_irq (struct pci_dev *pdev,struct msi_desc *desc) {struct msi_msg msg;unsigned long dest_phys_id;
@@ -77,7 +77,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)return 0 ; } -void ia64_teardown_msi_irq (unsigned int irq) +void arch_teardown_msi_irq (unsigned int irq) {destroy_irq (irq); }
@@ -111,23 +111,6 @@ static struct irq_chip ia64_msi_chip = { .irq_retrigger = ia64_msi_retrigger_irq, }; - -int arch_setup_msi_irq (struct pci_dev *pdev,struct msi_desc *desc) -{ -if (platform_setup_msi_irq) -return platform_setup_msi_irq (pdev, desc); - -return ia64_setup_msi_irq (pdev, desc); -} - -void arch_teardown_msi_irq (unsigned int irq) -{ -if (platform_teardown_msi_irq) -return platform_teardown_msi_irq (irq); - -return ia64_teardown_msi_irq (irq); -} -#ifdef CONFIG_INTEL_IOMMU #ifdef CONFIG_SMP static int dmar_msi_set_affinity(struct irq_data *data,
arch/ia64/kernel/sal.c +1 -1
@@ -249,7 +249,7 @@ check_sal_cache_flush (void)* Send ourselves a timer interrupt, wait until it's reported, and see * if SAL_CACHE_FLUSH drops it. */ -platform_send_ipi (cpu,IA64_TIMER_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpu,IA64_TIMER_VECTOR ,IA64_IPI_DM_INT ,0 );while (!ia64_get_irr (IA64_TIMER_VECTOR ))cpu_relax ();
arch/ia64/kernel/setup.c +0 -1
@@ -1039,7 +1039,6 @@ cpu_init (void)ia64_patch_phys_stack_reg (num_phys_stacked*8 +8 ); max_num_phys_stacked = num_phys_stacked; } -platform_cpu_init (); }void __init
arch/ia64/kernel/smp.c +4 -4
@@ -146,7 +146,7 @@ static inline void send_IPI_single (int dest_cpu, int op) { set_bit(op, &per_cpu(ipi_operation, dest_cpu)); -platform_send_ipi (dest_cpu,IA64_IPI_VECTOR ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (dest_cpu,IA64_IPI_VECTOR ,IA64_IPI_DM_INT ,0 ); }/*
@@ -213,7 +213,7 @@ kdump_smp_send_init(void)for_each_online_cpu (cpu) {if (cpu != self_cpu) {if (kdump_status[cpu] =0 ) -platform_send_ipi (cpu,0 ,IA64_IPI_DM_INIT ,0 ); +ia64_send_ipi (cpu,0 ,IA64_IPI_DM_INIT ,0 ); } } }
@@ -224,7 +224,7 @@ kdump_smp_send_init(void)void smp_send_reschedule (int cpu) { -platform_send_ipi (cpu,IA64_IPI_RESCHEDULE ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpu,IA64_IPI_RESCHEDULE ,IA64_IPI_DM_INT ,0 ); }EXPORT_SYMBOL_GPL (smp_send_reschedule);
@@ -234,7 +234,7 @@ EXPORT_SYMBOL_GPL(smp_send_reschedule);static void smp_send_local_flush_tlb (int cpu) { -platform_send_ipi (cpu,IA64_IPI_LOCAL_TLB_FLUSH ,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpu,IA64_IPI_LOCAL_TLB_FLUSH ,IA64_IPI_DM_INT ,0 ); }void
arch/ia64/kernel/smpboot.c +1 -1
@@ -467,7 +467,7 @@ do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)Dprintk ("Sending wakeup vector %lu to AP 0x%x/0x%x.\n" , ap_wakeup_vector, cpu, sapicid);set_brendez_area (cpu); -platform_send_ipi (cpu, ap_wakeup_vector,IA64_IPI_DM_INT ,0 ); +ia64_send_ipi (cpu, ap_wakeup_vector,IA64_IPI_DM_INT ,0 );/* * Wait 10s total for the AP to start
arch/ia64/kernel/time.c +0 -2
@@ -167,8 +167,6 @@ timer_interrupt (int irq, void *dev_id)return IRQ_HANDLED ; } -platform_timer_interrupt (irq, dev_id); - new_itm = local_cpu_data->itm_next;if (!time_after (ia64_get_itc (), new_itm))
arch/ia64/lib/io.c +0 -114
117 lines not on this page · raw message
arch/ia64/mm/discontig.c +1 -2
@@ -396,8 +396,7 @@ static void __meminit scatter_node_data(void)* * Each node's per-node area has a copy of the global pg_data_t list, so * we copy that to each node here, as well as setting the per-cpu pointer -* to the local node data structure. The active_cpus field of the per-node -* structure gets setup by the platform_cpu_init() function later. +* to the local node data structure. */ static void __init initialize_pernode_data (void ) {
arch/ia64/mm/tlb.c +2 -2
@@ -245,7 +245,7 @@ setup_ptcg_sem(int max_purges, int nptcg_from)spinaphore_init (&ptcg_sem, max_purges); } -void +static void ia64_global_tlb_purge (struct mm_struct *mm,unsigned long start,unsigned long end,unsigned long nbits) {
@@ -332,7 +332,7 @@ __flush_tlb_range (struct vm_area_struct *vma, unsigned long start,preempt_disable ();#ifdef CONFIG_SMP if (mm != current->active_mm ||cpumask_weight (mm_cpumask (mm)) !=1 ) { -platform_global_tlb_purge (mm, start, end, nbits); +ia64_global_tlb_purge (mm, start, end, nbits);preempt_enable ();return ; }
arch/ia64/pci/pci.c +6 -7
@@ -372,7 +372,6 @@ void pcibios_fixup_bus(struct pci_bus *b) }list_for_each_entry (dev, &b->devices, bus_list)pcibios_fixup_device_resources (dev); -platform_pci_fixup_bus (b); }void pcibios_add_bus (struct pci_bus *bus)
@@ -413,7 +412,7 @@ pcibios_disable_device (struct pci_dev *dev) }/** -* ia64_pci_get_legacy_mem - generic legacy mem routine +* pci_get_legacy_mem - generic legacy mem routine * @bus: bus to get legacy memory base address for * * Find the base of legacy memory for @bus. This is typically the first
@@ -424,7 +423,7 @@ pcibios_disable_device (struct pci_dev *dev)* This is the ia64 generic version of this routine. Other platforms * are free to override it with a machine vector. */ -char *ia64_pci_get_legacy_mem (struct pci_bus *bus) +char *pci_get_legacy_mem (struct pci_bus *bus) {return (char *)__IA64_UNCACHED_OFFSET; }
@@ -473,7 +472,7 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma, }/** -* ia64_pci_legacy_read - read from legacy I/O space +* pci_legacy_read - read from legacy I/O space * @bus: bus to read * @port: legacy port value * @val: caller allocated storage for returned value
@@ -485,7 +484,7 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma,* overridden by the platform. This is necessary on platforms that don't * support legacy I/O routing or that hard fail on legacy I/O timeouts. */ -int ia64_pci_legacy_read (struct pci_bus *bus,u16 port,u32 *val,u8 size) +int pci_legacy_read (struct pci_bus *bus,u16 port,u32 *val,u8 size) {int ret = size;
@@ -508,7 +507,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size) }/** -* ia64_pci_legacy_write - perform a legacy I/O write +* pci_legacy_write - perform a legacy I/O write * @bus: bus pointer * @port: port to write * @val: value to write
@@ -516,7 +515,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size)* * Simply writes @size bytes of @val to @port. */ -int ia64_pci_legacy_write (struct pci_bus *bus,u16 port,u32 val,u8 size) +int pci_legacy_write (struct pci_bus *bus,u16 port,u32 val,u8 size) {int ret = size;
Signature · 1 line
2.20.1
PATCH 17/29 ia64: remove the hpsim platform
In reply to Christoph HellwigThe hpsim platform supports the HP IA64 simulator which was useful as a bring up platform. But it is fairly non-standard vs real IA64 system in that it for example doesn't support ACPI. It also comes with a whole bunch of simulator specific drivers. Remove it to simplify the IA64 port.
--- arch/ia64/Kconfig | 34 +- arch/ia64/Makefile | 15 +- arch/ia64/configs/sim_defconfig | 52 --- arch/ia64/hp/sim/Kconfig | 23 -- arch/ia64/hp/sim/Makefile | 17 - arch/ia64/hp/sim/boot/Makefile | 37 -- arch/ia64/hp/sim/boot/boot_head.S | 165 -------- arch/ia64/hp/sim/boot/bootloader.c | 175 --------- arch/ia64/hp/sim/boot/bootloader.lds | 67 ---- arch/ia64/hp/sim/boot/fw-emu.c | 374 ------------------ arch/ia64/hp/sim/boot/ssc.h | 36 -- arch/ia64/hp/sim/hpsim.S | 11 - arch/ia64/hp/sim/hpsim_console.c | 77 ---- arch/ia64/hp/sim/hpsim_irq.c | 76 ---- arch/ia64/hp/sim/hpsim_machvec.c | 3 - arch/ia64/hp/sim/hpsim_setup.c | 41 -- arch/ia64/hp/sim/hpsim_ssc.h | 37 -- arch/ia64/hp/sim/simeth.c | 510 ------------------------- arch/ia64/hp/sim/simscsi.c | 373 ------------------ arch/ia64/hp/sim/simserial.c | 521 -------------------------- arch/ia64/include/asm/acpi.h | 4 +- arch/ia64/include/asm/hpsim.h | 17 - arch/ia64/include/asm/iosapic.h | 12 - arch/ia64/include/asm/machvec.h | 11 +- arch/ia64/include/asm/machvec_hpsim.h | 19 - arch/ia64/kernel/Makefile | 3 +- arch/ia64/kernel/irq_ia64.c | 2 - arch/ia64/kernel/setup.c | 13 +- 28 files changed, 15 insertions(+), 2710 deletions(-) delete mode 100644 arch/ia64/configs/sim_defconfig delete mode 100644 arch/ia64/hp/sim/Kconfig delete mode 100644 arch/ia64/hp/sim/Makefile delete mode 100644 arch/ia64/hp/sim/boot/Makefile delete mode 100644 arch/ia64/hp/sim/boot/boot_head.S delete mode 100644 arch/ia64/hp/sim/boot/bootloader.c delete mode 100644 arch/ia64/hp/sim/boot/bootloader.lds delete mode 100644 arch/ia64/hp/sim/boot/fw-emu.c delete mode 100644 arch/ia64/hp/sim/boot/ssc.h delete mode 100644 arch/ia64/hp/sim/hpsim.S delete mode 100644 arch/ia64/hp/sim/hpsim_console.c delete mode 100644 arch/ia64/hp/sim/hpsim_irq.c delete mode 100644 arch/ia64/hp/sim/hpsim_machvec.c delete mode 100644 arch/ia64/hp/sim/hpsim_setup.c delete mode 100644 arch/ia64/hp/sim/hpsim_ssc.h delete mode 100644 arch/ia64/hp/sim/simeth.c delete mode 100644 arch/ia64/hp/sim/simscsi.c delete mode 100644 arch/ia64/hp/sim/simserial.c delete mode 100644 arch/ia64/include/asm/hpsim.h delete mode 100644 arch/ia64/include/asm/machvec_hpsim.h
arch/ia64/Kconfig +7 -27
@@ -10,11 +10,11 @@ config IA64 bool select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO - select ACPI if (!IA64_HP_SIM) - select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM) + select ACPI + select ARCH_SUPPORTS_ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI - select FORCE_PCI if (!IA64_HP_SIM) + select FORCE_PCI select PCI_DOMAINS if PCI select PCI_SYSCALL if PCI select HAVE_UNSTABLE_SCHED_CLOCK
@@ -140,7 +140,6 @@ config IA64_GENERIC HP-zx1/sx1000 For HP systems HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices. SGI-UV For SGI UV systems - Ski-simulator For the HP simulator <http://www.hpl.hp.com/research/linux/ski/> If you don't know what to do, choose "generic".
@@ -181,11 +180,6 @@ config IA64_SGI_UV to select this option. If in doubt, select ia64 generic support instead. -config IA64_HP_SIM - bool "Ski-simulator" - select SWIOTLB - depends on !PM - endchoice choice
@@ -239,14 +233,7 @@ config IA64_PAGE_SIZE_64KB endchoice -if IA64_HP_SIM -config HZ - default 32 -endif - -if !IA64_HP_SIM source "kernel/Kconfig.hz" -endif config IA64_BRL_EMU bool
@@ -265,11 +252,6 @@ config IA64_CYCLONE Say Y here to enable support for IBM EXA Cyclone time source. If you're unsure, answer N. -config IOSAPIC - bool - depends on !IA64_HP_SIM - default y - config FORCE_MAX_ZONEORDER int "MAX_ORDER (11 - 17)" if !HUGETLB_PAGE range 11 17 if !HUGETLB_PAGE
@@ -373,7 +355,7 @@ config ARCH_DISCONTIGMEM_DEFAULT config NUMA bool "NUMA support" - depends on !IA64_HP_SIM && !FLATMEM + depends on !FLATMEM select ACPI_NUMA if ACPI help Say Y to compile the kernel to support NUMA (Non-Uniform Memory
@@ -395,7 +377,7 @@ config NODES_SHIFT config VIRTUAL_MEM_MAP bool "Virtual mem map" depends on !SPARSEMEM - default y if !IA64_HP_SIM + default y help Say Y to compile the kernel with support for a virtual mem map. This code also only takes effect if a memory hole of greater than
@@ -478,7 +460,7 @@ config IA64_HP_AML_NFW config KEXEC bool "kexec system call" - depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) + depends on !SMP || HOTPLUG_CPU select KEXEC_CORE help kexec is a system call that implements the ability to shutdown your
@@ -496,7 +478,7 @@ config KEXEC config CRASH_DUMP bool "kernel crash dumps" - depends on IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) + depends on IA64_MCA_RECOVERY && (!SMP || HOTPLUG_CPU) help Generate crash dump after being started by kexec.
@@ -518,8 +500,6 @@ endif endmenu -source "arch/ia64/hp/sim/Kconfig" - config MSPEC tristate "Memory special operations driver" depends on IA64
arch/ia64/Makefile +3 -12
@@ -52,15 +52,12 @@ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ drivers-$(CONFIG_PCI) += arch/ia64/pci/ -drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/ drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ -drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/uv/ +drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/ drivers-$(CONFIG_OPROFILE) += arch/ia64/oprofile/ -boot := arch/ia64/hp/sim/boot - -PHONY += boot compressed check +PHONY += compressed check all: compressed unwcheck
@@ -69,21 +66,16 @@ compressed: vmlinux.gz vmlinuz: vmlinux.gz vmlinux.gz: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ unwcheck: vmlinux -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $< archclean: - $(Q)$(MAKE) $(clean)=$(boot) archheaders: $(Q)$(MAKE) $(build)=arch/ia64/kernel/syscalls all -CLEAN_FILES += vmlinux.gz bootloader - -boot: lib/lib.a vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ +CLEAN_FILES += vmlinux.gz install: vmlinux.gz sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
@@ -91,7 +83,6 @@ install: vmlinux.gz define archhelp echo '* compressed - Build compressed kernel image' echo ' install - Install compressed kernel image' - echo ' boot - Build vmlinux and bootloader for Ski simulator' echo '* unwcheck - Check vmlinux for invalid unwind info' endef
arch/ia64/configs/sim_defconfig deleted +0 -52
52 lines not on this page · raw message
arch/ia64/hp/sim/Kconfig deleted +0 -23
@@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -menu "HP Simulator drivers" - depends on IA64_HP_SIM || IA64_GENERIC - -config HP_SIMETH - bool "Simulated Ethernet " - depends on NET - -config HP_SIMSERIAL - bool "Simulated serial driver support" - depends on TTY - -config HP_SIMSERIAL_CONSOLE - bool "Console for HP simulator" - depends on HP_SIMSERIAL - -config HP_SIMSCSI - bool "Simulated SCSI disk" - depends on SCSI=y - -endmenu -
arch/ia64/hp/sim/Makefile deleted +0 -17
@@ -1,17 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# ia64/platform/hp/sim/Makefile -# -# Copyright (C) 2002 Hewlett-Packard Co. -# David Mosberger-Tang <[email protected]> -# Copyright (C) 1999 Silicon Graphics, Inc. -# Copyright (C) Srinivasa Thirumalachar ([email protected]) -# - -obj-y := hpsim_irq.o hpsim_setup.o hpsim.o -obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o - -obj-$(CONFIG_HP_SIMETH) += simeth.o -obj-$(CONFIG_HP_SIMSERIAL) += simserial.o -obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o -obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
arch/ia64/hp/sim/boot/Makefile deleted +0 -37
@@ -1,37 +0,0 @@ -# -# ia64/boot/Makefile -# -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# -# Copyright (C) 1998, 2003 by David Mosberger-Tang <[email protected]> -# - -targets-$(CONFIG_IA64_HP_SIM) += bootloader -targets := vmlinux.bin vmlinux.gz $(targets-y) - -quiet_cmd_cptotop = LN $@ - cmd_cptotop = ln -f $< $@ - -vmlinux.gz: $(obj)/vmlinux.gz $(addprefix $(obj)/,$(targets-y)) - $(call cmd,cptotop) - @echo ' Kernel: $@ is ready' - -boot: bootloader - -bootloader: $(obj)/bootloader - $(call cmd,cptotop) - -$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE - $(call if_changed,gzip) - -$(obj)/vmlinux.bin: vmlinux FORCE - $(call if_changed,objcopy) - - -LDFLAGS_bootloader = -static -T - -$(obj)/bootloader: $(src)/bootloader.lds $(obj)/bootloader.o $(obj)/boot_head.o $(obj)/fw-emu.o \ - lib/lib.a arch/ia64/lib/lib.a FORCE - $(call if_changed,ld)
arch/ia64/hp/sim/boot/boot_head.S deleted +0 -165
165 lines not on this page · raw message
arch/ia64/hp/sim/boot/bootloader.c deleted +0 -175
175 lines not on this page · raw message
arch/ia64/hp/sim/boot/bootloader.lds deleted +0 -67
67 lines not on this page · raw message
arch/ia64/hp/sim/boot/fw-emu.c deleted +0 -373
373 lines not on this page · raw message
arch/ia64/hp/sim/boot/ssc.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 1998-2003 Hewlett-Packard Co -* David Mosberger-Tang <[email protected]> -* Stephane Eranian <[email protected]> -*/ -#ifndef ssc_h -#define ssc_h - -/* Simulator system calls: */ - -#define SSC_CONSOLE_INIT 20 -#define SSC_GETCHAR 21 -#define SSC_PUTCHAR 31 -#define SSC_OPEN 50 -#define SSC_CLOSE 51 -#define SSC_READ 52 -#define SSC_WRITE 53 -#define SSC_GET_COMPLETION 54 -#define SSC_WAIT_COMPLETION 55 -#define SSC_CONNECT_INTERRUPT 58 -#define SSC_GENERATE_INTERRUPT 59 -#define SSC_SET_PERIODIC_INTERRUPT 60 -#define SSC_GET_RTC 65 -#define SSC_EXIT 66 -#define SSC_LOAD_SYMBOLS 69 -#define SSC_GET_TOD 74 - -#define SSC_GET_ARGS 75 - -/* -* Simulator system call. -*/ -extern long ssc (long arg0,long arg1,long arg2,long arg3,int nr); - -#endif /* ssc_h */
arch/ia64/hp/sim/hpsim.S deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <asm/asmmacro.h> - -/* - * Simulator system call. - */ -GLOBAL_ENTRY(ia64_ssc) - mov r15=r36 - break 0x80001 - br.ret.sptk.many rp -END(ia64_ssc)
arch/ia64/hp/sim/hpsim_console.c deleted +0 -77
77 lines not on this page · raw message
arch/ia64/hp/sim/hpsim_irq.c deleted +0 -76
76 lines not on this page · raw message
arch/ia64/hp/sim/hpsim_machvec.c deleted +0 -3
@@ -1,3 +0,0 @@ -#define MACHVEC_PLATFORM_NAME hpsim -#define MACHVEC_PLATFORM_HEADER <asm/machvec_hpsim.h> -#include <asm/machvec_init.h>
arch/ia64/hp/sim/hpsim_setup.c deleted +0 -41
41 lines not on this page · raw message
arch/ia64/hp/sim/hpsim_ssc.h deleted +0 -37
@@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Platform dependent support for HP simulator. -* -* Copyright (C) 1998, 1999 Hewlett-Packard Co -* Copyright (C) 1998, 1999 David Mosberger-Tang <[email protected]> -* Copyright (C) 1999 Vijay Chander <[email protected]> -*/ -#ifndef _IA64_PLATFORM_HPSIM_SSC_H -#define _IA64_PLATFORM_HPSIM_SSC_H - -/* Simulator system calls: */ - -#define SSC_CONSOLE_INIT 20 -#define SSC_GETCHAR 21 -#define SSC_PUTCHAR 31 -#define SSC_CONNECT_INTERRUPT 58 -#define SSC_GENERATE_INTERRUPT 59 -#define SSC_SET_PERIODIC_INTERRUPT 60 -#define SSC_GET_RTC 65 -#define SSC_EXIT 66 -#define SSC_LOAD_SYMBOLS 69 -#define SSC_GET_TOD 74 -#define SSC_CTL_TRACE 76 - -#define SSC_NETDEV_PROBE 100 -#define SSC_NETDEV_SEND 101 -#define SSC_NETDEV_RECV 102 -#define SSC_NETDEV_ATTACH 103 -#define SSC_NETDEV_DETACH 104 - -/* -* Simulator system call. -*/ -extern long ia64_ssc (long arg0,long arg1,long arg2,long arg3,int nr); - -#endif /* _IA64_PLATFORM_HPSIM_SSC_H */
arch/ia64/hp/sim/simeth.c deleted +0 -510
510 lines not on this page · raw message
arch/ia64/hp/sim/simscsi.c deleted +0 -373
373 lines not on this page · raw message
arch/ia64/hp/sim/simserial.c deleted +0 -520
520 lines not on this page · raw message
arch/ia64/include/asm/acpi.h +1 -3
@@ -37,9 +37,7 @@ const char *acpi_get_sysname (void);#else static inline const char *acpi_get_sysname (void ) { -# if defined (CONFIG_IA64_HP_SIM ) -return "hpsim" ; -# elif defined (CONFIG_IA64_HP_ZX1 ) +# if defined (CONFIG_IA64_HP_ZX1 )return "hpzx1" ;# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB )return "hpzx1_swiotlb" ;
arch/ia64/include/asm/hpsim.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASMIA64_HPSIM_H -#define _ASMIA64_HPSIM_H - -#ifndef CONFIG_HP_SIMSERIAL_CONSOLE -static inline int simcons_register (void ) {return 1 ; } -#else -int simcons_register (void ); -#endif - -struct tty_driver ; -extern struct tty_driver *hp_simserial_driver; - -extern int hpsim_get_irq (int intr); -void ia64_ctl_trace (long on); - -#endif
arch/ia64/include/asm/iosapic.h +0 -12
@@ -52,8 +52,6 @@#ifndef __ASSEMBLY__ -#ifdef CONFIG_IOSAPIC -#define NR_IOSAPICS 256#define iosapic_pcat_compat_init ia64_native_iosapic_pcat_compat_init
@@ -103,16 +101,6 @@ extern int __init iosapic_register_platform_intr (u32 int_type,#ifdef CONFIG_NUMA extern void map_iosapic_to_node (unsigned int ,int );#endif -#else -#define iosapic_system_init (pcat_compat) do { } while (0) -#define iosapic_init (address,gsi_base) (-EINVAL) -#define iosapic_remove (gsi_base) (-ENODEV) -#define iosapic_register_intr (gsi,polarity,trigger) (gsi) -#define iosapic_unregister_intr (irq) do { } while (0) -#define iosapic_override_isa_irq (isa_irq,gsi,polarity,trigger) do { } while (0) -#define iosapic_register_platform_intr (type,gsi,pmi,eid,id, \ - polarity,trigger) (gsi) -#endif # endif /* !__ASSEMBLY__ */ #endif /* __ASM_IA64_IOSAPIC_H */
arch/ia64/include/asm/machvec.h +1 -10
@@ -16,7 +16,6 @@struct device ;typedef void ia64_mv_setup_t (char **); -typedef void ia64_mv_irq_init_t (void );typedef void ia64_mv_dma_init (void );typedef const struct dma_map_ops *ia64_mv_dma_get_ops (struct device *);
@@ -27,9 +26,7 @@ machvec_noop (void)extern void machvec_setup (char **); -# if defined (CONFIG_IA64_HP_SIM ) -# include <asm/machvec_hpsim.h> -# elif defined (CONFIG_IA64_DIG ) +# if defined (CONFIG_IA64_DIG )# include <asm/machvec_dig.h> # elif defined(CONFIG_IA64_DIG_VTD )# include <asm/machvec_dig_vtd.h>
@@ -46,7 +43,6 @@ extern void machvec_setup (char **);# else # define ia64_platform_name ia64_mv.name# define platform_setup ia64_mv.setup -# define platform_irq_init ia64_mv.irq_init# define platform_dma_init ia64_mv.dma_init# define platform_dma_get_ops ia64_mv.dma_get_ops# endif
@@ -59,7 +55,6 @@ extern void machvec_setup (char **);struct ia64_machine_vector {const char *name;ia64_mv_setup_t *setup; -ia64_mv_irq_init_t *irq_init;ia64_mv_dma_init *dma_init;ia64_mv_dma_get_ops *dma_get_ops; } __attribute__((__aligned__ (16 )));/* align attrib? see above comment */
@@ -68,7 +63,6 @@ struct ia64_machine_vector { { \#name , \ platform_setup, \ - platform_irq_init, \ platform_dma_init, \ platform_dma_get_ops, \ }
@@ -91,9 +85,6 @@ extern const struct dma_map_ops *dma_get_ops(struct device *);#ifndef platform_setup# define platform_setup machvec_setup#endif -#ifndef platform_irq_init -# define platform_irq_init machvec_noop -#endif #ifndef platform_dma_init# define platform_dma_init swiotlb_dma_init#endif
arch/ia64/include/asm/machvec_hpsim.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_IA64_MACHVEC_HPSIM_h -#define _ASM_IA64_MACHVEC_HPSIM_h - -extern ia64_mv_setup_t hpsim_setup; -extern ia64_mv_irq_init_t hpsim_irq_init; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "hpsim" -#define platform_setup hpsim_setup -#define platform_irq_init hpsim_irq_init - -#endif /* _ASM_IA64_MACHVEC_HPSIM_h */
arch/ia64/kernel/Makefile +1 -2
@@ -12,13 +12,12 @@ extra-y := head.o vmlinux.lds obj-y := entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \ irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \ salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \ - unwind.o mca.o mca_asm.o topology.o dma-mapping.o + unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o obj-$(CONFIG_ACPI) += acpi.o acpi-ext.o obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o obj-$(CONFIG_IA64_PALINFO) += palinfo.o -obj-$(CONFIG_IOSAPIC) += iosapic.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_NUMA) += numa.o
arch/ia64/kernel/irq_ia64.c +0 -2
@@ -53,7 +53,6 @@#define IRQ_USED (1)#define IRQ_RSVD (2) -/* These can be overridden in platform_irq_init */ int ia64_first_device_vector =IA64_DEF_FIRST_DEVICE_VECTOR ;int ia64_last_device_vector =IA64_DEF_LAST_DEVICE_VECTOR ;
@@ -648,7 +647,6 @@ init_IRQ (void)#ifdef CONFIG_PERFMON pfm_init_percpu ();#endif -platform_irq_init (); }void
arch/ia64/kernel/setup.c +2 -11
@@ -63,7 +63,6 @@#include <asm/smp.h> #include <asm/tlbflush.h> #include <asm/unistd.h> -#include <asm/hpsim.h> #if defined(CONFIG_SMP ) && (IA64_CPU_SIZE >PAGE_SIZE )# error "struct cpuinfo_ia64 too big!"
@@ -461,16 +460,11 @@ io_port_init (void)static inline int __init early_console_setup (char *cmdline) { -int earlycons =0 ; -#ifdef CONFIG_EFI_PCDP if (!efi_setup_pcdp_console (cmdline)) - earlycons++; +return 0 ;#endif -if (!simcons_register ()) - earlycons++; - -return (earlycons) ?0 :-1 ; +return -1 ; } static inline void
@@ -608,9 +602,6 @@ setup_arch (char **cmdline_p)ia64_mca_init ();platform_setup (cmdline_p); -#ifndef CONFIG_IA64_HP_SIM -check_sal_cache_flush (); -#endif paging_init ();clear_sched_clock_stable ();
Signature · 1 line
2.20.1
PATCH 18/29 ia64: remove CONFIG_PCI ifdefs
In reply to Christoph HellwigNow that hpsim support is gone, CONFIG_PCI is forced on for ia64, and we can remove a few ifdefs for it.
--- arch/ia64/Makefile | 2 +- arch/ia64/hp/common/sba_iommu.c | 10 +--------- arch/ia64/include/asm/dma.h | 6 +----- arch/ia64/kernel/sys_ia64.c | 18 ------------------ arch/ia64/mm/init.c | 2 -- 5 files changed, 3 insertions(+), 35 deletions(-)
arch/ia64/Makefile +1 -1
@@ -51,7 +51,7 @@ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ -drivers-$(CONFIG_PCI) += arch/ia64/pci/ +drivers-y += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/
arch/ia64/hp/common/sba_iommu.c +1 -9
@@ -251,12 +251,8 @@ static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t);static u64 prefetch_spill_page;#endif -#ifdef CONFIG_PCI -# define GET_IOC (dev) ((dev_is_pci(dev)) \ +#define GET_IOC (dev) ((dev_is_pci(dev)) \ ? ((struct ioc *) PCI_CONTROLLER(to_pci_dev(dev))->iommu) : NULL) -#else -# define GET_IOC (dev) NULL -#endif /* ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
@@ -1741,9 +1737,7 @@ ioc_sac_init(struct ioc *ioc) controller->iommu = ioc; sac->sysdata = controller; sac->dma_mask =0xFFFFFFFFUL ; -#ifdef CONFIG_PCI sac->dev.bus = &pci_bus_type; -#endif ioc->sac_only_dev = sac; }
@@ -2121,13 +2115,11 @@ sba_init(void) }#endif -#ifdef CONFIG_PCI {struct pci_bus *b =NULL ;while ((b =pci_find_next_bus (b)) !=NULL )sba_connect_bus (b); } -#endif #ifdef CONFIG_PROC_FS ioc_proc_init ();
arch/ia64/include/asm/dma.h +1 -5
@@ -12,11 +12,7 @@extern unsigned long MAX_DMA_ADDRESS ; -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -# define isa_dma_bridge_buggy (0) -#endif +extern int isa_dma_bridge_buggy;#define free_dma (x)
arch/ia64/kernel/sys_ia64.c +0 -18
@@ -166,21 +166,3 @@ ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, uforce_successful_syscall_return ();return addr; } - -#ifndef CONFIG_PCI - -asmlinkage long -sys_pciconfig_read (unsigned long bus,unsigned long dfn,unsigned long off,unsigned long len, -void *buf) -{ -return -ENOSYS ; -} - -asmlinkage long -sys_pciconfig_write (unsigned long bus,unsigned long dfn,unsigned long off,unsigned long len, -void *buf) -{ -return -ENOSYS ; -} - -#endif /* CONFIG_PCI */
arch/ia64/mm/init.c +0 -2
@@ -632,14 +632,12 @@ mem_init (void)BUG_ON (PTRS_PER_PMD *sizeof (pmd_t) !=PAGE_SIZE );BUG_ON (PTRS_PER_PTE *sizeof (pte_t) !=PAGE_SIZE ); -#ifdef CONFIG_PCI /* * This needs to be called _after_ the command line has been parsed but _before_ * any drivers that may need the PCI DMA interface are initialized or bootmem has * been freed. */ platform_dma_init (); -#endif #ifdef CONFIG_FLATMEM BUG_ON (!mem_map);
Signature · 1 line
2.20.1
PATCH 19/29 ia64: remove CONFIG_ACPI ifdefs
In reply to Christoph HellwigNow that hpsim support is gone, CONFIG_ACPI is forced on for ia64, and we can remove a few ifdefs for it.
--- arch/ia64/include/asm/acpi.h | 4 ++-- arch/ia64/kernel/Makefile | 4 ++-- arch/ia64/kernel/iosapic.c | 2 -- arch/ia64/kernel/irq_ia64.c | 2 -- arch/ia64/kernel/mca.c | 18 ------------------ arch/ia64/kernel/setup.c | 10 ++++------ arch/ia64/kernel/topology.c | 4 ---- 7 files changed, 8 insertions(+), 36 deletions(-)
arch/ia64/include/asm/acpi.h +2 -2
@@ -17,7 +17,7 @@#include <linux/numa.h> #include <asm/numa.h> -#ifdef CONFIG_ACPI +extern int acpi_lapic;#define acpi_disabled 0/* ACPI always enabled on IA64 */ #define acpi_noirq 0/* ACPI always enabled on IA64 */
@@ -28,7 +28,7 @@ static inline bool acpi_has_cpu_in_madt(void) {return !!acpi_lapic; } -#endif +#define acpi_processor_cstate_check (x) (x)/* no idle limits on IA64 :) */ static inline void disable_acpi (void ) { }
arch/ia64/kernel/Makefile +2 -2
@@ -12,9 +12,9 @@ extra-y := head.o vmlinux.lds obj-y := entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \ irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \ salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \ - unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o + unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o acpi.o \ + acpi-ext.o -obj-$(CONFIG_ACPI) += acpi.o acpi-ext.o obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o obj-$(CONFIG_IA64_PALINFO) += palinfo.o
arch/ia64/kernel/iosapic.c +0 -2
@@ -643,10 +643,8 @@ get_target_cpu (unsigned int gsi, int irq)if (!cpu_online (smp_processor_id ()))return cpu_physical_id (smp_processor_id ()); -#ifdef CONFIG_ACPI if (cpe_vector >0 &&irq_to_vector (irq) =IA64_CPEP_VECTOR )return get_cpei_target_cpu (); -#endif #ifdef CONFIG_NUMA {
arch/ia64/kernel/irq_ia64.c +0 -2
@@ -633,9 +633,7 @@ ia64_native_register_ipi(void)void __init init_IRQ (void ) { -#ifdef CONFIG_ACPI acpi_boot_init (); -#endif ia64_register_ipi ();register_percpu_irq (IA64_SPURIOUS_INT_VECTOR ,NULL );#ifdef CONFIG_SMP
arch/ia64/kernel/mca.c +0 -18
@@ -149,9 +149,7 @@ static ia64_mc_info_t ia64_mc_info;#define CPE_HISTORY_LENGTH 5#define CMC_HISTORY_LENGTH 5 -#ifdef CONFIG_ACPI static struct timer_list cpe_poll_timer; -#endif static struct timer_list cmc_poll_timer;/* * This variable tells whether we are currently in polling mode.
@@ -532,8 +530,6 @@ int mca_recover_range(unsigned long addr) }EXPORT_SYMBOL_GPL (mca_recover_range); -#ifdef CONFIG_ACPI -int cpe_vector =-1 ;int ia64_cpe_irq =-1 ;
@@ -595,9 +591,6 @@ ia64_mca_cpe_int_handler (int cpe_irq, void *arg)return IRQ_HANDLED ; } -#endif /* CONFIG_ACPI */ - -#ifdef CONFIG_ACPI /* * ia64_mca_register_cpev *
@@ -625,7 +618,6 @@ ia64_mca_register_cpev (int cpev)IA64_MCA_DEBUG ("%s: corrected platform error " "vector %#x registered\n" , __func__, cpev); } -#endif /* CONFIG_ACPI */ /* * ia64_mca_cmc_vector_setup
@@ -1540,8 +1532,6 @@ ia64_mca_cmc_poll (struct timer_list *unused)* Outputs * handled */ -#ifdef CONFIG_ACPI -static irqreturn_t ia64_mca_cpe_int_caller (int cpe_irq,void *arg) {
@@ -1604,8 +1594,6 @@ ia64_mca_cpe_poll (struct timer_list *unused) IA64_IPI_DM_INT, 0); } -#endif /* CONFIG_ACPI */ -static int default_monarch_init_process (struct notifier_block *self,unsigned long val,void *data) {
@@ -1799,7 +1787,6 @@ static struct irqaction mca_wkup_irqaction = { .name = "mca_wkup" }; -#ifdef CONFIG_ACPI static struct irqaction mca_cpe_irqaction = { .handler = ia64_mca_cpe_int_handler, .name ="cpe_hndlr"
@@ -1809,7 +1796,6 @@ static struct irqaction mca_cpep_irqaction = { .handler = ia64_mca_cpe_int_caller, .name = "cpe_poll" }; -#endif /* CONFIG_ACPI */ /* Minimal format of the MCA/INIT stacks. The pseudo processes that run on * these stacks can never sleep, they cannot return from the kernel to user
@@ -2081,10 +2067,8 @@ void __init ia64_mca_irq_init(void)/* Setup the MCA wakeup interrupt vector */ register_percpu_irq (IA64_MCA_WAKEUP_VECTOR , &mca_wkup_irqaction); -#ifdef CONFIG_ACPI /* Setup the CPEI/P handler */ register_percpu_irq (IA64_CPEP_VECTOR , &mca_cpep_irqaction); -#endif }/*
@@ -2112,7 +2096,6 @@ ia64_mca_late_init(void) ia64_mca_cpu_online, NULL);IA64_MCA_DEBUG ("%s: CMCI/P setup and enabled.\n" , __func__); -#ifdef CONFIG_ACPI /* Setup the CPEI/P vector and handler */ cpe_vector =acpi_request_vector (ACPI_INTERRUPT_CPEI );timer_setup (&cpe_poll_timer, ia64_mca_cpe_poll,0 );
@@ -2143,7 +2126,6 @@ ia64_mca_late_init(void)IA64_MCA_DEBUG ("%s: CPEP setup and enabled.\n" , __func__); } } -#endif return 0 ; }
arch/ia64/kernel/setup.c +4 -6
@@ -537,21 +537,19 @@ setup_arch (char **cmdline_p)if (early_console_setup (*cmdline_p) =0 )mark_bsp_online (); -#ifdef CONFIG_ACPI /* Initialize the ACPI boot-time table parser */ acpi_table_init ();early_acpi_boot_init (); -# ifdef CONFIG_ACPI_NUMA +#ifdef CONFIG_ACPI_NUMA acpi_numa_init ();acpi_numa_fixup (); -# ifdef CONFIG_ACPI_HOTPLUG_CPU +#ifdef CONFIG_ACPI_HOTPLUG_CPU prefill_possible_map (); -# endif +#endif per_cpu_scan_finalize ((cpumask_weight (&early_cpu_possible_map) =0 ?32 :cpumask_weight (&early_cpu_possible_map)), additional_cpus >0 ? additional_cpus :0 ); -# endif -#endif /* CONFIG_APCI_BOOT */ +#endif /* CONFIG_ACPI_NUMA */ #ifdef CONFIG_SMP smp_build_cpu_map ();
arch/ia64/kernel/topology.c +0 -4
@@ -42,7 +42,6 @@ EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);#ifdef CONFIG_HOTPLUG_CPU int __ref arch_register_cpu (int num) { -#ifdef CONFIG_ACPI /* * If CPEI can be re-targeted or if this is not * CPEI target, then it is hotpluggable
@@ -50,7 +49,6 @@ int __ref arch_register_cpu(int num)if (can_cpei_retarget () || !is_cpu_cpei_target (num)) sysfs_cpus[num].cpu.hotpluggable =1 ;map_cpu_to_node (num, node_cpuid[num].nid); -#endif return register_cpu (&sysfs_cpus[num].cpu, num); }EXPORT_SYMBOL (arch_register_cpu);
@@ -58,9 +56,7 @@ EXPORT_SYMBOL(arch_register_cpu);void __ref arch_unregister_cpu (int num) {unregister_cpu (&sysfs_cpus[num].cpu); -#ifdef CONFIG_ACPI unmap_cpu_from_node (num,cpu_to_node (num)); -#endif }EXPORT_SYMBOL (arch_unregister_cpu);#else
Signature · 1 line
2.20.1
PATCH 20/29 ia64: remove the zx1 swiotlb machvec
In reply to Christoph HellwigThe aim of this machvec is to support devices with < 32-bit dma masks. But given that ia64 only has a ZONE_DMA32 and not a ZONE_DMA that isn't supported by swiotlb either.
--- .../admin-guide/kernel-parameters.txt | 2 +- arch/ia64/Kconfig | 13 +--- arch/ia64/Kconfig.debug | 2 +- arch/ia64/Makefile | 2 - arch/ia64/hp/common/Makefile | 2 - arch/ia64/hp/common/hwsw_iommu.c | 60 ------------------- arch/ia64/hp/common/sba_iommu.c | 15 +---- arch/ia64/hp/zx1/Makefile | 2 +- arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c | 3 - arch/ia64/include/asm/acpi.h | 2 - arch/ia64/include/asm/dma-mapping.h | 8 +-- arch/ia64/include/asm/machvec.h | 15 ----- arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 20 ------- arch/ia64/kernel/dma-mapping.c | 6 -- drivers/char/agp/Kconfig | 2 +- 15 files changed, 7 insertions(+), 147 deletions(-) delete mode 100644 arch/ia64/hp/common/hwsw_iommu.c delete mode 100644 arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c delete mode 100644 arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
Documentation/admin-guide/kernel-parameters.txt +1 -1
@@ -2373,7 +2373,7 @@ machvec= [IA-64] Force the use of a particular machine-vector (machvec) in a generic kernel. - Example: machvec=hpzx1_swiotlb + Example: machvec=hpzx1 machtype= [Loongson] Share the same kernel image file between different yeeloong laptop.
arch/ia64/Kconfig +1 -12
@@ -138,7 +138,6 @@ config IA64_GENERIC DIG-compliant For DIG ("Developer's Interface Guide") compliant systems DIG+Intel+IOMMU For DIG systems with Intel IOMMU HP-zx1/sx1000 For HP systems - HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices. SGI-UV For SGI UV systems If you don't know what to do, choose "generic".
@@ -158,16 +157,6 @@ config IA64_HP_ZX1 Build a kernel that runs on HP zx1 and sx1000 systems. This adds support for the HP I/O MMU. -config IA64_HP_ZX1_SWIOTLB - bool "HP-zx1/sx1000 with software I/O TLB" - select SWIOTLB - help - Build a kernel that runs on HP zx1 and sx1000 systems even when they - have broken PCI devices which cannot DMA to full 32 bits. Apart - from support for the HP I/O MMU, this includes support for the software - I/O TLB, which allows supporting the broken devices at the expense of - wasting some kernel memory (about 2MB by default). - config IA64_SGI_UV bool "SGI-UV" select NUMA
@@ -350,7 +339,7 @@ config ARCH_SPARSEMEM_ENABLE select SPARSEMEM_VMEMMAP_ENABLE config ARCH_DISCONTIGMEM_DEFAULT - def_bool y if (IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) + def_bool y if (IA64_GENERIC || IA64_HP_ZX1) depends on ARCH_DISCONTIGMEM_ENABLE config NUMA
arch/ia64/Kconfig.debug +1 -1
@@ -14,7 +14,7 @@ config IA64_GRANULE_16MB config IA64_GRANULE_64MB bool "64MB" - depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) + depends on !(IA64_GENERIC || IA64_HP_ZX1) endchoice
arch/ia64/Makefile +0 -2
@@ -48,12 +48,10 @@ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ -core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ drivers-y += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ -drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/ drivers-$(CONFIG_OPROFILE) += arch/ia64/oprofile/
arch/ia64/hp/common/Makefile +0 -2
@@ -7,6 +7,4 @@ # obj-y := sba_iommu.o -obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += hwsw_iommu.o -obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o
arch/ia64/hp/common/hwsw_iommu.c deleted +0 -60
60 lines not on this page · raw message
arch/ia64/hp/common/sba_iommu.c +1 -14
@@ -2059,7 +2059,7 @@ arch_initcall(acpi_sba_ioc_init_acpi);static int __init sba_init (void ) { -if (!ia64_platform_is ("hpzx1" ) && !ia64_platform_is ("hpzx1_swiotlb" )) +if (!ia64_platform_is ("hpzx1" ))return 0 ;#if defined(CONFIG_IA64_GENERIC )
@@ -2102,19 +2102,6 @@ sba_init(void)return 0 ; } -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB ) -/* -* hpzx1_swiotlb needs to have a fairly small swiotlb bounce -* buffer setup to support devices with smaller DMA masks than -* sba_iommu can handle. -*/ -if (ia64_platform_is ("hpzx1_swiotlb" )) { -extern void hwsw_init (void ); - -hwsw_init (); - } -#endif - {struct pci_bus *b =NULL ;while ((b =pci_find_next_bus (b)) !=NULL )
arch/ia64/hp/zx1/Makefile +1 -1
@@ -6,4 +6,4 @@ # Copyright (C) Alex Williamson ([email protected]) # -obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o hpzx1_swiotlb_machvec.o +obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c deleted +0 -3
@@ -1,3 +0,0 @@ -#define MACHVEC_PLATFORM_NAME hpzx1_swiotlb -#define MACHVEC_PLATFORM_HEADER <asm/machvec_hpzx1_swiotlb.h> -#include <asm/machvec_init.h>
arch/ia64/include/asm/acpi.h +0 -2
@@ -39,8 +39,6 @@ static inline const char *acpi_get_sysname (void) {# if defined (CONFIG_IA64_HP_ZX1 )return "hpzx1" ; -# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB ) -return "hpzx1_swiotlb" ;# elif defined (CONFIG_IA64_SGI_UV )return "uv" ;# elif defined (CONFIG_IA64_DIG )
arch/ia64/include/asm/dma-mapping.h +1 -7
@@ -6,17 +6,11 @@* Copyright (C) 2003-2004 Hewlett-Packard Co * David Mosberger-Tang <[email protected]> */ -#include <asm/machvec.h> -#include <linux/scatterlist.h> -#include <linux/dma-debug.h> -extern const struct dma_map_ops *dma_ops; -extern struct ia64_machine_vector ia64_mv; -extern void set_iommu_machvec (void );static inline const struct dma_map_ops *get_arch_dma_ops (struct bus_type *bus) { -return platform_dma_get_ops (NULL ); +return dma_ops; }#endif /* _ASM_IA64_DMA_MAPPING_H */
arch/ia64/include/asm/machvec.h +0 -15
@@ -17,12 +17,6 @@ struct device;typedef void ia64_mv_setup_t (char **);typedef void ia64_mv_dma_init (void ); -typedef const struct dma_map_ops *ia64_mv_dma_get_ops (struct device *); - -static inline void -machvec_noop (void ) -{ -}extern void machvec_setup (char **);
@@ -32,8 +26,6 @@ extern void machvec_setup (char **);# include <asm/machvec_dig_vtd.h> # elif defined (CONFIG_IA64_HP_ZX1 )# include <asm/machvec_hpzx1.h> -# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB ) -# include <asm/machvec_hpzx1_swiotlb.h> # elif defined (CONFIG_IA64_SGI_UV )# include <asm/machvec_uv.h> # elif defined (CONFIG_IA64_GENERIC )
@@ -44,7 +36,6 @@ extern void machvec_setup (char **);# define ia64_platform_name ia64_mv.name# define platform_setup ia64_mv.setup# define platform_dma_init ia64_mv.dma_init -# define platform_dma_get_ops ia64_mv.dma_get_ops# endif /* __attribute__((__aligned__(16))) is required to make size of the
@@ -56,7 +47,6 @@ struct ia64_machine_vector {const char *name;ia64_mv_setup_t *setup;ia64_mv_dma_init *dma_init; -ia64_mv_dma_get_ops *dma_get_ops; } __attribute__((__aligned__(16))); /* align attrib? see above comment */#define MACHVEC_INIT (name) \
@@ -64,7 +54,6 @@ struct ia64_machine_vector {#name , \ platform_setup, \ platform_dma_init, \ - platform_dma_get_ops, \ }extern struct ia64_machine_vector ia64_mv;
@@ -76,7 +65,6 @@ extern void machvec_init_from_cmdline(const char *cmdline);# endif /* CONFIG_IA64_GENERIC */ extern void swiotlb_dma_init (void ); -extern const struct dma_map_ops *dma_get_ops (struct device *);/* * Define default versions so we can extend machvec for new platforms without having
@@ -88,8 +76,5 @@ extern const struct dma_map_ops *dma_get_ops(struct device *);#ifndef platform_dma_init# define platform_dma_init swiotlb_dma_init#endif -#ifndef platform_dma_get_ops -# define platform_dma_get_ops dma_get_ops -#endif #endif /* _ASM_IA64_MACHVEC_H */
arch/ia64/include/asm/machvec_hpzx1_swiotlb.h deleted +0 -20
@@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h -#define _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h - -extern ia64_mv_setup_t dig_setup; -extern ia64_mv_dma_get_ops hwsw_dma_get_ops; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "hpzx1_swiotlb" -#define platform_setup dig_setup -#define platform_dma_init machvec_noop -#define platform_dma_get_ops hwsw_dma_get_ops - -#endif /* _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h */
arch/ia64/kernel/dma-mapping.c +0 -6
@@ -9,12 +9,6 @@ int iommu_detected __read_mostly;const struct dma_map_ops *dma_ops;EXPORT_SYMBOL (dma_ops); -const struct dma_map_ops *dma_get_ops (struct device *dev) -{ -return dma_ops; -} -EXPORT_SYMBOL (dma_get_ops); -#ifdef CONFIG_SWIOTLB void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs)
drivers/char/agp/Kconfig +1 -1
@@ -118,7 +118,7 @@ config AGP_I460 config AGP_HP_ZX1 tristate "HP ZX1 chipset AGP support" - depends on AGP && (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC) + depends on AGP && (IA64_HP_ZX1 || IA64_GENERIC) help This option gives you AGP GART support for the HP ZX1 chipset for IA64 processors.
Signature · 1 line
2.20.1
PATCH 21/29 ia64: remove the SGI UV simulator support
In reply to Christoph HellwigThe simulator support was marked as temporary since the initial commit, so drop it more than 10 years later.
--- arch/ia64/include/asm/sn/simulator.h | 25 ---------------------- arch/ia64/include/asm/sn/sn_sal.h | 10 --------- arch/ia64/include/asm/uv/uv.h | 4 +--- arch/ia64/uv/kernel/setup.c | 31 +++++----------------------- 4 files changed, 6 insertions(+), 64 deletions(-) delete mode 100644 arch/ia64/include/asm/sn/simulator.h
arch/ia64/include/asm/sn/simulator.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* Copyright (C) 2000-2004 Silicon Graphics, Inc. All rights reserved. -*/ - -#ifndef _ASM_IA64_SN_SIMULATOR_H -#define _ASM_IA64_SN_SIMULATOR_H - -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_SGI_UV ) -#define SNMAGIC 0xaeeeeeee8badbeefL -#define IS_MEDUSA () ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn = SNMAGIC;}) - -#define SIMULATOR_SLEEP () asm("nop.i 0x8beef") -#define IS_RUNNING_ON_SIMULATOR () (sn_prom_type) -#define IS_RUNNING_ON_FAKE_PROM () (sn_prom_type = 2) -extern int sn_prom_type;/* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ -#else -#define IS_MEDUSA () 0 -#define SIMULATOR_SLEEP () -#define IS_RUNNING_ON_SIMULATOR () 0 -#endif - -#endif /* _ASM_IA64_SN_SIMULATOR_H */
arch/ia64/include/asm/sn/sn_sal.h +0 -10
@@ -30,8 +30,6 @@#define SALRET_INVALID_ARG (-2)#define SALRET_ERROR (-3) -#define SN_SAL_FAKE_PROM 0x02009999 -/* * Returns the physical address of the partition's reserved page through * an iterative number of calls.
@@ -81,14 +79,6 @@ sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)#define SN_MEMPROT_ACCESS_CLASS_6 0x084080#define SN_MEMPROT_ACCESS_CLASS_7 0x021080 -static inline int -ia64_sn_is_fake_prom (void ) -{ -struct ia64_sal_retval rv; -SAL_CALL_NOLOCK (rv,SN_SAL_FAKE_PROM ,0 ,0 ,0 ,0 ,0 ,0 ,0 ); -return (rv.status =0 ); -} -union sn_watchlist_u {u64 val;struct {
arch/ia64/include/asm/uv/uv.h +1 -3
@@ -2,12 +2,10 @@#ifndef _ASM_IA64_UV_UV_H#define _ASM_IA64_UV_UV_H -#include <asm/sn/simulator.h> -static inline int is_uv_system (void ) {/* temporary support for running on hardware simulator */ -return IS_MEDUSA () ||ia64_platform_is ("uv" ); +return ia64_platform_is ("uv" ); }#endif /* _ASM_IA64_UV_UV_H */
arch/ia64/uv/kernel/setup.c +5 -25
@@ -10,14 +10,12 @@#include <linux/module.h> #include <linux/percpu.h> -#include <asm/sn/simulator.h> #include <asm/uv/uv_mmrs.h> #include <asm/uv/uv_hub.h> DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);EXPORT_PER_CPU_SYMBOL_GPL (__uv_hub_info); -int sn_prom_type;long sn_coherency_id;EXPORT_SYMBOL_GPL (sn_coherency_id);
@@ -60,30 +58,11 @@ void __init uv_setup(char **cmdline_p)int nid, cpu, m_val, n_val;unsigned long mmr_base, lowmem_redir_base, lowmem_redir_size; -if (IS_MEDUSA ()) { - lowmem_redir_base =0 ; - lowmem_redir_size =0 ; - node_id.v =0 ; - m_n_config.s.m_skt =37 ; - m_n_config.s.n_skt =0 ; - mmr_base =0 ; -#if 0 -/* Need BIOS calls - TDB */ -if (!ia64_sn_is_fake_prom ()) - sn_prom_type =1 ; - else -#endif - sn_prom_type =2 ; -printk (KERN_INFO "Running on medusa with %s PROM\n" , - (sn_prom_type =1 ) ?"real" :"fake" ); - }else { -get_lowmem_redirect (&lowmem_redir_base, &lowmem_redir_size); - node_id.v =uv_read_local_mmr (UVH_NODE_ID ); - m_n_config.v =uv_read_local_mmr (UVH_SI_ADDR_MAP_CONFIG ); - mmr_base -uv_read_local_mmr (UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR ) & - ~UV_MMR_ENABLE ; - } +get_lowmem_redirect (&lowmem_redir_base, &lowmem_redir_size); + node_id.v =uv_read_local_mmr (UVH_NODE_ID ); + m_n_config.v =uv_read_local_mmr (UVH_SI_ADDR_MAP_CONFIG ); + mmr_base =uv_read_local_mmr (UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR ) & + ~UV_MMR_ENABLE ; m_val = m_n_config.s.m_skt; n_val = m_n_config.s.n_skt;
Signature · 1 line
2.20.1
PATCH 22/29 ia64: remove the unused sn_coherency_id symbol
In reply to Christoph HellwigThe sn_coherency_id symbol isn't used anywhere, remove it.
--- arch/ia64/uv/kernel/setup.c | 3 --- 1 file changed, 3 deletions(-)
arch/ia64/uv/kernel/setup.c +0 -3
@@ -16,9 +16,6 @@ DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);EXPORT_PER_CPU_SYMBOL_GPL (__uv_hub_info); -long sn_coherency_id; -EXPORT_SYMBOL_GPL (sn_coherency_id); -struct redir_addr {unsigned long redirect;unsigned long alias;
Signature · 1 line
2.20.1
PATCH 23/29 ia64: rework iommu probing
In reply to Christoph Hellwigia64 currently organizes the iommu probing along machves, which isn't very helpful. Instead just try to probe for Intel IOMMUs in mem_init as they are properly described in ACPI and if none was found initialize the swiotlb buffer. The HP SBA handling is then only done delayed when the actual hardware is probed. Only in the case that we actually found usable IOMMUs we then set up the DMA ops and free the not needed swiotlb buffer. This scheme gets rid of the need for the dma_init machvec operation, and the dig_vtd machvec.
--- arch/ia64/Kconfig | 5 -- arch/ia64/Makefile | 1 - arch/ia64/dig/Makefile | 5 -- arch/ia64/dig/machvec_vtd.c | 3 - arch/ia64/hp/common/sba_iommu.c | 82 +++++++++---------------- arch/ia64/include/asm/acpi.h | 2 - arch/ia64/include/asm/machvec.h | 11 ---- arch/ia64/include/asm/machvec_dig_vtd.h | 19 ------ arch/ia64/include/asm/machvec_hpzx1.h | 2 - arch/ia64/include/asm/pci.h | 3 - arch/ia64/kernel/acpi.c | 15 ----- arch/ia64/kernel/dma-mapping.c | 6 -- arch/ia64/kernel/pci-dma.c | 21 ------- arch/ia64/mm/init.c | 13 ++-- 14 files changed, 37 insertions(+), 151 deletions(-) delete mode 100644 arch/ia64/dig/machvec_vtd.c delete mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h
arch/ia64/Kconfig +0 -5
@@ -146,11 +146,6 @@ config IA64_DIG bool "DIG-compliant" select SWIOTLB -config IA64_DIG_VTD - bool "DIG+Intel+IOMMU" - select INTEL_IOMMU - select PCI_MSI - config IA64_HP_ZX1 bool "HP-zx1/sx1000" help
arch/ia64/Makefile +0 -1
@@ -45,7 +45,6 @@ head-y := arch/ia64/kernel/head.o libs-y += arch/ia64/lib/ core-y += arch/ia64/kernel/ arch/ia64/mm/ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ -core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/
arch/ia64/dig/Makefile +0 -5
@@ -7,9 +7,4 @@ # obj-y := setup.o -ifeq ($(CONFIG_INTEL_IOMMU), y) -obj-$(CONFIG_IA64_GENERIC) += machvec.o machvec_vtd.o -else obj-$(CONFIG_IA64_GENERIC) += machvec.o -endif -
arch/ia64/dig/machvec_vtd.c deleted +0 -3
@@ -1,3 +0,0 @@ -#define MACHVEC_PLATFORM_NAME dig_vtd -#define MACHVEC_PLATFORM_HEADER <asm/machvec_dig_vtd.h> -#include <asm/machvec_init.h>
arch/ia64/hp/common/sba_iommu.c +28 -54
127 lines not on this page · raw message
arch/ia64/include/asm/acpi.h +0 -2
@@ -43,8 +43,6 @@ static inline const char *acpi_get_sysname (void)return "uv" ;# elif defined (CONFIG_IA64_DIG )return "dig" ; -# elif defined(CONFIG_IA64_DIG_VTD ) -return "dig_vtd" ;# else # error Unknown platform. Fix acpi.c.# endif
arch/ia64/include/asm/machvec.h +0 -11
@@ -16,14 +16,11 @@struct device ;typedef void ia64_mv_setup_t (char **); -typedef void ia64_mv_dma_init (void );extern void machvec_setup (char **);# if defined (CONFIG_IA64_DIG )# include <asm/machvec_dig.h> -# elif defined(CONFIG_IA64_DIG_VTD ) -# include <asm/machvec_dig_vtd.h> # elif defined (CONFIG_IA64_HP_ZX1 )# include <asm/machvec_hpzx1.h> # elif defined (CONFIG_IA64_SGI_UV )
@@ -35,7 +32,6 @@ extern void machvec_setup (char **);# else # define ia64_platform_name ia64_mv.name# define platform_setup ia64_mv.setup -# define platform_dma_init ia64_mv.dma_init# endif /* __attribute__((__aligned__(16))) is required to make size of the
@@ -46,14 +42,12 @@ extern void machvec_setup (char **);struct ia64_machine_vector {const char *name;ia64_mv_setup_t *setup; -ia64_mv_dma_init *dma_init; } __attribute__((__aligned__ (16 )));/* align attrib? see above comment */ #define MACHVEC_INIT (name) \ { \ #name, \ platform_setup, \ - platform_dma_init, \ }extern struct ia64_machine_vector ia64_mv;
@@ -64,8 +58,6 @@ extern void machvec_init_from_cmdline(const char *cmdline);# error Unknown configuration. Update arch/ia64/include/asm/machvec.h.# endif /* CONFIG_IA64_GENERIC */ -extern void swiotlb_dma_init (void ); -/* * Define default versions so we can extend machvec for new platforms without having * to update the machvec files for all existing platforms.
@@ -73,8 +65,5 @@ extern void swiotlb_dma_init(void);#ifndef platform_setup# define platform_setup machvec_setup#endif -#ifndef platform_dma_init -# define platform_dma_init swiotlb_dma_init -#endif #endif /* _ASM_IA64_MACHVEC_H */
arch/ia64/include/asm/machvec_dig_vtd.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_IA64_MACHVEC_DIG_VTD_h -#define _ASM_IA64_MACHVEC_DIG_VTD_h - -extern ia64_mv_setup_t dig_setup; -extern ia64_mv_dma_init pci_iommu_alloc; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "dig_vtd" -#define platform_setup dig_setup -#define platform_dma_init pci_iommu_alloc - -#endif /* _ASM_IA64_MACHVEC_DIG_VTD_h */
arch/ia64/include/asm/machvec_hpzx1.h +0 -2
@@ -3,7 +3,6 @@#define _ASM_IA64_MACHVEC_HPZX1_hextern ia64_mv_setup_t dig_setup; -extern ia64_mv_dma_init sba_dma_init;/* * This stuff has dual use!
@@ -14,6 +13,5 @@ extern ia64_mv_dma_init sba_dma_init;*/ #define ia64_platform_name "hpzx1"#define platform_setup dig_setup -#define platform_dma_init sba_dma_init#endif /* _ASM_IA64_MACHVEC_HPZX1_h */
arch/ia64/include/asm/pci.h +0 -3
@@ -69,7 +69,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14); } -#ifdef CONFIG_INTEL_IOMMU -extern void pci_iommu_alloc (void ); -#endif #endif /* _ASM_IA64_PCI_H */
arch/ia64/kernel/acpi.c +0 -15
@@ -65,9 +65,6 @@ acpi_get_sysname(void)struct acpi_table_rsdp *rsdp;struct acpi_table_xsdt *xsdt;struct acpi_table_header *hdr; -#ifdef CONFIG_INTEL_IOMMU -u64 i, nentries; -#endif rsdp_phys =acpi_find_rsdp ();if (!rsdp_phys) {
@@ -98,18 +95,6 @@ acpi_get_sysname(void) return "uv"; } -#ifdef CONFIG_INTEL_IOMMU -/* Look for Intel IOMMU */ - nentries = (hdr->length -sizeof (*hdr)) / -sizeof (xsdt->table_offset_entry[0 ]); -for (i =0 ; i < nentries; i++) { - hdr =__va (xsdt->table_offset_entry[i]); -if (strncmp (hdr->signature,ACPI_SIG_DMAR , -sizeof (ACPI_SIG_DMAR ) -1 ) =0 ) -return "dig_vtd" ; - } -#endif -return "dig" ; }#endif /* CONFIG_IA64_GENERIC */
arch/ia64/kernel/dma-mapping.c +0 -6
@@ -1,6 +1,5 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/dma-direct.h> -#include <linux/swiotlb.h> #include <linux/export.h> /* Set this to 1 if there is a HW IOMMU in the system */
@@ -27,9 +26,4 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr, {return page_to_pfn (virt_to_page (cpu_addr)); } - -void __init swiotlb_dma_init (void ) -{ -swiotlb_init (1 ); -}#endif
arch/ia64/kernel/pci-dma.c +0 -21
@@ -34,24 +34,3 @@ static int __init pci_iommu_init(void)/* Must execute after PCI subsystem */ fs_initcall (pci_iommu_init); - -void __init pci_iommu_alloc (void ) -{ -/* -* The order of these functions is important for -* fall-back/fail-over reasons -*/ -detect_intel_iommu (); - -#ifdef CONFIG_SWIOTLB -if (!iommu_detected) { -#ifdef CONFIG_IA64_GENERIC -printk (KERN_INFO "PCI-DMA: Re-initialize machine vector.\n" ); -machvec_init ("dig" ); -swiotlb_dma_init (); -#else -panic ("Unable to find Intel IOMMU" ); -#endif /* CONFIG_IA64_GENERIC */ - } -#endif /* CONFIG_SWIOTLB */ -}
arch/ia64/mm/init.c +9 -4
@@ -9,6 +9,7 @@#include <linux/init.h> #include <linux/dma-noncoherent.h> +#include <linux/dmar.h> #include <linux/efi.h> #include <linux/elf.h> #include <linux/memblock.h>
@@ -23,6 +24,7 @@#include <linux/proc_fs.h> #include <linux/bitops.h> #include <linux/kexec.h> +#include <linux/swiotlb.h> #include <asm/dma.h> #include <asm/io.h>
@@ -633,11 +635,14 @@ mem_init (void)BUG_ON (PTRS_PER_PTE *sizeof (pte_t) !=PAGE_SIZE );/* -* This needs to be called _after_ the command line has been parsed but _before_ -* any drivers that may need the PCI DMA interface are initialized or bootmem has -* been freed. +* This needs to be called _after_ the command line has been parsed but +* _before_ any drivers that may need the PCI DMA interface are +* initialized or bootmem has been freed. */ -platform_dma_init (); +if (IS_ENABLED (CONFIG_INTEL_IOMMU )) +detect_intel_iommu (); +if (!iommu_detected) +swiotlb_init (1 );#ifdef CONFIG_FLATMEM BUG_ON (!mem_map);
Signature · 1 line
2.20.1
PATCH 24/29 ia64: move the ROOT_DEV setup to common code
In reply to Christoph HellwigI'm not sure how useful a platform default ROOT_DEV is these days, but it pretty sure isn't machvec dependent.
--- arch/ia64/dig/setup.c | 9 --------- arch/ia64/kernel/setup.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)
arch/ia64/dig/setup.c +0 -9
@@ -13,13 +13,11 @@#include <linux/init.h> #include <linux/delay.h> #include <linux/kernel.h> -#include <linux/kdev_t.h> #include <linux/string.h> #include <linux/screen_info.h> #include <linux/console.h> #include <linux/timex.h> #include <linux/sched.h> -#include <linux/root_dev.h> #include <asm/io.h> #include <asm/machvec.h>
@@ -30,13 +28,6 @@ dig_setup (char **cmdline_p) {unsigned int orig_x, orig_y, num_cols, num_rows, font_height; -/* -* Default to /dev/sda2. This assumes that the EFI partition -* is physical disk 1 partition 1 and the Linux root disk is -* physical disk 1 partition 2. -*/ -ROOT_DEV = Root_SDA2;/* default to second partition on first drive */ -#ifdef CONFIG_SMP init_smp_config ();#endif
arch/ia64/kernel/setup.c +9 -0
@@ -30,6 +30,7 @@#include <linux/console.h> #include <linux/delay.h> #include <linux/cpu.h> +#include <linux/kdev_t.h> #include <linux/kernel.h> #include <linux/memblock.h> #include <linux/reboot.h>
@@ -41,6 +42,7 @@#include <linux/threads.h> #include <linux/screen_info.h> #include <linux/dmi.h> +#include <linux/root_dev.h> #include <linux/serial.h> #include <linux/serial_core.h> #include <linux/efi.h>
@@ -599,6 +601,13 @@ setup_arch (char **cmdline_p)if (!nomca)ia64_mca_init (); +/* +* Default to /dev/sda2. This assumes that the EFI partition +* is physical disk 1 partition 1 and the Linux root disk is +* physical disk 1 partition 2. +*/ +ROOT_DEV = Root_SDA2;/* default to second partition on first drive */ +platform_setup (cmdline_p);paging_init ();
Signature · 1 line
2.20.1
PATCH 25/29 ia64: move the screen_info setup to common code
In reply to Christoph HellwigThere is nothing really platform specific about setting about the screen_info from the ia64_boot_param structure, so move it from the dig machvec to common code.
--- arch/ia64/dig/setup.c | 30 ------------------------------ arch/ia64/kernel/setup.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 30 deletions(-)
arch/ia64/dig/setup.c +0 -30
@@ -26,37 +26,7 @@void __init dig_setup (char **cmdline_p) { -unsigned int orig_x, orig_y, num_cols, num_rows, font_height; -#ifdef CONFIG_SMP init_smp_config ();#endif - -memset (&screen_info,0 ,sizeof (screen_info)); - -if (!ia64_boot_param->console_info.num_rows - || !ia64_boot_param->console_info.num_cols) - { -printk (KERN_WARNING "dig_setup: warning: invalid screen-info, guessing 80x25\n" ); - orig_x =0 ; - orig_y =0 ; - num_cols =80 ; - num_rows =25 ; - font_height =16 ; - }else { - orig_x = ia64_boot_param->console_info.orig_x; - orig_y = ia64_boot_param->console_info.orig_y; - num_cols = ia64_boot_param->console_info.num_cols; - num_rows = ia64_boot_param->console_info.num_rows; - font_height =400 / num_rows; - } - - screen_info.orig_x = orig_x; - screen_info.orig_y = orig_y; - screen_info.orig_video_cols = num_cols; - screen_info.orig_video_lines = num_rows; - screen_info.orig_video_points = font_height; - screen_info.orig_video_mode =3 ;/* XXX fake */ - screen_info.orig_video_isVGA =1 ;/* XXX fake */ - screen_info.orig_video_ega_bx =3 ;/* XXX fake */ }
arch/ia64/kernel/setup.c +34 -0
@@ -469,6 +469,39 @@ early_console_setup (char *cmdline)return -1 ; } +static void __init +screen_info_setup (void ) +{ +unsigned int orig_x, orig_y, num_cols, num_rows, font_height; + +memset (&screen_info,0 ,sizeof (screen_info)); + +if (!ia64_boot_param->console_info.num_rows || + !ia64_boot_param->console_info.num_cols) { +printk (KERN_WARNING "invalid screen-info, guessing 80x25\n" ); + orig_x =0 ; + orig_y =0 ; + num_cols =80 ; + num_rows =25 ; + font_height =16 ; + }else { + orig_x = ia64_boot_param->console_info.orig_x; + orig_y = ia64_boot_param->console_info.orig_y; + num_cols = ia64_boot_param->console_info.num_cols; + num_rows = ia64_boot_param->console_info.num_rows; + font_height =400 / num_rows; + } + + screen_info.orig_x = orig_x; + screen_info.orig_y = orig_y; + screen_info.orig_video_cols = num_cols; + screen_info.orig_video_lines = num_rows; + screen_info.orig_video_points = font_height; + screen_info.orig_video_mode =3 ;/* XXX fake */ + screen_info.orig_video_isVGA =1 ;/* XXX fake */ + screen_info.orig_video_ega_bx =3 ;/* XXX fake */ +} +static inline void mark_bsp_online (void ) {
@@ -609,6 +642,7 @@ setup_arch (char **cmdline_p)ROOT_DEV = Root_SDA2;/* default to second partition on first drive */ platform_setup (cmdline_p); +screen_info_setup ();paging_init ();clear_sched_clock_stable ();
Signature · 1 line
2.20.1
PATCH 26/29 ia64: remove support for machvecs
In reply to Christoph HellwigThe only thing remaining of the machvecs is a few checks if we are running on an SGI UV system. Replace those with the existing is_uv_system() check that has been rewritten to simply check the OEM ID directly.
That leaves us with a generic kernel that is as fast as the previous DIG/ZX1/UV kernels, but can support all hardware. Support for UV and the HP SBA IOMMU is now optional based on new config options.
--- arch/ia64/Kconfig | 72 ++++++++------------------- arch/ia64/Kconfig.debug | 2 +- arch/ia64/Makefile | 7 +-- arch/ia64/configs/bigsur_defconfig | 1 - arch/ia64/configs/tiger_defconfig | 1 - arch/ia64/configs/zx1_defconfig | 1 - arch/ia64/dig/Makefile | 10 ---- arch/ia64/dig/machvec.c | 3 -- arch/ia64/dig/setup.c | 32 ------------ arch/ia64/hp/common/Makefile | 2 +- arch/ia64/hp/zx1/Makefile | 9 ---- arch/ia64/hp/zx1/hpzx1_machvec.c | 3 -- arch/ia64/include/asm/acpi.h | 16 ------ arch/ia64/include/asm/hw_irq.h | 5 +- arch/ia64/include/asm/io.h | 1 - arch/ia64/include/asm/iommu.h | 1 - arch/ia64/include/asm/machvec.h | 69 ------------------------- arch/ia64/include/asm/machvec_dig.h | 17 ------- arch/ia64/include/asm/machvec_hpzx1.h | 17 ------- arch/ia64/include/asm/machvec_init.h | 11 ---- arch/ia64/include/asm/machvec_uv.h | 26 ---------- arch/ia64/include/asm/mmzone.h | 13 ++--- arch/ia64/include/asm/processor.h | 2 - arch/ia64/include/asm/tlb.h | 1 - arch/ia64/include/asm/uv/uv.h | 23 ++++++++- arch/ia64/kernel/Makefile | 4 +- arch/ia64/kernel/acpi.c | 55 -------------------- arch/ia64/kernel/iosapic.c | 1 - arch/ia64/kernel/irq_ia64.c | 5 +- arch/ia64/kernel/machvec.c | 70 -------------------------- arch/ia64/kernel/mca.c | 1 - arch/ia64/kernel/mca_drv.c | 1 - arch/ia64/kernel/pci-dma.c | 1 - arch/ia64/kernel/setup.c | 24 ++++----- arch/ia64/kernel/smp.c | 1 - arch/ia64/kernel/smpboot.c | 1 - arch/ia64/kernel/time.c | 1 - arch/ia64/kernel/vmlinux.lds.S | 10 ---- arch/ia64/mm/init.c | 1 - arch/ia64/pci/fixup.c | 6 +-- arch/ia64/pci/pci.c | 1 - arch/ia64/uv/kernel/Makefile | 1 - arch/ia64/uv/kernel/machvec.c | 11 ---- arch/ia64/uv/kernel/setup.c | 34 +++++++++++++ drivers/acpi/Kconfig | 2 +- drivers/char/agp/Kconfig | 4 +- drivers/iommu/Kconfig | 2 +- drivers/misc/Kconfig | 2 +- drivers/misc/sgi-xp/xp_uv.c | 6 +-- drivers/misc/sgi-xp/xpc_uv.c | 14 +++--- 50 files changed, 116 insertions(+), 488 deletions(-) delete mode 100644 arch/ia64/dig/Makefile delete mode 100644 arch/ia64/dig/machvec.c delete mode 100644 arch/ia64/dig/setup.c delete mode 100644 arch/ia64/hp/zx1/Makefile delete mode 100644 arch/ia64/hp/zx1/hpzx1_machvec.c delete mode 100644 arch/ia64/include/asm/machvec.h delete mode 100644 arch/ia64/include/asm/machvec_dig.h delete mode 100644 arch/ia64/include/asm/machvec_hpzx1.h delete mode 100644 arch/ia64/include/asm/machvec_init.h delete mode 100644 arch/ia64/include/asm/machvec_uv.h delete mode 100644 arch/ia64/kernel/machvec.c delete mode 100644 arch/ia64/uv/kernel/machvec.c
arch/ia64/Kconfig +21 -51
@@ -11,11 +11,13 @@ config IA64 select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ACPI + select ACPI_NUMA select ARCH_SUPPORTS_ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select FORCE_PCI select PCI_DOMAINS if PCI + select PCI_MSI select PCI_SYSCALL if PCI select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_EXIT_THREAD
@@ -30,8 +32,8 @@ config IA64 select HAVE_ARCH_TRACEHOOK select HAVE_MEMBLOCK_NODE_MAP select HAVE_VIRT_CPU_ACCOUNTING - select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB - select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB + select ARCH_HAS_DMA_COHERENT_TO_PFN + select ARCH_HAS_SYNC_DMA_FOR_CPU select VIRT_TO_BUS select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP
@@ -45,6 +47,7 @@ config IA64 select ARCH_THREAD_STACK_ALLOCATOR select ARCH_CLOCKSOURCE_DATA select GENERIC_TIME_VSYSCALL + select SWIOTLB select SYSCTL_ARCH_UNALIGN_NO_WARN select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA
@@ -52,6 +55,7 @@ config IA64 select HAVE_ARCH_AUDITSYSCALL select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH + select NUMA default y help The Itanium Processor Family is Intel's 64-bit successor to
@@ -119,53 +123,6 @@ config AUDIT_ARCH bool default y -choice - prompt "System type" - default IA64_GENERIC - -config IA64_GENERIC - bool "generic" - select NUMA - select ACPI_NUMA - select SWIOTLB - select PCI_MSI - help - This selects the system type of your hardware. A "generic" kernel - will run on any supported IA-64 system. However, if you configure - a kernel for your specific system, it will be faster and smaller. - - generic For any supported IA-64 system - DIG-compliant For DIG ("Developer's Interface Guide") compliant systems - DIG+Intel+IOMMU For DIG systems with Intel IOMMU - HP-zx1/sx1000 For HP systems - SGI-UV For SGI UV systems - - If you don't know what to do, choose "generic". - -config IA64_DIG - bool "DIG-compliant" - select SWIOTLB - -config IA64_HP_ZX1 - bool "HP-zx1/sx1000" - help - Build a kernel that runs on HP zx1 and sx1000 systems. This adds - support for the HP I/O MMU. - -config IA64_SGI_UV - bool "SGI-UV" - select NUMA - select ACPI_NUMA - select SWIOTLB - help - Selecting this option will optimize the kernel for use on UV based - systems, but the resulting kernel binary will not run on other - types of ia64 systems. If you have an SGI UV system, it's safe - to select this option. If in doubt, select ia64 generic support - instead. - -endchoice - choice prompt "Processor type" default ITANIUM
@@ -230,6 +187,20 @@ config IA64_L1_CACHE_SHIFT default "7" if MCKINLEY default "6" if ITANIUM +config IA64_SGI_UV + bool "SGI-UV support" + help + Selecting this option will add specific support for running on SGI + UV based systems. If you have an SGI UV system or are building a + distro kernel, select this option. + +config IA64_HP_SBA_IOMMU + bool "HP SBA IOMMU support" + default y + help + Say Y here to add support for the SBA IOMMU found on HP zx1 and + sx1000 systems. If you're unsure, answer Y. + config IA64_CYCLONE bool "Cyclone (EXA) Time Source support" help
@@ -334,13 +305,12 @@ config ARCH_SPARSEMEM_ENABLE select SPARSEMEM_VMEMMAP_ENABLE config ARCH_DISCONTIGMEM_DEFAULT - def_bool y if (IA64_GENERIC || IA64_HP_ZX1) + def_bool y depends on ARCH_DISCONTIGMEM_ENABLE config NUMA bool "NUMA support" depends on !FLATMEM - select ACPI_NUMA if ACPI help Say Y to compile the kernel to support NUMA (Non-Uniform Memory Access). This option is for configuring high-end multiprocessor
arch/ia64/Kconfig.debug +1 -1
@@ -14,7 +14,7 @@ config IA64_GRANULE_16MB config IA64_GRANULE_64MB bool "64MB" - depends on !(IA64_GENERIC || IA64_HP_ZX1) + depends on BROKEN endchoice
arch/ia64/Makefile +1 -6
@@ -44,14 +44,9 @@ head-y := arch/ia64/kernel/head.o libs-y += arch/ia64/lib/ core-y += arch/ia64/kernel/ arch/ia64/mm/ -core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ -core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ -core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ -drivers-y += arch/ia64/pci/ -drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ -drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/ +drivers-y += arch/ia64/pci/ arch/ia64/hp/common/ drivers-$(CONFIG_OPROFILE) += arch/ia64/oprofile/ PHONY += compressed check
arch/ia64/configs/bigsur_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_SGI_PARTITION=y -CONFIG_IA64_DIG=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y
arch/ia64/configs/tiger_defconfig +0 -1
@@ -12,7 +12,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y CONFIG_SGI_PARTITION=y -CONFIG_IA64_DIG=y CONFIG_MCKINLEY=y CONFIG_IA64_PAGE_SIZE_64KB=y CONFIG_IA64_CYCLONE=y
arch/ia64/configs/zx1_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KPROBES=y CONFIG_MODULES=y CONFIG_PARTITION_ADVANCED=y -CONFIG_IA64_HP_ZX1=y CONFIG_MCKINLEY=y CONFIG_SMP=y CONFIG_NR_CPUS
arch/ia64/dig/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# ia64/platform/dig/Makefile -# -# Copyright (C) 1999 Silicon Graphics, Inc. -# Copyright (C) Srinivasa Thirumalachar ([email protected]) -# - -obj-y := setup.o -obj-$(CONFIG_IA64_GENERIC) += machvec.o
arch/ia64/dig/machvec.c deleted +0 -3
@@ -1,3 +0,0 @@ -#define MACHVEC_PLATFORM_NAME dig -#define MACHVEC_PLATFORM_HEADER <asm/machvec_dig.h> -#include <asm/machvec_init.h>
arch/ia64/dig/setup.c deleted +0 -32
@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Platform dependent support for DIG64 platforms. -* -* Copyright (C) 1999 Intel Corp. -* Copyright (C) 1999, 2001 Hewlett-Packard Co -* Copyright (C) 1999, 2001, 2003 David Mosberger-Tang <[email protected]> -* Copyright (C) 1999 VA Linux Systems -* Copyright (C) 1999 Walt Drummond <[email protected]> -* Copyright (C) 1999 Vijay Chander <[email protected]> -*/ - -#include <linux/init.h> -#include <linux/delay.h> -#include <linux/kernel.h> -#include <linux/string.h> -#include <linux/screen_info.h> -#include <linux/console.h> -#include <linux/timex.h> -#include <linux/sched.h> - -#include <asm/io.h> -#include <asm/machvec.h> -#include <asm/setup.h> - -void __init -dig_setup (char **cmdline_p) -{ -#ifdef CONFIG_SMP -init_smp_config (); -#endif -}
arch/ia64/hp/common/Makefile +1 -1
@@ -6,5 +6,5 @@ # Copyright (C) Alex Williamson ([email protected]) # -obj-y := sba_iommu.o +obj-$(CONFIG_IA64_HP_SBA_IOMMU) += sba_iommu.o obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o
arch/ia64/hp/zx1/Makefile deleted +0 -9
@@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# ia64/hp/zx1/Makefile -# -# Copyright (C) 2002 Hewlett Packard -# Copyright (C) Alex Williamson ([email protected]) -# - -obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
arch/ia64/hp/zx1/hpzx1_machvec.c deleted +0 -3
@@ -1,3 +0,0 @@ -#define MACHVEC_PLATFORM_NAME hpzx1 -#define MACHVEC_PLATFORM_HEADER <asm/machvec_hpzx1.h> -#include <asm/machvec_init.h>
arch/ia64/include/asm/acpi.h +0 -16
@@ -32,22 +32,6 @@ static inline bool acpi_has_cpu_in_madt(void)#define acpi_processor_cstate_check (x) (x)/* no idle limits on IA64 :) */ static inline void disable_acpi (void ) { } -#ifdef CONFIG_IA64_GENERIC -const char *acpi_get_sysname (void ); -#else -static inline const char *acpi_get_sysname (void ) -{ -# if defined (CONFIG_IA64_HP_ZX1 ) -return "hpzx1" ; -# elif defined (CONFIG_IA64_SGI_UV ) -return "uv" ; -# elif defined (CONFIG_IA64_DIG ) -return "dig" ; -# else -# error Unknown platform. Fix acpi.c. -# endif -} -#endif int acpi_request_vector (u32 int_type);int acpi_gsi_to_irq (u32 gsi,unsigned int *irq);
arch/ia64/include/asm/hw_irq.h +2 -3
@@ -12,7 +12,6 @@#include <linux/types.h> #include <linux/profile.h> -#include <asm/machvec.h> #include <asm/ptrace.h> #include <asm/smp.h>
@@ -56,7 +55,7 @@ typedef u8 ia64_vector;extern int ia64_first_device_vector;extern int ia64_last_device_vector; -#if defined(CONFIG_SMP ) && (defined(CONFIG_IA64_GENERIC ) || defined (CONFIG_IA64_DIG )) +#ifdef CONFIG_SMP /* Reserve the lower priority vector than device vectors for "move IRQ" IPI */ #define IA64_IRQ_MOVE_VECTOR 0x30/* "move IRQ" IPI */ #define IA64_DEF_FIRST_DEVICE_VECTOR 0x31
@@ -127,7 +126,7 @@ extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect)extern void ia64_native_register_percpu_irq (ia64_vector vec,struct irqaction *action);extern void destroy_and_reserve_irq (unsigned int irq); -#if defined(CONFIG_SMP ) && (defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_DIG )) +#ifdef CONFIG_SMP extern int irq_prepare_move (int irq,int cpu);extern void irq_complete_move (unsigned int irq);#else
arch/ia64/include/asm/io.h +0 -1
@@ -71,7 +71,6 @@ extern unsigned int num_io_spaces;#define HAVE_ARCH_PIO_SIZE #include <asm/intrinsics.h> -#include <asm/machvec.h> #include <asm/page.h> #include <asm-generic/iomap.h>
arch/ia64/include/asm/iommu.h +0 -1
@@ -15,6 +15,5 @@ extern int iommu_detected;#define no_iommu (1)#define iommu_detected (0)#endif -extern void machvec_init (const char *name);#endif
arch/ia64/include/asm/machvec.h deleted +0 -69
69 lines not on this page · raw message
arch/ia64/include/asm/machvec_dig.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_IA64_MACHVEC_DIG_h -#define _ASM_IA64_MACHVEC_DIG_h - -extern ia64_mv_setup_t dig_setup; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "dig" -#define platform_setup dig_setup - -#endif /* _ASM_IA64_MACHVEC_DIG_h */
arch/ia64/include/asm/machvec_hpzx1.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_IA64_MACHVEC_HPZX1_h -#define _ASM_IA64_MACHVEC_HPZX1_h - -extern ia64_mv_setup_t dig_setup; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "hpzx1" -#define platform_setup dig_setup - -#endif /* _ASM_IA64_MACHVEC_HPZX1_h */
arch/ia64/include/asm/machvec_init.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <asm/iommu.h> -#include <asm/machvec.h> - -#define MACHVEC_HELPER (name) \ - struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec"))) \ - = MACHVEC_INIT(name); - -#define MACHVEC_DEFINE (name) MACHVEC_HELPER(name) - -MACHVEC_DEFINE (MACHVEC_PLATFORM_NAME )
arch/ia64/include/asm/machvec_uv.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* -* SGI UV Core Functions -* -* Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. -*/ - -#ifndef _ASM_IA64_MACHVEC_UV_H -#define _ASM_IA64_MACHVEC_UV_H - -extern ia64_mv_setup_t uv_setup; - -/* -* This stuff has dual use! -* -* For a generic kernel, the macros are used to initialize the -* platform's machvec structure. When compiling a non-generic kernel, -* the macros are used directly. -*/ -#define ia64_platform_name "uv" -#define platform_setup uv_setup - -#endif /* _ASM_IA64_MACHVEC_UV_H */
arch/ia64/include/asm/mmzone.h +3 -10
@@ -27,16 +27,9 @@ static inline int pfn_to_nid(unsigned long pfn)return nid; } -#ifdef CONFIG_IA64_DIG /* DIG systems are small */ -# define MAX_PHYSNODE_ID 8 -# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) -#else -# define MAX_PHYSNODE_ID 2048 -# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4) -#endif - -#else /* CONFIG_NUMA */ -# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4) +#define MAX_PHYSNODE_ID 2048#endif /* CONFIG_NUMA */ +#define NR_NODE_MEMBLKS (MAX_NUMNODES * 4) +#endif /* _ASM_IA64_MMZONE_H */
arch/ia64/include/asm/processor.h +0 -2
@@ -679,8 +679,6 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,void default_idle (void ); -#define ia64_platform_is (x) (strcmp(x, ia64_platform_name) = 0) -#endif /* !__ASSEMBLY__ */ #endif /* _ASM_IA64_PROCESSOR_H */
arch/ia64/include/asm/tlb.h +0 -1
@@ -45,7 +45,6 @@#include <asm/pgalloc.h> #include <asm/processor.h> #include <asm/tlbflush.h> -#include <asm/machvec.h> #include <asm-generic/tlb.h>
arch/ia64/include/asm/uv/uv.h +21 -2
@@ -2,10 +2,29 @@#ifndef _ASM_IA64_UV_UV_H#define _ASM_IA64_UV_UV_H +#ifdef CONFIG_IA64_SGI_UV +extern bool ia64_is_uv; + +static inline int is_uv_system (void ) +{ +return ia64_is_uv; +} + +void __init uv_probe_system_type (void ); +void __init uv_setup (char **cmdline_p); +#else /* CONFIG_IA64_SGI_UV */ static inline int is_uv_system (void ) { -/* temporary support for running on hardware simulator */ -return ia64_platform_is ("uv" ); +return false; +} + +static inline void __init uv_probe_system_type (void ) +{ +} + +static inline void __init uv_setup (char **cmdline_p) +{ } +#endif /* CONFIG_IA64_SGI_UV */ #endif /* _ASM_IA64_UV_UV_H */
arch/ia64/kernel/Makefile +2 -2
@@ -10,7 +10,7 @@ endif extra-y := head.o vmlinux.lds obj-y := entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \ - irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \ + irq_lsapic.o ivt.o pal.o patch.o process.o perfmon.o ptrace.o sal.o \ salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \ unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o acpi.o \ acpi-ext.o
@@ -30,7 +30,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o obj-$(CONFIG_AUDIT) += audit.o -obj-$(CONFIG_PCI_MSI) += msi_ia64.o +obj-y += msi_ia64.o mca_recovery-y += mca_drv.o mca_drv_asm.o obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
arch/ia64/kernel/acpi.c +0 -55
67 lines not on this page · raw message
arch/ia64/kernel/iosapic.c +0 -1
@@ -93,7 +93,6 @@#include <asm/hw_irq.h> #include <asm/io.h> #include <asm/iosapic.h> -#include <asm/machvec.h> #include <asm/processor.h> #include <asm/ptrace.h>
arch/ia64/kernel/irq_ia64.c +1 -4
@@ -37,7 +37,6 @@#include <asm/intrinsics.h> #include <asm/io.h> #include <asm/hw_irq.h> -#include <asm/machvec.h> #include <asm/pgtable.h> #include <asm/tlbflush.h>
@@ -249,7 +248,7 @@ void __setup_vector_irq(int cpu) } } -#if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG)) +#ifdef CONFIG_SMP static enum vector_domain_type { VECTOR_DOMAIN_NONE,
@@ -637,11 +636,9 @@ init_IRQ (void)ia64_register_ipi ();register_percpu_irq (IA64_SPURIOUS_INT_VECTOR ,NULL );#ifdef CONFIG_SMP -#if defined(CONFIG_IA64_GENERIC ) || defined(CONFIG_IA64_DIG )if (vector_domain_type !=VECTOR_DOMAIN_NONE )register_percpu_irq (IA64_IRQ_MOVE_VECTOR , &irq_move_irqaction);#endif -#endif #ifdef CONFIG_PERFMON pfm_init_percpu ();#endif
arch/ia64/kernel/machvec.c deleted +0 -70
70 lines not on this page · raw message
arch/ia64/kernel/mca.c +0 -1
@@ -91,7 +91,6 @@#include <linux/gfp.h> #include <asm/delay.h> -#include <asm/machvec.h> #include <asm/meminit.h> #include <asm/page.h> #include <asm/ptrace.h>
arch/ia64/kernel/mca_drv.c +0 -1
@@ -26,7 +26,6 @@#include <linux/slab.h> #include <asm/delay.h> -#include <asm/machvec.h> #include <asm/page.h> #include <asm/ptrace.h> #include <asm/sal.h>
arch/ia64/kernel/pci-dma.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/dmar.h> #include <asm/iommu.h> -#include <asm/machvec.h> #include <linux/dma-mapping.h> #include <linux/kernel.h> #include <asm/page.h>
arch/ia64/kernel/setup.c +12 -12
@@ -52,7 +52,6 @@#include <linux/kexec.h> #include <linux/crash_dump.h> -#include <asm/machvec.h> #include <asm/mca.h> #include <asm/meminit.h> #include <asm/page.h>
@@ -65,11 +64,14 @@#include <asm/smp.h> #include <asm/tlbflush.h> #include <asm/unistd.h> +#include <asm/uv/uv.h> #if defined(CONFIG_SMP ) && (IA64_CPU_SIZE >PAGE_SIZE )# error "struct cpuinfo_ia64 too big!"#endif +char ia64_platform_name[64 ]; +#ifdef CONFIG_SMP unsigned long __per_cpu_offset[NR_CPUS ];EXPORT_SYMBOL (__per_cpu_offset);
@@ -265,7 +267,7 @@ __initcall(register_memory);*/ static int __init check_crashkernel_memory (unsigned long pbase,size_t size) { -if (ia64_platform_is ("uv" )) +if (is_uv_system ())return 1 ;else return pbase < (1UL <<32 );
@@ -558,15 +560,7 @@ setup_arch (char **cmdline_p)efi_init ();io_port_init (); -#ifdef CONFIG_IA64_GENERIC -/* machvec needs to be parsed from the command line -* before parse_early_param() is called to ensure -* that ia64_mv is initialised before any command line -* settings may cause console setup to occur -*/ -machvec_init_from_cmdline (*cmdline_p); -#endif - +uv_probe_system_type ();parse_early_param ();if (early_console_setup (*cmdline_p) =0 )
@@ -641,7 +635,13 @@ setup_arch (char **cmdline_p)*/ ROOT_DEV = Root_SDA2;/* default to second partition on first drive */ -platform_setup (cmdline_p); +if (is_uv_system ()) +uv_setup (cmdline_p); +#ifdef CONFIG_SMP + else +init_smp_config (); +#endif +screen_info_setup ();paging_init ();
arch/ia64/kernel/smp.c +0 -1
@@ -36,7 +36,6 @@#include <linux/atomic.h> #include <asm/current.h> #include <asm/delay.h> -#include <asm/machvec.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/page.h>
arch/ia64/kernel/smpboot.c +0 -1
@@ -47,7 +47,6 @@#include <asm/delay.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/machvec.h> #include <asm/mca.h> #include <asm/page.h> #include <asm/pgalloc.h>
arch/ia64/kernel/time.c +0 -1
@@ -25,7 +25,6 @@#include <linux/platform_device.h> #include <linux/sched/cputime.h> -#include <asm/machvec.h> #include <asm/delay.h> #include <asm/hw_irq.h> #include <asm/ptrace.h>
arch/ia64/kernel/vmlinux.lds.S +0 -10
@@ -141,16 +141,6 @@ SECTIONS { __end___mckinley_e9_bundles = .; } -#if defined(CONFIG_IA64_GENERIC) - /* Machine Vector */ - . = ALIGN(16); - .machvec : AT(ADDR(.machvec) - LOAD_OFFSET) { - machvec_start = .; - *(.machvec) - machvec_end = .; - } -#endif - #ifdef CONFIG_SMP . = ALIGN(PERCPU_PAGE_SIZE); __cpu0_per_cpu = .;
arch/ia64/mm/init.c +0 -1
@@ -28,7 +28,6 @@#include <asm/dma.h> #include <asm/io.h> -#include <asm/machvec.h> #include <asm/numa.h> #include <asm/patch.h> #include <asm/pgalloc.h>
arch/ia64/pci/fixup.c +2 -4
@@ -8,8 +8,7 @@#include <linux/init.h> #include <linux/vgaarb.h> #include <linux/screen_info.h> - -#include <asm/machvec.h> +#include <asm/uv/uv.h> /* * Fixup to mark boot BIOS video selected by BIOS before it changes
@@ -35,8 +34,7 @@ static void pci_fixup_video(struct pci_dev *pdev)u16 config;struct resource *res; -if ((strcmp (ia64_platform_name,"dig" ) !=0 ) - && (strcmp (ia64_platform_name,"hpzx1" ) !=0 )) +if (is_uv_system ())return ;/* Maybe, this machine supports legacy memory map. */
arch/ia64/pci/pci.c +0 -1
@@ -24,7 +24,6 @@#include <linux/memblock.h> #include <linux/export.h> -#include <asm/machvec.h> #include <asm/page.h> #include <asm/io.h> #include <asm/sal.h>
arch/ia64/uv/kernel/Makefile +0 -1
@@ -10,4 +10,3 @@ ccflags-y := -Iarch/ia64/sn/include obj-y += setup.o -obj-$(CONFIG_IA64_GENERIC) += machvec.o
arch/ia64/uv/kernel/machvec.c deleted +0 -11
@@ -1,11 +0,0 @@ -/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. -*/ - -#define MACHVEC_PLATFORM_NAME uv -#define MACHVEC_PLATFORM_HEADER <asm/machvec_uv.h> -#include <asm/machvec_init.h>
arch/ia64/uv/kernel/setup.c +34 -0
@@ -8,11 +8,17 @@* Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. */ +#include <linux/acpi.h> +#include <linux/efi.h> #include <linux/module.h> #include <linux/percpu.h> +#include <asm/uv/uv.h> #include <asm/uv/uv_mmrs.h> #include <asm/uv/uv_hub.h> +bool ia64_is_uv; +EXPORT_SYMBOL_GPL (ia64_is_uv); + DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);EXPORT_PER_CPU_SYMBOL_GPL (__uv_hub_info);
@@ -47,6 +53,34 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)BUG (); } +void __init uv_probe_system_type (void ) +{ +struct acpi_table_rsdp *rsdp; +struct acpi_table_xsdt *xsdt; + +if (efi.acpi20 =EFI_INVALID_TABLE_ADDR ) { +pr_err ("ACPI 2.0 RSDP not found.\n" ); +return ; + } + + rsdp = (struct acpi_table_rsdp *)__va (efi.acpi20); +if (strncmp (rsdp->signature,ACPI_SIG_RSDP ,sizeof (ACPI_SIG_RSDP ) -1 )) { +pr_err ("ACPI 2.0 RSDP signature incorrect.\n" ); +return ; + } + + xsdt = (struct acpi_table_xsdt *)__va (rsdp->xsdt_physical_address); +if (strncmp (xsdt->header.signature,ACPI_SIG_XSDT , +sizeof (ACPI_SIG_XSDT ) -1 )) { +pr_err ("ACPI 2.0 XSDT signature incorrect.\n" ); +return ; + } + +if (!strcmp (xsdt->header.oem_id,"SGI" ) && + !strcmp (xsdt->header.oem_table_id +4 ,"UV" )) + ia64_is_uv = true; +} +void __init uv_setup (char **cmdline_p) {union uvh_si_addr_map_config_u m_n_config;
drivers/acpi/Kconfig +1 -1
@@ -323,7 +323,7 @@ config ACPI_NUMA bool "NUMA support" depends on NUMA depends on (X86 || IA64 || ARM64) - default y if IA64_GENERIC || ARM64 + default y if IA64 || ARM64 config ACPI_CUSTOM_DSDT_FILE string "Custom DSDT Table file to include"
drivers/char/agp/Kconfig +2 -2
@@ -111,14 +111,14 @@ config AGP_VIA config AGP_I460 tristate "Intel 460GX chipset support" - depends on AGP && (IA64_DIG || IA64_GENERIC) + depends on AGP && IA64 help This option gives you AGP GART support for the Intel 460GX chipset for IA64 processors. config AGP_HP_ZX1 tristate "HP ZX1 chipset AGP support" - depends on AGP && (IA64_HP_ZX1 || IA64_GENERIC) + depends on AGP && IA64 help This option gives you AGP GART support for the HP ZX1 chipset for IA64 processors.
drivers/iommu/Kconfig +1 -1
@@ -177,7 +177,7 @@ config DMAR_TABLE config INTEL_IOMMU bool "Support for Intel IOMMU using DMA Remapping Devices" - depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC) + depends on PCI_MSI && ACPI && (X86 || IA64) select IOMMU_API select IOMMU_IOVA select NEED_DMA_MAP_STATE
drivers/misc/Kconfig +1 -1
@@ -188,7 +188,7 @@ config ENCLOSURE_SERVICES config SGI_XP tristate "Support communication between SGI SSIs" depends on NET - depends on (IA64_GENERIC || IA64_SGI_UV || X86_UV) && SMP + depends on (IA64_SGI_UV || X86_UV) && SMP depends on X86_64 || BROKEN select SGI_GRU if X86_64 && SMP ---help---
drivers/misc/sgi-xp/xp_uv.c +3 -3
@@ -17,7 +17,7 @@#include <asm/uv/uv_hub.h> #if definedCONFIG_X86_64 #include <asm/uv/bios.h> -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif definedCONFIG_IA64_SGI_UV #include <asm/sn/sn_sal.h> #endif #include "../sgi-gru/grukservices.h"
@@ -99,7 +99,7 @@ xp_expand_memprotect_uv(unsigned long phys_addr, unsigned long size) return xpBiosError; } -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif defined defined CONFIG_IA64_SGI_UVu64 nasid_array; ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_1,
@@ -129,7 +129,7 @@ xp_restrict_memprotect_uv(unsigned long phys_addr, unsigned long size)return xpBiosError; } -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif definedCONFIG_IA64_SGI_UV u64 nasid_array; ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_0,
drivers/misc/sgi-xp/xpc_uv.c +7 -7
@@ -27,7 +27,7 @@#if definedCONFIG_X86_64 #include <asm/uv/bios.h> #include <asm/uv/uv_irq.h> -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif defined defined CONFIG_IA64_SGI_UV#include <asm/sn/intr.h> #include <asm/sn/sn_sal.h> #endif
@@ -35,7 +35,7 @@#include "../sgi-gru/grukservices.h" #include "xpc.h" -#if defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV +#if defined defined CONFIG_IA64_SGI_UV struct uv_IO_APIC_route_entry { __u64 vector : 8, delivery_mode : 3,
@@ -121,7 +121,7 @@ xpc_get_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq, int cpu, char *irq_name) mq->mmr_value =uv_read_global_mmr64 (mmr_pnode, mq->mmr_offset); -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif defined defined CONFIG_IA64_SGI_UVif (strcmp (irq_name,XPC_ACTIVATE_IRQ_NAME ) =0 ) mq->irq =SGI_XPC_ACTIVATE ;else if (strcmp (irq_name,XPC_NOTIFY_IRQ_NAME ) =0 )
@@ -144,7 +144,7 @@ xpc_release_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq)#if definedCONFIG_X86_64 uv_teardown_irq (mq->irq); -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif defined defined CONFIG_IA64_SGI_UVint mmr_pnode;unsigned long mmr_value;
@@ -162,7 +162,7 @@ xpc_gru_mq_watchlist_alloc_uv(struct xpc_gru_mq_uv *mq) {int ret; -#if definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#if defined defined CONFIG_IA64_SGI_UVint mmr_pnode =uv_blade_to_pnode (mq->mmr_blade); ret = sn_mq_watchlist_alloc(mmr_pnode, (void *)uv_gpa(mq->address),
@@ -197,7 +197,7 @@ xpc_gru_mq_watchlist_free_uv(struct xpc_gru_mq_uv *mq)#if definedCONFIG_X86_64 ret =uv_bios_mq_watchlist_free (mmr_pnode, mq->watchlist_num);BUG_ON (ret !=BIOS_STATUS_SUCCESS ); -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif definedCONFIG_IA64_SGI_UV ret =sn_mq_watchlist_free (mmr_pnode, mq->watchlist_num);BUG_ON (ret !=SALRET_OK );#else
@@ -796,7 +796,7 @@ xpc_get_partition_rsvd_page_pa_uv(void *buf, u64 *cookie, unsigned long *rp_pa, else ret = xpBiosError; -#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV +#elif defined defined CONFIG_IA64_SGI_UV status =sn_partition_reserved_page_pa ((u64 )buf, cookie, rp_pa, len);if (status =SALRET_OK ) ret = xpSuccess;
Signature · 1 line
2.20.1
PATCH 27/29 ia64: remove CONFIG_SWIOTLB ifdefs
In reply to Christoph HellwigCONFIG_SWIOTLB is now unconditionally selected on ia64, so remove the ifdefs.
--- arch/ia64/kernel/dma-mapping.c | 2 -- arch/ia64/mm/init.c | 2 -- 2 files changed, 4 deletions(-)
arch/ia64/kernel/dma-mapping.c +0 -2
@@ -8,7 +8,6 @@ int iommu_detected __read_mostly;const struct dma_map_ops *dma_ops;EXPORT_SYMBOL (dma_ops); -#ifdef CONFIG_SWIOTLB void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs) {
@@ -26,4 +25,3 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr, {return page_to_pfn (virt_to_page (cpu_addr)); } -#endif
arch/ia64/mm/init.c +0 -2
@@ -68,7 +68,6 @@ __ia64_sync_icache_dcache (pte_t pte)set_bit (PG_arch_1, &page->flags);/* mark page as clean */ } -#ifdef CONFIG_SWIOTLB /* * Since DMA is i-cache coherent, any (complete) pages that were written via * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to
@@ -83,7 +82,6 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,set_bit (PG_arch_1, &pfn_to_page (pfn)->flags); }while (++pfn <=PHYS_PFN (paddr + size -1 )); } -#endif inline void ia64_set_rbs_bot (void )
Signature · 1 line
2.20.1
PATCH 28/29 ia64: remove CONFIG_ACPI_NUMA ifdefs
In reply to Christoph HellwigCONFIG_ACPI_NUMA is now unconditionally selected on ia64, so remove the ifdefs.
--- arch/ia64/include/asm/acpi.h | 5 ----- arch/ia64/kernel/acpi.c | 17 ----------------- arch/ia64/kernel/setup.c | 2 -- 3 files changed, 24 deletions(-)
arch/ia64/include/asm/acpi.h +0 -5
@@ -55,7 +55,6 @@ extern int additional_cpus;#define additional_cpus 0#endif -#ifdef CONFIG_ACPI_NUMA #if MAX_NUMNODES >256 #define MAX_PXM_DOMAINS MAX_NUMNODES#else
@@ -63,7 +62,6 @@ extern int additional_cpus;#endif extern int pxm_to_nid_map[MAX_PXM_DOMAINS ];extern int __initdata nid_to_pxm_map[MAX_NUMNODES ]; -#endif static inline bool arch_has_acpi_pdc (void ) {return true; }static inline void arch_acpi_set_pdc_bits (u32 *buf)
@@ -73,7 +71,6 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)#define acpi_unlazy_tlb (x) -#ifdef CONFIG_ACPI_NUMA extern cpumask_t early_cpu_possible_map;#define for_each_possible_early_cpu (cpu) \ for_each_cpu((cpu), &early_cpu_possible_map)
@@ -102,8 +99,6 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus)extern void acpi_numa_fixup (void ); -#endif /* CONFIG_ACPI_NUMA */ -#endif /*__KERNEL__*/ #endif /*_ASM_ACPI_H*/
arch/ia64/kernel/acpi.c +0 -17
@@ -316,8 +316,6 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)return 0 ; } -#ifdef CONFIG_ACPI_NUMA -#undef SLIT_DEBUG#define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32)
@@ -517,7 +515,6 @@ void __init acpi_numa_fixup(void) }#endif } -#endif /* CONFIG_ACPI_NUMA */ /* * success: return IRQ number (>=0)
@@ -668,7 +665,6 @@ int __init acpi_boot_init(void)if (acpi_table_parse (ACPI_SIG_FADT , acpi_parse_fadt)) printk(KERN_ERR PREFIX "Can't find FADT\n"); -#ifdef CONFIG_ACPI_NUMA#ifdef CONFIG_SMP if (srat_num_cpus =0 ) {int cpu, i =1 ;
@@ -680,7 +676,6 @@ int __init acpi_boot_init(void) }#endif build_cpu_to_node_map (); -#endif return 0 ; }
@@ -713,7 +708,6 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)#ifdef CONFIG_ACPI_HOTPLUG_CPU int acpi_map_cpu2node (acpi_handle handle,int cpu,int physid) { -#ifdef CONFIG_ACPI_NUMA /* * We don't have cpu-only-node hotadd. But if the system equips * SRAT table, pxm is already found and node is ready.
@@ -723,7 +717,6 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)*/ node_cpuid[cpu].phys_id = physid; node_cpuid[cpu].nid =acpi_get_node (handle); -#endif return 0 ; }
@@ -813,17 +806,11 @@ int acpi_unmap_cpu(int cpu) { ia64_cpu_to_sapicid[cpu] =-1 ;set_cpu_present (cpu, false); - -#ifdef CONFIG_ACPI_NUMA -/* NUMA specific cleanup's */ -#endif -return (0 ); }EXPORT_SYMBOL (acpi_unmap_cpu);#endif /* CONFIG_ACPI_HOTPLUG_CPU */ -#ifdef CONFIG_ACPI_NUMA static acpi_status acpi_map_iosapic (acpi_handle handle,u32 depth,void *context,void **ret) {
@@ -877,7 +864,6 @@ acpi_map_iosapics (void) }fs_initcall (acpi_map_iosapics); -#endif /* CONFIG_ACPI_NUMA */ int __ref acpi_register_ioapic (acpi_handle handle,u64 phys_addr,u32 gsi_base) {
@@ -886,10 +872,7 @@ int __ref acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)if ((err =iosapic_init (phys_addr, gsi_base)))return err; -#ifdef CONFIG_ACPI_NUMA acpi_map_iosapic (handle,0 ,NULL ,NULL ); -#endif /* CONFIG_ACPI_NUMA */ -return 0 ; }
arch/ia64/kernel/setup.c +0 -2
@@ -569,7 +569,6 @@ setup_arch (char **cmdline_p)/* Initialize the ACPI boot-time table parser */ acpi_table_init ();early_acpi_boot_init (); -#ifdef CONFIG_ACPI_NUMA acpi_numa_init ();acpi_numa_fixup ();#ifdef CONFIG_ACPI_HOTPLUG_CPU
@@ -578,7 +577,6 @@ setup_arch (char **cmdline_p)per_cpu_scan_finalize ((cpumask_weight (&early_cpu_possible_map) =0 ?32 :cpumask_weight (&early_cpu_possible_map)), additional_cpus >0 ? additional_cpus :0 ); -#endif /* CONFIG_ACPI_NUMA */ #ifdef CONFIG_SMP smp_build_cpu_map ();
Signature · 1 line
2.20.1
PATCH 29/29 genirq: remove the is_affinity_mask_valid hook
In reply to Christoph HellwigThis override was only used by the ia64 SGI SN2 platform, which is gone now.
--- kernel/irq/proc.c | 14 -------------- 1 file changed, 14 deletions(-)
kernel/irq/proc.c +0 -14
@@ -100,10 +100,6 @@ static int irq_affinity_hint_proc_show(struct seq_file *m, void *v)return 0 ; } -#ifndef is_affinity_mask_valid -#define is_affinity_mask_valid (val) 1 -#endif -int no_irq_affinity;static int irq_affinity_proc_show (struct seq_file *m,void *v) {
@@ -136,11 +132,6 @@ static ssize_t write_irq_affinity(int type, struct file *file,if (err) goto free_cpumask; -if (!is_affinity_mask_valid (new_value)) { - err = -EINVAL ; - goto free_cpumask; - } -/* * Do not allow disabling IRQs completely - it's a too easy * way to make the system unusable accidentally :-) At least
@@ -232,11 +223,6 @@ static ssize_t default_affinity_write(struct file *file,if (err) goto out; -if (!is_affinity_mask_valid (new_value)) { - err = -EINVAL ; - goto out; - } -/* * Do not allow disabling IRQs completely - it's a too easy * way to make the system unusable accidentally :-) At least
Signature · 1 line
2.20.1
Hi Christoph!
Quoted 4 lines · Christoph Hellwig
let me know what you think of this series. This drops the pretty much dead sn2 and hpsim support, which then allows us to build a single ia64 kernel image that supports all remaining systems without extra indirections in the fast path.
Interesting. Does that mean Debian no longer needs to maintain two different kernels for ia64, currently named "itanium" and "mckinley"?
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 10 lines · John Paul Adrian Glaubitz
Hi Christoph!
Quoted 4 lines · Christoph Hellwig
let me know what you think of this series. This drops the pretty much dead sn2 and hpsim support, which then allows us to build a single ia64 kernel image that supports all remaining systems without extra indirections in the fast path.
Interesting. Does that mean Debian no longer needs to maintain two different kernels for ia64, currently named "itanium" and "mckinley"?
I don't think so. Assumeing one of them sets CONFIG_ITANIUM and the other just CONFIG_MCKINLEY, the first one already covers everything that the second can. But assuming both set CONFIG_IA64_GENERIC they should both get a little faster as a lot of indirect calls there just exist for SN2 are gone with this. And if my memory serves me right indirect calls have always been rather expensive on ia64 vs other architectures (at least before spectre mitigations made others slower as well).
Quoted 8 lines
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
---end quoted text---
RE: remove sn2, hpsim and ia64 machvecs
In reply to Christoph HellwigI like the idea ... and it sure gets rid of a lot of code.
Quoted 3 lines
A git tree is also available at:
git://git.infradead.org/users/hch/misc.gitia64-remove-machvecs
I grabbed this tree and ran though my build scripts. I found that vmlinux.gz doesn't get built. Which is odd, because I don't see that you changed the "compressed" target in the Makefile.
Even if I explicitly run:
$ make compressed
It still doesn't build it. Weird.
-Tony
RE: remove sn2, hpsim and ia64 machvecs
Quoted 5 lines
Even if I explicitly run:
$ make compressedIt still doesn't build it. Weird.
Ugh! The rule to do the compression was in arch/ia64/hp/sim/boot/Makefile which went away as part of the deletion of hpsim.
-Tony
Re: remove sn2, hpsim and ia64 machvecs
Quoted 2 lines · Tony
Ugh! The rule to do the compression was in
arch/ia64/hp/sim/boot/Makefilewhich went away as part of the deletion of hpsim.
This fixes it ... should fold into the patch that dropped the arch/ia64/hp/sim/boot/Makefile
I just cut/pasted in those cmd_gzip and cmd_objcopy definitions from elsewhere in the tree. It might be possible to simplify them.
--- arch/ia64/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/ia64/Makefile +11 -1
@@ -39,6 +39,12 @@ $(error Sorry, you need a newer version of the assember, one that is built from ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) endif +quiet_cmd_gzip = GZIP $@ +cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@ + +quiet_cmd_objcopy = OBJCOPY $@ +cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ + KBUILD_CFLAGS += $(cflags-y) head-y := arch/ia64/kernel/head.o
@@ -57,7 +63,11 @@ compressed: vmlinux.gz vmlinuz: vmlinux.gz -vmlinux.gz: vmlinux +vmlinux.gz: vmlinux.bin FORCE + $(call if_changed,gzip) + +vmlinux.bin: vmlinux FORCE + $(call if_changed,objcopy) unwcheck: vmlinux -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<
Signature · 1 line
2.20.1
Re: remove sn2, hpsim and ia64 machvecs
Quoted 9 lines · Tony
Quoted 2 lines · Tony
Ugh! The rule to do the compression was in
arch/ia64/hp/sim/boot/Makefilewhich went away as part of the deletion of hpsim.This fixes it ... should fold into the patch that dropped the
arch/ia64/hp/sim/boot/MakefileI just cut/pasted in those
cmd_gzipandcmd_objcopydefinitions from elsewhere in the tree. It might be possible to simplify them.
Lets keep it simple. I've picked this up for the hpsim removal patch.
Re: remove sn2, hpsim and ia64 machvecs
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Tony
Quoted 2 lines · Tony
Ugh! The rule to do the compression was in
arch/ia64/hp/sim/boot/Makefilewhich went away as part of the deletion of hpsim.
Quoted 7 lines
Quoted 5 lines
This fixes it ... should fold into the patch that dropped the
arch/ia64/hp/sim/boot/MakefileI just cut/pasted in those
cmd_gzipandcmd_objcopydefinitions from elsewhere in the tree. It might be possible to simplify them.Lets keep it simple. I've picked this up for the hpsim removal patch.
So most configs now build, and the generic one boots on my Tukwila system.
But a config based on arch/ia64/configs/zx1_defconfig gets a bunch of build errors from different files complaining about 'max_mapnr'
arch/ia64/mm/init.c:198:8: error: 'max_mapnr' undeclared (first use in this function) ./include/linux/dma-mapping.h:359:6: error: 'max_mapnr' undeclared (first use in this function) kernel/dma/mapping.c:126:8: error: 'max_mapnr' undeclared (first use in this function) kernel/dma/mapping.c:181:8: error: 'max_mapnr' undeclared (first use in this function) mm/internal.h:393:8: error: 'max_mapnr' undeclared (first use in this function)
-Tony
Re: remove sn2, hpsim and ia64 machvecs
Quoted 10 lines · Tony
So most configs now build, and the generic one boots on my Tukwila system.
But a config based on
arch/ia64/configs/zx1_defconfiggets a bunch of build errors from different files complaining about 'max_mapnr'
arch/ia64/mm/init.c:198:8: error: 'max_mapnr' undeclared (first use in this function)./include/linux/dma-mapping.h:359:6: error: 'max_mapnr' undeclared (first use in this function)kernel/dma/mapping.c:126:8: error: 'max_mapnr' undeclared (first use in this function)kernel/dma/mapping.c:181:8: error: 'max_mapnr' undeclared (first use in this function)mm/internal.h:393:8: error: 'max_mapnr' undeclared (first use in this function)
Looks like we somehow lost the indirect mm.h include for those builds, I'll take a look at fixing this up.