by Arthur Heymans (Code Review)
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30432
Change subject: drivers/smmstore: Fix some issues
......................................................................
drivers/smmstore: Fix some issues
This fixes the following:
- Make the API ARCH independent (no dependency on size_t)
- clean up the code a little
Change-Id: I629be25d2a9b65796ae8f7a700b6bdab57b91b22
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/drivers/smmstore/store.c
M src/include/smmstore.h
M src/soc/intel/common/block/smm/smihandler.c
3 files changed, 86 insertions(+), 67 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/30432/1
diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c
index 409949a..0a62b3c 100644
--- a/src/drivers/smmstore/store.c
+++ b/src/drivers/smmstore/store.c
@@ -62,8 +62,8 @@
if (cbfs_locate_file_in_region(&file,
CONFIG_SMMSTORE_REGION,
CONFIG_SMMSTORE_FILENAME, NULL) < 0) {
- printk(BIOS_WARNING, "smm store: "
- "Unable to find SMM store file in region '%s'\n",
+ printk(BIOS_WARNING,
+ "smm store: Unable to find SMM store file in region '%s'\n",
CONFIG_SMMSTORE_REGION);
return -1;
}
@@ -87,14 +87,13 @@
* returns 0 on success, -1 on failure
* writes up to `*bufsize` bytes into `buf` and updates `*bufsize`
*/
-int smmstore_read_region(void *buf, ssize_t *bufsize)
+int smmstore_read_region(void *buf, uint32_t *bufsize)
{
struct region_device store;
if (bufsize == NULL)
return -1;
- *bufsize = 0;
if (lookup_store(&store) < 0) {
printk(BIOS_WARNING, "reading region failed\n");
return -1;
@@ -109,6 +108,66 @@
return 0;
}
+static enum cb_err scan_end(ssize_t *end)
+{
+ struct region_device store;
+
+ if (lookup_store(&store) < 0) {
+ printk(BIOS_WARNING, "reading region failed\n");
+ return CB_ERR;
+ }
+ ssize_t data_sz = region_device_sz(&store);
+
+ /* scan for end */
+ *end = 0;
+ uint32_t k_sz, v_sz;
+ while (*end < data_sz) {
+ /* make odd corner cases identifiable, eg. invalid v_sz */
+ k_sz = 0;
+
+ if (rdev_readat(&store, &k_sz, *end, sizeof(k_sz)) < 0) {
+ printk(BIOS_WARNING, "failed reading key size\n");
+ return CB_ERR;
+ }
+
+ /* found the end */
+ if (k_sz == 0xffffffff)
+ break;
+
+ /* something is fishy here:
+ * Avoid wrapping (since data_size < MAX_UINT32_T / 2) while
+ * other problems are covered by the loop condition
+ */
+ if (k_sz > data_sz) {
+ printk(BIOS_WARNING, "key size out of bounds\n");
+ return CB_ERR;
+ }
+
+ if (rdev_readat(&store, &v_sz, *end + 4, sizeof(v_sz)) < 0) {
+ printk(BIOS_WARNING, "failed reading value size\n");
+ return CB_ERR;
+ }
+
+ if (v_sz > data_sz) {
+ printk(BIOS_WARNING, "value size out of bounds\n");
+ return CB_ERR;
+ }
+
+ *end += sizeof(k_sz) + sizeof(v_sz) + k_sz + v_sz + 1;
+ *end = ALIGN_UP(*end, sizeof(uint32_t));
+ }
+
+ printk(BIOS_WARNING, "used smm store size might be 0x%zx bytes\n", *end);
+
+ if (k_sz != 0xffffffff) {
+ printk(BIOS_WARNING,
+ "eof of data marker looks invalid: 0x%x\n", k_sz);
+ return CB_ERR;
+ }
+
+ return CB_SUCCESS;
+
+}
/*
* Append data to region
*
@@ -124,78 +183,38 @@
return -1;
}
- ssize_t data_sz = region_device_sz(&store);
-
- /* scan for end */
- ssize_t end = 0;
- uint32_t k_sz, v_sz;
- while (end < data_sz) {
- /* make odd corner cases identifiable, eg. invalid v_sz */
- k_sz = 0;
-
- if (rdev_readat(&store, &k_sz, end, sizeof(k_sz)) < 0) {
- printk(BIOS_WARNING, "failed reading key size\n");
- return -1;
- }
-
- /* found the end */
- if (k_sz == 0xffffffff)
- break;
-
- /* something is fishy here:
- * Avoid wrapping (since data_size < MAX_UINT32_T / 2) while
- * other problems are covered by the loop condition
- */
- if (k_sz > data_sz) {
- printk(BIOS_WARNING, "key size out of bounds\n");
- return -1;
- }
-
- if (rdev_readat(&store, &v_sz, end + 4, sizeof(v_sz)) < 0) {
- printk(BIOS_WARNING, "failed reading value size\n");
- return -1;
- }
-
- if (v_sz > data_sz) {
- printk(BIOS_WARNING, "value size out of bounds\n");
- return -1;
- }
-
- end += 8 + k_sz + v_sz + 1;
- end = ALIGN_UP(end, sizeof(uint32_t));
- }
-
- printk(BIOS_WARNING, "used smm store size might be 0x%zx bytes\n", end);
-
- if (k_sz != 0xffffffff) {
- printk(BIOS_WARNING,
- "eof of data marker looks invalid: 0x%x\n", k_sz);
+ ssize_t end;
+ if (scan_end(&end) == CB_ERR)
return -1;
- }
printk(BIOS_WARNING, "used size looks legit\n");
printk(BIOS_WARNING, "open (%zx, %zx) for writing\n",
region_device_offset(&store), region_device_sz(&store));
- if (boot_device_rw_subregion(&store.region, &store) < 0) {
+ if (boot_device_rw_subregion(region_device_region(&store), &store) < 0) {
printk(BIOS_WARNING, "couldn't open store for writing\n");
return -1;
}
- uint32_t record_sz = 8 + key_sz + value_sz + 1;
- if (end + record_sz >= data_sz) {
+ struct region subregion =
+ {
+ .offset = end,
+ .size = sizeof(key_sz) + sizeof(value_sz) + key_sz + value_sz + 1,
+ };
+
+ if (region_is_subregion(region_device_region(&store), &subregion)) {
printk(BIOS_WARNING, "not enough space for new data\n");
return -1;
}
- if (rdev_writeat(&store, &key_sz, end, 4) != 4) {
+ if (rdev_writeat(&store, &key_sz, end, sizeof(key_sz) != sizeof(key_sz))) {
printk(BIOS_WARNING, "failed writing key size\n");
}
- end += 4;
- if (rdev_writeat(&store, &value_sz, end, 4) != 4) {
+ end += sizeof(key_sz);
+ if (rdev_writeat(&store, &value_sz, end, sizeof(value_sz) != sizeof(key_sz))) {
printk(BIOS_WARNING, "failed writing value size\n");
}
- end += 4;
+ end += sizeof(value_sz);
if (rdev_writeat(&store, key, end, key_sz) != key_sz) {
printk(BIOS_WARNING, "failed writing key data\n");
}
@@ -205,7 +224,7 @@
}
end += value_sz;
uint8_t nul = 0;
- if (rdev_writeat(&store, &nul, end, 1) != 1) {
+ if (rdev_writeat(&store, &nul, end, sizeof(nul)) != sizeof(nul)) {
printk(BIOS_WARNING, "failed writing termination\n");
}
diff --git a/src/include/smmstore.h b/src/include/smmstore.h
index a535c5b..30a8191 100644
--- a/src/include/smmstore.h
+++ b/src/include/smmstore.h
@@ -28,22 +28,22 @@
#define SMMSTORE_CMD_APPEND 3
struct smmstore_params_read {
- void *buf;
- ssize_t bufsize;
+ uint32_t *buf;
+ uint32_t bufsize;
};
struct smmstore_params_append {
- void *key;
- size_t keysize;
- void *val;
- size_t valsize;
+ uint32_t *key;
+ uint32_t keysize;
+ uint32_t *val;
+ uint32_t valsize;
};
/* SMM responder */
uint32_t smmstore_exec(uint8_t command, void *param);
/* implementation */
-int smmstore_read_region(void *buf, ssize_t *bufsize);
+int smmstore_read_region(void *buf, uint32_t *bufsize);
int smmstore_append_data(void *key, uint32_t key_sz,
void *value, uint32_t value_sz);
int smmstore_clear_region(void);
diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 2ffc00f..c125c0c 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -311,7 +311,7 @@
reg_ebx = save_state_ops->get_reg(io_smi, RBX);
/* drivers/smmstore/smi.c */
- ret = smmstore_exec(sub_command, (void *)reg_ebx);
+ ret = smmstore_exec(sub_command, (uintptr_t *)reg_ebx);
save_state_ops->set_reg(io_smi, RAX, ret);
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/30432
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I629be25d2a9b65796ae8f7a700b6bdab57b91b22
Gerrit-Change-Number: 30432
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
by Arthur Heymans (Code Review)
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30470
Change subject: mb/intel/dg41wv: Inherit the subsystemid
......................................................................
mb/intel/dg41wv: Inherit the subsystemid
Don't reprogram the same subsystemid for each PCI device.
Change-Id: Ieaeef728e200bfa826c4ae25de3e8532c493c877
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/mainboard/intel/dg41wv/devicetree.cb
1 file changed, 23 insertions(+), 46 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/30470/1
diff --git a/src/mainboard/intel/dg41wv/devicetree.cb b/src/mainboard/intel/dg41wv/devicetree.cb
index d96ad95..da91ea2 100644
--- a/src/mainboard/intel/dg41wv/devicetree.cb
+++ b/src/mainboard/intel/dg41wv/devicetree.cb
@@ -24,14 +24,10 @@
end
end
device domain 0 on # PCI domain
- subsystemid 0x1458 0x5000 inherit
- device pci 0.0 on # Host Bridge
- subsystemid 0x8086 0x5756
- end
+ subsystemid 0x8086 0x5756 inherit
+ device pci 0.0 on end # Host Bridge
device pci 1.0 on end # PEG
- device pci 2.0 on # Integrated graphics controller
- subsystemid 0x8086 0x5756
- end
+ device pci 2.0 on end # Integrated graphics controller
chip southbridge/intel/i82801gx # Southbridge
register "pirqa_routing" = "0x0b"
register "pirqb_routing" = "0x0b"
@@ -66,39 +62,24 @@
register "sata_ahci" = "0x0" # AHCI not supported on this ICH7 variant
register "gpe0_en" = "0x440"
- device pci 1b.0 on # Audio
- subsystemid 0x8086 0x5756
+ device pci 1b.0 on end # Audio
+ device pci 1c.0 on end # PCIe 1
+ device pci 1c.1 on # PCIe 2: NIC
+ device pci 00.0 on end
end
- device pci 1c.0 on end # PCIe 1
- device pci 1c.1 on # PCIe 2: NIC
- device pci 00.0 on
- subsystemid 0x8086 0x5756
- end
- end
- device pci 1c.2 off end # PCIe 3
- device pci 1c.3 off end # PCIe 4
- device pci 1c.4 off end # PCIe 5
- device pci 1c.5 off end # PCIe 6
- device pci 1d.0 on # USB
- subsystemid 0x8086 0x5756
- end
- device pci 1d.1 on # USB
- subsystemid 0x8086 0x5756
- end
- device pci 1d.2 on # USB
- subsystemid 0x8086 0x5756
- end
- device pci 1d.3 on # USB
- subsystemid 0x8086 0x5756
- end
- device pci 1d.7 on # USB
- subsystemid 0x8086 0x5756
- end
- device pci 1e.0 on end # PCI bridge
- device pci 1e.2 off end # AC'97 Audio Controller
- device pci 1e.3 off end # AC'97 Modem Controller
- device pci 1f.0 on # ISA bridge
- subsystemid 0x8086 0x5756
+ device pci 1c.2 off end # PCIe 3
+ device pci 1c.3 off end # PCIe 4
+ device pci 1c.4 off end # PCIe 5
+ device pci 1c.5 off end # PCIe 6
+ device pci 1d.0 on end # USB
+ device pci 1d.1 on end # USB
+ device pci 1d.2 on end # USB
+ device pci 1d.3 on end # USB
+ device pci 1d.7 on end # USB
+ device pci 1e.0 on end # PCI bridge
+ device pci 1e.2 off end # AC'97 Audio Controller
+ device pci 1e.3 off end # AC'97 Modem Controller
+ device pci 1f.0 on # ISA bridge
chip superio/winbond/w83627dhg
device pnp 2e.0 on # Floppy
# global
@@ -155,12 +136,9 @@
end
end
device pci 1f.1 off end # PATA/IDE
- device pci 1f.2 on # SATA
- subsystemid 0x8086 0x5756
- end
- device pci 1f.3 on # SMbus
- subsystemid 0x8086 0x5756
- chip drivers/i2c/ck505
+ device pci 1f.2 on end # SATA
+ device pci 1f.3 on # SMbus
+ chip drivers/i2c/ck505
register "mask" = "{ 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff,
@@ -173,7 +151,6 @@
0x06, 0x00, 0xea }"
device i2c 69 on end
end
-
end
end
end
--
To view, visit https://review.coreboot.org/c/coreboot/+/30470
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ieaeef728e200bfa826c4ae25de3e8532c493c877
Gerrit-Change-Number: 30470
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
by Xiang Wang (Code Review)
Xiang Wang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30466
Change subject: fu540: add code to initialize flash
......................................................................
fu540: add code to initialize flash
SiFive's ZSBL has initialized flash, but only 16MB of space is
available. I fixed it to use all 32MB.
Change-Id: I8cd803369da5526eff90400c15b91bbf6b477c69
Signed-off-by: Xiang Wang <wxjstz(a)126.com>
---
M src/mainboard/sifive/hifive-unleashed/Makefile.inc
A src/mainboard/sifive/hifive-unleashed/bootblock.c
A src/mainboard/sifive/hifive-unleashed/flash.c
M src/mainboard/sifive/hifive-unleashed/romstage.c
M src/soc/sifive/fu540/Makefile.inc
A src/soc/sifive/fu540/include/soc/spi.h
A src/soc/sifive/fu540/include/soc/spi_flash.h
A src/soc/sifive/fu540/spi.c
8 files changed, 506 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/30466/1
diff --git a/src/mainboard/sifive/hifive-unleashed/Makefile.inc b/src/mainboard/sifive/hifive-unleashed/Makefile.inc
index 27ddcba..2dac283 100644
--- a/src/mainboard/sifive/hifive-unleashed/Makefile.inc
+++ b/src/mainboard/sifive/hifive-unleashed/Makefile.inc
@@ -11,6 +11,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+bootblock-y += flash.c
+bootblock-y += bootblock.c
+
+romstage-y += flash.c
romstage-y += romstage.c
bootblock-y += memlayout.ld
diff --git a/src/mainboard/sifive/hifive-unleashed/bootblock.c b/src/mainboard/sifive/hifive-unleashed/bootblock.c
new file mode 100644
index 0000000..777b2aa
--- /dev/null
+++ b/src/mainboard/sifive/hifive-unleashed/bootblock.c
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 HardenedLinux
+ *
+ * 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 <soc/addressmap.h>
+#include <soc/spi.h>
+#include <soc/spi_flash.h>
+#include <soc/clock.h>
+
+extern void flash_init(void);
+extern void bootblock_mainboard_init(void);
+
+void bootblock_mainboard_init(void)
+{
+ flash_init();
+}
diff --git a/src/mainboard/sifive/hifive-unleashed/flash.c b/src/mainboard/sifive/hifive-unleashed/flash.c
new file mode 100644
index 0000000..a29ac24
--- /dev/null
+++ b/src/mainboard/sifive/hifive-unleashed/flash.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 HardenedLinux
+ *
+ * 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 <soc/addressmap.h>
+#include <soc/spi.h>
+#include <soc/spi_flash.h>
+#include <soc/clock.h>
+
+extern void flash_init(void);
+
+const static spi_reg_ffmt ffmt= {
+ .cmd_en = 1,
+ .addr_len = 4,
+ .pad_cnt = 8,
+ .command_proto = SPI_PROTO_S,
+ .addr_proto = SPI_PROTO_S,
+ .data_proto = SPI_PROTO_Q,
+ .command_code = 0x6c
+};
+
+
+void flash_init(void)
+{
+ initialize_spi_flash_mmap_quad(
+ (spi_ctrl*)FU540_QSPI0,
+ clock_get_tlclk_khz(),
+ ffmt.raw_bits,
+ 0x66,
+ 0x99);
+}
diff --git a/src/mainboard/sifive/hifive-unleashed/romstage.c b/src/mainboard/sifive/hifive-unleashed/romstage.c
index 8277141..1675aca 100644
--- a/src/mainboard/sifive/hifive-unleashed/romstage.c
+++ b/src/mainboard/sifive/hifive-unleashed/romstage.c
@@ -21,6 +21,8 @@
#include <soc/clock.h>
#include <soc/sdram.h>
+extern void flash_init(void);
+
void main(void)
{
console_init();
@@ -39,6 +41,7 @@
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL))
uart_init(CONFIG_UART_FOR_CONSOLE);
+ flash_init();
sdram_init();
cbmem_initialize_empty();
diff --git a/src/soc/sifive/fu540/Makefile.inc b/src/soc/sifive/fu540/Makefile.inc
index 4f62f3e..83c7b1c 100644
--- a/src/soc/sifive/fu540/Makefile.inc
+++ b/src/soc/sifive/fu540/Makefile.inc
@@ -18,6 +18,7 @@
bootblock-y += media.c
bootblock-y += bootblock.c
bootblock-y += clock.c
+bootblock-y += spi.c
romstage-y += uart.c
romstage-y += clint.c
@@ -26,6 +27,7 @@
romstage-y += cbmem.c
romstage-y += otp.c
romstage-y += clock.c
+romstage-y += spi.c
ramstage-y += uart.c
ramstage-y += clint.c
@@ -34,6 +36,7 @@
ramstage-y += cbmem.c
ramstage-y += otp.c
ramstage-y += clock.c
+ramstage-y += spi.c
CPPFLAGS_common += -Isrc/soc/sifive/fu540/include
diff --git a/src/soc/sifive/fu540/include/soc/spi.h b/src/soc/sifive/fu540/include/soc/spi.h
new file mode 100644
index 0000000..c40ae7c
--- /dev/null
+++ b/src/soc/sifive/fu540/include/soc/spi.h
@@ -0,0 +1,266 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 SiFive, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#ifndef __SOC_SIFIVE_HIFIVE_U_SPI_H__
+#define __SOC_SIFIVE_HIFIVE_U_SPI_H__
+
+#include <stdint.h>
+
+#define _ASSERT_SIZEOF(type, size) _Static_assert(sizeof(type) == (size), #type " must be " #size " bytes wide")
+
+typedef union
+{
+ struct
+ {
+ uint32_t pha : 1;
+ uint32_t pol : 1;
+ uint32_t reserved : 30;
+ };
+ uint32_t raw_bits;
+} spi_reg_sckmode;
+_ASSERT_SIZEOF(spi_reg_sckmode, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t mode : 2;
+ uint32_t reserved : 30;
+ };
+ uint32_t raw_bits;
+} spi_reg_csmode;
+_ASSERT_SIZEOF(spi_reg_csmode, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t cssck : 8;
+ uint32_t reserved0 : 8;
+ uint32_t sckcs : 8;
+ uint32_t reserved1 : 8;
+ };
+ uint32_t raw_bits;
+} spi_reg_delay0;
+_ASSERT_SIZEOF(spi_reg_delay0, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t intercs : 8;
+ uint32_t reserved0 : 8;
+ uint32_t interxfr : 8;
+ uint32_t reserved1 : 8;
+ };
+ uint32_t raw_bits;
+} spi_reg_delay1;
+_ASSERT_SIZEOF(spi_reg_delay1, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t proto : 2;
+ uint32_t endian : 1;
+ uint32_t dir : 1;
+ uint32_t reserved0 : 12;
+ uint32_t len : 4;
+ uint32_t reserved1 : 12;
+ };
+ uint32_t raw_bits;
+} spi_reg_fmt;
+_ASSERT_SIZEOF(spi_reg_fmt, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t data : 8;
+ uint32_t reserved : 23;
+ uint32_t full : 1;
+ };
+ uint32_t raw_bits;
+} spi_reg_txdata;
+_ASSERT_SIZEOF(spi_reg_txdata, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t data : 8;
+ uint32_t reserved : 23;
+ uint32_t empty : 1;
+ };
+ uint32_t raw_bits;
+} spi_reg_rxdata;
+_ASSERT_SIZEOF(spi_reg_rxdata, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t txmark : 3;
+ uint32_t reserved : 29;
+ };
+ uint32_t raw_bits;
+} spi_reg_txmark;
+_ASSERT_SIZEOF(spi_reg_txmark, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t rxmark : 3;
+ uint32_t reserved : 29;
+ };
+ uint32_t raw_bits;
+} spi_reg_rxmark;
+_ASSERT_SIZEOF(spi_reg_rxmark, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t en : 1;
+ uint32_t reserved : 31;
+ };
+ uint32_t raw_bits;
+} spi_reg_fctrl;
+_ASSERT_SIZEOF(spi_reg_fctrl, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t cmd_en : 1;
+ uint32_t addr_len : 3;
+ uint32_t pad_cnt : 4;
+ uint32_t command_proto : 2;
+ uint32_t addr_proto : 2;
+ uint32_t data_proto : 2;
+ uint32_t reserved : 2;
+ uint32_t command_code : 8;
+ uint32_t pad_code : 8;
+ };
+ uint32_t raw_bits;
+} spi_reg_ffmt;
+_ASSERT_SIZEOF(spi_reg_ffmt, 4);
+
+
+typedef union
+{
+ struct
+ {
+ uint32_t txwm : 1;
+ uint32_t rxwm : 1;
+ uint32_t reserved : 30;
+ };
+ uint32_t raw_bits;
+} spi_reg_ie;
+typedef spi_reg_ie spi_reg_ip;
+_ASSERT_SIZEOF(spi_reg_ie, 4);
+_ASSERT_SIZEOF(spi_reg_ip, 4);
+
+#undef _ASSERT_SIZEOF
+
+
+/**
+ * SPI control register memory map.
+ *
+ * All functions take a pointer to a SPI device's control registers.
+ */
+typedef volatile struct
+{
+ uint32_t sckdiv;
+ spi_reg_sckmode sckmode;
+ uint32_t reserved08;
+ uint32_t reserved0c;
+
+ uint32_t csid;
+ uint32_t csdef;
+ spi_reg_csmode csmode;
+ uint32_t reserved1c;
+
+ uint32_t reserved20;
+ uint32_t reserved24;
+ spi_reg_delay0 delay0;
+ spi_reg_delay1 delay1;
+
+ uint32_t reserved30;
+ uint32_t reserved34;
+ uint32_t reserved38;
+ uint32_t reserved3c;
+
+ spi_reg_fmt fmt;
+ uint32_t reserved44;
+ spi_reg_txdata txdata;
+ spi_reg_rxdata rxdata;
+
+ spi_reg_txmark txmark;
+ spi_reg_rxmark rxmark;
+ uint32_t reserved58;
+ uint32_t reserved5c;
+
+ spi_reg_fctrl fctrl;
+ spi_reg_ffmt ffmt;
+ uint32_t reserved68;
+ uint32_t reserved6c;
+
+ spi_reg_ie ie;
+ spi_reg_ip ip;
+} spi_ctrl;
+
+
+void spi_tx(spi_ctrl* spictrl, uint8_t in);
+uint8_t spi_rx(spi_ctrl* spictrl);
+uint8_t spi_txrx(spi_ctrl* spictrl, uint8_t in);
+
+// Inlining header functions in C
+// https://stackoverflow.com/a/23699777/7433423
+
+/**
+ * Get smallest clock divisor that divides input_khz to a quotient less than or
+ * equal to max_target_khz;
+ */
+static inline unsigned int spi_min_clk_divisor(unsigned int input_khz, unsigned int max_target_khz)
+{
+ // f_sck = f_in / (2 * (div + 1)) => div = (f_in / (2*f_sck)) - 1
+ //
+ // The nearest integer solution for div requires rounding up as to not exceed
+ // max_target_khz.
+ //
+ // div = ceil(f_in / (2*f_sck)) - 1
+ // = floor((f_in - 1 + 2*f_sck) / (2*f_sck)) - 1
+ //
+ // This should not overflow as long as (f_in - 1 + 2*f_sck) does not exceed
+ // 2^32 - 1, which is unlikely since we represent frequencies in kHz.
+ unsigned int quotient = (input_khz + 2 * max_target_khz - 1) / (2 * max_target_khz);
+ // Avoid underflow
+ if (quotient == 0)
+ return 0;
+ return quotient - 1;
+}
+
+#endif /* __SOC_SIFIVE_HIFIVE_U_SPI_H__ */
diff --git a/src/soc/sifive/fu540/include/soc/spi_flash.h b/src/soc/sifive/fu540/include/soc/spi_flash.h
new file mode 100644
index 0000000..9926b82
--- /dev/null
+++ b/src/soc/sifive/fu540/include/soc/spi_flash.h
@@ -0,0 +1,103 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 SiFive, Inc
+ * Copyright (C) 2018 HardenedLinux
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __SOC_SIFIVE_HIFIVE_U_SPI_FLASH_H__
+#define __SOC_SIFIVE_HIFIVE_U_SPI_FLASH_H__
+
+#include <soc/spi.h>
+#include <stdint.h>
+
+#define SPI_PROTO_S 0
+#define SPI_PROTO_D 1
+#define SPI_PROTO_Q 2
+
+/**
+ * Set up SPI for direct, non-memory-mapped access.
+ */
+
+static inline int initialize_spi_flash_direct(
+ spi_ctrl* spictrl,
+ unsigned int spi_clk_input_khz,
+ unsigned int command_enable,
+ unsigned int command_reset)
+{
+ // Max desired SPI clock is 10MHz
+ spictrl->sckdiv = spi_min_clk_divisor(spi_clk_input_khz, 10000);
+
+ spictrl->fctrl.en = 0;
+
+ spi_txrx(spictrl, command_enable);
+ spi_txrx(spictrl, command_reset);
+
+ return 0;
+}
+
+static inline int _initialize_spi_flash_mmap(
+ spi_ctrl* spictrl,
+ unsigned int spi_clk_input_khz,
+ uint32_t ffmt_rawbits,
+ unsigned int command_enable,
+ unsigned int command_reset)
+{
+ // Max desired SPI clock is 10MHz
+ spictrl->sckdiv = spi_min_clk_divisor(spi_clk_input_khz, 10000);
+
+ spictrl->fctrl.en = 0;
+
+ spi_txrx(spictrl, command_enable);
+ spi_txrx(spictrl, command_reset);
+
+ spictrl->ffmt.raw_bits = ffmt_rawbits;
+
+ spictrl->fctrl.en = 1;
+ __asm__ __volatile__ ("fence io, io");
+ return 0;
+}
+
+
+static inline int initialize_spi_flash_mmap_single(
+ spi_ctrl* spictrl,
+ unsigned int spi_clk_input_khz,
+ uint32_t ffmt_rawbits,
+ unsigned int command_enable,
+ unsigned int command_reset)
+{
+ return _initialize_spi_flash_mmap(
+ spictrl,
+ spi_clk_input_khz,
+ ffmt_rawbits,
+ command_enable,
+ command_reset);
+}
+
+
+static inline int initialize_spi_flash_mmap_quad(
+ spi_ctrl* spictrl,
+ unsigned int spi_clk_input_khz,
+ uint32_t ffmt_rawbits,
+ unsigned int command_enable,
+ unsigned int command_reset)
+{
+ return _initialize_spi_flash_mmap(
+ spictrl,
+ spi_clk_input_khz,
+ ffmt_rawbits,
+ command_enable,
+ command_reset);
+}
+
+#endif /* __SOC_SIFIVE_HIFIVE_U_SPI_FLASH_H__ */
+
diff --git a/src/soc/sifive/fu540/spi.c b/src/soc/sifive/fu540/spi.c
new file mode 100644
index 0000000..01a58dd
--- /dev/null
+++ b/src/soc/sifive/fu540/spi.c
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 SiFive, Inc
+ *
+ * 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 <soc/spi.h>
+
+/**
+ * Wait until SPI is ready for transmission and transmit byte.
+ */
+void spi_tx(spi_ctrl* spictrl, uint8_t in)
+{
+#if __riscv_atomic
+ int32_t r;
+ do {
+ asm volatile (
+ "amoor.w %0, %2, %1\n"
+ : "=r" (r), "+A" (spictrl->txdata.raw_bits)
+ : "r" (in)
+ );
+ } while (r < 0);
+#else
+ while ((int32_t) spictrl->txdata.raw_bits < 0);
+ spictrl->txdata.data = in;
+#endif
+}
+
+
+/**
+ * Wait until SPI receive queue has data and read byte.
+ */
+uint8_t spi_rx(spi_ctrl* spictrl)
+{
+ int32_t out;
+ while ((out = (int32_t) spictrl->rxdata.raw_bits) < 0);
+ return (uint8_t) out;
+}
+
+
+/**
+ * Transmit a byte and receive a byte.
+ */
+uint8_t spi_txrx(spi_ctrl* spictrl, uint8_t in)
+{
+ spi_tx(spictrl, in);
+ return spi_rx(spictrl);
+}
+
--
To view, visit https://review.coreboot.org/c/coreboot/+/30466
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8cd803369da5526eff90400c15b91bbf6b477c69
Gerrit-Change-Number: 30466
Gerrit-PatchSet: 1
Gerrit-Owner: Xiang Wang <wxjstz(a)126.com>
Gerrit-MessageType: newchange
by Arthur Heymans (Code Review)
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30504
Change subject: x86/smmstub: Fix compiling with external toolchains
......................................................................
x86/smmstub: Fix compiling with external toolchains
Change-Id: I298d24d54b8fb27da96257ccda65b7fbee988ebb
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/cpu/x86/smm/Makefile.inc
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/30504/1
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc
index 32f5ea7..e6add1d 100644
--- a/src/cpu/x86/smm/Makefile.inc
+++ b/src/cpu/x86/smm/Makefile.inc
@@ -47,8 +47,8 @@
# SMM Stub Module. The stub is used as a trampoline for relocation and normal
# SMM handling.
-$(obj)/smmstub/smmstub.o: $$(smmstub-objs)
- $(CC_smmstub) $(CFLAGS_smmstub) -nostdlib -r -o $@ $^
+$(obj)/smmstub/smmstub.o: $$(smmstub-objs) $(COMPILER_RT_smmstub)
+ $(LD_smmstub) -nostdlib -r -o $@ $(COMPILER_RT_FLAGS_smmstub) --whole-archive --start-group $(smmstub-objs) --no-whole-archive $(COMPILER_RT_smmstub) --end-group
# Link the SMM stub module with a 0-byte heap.
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
--
To view, visit https://review.coreboot.org/c/coreboot/+/30504
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I298d24d54b8fb27da96257ccda65b7fbee988ebb
Gerrit-Change-Number: 30504
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
by Matt DeVillier (Code Review)
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30523
Change subject: google/buddy: fix Windows ACPI error with WLAN
......................................................................
google/buddy: fix Windows ACPI error with WLAN
Buddy's WLAN ACPI code was equivalent to, but formatted
differently from the other auron variants. Since only
differnce is root port used, have buddy use common
WLAN ACPI and use preprocessor guards to set the root
port correctly.
Test: build/boot Buddy, verify Windows 10 boots
without ACPI BIOS ERROR.
Change-Id: I78d994f2bb3981d4d10cb534cd6e0ae673f73527
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/mainboard/google/auron/acpi/mainboard.asl
M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
2 files changed, 4 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30523/1
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl
index 204c1c4..b473362 100644
--- a/src/mainboard/google/auron/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/acpi/mainboard.asl
@@ -16,8 +16,11 @@
#include <variant/onboard.h>
-#if !IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY)
+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY)
+Scope (\_SB.PCI0.RP02)
+#else
Scope (\_SB.PCI0.RP01)
+#endif
{
Device (WLAN)
{
@@ -35,7 +38,6 @@
}
}
}
-#endif
#include <variant/acpi/mainboard.asl>
diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
index 788fbdc..e9fd212 100644
--- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
@@ -117,27 +117,3 @@
}
}
}
-
-/*
- * WLAN connected to Root Port 4, becomes Root Port 2 after coalesce
- */
-Scope (\_SB.PCI0.RP02)
-{
- Device (WLAN)
- {
- Name (_ADR, 0x00000000)
-
- /* GPIO10 is WLAN_WAKE_L_Q */
- Name (GPIO, BOARD_WLAN_WAKE_GPIO)
-
- Name (_PRW, Package() { GPIO, 3 })
-
- Method (_DSW, 3, NotSerialized)
- {
- If (LEqual (Arg0, 1)) {
- // Enable GPIO as wake source
- \_SB.PCI0.LPCB.GPIO.GWAK (^GPIO)
- }
- }
- }
-}
--
To view, visit https://review.coreboot.org/c/coreboot/+/30523
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I78d994f2bb3981d4d10cb534cd6e0ae673f73527
Gerrit-Change-Number: 30523
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
by Arthur Heymans (Code Review)
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30510
Change subject: soc/intel/apollolake: Don't use CAR_GLOBAL
......................................................................
soc/intel/apollolake: Don't use CAR_GLOBAL
All platforms using this code have NO_CAR_GLOBAL_MIGRATION.
Change-Id: I0f393385aa94f18c2e05af3b5a54999575323d18
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/soc/intel/apollolake/meminit.c
M src/soc/intel/apollolake/mmap_boot.c
M src/soc/intel/apollolake/romstage.c
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/30510/1
diff --git a/src/soc/intel/apollolake/meminit.c b/src/soc/intel/apollolake/meminit.c
index 889bbde..a230222 100644
--- a/src/soc/intel/apollolake/meminit.c
+++ b/src/soc/intel/apollolake/meminit.c
@@ -21,7 +21,7 @@
#include <fsp/soc_binding.h>
#include <string.h>
-static size_t memory_size_mib CAR_GLOBAL;
+static size_t memory_size_mib;
size_t memory_in_system_in_mib(void)
{
diff --git a/src/soc/intel/apollolake/mmap_boot.c b/src/soc/intel/apollolake/mmap_boot.c
index 1c3077e..8174502 100644
--- a/src/soc/intel/apollolake/mmap_boot.c
+++ b/src/soc/intel/apollolake/mmap_boot.c
@@ -57,10 +57,10 @@
*
*/
-static size_t bios_size CAR_GLOBAL;
+static size_t bios_size;
-static struct mem_region_device shadow_dev CAR_GLOBAL;
-static struct xlate_region_device real_dev CAR_GLOBAL;
+static struct mem_region_device shadow_dev;
+static struct xlate_region_device real_dev;
static void bios_mmap_init(void)
{
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 4f4f9f5..4133946 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -58,7 +58,7 @@
0x8d, 0xe6, 0xc0, 0x44, 0x64, 0x1d, 0xe9, 0x42,
};
-static uint32_t fsp_version CAR_GLOBAL;
+static uint32_t fsp_version;
/* High Performance Event Timer Configuration */
#define P2SB_HPTC 0x60
--
To view, visit https://review.coreboot.org/c/coreboot/+/30510
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0f393385aa94f18c2e05af3b5a54999575323d18
Gerrit-Change-Number: 30510
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange
by Michał Żygowski (Code Review)
Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30553
Change subject: src/superio/ite/common: Prepare for new SuperIO
......................................................................
src/superio/ite/common: Prepare for new SuperIO
Introduce 7bit Slope PWM registers. New ITE SuperIO may have contiguous
7bit values for PWM slope.
Add option to enable External Sensor SMBus Host.
Allow early SuperIO serial init in bootblock for platforms supporting
C_ENVIRONMENT_BOOTBLOCK.
Update/add registers macros for IT8786E-F which are not backwards
compatible.
Change-Id: I68fbfe62dfa05d0c166abaefbdc2ab873114b236
Signed-off-by: Michał Żygowski <michal.zygowski(a)3mdeb.com>
---
M src/superio/ite/Makefile.inc
M src/superio/ite/common/Kconfig
M src/superio/ite/common/env_ctrl.c
M src/superio/ite/common/env_ctrl.h
M src/superio/ite/common/env_ctrl_chip.h
5 files changed, 53 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/30553/1
diff --git a/src/superio/ite/Makefile.inc b/src/superio/ite/Makefile.inc
index 382dbd7..a54db6f 100644
--- a/src/superio/ite/Makefile.inc
+++ b/src/superio/ite/Makefile.inc
@@ -14,7 +14,11 @@
##
## include generic ite pre-ram stage driver
-romstage-$(CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE) += common/early_serial.c
+
+ifeq ($(CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE),y)
+bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += common/early_serial.c
+romstage-y += common/early_serial.c
+endif
## include generic ite environment controller driver
ramstage-$(CONFIG_SUPERIO_ITE_ENV_CTRL) += common/env_ctrl.c
diff --git a/src/superio/ite/common/Kconfig b/src/superio/ite/common/Kconfig
index 162b7f1..fd6a699 100644
--- a/src/superio/ite/common/Kconfig
+++ b/src/superio/ite/common/Kconfig
@@ -41,4 +41,10 @@
help
The second FAN controller has a separate frequency setting.
+config SUPERIO_ITE_ENV_CTRL_7BIT_SLOPE_REG
+ bool
+ help
+ Slope PWM registers have no separate BIT6 and are set directly by
+ 7-bit values instead.
+
endif
diff --git a/src/superio/ite/common/env_ctrl.c b/src/superio/ite/common/env_ctrl.c
index 1dc5bb6..fb347de 100644
--- a/src/superio/ite/common/env_ctrl.c
+++ b/src/superio/ite/common/env_ctrl.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
* Copyright (C) 2016 secunet Security Networks AG
+ * Copyright (C) 2018 Libretrend LDA
*
* 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
@@ -164,9 +165,14 @@
pwm_ctrl |= ITE_EC_FAN_CTL_TEMPIN(conf->tmpin);
pwm_start = ITE_EC_FAN_CTL_PWM_START_DUTY(conf->pwm_start);
- pwm_start |= ITE_EC_FAN_CTL_PWM_SLOPE_BIT6(conf->slope);
- pwm_auto = ITE_EC_FAN_CTL_PWM_SLOPE_LOWER(conf->slope);
+ if (IS_ENABLED(CONFIG_SUPERIO_ITE_ENV_CTRL_7BIT_SLOPE_REG)) {
+ pwm_auto = conf->slope & 0x7f;
+ } else {
+ pwm_start |= ITE_EC_FAN_CTL_PWM_SLOPE_BIT6(conf->slope);
+ pwm_auto = ITE_EC_FAN_CTL_PWM_SLOPE_LOWER(conf->slope);
+ }
+
if (conf->smoothing)
pwm_auto |= ITE_EC_FAN_CTL_AUTO_SMOOTHING_EN;
@@ -213,7 +219,7 @@
ite_ec_write(base, ITE_EC_FAN_CTL_MODE, reg);
}
- if (IS_ENABLED(SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG)
+ if (IS_ENABLED(CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG)
&& conf->mode >= FAN_MODE_ON) {
reg = ite_ec_read(base, ITE_EC_FAN_TAC_COUNTER_ENABLE);
reg |= ITE_EC_FAN_TAC_16BIT_ENABLE(fan);
@@ -271,6 +277,13 @@
for (i = 0; i < ITE_EC_TMPIN_CNT; ++i)
enable_tmpin(base, i + 1, &conf->tmpin[i]);
+ /* Enable External Sensor SMBus Host if configured */
+ if (conf->smbus_en) {
+ ite_ec_write(base, ITE_EC_INTERFACE_SELECT,
+ ite_ec_read(base, ITE_EC_INTERFACE_SELECT) |
+ ITE_EC_INTERFACE_SMB_ENABLE);
+ }
+
/* Enable reading of voltage pins */
ite_ec_write(base, ITE_EC_ADC_VOLTAGE_CHANNEL_ENABLE, conf->vin_mask);
diff --git a/src/superio/ite/common/env_ctrl.h b/src/superio/ite/common/env_ctrl.h
index 11316db..06a41a5 100644
--- a/src/superio/ite/common/env_ctrl.h
+++ b/src/superio/ite/common/env_ctrl.h
@@ -3,6 +3,7 @@
*
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
* Copyright (C) 2016 secunet Security Networks AG
+ * Copyright (C) 2018 Libretrend LDA
*
* 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
@@ -48,13 +49,34 @@
#define ITE_EC_FAN_PWM_SMOOTHING_1KHZ (0 << 6)
#define ITE_EC_FAN_PWM_SMOOTHING_256HZ (1 << 6)
#define ITE_EC_FAN_PWM_SMOOTHING_64HZ (2 << 6)
+#if IS_ENABLED(CONFIG_SUPERIO_ITE_IT8786E)
+#define ITE_EC_FAN_PWM_SMOOTHING_16HZ (1 << 6)
+#else
#define ITE_EC_FAN_PWM_SMOOTHING_16HZ (3 << 6)
+#endif
+/* SUPERIO_ITE_IT8786E PWM_SMOOTHING_FREQ contents */
+#define ITE_EC_FAN_PWM_SMOOTHING_1HZ (0 << 6)
+#define ITE_EC_FAN_PWM_SMOOTHING_8HZ (2 << 6)
+#define ITE_EC_FAN_PWM_SMOOTHING_4HZ (3 << 6)
+#define ITE_EC_FAN_CTL5_SEL(x) ((((x)-1) & 3) << 2)
+#define ITE_EC_FAN_CTL5_SEL_NONE (3 << 2)
+#define ITE_EC_FAN_CTL4_SEL(x) (((x)-1) & 3)
+#define ITE_EC_FAN_CTL4_SEL_NONE (3 << 0)
#define ITE_EC_FAN_TAC_COUNTER_ENABLE 0x0c
#define ITE_EC_FAN_TAC_16BIT_ENABLE(x) (1 << ((x)-1))
#define ITE_EC_FAN_TAC_LIMIT(x) (0x10 + ((x)-1))
#define ITE_EC_FAN_TAC_EXT_LIMIT(x) (0x1b + ((x)-1))
+/* SUPERIO_ITE_IT8786E FAN_TAC_CNTRL register content */
+#define ITE_EC_FAN_TAC_CNTRL 0x0c
+#define ITE_EC_TMPIN3_ENHANCED_INT_MODE (1 << 7)
+#define ITE_EC_TMPIN2_ENHANCED_INT_MODE (1 << 6)
+#define ITE_EC_FAN_TAC5_EN (1 << 5)
+#define ITE_EC_FAN_TAC4_EN (1 << 4)
+#define ITE_EC_TMPIN1_ENHANCED_INT_MODE (1 << 3)
+#define ITE_EC_AMDTSI_ERR_EN (1 << 0)
+
#define ITE_EC_FAN_MAIN_CTL 0x13
#define ITE_EC_FAN_MAIN_CTL_TAC_EN(x) (1 << ((x)+3))
#define ITE_EC_FAN_MAIN_CTL_COLL_FULL_SPEED (1 << 3)
@@ -130,6 +152,8 @@
#define ITE_EC_FAN_CTL_PWM_SLOPE_LOWER(s) ((s) & 0x3f)
#define ITE_EC_FAN_CTL_DELTA_TEMP(x) (0x65 + ((x)-1) * 8)
#define ITE_EC_FAN_CTL_DELTA_TEMP_INTRVL(c) ((c) & 0x1f)
+#define ITE_EC_FAN_CTL_TARGET_ZONE(x) (0x66 + ((x)-1) * 8)
+#define ITE_EC_FAN_CTL_TARGET_ZONE_MASK 0x0f
#define ITE_EC_EXTEMP_STATUS 0x88
#define ITE_EC_EXTEMP_STATUS_HOST_BUSY (1 << 0)
diff --git a/src/superio/ite/common/env_ctrl_chip.h b/src/superio/ite/common/env_ctrl_chip.h
index f8f2e1e..4df9b01 100644
--- a/src/superio/ite/common/env_ctrl_chip.h
+++ b/src/superio/ite/common/env_ctrl_chip.h
@@ -3,6 +3,7 @@
*
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
* Copyright (C) 2016 secunet Security Networks AG
+ * Copyright (C) 2018 Libretrend LDA
*
* 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
@@ -95,6 +96,7 @@
bool tmpin_beep;
bool fan_beep;
bool vin_beep;
+ bool smbus_en;
};
/* Some shorthands for device trees */
--
To view, visit https://review.coreboot.org/c/coreboot/+/30553
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I68fbfe62dfa05d0c166abaefbdc2ab873114b236
Gerrit-Change-Number: 30553
Gerrit-PatchSet: 1
Gerrit-Owner: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-MessageType: newchange
by Arthur Heymans (Code Review)
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30427
Change subject: mb/google/nami: Add VBT blobs and include them in cbfs
......................................................................
mb/google/nami: Add VBT blobs and include them in cbfs
Change-Id: Iaf49bdee7ae82a0a61192327351267f098eb5ab1
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/mainboard/google/poppy/variants/nami/Makefile.inc
R src/mainboard/google/poppy/variants/nami/akali-data.vbt
A src/mainboard/google/poppy/variants/nami/data.vbt
A src/mainboard/google/poppy/variants/nami/patheon-data.vbt
A src/mainboard/google/poppy/variants/nami/vayne-data.vbt
5 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/30427/1
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc
index 7f86bb7..8f4ef0c 100644
--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc
@@ -41,3 +41,15 @@
cbfs-files-y += oem.bin
oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE))
oem.bin-type := raw
+
+add_vbt_to_cbfs= \
+ $(eval cbfs-files-y += $1) \
+ $(eval $1-file := $2) \
+ $(eval $1-type := raw) \
+ $(eval $1-compression := lzma)
+
+$(call add_vbt_to_cbfs, akali-data.vbt, akali-vbt.bin)
+$(call add_vbt_to_cbfs, pantheon-data.vbt, pantheon-vbt.bin)
+$(call add_vbt_to_cbfs, pantheon-data.vbt, pantheon-vbt.bin)
+$(call add_vbt_to_cbfs, vayne-data.vbt, vayne-vbt.bin)
+$(call add_vbt_to_cbfs, data.vbt, vbt.bin)
diff --git a/src/mainboard/google/poppy/variants/nami/vbt-akali.bin b/src/mainboard/google/poppy/variants/nami/akali-data.vbt
similarity index 100%
rename from src/mainboard/google/poppy/variants/nami/vbt-akali.bin
rename to src/mainboard/google/poppy/variants/nami/akali-data.vbt
Binary files differ
diff --git a/src/mainboard/google/poppy/variants/nami/data.vbt b/src/mainboard/google/poppy/variants/nami/data.vbt
new file mode 100644
index 0000000..8406362
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/data.vbt
Binary files differ
diff --git a/src/mainboard/google/poppy/variants/nami/patheon-data.vbt b/src/mainboard/google/poppy/variants/nami/patheon-data.vbt
new file mode 100644
index 0000000..7e4fb0a
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/patheon-data.vbt
Binary files differ
diff --git a/src/mainboard/google/poppy/variants/nami/vayne-data.vbt b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt
new file mode 100644
index 0000000..7e4fb0a
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt
Binary files differ
--
To view, visit https://review.coreboot.org/c/coreboot/+/30427
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iaf49bdee7ae82a0a61192327351267f098eb5ab1
Gerrit-Change-Number: 30427
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
by Lijian Zhao (Code Review)
Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30447
Change subject: soc/intel/cannonlake: Enable options for wakeup
......................................................................
soc/intel/cannonlake: Enable options for wakeup
Cannonlake FSP silicon init have dedicated wake up capability settings
for several IP, expose the selection into coreboot.
Signed-off-by: Lijian Zhao <lijian.zhao(a)intel.com>
Change-Id: I260e655417ca79d458784c9ec0e8e35d03b02e06
---
M src/soc/intel/cannonlake/chip.h
M src/soc/intel/cannonlake/fsp_params.c
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/30447/1
diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h
index 3a723d2..e5a3ae1 100644
--- a/src/soc/intel/cannonlake/chip.h
+++ b/src/soc/intel/cannonlake/chip.h
@@ -302,6 +302,13 @@
/* SATA Power Optimizer */
uint8_t satapwroptimize;
+
+ /* Wake Up Capability */
+ uint8_t codec_wake_sx;
+ uint8_t pcie_wake_deepsx;
+ uint8_t wlan_wake_sx;
+ uint8_t wlan_wake_deepsx;
+ uint8_t glan_wake_deepsx;
};
typedef struct soc_intel_cannonlake_config config_t;
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index 78b27e9..9a24242 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -225,6 +225,14 @@
/* Power Optimizer */
params->PchPwrOptEnable = config->dmipwroptimize;
params->SataPwrOptEnable = config->satapwroptimize;
+
+ /* Wakeup Capability */
+ params->PchHdaCodecSxWakeCapability = config->codec_wake_sx;
+ params->PchPmWoWlanEnable = config->wlan_wake_sx;
+ params->PchPmPcieWakeFromDeepSx = config->pcie_wake_deepsx;
+ params->PchPmWoWlanDeepSxEnable = config->wlan_wake_deepsx;
+ params->PchPmLanWakeFromDeepSx = config->glan_wake_deepsx;
+
}
/* Mainboard GPIO Configuration */
--
To view, visit https://review.coreboot.org/c/coreboot/+/30447
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I260e655417ca79d458784c9ec0e8e35d03b02e06
Gerrit-Change-Number: 30447
Gerrit-PatchSet: 1
Gerrit-Owner: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-MessageType: newchange
by HAOUAS Elyes (Code Review)
HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30468
Change subject: mb/packardbell/ms2290/acpi: Update _OSI strings and OSYS values
......................................................................
mb/packardbell/ms2290/acpi: Update _OSI strings and OSYS values
Change-Id: I3f5ee4d68c96e8ee0d964c62edebfcfa37fd1c45
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/mainboard/packardbell/ms2290/acpi/platform.asl
1 file changed, 67 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/30468/1
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 9812d14..e3f95ed 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -90,51 +90,101 @@
* 2001 | Windows XP(+SP1)
* 2002 | Windows XP SP2
* 2006 | Windows Vista
- * ???? | Windows 7
+ * 2009 | Windows 7
+ * 2012 | Windows 8
+ * 2013 | Windows 8.1
+ * 2015 | Windows 10
+ * 2016 | Windows 10, version 1607
+ * 2017 | Windows 10, version 1703
+ * 2017.2 | Windows 10, version 1709
+ * 2018 | Windows 10, version 1803
+ * 2018.2 | Windows 10, version 1809
*/
/* Let's assume we're running at least Windows 2000 */
Store (2000, OSYS)
If (CondRefOf(_OSI)) {
+ /* Linux answers _OSI with "True" for a couple of
+ * Windows version queries. But unlike Windows it
+ * needs a Video repost, so let's determine whether
+ * we're running Linux.
+ */
+
+ If (_OSI("Linux")) {
+ Store (1, LINX)
+ }
+
+ If (_OSI("Windows 2000")) {
+ Store (0x07D0, OSYS)
+ }
+
If (_OSI("Windows 2001")) {
- Store (2001, OSYS)
+ Store (0x07D1, OSYS)
}
If (_OSI("Windows 2001 SP1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001 SP2")) {
- Store (2002, OSYS)
+ Store (0x07D1, OSYS)
}
If (_OSI("Windows 2001.1")) {
- Store (2001, OSYS)
+ Store (0x07D1, OSYS)
+ }
+
+ If (_OSI("Windows 2001 SP2")) {
+ Store (0x07D1, OSYS)
}
If (_OSI("Windows 2001.1 SP1")) {
- Store (2001, OSYS)
+ Store (0x07D1, OSYS)
}
If (_OSI("Windows 2006")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2006.1")) {
- Store (2006, OSYS)
+ Store (0x07D6, OSYS)
}
If (_OSI("Windows 2006 SP1")) {
- Store (2006, OSYS)
+ Store (0x07D6, OSYS)
+ }
+
+ If (_OSI("Windows 2006.1")) {
+ Store (0x07D6, OSYS)
}
If (_OSI("Windows 2009")) {
- Store (2009, OSYS)
+ Store (0x07D9, OSYS)
}
If (_OSI("Windows 2012")) {
- Store (2012, OSYS)
+ Store (0x07DC, OSYS)
+ }
+
+ If (_OSI("Windows 2013")) {
+ Store (0x07DD, OSYS)
+ }
+
+ If (_OSI("Windows 2015")) {
+ Store (0x07DF, OSYS)
+ }
+
+ If (_OSI("Windows 2016")) {
+ Store (0x07E0, OSYS)
+ }
+
+ If (_OSI("Windows 2017")) {
+ Store (0x07E1, OSYS)
+ }
+
+ If (_OSI("Windows 2017.2")) {
+ Store (0x07E1, OSYS)
+ }
+
+ If (_OSI("Windows 2018")) {
+ Store (0x07E2, OSYS)
+ }
+
+ If (_OSI("Windows 2018.2")) {
+ Store (0x07E2, OSYS)
}
}
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/30468
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3f5ee4d68c96e8ee0d964c62edebfcfa37fd1c45
Gerrit-Change-Number: 30468
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr>
Gerrit-MessageType: newchange
