i82801ix,bd82x6x,ibexpeak: rewrite expresscard hotplug
This implementation is more compact, unified and works with windows as well.
Tested under windows and under Debian GNU/Linux.
Change-Id: I585dec12e17e22d829baa3f2dc7aecc174f9d3b5
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7296
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Nicolas Reinecke <nr@das-labor.org>
Tested-by: build bot (Jenkins)
diff --git a/src/mainboard/lenovo/t520/acpi/gpe.asl b/src/mainboard/lenovo/t520/acpi/gpe.asl
deleted file mode 100644
index 80bee71..0000000
--- a/src/mainboard/lenovo/t520/acpi/gpe.asl
+++ /dev/null
@@ -1,13 +0,0 @@
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP04.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP04.HPCS)
- If (\_SB.PCI0.RP04.PDC)
- {
- Store (0x01, \_SB.PCI0.RP04.PDC)
- Notify (\_SB.PCI0.RP04, 0x00)
- }
- }
- }
diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb
index d347e82..065261a 100644
--- a/src/mainboard/lenovo/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/devicetree.cb
@@ -76,6 +76,8 @@
register "c2_latency" = "101" # c2 not supported
register "p_cnt_throttling_supported" = "1"
+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
+
device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end
device pci 16.2 off end
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index b6b4b33..85e2b4f 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP04_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
@@ -42,9 +41,6 @@
// global NVS and variables
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
- // General Purpose Events
- //#include "acpi/gpe.asl"
-
#include <cpu/intel/model_206ax/acpi/cpu.asl>
Scope (\_SB) {
diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index 387bbe0..582ef81 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/mainboard.c
@@ -53,14 +53,6 @@
RCBA32(0x38c0) = 0x00000007;
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0x42, 0x142);
}
/* mainboard_enable is executed as first thing after
diff --git a/src/mainboard/lenovo/t530/acpi/gpe.asl b/src/mainboard/lenovo/t530/acpi/gpe.asl
deleted file mode 100644
index eb489d5..0000000
--- a/src/mainboard/lenovo/t530/acpi/gpe.asl
+++ /dev/null
@@ -1,13 +0,0 @@
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP03.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP03.HPCS)
- If (\_SB.PCI0.RP03.PDC)
- {
- Store (0x01, \_SB.PCI0.RP03.PDC)
- Notify (\_SB.PCI0.RP03, 0x00)
- }
- }
- }
diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb
index 397bb9f..ec3913c 100644
--- a/src/mainboard/lenovo/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/devicetree.cb
@@ -75,6 +75,8 @@
register "c2_latency" = "101" # c2 not supported
register "p_cnt_throttling_supported" = "1"
+ register "pcie_hotplug_map" = "{ 0, 0, 1, 0, 0, 0, 0, 0 }"
+
device pci 14.0 on end # USB 3.0 Controller
device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end # Management Engine Interface 2
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index c73f795..85e2b4f 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP03_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
@@ -42,9 +41,6 @@
// global NVS and variables
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
- // General Purpose Events
- //#include "acpi/gpe.asl"
-
#include <cpu/intel/model_206ax/acpi/cpu.asl>
Scope (\_SB) {
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index f8c9dae..14e1960 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -56,14 +56,6 @@
connected to anything and hence we don't init it.
*/
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0x42, 0x142);
}
// mainboard_enable is executed as first thing after
diff --git a/src/mainboard/lenovo/x200/acpi/gpe.asl b/src/mainboard/lenovo/x200/acpi/gpe.asl
index cc6075f..3120caf 100644
--- a/src/mainboard/lenovo/x200/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x200/acpi/gpe.asl
@@ -26,18 +26,4 @@
/* Read EC register to clear wake status */
Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
}
-
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP04.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP04.HPCS)
- If (\_SB.PCI0.RP04.PDC)
- {
- Store (0x01, \_SB.PCI0.RP04.PDC)
- Notify (\_SB.PCI0.RP04, 0x00)
- }
- }
- }
}
diff --git a/src/mainboard/lenovo/x200/devicetree.cb b/src/mainboard/lenovo/x200/devicetree.cb
index 376273a..acc6c3a 100644
--- a/src/mainboard/lenovo/x200/devicetree.cb
+++ b/src/mainboard/lenovo/x200/devicetree.cb
@@ -71,6 +71,7 @@
# Set power limits to 10 * 10^0 watts.
# Maybe we should set less for Mini PCIe.
register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }"
+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
diff --git a/src/mainboard/lenovo/x200/dsdt.asl b/src/mainboard/lenovo/x200/dsdt.asl
index eb6ce6d..0409e66 100644
--- a/src/mainboard/lenovo/x200/dsdt.asl
+++ b/src/mainboard/lenovo/x200/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP04_IS_EXPRESSCARD 1
#define DISPLAY_DEVICE_2_IS_LCD_SCREEN 1
DefinitionBlock(
diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index dcb4e16..1c0668f 100644
--- a/src/mainboard/lenovo/x200/romstage.c
+++ b/src/mainboard/lenovo/x200/romstage.c
@@ -77,14 +77,6 @@
int cbmem_initted;
u16 reg16;
- /* Enable expresscard hotplug events. */
- pci_write_config32(PCI_DEV (0, 0x1c, 3),
- 0xd8,
- pci_read_config32(PCI_DEV (0, 0x1c, 3), 0xd8)
- | (1 << 30));
- pci_write_config16(PCI_DEV (0, 0x1c, 3),
- 0x42, 0x141);
-
/* basic northbridge setup, including MMCONF BAR */
gm45_early_init();
diff --git a/src/mainboard/lenovo/x201/acpi/gpe.asl b/src/mainboard/lenovo/x201/acpi/gpe.asl
index 2f0ee16..b160b50 100644
--- a/src/mainboard/lenovo/x201/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x201/acpi/gpe.asl
@@ -27,18 +27,4 @@
/* Read EC register to clear wake status */
Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
}
-
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP04.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP04.HPCS)
- If (\_SB.PCI0.RP04.PDC)
- {
- Store (0x01, \_SB.PCI0.RP04.PDC)
- Notify (\_SB.PCI0.RP04, 0x00)
- }
- }
- }
}
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index 3005077..614245c 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -122,6 +122,8 @@
register "c2_latency" = "1"
register "docking_supported" = "1"
+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
+
device pci 16.2 on # IDE/SATA
subsystemid 0x17aa 0x2161
end
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index 62616a8..5265a91 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP04_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 5b76be2..a58d415 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -102,14 +102,6 @@
connected to anything and hence we don't init it.
*/
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0x42, 0x142);
}
static void fill_ssdt(void)
diff --git a/src/mainboard/lenovo/x220/acpi/gpe.asl b/src/mainboard/lenovo/x220/acpi/gpe.asl
deleted file mode 100644
index 80bee71..0000000
--- a/src/mainboard/lenovo/x220/acpi/gpe.asl
+++ /dev/null
@@ -1,13 +0,0 @@
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP04.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP04.HPCS)
- If (\_SB.PCI0.RP04.PDC)
- {
- Store (0x01, \_SB.PCI0.RP04.PDC)
- Notify (\_SB.PCI0.RP04, 0x00)
- }
- }
- }
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 3edbb87..c1bea43 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -74,6 +74,8 @@
register "gen2_dec" = "0x0c15e1"
register "gen4_dec" = "0x0c06a1"
+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
+
# Enable zero-based linear PCIe root port functions
register "pcie_port_coalesce" = "1"
diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl
index b6b4b33..85e2b4f 100644
--- a/src/mainboard/lenovo/x220/dsdt.asl
+++ b/src/mainboard/lenovo/x220/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP04_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
@@ -42,9 +41,6 @@
// global NVS and variables
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
- // General Purpose Events
- //#include "acpi/gpe.asl"
-
#include <cpu/intel/model_206ax/acpi/cpu.asl>
Scope (\_SB) {
diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c
index 00e7991..2fdc204 100644
--- a/src/mainboard/lenovo/x220/mainboard.c
+++ b/src/mainboard/lenovo/x220/mainboard.c
@@ -59,14 +59,6 @@
connected to anything and hence we don't init it.
*/
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
- 0x42, 0x142);
}
// mainboard_enable is executed as first thing after
diff --git a/src/mainboard/lenovo/x230/acpi/gpe.asl b/src/mainboard/lenovo/x230/acpi/gpe.asl
deleted file mode 100644
index eb489d5..0000000
--- a/src/mainboard/lenovo/x230/acpi/gpe.asl
+++ /dev/null
@@ -1,13 +0,0 @@
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP03.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP03.HPCS)
- If (\_SB.PCI0.RP03.PDC)
- {
- Store (0x01, \_SB.PCI0.RP03.PDC)
- Notify (\_SB.PCI0.RP03, 0x00)
- }
- }
- }
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index 256586b..c44a2b7 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -74,6 +74,8 @@
register "gen2_dec" = "0x0c15e1"
register "gen4_dec" = "0x0c06a1"
+ register "pcie_hotplug_map" = "{ 0, 0, 1, 0, 0, 0, 0, 0 }"
+
# Enable zero-based linear PCIe root port functions
register "pcie_port_coalesce" = "1"
register "c2_latency" = "101" # c2 not supported
diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl
index c73f795..85e2b4f 100644
--- a/src/mainboard/lenovo/x230/dsdt.asl
+++ b/src/mainboard/lenovo/x230/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP03_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
@@ -42,9 +41,6 @@
// global NVS and variables
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
- // General Purpose Events
- //#include "acpi/gpe.asl"
-
#include <cpu/intel/model_206ax/acpi/cpu.asl>
Scope (\_SB) {
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index a060015..da0aa65 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -60,14 +60,6 @@
connected to anything and hence we don't init it.
*/
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0x42, 0x142);
}
// mainboard_enable is executed as first thing after