May 2015 - SerialICE - mail.coreboot.org

Patch set updated for serialice: a7ef3a8 X61: Add filters
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10327 -gerrit commit a7ef3a82ef25812711f0456509519470f681f05b Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Wed May 27 22:18:40 2015 +0200 X61: Add filters Work with x60 mainboard support, just: ln -s lenovo_x61.lua SerialICE/simba/mainboard/lenovo_x60.lua TODO: Something more clever instead of the above Change-Id: I542e4fce26737be4437544b6ef4b6b5e6ea8d296 Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/mainboard/lenovo_x61.lua | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/SerialICE/simba/mainboard/lenovo_x61.lua b/SerialICE/simba/mainboard/lenovo_x61.lua new file mode 100644 index 0000000..2d59b1c --- /dev/null +++ b/SerialICE/simba/mainboard/lenovo_x61.lua @@ -0,0 +1,54 @@ +-- For X61, chop off the bottom 2M: dd if=x61 bs=2048k skip=1 of=x61.2m +-- Dies shortly after raminit + +function mainboard_io_pre(f, action) + -- src/mainboard/lenovo/x60/dock.c dock_connect(): + -- Firmware attempts toggling the D_PLTRST GPIO pin, + -- disconnecting the dock we're connecting through + if action.write and action.addr == 0x1680 then + ignore_action(f, action) + return drop_action(f, action, 0) + end +end + +function mainboard_io_post(f, action) + if action.write and action.addr == 0x1680 then + return true + end +end + +filter_mainboard = { + name = "X61", + pre = mainboard_io_pre, + post = mainboard_io_post, + hide = hide_mainboard_io, + base = 0x0, + size = 0x10000 +} + +load_filter("i82801") +load_filter("intel_bars") + +function do_mainboard_setup() + do_default_setup() + + enable_hook_pc80() + -- Reasonably similar to ICH8/i82801hx + enable_hook_i82801gx() + + enable_hook(io_hooks, filter_pci_io_cfg) + enable_hook(mem_hooks, filter_lapic) + enable_hook(mem_hooks, filter_ioapic) + + enable_hook(cpumsr_hooks, filter_intel_microcode) + enable_hook(cpuid_hooks, filter_multiprocessor) + + -- i965 happens to have 64-bit BARs too, on the same addresses + northbridge_i946() + + enable_ram() + new_car_region(0xffde0000, 0x2000) + + -- Apply mainboard hooks last, so they are the first ones to check + enable_hook(io_hooks, filter_mainboard) +end

1 0

Patch set updated for serialice: a7a4b25 X61: Add filters
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10327 -gerrit commit a7a4b2527b8ae81050158e8f288b775222a302b7 Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Wed May 27 22:18:40 2015 +0200 X61: Add filters Work with x60 mainboard support, just: ln -s lenovo_x61.lua SerialICE/simba/mainboard/lenovo_x60.lua TODO: Something more clever instead of the above Change-Id: I542e4fce26737be4437544b6ef4b6b5e6ea8d296 Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/mainboard/lenovo_x61.lua | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/SerialICE/simba/mainboard/lenovo_x61.lua b/SerialICE/simba/mainboard/lenovo_x61.lua new file mode 100644 index 0000000..41bde01 --- /dev/null +++ b/SerialICE/simba/mainboard/lenovo_x61.lua @@ -0,0 +1,54 @@ +-- For X61, chop off the bottom 2M: dd if=x61 bs=2048k skip=1 of=x61.2m +-- Dies shortly after raminit + +function mainboard_io_pre(f, action) + -- src/mainboard/lenovo/x60/dock.c dock_connect(): + -- Firmware attempts toggling the D_PLTRST GPIO pin, + -- disconnecting the dock we're connecting through + if action.write and action.addr == 0x1680 then + ignore_action(f, action) + return drop_action(f, action, 0) + end +end + +function mainboard_io_post(f, action) + if action.write and action.addr == 0x1680 then + return true + end +end + +filter_mainboard = { + name = "X60", + pre = mainboard_io_pre, + post = mainboard_io_post, + hide = hide_mainboard_io, + base = 0x0, + size = 0x10000 +} + +load_filter("i82801") +load_filter("intel_bars") + +function do_mainboard_setup() + do_default_setup() + + enable_hook_pc80() + -- Reasonably similar to ICH8/i82801hx + enable_hook_i82801gx() + + enable_hook(io_hooks, filter_pci_io_cfg) + enable_hook(mem_hooks, filter_lapic) + enable_hook(mem_hooks, filter_ioapic) + + enable_hook(cpumsr_hooks, filter_intel_microcode) + enable_hook(cpuid_hooks, filter_multiprocessor) + + -- i965 happens to have 64-bit BARs too, on the same addresses + northbridge_i946() + + enable_ram() + new_car_region(0xffde0000, 0x2000) + + -- Apply mainboard hooks last, so they are the first ones to check + enable_hook(io_hooks, filter_mainboard) +end

