Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel-5.15, -6.1: drop i8042 modules from shared config #3396

Merged
merged 1 commit into from
Sep 1, 2023

Conversation

bcressey
Copy link
Contributor

Issue number:
N/A

Description of changes:
This effectively removes i8042 hardware support from aws variants, matching the Amazon Linux upstream configuration for EC2.

i8042 is retained for vmware variants, where it's required for the interactive console to accept keyboard input, and for metal variants where it might also be useful in some environments.

Testing done:
Verified EC2 serial console connectivity:

  • kernel 6.1 / m6g.medium
  • kernel 6.1 / c5.large
  • kernel 5.15 / m6g.medium
  • kernel 5.15 / c5.large

Confirmed that only the aws kernel configs are affected:

./tools/diff-kernel-config \
  -a 7c8d340c -b 006afceb -o configs \
  -v aws-k8s-1.24 -v vmware-k8s-1.24 -v metal-k8s-1.24 \
  -v aws-k8s-1.28 -v vmware-k8s-1.28 -v metal-k8s-1.28

config-aarch64-aws-k8s-1.24-diff:        22 removed,   0 added,   3 changed
config-aarch64-aws-k8s-1.28-diff:        23 removed,   0 added,   3 changed
config-x86_64-aws-k8s-1.24-diff:         25 removed,   0 added,   3 changed
config-x86_64-aws-k8s-1.28-diff:         27 removed,   0 added,   3 changed
config-x86_64-metal-k8s-1.24-diff:        0 removed,   0 added,   0 changed
config-x86_64-metal-k8s-1.28-diff:        0 removed,   0 added,   0 changed
config-x86_64-vmware-k8s-1.24-diff:       0 removed,   0 added,   0 changed
config-x86_64-vmware-k8s-1.28-diff:       0 removed,   0 added,   0 changed

==> configs/config-aarch64-aws-k8s-1.24-diff <==
-MOUSE_PS2_ALPS n
-MOUSE_PS2_BYD n
-MOUSE_PS2_CYPRESS n
-MOUSE_PS2_ELANTECH n
-MOUSE_PS2_FOCALTECH n
-MOUSE_PS2_LOGIPS2PP n
-MOUSE_PS2_SENTELIC n
-MOUSE_PS2_SYNAPTICS n
-MOUSE_PS2_SYNAPTICS_SMBUS n
-MOUSE_PS2_TOUCHKIT n
-MOUSE_PS2_TRACKPOINT n
-SERIO_ALTERA_PS2 n
-SERIO_AMBAKMI n
-SERIO_APBPS2 n
-SERIO_ARC_PS2 n
-SERIO_GPIO_PS2 n
-SERIO_LIBPS2 m
-SERIO_PCIPS2 n
-SERIO_PS2MULT n
-SERIO_RAW n
-SERIO_SERPORT m
-USERIO n
 KEYBOARD_ATKBD m -> n
 MOUSE_PS2 m -> n
 SERIO m -> n

==> configs/config-aarch64-aws-k8s-1.28-diff <==
-INPUT_VIVALDIFMAP m
-MOUSE_PS2_ALPS n
-MOUSE_PS2_BYD n
-MOUSE_PS2_CYPRESS n
-MOUSE_PS2_ELANTECH n
-MOUSE_PS2_FOCALTECH n
-MOUSE_PS2_LOGIPS2PP n
-MOUSE_PS2_SENTELIC n
-MOUSE_PS2_SYNAPTICS n
-MOUSE_PS2_SYNAPTICS_SMBUS n
-MOUSE_PS2_TOUCHKIT n
-MOUSE_PS2_TRACKPOINT n
-SERIO_ALTERA_PS2 n
-SERIO_AMBAKMI n
-SERIO_APBPS2 n
-SERIO_ARC_PS2 n
-SERIO_GPIO_PS2 n
-SERIO_LIBPS2 m
-SERIO_PCIPS2 n
-SERIO_PS2MULT n
-SERIO_RAW n
-SERIO_SERPORT m
-USERIO n
 KEYBOARD_ATKBD m -> n
 MOUSE_PS2 m -> n
 SERIO m -> n

==> configs/config-x86_64-aws-k8s-1.24-diff <==
-HYPERV_KEYBOARD m
-INPUT_IDEAPAD_SLIDEBAR n
-MOUSE_PS2_ALPS n
-MOUSE_PS2_BYD n
-MOUSE_PS2_CYPRESS n
-MOUSE_PS2_ELANTECH n
-MOUSE_PS2_FOCALTECH n
-MOUSE_PS2_LIFEBOOK y
-MOUSE_PS2_LOGIPS2PP n
-MOUSE_PS2_SENTELIC n
-MOUSE_PS2_SYNAPTICS n
-MOUSE_PS2_SYNAPTICS_SMBUS n
-MOUSE_PS2_TOUCHKIT n
-MOUSE_PS2_TRACKPOINT n
-MOUSE_PS2_VMMOUSE n
-SERIO_ALTERA_PS2 n
-SERIO_ARC_PS2 n
-SERIO_CT82C710 n
-SERIO_I8042 m
-SERIO_LIBPS2 m
-SERIO_PCIPS2 n
-SERIO_PS2MULT n
-SERIO_RAW n
-SERIO_SERPORT m
-USERIO n
 KEYBOARD_ATKBD m -> n
 MOUSE_PS2 m -> n
 SERIO m -> n

==> configs/config-x86_64-aws-k8s-1.28-diff <==
-ACER_WMI n
-HYPERV_KEYBOARD m
-INPUT_IDEAPAD_SLIDEBAR n
-INPUT_VIVALDIFMAP m
-MOUSE_PS2_ALPS n
-MOUSE_PS2_BYD n
-MOUSE_PS2_CYPRESS n
-MOUSE_PS2_ELANTECH n
-MOUSE_PS2_FOCALTECH n
-MOUSE_PS2_LIFEBOOK y
-MOUSE_PS2_LOGIPS2PP n
-MOUSE_PS2_SENTELIC n
-MOUSE_PS2_SYNAPTICS n
-MOUSE_PS2_SYNAPTICS_SMBUS n
-MOUSE_PS2_TOUCHKIT n
-MOUSE_PS2_TRACKPOINT n
-MOUSE_PS2_VMMOUSE n
-SERIO_ALTERA_PS2 n
-SERIO_ARC_PS2 n
-SERIO_CT82C710 n
-SERIO_I8042 m
-SERIO_LIBPS2 m
-SERIO_PCIPS2 n
-SERIO_PS2MULT n
-SERIO_RAW n
-SERIO_SERPORT m
-USERIO n
 KEYBOARD_ATKBD m -> n
 MOUSE_PS2 m -> n
 SERIO m -> n

==> configs/config-x86_64-metal-k8s-1.24-diff <==

==> configs/config-x86_64-metal-k8s-1.28-diff <==

==> configs/config-x86_64-vmware-k8s-1.24-diff <==

==> configs/config-x86_64-vmware-k8s-1.28-diff <==

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

This effectively removes i8042 hardware support from aws variants,
matching the Amazon Linux upstream configuration for EC2.

i8042 is retained for vmware variants, where it's required for the
interactive console to accept keyboard input, and for metal variants
where it might also be useful in some environments.

Signed-off-by: Ben Cressey <[email protected]>
@bcressey bcressey merged commit 5a087f5 into bottlerocket-os:develop Sep 1, 2023
48 checks passed
@bcressey bcressey deleted the move-i8042-config branch September 1, 2023 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants