From 3b0eb602b99f5f3ae3137263b6040f78a314c2aa Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 31 Jan 2019 22:47:09 +0100 Subject: nb/intel/gm45: Use a common romstage This moves a lot of the common romstage boilerplate code to a common location, while adding a few mainboard specific hooks. Another difference is that the settings for enable_igd and enable_peg are now based on the static devicetree settings. Change-Id: I30ef7f6962aabde78b5c40e0b53bb85e01c254c1 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/31190 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/northbridge/intel/gm45/Makefile.inc | 1 + src/northbridge/intel/gm45/gm45.h | 7 ++ src/northbridge/intel/gm45/romstage.c | 135 ++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 src/northbridge/intel/gm45/romstage.c (limited to 'src/northbridge/intel/gm45') diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc index 95b360ce4c..16a9ddb648 100644 --- a/src/northbridge/intel/gm45/Makefile.inc +++ b/src/northbridge/intel/gm45/Makefile.inc @@ -27,6 +27,7 @@ romstage-y += igd.c romstage-y += pm.c romstage-y += ram_calc.c romstage-y += iommu.c +romstage-y += romstage.c ramstage-y += acpi.c diff --git a/src/northbridge/intel/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h index 736d6af6bd..0096793c23 100644 --- a/src/northbridge/intel/gm45/gm45.h +++ b/src/northbridge/intel/gm45/gm45.h @@ -436,6 +436,13 @@ u32 decode_tseg_size(u8 esmramc); void init_iommu(void); +/* romstage mainboard hookups */ +void mb_setup_lpc(void); +void mb_setup_superio(void); /* optional */ +void get_mb_spd_addrmap(u8 spd_addrmap[4]); +void mb_pre_raminit_setup(sysinfo_t *); /* optional */ +void mb_post_raminit_setup(void); /* optional */ + struct blc_pwm_t { char ascii_string[13]; int pwm_freq; /* In Hz */ diff --git a/src/northbridge/intel/gm45/romstage.c b/src/northbridge/intel/gm45/romstage.c new file mode 100644 index 0000000000..6d652bb8d8 --- /dev/null +++ b/src/northbridge/intel/gm45/romstage.c @@ -0,0 +1,135 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2007-2010 coresystems GmbH + * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. + * Copyright (C) 2014 Vladimir Serbinenko + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LPC_DEV PCI_DEV(0, 0x1f, 0) +#define MCH_DEV PCI_DEV(0, 0, 0) + +void __weak mb_setup_superio(void) +{ +} + +void __weak mb_pre_raminit_setup(sysinfo_t *sysinfo) +{ +} + +void __weak mb_post_raminit_setup(void) +{ +} + +/* Platform has no romstage entry point under mainboard directory, + * so this one is named with prefix mainboard. + */ +void mainboard_romstage_entry(unsigned long bist) +{ + sysinfo_t sysinfo; + int s3resume = 0; + int cbmem_initted; + u16 reg16; + + /* basic northbridge setup, including MMCONF BAR */ + gm45_early_init(); + + if (bist == 0) + enable_lapic(); + + /* First, run everything needed for console output. */ + i82801ix_early_init(); + setup_pch_gpios(&mainboard_gpio_map); + + mb_setup_lpc(); + + mb_setup_superio(); + + console_init(); + report_bist_failure(bist); + + reg16 = pci_read_config16(LPC_DEV, D31F0_GEN_PMCON_3); + pci_write_config16(LPC_DEV, D31F0_GEN_PMCON_3, reg16); + if ((MCHBAR16(SSKPD_MCHBAR) == 0xCAFE) && !(reg16 & (1 << 9))) { + printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n"); + gm45_early_reset(); + } + + /* ASPM related setting, set early by original BIOS. */ + DMIBAR16(0x204) &= ~(3 << 10); + + /* Check for S3 resume. */ + const u32 pm1_cnt = inl(DEFAULT_PMBASE + 0x04); + if (((pm1_cnt >> 10) & 7) == 5) { + if (acpi_s3_resume_allowed()) { + printk(BIOS_DEBUG, "Resume from S3 detected.\n"); + s3resume = 1; + /* Clear SLP_TYPE. This will break stage2 but + * we care for that when we get there. + */ + outl(pm1_cnt & ~(7 << 10), DEFAULT_PMBASE + 0x04); + } else { + printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n"); + } + } + + /* RAM initialization */ + enter_raminit_or_reset(); + memset(&sysinfo, 0, sizeof(sysinfo)); + get_mb_spd_addrmap(sysinfo.spd_map); + const struct device *dev; + dev = pcidev_on_root(2, 0); + if (dev) + sysinfo.enable_igd = dev->enabled; + dev = pcidev_on_root(1, 0); + if (dev) + sysinfo.enable_peg = dev->enabled; + get_gmch_info(&sysinfo); + + mb_pre_raminit_setup(&sysinfo); + + raminit(&sysinfo, s3resume); + + mb_post_raminit_setup(); + + const u32 deven = pci_read_config32(MCH_DEV, D0F0_DEVEN); + /* Disable D4F0 (unknown signal controller). */ + pci_write_config32(MCH_DEV, D0F0_DEVEN, deven & ~0x4000); + + init_pm(&sysinfo, 0); + + i82801ix_dmi_setup(); + gm45_late_init(sysinfo.stepping); + i82801ix_dmi_poll_vc1(); + + MCHBAR16(SSKPD_MCHBAR) = 0xCAFE; + + init_iommu(); + + cbmem_initted = !cbmem_recovery(s3resume); + + romstage_handoff_init(cbmem_initted && s3resume); + + printk(BIOS_SPEW, "exit main()\n"); +} -- cgit v1.2.3