1 0

New patch to review for serialice: 1189098 X60: Add filters
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10327 -gerrit commit 1189098e2ac0b9301b5a196c95a09326e388f438 Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Wed May 27 22:18:40 2015 +0200 X60: Add filters Change-Id: I542e4fce26737be4437544b6ef4b6b5e6ea8d296 Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/mainboard/lenovo_x60.lua | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/SerialICE/simba/mainboard/lenovo_x60.lua b/SerialICE/simba/mainboard/lenovo_x60.lua new file mode 100644 index 0000000..41bde01 --- /dev/null +++ b/SerialICE/simba/mainboard/lenovo_x60.lua @@ -0,0 +1,54 @@ +-- For X61, chop off the bottom 2M: dd if=x61 bs=2048k skip=1 of=x61.2m +-- Dies shortly after raminit + +function mainboard_io_pre(f, action) + -- src/mainboard/lenovo/x60/dock.c dock_connect(): + -- Firmware attempts toggling the D_PLTRST GPIO pin, + -- disconnecting the dock we're connecting through + if action.write and action.addr == 0x1680 then + ignore_action(f, action) + return drop_action(f, action, 0) + end +end + +function mainboard_io_post(f, action) + if action.write and action.addr == 0x1680 then + return true + end +end + +filter_mainboard = { + name = "X60", + pre = mainboard_io_pre, + post = mainboard_io_post, + hide = hide_mainboard_io, + base = 0x0, + size = 0x10000 +} + +load_filter("i82801") +load_filter("intel_bars") + +function do_mainboard_setup() + do_default_setup() + + enable_hook_pc80() + -- Reasonably similar to ICH8/i82801hx + enable_hook_i82801gx() + + enable_hook(io_hooks, filter_pci_io_cfg) + enable_hook(mem_hooks, filter_lapic) + enable_hook(mem_hooks, filter_ioapic) + + enable_hook(cpumsr_hooks, filter_intel_microcode) + enable_hook(cpuid_hooks, filter_multiprocessor) + + -- i965 happens to have 64-bit BARs too, on the same addresses + northbridge_i946() + + enable_ram() + new_car_region(0xffde0000, 0x2000) + + -- Apply mainboard hooks last, so they are the first ones to check + enable_hook(io_hooks, filter_mainboard) +end

1 0

New patch to review for serialice: ead0858 i82801: protect serial port in DLPC superio too
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10326 -gerrit commit ead085840f7ca43292ac3660327d1e592693a756 Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Wed May 27 22:17:23 2015 +0200 i82801: protect serial port in DLPC superio too Change-Id: I6de2fbbc269fb070e56aa37c6e4e1c296fcbc1ec Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/chipset/i82801.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SerialICE/simba/chipset/i82801.lua b/SerialICE/simba/chipset/i82801.lua index 40be0f9..e27509c 100644 --- a/SerialICE/simba/chipset/i82801.lua +++ b/SerialICE/simba/chipset/i82801.lua @@ -166,7 +166,10 @@ function enable_gx_lpc_bars() pci_cfg32_hook(dev_power, 0x84, "LPC", lpc_io_bar) pci_cfg32_hook(dev_power, 0x88, "LPC", lpc_io_bar) - pci_cfg32_hook(dev_power, 0x8c, "LPC", lpc_io_bar) + -- The GPIO range 0x1680-0x169f is forwarded to DLPC via this DRR. + -- We want our own hook for that range so that we can mask out D_PLTRST + -- toggle, ignore it here. + pci_cfg32_hook(dev_power, 0x8c, "LPC", lpc_protect_serial_port) pci_cfg32_hook(dev_power, 0x90, "LPC", lpc_io_bar) end

