James has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31067
Change subject: mb/lenovo/x131e: function key support
......................................................................
mb/lenovo/x131e: function key support
Enables function keys for X131e.
The IT8518e EC of this board uses some different ACPI methods compared to the
regular Lenovo H8. Add an option to use the alternative set of methods.
Change-Id: Ib3a01f37a8b54889b55e92c501c9350e6c68bd57
Signed-off-by: James Ye <jye836(a)gmail.com>
---
M src/ec/lenovo/h8/Kconfig
M src/ec/lenovo/h8/acpi/ec.asl
M src/mainboard/lenovo/x131e/Kconfig
M src/mainboard/lenovo/x131e/Makefile.inc
M src/mainboard/lenovo/x131e/devicetree.cb
A src/mainboard/lenovo/x131e/ec.h
M src/mainboard/lenovo/x131e/mainboard.c
M src/mainboard/lenovo/x131e/romstage.c
A src/mainboard/lenovo/x131e/smihandler.c
9 files changed, 146 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/31067/1
diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig
index f9b0b14..3dab615 100644
--- a/src/ec/lenovo/h8/Kconfig
+++ b/src/ec/lenovo/h8/Kconfig
@@ -28,6 +28,12 @@
Disable BDC detection and assume bluetooth is installed. Required for
bluetooth on wifi cards, as it's not possible to detect it in coreboot.
+config H8_ALT_EC_QUERY
+ bool "Alternate ACPI EC query methods"
+ default n
+ help
+ Use alternative EC query methods for X131e
+
endif
config H8_DOCK_EARLY_INIT
diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl
index 327a2cf..7c96504 100644
--- a/src/ec/lenovo/h8/acpi/ec.asl
+++ b/src/ec/lenovo/h8/acpi/ec.asl
@@ -140,7 +140,11 @@
/* Sleep Button pressed */
Method(_Q13, 0, NotSerialized)
{
+#ifndef CONFIG_H8_ALT_EC_QUERY
Notify(^SLPB, 0x80)
+#else
+ ^HKEY.RHK(0x04)
+#endif
}
/* Brightness up GPE */
@@ -217,9 +221,20 @@
Method (_Q17, 0, NotSerialized)
{
+#ifndef CONFIG_H8_ALT_EC_QUERY
^HKEY.RHK (0x08)
+#else
+ BRIGHTNESS_DOWN()
+#endif
}
+#ifdef CONFIG_H8_ALT_EC_QUERY
+ Method (_Q18, 0, NotSerialized)
+ {
+ BRIGHTNESS_UP()
+ }
+#endif
+
Method (_Q66, 0, NotSerialized)
{
^HKEY.RHK (0x0A)
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index 946b945..ee7a83f 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -8,6 +8,7 @@
select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216
select EC_LENOVO_H8
+ select H8_ALT_EC_QUERY
select NO_UART_ON_SUPERIO
select BOARD_ROMSIZE_KB_12288
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/lenovo/x131e/Makefile.inc b/src/mainboard/lenovo/x131e/Makefile.inc
index 7a00cce..2dab950 100644
--- a/src/mainboard/lenovo/x131e/Makefile.inc
+++ b/src/mainboard/lenovo/x131e/Makefile.inc
@@ -13,6 +13,7 @@
## GNU General Public License for more details.
##
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb
index 3d0148f..0a73010 100644
--- a/src/mainboard/lenovo/x131e/devicetree.cb
+++ b/src/mainboard/lenovo/x131e/devicetree.cb
@@ -47,7 +47,8 @@
chip southbridge/intel/bd82x6x
# GPI routing
- register "alt_gp_smi_en" = "0x0000"
+ register "alt_gp_smi_en" = "0x0002"
+ register "gpi1_routing" = "1"
register "gpi6_routing" = "2"
register "gpi13_routing" = "2"
@@ -115,22 +116,10 @@
register "beepmask1" = "0x87"
register "has_power_management_beeps" = "0"
- register "event0_enable" = "0xff"
- register "event1_enable" = "0xff"
- register "event2_enable" = "0xff"
- register "event3_enable" = "0xff"
- register "event4_enable" = "0xff"
- register "event5_enable" = "0xff"
- register "event6_enable" = "0xff"
- register "event7_enable" = "0xff"
- register "event8_enable" = "0xff"
- register "event9_enable" = "0xff"
- register "eventa_enable" = "0xff"
- register "eventb_enable" = "0xff"
- register "eventc_enable" = "0xff"
- register "eventd_enable" = "0xff"
- register "evente_enable" = "0xff"
- register "eventf_enable" = "0xff"
+ register "event2_enable" = "0xc8" # sleep, monitor, brightness down
+ register "event3_enable" = "0x01" # brightness up
+ register "eventc_enable" = "0x30" # airplane, camera
+ register "eventd_enable" = "0x04" # mic
register "has_bdc_detection" = "0"
diff --git a/src/mainboard/lenovo/x131e/ec.h b/src/mainboard/lenovo/x131e/ec.h
new file mode 100644
index 0000000..4a731dc
--- /dev/null
+++ b/src/mainboard/lenovo/x131e/ec.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2019 James Ye <jye836(a)gmail.com>
+ *
+ * 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.
+ */
+
+#ifndef X131E_EC_H
+#define X131E_EC_H
+
+#define GPE_EC_SCI 6
+#define GPE_EC_WAKE 13
+
+#define EC_CMD_NOTIFY_ACPI_ENTER 0x86
+#define EC_CMD_NOTIFY_ACPI_EXIT 0x87
+
+#endif // X131E_EC_H
diff --git a/src/mainboard/lenovo/x131e/mainboard.c b/src/mainboard/lenovo/x131e/mainboard.c
index 1342aca..9e6a7dd 100644
--- a/src/mainboard/lenovo/x131e/mainboard.c
+++ b/src/mainboard/lenovo/x131e/mainboard.c
@@ -13,9 +13,17 @@
* GNU General Public License for more details.
*/
+#include <arch/acpi.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
+#include <ec/acpi/ec.h>
#include <ec/lenovo/h8/h8.h>
+#include "ec.h"
+
+void mainboard_suspend_resume(void)
+{
+ send_ec_command(EC_CMD_NOTIFY_ACPI_ENTER);
+}
static void mainboard_enable(struct device *dev)
{
diff --git a/src/mainboard/lenovo/x131e/romstage.c b/src/mainboard/lenovo/x131e/romstage.c
index 43e0bd7..30df36f 100644
--- a/src/mainboard/lenovo/x131e/romstage.c
+++ b/src/mainboard/lenovo/x131e/romstage.c
@@ -26,11 +26,6 @@
/* Enable TPM, EC, PS/2 Keyboard/Mouse */
pci_write_config16(PCH_LPC_DEV, LPC_EN,
CNF2_LPC_EN | CNF1_LPC_EN | MC_LPC_EN | KBC_LPC_EN);
-
- pci_write_config32(PCH_LPC_DEV, LPC_GEN1_DEC, 0x007c1611);
- pci_write_config32(PCH_LPC_DEV, LPC_GEN2_DEC, 0x00040069);
- pci_write_config32(PCH_LPC_DEV, LPC_GEN3_DEC, 0x000c0701);
- pci_write_config32(PCH_LPC_DEV, LPC_GEN4_DEC, 0x000c06a1);
}
void mainboard_rcba_config(void)
diff --git a/src/mainboard/lenovo/x131e/smihandler.c b/src/mainboard/lenovo/x131e/smihandler.c
new file mode 100644
index 0000000..a634359
--- /dev/null
+++ b/src/mainboard/lenovo/x131e/smihandler.c
@@ -0,0 +1,83 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2019 James Ye <jye836(a)gmail.com>
+ *
+ * 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 <arch/io.h>
+#include <console/console.h>
+#include <cpu/x86/smm.h>
+#include <ec/acpi/ec.h>
+#include <ec/lenovo/h8/h8.h>
+#include <southbridge/intel/bd82x6x/pch.h>
+#include <southbridge/intel/common/pmutil.h>
+#include "ec.h"
+
+static void mainboard_smi_handle_ec_sci(void)
+{
+ u8 status = ec_status();
+ if (!(status & EC_SCI_EVT))
+ return;
+
+ u8 event = ec_query();
+ printk(BIOS_DEBUG, "EC event %02x\n", event);
+}
+
+void mainboard_smi_gpi(u32 gpi_sts)
+{
+ if (gpi_sts & (1 << GPE_EC_SCI))
+ mainboard_smi_handle_ec_sci();
+}
+
+int mainboard_smi_apmc(u8 data)
+{
+ switch (data) {
+ case APM_CNT_ACPI_ENABLE:
+ send_ec_command(EC_CMD_NOTIFY_ACPI_ENTER);
+ /* use 0x1600/0x1604 to prevent races with userspace */
+ ec_set_ports(0x1604, 0x1600);
+ /* route EC_SCI to SCI */
+ gpi_route_interrupt(GPE_EC_SCI, GPI_IS_SCI);
+ /* discard all events, and enable attention */
+ ec_write(0x80, 0x01);
+ break;
+ case APM_CNT_ACPI_DISABLE:
+ send_ec_command(EC_CMD_NOTIFY_ACPI_EXIT);
+ /* we have to use port 0x62/0x66, as 0x1600/0x1604 doesn't
+ provide a EC query function */
+ ec_set_ports(EC_SC, EC_DATA);
+ /* route EC_SCI to SMI */
+ gpi_route_interrupt(GPE_EC_SCI, GPI_IS_SMI);
+ /* discard all events, and enable attention */
+ ec_write(0x80, 0x01);
+ break;
+ }
+ return 0;
+}
+
+void mainboard_smi_sleep(u8 slp_typ)
+{
+ if (slp_typ == 3) {
+ u8 ec_wake = ec_read(0x32);
+ /* If EC wake events are enabled, enable wake on EC WAKE GPE. */
+ if (ec_wake & 0x14) {
+ /* Redirect EC WAKE GPE to SCI. */
+ gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);
+ }
+ }
+
+ //outb(0xe9, 0x64); // EC_KBD_CMD_MUTE
+ //ec_set_bit(0xbf, 4); // EC_WAKE_SRC_ENABLE, EC_LID_WAKE_ENABLE
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/31067
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib3a01f37a8b54889b55e92c501c9350e6c68bd57
Gerrit-Change-Number: 31067
Gerrit-PatchSet: 1
Gerrit-Owner: James <jye836(a)gmail.com>
Gerrit-MessageType: newchange
Sumeet R Pawnikar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31136
Change subject: skylake: Force to use single channel
......................................................................
skylake: Force to use single channel
Change-Id: I5fea8bdb14922f57d05c1388025a458451035132
Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar(a)intel.com>
---
M src/vendorcode/intel/fsp/fsp1_1/skylake/FspUpdVpd.h
M src/vendorcode/intel/fsp/fsp2_0/denverton_ns/FspmUpd.h
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/31136/1
diff --git a/src/vendorcode/intel/fsp/fsp1_1/skylake/FspUpdVpd.h b/src/vendorcode/intel/fsp/fsp1_1/skylake/FspUpdVpd.h
index fddc168..cfb336b 100644
--- a/src/vendorcode/intel/fsp/fsp1_1/skylake/FspUpdVpd.h
+++ b/src/vendorcode/intel/fsp/fsp1_1/skylake/FspUpdVpd.h
@@ -38,7 +38,7 @@
#define MRC_MAX_RCOMP 3
#define MRC_MAX_RCOMP_TARGETS 5
-#define MAX_CHANNELS_NUM 2
+#define MAX_CHANNELS_NUM 1
#define MAX_DIMMS_NUM 2
typedef struct {
diff --git a/src/vendorcode/intel/fsp/fsp2_0/denverton_ns/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/denverton_ns/FspmUpd.h
index 3aa74a0..b4ba865 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/denverton_ns/FspmUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/denverton_ns/FspmUpd.h
@@ -37,7 +37,7 @@
#pragma pack(1)
-#define MAX_CH 2 /* Maximum Number of Memory Channels */
+#define MAX_CH 1 /* Maximum Number of Memory Channels */
#define MAX_DIMM 2 /* Maximum Number of DIMMs PER Memory Channel */
#define MAX_SPD_BYTES 512 /* Maximum Number of SPD bytes */
--
To view, visit https://review.coreboot.org/c/coreboot/+/31136
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5fea8bdb14922f57d05c1388025a458451035132
Gerrit-Change-Number: 31136
Gerrit-PatchSet: 1
Gerrit-Owner: Sumeet R Pawnikar <sumeet.r.pawnikar(a)intel.com>
Gerrit-MessageType: newchange
John Looney has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32087
Change subject: Patch SSDTs into qemu, and add VPD area to the fmap for q35 as a proof of concept
......................................................................
Patch SSDTs into qemu, and add VPD area to the fmap for q35 as a proof of concept
Signed-off-by: John Looney <john.looney(a)gmail.com>
Change-Id: I4678b9adc8044a691c818527e2c16205f9b259e2
---
A src/mainboard/emulation/qemu-q35/board.fmd
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/32087/1
diff --git a/src/mainboard/emulation/qemu-q35/board.fmd b/src/mainboard/emulation/qemu-q35/board.fmd
new file mode 100644
index 0000000..a97e218
--- /dev/null
+++ b/src/mainboard/emulation/qemu-q35/board.fmd
@@ -0,0 +1,16 @@
+# layout for firmware residing at top of 4GB address space
+# +-------------+ <-- 4GB - ROM_SIZE / start of flash
+# | unspecified |
+# +-------------+ <-- 4GB - BIOS_SIZE
+# | FMAP |
+# +-------------+ <-- 4GB - BIOS_SIZE + FMAP_SIZE
+# | CBFS |
+# +-------------+ <-- 4GB / end of flash
+FLASH@4278190080 0x1000000 {
+ BIOS@0 0x1000000 {
+ FMAP@0 0x200
+ RO_VPD@0x200 0x10000
+ RW_VPD@0x10200 0x1000
+ COREBOOT(CBFS)@0x11200
+ }
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/32087
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4678b9adc8044a691c818527e2c16205f9b259e2
Gerrit-Change-Number: 32087
Gerrit-PatchSet: 1
Gerrit-Owner: John Looney <john.looney(a)gmail.com>
Gerrit-MessageType: newchange
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32253
Change subject: Documentation: Document PMH known registers
......................................................................
Documentation: Document PMH known registers
Document what is known of Lenovo's PMH.
Change-Id: I1891a6370123d9ee29d9e37e4b7b78b677343aed
Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com>
---
M Documentation/mainboard/index.md
A Documentation/mainboard/lenovo/pmh.md
2 files changed, 70 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/32253/1
diff --git a/Documentation/mainboard/index.md b/Documentation/mainboard/index.md
index d94c23e..adfe877 100644
--- a/Documentation/mainboard/index.md
+++ b/Documentation/mainboard/index.md
@@ -54,6 +54,7 @@
- [Hardware Maintenance Manual of ThinkPads](lenovo/thinkpad_hmm.md)
- [T4xx common](lenovo/t4xx_series.md)
- [X2xx common](lenovo/x2xx_series.md)
+- [PMH](lenovo/pmh.md)
### Sandy Bridge series
diff --git a/Documentation/mainboard/lenovo/pmh.md b/Documentation/mainboard/lenovo/pmh.md
new file mode 100644
index 0000000..06c595d
--- /dev/null
+++ b/Documentation/mainboard/lenovo/pmh.md
@@ -0,0 +1,69 @@
+# Lenovo's Power Management Hub
+
+The *Power Management Hub* or *PMH* originally was a CPLD connected to the EC
+to controll power rails and reset lines on the lenovo mainboard.
+Starting with Ivy Bridge series, the CPLD was removed and an EC with higher
+pincount does the same job. The IO space to configure the PMH is still
+the same.
+
+## PMH access
+
+The PMH register can be accessed using the IO region:
+
+ IO region address: 0x15e0
+ IO region size: 16
+
+The IO region has the following layout:
+
+```eval_rst
++-------------------+---------------------------------------+
+| Offset | Register function |
++-------------------+---------------------------------------+
+| 0xc | ADDR_L: Low address into PMH space |
++-------------------+---------------------------------------+
+| 0xd | ADDR_H: High address into PMH space |
++-------------------+---------------------------------------+
+| 0xe | DATA: The data to read/write in PMH |
++-------------------+---------------------------------------+
+```
+
+The PMH register space allows to access 512bytes.
+The following registers are known:
+
+```eval_rst
++-------------------+---------------------------------------+
+| Offset | Register function |
++-------------------+---------------------------------------+
+| 0x50 | BIT3: dGPU power enable |
+| +---------------------------------------+
+| | BIT5: Backlight enable |
+| +---------------------------------------+
+| | BIT7: dGPU !reset |
++-------------------+---------------------------------------+
+| 0x51 | BIT0: Trackpoint enable |
+| +---------------------------------------+
+| | BIT2: Touchpad enable |
++-------------------+---------------------------------------+
+| 0x60 | BIT3: Dock event enable |
++-------------------+---------------------------------------+
+| 0x62 | BIT0: Ultrabay power enable |
++-------------------+---------------------------------------+
+| 0xc2 | ID: ID of PMH |
++-------------------+---------------------------------------+
+| 0xc3 | REV: Revision of PMH |
++-------------------+---------------------------------------+
+```
+
+The revision at 0xc3 seems to increment over time:
+
+```eval_rst
++-------------------+---------------------------------------+
+| Revision | Mainboard generation |
++-------------------+---------------------------------------+
+| 4 | T520 and T420s |
++-------------------+---------------------------------------+
+| 5 | W530 |
++-------------------+---------------------------------------+
+| 6 | T470p |
++-------------------+---------------------------------------+
+```
--
To view, visit https://review.coreboot.org/c/coreboot/+/32253
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I1891a6370123d9ee29d9e37e4b7b78b677343aed
Gerrit-Change-Number: 32253
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-MessageType: newchange
Pixie has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32372
Change subject: Supplement motherboard name for G41M-GS
......................................................................
Supplement motherboard name for G41M-GS
A few months ago, Arthur Heymans rebased a few patches to add
support for the G41M-GS to aid me in testing my G41M-S. The
two boards are exact duplicates, save for the -GS having a
gigabit LAN chip, and the G41M-S having a 100Mbit one. I did
some scant testing, and it worked, but I had a lot of other
projects ongoing. Now that I remembered thisagain, I'm here
to commit the motherboard name.
Signed-off-by: Cheetah Pixie <mayulithsv(a)gmail.com>
Change-Id: I97f77ec2c8cbd9c2f13e6890257cb7c5b1c77311
---
M src/mainboard/asrock/g41c-gs/Kconfig.name
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/32372/1
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig.name b/src/mainboard/asrock/g41c-gs/Kconfig.name
index 86a41aa..1a090ff3 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig.name
+++ b/src/mainboard/asrock/g41c-gs/Kconfig.name
@@ -5,7 +5,7 @@
bool "G41C-GS / G41C-S"
config BOARD_ASROCK_G41M_GS
- bool "G41M-GS"
+ bool "G41M-GS / G41M-S"
config BOARD_ASROCK_G41M_S3
bool "G41M-S3"
--
To view, visit https://review.coreboot.org/c/coreboot/+/32372
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I97f77ec2c8cbd9c2f13e6890257cb7c5b1c77311
Gerrit-Change-Number: 32372
Gerrit-PatchSet: 1
Gerrit-Owner: Pixie <mayulithsv(a)gmail.com>
Gerrit-MessageType: newchange