Skip to content

L
linux
Commit f26ee67a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'tty-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty fix from Greg KH:
 "Here is a single revert for a much-reported regression in 6.10-rc1
  when it comes to a few older architectures.

  Turns out that the VT ioctls don't work the same across all cpu types
  because of some old compatibility requrements for stuff like alpha and
  powerpc. So revert the change that attempted to have them use the
  _IO() macros and go back to the known-working values instead.

  This has NOT been in linux-next but has had many reports that it fixes
  the issue with 6.10-rc1"

* tag 'tty-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "VT: Use macros to define ioctls"
parents d9aab0b1 7bc4244c
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 49 deletions
include/uapi/linux/kd.h
View file @ f26ee67a
...@@ -5,61 +5,60 @@ ...@@ -5,61 +5,60 @@
#include <linux/compiler.h> #include <linux/compiler.h>
/* 0x4B is 'K', to avoid collision with termios and vt */ /* 0x4B is 'K', to avoid collision with termios and vt */
#define KD_IOCTL_BASE 'K'
#define GIO_FONT _IO(KD_IOCTL_BASE, 0x60) /* gets font in expanded form */ #define GIO_FONT 0x4B60 /* gets font in expanded form */
#define PIO_FONT _IO(KD_IOCTL_BASE, 0x61) /* use font in expanded form */ #define PIO_FONT 0x4B61 /* use font in expanded form */
#define GIO_FONTX _IO(KD_IOCTL_BASE, 0x6B) /* get font using struct consolefontdesc */ #define GIO_FONTX 0x4B6B /* get font using struct consolefontdesc */
#define PIO_FONTX _IO(KD_IOCTL_BASE, 0x6C) /* set font using struct consolefontdesc */ #define PIO_FONTX 0x4B6C /* set font using struct consolefontdesc */
struct consolefontdesc { struct consolefontdesc {
unsigned short charcount; /* characters in font (256 or 512) */ unsigned short charcount; /* characters in font (256 or 512) */
unsigned short charheight; /* scan lines per character (1-32) */ unsigned short charheight; /* scan lines per character (1-32) */
char __user *chardata; /* font data in expanded form */ char __user *chardata; /* font data in expanded form */
}; };
#define PIO_FONTRESET _IO(KD_IOCTL_BASE, 0x6D) /* reset to default font */ #define PIO_FONTRESET 0x4B6D /* reset to default font */
#define GIO_CMAP _IO(KD_IOCTL_BASE, 0x70) /* gets colour palette on VGA+ */ #define GIO_CMAP 0x4B70 /* gets colour palette on VGA+ */
#define PIO_CMAP _IO(KD_IOCTL_BASE, 0x71) /* sets colour palette on VGA+ */ #define PIO_CMAP 0x4B71 /* sets colour palette on VGA+ */
#define KIOCSOUND _IO(KD_IOCTL_BASE, 0x2F) /* start sound generation (0 for off) */ #define KIOCSOUND 0x4B2F /* start sound generation (0 for off) */
#define KDMKTONE _IO(KD_IOCTL_BASE, 0x30) /* generate tone */ #define KDMKTONE 0x4B30 /* generate tone */
#define KDGETLED _IO(KD_IOCTL_BASE, 0x31) /* return current led state */ #define KDGETLED 0x4B31 /* return current led state */
#define KDSETLED _IO(KD_IOCTL_BASE, 0x32) /* set led state [lights, not flags] */ #define KDSETLED 0x4B32 /* set led state [lights, not flags] */
#define LED_SCR 0x01 /* scroll lock led */ #define LED_SCR 0x01 /* scroll lock led */
#define LED_NUM 0x02 /* num lock led */ #define LED_NUM 0x02 /* num lock led */
#define LED_CAP 0x04 /* caps lock led */ #define LED_CAP 0x04 /* caps lock led */
#define KDGKBTYPE _IO(KD_IOCTL_BASE, 0x33) /* get keyboard type */ #define KDGKBTYPE 0x4B33 /* get keyboard type */
#define KB_84 0x01 #define KB_84 0x01
#define KB_101 0x02 /* this is what we always answer */ #define KB_101 0x02 /* this is what we always answer */
#define KB_OTHER 0x03 #define KB_OTHER 0x03
#define KDADDIO _IO(KD_IOCTL_BASE, 0x34) /* add i/o port as valid */ #define KDADDIO 0x4B34 /* add i/o port as valid */
#define KDDELIO _IO(KD_IOCTL_BASE, 0x35) /* del i/o port as valid */ #define KDDELIO 0x4B35 /* del i/o port as valid */
#define KDENABIO _IO(KD_IOCTL_BASE, 0x36) /* enable i/o to video board */ #define KDENABIO 0x4B36 /* enable i/o to video board */
#define KDDISABIO _IO(KD_IOCTL_BASE, 0x37) /* disable i/o to video board */ #define KDDISABIO 0x4B37 /* disable i/o to video board */
#define KDSETMODE _IO(KD_IOCTL_BASE, 0x3A) /* set text/graphics mode */ #define KDSETMODE 0x4B3A /* set text/graphics mode */
#define KD_TEXT 0x00 #define KD_TEXT 0x00
#define KD_GRAPHICS 0x01 #define KD_GRAPHICS 0x01
#define KD_TEXT0 0x02 /* obsolete */ #define KD_TEXT0 0x02 /* obsolete */
#define KD_TEXT1 0x03 /* obsolete */ #define KD_TEXT1 0x03 /* obsolete */
#define KDGETMODE _IO(KD_IOCTL_BASE, 0x3B) /* get current mode */ #define KDGETMODE 0x4B3B /* get current mode */
#define KDMAPDISP _IO(KD_IOCTL_BASE, 0x3C) /* map display into address space */ #define KDMAPDISP 0x4B3C /* map display into address space */
#define KDUNMAPDISP _IO(KD_IOCTL_BASE, 0x3D) /* unmap display from address space */ #define KDUNMAPDISP 0x4B3D /* unmap display from address space */
typedef char scrnmap_t; typedef char scrnmap_t;
#define E_TABSZ 256 #define E_TABSZ 256
#define GIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x40) /* get screen mapping from kernel */ #define GIO_SCRNMAP 0x4B40 /* get screen mapping from kernel */
#define PIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x41) /* put screen mapping table in kernel */ #define PIO_SCRNMAP 0x4B41 /* put screen mapping table in kernel */
#define GIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x69) /* get full Unicode screen mapping */ #define GIO_UNISCRNMAP 0x4B69 /* get full Unicode screen mapping */
#define PIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x6A) /* set full Unicode screen mapping */ #define PIO_UNISCRNMAP 0x4B6A /* set full Unicode screen mapping */
#define GIO_UNIMAP _IO(KD_IOCTL_BASE, 0x66) /* get unicode-to-font mapping from kernel */ #define GIO_UNIMAP 0x4B66 /* get unicode-to-font mapping from kernel */
struct unipair { struct unipair {
unsigned short unicode; unsigned short unicode;
unsigned short fontpos; unsigned short fontpos;
...@@ -68,8 +67,8 @@ struct unimapdesc { ...@@ -68,8 +67,8 @@ struct unimapdesc {
unsigned short entry_ct; unsigned short entry_ct;
struct unipair __user *entries; struct unipair __user *entries;
}; };
#define PIO_UNIMAP _IO(KD_IOCTL_BASE, 0x67) /* put unicode-to-font mapping in kernel */ #define PIO_UNIMAP 0x4B67 /* put unicode-to-font mapping in kernel */
#define PIO_UNIMAPCLR _IO(KD_IOCTL_BASE, 0x68) /* clear table, possibly advise hash algorithm */ #define PIO_UNIMAPCLR 0x4B68 /* clear table, possibly advise hash algorithm */
struct unimapinit { struct unimapinit {
unsigned short advised_hashsize; /* 0 if no opinion */ unsigned short advised_hashsize; /* 0 if no opinion */
unsigned short advised_hashstep; /* 0 if no opinion */ unsigned short advised_hashstep; /* 0 if no opinion */
...@@ -84,19 +83,19 @@ struct unimapinit { ...@@ -84,19 +83,19 @@ struct unimapinit {
#define K_MEDIUMRAW 0x02 #define K_MEDIUMRAW 0x02
#define K_UNICODE 0x03 #define K_UNICODE 0x03
#define K_OFF 0x04 #define K_OFF 0x04
#define KDGKBMODE _IO(KD_IOCTL_BASE, 0x44) /* gets current keyboard mode */ #define KDGKBMODE 0x4B44 /* gets current keyboard mode */
#define KDSKBMODE _IO(KD_IOCTL_BASE, 0x45) /* sets current keyboard mode */ #define KDSKBMODE 0x4B45 /* sets current keyboard mode */
#define K_METABIT 0x03 #define K_METABIT 0x03
#define K_ESCPREFIX 0x04 #define K_ESCPREFIX 0x04
#define KDGKBMETA _IO(KD_IOCTL_BASE, 0x62) /* gets meta key handling mode */ #define KDGKBMETA 0x4B62 /* gets meta key handling mode */
#define KDSKBMETA _IO(KD_IOCTL_BASE, 0x63) /* sets meta key handling mode */ #define KDSKBMETA 0x4B63 /* sets meta key handling mode */
#define K_SCROLLLOCK 0x01 #define K_SCROLLLOCK 0x01
#define K_NUMLOCK 0x02 #define K_NUMLOCK 0x02
#define K_CAPSLOCK 0x04 #define K_CAPSLOCK 0x04
#define KDGKBLED _IO(KD_IOCTL_BASE, 0x64) /* get led flags (not lights) */ #define KDGKBLED 0x4B64 /* get led flags (not lights) */
#define KDSKBLED _IO(KD_IOCTL_BASE, 0x65) /* set led flags (not lights) */ #define KDSKBLED 0x4B65 /* set led flags (not lights) */
struct kbentry { struct kbentry {
unsigned char kb_table; unsigned char kb_table;
...@@ -108,15 +107,15 @@ struct kbentry { ...@@ -108,15 +107,15 @@ struct kbentry {
#define K_ALTTAB 0x02 #define K_ALTTAB 0x02
#define K_ALTSHIFTTAB 0x03 #define K_ALTSHIFTTAB 0x03
#define KDGKBENT _IO(KD_IOCTL_BASE, 0x46) /* gets one entry in translation table */ #define KDGKBENT 0x4B46 /* gets one entry in translation table */
#define KDSKBENT _IO(KD_IOCTL_BASE, 0x47) /* sets one entry in translation table */ #define KDSKBENT 0x4B47 /* sets one entry in translation table */
struct kbsentry { struct kbsentry {
unsigned char kb_func; unsigned char kb_func;
unsigned char kb_string[512]; unsigned char kb_string[512];
}; };
#define KDGKBSENT _IO(KD_IOCTL_BASE, 0x48) /* gets one function key string entry */ #define KDGKBSENT 0x4B48 /* gets one function key string entry */
#define KDSKBSENT _IO(KD_IOCTL_BASE, 0x49) /* sets one function key string entry */ #define KDSKBSENT 0x4B49 /* sets one function key string entry */
struct kbdiacr { struct kbdiacr {
unsigned char diacr, base, result; unsigned char diacr, base, result;
...@@ -125,8 +124,8 @@ struct kbdiacrs { ...@@ -125,8 +124,8 @@ struct kbdiacrs {
unsigned int kb_cnt; /* number of entries in following array */ unsigned int kb_cnt; /* number of entries in following array */
struct kbdiacr kbdiacr[256]; /* MAX_DIACR from keyboard.h */ struct kbdiacr kbdiacr[256]; /* MAX_DIACR from keyboard.h */
}; };
#define KDGKBDIACR _IO(KD_IOCTL_BASE, 0x4A) /* read kernel accent table */ #define KDGKBDIACR 0x4B4A /* read kernel accent table */
#define KDSKBDIACR _IO(KD_IOCTL_BASE, 0x4B) /* write kernel accent table */ #define KDSKBDIACR 0x4B4B /* write kernel accent table */
struct kbdiacruc { struct kbdiacruc {
unsigned int diacr, base, result; unsigned int diacr, base, result;
...@@ -135,16 +134,16 @@ struct kbdiacrsuc { ...@@ -135,16 +134,16 @@ struct kbdiacrsuc {
unsigned int kb_cnt; /* number of entries in following array */ unsigned int kb_cnt; /* number of entries in following array */
struct kbdiacruc kbdiacruc[256]; /* MAX_DIACR from keyboard.h */ struct kbdiacruc kbdiacruc[256]; /* MAX_DIACR from keyboard.h */
}; };
#define KDGKBDIACRUC _IO(KD_IOCTL_BASE, 0xFA) /* read kernel accent table - UCS */ #define KDGKBDIACRUC 0x4BFA /* read kernel accent table - UCS */
#define KDSKBDIACRUC _IO(KD_IOCTL_BASE, 0xFB) /* write kernel accent table - UCS */ #define KDSKBDIACRUC 0x4BFB /* write kernel accent table - UCS */
struct kbkeycode { struct kbkeycode {
unsigned int scancode, keycode; unsigned int scancode, keycode;
}; };
#define KDGETKEYCODE _IO(KD_IOCTL_BASE, 0x4C) /* read kernel keycode table entry */ #define KDGETKEYCODE 0x4B4C /* read kernel keycode table entry */
#define KDSETKEYCODE _IO(KD_IOCTL_BASE, 0x4D) /* write kernel keycode table entry */ #define KDSETKEYCODE 0x4B4D /* write kernel keycode table entry */
#define KDSIGACCEPT _IO(KD_IOCTL_BASE, 0x4E) /* accept kbd generated signals */ #define KDSIGACCEPT 0x4B4E /* accept kbd generated signals */
struct kbd_repeat { struct kbd_repeat {
int delay; /* in msec; <= 0: don't change */ int delay; /* in msec; <= 0: don't change */
...@@ -152,11 +151,10 @@ struct kbd_repeat { ...@@ -152,11 +151,10 @@ struct kbd_repeat {
/* earlier this field was misnamed "rate" */ /* earlier this field was misnamed "rate" */
}; };
#define KDKBDREP _IO(KD_IOCTL_BASE, 0x52) /* set keyboard delay/repeat rate; #define KDKBDREP 0x4B52 /* set keyboard delay/repeat rate;
* actually used values are returned * actually used values are returned */
*/
#define KDFONTOP _IO(KD_IOCTL_BASE, 0x72) /* font operations */ #define KDFONTOP 0x4B72 /* font operations */
struct console_font_op { struct console_font_op {
unsigned int op; /* operation code KD_FONT_OP_* */ unsigned int op; /* operation code KD_FONT_OP_* */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7