1 0

New patch to review for serialice: f0907b4 pc80: fix "number has no integer representation"
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10324 -gerrit commit f0907b43d60e1dae72e4aa254d17a276803d6703 Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Mon May 25 07:17:25 2015 +0200 pc80: fix "number has no integer representation" For the value of init == 80: lua: output.lua:6: bad argument #2 to 'format' (number has no integer representation) stack traceback: [C]: in function 'string.format' output.lua:6: in function 'printf' output.lua:64: in function 'printk' chipset/pc80.lua:213: in function 'i8254_post' hooks.lua:122: in function 'walk_post_hooks' replay.lua:24: in function 'replay_io' replay.lua:74: in function 'parse_io' replay.lua:250: in function 'parse_file' replay.lua:269: in main chunk [C]: in ? Change-Id: Iac92f0f378fec3b9dbb93fe4158cb4ffdd3a1f4a Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/chipset/pc80.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialICE/simba/chipset/pc80.lua b/SerialICE/simba/chipset/pc80.lua index 454bdda..a1e3fdc 100644 --- a/SerialICE/simba/chipset/pc80.lua +++ b/SerialICE/simba/chipset/pc80.lua @@ -210,7 +210,7 @@ function i8254_post(f, action) elseif reg == 2 then if period ~= 0 then local spktone = 1193000 / f.counter[reg].init - printk(f, action, "Speaker Tone (%s): %d kHz\n", modestr, spktone) + printk(f, action, "Speaker Tone (%s): %f kHz\n", modestr, spktone) end end else

1 0

New patch to review for serialice: d22929f smbus: ignore the least significant f.host.slave bit
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10325 -gerrit commit d22929f77f45fe795f425c6c460850d15816725e Author: Lubomir Rintel <lkundrak(a)v3.sk> Date: Mon May 25 07:46:37 2015 +0200 smbus: ignore the least significant f.host.slave bit It's the transaction direction. lua: chipset/smbus_host.lua:155: bad argument #2 to 'format' (number has no integer representation) stack traceback: [C]: in function 'string.format' chipset/smbus_host.lua:155: in upvalue 'dump_transaction' chipset/smbus_host.lua:271: in upvalue 'host_change_state' chipset/smbus_host.lua:288: in upvalue 'host_switch' chipset/smbus_host.lua:368: in upvalue 'host_sync' chipset/smbus_host.lua:445: in field 'data_read' chipset/smbus_host.lua:511: in field 'update_register' chipset/intel_smbus.lua:195: in upvalue 'intel_smbus_host_access' chipset/intel_smbus.lua:232: in function 'intel_smbus_host_post' hooks.lua:122: in function 'walk_post_hooks' replay.lua:24: in function 'replay_io' replay.lua:76: in function 'parse_io' replay.lua:250: in function 'parse_file' replay.lua:269: in main chunk [C]: in ? Change-Id: Ia482fc745060c0f84f8147912bf0123d81f3f893 Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- SerialICE/simba/chipset/smbus_host.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialICE/simba/chipset/smbus_host.lua b/SerialICE/simba/chipset/smbus_host.lua index f8baf2e..13049cc 100644 --- a/SerialICE/simba/chipset/smbus_host.lua +++ b/SerialICE/simba/chipset/smbus_host.lua @@ -152,7 +152,7 @@ local function dump_transaction(f, action) end - local dump = string.format("%02x %s ", f.host.slave / 2, proto_name[f.host.proto]) + local dump = string.format("%02x %s ", f.host.slave >> 1, proto_name[f.host.proto]) if host_proto(f, SMBUS_QUICK) then

