[coreboot-gerrit] Change in coreboot[master]: asrock/e350m1: Include ASL for PS/2 controller

gerrit code review gerrit at coreboot.org
Thu Mar 16 15:21:38 CET 2017


>From Martin Roth <martinroth at google.com>:

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/18574 )

Change subject: asrock/e350m1: Include ASL for PS/2 controller
......................................................................


asrock/e350m1: Include ASL for PS/2 controller

On the ASRock E350M1, with Linux 4.10 after resuming from S3, the PS/2
keyboard does not work. Adding the ASL code, fixes this.

The Linux messages change like below.

Before (equivalent to `i8042.nopnp`):

```
kernel: i8042: PNP: No PS/2 controller found.
kernel: i8042: Probing ports directly.
kernel: serio: i8042 KBD port at 0x60,0x64 irq 1
kernel: serio: i8042 AUX port at 0x60,0x64 irq 12
kernel: mousedev: PS/2 mouse device common for all mice
```

After:

```
kernel: i8042: PNP: PS/2 Controller [PNP0303:PS2K] at 0x60,0x64 irq 1
kernel: i8042: PNP: PS/2 appears to have AUX port disabled, if this is incorrect please boot with i8042.nopnp
kernel: serio: i8042 KBD port at 0x60,0x64 irq 1
kernel: mousedev: PS/2 mouse device common for all mice
```

Change-Id: I0a06311860398cac9cf1a077e3aba75da779f45d
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
Signed-off-by: Paul Menzel <pmenzel at molgen.mpg.de>
Reviewed-on: https://review.coreboot.org/18574
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/mainboard/asrock/e350m1/acpi/superio.asl
M src/mainboard/asrock/e350m1/dsdt.asl
2 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Arthur Heymans: Looks good to me, approved
  build bot (Jenkins): Verified



diff --git a/src/mainboard/asrock/e350m1/acpi/superio.asl b/src/mainboard/asrock/e350m1/acpi/superio.asl
index e69de29..5047e54 100644
--- a/src/mainboard/asrock/e350m1/acpi/superio.asl
+++ b/src/mainboard/asrock/e350m1/acpi/superio.asl
@@ -0,0 +1,14 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <drivers/pc80/pc/ps2_controller.asl>
diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl
index 2566371..4b48935 100644
--- a/src/mainboard/asrock/e350m1/dsdt.asl
+++ b/src/mainboard/asrock/e350m1/dsdt.asl
@@ -46,6 +46,8 @@
 		}
 	}   /* End Scope(_SB)  */
 
+	#include "acpi/superio.asl"
+
 	/* Contains the supported sleep states for this chipset */
 	#include <southbridge/amd/cimx/sb800/acpi/sleepstates.asl>
 

-- 
To view, visit https://review.coreboot.org/18574
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a06311860398cac9cf1a077e3aba75da779f45d
Gerrit-PatchSet: 4
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki at gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Gerrit-Reviewer: build bot (Jenkins)



More information about the coreboot-gerrit mailing list