Skip to contentSkip to conversation

hw/input: Do not enable CONFIG_PCKBD by default

PATCH In review Thomas Huth 4 participants 4 messages Jan 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/input: Do not enable CONFIG_PCKBD by default

The i8042 device is part of the chipset of a machine, so it should be selected by the machines or chipsets (e.g. SuperIO chipsets), and not be enabled by default.

---
 hw/input/Kconfig | 1 -
 hw/isa/Kconfig   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
hw/input/Kconfig +0 -1
index 287f08887b..a2f25725be 100644
@@ -7,7 +7,6 @@ config LM832X
 
 config PCKBD
     bool
-    default y
     select PS2
     depends on ISA_BUS
 
hw/isa/Kconfig +1 -0
index 8a38813cc1..c7f07854f7 100644
@@ -16,6 +16,7 @@ config I82378
 config ISA_SUPERIO
     bool
     select ISA_BUS
+    select PCKBD
 
 config PC87312
     bool
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw

Le 15/01/2020 à 12:37, Thomas Huth a écrit :

Quoted 28 lines

The i8042 device is part of the chipset of a machine, so it should be selected by the machines or chipsets (e.g. SuperIO chipsets), and not be enabled by default.

---
 hw/input/Kconfig | 1 -
 hw/isa/Kconfig   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
hw/input/Kconfig +0 -1
index 287f08887b..a2f25725be 100644
@@ -7,7 +7,6 @@ config LM832X
 
 config PCKBD
     bool
-    default y
     select PS2
     depends on ISA_BUS
 
hw/isa/Kconfig +0 -0
index 8a38813cc1..c7f07854f7 100644

hw/isa/Kconfig config I82378 · line 22

Quoted 7 lines
hw/isa/Kconfig +1 -0
@@ -16,6 +16,7 @@ config I82378
 config ISA_SUPERIO
     bool
     select ISA_BUS
+    select PCKBD
 
 config PC87312
     bool

It is also used by R4K but the Kconfig already includes it, so:

#2 lore raw
Quoted 4 lines · Laurent Vivier

Le 15/01/2020 à 12:37, Thomas Huth a écrit :

Quoted 3 lines

The i8042 device is part of the chipset of a machine, so it should be selected by the machines or chipsets (e.g. SuperIO chipsets), and not be enabled by default.

The sentence "The i8042 device is part of the chipset of a machine" sounds odd to me.

Maybe simply use "The i8042 PS/2 Controller should not be enabled by default. It has to be selected by machines or chipsets (e.g. SuperIO chipsets)."

Quoted 29 lines
Quoted 29 lines
---
  hw/input/Kconfig | 1 -
  hw/isa/Kconfig   | 1 +
  2 files changed, 1 insertion(+), 1 deletion(-)
hw/input/Kconfig +0 -1
index 287f08887b..a2f25725be 100644
@@ -7,7 +7,6 @@ config LM832X
 
  config PCKBD
      bool
-    default y
      select PS2
      depends on ISA_BUS
 
hw/isa/Kconfig +1 -0
index 8a38813cc1..c7f07854f7 100644
@@ -16,6 +16,7 @@ config I82378
  config ISA_SUPERIO
      bool
      select ISA_BUS
+    select PCKBD
 
Quoted 5 lines

hw/isa/Kconfig config I82378 · line 22

Quoted 3 lines
hw/isa/Kconfig +0 -0
  config PC87312
      bool

It is also used by R4K but the Kconfig already includes it, so:

I believe R4K should 'select ISA_SUPERIO' but we don't have specs and this machine is deprecated, so I didn't bother improving it.

Quoted 3 lines
Acked-by on v1 1/1
#3 lore raw
In reply to Thomas Huth
Quoted 28 lines · Thomas Huth

The i8042 device is part of the chipset of a machine, so it should be selected by the machines or chipsets (e.g. SuperIO chipsets), and not be enabled by default.

---
 hw/input/Kconfig | 1 -
 hw/isa/Kconfig   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
hw/input/Kconfig +0 -1
index 287f08887b..a2f25725be 100644
@@ -7,7 +7,6 @@ config LM832X
 
 config PCKBD
     bool
-    default y
     select PS2
     depends on ISA_BUS
 
hw/isa/Kconfig +0 -0
index 8a38813cc1..c7f07854f7 100644

hw/isa/Kconfig config I82378 · line 22

Quoted 7 lines
hw/isa/Kconfig +1 -0
@@ -16,6 +16,7 @@ config I82378
 config ISA_SUPERIO
     bool
     select ISA_BUS
+    select PCKBD
 
 config PC87312
     bool

Since you CCed qemu-trivial,