coreboot-gerrit June 2024

coreboot-gerrit@coreboot.org

1 participants
3527 discussions

[XS] Change in coreboot[main]: Revert "Makefile: Warn if flexible array members are not at the end"
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Attention is currently required from: Elyes Haouas, Felix Singer, Jan Samek, Martin L Roth, Maximilian Brune. Nico Huber has posted comments on this change by Elyes Haouas. ( https://review.coreboot.org/c/coreboot/+/82758?usp=email ) Change subject: Revert "Makefile: Warn if flexible array members are not at the end" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/82758?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I179d0bc0db3e863645ae4c87e1534c5c20025dfb Gerrit-Change-Number: 82758 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Jan Samek <samekh(a)email.cz> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Attention: Jan Samek <samekh(a)email.cz> Gerrit-Attention: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Comment-Date: Sun, 02 Jun 2024 23:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in coreboot[main]: cpu/via/c7: Compress ramstage with LZ4 by default
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82772?usp=email ) Change subject: cpu/via/c7: Compress ramstage with LZ4 by default ...................................................................... cpu/via/c7: Compress ramstage with LZ4 by default It's a slow CPU. Change-Id: I0bf75f410c1d9134f05a2d11b8d011499a7cf794 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/via/c7/Kconfig 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/82772/1 diff --git a/src/cpu/via/c7/Kconfig b/src/cpu/via/c7/Kconfig index b6a970b..0d5fd8f 100644 --- a/src/cpu/via/c7/Kconfig +++ b/src/cpu/via/c7/Kconfig @@ -8,6 +8,7 @@ select UNKNOWN_TSC_RATE select UDELAY_LAPIC select LAPIC_MONOTONIC_TIMER + select MB_COMPRESS_RAMSTAGE_LZ4 if CPU_VIA_C7 -- To view, visit https://review.coreboot.org/c/coreboot/+/82772?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I0bf75f410c1d9134f05a2d11b8d011499a7cf794 Gerrit-Change-Number: 82772 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[S] Change in coreboot[main]: cpu/via/c7: Use the simple p4-netburst CAR teardown
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82771?usp=email ) Change subject: cpu/via/c7: Use the simple p4-netburst CAR teardown ...................................................................... cpu/via/c7: Use the simple p4-netburst CAR teardown Change-Id: Icba7586145fbfd859d738ecd7a407739a7024ebb Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/via/c7/Makefile.mk D src/cpu/via/car/exit_car.S 2 files changed, 1 insertion(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/82771/1 diff --git a/src/cpu/via/c7/Makefile.mk b/src/cpu/via/c7/Makefile.mk index e1e278c..c91441e 100644 --- a/src/cpu/via/c7/Makefile.mk +++ b/src/cpu/via/c7/Makefile.mk @@ -5,4 +5,4 @@ romstage-y += ../../intel/car/romstage.c -postcar-y += ../car/exit_car.S +postcar-y += ../../intel/car/p4-netburst/exit_car.S diff --git a/src/cpu/via/car/exit_car.S b/src/cpu/via/car/exit_car.S deleted file mode 100644 index 0f1b227..0000000 --- a/src/cpu/via/car/exit_car.S +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -.global chipset_teardown_car - -.code32 -chipset_teardown_car: - /* Return to caller. */ - jmp *%esp -- To view, visit https://review.coreboot.org/c/coreboot/+/82771?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Icba7586145fbfd859d738ecd7a407739a7024ebb Gerrit-Change-Number: 82771 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[XL] Change in coreboot[main]: nb/via/cx700: Implement raminit
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82770?usp=email ) Change subject: nb/via/cx700: Implement raminit ...................................................................... nb/via/cx700: Implement raminit This brings the old raminit implementation for CX700 back, mostly unmodified. Three minor issues are fixed: * A shift (>>= 2) was missing when reading tRRD from SPD byte 28. The fixed value matches what the vendor BIOS of a VIA EPIA-EX board programs. The code also suggests that we are looking for a small value (<= 19 for DDR2-533). * We allow the board port to specify which clock outputs should be enabled now. This is necessary for the VIA EPIA-EX, which needs the ALL_MCLKO setting (instead of the previously hard- coded MCLKO2. * When programming the DQS output delays, we considered the 1~2 rank values only for single-rank configurations. Changing the `< 2` to `<= 2` brings us closer to the vendor values on the VIA EPIA-EX. Otherwise a lot of cosmetics changed. Partly because the original code was to be #included into another C file, but also to satisfy checkpatch. Also, all the #if'd code was removed (32-bit width option, ECC, etc.). Change-Id: Ibc36b4f314cdf47f18c8be0fcb98218c50938e94 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/via/c7/Makefile.mk M src/mainboard/via/epia-ex/devicetree.cb M src/northbridge/via/cx700/Kconfig M src/northbridge/via/cx700/Makefile.mk A src/northbridge/via/cx700/chip.h A src/northbridge/via/cx700/memmap.c A src/northbridge/via/cx700/raminit.c A src/northbridge/via/cx700/raminit.h A src/northbridge/via/cx700/registers.h M src/northbridge/via/cx700/romstage.c 10 files changed, 1,800 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/82770/1 diff --git a/src/cpu/via/c7/Makefile.mk b/src/cpu/via/c7/Makefile.mk index 0890cee..e1e278c 100644 --- a/src/cpu/via/c7/Makefile.mk +++ b/src/cpu/via/c7/Makefile.mk @@ -3,4 +3,6 @@ bootblock-y += ../car/cache_as_ram.S bootblock-y += ../../intel/car/bootblock.c +romstage-y += ../../intel/car/romstage.c + postcar-y += ../car/exit_car.S diff --git a/src/mainboard/via/epia-ex/devicetree.cb b/src/mainboard/via/epia-ex/devicetree.cb index 3f76279..732d024 100644 --- a/src/mainboard/via/epia-ex/devicetree.cb +++ b/src/mainboard/via/epia-ex/devicetree.cb @@ -1,6 +1,14 @@ chip northbridge/via/cx700 device domain 0 on + + device ref dram_ctrl on + register "dram_cfg" = "{ + .spd_addr = { 0x50, }, + .mem_clocks = ALL_MCLKO, + }" + end + end end diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig index f2ba54e..4309719 100644 --- a/src/northbridge/via/cx700/Kconfig +++ b/src/northbridge/via/cx700/Kconfig @@ -6,6 +6,7 @@ select NO_ECAM_MMCONF_SUPPORT select HAVE_CF9_RESET select SOUTHBRIDGE_INTEL_COMMON_SMBUS + select HAVE_DEBUG_RAM_SETUP if NORTHBRIDGE_VIA_CX700 diff --git a/src/northbridge/via/cx700/Makefile.mk b/src/northbridge/via/cx700/Makefile.mk index a7af6fd..3b9608c 100644 --- a/src/northbridge/via/cx700/Makefile.mk +++ b/src/northbridge/via/cx700/Makefile.mk @@ -1,9 +1,13 @@ ## SPDX-License-Identifier: GPL-2.0-only ifeq ($(CONFIG_NORTHBRIDGE_VIA_CX700),y) +# raminit accesses addresses as low as 0 +CFLAGS_bootblock += --param=min-pagesize=0 +CFLAGS_romstage += --param=min-pagesize=0 + bootblock-y += early_smbus.c bootblock.c -romstage-y += early_smbus.c romstage.c -ramstage-y += chip.c +romstage-y += early_smbus.c memmap.c romstage.c raminit.c +ramstage-y += memmap.c chip.c all-y += clock.c reset.c endif diff --git a/src/northbridge/via/cx700/chip.h b/src/northbridge/via/cx700/chip.h new file mode 100644 index 0000000..6ebbc47 --- /dev/null +++ b/src/northbridge/via/cx700/chip.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __VIA_CX700_CHIP_H__ +#define __VIA_CX700_CHIP_H__ + +#define DIMM_SOCKETS 2 + +struct dram_cfg { + uint8_t spd_addr[DIMM_SOCKETS]; + enum { + MCLKO0, + MCLKO1, + MCLKO2, + ALL_MCLKO + } mem_clocks; +}; + +struct northbridge_via_cx700_config { + struct dram_cfg dram_cfg; +}; + +#endif diff --git a/src/northbridge/via/cx700/memmap.c b/src/northbridge/via/cx700/memmap.c new file mode 100644 index 0000000..b4ca8b1 --- /dev/null +++ b/src/northbridge/via/cx700/memmap.c @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#define __SIMPLE_DEVICE__ + +#include <commonlib/bsd/helpers.h> +#include <stddef.h> +#include <stdint.h> +#include <device/pci_ops.h> +#include <static_devices.h> +#include <arch/romstage.h> +#include <cbmem.h> + +static uintptr_t top_of_low_ram(void) +{ + return (uintptr_t)pci_read_config8(_sdev_dram_ctrl, 0x88) << 24; +} + +static size_t get_stolen_framebuffer_size(void) +{ + const size_t size_selection = pci_read_config8(_sdev_dram_ctrl, 0xa1) >> 4 & 7; + + return size_selection ? 1 << (size_selection + 22) : 0; +} + +static size_t get_tseg_size(void) +{ + return pci_read_config8(_sdev_dram_ctrl, 0x86) & 0x04 ? 1*MiB : 0; +} + +uintptr_t cbmem_top_chipset(void) +{ + /* Keep it below 2GiB to leave space for PCI MMIO. + If more than 2GiB are installed, CBMEM won't be + at the top of the available memory. */ + return MIN(2ul*GiB, top_of_low_ram() - get_stolen_framebuffer_size() - get_tseg_size()); +} + +void fill_postcar_frame(struct postcar_frame *pcf) +{ + /* TSEG top is at least 8MiB aligned, so + we cache 8MiB including TSEG if enabled. */ + const uintptr_t top_down = ALIGN_DOWN(cbmem_top_chipset() - 7*MiB, 8*MiB); + postcar_frame_add_mtrr(pcf, top_down, 8*MiB, MTRR_TYPE_WRBACK); +} diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c new file mode 100644 index 0000000..a4ec121 --- /dev/null +++ b/src/northbridge/via/cx700/raminit.c @@ -0,0 +1,1662 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <types.h> +#include <delay.h> +#include <spd.h> +#include <device/mmio.h> +#include <device/pci_ops.h> +#include <device/smbus_host.h> +#include <device/dram/common.h> +#include <static_devices.h> + +#include "chip.h" +#include "registers.h" +#include "raminit.h" + +struct mem_controller { + struct dram_cfg cfg; +}; + +#define SPD_MOD_ATTRIB_RANK 5 +#define SPD_MOD_ATTRIB_RANK_NUM_MASK 0x07 +#define SPD_PRI_WIDTH 13 +#define SPD_CAS_LAT 18 +#define SPD_CAS_LATx(x) (1 << (x)) +#define SPD_CAS_LAT_MIN_X_1 23 +#define SPD_CAS_LAT_MIN_X_2 25 +#define SPD_TRP 27 +#define SPD_TRRD 28 +#define SPD_TRCD 29 +#define SPD_TRAS 30 +#define SPD_RANK_SIZE 31 /* Only one bit is set */ +#define SPD_TWR 36 +#define SPD_TWTR 37 +#define SPD_TRTP 38 +#define SPD_EX_TRC_TRFC 40 +#define SPD_TRFC 42 + +#define RAM_COMMAND_NORMAL 0x0 +#define RAM_COMMAND_NOP 0x1 +#define RAM_COMMAND_PRECHARGE 0x2 +#define RAM_COMMAND_MRS 0x3 +#define RAM_COMMAND_CBR 0x4 + +#define HOSTCTRL _sdev_host_if +#define MEMCTRL _sdev_dram_ctrl +#define SCRATCH _sdev_pm_ctrl + +#define SDRAM1X_RA_14 31 +#define SDRAM1X_RA_13 30 +#define SDRAM1X_RA_12 29 +#define SDRAM1X_RA_12_8bk 27 +#define SDRAM1X_CA_12 16 +#define SDRAM1X_CA_11 15 +#define SDRAM1X_CA_09 12 +#define SDRAM1X_CA_09_8bk 12 +#define SDRAM1X_BA1 14 +#define SDRAM1X_BA2_8bk 15 +#define SDRAM1X_BA1_8bk 14 + +#define MA_Column 0x06 +#define MA_Bank 0x08 +#define MA_Row 0x30 +#define MA_4_Bank 0x00 +#define MA_8_Bank 0x08 +#define MA_12_Row 0x00 +#define MA_13_Row 0x10 +#define MA_14_Row 0x20 +#define MA_15_Row 0x30 +#define MA_9_Column 0x00 +#define MA_10_Column 0x02 +#define MA_11_Column 0x04 +#define MA_12_Column 0x06 + +static u8 get_spd_data(const struct dram_cfg *cfg, unsigned int socket, u8 reg) +{ + return cfg->spd_addr[socket] ? smbus_read_byte(cfg->spd_addr[socket], reg) : 0x00; +} + +#define GET_SPD(i, val, tmp, reg) \ + do { \ + val = 0; \ + tmp = 0; \ + for (i = 0; i < DIMM_SOCKETS; i++) { \ + if (pci_read_config8(SCRATCH, SCRATCH_RANK_0 + (i << 1))) { \ + tmp = get_spd_data(&ctrl->cfg, i, reg); \ + if (tmp > val) \ + val = tmp; \ + } \ + } \ + } while (0) + +#define REGISTERPRESET(bus, dev, fun, bdfspec) \ + { u8 j, reg; \ + for (j = 0; j < ARRAY_SIZE(bdfspec); j++) { \ + printk(BIOS_SPEW, "Writing bus " #bus " dev " #dev " fun " #fun " register "); \ + printk(BIOS_SPEW, "%02x", (bdfspec)[j].reg); \ + printk(BIOS_SPEW, "\n"); \ + reg = pci_read_config8(PCI_DEV((bus), (dev), (fun)), (bdfspec)[j].reg); \ + reg &= (bdfspec)[j].mask; \ + reg |= (bdfspec)[j].val; \ + pci_write_config8(PCI_DEV((bus), (dev), (fun)), (bdfspec)[j].reg, reg); \ + } \ + } + +static const u8 Reg_Val[] = { +/* REG, VALUE */ + 0x70, 0x33, + 0x71, 0x11, + 0x72, 0x33, + 0x73, 0x11, + 0x74, 0x20, + 0x75, 0x2e, + 0x76, 0x64, + 0x77, 0x00, + 0x78, 0x44, + 0x79, 0xaa, + 0x7a, 0x33, + 0x7b, 0xaa, + 0x7c, 0x00, + 0x7e, 0x33, + 0x7f, 0x33, + 0x80, 0x44, + 0x81, 0x44, + 0x82, 0x44, + 0x83, 0x02, + 0x50, 0x88, + 0x51, 0x7b, + 0x52, 0x6f, + 0x53, 0x88, + 0x54, 0x0e, + 0x55, 0x00, + 0x56, 0x00, + 0x59, 0x00, + 0x5d, 0x72, + 0x5e, 0x88, + 0x5f, 0xc7, + 0x68, 0x01, +}; + +/* Host registers initial value */ +static const u8 Host_Reg_Val[] = { +/* REG, VALUE */ + 0x60, 0xff, + 0x61, 0xff, + 0x62, 0x0f, + 0x63, 0xff, + 0x64, 0xff, + 0x65, 0x0f, + 0x66, 0xff, + 0x67, 0x30, +}; + +static const u8 Mem_Reg_Init[] = { +/* REG, AND, OR */ + 0x50, 0x11, 0x66, + 0x51, 0x11, 0x66, + 0x52, 0x00, 0x11, + 0x53, 0x00, 0x0f, + 0x54, 0x00, 0x00, + 0x55, 0x00, 0x00, + 0x56, 0x00, 0x00, + 0x57, 0x00, 0x00, + 0x60, 0x00, 0x00, + 0x62, 0xf7, 0x08, + 0x65, 0x00, 0xd9, + 0x66, 0x00, 0x80, + 0x67, 0x00, 0x50, /* OR 0x00 ?? */ + 0x69, 0xf0, 0x00, + 0x6a, 0x00, 0x00, + 0x6d, 0xcf, 0xc0, + 0x6e, 0xff, 0x80, + 0x75, 0x0f, 0x40, + 0x77, 0x00, 0x00, + 0x80, 0x00, 0x00, + 0x81, 0x00, 0x00, + 0x82, 0x00, 0x00, + 0x83, 0x00, 0x00, + 0x84, 0x00, 0x00, + 0x85, 0x00, 0x00, + 0x86, 0xff, 0x2c, /* OR 0x28 if we don't want enable top 1M SM memory */ + 0x40, 0x00, 0x00, + 0x7c, 0x00, 0x00, + 0x7e, 0x00, 0x00, + 0xa4, 0xfe, 0x00, + 0xb0, 0x7f, 0x80, + 0xb1, 0x00, 0xaa, + 0xb4, 0xfd, 0x02, + 0xb8, 0xfe, 0x00, +}; + +static const u8 Dram_Driving_ODT_CTRL[] = { +/* REG, VALUE */ + 0xd6, 0xa8, + 0xd4, 0x80, + 0xd0, 0x88, + 0xd3, 0x01, + 0xd8, 0x00, + 0xda, 0x80, +}; + +#define Rank0_ODT 0x00 +#define Rank1_ODT 0x01 +#define Rank2_ODT 0x02 +#define Rank3_ODT 0x03 +#define NA_ODT 0x00 +#define NB_ODT_75ohm 0x00 +#define NB_ODT_150ohm 0x01 +#define DDR2_ODT_75ohm 0x20 +#define DDR2_ODT_150ohm 0x40 + +static const u8 ODT_TBL[] = { +/* RankMap, ODT Control Bits, DRAM & NB ODT setting */ + 0x01, ((NA_ODT << 6) | (NA_ODT << 4) | (NA_ODT << 2) | Rank0_ODT), (DDR2_ODT_150ohm | NB_ODT_75ohm), + 0x03, ((NA_ODT << 6) | (NA_ODT << 4) | (Rank0_ODT << 2) | Rank1_ODT), (DDR2_ODT_150ohm | NB_ODT_75ohm), + 0x04, ((NA_ODT << 6) | (Rank2_ODT << 4) | (NA_ODT << 2) | NA_ODT), (DDR2_ODT_150ohm | NB_ODT_75ohm), + 0x05, ((NA_ODT << 6) | (Rank0_ODT << 4) | (NA_ODT << 2) | Rank2_ODT), (DDR2_ODT_75ohm | NB_ODT_150ohm), + 0x07, ((NA_ODT << 6) | (Rank0_ODT << 4) | (Rank2_ODT << 2) | Rank2_ODT), (DDR2_ODT_75ohm | NB_ODT_150ohm), + 0x0c, ((Rank2_ODT << 6) | (Rank3_ODT << 4) | (NA_ODT << 2) | NA_ODT), (DDR2_ODT_150ohm | NB_ODT_75ohm), + 0x0d, ((Rank0_ODT << 6) | (Rank0_ODT << 4) | (NA_ODT << 2) | Rank2_ODT), (DDR2_ODT_75ohm | NB_ODT_150ohm), + 0x0f, ((Rank0_ODT << 6) | (Rank0_ODT << 4) | (Rank2_ODT << 2) | Rank2_ODT), (DDR2_ODT_75ohm | NB_ODT_150ohm), +}; + +static const u8 DQS_DQ_TBL[] = { +/* RxE0: DRAM Timing DQS */ +/* RxE2: DRAM Timing DQ */ +/* RxE0, RxE2 */ + 0xee, 0xba, + 0xee, 0xba, + 0xcc, 0xba, + 0xcc, 0xba, +}; + +static const u8 Duty_Control_DDR2[] = { +/* RxEC, RxED, RxEE, RXEF */ + /* DDRII533 1~2 rank, DDRII400 */ + 0x84, 0x10, 0x00, 0x10, + /* DDRII533 3~4 rank */ + 0x44, 0x10, 0x00, 0x10, +}; + +static const u8 ChA_Clk_Phase_DDR2_Table[] = { +/* Rx91, Rx92, Rx93 */ + /* DDRII533 1 rank */ + 0x04, 0x05, 0x06, + /* DDRII533 2~4 rank */ + 0x04, 0x05, 0x05, + /* DDRII400 */ + 0x02, 0x04, 0x04, +}; + +static const u8 DQ_DQS_Table[] = { +/* REG, VALUE */ +/* DRAM DQ/DQS Output Delay Control */ + 0xdc, 0x65, + 0xdd, 0x01, + 0xde, 0xc0, +/* DRAM DQ/DQS input Capture Control */ + 0x78, 0x83, + 0x79, 0x83, + 0x7a, 0x00, +}; + +static const u8 DQSOChA_DDR2_Driving_Table[] = { +/* Rx70, Rx71 */ + /* DDRII533 1~2 rank */ + 0x00, 0x01, + /* DDRII533 3~4 rank */ + 0x03, 0x00, + /* DDRII400 1~2 rank */ + 0x00, 0x04, + /* DDRII400 3~4 rank */ + 0x00, 0x01, +}; + +/************************************************************************/ +/* Chipset Performance UP and other setting after DRAM Sizing Registers */ +/************************************************************************/ +static const u8 Dram_Table[] = { +/* REG, AND, OR */ + 0x60, 0xff, 0x03, + 0x66, 0xcf, 0x80, + 0x68, 0x00, 0x00, + 0x69, 0xfd, 0x03, + 0x6e, 0xff, 0x01, + 0x95, 0xff, 0x40, +}; + +static const u8 Host_Table[] = { +/* REG, AND, OR */ + 0x51, 0x81, 0x7a, + 0x55, 0xff, 0x06, + 0x5e, 0x00, 0x88, + 0x5d, 0xff, 0xb2, +}; + +static const u8 Init_Rank_Reg_Table[] = { + /* Rank Ending Address Registers */ + 0x40, 0x41, 0x42, 0x43, + /* Rank Beginning Address Registers */ + 0x48, 0x49, 0x4a, 0x4b, + /* Physical-to-Virtual Rank Mapping Registers */ + 0x54, 0x55, +}; + +static const u16 DDR2_MRS_table[] = { +/* CL: 2, 3, 4, 5 */ + 0x150, 0x1d0, 0x250, 0x2d0, /* BL = 4; Use 1X-bandwidth MA table to init DRAM */ + 0x158, 0x1d8, 0x258, 0x2d8, /* BL = 8; Use 1X-bandwidth MA table to init DRAM */ +}; + +#define MRS_DDR2_TWR2 ((0 << 15) | (0 << 20) | (1 << 12)) +#define MRS_DDR2_TWR3 ((0 << 15) | (1 << 20) | (0 << 12)) +#define MRS_DDR2_TWR4 ((0 << 15) | (1 << 20) | (1 << 12)) +#define MRS_DDR2_TWR5 ((1 << 15) | (0 << 20) | (0 << 12)) +static const u32 DDR2_Twr_table[] = { + MRS_DDR2_TWR2, + MRS_DDR2_TWR3, + MRS_DDR2_TWR4, + MRS_DDR2_TWR5, +}; + +static const u8 DQSI_Rate_Table[] = { + 8, /* DDRII 200 */ + 8, /* DDRII 266 */ + 8, /* DDRII 333 */ + 7, /* DDRII 400 */ + 8, /* DDRII 533 */ + 8, /* DDRII 666 */ +}; + +static const u8 REFC_Table[] = { + 0x65, 0x32, /* DDRII 100 */ + 0x86, 0x43, /* DDRII 266 */ + 0xa8, 0x54, /* DDRII 333 */ + 0xca, 0x65, /* DDRII 400 */ + 0xca, 0x86, /* DDRII 533 */ + 0xca, 0xa8, /* DDRII 666 */ +}; + +static void do_ram_command(const struct mem_controller *ctrl, u8 command) +{ + u8 reg; + + reg = pci_read_config8(MEMCTRL, 0x6b); + reg &= 0xf8; /* Clear bits 2-0. */ + reg |= command; + pci_write_config8(MEMCTRL, 0x6b, reg); + + printram(" Sending RAM command 0x%02x\n", reg); +} + +// TODO factor out to another file +static void c7_cpu_setup(const struct mem_controller *ctrl) +{ + for (size_t i = 0; i < ARRAY_SIZE(Reg_Val); i += 2) + pci_write_config8(HOSTCTRL, Reg_Val[i], Reg_Val[i + 1]); +} + +static void ddr_detect(const struct mem_controller *ctrl) +{ + /* FIXME: Only supports 2 ranks per DIMM */ + u8 val, rsize, dimm; + u8 nrank = 0; + u8 ndimm = 0; + u8 rmap = 0; + for (dimm = 0; dimm < DIMM_SOCKETS; dimm++) { + val = get_spd_data(&ctrl->cfg, dimm, 0); + if ((val != 0x80) && (val != 0xff)) + continue; + + printk(BIOS_DEBUG, "Found DIMM #%u\n", dimm); + ndimm++; + + rsize = get_spd_data(&ctrl->cfg, dimm, SPD_RANK_SIZE); + /* unit is 128M */ + rsize = (rsize << 3) | (rsize >> 5); + + val = get_spd_data(&ctrl->cfg, dimm, SPD_MOD_ATTRIB_RANK); + switch (val & SPD_MOD_ATTRIB_RANK_NUM_MASK) { + case 1: + pci_write_config8(SCRATCH, SCRATCH_RANK_1 + (dimm << 1), rsize); + rmap |= 1 << ((dimm << 1) + 1); + nrank++; + __fallthrough; + case 0: + pci_write_config8(SCRATCH, SCRATCH_RANK_0 + (dimm << 1), rsize); + rmap |= 1 << (dimm << 1); + nrank++; + } + } + pci_write_config8(SCRATCH, SCRATCH_DIMM_NUM, ndimm); + pci_write_config8(SCRATCH, SCRATCH_RANK_NUM, nrank); + pci_write_config8(SCRATCH, SCRATCH_RANK_MAP, rmap); +} + +static void sdram_set_safe_values(const struct mem_controller *ctrl) +{ + /* The purpose of this function is to set initial values for the dram + * size and timings. It will be replaced with the SPD based function + * once the RAM commands are working with these values. + */ + u8 regs, val, t, dimm; + u32 spds, tmp; + + regs = pci_read_config8(MEMCTRL, 0x6c); + if (regs & (1 << 6)) + printk(BIOS_DEBUG, "DDR2 Detected.\n"); + else + die("ERROR: DDR1 memory detected but not supported by coreboot.\n"); + + /* Enable DDR2 */ + regs |= (1 << 7); + pci_write_config8(MEMCTRL, 0x6c, regs); + + /* SPD 5 # of ranks */ + pci_write_config8(MEMCTRL, 0x6d, 0xc0); + + /**********************************************/ + /* Set DRAM Freq (DDR2 533) */ + /**********************************************/ + /* SPD 9 SDRAM Cycle Time */ + GET_SPD(dimm, spds, regs, 9); + + printk(BIOS_DEBUG, "DDRII "); + if (spds <= 0x3d) { + printk(BIOS_DEBUG, "533\n"); + val = DDRII_533; + t = 38; + } else if (spds <= 0x50) { + printk(BIOS_DEBUG, "400\n"); + val = DDRII_400; + t = 50; + } else if (spds <= 0x60) { + printk(BIOS_DEBUG, "333\n"); + val = DDRII_333; + t = 60; + } else if (spds <= 0x75) { + printk(BIOS_DEBUG, "266\n"); + val = DDRII_266; + t = 75; + } else { + printk(BIOS_DEBUG, "200\n"); + val = DDRII_200; + t = 100; + } + /* To store DDRII frequency */ + pci_write_config8(SCRATCH, SCRATCH_DRAM_FREQ, val); + + /* Manual reset and adjust DLL when DRAM change frequency + * This is a necessary sequence. + */ + udelay(2000); + regs = pci_read_config8(MEMCTRL, 0x90); + regs |= 0x7; + pci_write_config8(MEMCTRL, 0x90, regs); + udelay(2000); + regs = pci_read_config8(MEMCTRL, 0x90); + regs &= ~0x7; + regs |= val; + pci_write_config8(MEMCTRL, 0x90, regs); + udelay(2000); + regs = pci_read_config8(MEMCTRL, 0x6b); + regs |= 0xc0; + regs &= ~0x10; + pci_write_config8(MEMCTRL, 0x6b, regs); + udelay(1); + regs |= 0x10; + pci_write_config8(MEMCTRL, 0x6b, regs); + udelay(1); + regs &= ~0xc0; + pci_write_config8(MEMCTRL, 0x6b, regs); + regs = pci_read_config8(MEMCTRL, 0x6f); + regs |= 0x1; + pci_write_config8(MEMCTRL, 0x6f, regs); + + /**********************************************/ + /* Set DRAM Timing Setting (DDR2 533) */ + /**********************************************/ + /* SPD 9 18 23 25 CAS Latency NB3DRAM_REG62[2:0] */ + /* Read SPD byte 18 CAS Latency */ + GET_SPD(dimm, spds, regs, SPD_CAS_LAT); + printk(BIOS_DEBUG, "CAS Supported "); + if (spds & SPD_CAS_LATx(2)) + printk(BIOS_DEBUG, "2 "); + if (spds & SPD_CAS_LATx(3)) + printk(BIOS_DEBUG, "3 "); + if (spds & SPD_CAS_LATx(4)) + printk(BIOS_DEBUG, "4 "); + if (spds & SPD_CAS_LATx(5)) + printk(BIOS_DEBUG, "5 "); + if (spds & SPD_CAS_LATx(6)) + printk(BIOS_DEBUG, "6"); + + /* We don't consider CAS = 6, because CX700 doesn't support it */ + printk(BIOS_DEBUG, "\n CAS:"); + if (spds & SPD_CAS_LATx(5)) { + printk(BIOS_DEBUG, "Starting at CL5"); + val = 0x3; + /* See whether we can improve it */ + GET_SPD(dimm, tmp, regs, SPD_CAS_LAT_MIN_X_1); + if ((spds & SPD_CAS_LATx(4)) && (tmp < 0x50)) { + printk(BIOS_DEBUG, "\n... going to CL4"); + val = 0x2; + } + GET_SPD(dimm, tmp, regs, SPD_CAS_LAT_MIN_X_2); + if ((spds & SPD_CAS_LATx(3)) && (tmp < 0x50)) { + printk(BIOS_DEBUG, "\n... going to CL3"); + val = 0x1; + } + } else { + printk(BIOS_DEBUG, "Starting at CL4"); + val = 0x2; + GET_SPD(dimm, tmp, regs, SPD_CAS_LAT_MIN_X_1); + if ((spds & SPD_CAS_LATx(3)) && (tmp < 0x50)) { + printk(BIOS_DEBUG, "\n... going to CL3"); + val = 0x1; + } + GET_SPD(dimm, tmp, regs, SPD_CAS_LAT_MIN_X_2); + if ((spds & SPD_CAS_LATx(2)) && (tmp < 0x50)) { + printk(BIOS_DEBUG, "\n... going to CL2"); + val = 0x0; + } + } + regs = pci_read_config8(MEMCTRL, 0x62); + regs &= ~0x7; + regs |= val; + pci_write_config8(MEMCTRL, 0x62, regs); + printk(BIOS_DEBUG, "\n"); + + /* SPD 27 Trp NB3DRAM_REG64[3:2] */ + GET_SPD(dimm, spds, regs, SPD_TRP); + printk(BIOS_DEBUG, "Trp %d\n", spds); + spds >>= 2; + for (val = 2; val <= 5; val++) { + if (spds <= (val * t / 10)) { + val = val - 2; + break; + } + } + val <<= 2; + regs = pci_read_config8(MEMCTRL, 0x64); + regs &= ~0xc; + regs |= val; + pci_write_config8(MEMCTRL, 0x64, regs); + + /* SPD 29 Trcd NB3DRAM_REG64[7:6] */ + GET_SPD(dimm, spds, regs, SPD_TRCD); + printk(BIOS_DEBUG, "Trcd %d\n", spds); + spds >>= 2; + for (val = 2; val <= 5; val++) { + if (spds <= (val * t / 10)) { + val = val - 2; + break; + } + } + val <<= 6; + regs = pci_read_config8(MEMCTRL, 0x64); + regs &= ~0xc0; + regs |= val; + pci_write_config8(MEMCTRL, 0x64, regs); + + /* SPD 30 Tras NB3DRAM_REG62[7:4] */ + GET_SPD(dimm, spds, regs, SPD_TRAS); + printk(BIOS_DEBUG, "Tras %d\n", spds); + for (val = 5; val <= 20; val++) { + if (spds <= (val * t / 10)) { + val = val - 5; + break; + } + } + val <<= 4; + regs = pci_read_config8(MEMCTRL, 0x62); + regs &= ~0xf0; + regs |= val; + pci_write_config8(MEMCTRL, 0x62, regs); + + /* SPD 42 SPD 40 Trfc NB3DRAM_REG61[5:0] */ + GET_SPD(dimm, spds, regs, SPD_TRFC); + printk(BIOS_DEBUG, "Trfc %d\n", spds); + tmp = spds; + GET_SPD(dimm, spds, regs, SPD_EX_TRC_TRFC); + if (spds & 0x1) + tmp += 256; + if (spds & 0xe) + tmp++; + for (val = 8; val <= 71; val++) { + if (tmp <= (val * t / 10)) { + val = val - 8; + break; + } + } + regs = pci_read_config8(MEMCTRL, 0x61); + regs &= ~0x3f; + regs |= val; + pci_write_config8(MEMCTRL, 0x61, regs); + + /* SPD 28 Trrd NB3DRAM_REG63[7:6] */ + GET_SPD(dimm, spds, regs, SPD_TRRD); + spds >>= 2; + for (val = 2; val <= 5; val++) { + if (spds <= (val * t / 10)) { + val = val - 2; + break; + } + } + val <<= 6; + printk(BIOS_DEBUG, "Trrd val = 0x%x\n", val); + + regs = pci_read_config8(MEMCTRL, 0x63); + regs &= ~0xc0; + regs |= val; + pci_write_config8(MEMCTRL, 0x63, regs); + + /* SPD 36 Twr NB3DRAM_REG61[7:6] */ + GET_SPD(dimm, spds, regs, SPD_TWR); + for (val = 2; val <= 5; val++) { + if (spds <= (val * t / 10)) { + val = val - 2; + break; + } + } + val <<= 6; + printk(BIOS_DEBUG, "Twr val = 0x%x\n", val); + + regs = pci_read_config8(MEMCTRL, 0x61); + regs &= ~0xc0; + regs |= val; + pci_write_config8(MEMCTRL, 0x61, regs); + + /* SPD 37 Twtr NB3DRAM_REG63[1] */ + GET_SPD(dimm, spds, regs, SPD_TWTR); + spds >>= 2; + printk(BIOS_DEBUG, "Twtr 0x%x\n", spds); + if (spds <= (t * 2 / 10)) + val = 0; + else + val = 1; + val <<= 1; + printk(BIOS_DEBUG, "Twtr val = 0x%x\n", val); + + regs = pci_read_config8(MEMCTRL, 0x63); + regs &= ~0x2; + regs |= val; + pci_write_config8(MEMCTRL, 0x63, regs); + + /* SPD 38 Trtp NB3DRAM_REG63[3] */ + GET_SPD(dimm, spds, regs, SPD_TRTP); + spds >>= 2; + printk(BIOS_DEBUG, "Trtp 0x%x\n", spds); + if (spds <= (t * 2 / 10)) + val = 0; + else + val = 1; + val <<= 3; + printk(BIOS_DEBUG, "Trtp val = 0x%x\n", val); + + regs = pci_read_config8(MEMCTRL, 0x63); + regs &= ~0x8; + regs |= val; + pci_write_config8(MEMCTRL, 0x63, regs); + + /**********************************************/ + /* Set DRAM DRDY Setting */ + /**********************************************/ + /* Write slowest value to register */ + for (val = 0; val < ARRAY_SIZE(Host_Reg_Val); val += 2) + pci_write_config8(HOSTCTRL, Host_Reg_Val[val], Host_Reg_Val[val + 1]); + + /* F2_RX51[7]=0, disable DRDY timing */ + regs = pci_read_config8(HOSTCTRL, 0x51); + regs &= ~0x80; + pci_write_config8(HOSTCTRL, 0x51, regs); + + /**********************************************/ + /* Set DRAM BurstLength */ + /**********************************************/ + regs = pci_read_config8(MEMCTRL, 0x6c); + for (dimm = 0; dimm < DIMM_SOCKETS; dimm++) { + if (pci_read_config8(SCRATCH, SCRATCH_REG_BASE + (dimm << 1))) { + spds = get_spd_data(&ctrl->cfg, dimm, 16); + if (!(spds & 0x8)) + break; + } + } + if (dimm == 2) + regs |= 0x8; + pci_write_config8(MEMCTRL, 0x6c, regs); + val = pci_read_config8(HOSTCTRL, 0x54); + val &= ~0x10; + if (dimm == 2) + val |= 0x10; + pci_write_config8(HOSTCTRL, 0x54, val); + + /**********************************************/ + /* Set DRAM Driving Setting */ + /**********************************************/ + /* DRAM Timing ODT */ + for (val = 0; val < ARRAY_SIZE(Dram_Driving_ODT_CTRL); val += 2) + pci_write_config8(MEMCTRL, Dram_Driving_ODT_CTRL[val], + Dram_Driving_ODT_CTRL[val + 1]); + + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_NUM); + val = pci_read_config8(MEMCTRL, 0xd5); + val &= ~0xaa; + switch (regs) { + case 3: + case 2: + val |= 0xa0; + break; + default: + val |= 0x80; + } + regs = pci_read_config8(SCRATCH, SCRATCH_DIMM_NUM); + if (regs == 1) + val |= 0xa; + pci_write_config8(MEMCTRL, 0xd5, val); + + regs = pci_read_config8(SCRATCH, SCRATCH_DIMM_NUM); + val = pci_read_config8(MEMCTRL, 0xd6); + val &= ~0x2; + if (regs == 1) + val |= 0x2; + pci_write_config8(MEMCTRL, 0xd6, val); + + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_MAP); + for (val = 0; val < ARRAY_SIZE(ODT_TBL); val += 3) { + if (regs == ODT_TBL[val]) { + pci_write_config8(MEMCTRL, 0xd8, ODT_TBL[val + 1]); + /* Store DRAM & NB ODT setting in d0f4_Rxd8 */ + pci_write_config8(SCRATCH, SCRATCH_DRAM_NB_ODT, ODT_TBL[val + 2]); + break; + } + } + + pci_write_config8(MEMCTRL, 0xd9, 0x0a); + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_NUM); + regs--; + regs = regs << 1; + pci_write_config8(MEMCTRL, 0xe0, DQS_DQ_TBL[regs++]); + pci_write_config8(MEMCTRL, 0xe2, DQS_DQ_TBL[regs]); + + /* DRAM Timing CS */ + pci_write_config8(MEMCTRL, 0xe4, 0x66); + + /* DRAM Timing MAA */ + val = 0; + for (dimm = 0; dimm < DIMM_SOCKETS; dimm++) { + if (pci_read_config8(SCRATCH, SCRATCH_REG_BASE + (dimm << 1))) { + spds = get_spd_data(&ctrl->cfg, dimm, SPD_PRI_WIDTH); + spds = 64 / spds; + if (pci_read_config8(SCRATCH, SCRATCH_REG_BASE + (dimm << 1) + 1)) + spds = spds << 1; + val += spds; + } + } + printk(BIOS_DEBUG, "\nchip #%d\n", val); + if (val > 18) + regs = 0xdb; + else + regs = 0x86; + pci_write_config8(MEMCTRL, 0xe8, regs); + + /* DRAM Timing MAB */ + pci_write_config8(MEMCTRL, 0xe9, 0x0); + + /* DRAM Timing DCLK VT8454C always 0x66 */ + pci_write_config8(MEMCTRL, 0xe6, 0xaa); + + /**********************************************/ + /* Set DRAM Duty Control */ + /**********************************************/ + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_NUM); + switch (regs) { + case 1: + case 2: /* 1~2 rank */ + val = 0; + break; + case 3: + case 4: /* 3~4 rank */ + regs = pci_read_config8(SCRATCH, SCRATCH_DRAM_FREQ); + if (regs == DDRII_533) + val = 4; + else /* DDRII-400 */ + val = 0; + break; + } + regs = 0xec; + for (t = 0; t < 4; t++) { + pci_write_config8(MEMCTRL, regs, Duty_Control_DDR2[val]); + regs++; + val++; + } + + /**********************************************/ + /* Set DRAM Clock Control */ + /**********************************************/ + /* Write Data Phase */ + val = pci_read_config8(SCRATCH, SCRATCH_DRAM_FREQ); + regs = pci_read_config8(MEMCTRL, 0x75); + regs &= 0xf0; + switch (val) { + case DDRII_533: + pci_write_config8(MEMCTRL, 0x74, 0x07); + regs |= 0x7; + break; + case DDRII_400: + default: + pci_write_config8(MEMCTRL, 0x74, 0x05); + regs |= 0x5; + break; + } + pci_write_config8(MEMCTRL, 0x75, regs); + pci_write_config8(MEMCTRL, 0x76, 0x80); + + /* Clock Phase Control for FeedBack Mode */ + regs = pci_read_config8(MEMCTRL, 0x90); + pci_write_config8(MEMCTRL, 0x90, regs); + + regs = pci_read_config8(SCRATCH, SCRATCH_DRAM_FREQ); + switch (regs) { + case DDRII_533: + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_NUM); + if (regs == 1) + val = 0; + else + val = 3; + break; + case DDRII_400: + default: + val = 6; + break; + } + regs = pci_read_config8(MEMCTRL, 0x91); + regs &= ~0xc0; + regs |= ctrl->cfg.mem_clocks << 6; + pci_write_config8(MEMCTRL, 0x91, regs); + regs = 0x91; + for (t = 0; t < 3; t++) { + dimm = pci_read_config8(MEMCTRL, regs); + dimm &= ~0x7; + dimm |= ChA_Clk_Phase_DDR2_Table[val]; + pci_write_config8(MEMCTRL, regs, dimm); + regs++; + val++; + } + + pci_write_config8(MEMCTRL, 0x97, 0x12); + pci_write_config8(MEMCTRL, 0x98, 0x33); + + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_0); + val = pci_read_config8(SCRATCH, SCRATCH_RANK_2); + if (regs && val) + pci_write_config8(MEMCTRL, 0x9d, 0x00); + else + pci_write_config8(MEMCTRL, 0x9d, 0x0f); + + for (val = 0; val < ARRAY_SIZE(DQ_DQS_Table); val += 2) + pci_write_config8(MEMCTRL, DQ_DQS_Table[val], DQ_DQS_Table[val + 1]); + regs = pci_read_config8(SCRATCH, SCRATCH_DRAM_FREQ); + if (regs == DDRII_533) + pci_write_config8(MEMCTRL, 0x7b, 0xa0); + else + pci_write_config8(MEMCTRL, 0x7b, 0x10); + + /***************************************************/ + /* Set necessary register before DRAM initialize */ + /***************************************************/ + for (val = 0; val < ARRAY_SIZE(Mem_Reg_Init); val += 3) { + regs = pci_read_config8(MEMCTRL, Mem_Reg_Init[val]); + regs &= Mem_Reg_Init[val + 1]; + regs |= Mem_Reg_Init[val + 2]; + pci_write_config8(MEMCTRL, Mem_Reg_Init[val], regs); + } + regs = pci_read_config8(HOSTCTRL, 0x51); + regs &= 0xbf; // Clear bit 6 Disable Read Around Write + pci_write_config8(HOSTCTRL, 0x51, regs); + + regs = pci_read_config8(HOSTCTRL, 0x54); + t = regs >> 5; + val = pci_read_config8(HOSTCTRL, 0x57); + dimm = val >> 5; + if (t == dimm) + t = 0x0; + else + t = 0x1; + regs &= ~0x1; + regs |= t; + val &= ~0x1; + val |= t; + pci_write_config8(HOSTCTRL, 0x57, val); + + regs = pci_read_config8(HOSTCTRL, 0x51); + regs |= t; + pci_write_config8(HOSTCTRL, 0x51, regs); + + regs = pci_read_config8(MEMCTRL, 0x90); + regs &= 0x7; + val = 0; + if (regs < 0x2) + val = 0x80; + regs = pci_read_config8(MEMCTRL, 0x76); + regs &= 0x80; + regs |= val; + pci_write_config8(MEMCTRL, 0x76, regs); + + regs = pci_read_config8(MEMCTRL, 0x6f); + regs |= 0x10; + pci_write_config8(MEMCTRL, 0x6f, regs); + + /***************************************************/ + /* Find suitable DQS value for ChA and ChB */ + /***************************************************/ + // Set DQS output delay for Channel A + regs = pci_read_config8(SCRATCH, SCRATCH_DRAM_FREQ); + val = pci_read_config8(SCRATCH, SCRATCH_RANK_NUM); + switch (regs) { + case DDRII_533: + if (val <= 2) + val = 0; + else + val = 2; + break; + case DDRII_400: + default: + if (val <= 2) + val = 4; + else + val = 6; + break; + } + for (t = 0; t < 2; t++) + pci_write_config8(MEMCTRL, (0x70 + t), DQSOChA_DDR2_Driving_Table[val + t]); + // Set DQS output delay for Channel B + pci_write_config8(MEMCTRL, 0x72, 0x0); + + regs = pci_read_config8(SCRATCH, SCRATCH_RANK_0); + val = pci_read_config8(SCRATCH, SCRATCH_RANK_2); + if (regs && val) + pci_write_config8(MEMCTRL, 0x73, 0xfd); + else + pci_write_config8(MEMCTRL, 0x73, 0x01); +} + +static void sdram_set_registers(const struct mem_controller *ctrl) +{ + c7_cpu_setup(ctrl); + ddr_detect(ctrl); + sdram_set_safe_values(ctrl); +} + +static void step_20_21(const struct mem_controller *ctrl) +{ + u8 val; + + // Step 20 + udelay(200); + + val = pci_read_config8(SCRATCH, SCRATCH_DRAM_NB_ODT); + if (val & DDR2_ODT_150ohm) + read32p(0x102200); + else + read32p(0x102020); + + /* Step 21. Normal operation */ + printk(BIOS_SPEW, "RAM Enable 5: Normal operation\n"); + do_ram_command(ctrl, RAM_COMMAND_NORMAL); + udelay(3); +} + +static void step_2_19(const struct mem_controller *ctrl) +{ + u32 i; + u8 val; + + // Step 2 + val = pci_read_config8(MEMCTRL, 0x69); + val &= ~0x03; + pci_write_config8(MEMCTRL, 0x69, val); + + /* Step 3 Apply NOP. */ + printk(BIOS_SPEW, "RAM Enable 1: Apply NOP\n"); + do_ram_command(ctrl, RAM_COMMAND_NOP); + + udelay(15); + + // Step 4 + printk(BIOS_SPEW, "SEND: "); + read32p(0); + printk(BIOS_SPEW, "OK\n"); + + // Step 5 + udelay(400); + + /* 6. Precharge all. Wait tRP. */ + printk(BIOS_SPEW, "RAM Enable 2: Precharge all\n"); + do_ram_command(ctrl, RAM_COMMAND_PRECHARGE); + + // Step 7 + printk(BIOS_SPEW, "SEND: "); + read32p(0); + printk(BIOS_SPEW, "OK\n"); + + /* Step 8. Mode register set. */ + printk(BIOS_SPEW, "RAM Enable 4: Mode register set\n"); + do_ram_command(ctrl, RAM_COMMAND_MRS); //enable dll + + // Step 9 + printk(BIOS_SPEW, "SEND: "); + + val = pci_read_config8(SCRATCH, SCRATCH_DRAM_NB_ODT); + if (val & DDR2_ODT_150ohm) + read32p(0x102200); //DDR2_ODT_150ohm + else + read32p(0x102020); + printk(BIOS_SPEW, "OK\n"); + + // Step 10 + printk(BIOS_SPEW, "SEND: "); + read32p(0x800); + printk(BIOS_SPEW, "OK\n"); + + /* Step 11. Precharge all. Wait tRP. */ + printk(BIOS_SPEW, "RAM Enable 2: Precharge all\n"); + do_ram_command(ctrl, RAM_COMMAND_PRECHARGE); + + // Step 12 + printk(BIOS_SPEW, "SEND: "); + read32p(0); + printk(BIOS_SPEW, "OK\n"); + + /* Step 13. Perform 8 refresh cycles. Wait tRC each time. */ + printk(BIOS_SPEW, "RAM Enable 3: CBR\n"); + do_ram_command(ctrl, RAM_COMMAND_CBR); + + /* JEDEC says only twice, do 8 times for posterity */ + // Step 16: Repeat Step 14 and 15 another 7 times + for (i = 0; i < 8; i++) { + // Step 14 + read32p(0); + printk(BIOS_SPEW, "."); + + // Step 15 + udelay(100); + } + + /* Step 17. Mode register set. Wait 200us. */ + printk(BIOS_SPEW, "\nRAM Enable 4: Mode register set\n"); + + //safe value for now, BL = 8, WR = 4, CAS = 4 + do_ram_command(ctrl, RAM_COMMAND_MRS); + udelay(200); + + /* Use Single Chanel temporarily */ + val = pci_read_config8(MEMCTRL, 0x6c); + if (val & 0x8) { /* Burst Length = 8 */ + val = pci_read_config8(MEMCTRL, 0x62); + val &= 0x7; + i = DDR2_MRS_table[4 + val]; + } else { + val = pci_read_config8(MEMCTRL, 0x62); + val &= 0x7; + i = DDR2_MRS_table[val]; + } + + // Step 18 + val = pci_read_config8(MEMCTRL, 0x61); + val = val >> 6; + i |= DDR2_Twr_table[val]; + read32p(i); + + printk(BIOS_DEBUG, "MRS = %08x\n", i); + + udelay(15); + + // Step 19 + val = pci_read_config8(SCRATCH, SCRATCH_DRAM_NB_ODT); + if (val & DDR2_ODT_150ohm) + read32p(0x103e00); //EMRS OCD Default + else + read32p(0x103c20); +} + +static void sdram_set_vr(const struct mem_controller *ctrl, u8 num) +{ + u8 reg, val; + val = 0x54 + (num >> 1); + reg = pci_read_config8(MEMCTRL, val); + reg &= (0xf << (4 * (num & 0x1))); + reg |= (((0x8 | num) << 4) >> (4 * (num & 0x1))); + pci_write_config8(MEMCTRL, val, reg); +} +static void sdram_ending_addr(const struct mem_controller *ctrl, u8 num) +{ + u8 reg, val; + /* Set Ending Address */ + val = 0x40 + num; + reg = pci_read_config8(MEMCTRL, val); + reg += 0x10; + pci_write_config8(MEMCTRL, val, reg); + /* Set Beginning Address */ + val = 0x48 + num; + pci_write_config8(MEMCTRL, val, 0x0); +} + +static void sdram_clear_vr_addr(const struct mem_controller *ctrl, u8 num) +{ + u8 reg, val; + val = 0x54 + (num >> 1); + reg = pci_read_config8(MEMCTRL, val); + reg &= ~(0x80 >> (4 * (num & 0x1))); + pci_write_config8(MEMCTRL, val, reg); + val = 0x40 + num; + reg = pci_read_config8(MEMCTRL, val); + reg -= 0x10; + pci_write_config8(MEMCTRL, val, reg); + val = 0x48 + num; + pci_write_config8(MEMCTRL, val, 0x0); +} + +/* Perform sizing DRAM by dynamic method */ +static void sdram_calc_size(const struct mem_controller *ctrl, u8 num) +{ + u8 ca, ra, ba, reg; + ba = pci_read_config8(SCRATCH, SCRATCH_FLAGS); + if (ba == 8) { + write8p(0, 0x0d); + ra = read8p(0); + write8p(1 << SDRAM1X_RA_12_8bk, 0x0c); + ra = read8p(0); + + write8p(0, 0x0a); + ca = read8p(0); + write8p(1 << SDRAM1X_CA_09_8bk, 0x0c); + ca = read8p(0); + + write8p(0, 0x03); + ba = read8p(0); + write8p(1 << SDRAM1X_BA2_8bk, 0x02); + ba = read8p(0); + write8p(1 << SDRAM1X_BA1_8bk, 0x01); + ba = read8p(0); + } else { + write8p(0, 0x0f); + ra = read8p(0); + write8p(1 << SDRAM1X_RA_14, 0x0e); + ra = read8p(0); + write8p(1 << SDRAM1X_RA_13, 0x0d); + ra = read8p(0); + write8p(1 << SDRAM1X_RA_12, 0x0c); + ra = read8p(0); + + write8p(0, 0x0c); + ca = read8p(0); + write8p(1 << SDRAM1X_CA_12, 0x0b); + ca = read8p(0); + write8p(1 << SDRAM1X_CA_11, 0x0a); + ca = read8p(0); + write8p(1 << SDRAM1X_CA_09, 0x09); + ca = read8p(0); + + write8p(0, 0x02); + ba = read8p(0); + write8p(1 << SDRAM1X_BA1, 0x01); + ba = read8p(0); + } + + if (ra < 10 || ra > 15) + die("bad RA %u\n", ra); + if (ca < 8 || ca > 12) + die("bad CA %u\n", ca); + if (ba < 1 || ba > 3) + die("bad BA %u\n", ba); + + /* Calculate MA type save to scratch register */ + reg = 0; + + switch (ra) { + case 12: + reg |= MA_12_Row; + break; + case 13: + reg |= MA_13_Row; + break; + case 14: + reg |= MA_14_Row; + break; + default: + reg |= MA_15_Row; + } + + switch (ca) { + case 9: + reg |= MA_9_Column; + break; + case 10: + reg |= MA_10_Column; + break; + case 11: + reg |= MA_11_Column; + break; + default: + reg |= MA_12_Column; + } + + switch (ba) { + case 3: + reg |= MA_8_Bank; + break; + default: + reg |= MA_4_Bank; + } + + pci_write_config8(SCRATCH, SCRATCH_RANK0_MA_REG + num, reg); + + if (ra >= 13) + pci_write_config8(SCRATCH, SCRATCH_DRAM_256M_BIT, 1); + + /* Calculate rank size save to scratch register */ + ra = ra + ca + ba + 3 - 26; /* 1 unit = 64M */ + ra = 1 << ra; + pci_write_config8(SCRATCH, SCRATCH_RANK0_SIZE_REG + num, ra); +} + +static void enable_shadow_ram(const struct mem_controller *ctrl) +{ + u8 shadowreg; + + pci_write_config8(MEMCTRL, 0x80, 0x2a); + + /* 0xf0000-0xfffff - ACPI tables */ + shadowreg = pci_read_config8(MEMCTRL, 0x83); + shadowreg |= 0x30; + pci_write_config8(MEMCTRL, 0x83, shadowreg); +} + +void sdram_enable(const struct dram_cfg *cfg) +{ + struct mem_controller ctrl = { *cfg, }; + u8 reg8; + u8 val, i; + u8 dl, dh; + u32 quot; + + sdram_set_registers(&ctrl); + enable_shadow_ram(&ctrl); + + /* Init Present Bank */ + for (i = 0; i < ARRAY_SIZE(Init_Rank_Reg_Table); i++) + pci_write_config8(MEMCTRL, Init_Rank_Reg_Table[i], 0x0); + + /* Init other banks */ + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + sdram_set_vr(&ctrl, i); + sdram_ending_addr(&ctrl, i); + step_2_19(&ctrl); + step_20_21(&ctrl); + sdram_clear_vr_addr(&ctrl, i); + } + } + + /****************************************************************/ + /* Find the DQSI Low/High bound and save it to Scratch register */ + /****************************************************************/ + for (dl = 0; dl < 0x3f; dl += 2) { + reg8 = dl & 0x3f; + reg8 |= 0x80; /* Set Manual Mode */ + pci_write_config8(MEMCTRL, 0x77, reg8); + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + sdram_set_vr(&ctrl, i); + sdram_ending_addr(&ctrl, i); + write32p(0, 0x55555555); + write32p(4, 0x55555555); + udelay(15); + if (read32p(0) != 0x55555555) + break; + if (read32p(4) != 0x55555555) + break; + write32p(0, 0xaaaaaaaa); + write32p(4, 0xaaaaaaaa); + udelay(15); + if (read32p(0) != 0xaaaaaaaa) + break; + if (read32p(4) != 0xaaaaaaaa) + break; + sdram_clear_vr_addr(&ctrl, i); + } + } + if (i == 4) + break; + else + sdram_clear_vr_addr(&ctrl, i); + } + printk(BIOS_DEBUG, "DQSI Low 0x%02x\n", dl); + for (dh = dl; dh < 0x3f; dh += 2) { + reg8 = dh & 0x3f; + reg8 |= 0x80; /* Set Manual Mode */ + pci_write_config8(MEMCTRL, 0x77, reg8); + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + sdram_set_vr(&ctrl, i); + sdram_ending_addr(&ctrl, i); + + write32p(0, 0x55555555); + write32p(4, 0x55555555); + udelay(15); + if (read32p(0) != 0x55555555) + break; + if (read32p(4) != 0x55555555) + break; + write32p(0, 0xaaaaaaaa); + write32p(4, 0xaaaaaaaa); + udelay(15); + if (read32p(0) != 0xaaaaaaaa) + break; + if (read32p(4) != 0xaaaaaaaa) + break; + sdram_clear_vr_addr(&ctrl, i); + } + } + if (i != 4) { + sdram_clear_vr_addr(&ctrl, i); + break; + } + } + printk(BIOS_DEBUG, "DQSI High 0x%02x\n", dh); + pci_write_config8(SCRATCH, SCRATCH_CHA_DQSI_LOW_REG, dl); + pci_write_config8(SCRATCH, SCRATCH_CHA_DQSI_HIGH_REG, dh); + reg8 = pci_read_config8(MEMCTRL, 0X90) & 0X7; + val = DQSI_Rate_Table[reg8]; + quot = dh - dl; + quot = quot * val; + quot >>= 4; + val = quot + dl; + pci_write_config8(SCRATCH, SCRATCH_ChA_DQSI_REG, val); + reg8 = val & 0x3f; + reg8 |= 0x80; + pci_write_config8(MEMCTRL, 0x77, reg8); + + /****************************************************************/ + /* Find out the lowest Bank Interleave and Set Register */ + /****************************************************************/ + dl = 2; + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + reg8 = get_spd_data(&ctrl.cfg, (i >> 1), 17); + sdram_set_vr(&ctrl, i); + sdram_ending_addr(&ctrl, i); + if (reg8 == 4) { + write8p(0, 0x02); + val = read8p(0); + write8p(1 << SDRAM1X_BA1, 0x01); + val = read8p(0); + } else { + write8p(0, 0x03); + val = read8p(0); + write8p(1 << SDRAM1X_BA2_8bk, 0x02); + val = read8p(0); + write8p(1 << SDRAM1X_BA1_8bk, 0x01); + val = read8p(0); + } + if (val < dl) + dl = val; + sdram_clear_vr_addr(&ctrl, i); + } + } + dl <<= 6; + reg8 = pci_read_config8(MEMCTRL, 0x69); + reg8 &= ~0xc0; + reg8 |= dl; + pci_write_config8(MEMCTRL, 0x69, reg8); + + /****************************************************************/ + /* DRAM Sizing and Fill MA type */ + /****************************************************************/ + for (i = 0; i < 4; i++) { + val = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (val) { + reg8 = get_spd_data(&ctrl.cfg, (i >> 1), 17); + pci_write_config8(SCRATCH, SCRATCH_FLAGS, reg8); + if (reg8 == 4) { + /* Use MA Type 3 for DRAM sizing */ + reg8 = pci_read_config8(MEMCTRL, 0x50); + reg8 &= 0x11; + reg8 |= 0x66; + pci_write_config8(MEMCTRL, 0x50, reg8); + pci_write_config8(MEMCTRL, 0x51, reg8); + } else { + /* Use MA Type 5 for DRAM sizing */ + reg8 = pci_read_config8(MEMCTRL, 0x50); + reg8 &= 0x11; + reg8 |= 0xaa; + pci_write_config8(MEMCTRL, 0x50, reg8); + pci_write_config8(MEMCTRL, 0x51, reg8); + reg8 = pci_read_config8(MEMCTRL, 0x53); + reg8 &= 0x0f; + reg8 |= 0x90; + pci_write_config8(MEMCTRL, 0x53, reg8); + } + sdram_set_vr(&ctrl, i); + val = 0x40 + i; + reg8 = pci_read_config8(MEMCTRL, val); + /* max size 3G for new MA table */ + reg8 += 0x30; + pci_write_config8(MEMCTRL, val, reg8); + /* Set Beginning Address */ + val = 0x48 + i; + pci_write_config8(MEMCTRL, val, 0x0); + + sdram_calc_size(&ctrl, i); + + /* Clear */ + val = 0x54 + (i >> 1); + reg8 = pci_read_config8(MEMCTRL, val); + reg8 = ~(0x80 >> (4 * (i & 0x1))); + pci_write_config8(MEMCTRL, val, reg8); + val = 0x40 + i; + reg8 = pci_read_config8(MEMCTRL, val); + reg8 -= 0x30; + pci_write_config8(MEMCTRL, val, reg8); + val = 0x48 + i; + pci_write_config8(MEMCTRL, val, 0x0); + + } + } + /* Clear MA Type */ + reg8 = pci_read_config8(MEMCTRL, 0x50); + reg8 &= 0x11; + pci_write_config8(MEMCTRL, 0x50, reg8); + pci_write_config8(MEMCTRL, 0x51, reg8); + reg8 = pci_read_config8(MEMCTRL, 0x6b); + reg8 &= ~0x08; + pci_write_config8(MEMCTRL, 0x6b, reg8); + + /****************************************************************/ + /* DRAM re-initialize for burst length */ + /****************************************************************/ + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + sdram_set_vr(&ctrl, i); + sdram_ending_addr(&ctrl, i); + step_2_19(&ctrl); + step_20_21(&ctrl); + sdram_clear_vr_addr(&ctrl, i); + } + } + + /****************************************************************/ + /* Set the MA Type */ + /****************************************************************/ + reg8 = pci_read_config8(MEMCTRL, 0x50); + reg8 &= 0x11; + pci_write_config8(MEMCTRL, 0x50, reg8); + + reg8 = pci_read_config8(MEMCTRL, 0x51); + reg8 &= 0x11; + pci_write_config8(MEMCTRL, 0x51, reg8); + + reg8 = pci_read_config8(MEMCTRL, 0x6b); + reg8 &= ~0x08; + pci_write_config8(MEMCTRL, 0x6b, reg8); + + for (i = 0; i < 4; i += 2) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK0_MA_REG + i); + reg8 &= (MA_Bank + MA_Column); + val = pci_read_config8(MEMCTRL, 0x50); + if (i == 0) { + reg8 <<= 4; + val &= 0x1f; + } else + val &= 0xf1; + val |= reg8; + pci_write_config8(MEMCTRL, 0x50, val); + } + } + + /****************************************************************/ + /* Set Start and Ending Address */ + /****************************************************************/ + dl = 0; /* Begin Address */ + dh = 0; /* Ending Address */ + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK0_SIZE_REG + i); + if (reg8 == 0) + continue; + dh += reg8; + pci_write_config8(MEMCTRL, (0x40 + i), dh); + pci_write_config8(MEMCTRL, (0x48 + i), dl); + dl = dh; + } + } + dh <<= 2; + // F7_Rx57 Ending address mirror register + pci_write_config8(_sdev_north_end, 0x57, dh); + pci_write_config8(_sdev_south_end, 0x57, dh); + // LOW TOP Address + pci_write_config8(MEMCTRL, 0x88, dh); + pci_write_config8(MEMCTRL, 0x85, dh); + // also program vlink mirror + pci_write_config8(_sdev_north_end, 0xe5, dh); + + /****************************************************************/ + /* Set Physical to Virtual Rank mapping */ + /****************************************************************/ + pci_write_config32(MEMCTRL, 0x54, 0x0); + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) { + reg8 = pci_read_config8(MEMCTRL, (0x54 + (i >> 1))); + if (i & 0x1) { /* Odd Rank */ + reg8 &= 0xf0; + reg8 |= (0x8 | i); + } else { /* Even Rank */ + + reg8 &= 0x0f; + reg8 |= ((0x8 | i) << 4); + } + pci_write_config8(MEMCTRL, (0x54 + (i >> 1)), reg8); + } + } + + /****************************************************************/ + /* Set DRAM Refresh Counter */ + /****************************************************************/ + val = pci_read_config8(MEMCTRL, 0X90) & 0X7; + val <<= 1; + reg8 = pci_read_config8(SCRATCH, SCRATCH_DRAM_256M_BIT); + if (reg8) + val++; + pci_write_config8(MEMCTRL, 0x6a, REFC_Table[val]); + + /****************************************************************/ + /* Chipset Performance UP and other setting after DRAM Sizing */ + /****************************************************************/ + /* Dram Registers */ + for (i = 0; i < ARRAY_SIZE(Dram_Table); i += 3) { + reg8 = pci_read_config8(MEMCTRL, Dram_Table[i]); + reg8 &= Dram_Table[i + 1]; + reg8 |= Dram_Table[i + 2]; + pci_write_config8(MEMCTRL, Dram_Table[i], reg8); + } + + /* Host Registers */ + for (i = 0; i < ARRAY_SIZE(Host_Table); i += 3) { + reg8 = pci_read_config8(HOSTCTRL, Host_Table[i]); + reg8 &= Host_Table[i + 1]; + reg8 |= Host_Table[i + 2]; + pci_write_config8(HOSTCTRL, Host_Table[i], reg8); + } + + pci_write_config8(HOSTCTRL, 0x5d, 0xb2); + + /****************************************************************/ + /* UMA registers for N-series projects */ + /****************************************************************/ + + /* Manual setting frame buffer bank */ + for (i = 0; i < 4; i++) { + reg8 = pci_read_config8(SCRATCH, SCRATCH_RANK_0 + i); + if (reg8) + val = i; + } + pci_write_config8(MEMCTRL, 0xb0, val); + reg8 = 0x40; // Frame buffer size 64M + reg8 |= 0x80; // VGA Enable + reg8 |= 0x0a; // A[31:28] = 1010b + pci_write_config8(MEMCTRL, 0xa1, reg8); + + static const struct regmask { + u8 reg; + u8 mask; + u8 val; + } b0d1f0[] = { + { 0x40, 0x00, 0x8b}, + { 0x41, 0x80, 0x43}, + { 0x42, 0x00, 0x62}, + { 0x43, 0x00, 0x44}, + { 0x44, 0x00, 0x34}, + { 0x45, 0x00, 0x72} + }, b0d0f3[] = { + { 0x53, 0xf0, 0x0f}, + { 0x60, 0x00, 0x03}, + { 0x65, 0x00, 0xd9}, + { 0x66, 0x00, 0x80}, + { 0x67, 0x00, 0x00}, + { 0x68, 0x00, 0x01}, + { 0x69, 0xe0, 0x03}, + { 0x6b, 0x00, 0x10}, + { 0x6c, 0xc1, 0x08}, + { 0x6e, 0x00, 0x89}, + { 0x6f, 0x00, 0x51}, + { 0x75, ~0x40, 0x40}, + { 0x76, 0x8f, 0x00}, + { 0x7b, 0x00, 0xa0}, + { 0x86, 0x01, 0x24}, + { 0x86, 0x04, 0x29}, + { 0x8c, 0x00, 0x00}, + { 0x8d, 0x00, 0x00}, + { 0x95, ~0x40, 0x00}, + { 0xa2, 0x00, 0x44}, + { 0xb1, 0x00, 0xaa} + }, b0d0f0[] = { + { 0x4d, 0x00, 0x24}, + { 0x4f, 0x00, 0x01}, + { 0xbc, 0x00, 0x21}, + { 0xbe, 0x00, 0x00}, + { 0xbf, 0x7f, 0x80} + }, b0d17f0[] = { + { 0x40, ~0x01, 0x01}, // enable timer/counter shadow registers + { 0x67, ~0x03, 0x01}, + { 0x5b, ~0x01, 0x00}, + { 0x8d, ~0x02, 0x02}, + { 0x97, 0x7f, 0x00}, + { 0xd2, ~0x18, 0x00}, + { 0xe2, ~0x36, 0x06}, + { 0xe4, 0x7f, 0x00}, + { 0xe5, 0x00, 0x40}, + { 0xe6, 0x00, 0x20}, + { 0xe7, 0x2f, 0xc0}, + { 0xec, ~0x08, 0x00} + }, b0d17f7[] = { + { 0x4e, 0x7f, 0x80}, + { 0x4f, ~(1 << 6), 1 << 6 }, /* PG_CX700: 14.1.1 enable P2P Bridge Header for External PCI Bus */ + { 0x74, ~0x00, 0x04}, /* PG_CX700: 14.1.2 APIC FSB directly up to snmic, not on pci */ + { 0x7c, ~0x00, 0x02}, /* PG_CX700: 14.1.1 APIC FSB directly up to snmic, not on pci */ + { 0xe6, 0x0, 0x04} // MSI post + }, b0d19f0[] = { /* P2PE */ + { 0x42, ~0x08, 0x08}, // Disable HD Audio, + { 0x40, 0x3f, 0x80} // 14.1.3.1.1 of the PG: extended cfg mode for pcie. enable capability, but don't activate + }, b0d0f2[] = { + { 0x50, ~0x40, 0x88}, + { 0x51, 0x80, 0x7b}, + { 0x52, 0x90, 0x6f}, + { 0x53, 0x00, 0x88}, + { 0x54, 0xe4, 0x16}, + { 0x55, 0xf2, 0x04}, + { 0x56, 0x0f, 0x00}, + { 0x57, ~0x04, 0x00}, + { 0x5d, 0x00, 0xb2}, + { 0x5e, 0x00, 0x88}, + { 0x5f, 0x00, 0xc7}, + { 0x5c, 0x00, 0x01} + }; + + REGISTERPRESET(0, 0, 0, b0d0f0); + REGISTERPRESET(0, 0, 2, b0d0f2); + REGISTERPRESET(0, 0, 3, b0d0f3); + REGISTERPRESET(0, 1, 0, b0d1f0); + REGISTERPRESET(0, 17, 0, b0d17f0); + REGISTERPRESET(0, 17, 7, b0d17f7); + REGISTERPRESET(0, 19, 0, b0d19f0); +} diff --git a/src/northbridge/via/cx700/raminit.h b/src/northbridge/via/cx700/raminit.h new file mode 100644 index 0000000..811e3e1 --- /dev/null +++ b/src/northbridge/via/cx700/raminit.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __VIA_CX700_RAMINIT_H__ +#define __VIA_CX700_RAMINIT_H__ + +struct dram_cfg; +void sdram_enable(const struct dram_cfg *); + +#endif diff --git a/src/northbridge/via/cx700/registers.h b/src/northbridge/via/cx700/registers.h new file mode 100644 index 0000000..ce339d2 --- /dev/null +++ b/src/northbridge/via/cx700/registers.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __VIA_CX700_REGISTERS_H__ +#define __VIA_CX700_REGISTERS_H__ + +/* CX700 has 48 bytes of scratch registers in D0F4 starting at Reg. 0xd0 */ +#define SCRATCH_REG_BASE 0xd0 +#define SCRATCH_RANK_0 0xd0 +#define SCRATCH_RANK_1 0xd1 +#define SCRATCH_RANK_2 0xd2 +#define SCRATCH_RANK_3 0xd3 +#define SCRATCH_DIMM_NUM 0xd4 +#define SCRATCH_RANK_NUM 0xd5 +#define SCRATCH_RANK_MAP 0xd6 +#define SCRATCH_DRAM_FREQ 0xd7 +#define SCRATCH_DRAM_NB_ODT 0xd8 +#define SCRATCH_RANK0_SIZE_REG 0xe0 /* RxE0~RxE3 */ +#define SCRATCH_RANK0_MA_REG 0xe4 /* RxE4~RxE7 */ +#define SCRATCH_CHA_DQSI_LOW_REG 0xe8 +#define SCRATCH_CHA_DQSI_HIGH_REG 0xe9 +#define SCRATCH_ChA_DQSI_REG 0xea +#define SCRATCH_DRAM_256M_BIT 0xee +#define SCRATCH_FLAGS 0xef + +#define DDRII_666 0x5 +#define DDRII_533 0x4 +#define DDRII_400 0x3 +#define DDRII_333 0x2 +#define DDRII_266 0x1 +#define DDRII_200 0x0 + +#endif diff --git a/src/northbridge/via/cx700/romstage.c b/src/northbridge/via/cx700/romstage.c index f6999a3..b73dd91 100644 --- a/src/northbridge/via/cx700/romstage.c +++ b/src/northbridge/via/cx700/romstage.c @@ -3,10 +3,14 @@ #include <stddef.h> #include <stdint.h> #include <commonlib/bsd/helpers.h> +#include <device/device.h> #include <device/pci_ops.h> #include <static_devices.h> -#include <romstage_common.h> -#include <halt.h> +#include <arch/romstage.h> +#include <cbmem.h> + +#include "chip.h" +#include "raminit.h" static void tune_fsb(void) { @@ -41,13 +45,18 @@ pci_write_config8(_sdev_host_if, fsb_settings[i].reg, fsb_settings[i].val); } -void __noreturn romstage_main(void) +void mainboard_romstage_entry(void) { + const struct northbridge_via_cx700_config *config = config_of_soc(); + /* Allows access to all northbridge PCI devfn's */ pci_write_config8(_sdev_host_ctrl, 0x4f, 0x01); tune_fsb(); - /* Needed for __noreturn */ - halt(); + sdram_enable(&config->dram_cfg); + + cbmem_recovery(/* s3resume => */0); + + prepare_and_run_postcar(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/82770?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ibc36b4f314cdf47f18c8be0fcb98218c50938e94 Gerrit-Change-Number: 82770 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[S] Change in coreboot[main]: nb/via/cx700: Implement FSB tuning
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82769?usp=email ) Change subject: nb/via/cx700: Implement FSB tuning ...................................................................... nb/via/cx700: Implement FSB tuning This northbridge provides a lot of knobs for fine-grained tuning of the FSB drivers. The programming manual calls this "Host AGTL+ I/O Driving Control". We program the known good values for use with a VIA C7 CPU, and warn about use with different CPUs. The numbers were pulled out of raminit of the original CX700 port. Originally, there was a write to 0x83 as well, to set bit 1 which triggers a soft reset of the CPU. It was amidst a table, so it seems unclear if it was put there intentionally. Change-Id: I24ba6cfaab2ca3069952a6c399a065caea7b49f2 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/northbridge/via/cx700/romstage.c 1 file changed, 43 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/82769/1 diff --git a/src/northbridge/via/cx700/romstage.c b/src/northbridge/via/cx700/romstage.c index f4c5584..f6999a3 100644 --- a/src/northbridge/via/cx700/romstage.c +++ b/src/northbridge/via/cx700/romstage.c @@ -1,10 +1,53 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <stddef.h> +#include <stdint.h> +#include <commonlib/bsd/helpers.h> +#include <device/pci_ops.h> +#include <static_devices.h> #include <romstage_common.h> #include <halt.h> +static void tune_fsb(void) +{ + if (!CONFIG(CPU_VIA_C7)) { + printk(BIOS_WARNING, + "FSB settings are known for VIA C7 CPUs, P4 compat. is unknown.\n"); + } + static const struct { + uint8_t reg; + uint8_t val; + } fsb_settings[] = { + { 0x70, 0x33 }, + { 0x71, 0x11 }, + { 0x72, 0x33 }, + { 0x73, 0x11 }, + { 0x74, 0x20 }, + { 0x75, 0x2e }, + { 0x76, 0x64 }, + { 0x77, 0x00 }, + { 0x78, 0x44 }, + { 0x79, 0xaa }, + { 0x7a, 0x33 }, + { 0x7b, 0xaa }, + { 0x7c, 0x00 }, + { 0x7e, 0x33 }, + { 0x7f, 0x33 }, + { 0x80, 0x44 }, + { 0x81, 0x44 }, + { 0x82, 0x44 }, + }; + for (size_t i = 0; i < ARRAY_SIZE(fsb_settings); ++i) + pci_write_config8(_sdev_host_if, fsb_settings[i].reg, fsb_settings[i].val); +} + void __noreturn romstage_main(void) { + /* Allows access to all northbridge PCI devfn's */ + pci_write_config8(_sdev_host_ctrl, 0x4f, 0x01); + + tune_fsb(); + /* Needed for __noreturn */ halt(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/82769?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I24ba6cfaab2ca3069952a6c399a065caea7b49f2 Gerrit-Change-Number: 82769 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[S] Change in coreboot[main]: nb/via/cx700: Perform early bootblock init
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82768?usp=email ) Change subject: nb/via/cx700: Perform early bootblock init ...................................................................... nb/via/cx700: Perform early bootblock init Disable a timer (GP3) that is always running by default. And enable SMBus, which is useful this early as a console. The SMBus controller is mostly compatible to the Intel one. Change-Id: I77f179433b280d67860fc495605b5764ed081a6c Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/northbridge/via/cx700/Kconfig M src/northbridge/via/cx700/Makefile.mk A src/northbridge/via/cx700/bootblock.c A src/northbridge/via/cx700/early_smbus.c 4 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/82768/1 diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig index 95f289a..f2ba54e 100644 --- a/src/northbridge/via/cx700/Kconfig +++ b/src/northbridge/via/cx700/Kconfig @@ -5,6 +5,7 @@ select PCI select NO_ECAM_MMCONF_SUPPORT select HAVE_CF9_RESET + select SOUTHBRIDGE_INTEL_COMMON_SMBUS if NORTHBRIDGE_VIA_CX700 diff --git a/src/northbridge/via/cx700/Makefile.mk b/src/northbridge/via/cx700/Makefile.mk index 550ee2d..a7af6fd 100644 --- a/src/northbridge/via/cx700/Makefile.mk +++ b/src/northbridge/via/cx700/Makefile.mk @@ -1,7 +1,8 @@ ## SPDX-License-Identifier: GPL-2.0-only ifeq ($(CONFIG_NORTHBRIDGE_VIA_CX700),y) -romstage-y += romstage.c +bootblock-y += early_smbus.c bootblock.c +romstage-y += early_smbus.c romstage.c ramstage-y += chip.c all-y += clock.c reset.c diff --git a/src/northbridge/via/cx700/bootblock.c b/src/northbridge/via/cx700/bootblock.c new file mode 100644 index 0000000..cc048091 --- /dev/null +++ b/src/northbridge/via/cx700/bootblock.c @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <device/pci_ops.h> +#include <device/smbus_host.h> +#include <static_devices.h> +#include <arch/bootblock.h> + +#define MISC_CONFIG_1 0x94 +#define SMBUS_CLOCK_SELECT (1 << 7) + +#define GP2_GP3_TIMER_CONTROL 0x98 +#define GP3_TIMER_TICK_SELECT (3 << 4) + +#define SMBUS_IO_BASE 0xd0 +#define SMBUS_HOST_CONFIG 0xd2 +#define SMBUS_CLOCK_FROM_128K (1 << 2) +#define SMBUS_ENABLE (1 << 0) + +int smbus_enable_iobar(uintptr_t base) +{ + pci_and_config8(_sdev_lpc, MISC_CONFIG_1, (u8)~SMBUS_CLOCK_SELECT); /* 14.318MHz */ + pci_write_config16(_sdev_lpc, SMBUS_IO_BASE, base); + pci_or_config8(_sdev_lpc, SMBUS_HOST_CONFIG, SMBUS_CLOCK_FROM_128K | SMBUS_ENABLE); + return 0; +} + +void bootblock_early_northbridge_init(void) +{ + pci_and_config8(_sdev_lpc, GP2_GP3_TIMER_CONTROL, ~GP3_TIMER_TICK_SELECT); + + enable_smbus(); +} diff --git a/src/northbridge/via/cx700/early_smbus.c b/src/northbridge/via/cx700/early_smbus.c new file mode 100644 index 0000000..eb8a0f0 --- /dev/null +++ b/src/northbridge/via/cx700/early_smbus.c @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <device/smbus_host.h> + +uintptr_t smbus_base(void) +{ + return CONFIG_FIXED_SMBUS_IO_BASE; +} -- To view, visit https://review.coreboot.org/c/coreboot/+/82768?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I77f179433b280d67860fc495605b5764ed081a6c Gerrit-Change-Number: 82768 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[S] Change in coreboot[main]: nb/via/cx700: Add south module devices to chipset.cb
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82767?usp=email ) Change subject: nb/via/cx700: Add south module devices to chipset.cb ...................................................................... nb/via/cx700: Add south module devices to chipset.cb Change-Id: Ibd7a7b8c9e1461fa665bb72082489b9a48da63c3 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/northbridge/via/cx700/chipset.cb 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/82767/1 diff --git a/src/northbridge/via/cx700/chipset.cb b/src/northbridge/via/cx700/chipset.cb index 192fe22..d236bfb 100644 --- a/src/northbridge/via/cx700/chipset.cb +++ b/src/northbridge/via/cx700/chipset.cb @@ -10,6 +10,18 @@ device pci 00.7 alias north_end on end device pci 01.0 alias north_pci on end + device pci 0f.0 alias ata off end + device pci 10.0 alias uhci0 off end + device pci 10.1 alias uhci1 off end + device pci 10.2 alias uhci2 off end + device pci 10.4 alias ehci off end + device pci 11.0 alias lpc on end + device pci 11.7 alias south_end on end + device pci 13.0 alias pci0 off + device pci 01.0 alias hda off end + end + device pci 13.1 alias pci1 off end + end end -- To view, visit https://review.coreboot.org/c/coreboot/+/82767?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ibd7a7b8c9e1461fa665bb72082489b9a48da63c3 Gerrit-Change-Number: 82767 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[M] Change in coreboot[main]: cpu/via: Implement cache as RAM
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82766?usp=email ) Change subject: cpu/via: Implement cache as RAM ...................................................................... cpu/via: Implement cache as RAM The overall procedure is taken from the original code that was removed in commit 4c38ed3c38ac (cpu/via/nano: Drop support). Boilerplate at the start and end was updated (expect timestamp and BIST result in `xmm*' registers), stack is aligned to 16B, and linker symbols are now used for the CAR and cached XIP ranges. Change-Id: Ia190a3006fe897861b7b8a64d47e588871120dd1 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/via/c7/Kconfig M src/cpu/via/car/cache_as_ram.S 2 files changed, 162 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/82766/1 diff --git a/src/cpu/via/c7/Kconfig b/src/cpu/via/c7/Kconfig index df81b3f..b6a970b 100644 --- a/src/cpu/via/c7/Kconfig +++ b/src/cpu/via/c7/Kconfig @@ -14,4 +14,10 @@ config DCACHE_BSP_STACK_SIZE default 0x1000 +config DCACHE_RAM_BASE + default 0xffef0000 + +config DCACHE_RAM_SIZE + default 0x10000 + endif diff --git a/src/cpu/via/car/cache_as_ram.S b/src/cpu/via/car/cache_as_ram.S index 5c5066d..be9b9f3 100644 --- a/src/cpu/via/car/cache_as_ram.S +++ b/src/cpu/via/car/cache_as_ram.S @@ -1,13 +1,168 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -.section .init, "ax", @progbits +#include <cpu/x86/mtrr.h> +#include <cpu/x86/cache.h> +#include <cpu/x86/post_code.h> +.section .init .global bootblock_pre_c_entry .code32 +_cache_as_ram_setup: + bootblock_pre_c_entry: + +cache_as_ram: + post_code(POSTCODE_BOOTBLOCK_CAR) + + /* Disable cache. */ + movl %cr0, %eax + orl $CR0_CacheDisable, %eax + movl %eax, %cr0 + invd + + /* Set the default memory type and enable fixed and variable MTRRs. */ + movl $MTRR_DEF_TYPE_MSR, %ecx + xorl %edx, %edx + movl $(MTRR_DEF_TYPE_EN | MTRR_DEF_TYPE_FIX_EN), %eax + wrmsr + + /* Clear all MTRRs. */ + xorl %edx, %edx + movl $all_mtrr_msrs, %esi + +clear_fixed_var_mtrr: + lodsl (%esi), %eax + testl %eax, %eax + jz clear_fixed_var_mtrr_out + + movl %eax, %ecx + xorl %eax, %eax + wrmsr + + jmp clear_fixed_var_mtrr + +all_mtrr_msrs: + /* fixed MTRR MSRs */ + .long MTRR_FIX_64K_00000 + .long MTRR_FIX_16K_80000 + .long MTRR_FIX_16K_A0000 + .long MTRR_FIX_4K_C0000 + .long MTRR_FIX_4K_C8000 + .long MTRR_FIX_4K_D0000 + .long MTRR_FIX_4K_D8000 + .long MTRR_FIX_4K_E0000 + .long MTRR_FIX_4K_E8000 + .long MTRR_FIX_4K_F0000 + .long MTRR_FIX_4K_F8000 + + /* var MTRR MSRs */ + .long MTRR_PHYS_BASE(0) + .long MTRR_PHYS_MASK(0) + .long MTRR_PHYS_BASE(1) + .long MTRR_PHYS_MASK(1) + .long MTRR_PHYS_BASE(2) + .long MTRR_PHYS_MASK(2) + .long MTRR_PHYS_BASE(3) + .long MTRR_PHYS_MASK(3) + .long MTRR_PHYS_BASE(4) + .long MTRR_PHYS_MASK(4) + .long MTRR_PHYS_BASE(5) + .long MTRR_PHYS_MASK(5) + .long MTRR_PHYS_BASE(6) + .long MTRR_PHYS_MASK(6) + .long MTRR_PHYS_BASE(7) + .long MTRR_PHYS_MASK(7) + + .long 0x000 /* NULL, end of table */ + +clear_fixed_var_mtrr_out: + movl $MTRR_PHYS_BASE(0), %ecx + xorl %edx, %edx + movl $_car_mtrr_start, %eax + orl $MTRR_TYPE_WRBACK, %eax + wrmsr + + movl $MTRR_PHYS_MASK(0), %ecx + /* This assumes we never access addresses above 2^36 in CAR. */ + movl $0x0000000f, %edx + movl $_car_mtrr_mask, %eax + orl $MTRR_PHYS_MASK_VALID, %eax + wrmsr + + /* + * Enable write base caching so we can do execute in place (XIP) + * on the flash ROM. + */ + movl $MTRR_PHYS_BASE(1), %ecx + xorl %edx, %edx + movl $_program, %eax + andl $_xip_mtrr_mask, %eax + orl $MTRR_TYPE_WRBACK, %eax + wrmsr + + movl $MTRR_PHYS_MASK(1), %ecx + movl $0x0000000f, %edx + movl $_xip_mtrr_mask, %eax + orl $MTRR_PHYS_MASK_VALID, %eax + wrmsr + + /* Set the default memory type and enable fixed and variable MTRRs. */ + /* TODO: Or also enable fixed MTRRs? Bug in the code? */ + movl $MTRR_DEF_TYPE_MSR, %ecx + xorl %edx, %edx + movl $(MTRR_DEF_TYPE_EN), %eax + wrmsr + + /* Enable cache. */ + movl %cr0, %eax + andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax + movl %eax, %cr0 + + /* Read the range with lodsl. */ + cld + movl $_car_mtrr_start, %esi + movl %esi, %edi + movl $_car_mtrr_size, %ecx + shr $2, %ecx + movl %ecx, %ebx + rep lodsl + + /* Zero out the cache-as-ram area. */ + movl %ebx, %ecx + xorl %eax, %eax + rep stosl + + /* + * The key point of this CAR code is C7 cache does not turn into + * "no fill" mode, which is not compatible with general CAR code. + */ + + /* Setup the stack. */ + mov $_ecar_stack, %esp + + /* Need to align stack to 16 bytes at call instruction. Account for + the pushes below. */ + andl $0xfffffff0, %esp + subl $4, %esp + + /* push TSC and BIST to stack */ + movd %mm0, %eax + pushl %eax /* BIST */ + movd %mm2, %eax + pushl %eax /* tsc[63:32] */ + movd %mm1, %eax + pushl %eax /* tsc[31:0] */ + + /* Copy .data section content to Cache-As-Ram */ +#include <cpu/x86/copy_data_section.inc> + +before_c_entry: call bootblock_c_entry_bist + /* Should never see this postcode */ + post_code(POSTCODE_DEAD_CODE) + .Lhlt: hlt jmp .Lhlt -- To view, visit https://review.coreboot.org/c/coreboot/+/82766?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia190a3006fe897861b7b8a64d47e588871120dd1 Gerrit-Change-Number: 82766 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[M] Change in coreboot[main]: via: Start template for VIA C7 w/ CX700 northbridge
by Nico Huber (Code Review) 03 Jun '24

03 Jun '24

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82765?usp=email ) Change subject: via: Start template for VIA C7 w/ CX700 northbridge ...................................................................... via: Start template for VIA C7 w/ CX700 northbridge The first steps to bring C7 and CX700 support back mainline. Most is skeleton copied from the `min86' example. The romstage entry is placed in the northbridge code, as that's where we'll perform raminit. Support to read the FSB frequency is added right away, same for a reset function (using CF9 reset), as both are required for a minimal build test. A mainboard VIA EPIA-EX is also introduced for build testing, and in later stages boot testing as well. Change-Id: I66f678fae0d5a27bb09c0c6c702440900998e574 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/Makefile.mk A src/cpu/via/Kconfig A src/cpu/via/Makefile.mk A src/cpu/via/c7/Kconfig A src/cpu/via/c7/Makefile.mk A src/cpu/via/car/cache_as_ram.S A src/cpu/via/car/exit_car.S A src/mainboard/via/Kconfig A src/mainboard/via/Kconfig.name A src/mainboard/via/epia-ex/Kconfig A src/mainboard/via/epia-ex/Kconfig.name A src/mainboard/via/epia-ex/board_info.txt A src/mainboard/via/epia-ex/devicetree.cb A src/northbridge/via/cx700/Kconfig A src/northbridge/via/cx700/Makefile.mk A src/northbridge/via/cx700/chip.c A src/northbridge/via/cx700/chipset.cb A src/northbridge/via/cx700/clock.c A src/northbridge/via/cx700/reset.c A src/northbridge/via/cx700/romstage.c 20 files changed, 201 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/82765/1 diff --git a/src/cpu/Makefile.mk b/src/cpu/Makefile.mk index b1c1b1b..ef67e5e 100644 --- a/src/cpu/Makefile.mk +++ b/src/cpu/Makefile.mk @@ -7,6 +7,7 @@ subdirs-y += armltd subdirs-y += intel subdirs-y += ti +subdirs-y += via subdirs-$(CONFIG_ARCH_X86) += x86 subdirs-$(CONFIG_CPU_QEMU_X86) += qemu-x86 subdirs-$(CONFIG_CPU_POWER9) += power9 diff --git a/src/cpu/via/Kconfig b/src/cpu/via/Kconfig new file mode 100644 index 0000000..20f7c95 --- /dev/null +++ b/src/cpu/via/Kconfig @@ -0,0 +1 @@ +source "src/cpu/via/*/Kconfig" diff --git a/src/cpu/via/Makefile.mk b/src/cpu/via/Makefile.mk new file mode 100644 index 0000000..e8b7820 --- /dev/null +++ b/src/cpu/via/Makefile.mk @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +subdirs-$(CONFIG_CPU_VIA_C7) += c7 diff --git a/src/cpu/via/c7/Kconfig b/src/cpu/via/c7/Kconfig new file mode 100644 index 0000000..df81b3f --- /dev/null +++ b/src/cpu/via/c7/Kconfig @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config CPU_VIA_C7 + bool + select ARCH_X86 + select NO_SMM + select SSE2 + select UNKNOWN_TSC_RATE + select UDELAY_LAPIC + select LAPIC_MONOTONIC_TIMER + +if CPU_VIA_C7 + +config DCACHE_BSP_STACK_SIZE + default 0x1000 + +endif diff --git a/src/cpu/via/c7/Makefile.mk b/src/cpu/via/c7/Makefile.mk new file mode 100644 index 0000000..0890cee --- /dev/null +++ b/src/cpu/via/c7/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += ../car/cache_as_ram.S +bootblock-y += ../../intel/car/bootblock.c + +postcar-y += ../car/exit_car.S diff --git a/src/cpu/via/car/cache_as_ram.S b/src/cpu/via/car/cache_as_ram.S new file mode 100644 index 0000000..5c5066d --- /dev/null +++ b/src/cpu/via/car/cache_as_ram.S @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +.section .init, "ax", @progbits + +.global bootblock_pre_c_entry + +.code32 +bootblock_pre_c_entry: + call bootblock_c_entry_bist + +.Lhlt: + hlt + jmp .Lhlt diff --git a/src/cpu/via/car/exit_car.S b/src/cpu/via/car/exit_car.S new file mode 100644 index 0000000..0f1b227 --- /dev/null +++ b/src/cpu/via/car/exit_car.S @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +.global chipset_teardown_car + +.code32 +chipset_teardown_car: + /* Return to caller. */ + jmp *%esp diff --git a/src/mainboard/via/Kconfig b/src/mainboard/via/Kconfig new file mode 100644 index 0000000..8fff542 --- /dev/null +++ b/src/mainboard/via/Kconfig @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +if VENDOR_VIA + +choice + prompt "Mainboard model" + +source "src/mainboard/via/*/Kconfig.name" + +endchoice + +source "src/mainboard/via/*/Kconfig" + +config MAINBOARD_VENDOR + default "VIA" + +endif # VENDOR_VIA diff --git a/src/mainboard/via/Kconfig.name b/src/mainboard/via/Kconfig.name new file mode 100644 index 0000000..c3d6cfd --- /dev/null +++ b/src/mainboard/via/Kconfig.name @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config VENDOR_VIA + bool "VIA" diff --git a/src/mainboard/via/epia-ex/Kconfig b/src/mainboard/via/epia-ex/Kconfig new file mode 100644 index 0000000..76347f2 --- /dev/null +++ b/src/mainboard/via/epia-ex/Kconfig @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +if BOARD_VIA_EPIA_EX + +config BOARD_SPECIFIC_OPTIONS + def_bool y + select CPU_VIA_C7 + select NORTHBRIDGE_VIA_CX700 + select BOARD_ROMSIZE_KB_512 + select NO_UART_ON_SUPERIO + +config MAINBOARD_DIR + default "via/epia-ex" + +config MAINBOARD_PART_NUMBER + default "EPIA-EX" + +endif diff --git a/src/mainboard/via/epia-ex/Kconfig.name b/src/mainboard/via/epia-ex/Kconfig.name new file mode 100644 index 0000000..067e6b4 --- /dev/null +++ b/src/mainboard/via/epia-ex/Kconfig.name @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config BOARD_VIA_EPIA_EX + bool "EPIA-EX (work in progress)" diff --git a/src/mainboard/via/epia-ex/board_info.txt b/src/mainboard/via/epia-ex/board_info.txt new file mode 100644 index 0000000..b236799 --- /dev/null +++ b/src/mainboard/via/epia-ex/board_info.txt @@ -0,0 +1,8 @@ +Board name: EPIA-EX +Category: mini +Board URL: https://web.archive.org/web/20211129175218/https://www.viatech.com/en/suppo… +ROM package: PLCC +ROM protocol: LPC +ROM socketed: y +Flashrom support: y +Release year: 2006 diff --git a/src/mainboard/via/epia-ex/devicetree.cb b/src/mainboard/via/epia-ex/devicetree.cb new file mode 100644 index 0000000..3f76279 --- /dev/null +++ b/src/mainboard/via/epia-ex/devicetree.cb @@ -0,0 +1,6 @@ +chip northbridge/via/cx700 + + device domain 0 on + end + +end diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig new file mode 100644 index 0000000..95f289a --- /dev/null +++ b/src/northbridge/via/cx700/Kconfig @@ -0,0 +1,14 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config NORTHBRIDGE_VIA_CX700 + bool + select PCI + select NO_ECAM_MMCONF_SUPPORT + select HAVE_CF9_RESET + +if NORTHBRIDGE_VIA_CX700 + +config CHIPSET_DEVICETREE + default "northbridge/via/cx700/chipset.cb" + +endif diff --git a/src/northbridge/via/cx700/Makefile.mk b/src/northbridge/via/cx700/Makefile.mk new file mode 100644 index 0000000..550ee2d --- /dev/null +++ b/src/northbridge/via/cx700/Makefile.mk @@ -0,0 +1,8 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_NORTHBRIDGE_VIA_CX700),y) + +romstage-y += romstage.c +ramstage-y += chip.c +all-y += clock.c reset.c + +endif diff --git a/src/northbridge/via/cx700/chip.c b/src/northbridge/via/cx700/chip.c new file mode 100644 index 0000000..57583b8 --- /dev/null +++ b/src/northbridge/via/cx700/chip.c @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <device/device.h> + +struct chip_operations northbridge_via_cx700_ops = { NULL }; diff --git a/src/northbridge/via/cx700/chipset.cb b/src/northbridge/via/cx700/chipset.cb new file mode 100644 index 0000000..192fe22 --- /dev/null +++ b/src/northbridge/via/cx700/chipset.cb @@ -0,0 +1,15 @@ +chip northbridge/via/cx700 + + device domain 0 on + + device pci 00.0 alias host_ctrl on end + device pci 00.1 alias host_err on end + device pci 00.2 alias host_if on end + device pci 00.3 alias dram_ctrl on end + device pci 00.4 alias pm_ctrl on end + device pci 00.7 alias north_end on end + device pci 01.0 alias north_pci on end + + end + +end diff --git a/src/northbridge/via/cx700/clock.c b/src/northbridge/via/cx700/clock.c new file mode 100644 index 0000000..c29c2b2 --- /dev/null +++ b/src/northbridge/via/cx700/clock.c @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#define __SIMPLE_DEVICE__ +#include <console/console.h> +#include <device/pci_ops.h> +#include <static_devices.h> +#include <delay.h> + +static unsigned int read_timer_fsb(void) +{ + /* Allows access to all northbridge PCI devfn's */ + pci_write_config8(_sdev_host_ctrl, 0x4f, 0x01); + + const u8 misc_1 = pci_read_config8(_sdev_host_if, 0x54); + switch (misc_1 >> 5) { + case 0: + return 100; + case 1: + return 133; + default: + printk(BIOS_WARNING, "Unknown FSB frequency encoding: 0x%x\n", misc_1 >> 5); + return 100; + } +} + +u32 get_timer_fsb(void) +{ + static unsigned int fsb_mhz; + + if (!fsb_mhz) + fsb_mhz = read_timer_fsb(); + + return fsb_mhz; +} diff --git a/src/northbridge/via/cx700/reset.c b/src/northbridge/via/cx700/reset.c new file mode 100644 index 0000000..b052f1d --- /dev/null +++ b/src/northbridge/via/cx700/reset.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <reset.h> +#include <cf9_reset.h> + +void do_board_reset(void) +{ + full_reset(); +} diff --git a/src/northbridge/via/cx700/romstage.c b/src/northbridge/via/cx700/romstage.c new file mode 100644 index 0000000..f4c5584 --- /dev/null +++ b/src/northbridge/via/cx700/romstage.c @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <romstage_common.h> +#include <halt.h> + +void __noreturn romstage_main(void) +{ + /* Needed for __noreturn */ + halt(); +} -- To view, visit https://review.coreboot.org/c/coreboot/+/82765?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I66f678fae0d5a27bb09c0c6c702440900998e574 Gerrit-Change-Number: 82765 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

[L] Change in coreboot[main]: mb/asrock: Add Z97E-ITX/ac (Haswell/Broadwell)
by Jan Philipp Groß (Code Review) 03 Jun '24

03 Jun '24

Attention is currently required from: Angel Pons. Jan Philipp Groß has posted comments on this change by Jan Philipp Groß. ( https://review.coreboot.org/c/coreboot/+/82760?usp=email ) Change subject: mb/asrock: Add Z97E-ITX/ac (Haswell/Broadwell) ...................................................................... Patch Set 2: (2 comments) Patchset: PS1: > Welcome to coreboot Gerrit! Thank you Angel! Patchset: PS2: Thank you Angel! -- To view, visit https://review.coreboot.org/c/coreboot/+/82760?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3b940e9281814e8360900221714c0dfa3ae39540 Gerrit-Change-Number: 82760 Gerrit-PatchSet: 2 Gerrit-Owner: Jan Philipp Groß <jeangrande(a)mailbox.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 02 Jun 2024 22:49:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2024