mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
becdce1c66
Pull s390 updates from Martin Schwidefsky: - Improvements for the spectre defense: * The spectre related code is consolidated to a single file nospec-branch.c * Automatic enable/disable for the spectre v2 defenses (expoline vs. nobp) * Syslog messages for specve v2 are added * Enable CONFIG_GENERIC_CPU_VULNERABILITIES and define the attribute functions for spectre v1 and v2 - Add helper macros for assembler alternatives and use them to shorten the code in entry.S. - Add support for persistent configuration data via the SCLP Store Data interface. The H/W interface requires a page table that uses 4K pages only, the code to setup such an address space is added as well. - Enable virtio GPU emulation in QEMU. To do this the depends statements for a few common Kconfig options are modified. - Add support for format-3 channel path descriptors and add a binary sysfs interface to export the associated utility strings. - Add a sysfs attribute to control the IFCC handling in case of constant channel errors. - The vfio-ccw changes from Cornelia. - Bug fixes and cleanups. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (40 commits) s390/kvm: improve stack frame constants in entry.S s390/lpp: use assembler alternatives for the LPP instruction s390/entry.S: use assembler alternatives s390: add assembler macros for CPU alternatives s390: add sysfs attributes for spectre s390: report spectre mitigation via syslog s390: add automatic detection of the spectre defense s390: move nobp parameter functions to nospec-branch.c s390/cio: add util_string sysfs attribute s390/chsc: query utility strings via fmt3 channel path descriptor s390/cio: rename struct channel_path_desc s390/cio: fix unbind of io_subchannel_driver s390/qdio: split up CCQ handling for EQBS / SQBS s390/qdio: don't retry EQBS after CCQ 96 s390/qdio: restrict buffer merging to eligible devices s390/qdio: don't merge ERROR output buffers s390/qdio: simplify math in get_*_buffer_frontier() s390/decompressor: trim uncompressed image head during the build s390/crypto: Fix kernel crash on aes_s390 module remove. s390/defkeymap: fix global init to zero ...
165 lines
5.7 KiB
Plaintext
165 lines
5.7 KiB
Plaintext
#
|
|
# Video configuration
|
|
#
|
|
|
|
menu "Console display driver support"
|
|
|
|
config VGA_CONSOLE
|
|
bool "VGA text console" if EXPERT || !X86
|
|
depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \
|
|
(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
|
|
!ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390
|
|
default y
|
|
help
|
|
Saying Y here will allow you to use Linux in text mode through a
|
|
display that complies with the generic VGA standard. Virtually
|
|
everyone wants that.
|
|
|
|
The program SVGATextMode can be used to utilize SVGA video cards to
|
|
their full potential in text mode. Download it from
|
|
<ftp://ibiblio.org/pub/Linux/utils/console/>.
|
|
|
|
Say Y.
|
|
|
|
config VGACON_SOFT_SCROLLBACK
|
|
bool "Enable Scrollback Buffer in System RAM"
|
|
depends on VGA_CONSOLE
|
|
default n
|
|
help
|
|
The scrollback buffer of the standard VGA console is located in
|
|
the VGA RAM. The size of this RAM is fixed and is quite small.
|
|
If you require a larger scrollback buffer, this can be placed in
|
|
System RAM which is dynamically allocated during initialization.
|
|
Placing the scrollback buffer in System RAM will slightly slow
|
|
down the console.
|
|
|
|
If you want this feature, say 'Y' here and enter the amount of
|
|
RAM to allocate for this buffer. If unsure, say 'N'.
|
|
|
|
config VGACON_SOFT_SCROLLBACK_SIZE
|
|
int "Scrollback Buffer Size (in KB)"
|
|
depends on VGACON_SOFT_SCROLLBACK
|
|
range 1 1024
|
|
default "64"
|
|
help
|
|
Enter the amount of System RAM to allocate for scrollback
|
|
buffers of VGA consoles. Each 64KB will give you approximately
|
|
16 80x25 screenfuls of scrollback buffer.
|
|
|
|
config VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT
|
|
bool "Persistent Scrollback History for each console by default"
|
|
depends on VGACON_SOFT_SCROLLBACK
|
|
default n
|
|
help
|
|
Say Y here if the scrollback history should persist by default when
|
|
switching between consoles. Otherwise, the scrollback history will be
|
|
flushed each time the console is switched. This feature can also be
|
|
enabled using the boot command line parameter
|
|
'vgacon.scrollback_persistent=1'.
|
|
|
|
This feature might break your tool of choice to flush the scrollback
|
|
buffer, e.g. clear(1) will work fine but Debian's clear_console(1)
|
|
will be broken, which might cause security issues.
|
|
You can use the escape sequence \e[3J instead if this feature is
|
|
activated.
|
|
|
|
Note that a buffer of VGACON_SOFT_SCROLLBACK_SIZE is taken for each
|
|
created tty device.
|
|
So if you use a RAM-constrained system, say N here.
|
|
|
|
config MDA_CONSOLE
|
|
depends on !M68K && !PARISC && ISA
|
|
tristate "MDA text console (dual-headed)"
|
|
---help---
|
|
Say Y here if you have an old MDA or monochrome Hercules graphics
|
|
adapter in your system acting as a second head ( = video card). You
|
|
will then be able to use two monitors with your Linux system. Do not
|
|
say Y here if your MDA card is the primary card in your system; the
|
|
normal VGA driver will handle it.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called mdacon.
|
|
|
|
If unsure, say N.
|
|
|
|
config SGI_NEWPORT_CONSOLE
|
|
tristate "SGI Newport Console support"
|
|
depends on SGI_IP22 && HAS_IOMEM
|
|
select FONT_SUPPORT
|
|
help
|
|
Say Y here if you want the console on the Newport aka XL graphics
|
|
card of your Indy. Most people say Y here.
|
|
|
|
config DUMMY_CONSOLE
|
|
bool
|
|
depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y
|
|
default y
|
|
|
|
config DUMMY_CONSOLE_COLUMNS
|
|
int "Initial number of console screen columns"
|
|
depends on DUMMY_CONSOLE && !ARM
|
|
default 160 if PARISC
|
|
default 80
|
|
help
|
|
On PA-RISC, the default value is 160, which should fit a 1280x1024
|
|
monitor.
|
|
Select 80 if you use a 640x480 resolution by default.
|
|
|
|
config DUMMY_CONSOLE_ROWS
|
|
int "Initial number of console screen rows"
|
|
depends on DUMMY_CONSOLE && !ARM
|
|
default 64 if PARISC
|
|
default 25
|
|
help
|
|
On PA-RISC, the default value is 64, which should fit a 1280x1024
|
|
monitor.
|
|
Select 25 if you use a 640x480 resolution by default.
|
|
|
|
config FRAMEBUFFER_CONSOLE
|
|
bool "Framebuffer Console support"
|
|
depends on FB && !UML
|
|
select VT_HW_CONSOLE_BINDING
|
|
select CRC32
|
|
select FONT_SUPPORT
|
|
help
|
|
Low-level framebuffer-based console driver.
|
|
|
|
config FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
|
|
bool "Map the console to the primary display device"
|
|
depends on FRAMEBUFFER_CONSOLE
|
|
default n
|
|
---help---
|
|
If this option is selected, the framebuffer console will
|
|
automatically select the primary display device (if the architecture
|
|
supports this feature). Otherwise, the framebuffer console will
|
|
always select the first framebuffer driver that is loaded. The latter
|
|
is the default behavior.
|
|
|
|
You can always override the automatic selection of the primary device
|
|
by using the fbcon=map: boot option.
|
|
|
|
If unsure, select n.
|
|
|
|
config FRAMEBUFFER_CONSOLE_ROTATION
|
|
bool "Framebuffer Console Rotation"
|
|
depends on FRAMEBUFFER_CONSOLE
|
|
help
|
|
Enable display rotation for the framebuffer console. This is done
|
|
in software and may be significantly slower than a normally oriented
|
|
display. Note that the rotation is done at the console level only
|
|
such that other users of the framebuffer will remain normally
|
|
oriented.
|
|
|
|
config STI_CONSOLE
|
|
bool "STI text console"
|
|
depends on PARISC && HAS_IOMEM
|
|
select FONT_SUPPORT
|
|
default y
|
|
help
|
|
The STI console is the builtin display/keyboard on HP-PARISC
|
|
machines. Say Y here to build support for it into your kernel.
|
|
The alternative is to use your primary serial port as a console.
|
|
|
|
endmenu
|
|
|