From 0a24b2e612e5dbd5edabc5ce2001dd92f47b9776 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 25 Jan 2024 18:39:19 +0000 Subject: [PATCH] dell/e6*30: use generic PS2K/PS2M EISAID strings CONFIG_PS2M_EISAID. this is a a string used for the identifier on the mouse, in ACPI. CONFIG_PS2K_EISAID this is used for the keyboard. IASL comes back with this build error: dsdt.asl 1884: Name(_HID, EISAID("DLLK0534")) Error 6045 - ^ EISAID string must be of the form "UUUXXXX" (3 uppercase, 4 hex digits) (DLLK0534) Change DLLK0534 back to PNP0303 and change DLL0534 back to PNP0F13. These are generic identifiers for PS/2 keyboard and mouse. Any generic driver will work with the onboard mouse/keyboard on these machines. They do not need to be changed. These are the default values anyway. Just leave them explicitly defined to the default values, for now; if these options are not set, coreboot will default to these values. This shouldn't break anything for the users. I've reported this to Nicholas Chin, author of those patches. Libreboot imported the new versions of E6430/E6530 board patches in the coreboot revision update, but the new (technically correct) values broke IASL, so I've decided to use the old values for now. Signed-off-by: Leah Rowe --- .../patches/0020-mb-dell-Add-Latitude-E6430-Ivy-Bridge.patch | 4 ++-- .../0027-rebase-dell-e6530-to-newer-coreboot-code.patch | 4 ++-- config/coreboot/e6430_12mb/config/libgfxinit_corebootfb | 4 ++-- config/coreboot/e6430_12mb/config/libgfxinit_txtmode | 4 ++-- config/coreboot/e6530_12mb/config/libgfxinit_corebootfb | 4 ++-- config/coreboot/e6530_12mb/config/libgfxinit_txtmode | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/coreboot/default/patches/0020-mb-dell-Add-Latitude-E6430-Ivy-Bridge.patch b/config/coreboot/default/patches/0020-mb-dell-Add-Latitude-E6430-Ivy-Bridge.patch index c182ce8c..fecaf88a 100644 --- a/config/coreboot/default/patches/0020-mb-dell-Add-Latitude-E6430-Ivy-Bridge.patch +++ b/config/coreboot/default/patches/0020-mb-dell-Add-Latitude-E6430-Ivy-Bridge.patch @@ -122,10 +122,10 @@ index 0000000000..e4c799803e + default "Latitude E6430" + +config PS2K_EISAID -+ default "DLLK0534" ++ default "PNP0303" + +config PS2M_EISAID -+ default "DLL0534" ++ default "PNP0F13" + +config USBDEBUG_HCD_INDEX + default 2 diff --git a/config/coreboot/default/patches/0027-rebase-dell-e6530-to-newer-coreboot-code.patch b/config/coreboot/default/patches/0027-rebase-dell-e6530-to-newer-coreboot-code.patch index c5d67ae8..130984fb 100644 --- a/config/coreboot/default/patches/0027-rebase-dell-e6530-to-newer-coreboot-code.patch +++ b/config/coreboot/default/patches/0027-rebase-dell-e6530-to-newer-coreboot-code.patch @@ -44,12 +44,12 @@ index 582adddbd4..a104566890 100644 -config VGA_BIOS_ID - default "8086,0166" +config PS2K_EISAID -+ default "DLLK0534" ++ default "PNP0303" -config DRAM_RESET_GATE_GPIO - default 60 +config PS2M_EISAID -+ default "DLL0534" ++ default "PNP0F13" config USBDEBUG_HCD_INDEX default 2 diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb index 8416f2ef..3254c612 100644 --- a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb @@ -139,8 +139,8 @@ CONFIG_BOARD_DELL_LATITUDE_E6430=y # CONFIG_BOARD_DELL_LATITUDE_E6530 is not set # CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set # CONFIG_BOARD_DELL_PRECISION_T1650 is not set -CONFIG_PS2K_EISAID="DLLK0534" -CONFIG_PS2M_EISAID="DLL0534" +CONFIG_PS2K_EISAID="PNP0303" +CONFIG_PS2M_EISAID="PNP0F13" CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode index 4614c7fd..c76f2a2f 100644 --- a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode @@ -137,8 +137,8 @@ CONFIG_BOARD_DELL_LATITUDE_E6430=y # CONFIG_BOARD_DELL_LATITUDE_E6530 is not set # CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set # CONFIG_BOARD_DELL_PRECISION_T1650 is not set -CONFIG_PS2K_EISAID="DLLK0534" -CONFIG_PS2M_EISAID="DLL0534" +CONFIG_PS2K_EISAID="PNP0303" +CONFIG_PS2M_EISAID="PNP0F13" CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" diff --git a/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb index f730ef20..55e49b43 100644 --- a/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb @@ -139,8 +139,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_BOARD_DELL_LATITUDE_E6530=y # CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set # CONFIG_BOARD_DELL_PRECISION_T1650 is not set -CONFIG_PS2K_EISAID="DLLK0534" -CONFIG_PS2M_EISAID="DLL0534" +CONFIG_PS2K_EISAID="PNP0303" +CONFIG_PS2M_EISAID="PNP0F13" CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" diff --git a/config/coreboot/e6530_12mb/config/libgfxinit_txtmode b/config/coreboot/e6530_12mb/config/libgfxinit_txtmode index 9230658a..f4a09759 100644 --- a/config/coreboot/e6530_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/e6530_12mb/config/libgfxinit_txtmode @@ -137,8 +137,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_BOARD_DELL_LATITUDE_E6530=y # CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set # CONFIG_BOARD_DELL_PRECISION_T1650 is not set -CONFIG_PS2K_EISAID="DLLK0534" -CONFIG_PS2M_EISAID="DLL0534" +CONFIG_PS2K_EISAID="PNP0303" +CONFIG_PS2M_EISAID="PNP0F13" CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"