1 0

Patch set updated for serialice: bae9494 Add support for Lenovo X60.
by Lubomir Rintel May 27, 2015

May 27, 2015

Lubomir Rintel (lkundrak(a)v3.sk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3260 -gerrit commit bae94942a6410bab21cf2326840683285101dc3e Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Thu May 16 23:40:24 2013 +0200 Add support for Lenovo X60. Change-Id: I105c69ae53b3735fd60e7461f8f64078e8fef15c Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- SerialICE/Kconfig | 4 + SerialICE/mainboard/lenovo_x60.c | 362 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 366 insertions(+) diff --git a/SerialICE/Kconfig b/SerialICE/Kconfig index b384928..6f8df67 100644 --- a/SerialICE/Kconfig +++ b/SerialICE/Kconfig @@ -137,6 +137,9 @@ config BOARD_VIA_EPIA_M850 config BOARD_WYSE_S50 bool "WYSE S50" +config BOARD_LENOVO_X60 + bool "Lenovo X60" + endchoice config BOARD_INIT @@ -172,6 +175,7 @@ config BOARD_INIT default "asrock_775i65g.c" if BOARD_ASROCK_775I65G default "commell_lv_672.c" if BOARD_COMMELL_LV_672 default "jetway_nf81_t56n_lf.c" if BOARD_JETWAY_NF81_T56N_LF + default "lenovo_x60.c" if BOARD_LENOVO_X60 config SOUTHBRIDGE_INIT string diff --git a/SerialICE/mainboard/lenovo_x60.c b/SerialICE/mainboard/lenovo_x60.c new file mode 100644 index 0000000..68a9d5a --- /dev/null +++ b/SerialICE/mainboard/lenovo_x60.c @@ -0,0 +1,362 @@ +/* + * SerialICE + * + * Adapted by: + * Copyright (C) 2013 Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> + * from Coreboot's src/mainboard/lenovo/x60/romstage.c which has: + * Copyright (C) 2007-2009 coresystems GmbH + * Copyright (C) 2011 Sven Schnelle <svens(a)stackframe.org> + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#define PC87392_GPIO_PIN_DEBOUNCE 0x40 +#define PC87392_GPIO_PIN_PULLUP 0x04 +#define PC87392_GPIO_PIN_TRIGGERS_SMI 0x02 +#define PC87392_GPIO_PIN_OE 0x01 +#define PC87392_GPIO_PIN_TYPE_PUSH_PULL 0x02 +#define PNP_IDX_IO0 0x60 +#define BCTRL 0x3e +#define SBR (1 << 6) +#define DEFAULT_GPIOBASE 0x0480 + +#define PNP_DEV(PORT, FUNC) (((PORT) << 8) | (FUNC)) + +typedef unsigned device_t; +typedef unsigned char uint8_t; + +const char boardname[33]="Lenovo X60 "; + +void udelay(unsigned usecs) +{ + int i; + for(i = 0; i < usecs; i++) + inb(0x80); +} + +static u8 dock_read_register(int reg) +{ + outb(reg, 0x2e); + return inb(0x2f); +} + +static void dlpc_write_register(int reg, int value) +{ + outb(reg, 0x164e); + outb(value, 0x164f); +} + +static void dock_write_register(int reg, int value) +{ + outb(reg, 0x2e); + outb(value, 0x2f); +} + +static void dock_gpio_set_mode(int port, int mode, int irq) +{ + dock_write_register(0xf0, port); + dock_write_register(0xf1, mode); + dock_write_register(0xf2, irq); +} + +int dock_connect(void) +{ + int timeout = 1000; + + outb(0x07, 0x164c); + + timeout = 1000; + + while(!(inb(0x164c) & 8) && timeout--) + udelay(1000); + + if (!timeout) { + /* docking failed, disable DLPC switch */ + outb(0x00, 0x164c); + dlpc_write_register(0x30, 0x00); + return 1; + } + + /* Assert D_PLTRST# */ + outb(0xfe, 0x1680); + udelay(100000); + /* Deassert D_PLTRST# */ + outb(0xff, 0x1680); + + udelay(100000); + + /* startup 14.318MHz Clock */ + dock_write_register(0x29, 0x06); + /* wait until clock is settled */ + timeout = 1000; + while(!(dock_read_register(0x29) & 0x08) && timeout--) + udelay(1000); + + if (!timeout) + return 1; + + /* Pin 6: CLKRUN + * Pin 72: #DR1 + * Pin 19: #SMI + * Pin 73: #MTR + */ + dock_write_register(0x24, 0x37); + + /* PNF active HIGH */ + dock_write_register(0x25, 0xa0); + + /* disable FDC */ + dock_write_register(0x26, 0x01); + + /* Enable GPIO IRQ to #SMI */ + dock_write_register(0x28, 0x02); + + /* select GPIO */ + dock_write_register(0x07, 0x07); + + /* set base address */ + dock_write_register(0x60, 0x16); + dock_write_register(0x61, 0x20); + + /* init GPIO pins */ + dock_gpio_set_mode(0x00, PC87392_GPIO_PIN_DEBOUNCE | + PC87392_GPIO_PIN_PULLUP, 0x00); + + dock_gpio_set_mode(0x01, PC87392_GPIO_PIN_DEBOUNCE | + PC87392_GPIO_PIN_PULLUP, + PC87392_GPIO_PIN_TRIGGERS_SMI); + + dock_gpio_set_mode(0x02, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x03, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x04, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x05, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x06, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x07, PC87392_GPIO_PIN_PULLUP, 0x02); + + dock_gpio_set_mode(0x10, PC87392_GPIO_PIN_DEBOUNCE | + PC87392_GPIO_PIN_PULLUP, + PC87392_GPIO_PIN_TRIGGERS_SMI); + + dock_gpio_set_mode(0x11, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x12, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x13, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x14, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x15, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x16, PC87392_GPIO_PIN_PULLUP | + PC87392_GPIO_PIN_OE , 0x00); + + dock_gpio_set_mode(0x17, PC87392_GPIO_PIN_PULLUP, 0x00); + + dock_gpio_set_mode(0x20, PC87392_GPIO_PIN_TYPE_PUSH_PULL | + PC87392_GPIO_PIN_OE, 0x00); + + dock_gpio_set_mode(0x21, PC87392_GPIO_PIN_TYPE_PUSH_PULL | + PC87392_GPIO_PIN_OE, 0x00); + + dock_gpio_set_mode(0x22, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x23, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x24, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x25, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x26, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x27, PC87392_GPIO_PIN_PULLUP, 0x00); + + dock_gpio_set_mode(0x30, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x31, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x32, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x33, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x34, PC87392_GPIO_PIN_PULLUP, 0x00); + + dock_gpio_set_mode(0x35, PC87392_GPIO_PIN_PULLUP | + PC87392_GPIO_PIN_OE, 0x00); + + dock_gpio_set_mode(0x36, PC87392_GPIO_PIN_PULLUP, 0x00); + dock_gpio_set_mode(0x37, PC87392_GPIO_PIN_PULLUP, 0x00); + + /* enable GPIO */ + dock_write_register(0x30, 0x01); + + outb(0x00, 0x1628); + outb(0x00, 0x1623); + outb(0x82, 0x1622); + outb(0xff, 0x1624); + + /* Enable USB and Ultrabay power */ + outb(0x03, 0x1628); + + dock_write_register(0x07, 0x03); + dock_write_register(0x30, 0x01); + + return 0; +} + +void pnp_write_config(device_t dev, uint8_t reg, uint8_t value) +{ + unsigned port = dev >> 8; + outb(reg, port ); + outb(value, port +1); +} +uint8_t pnp_read_config(device_t dev, uint8_t reg) +{ + unsigned port = dev >> 8; + outb(reg, port); + return inb(port +1); +} + +void pnp_set_iobase(device_t dev, unsigned index, unsigned iobase) +{ + pnp_write_config(dev, index + 0, (iobase >> 8) & 0xff); + pnp_write_config(dev, index + 1, iobase & 0xff); +} + +#if 0 //TODO +void pnp_set_logical_device(device_t dev) +{ + unsigned device = dev & 0xff; + pnp_write_config(dev, 0x07, device); +} +#endif +static void early_superio_config(void) +{ + int timeout = 100000; + device_t dev = PNP_DEV(0x2e, 3); + + pnp_write_config(dev, 0x29, 0x06); + + while (!(pnp_read_config(dev, 0x29) & 0x08) && timeout--) + udelay(1000); + + /* Enable COM1 */ + pnp_set_logical_device(0x2e, 3); + pnp_set_iobase(dev, PNP_IDX_IO0, 0x3f8); + pnp_set_enable(dev, 1); +} + +static void ich7_enable_lpc(void) +{ + // Enable Serial IRQ + pci_write_config8(PCI_ADDR(0, 0x1f, 0, 0x64), 0xd0); + // decode range + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x80), 0x0210); + // decode range + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x82), 0x1f0d); + + /* range 0x1600 - 0x167f */ + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x84), 0x1601); + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x86), 0x007c); + + /* range 0x15e0 - 0x10ef */ + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x88), 0x15e1); + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x8a), 0x000c); + + /* range 0x1680 - 0x169f */ + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x8c), 0x1681); + pci_write_config16(PCI_ADDR(0, 0x1f, 0, 0x8e), 0x001c); +} + +static void dlpc_gpio_set_mode(int port, int mode) +{ + dlpc_write_register(0xf0, port); + dlpc_write_register(0xf1, mode); +} + +static void dlpc_gpio_init(void) +{ + /* Select GPIO module */ + dlpc_write_register(0x07, 0x07); + /* GPIO Base Address 0x1680 */ + dlpc_write_register(0x60, 0x16); + dlpc_write_register(0x61, 0x80); + + /* Activate GPIO */ + dlpc_write_register(0x30, 0x01); + + dlpc_gpio_set_mode(0x00, 3); + dlpc_gpio_set_mode(0x01, 3); + dlpc_gpio_set_mode(0x02, 0); + dlpc_gpio_set_mode(0x03, 3); + dlpc_gpio_set_mode(0x04, 4); + dlpc_gpio_set_mode(0x20, 4); + dlpc_gpio_set_mode(0x21, 4); + dlpc_gpio_set_mode(0x23, 4); +} + + +static void southbridge_init(void) +{ +#if 0 //TODO + if (bist == 0) + enable_lapic(); +#endif + /* Force PCIRST# */ + pci_write_config16(PCI_ADDR(0, 0x1e, 0, BCTRL), SBR); + udelay(200 * 1000); + pci_write_config16(PCI_ADDR(0, 0x1e, 0, BCTRL), 0); + + ich7_enable_lpc(); +} + +int dock_present(void) +{ + return !((inb(DEFAULT_GPIOBASE + 0x0c) >> 13) & 1); +} + +static u8 dlpc_read_register(int reg) +{ + outb(reg, 0x164e); + return inb(0x164f); +} + +int dlpc_init(void) +{ + int timeout = 1000; + + /* Enable 14.318MHz CLK on CLKIN */ + dlpc_write_register(0x29, 0xa0); + while(!(dlpc_read_register(0x29) & 0x10) && timeout--) + udelay(1000); + + if (!timeout) + return 1; + + /* Select DLPC module */ + dlpc_write_register(0x07, 0x19); + /* DLPC Base Address 0x164c */ + dlpc_write_register(0x60, 0x16); + dlpc_write_register(0x61, 0x4c); + /* Activate DLPC */ + dlpc_write_register(0x30, 0x01); + + dlpc_gpio_init(); + + return 0; +} + +static void superio_init(void) +{ + dlpc_init(); + /* dock_init initializes the DLPC switch on + * thinpad side, so this is required even + * if we're undocked. + */ + if (dock_present()) { + dock_connect(); + early_superio_config(); + } +} + +static void chipset_init(void) +{ + southbridge_init(); + superio_init(); +}

1 0