Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9096bd7a authored by Helge Wagner's avatar Helge Wagner Committed by Thomas Gleixner
Browse files

x86: restrict keyboard io ports reservation to make ipmi driver work 



On some of our (single board computer) boards (x86) we are using an
IPMI controller that uses I/O ports 0x62 and 0x66 for a KCS (keyboard
controller style) IPMI system interface.

Trying to load the openipmi driver fails, because the ports
(0x62/0x66) are reserved for keyboard. keyboard reserves the full
range 0x60-0x6F while it doesn't need to.

Reserve only ports 0x60 and 0x64 for the legacy PS/2 i8042 keyboad
controller instead of 0x60-0x6F to allow the openipmi driver to work.

[ tglx: added 64bit fixup ]

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fd3c3ed5

arch/x86/kernel/setup_32.c

+6 −1
Original line number Diff line number Diff line
@@ -127,7 +127,12 @@ static struct resource standard_io_resources[] = { { 
}, {

	.name	= "keyboard",

	.start	= 0x0060,

	.end	= 0x006f,

	.end	= 0x0060,

	.flags	= IORESOURCE_BUSY | IORESOURCE_IO

}, {

	.name	= "keyboard",

	.start	= 0x0064,

	.end	= 0x0064,

	.flags	= IORESOURCE_BUSY | IORESOURCE_IO

}, {

	.name	= "dma page reg",

arch/x86/kernel/setup_64.c

+3 −1
Original line number Diff line number Diff line
@@ -129,7 +129,9 @@ static struct resource standard_io_resources[] = { 
		.flags = IORESOURCE_BUSY | IORESOURCE_IO },

	{ .name = "timer1", .start = 0x50, .end = 0x53,

		.flags = IORESOURCE_BUSY | IORESOURCE_IO },

	{ .name = "keyboard", .start = 0x60, .end = 0x6f,

	{ .name = "keyboard", .start = 0x60, .end = 0x60,

		.flags = IORESOURCE_BUSY | IORESOURCE_IO },

	{ .name = "keyboard", .start = 0x64, .end = 0x64,

		.flags = IORESOURCE_BUSY | IORESOURCE_IO },

	{ .name = "dma page reg", .start = 0x80, .end = 0x8f,

		.flags = IORESOURCE_BUSY | IORESOURCE_IO },