Skip to contentSkip to conversation

x86: New Intel Quark SoC support

RFC PATCH Superseded Bin Meng 2 participants 17 messages Jan 29, 2015 – Feb 2, 2015 x86

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

v2 cover x86: New Intel Quark SoC support

This series adds the first step of bare support for the Intel Quark SoC support which can be validated on Intel Galileo board.

Intel Quark is a line of 32-bit x86 SoCs by Intel, designed for small size and low power consumption, and targeted at new markets including wearable devices. They are smaller and slower than Atom processors and consume less power. They lack support for SIMD instruction sets (such as MMX and SSE) and only support embedded operating systems. Quark powers the Intel Galileo developer microcontroller board. The CPU instruction set is the same as Pentium (P54C/i586) CPU.

Intel decided to completely publish Quark's hardware specification to software developers, which includes an SoC datasheet, a UEFI Firmware Writer's Guide, and a complete reference source code for the UEFI BIOS which is pre-flahsed on the Galileo board. As of today, the only BIOS for Galileo is the Intel one with UEFI inteface only. There is no CSM support yet in that BIOS, neither any 3rd party BIOS vendor provides support to Quark SoC.

Only one binary blob (exactly 8KiB) is needed which is rmu.bin for Remote Management Unit. Not like FSP, U-Boot will not call into the binary. The binary is needed by the Quark SoC itself.

Note there are two generation of Galileo boards, aka gen1 and gen2. Currently the development work is on gen2, but once we get it boot, we can easily add the gen1 board (old version).

With this patch series, the generated u-boot.rom could boot the Intel Galileo board up to fdt relocate, where U-Boot hangs because the DRAM is not initializaed yet. A follow up patch series will be sent soon to add support for Memory Reference Code (MRC).

Changes in v2:
- Rebase to u-boot-86/master
- Move vairous components' base addresses within Quark SoC to Kconfig
- Add msg_port_setup() and remove MCR_FILL
- Add MSG_BYTE_ENABLE define
- Wrap function declaraion with __ASSEMBLY__
- Replace upper case register names (EAX etc.) with lower case
- Use some macros from <asm/arch/msg_port.h> and <asm/arch/quark.h>
- Use machine-specific
- Use Arduino-certified

Bin Meng (6):
x86: Add header files for Intel Quark SoC defines
x86: quark: Add routines to access message bus registers
x86: quark: Add Cache-As-RAM initialization
x86: Add basic Intel Quark processor support
x86: Add basic Intel Galileo board support
x86: Enable the Intel quark/galileo build

 arch/x86/Kconfig                           |  17 +++++
 arch/x86/cpu/Makefile                      |   1 +
 arch/x86/cpu/quark/Kconfig                 | 118 +++++++++++++++++++++++++++++
 arch/x86/cpu/quark/Makefile                |   8 ++
 arch/x86/cpu/quark/car.S                   | 104 +++++++++++++++++++++++++
 arch/x86/cpu/quark/dram.c                  |  39 ++++++++++
 arch/x86/cpu/quark/msg_port.c              |  77 +++++++++++++++++++
 arch/x86/cpu/quark/pci.c                   |  70 +++++++++++++++++
 arch/x86/cpu/quark/quark.c                 |  44 +++++++++++
 arch/x86/dts/Makefile                      |   1 +
 arch/x86/dts/galileo.dts                   |  43 +++++++++++
 arch/x86/include/asm/arch-quark/device.h   |  28 +++++++
 arch/x86/include/asm/arch-quark/gpio.h     |  13 ++++
 arch/x86/include/asm/arch-quark/msg_port.h | 106 ++++++++++++++++++++++++++
 arch/x86/include/asm/arch-quark/quark.h    |  27 +++++++
 board/intel/galileo/Kconfig                |  21 +++++
 board/intel/galileo/MAINTAINERS            |   6 ++
 board/intel/galileo/Makefile               |   7 ++
 board/intel/galileo/galileo.c              |  19 +++++
 board/intel/galileo/start.S                |   9 +++
 configs/galileo_defconfig                  |   6 ++
 include/configs/galileo.h                  |  53 +++++++++++++
 22 files changed, 817 insertions(+)
 create mode 100644 arch/x86/cpu/quark/Kconfig
 create mode 100644 arch/x86/cpu/quark/Makefile
 create mode 100644 arch/x86/cpu/quark/car.S
 create mode 100644 arch/x86/cpu/quark/dram.c
 create mode 100644 arch/x86/cpu/quark/msg_port.c
 create mode 100644 arch/x86/cpu/quark/pci.c
 create mode 100644 arch/x86/cpu/quark/quark.c
 create mode 100644 arch/x86/dts/galileo.dts
 create mode 100644 arch/x86/include/asm/arch-quark/device.h
 create mode 100644 arch/x86/include/asm/arch-quark/gpio.h
 create mode 100644 arch/x86/include/asm/arch-quark/msg_port.h
 create mode 100644 arch/x86/include/asm/arch-quark/quark.h
 create mode 100644 board/intel/galileo/Kconfig
 create mode 100644 board/intel/galileo/MAINTAINERS
 create mode 100644 board/intel/galileo/Makefile
 create mode 100644 board/intel/galileo/galileo.c
 create mode 100644 board/intel/galileo/start.S
 create mode 100644 configs/galileo_defconfig
 create mode 100644 include/configs/galileo.h
Signature · 1 line
1.8.2.1
author
#1 lore raw

RFC PATCH v2 1/6 x86: Add header files for Intel Quark SoC defines

device.h for integrated pci devices' bdf on Quark SoC and quark.h for various memory-mapped and i/o-mapped base addresses within SoC.

---

Changes in v2:
- Move vairous components' base addresses within Quark SoC to Kconfig

 arch/x86/include/asm/arch-quark/device.h | 28 ++++++++++++++++++++++++++++
 arch/x86/include/asm/arch-quark/quark.h  | 27 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 arch/x86/include/asm/arch-quark/device.h
 create mode 100644 arch/x86/include/asm/arch-quark/quark.h
arch/x86/include/asm/arch-quark/device.h new file +28 -0
new file mode 100644
index 0000000..4af3ded
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _QUARK_DEVICE_H_
+#define _QUARK_DEVICE_H_
+
+#include <pci.h>
+
+#define QUARK_HOST_BRIDGE	PCI_BDF(0, 0, 0)
+#define QUARK_MMC_SDIO		PCI_BDF(0, 20, 0)
+#define QUARK_UART0		PCI_BDF(0, 20, 1)
+#define QUARK_USB_DEVICE	PCI_BDF(0, 20, 2)
+#define QUARK_USB_EHCI		PCI_BDF(0, 20, 3)
+#define QUARK_USB_OHCI		PCI_BDF(0, 20, 4)
+#define QUARK_UART1		PCI_BDF(0, 20, 5)
+#define QUARK_EMAC0		PCI_BDF(0, 20, 6)
+#define QUARK_EMAC1		PCI_BDF(0, 20, 7)
+#define QUARK_SPI0		PCI_BDF(0, 21, 0)
+#define QUARK_SPI1		PCI_BDF(0, 21, 1)
+#define QUARK_I2C_GPIO		PCI_BDF(0, 21, 2)
+#define QUARK_PCIE0		PCI_BDF(0, 23, 0)
+#define QUARK_PCIE1		PCI_BDF(0, 23, 1)
+#define QUARK_LEGACY_BRIDGE	PCI_BDF(0, 31, 0)
+
+#endif /* _QUARK_DEVICE_H_ */
arch/x86/include/asm/arch-quark/quark.h new file +27 -0
new file mode 100644
index 0000000..7d603e1
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _QUARK_H_
+#define _QUARK_H_
+
+/* DRAM */
+#define DRAM_BASE		0x00000000
+#define DRAM_MAX_SIZE		0x80000000
+
+/* eSRAM */
+#define ESRAM_SIZE		0x80000
+#define ESRAM_BLOCK_MODE	0x10000000
+
+/* Memory BAR Enable */
+#define MEM_BAR_EN		0x00000001
+
+/* I/O BAR Enable */
+#define IO_BAR_EN		0x80000000
+
+/* 64KiB of RMU binary in flash */
+#define RMU_BINARY_SIZE		0x10000
+
+#endif /* _QUARK_H_ */
Signature · 1 line
1.8.2.1
#2 lore raw

RFC PATCH v2 1/6 x86: Add header files for Intel Quark SoC defines

Hi Bin,

Quoted 7 lines · Bin Meng

device.h for integrated pci devices' bdf on Quark SoC and quark.h for various memory-mapped and i/o-mapped base addresses within SoC.

---

Quoted 8 lines

Changes in v2:
- Move vairous components' base addresses within Quark SoC to Kconfig

 arch/x86/include/asm/arch-quark/device.h | 28 ++++++++++++++++++++++++++++
 arch/x86/include/asm/arch-quark/quark.h  | 27 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 arch/x86/include/asm/arch-quark/device.h
 create mode 100644 arch/x86/include/asm/arch-quark/quark.h
author
#3 lore raw

RFC PATCH v2 2/6 x86: quark: Add routines to access message bus registers

In reply to Bin Meng

In the Quark SoC, some chipset commands are accomplished by utilizing the internal message network within the host bridge (D0:F0). Accesses to this network are accomplished by populating the message control register (MCR), Message Control Register eXtension (MCRX) and the message data register (MDR).

---

Changes in v2:
- Add msg_port_setup() and remove MCR_FILL
- Add MSG_BYTE_ENABLE define
- Wrap function declaraion with __ASSEMBLY__

 arch/x86/cpu/quark/msg_port.c              |  77 +++++++++++++++++++++
 arch/x86/include/asm/arch-quark/msg_port.h | 106 +++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 arch/x86/cpu/quark/msg_port.c
 create mode 100644 arch/x86/include/asm/arch-quark/msg_port.h
arch/x86/cpu/quark/msg_port.c new file +77 -0
new file mode 100644
index 0000000..31713e3
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <pci.h>
+#include <asm/arch/device.h>
+#include <asm/arch/msg_port.h>
+
+void msg_port_setup(int op, int port, int reg)
+{
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_REG,
+			       (((op) << 24) | ((port) << 16) |
+			       (((reg) << 8) & 0xff00) | MSG_BYTE_ENABLE));
+}
+
+u32 msg_port_read(u8 port, u32 reg)
+{
+	u32 value;
+
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_READ, port, reg);
+	pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+
+	return value;
+}
+
+void msg_port_write(u8 port, u32 reg, u32 value)
+{
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_WRITE, port, reg);
+}
+
+u32 msg_port_alt_read(u8 port, u32 reg)
+{
+	u32 value;
+
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_ALT_READ, port, reg);
+	pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+
+	return value;
+}
+
+void msg_port_alt_write(u8 port, u32 reg, u32 value)
+{
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_ALT_WRITE, port, reg);
+}
+
+u32 msg_port_io_read(u8 port, u32 reg)
+{
+	u32 value;
+
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_IO_READ, port, reg);
+	pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+
+	return value;
+}
+
+void msg_port_io_write(u8 port, u32 reg, u32 value)
+{
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+	pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+			       reg & 0xffffff00);
+	msg_port_setup(MSG_OP_IO_WRITE, port, reg);
+}
arch/x86/include/asm/arch-quark/msg_port.h new file +106 -0

106 lines not on this page · raw message

Signature · 1 line
1.8.2.1
#4 lore raw

RFC PATCH v2 2/6 x86: quark: Add routines to access message bus registers

Quoted 15 lines · Bin Meng

In the Quark SoC, some chipset commands are accomplished by utilizing the internal message network within the host bridge (D0:F0). Accesses to this network are accomplished by populating the message control register (MCR), Message Control Register eXtension (MCRX) and the message data register (MDR).

---

Changes in v2:
- Add msg_port_setup() and remove MCR_FILL
- Add MSG_BYTE_ENABLE define
- Wrap function declaraion with __ASSEMBLY__

Quoted 6 lines
 arch/x86/cpu/quark/msg_port.c              |  77 +++++++++++++++++++++
 arch/x86/include/asm/arch-quark/msg_port.h | 106 +++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 arch/x86/cpu/quark/msg_port.c
 create mode 100644 arch/x86/include/asm/arch-quark/msg_port.h

I'd still prefer lower case hex.

Regards,
Simon

author
#5 lore raw

RFC PATCH v2 2/6 x86: quark: Add routines to access message bus registers

Hi Simon,

Quoted 23 lines · Simon Glass
Quoted 15 lines · Bin Meng

In the Quark SoC, some chipset commands are accomplished by utilizing the internal message network within the host bridge (D0:F0). Accesses to this network are accomplished by populating the message control register (MCR), Message Control Register eXtension (MCRX) and the message data register (MDR).

---

Changes in v2:
- Add msg_port_setup() and remove MCR_FILL
- Add MSG_BYTE_ENABLE define
- Wrap function declaraion with __ASSEMBLY__

Quoted 6 lines
 arch/x86/cpu/quark/msg_port.c              |  77 +++++++++++++++++++++
 arch/x86/include/asm/arch-quark/msg_port.h | 106 +++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 arch/x86/cpu/quark/msg_port.c
 create mode 100644 arch/x86/include/asm/arch-quark/msg_port.h
Quoted 4 lines

I'd still prefer lower case hex.

OK, will fix in v3.

Regards,
Bin

author
#6 lore raw

RFC PATCH v2 3/6 x86: quark: Add Cache-As-RAM initialization

In reply to Bin Meng

Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is initialized by hardware. eSRAM is the ideal place to be used for Cache-As-RAM (CAR) before system memory is available.

---

Changes in v2:
- Replace upper case register names (EAX etc.) with lower case
- Use some macros from <asm/arch/msg_port.h> and <asm/arch/quark.h>

 arch/x86/cpu/quark/car.S | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 arch/x86/cpu/quark/car.S
arch/x86/cpu/quark/car.S new file +104 -0
new file mode 100644
index 0000000..f32f9b1
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <config.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+#include <asm/arch/msg_port.h>
+
+.globl car_init
+car_init:
+	post_code(POST_CAR_START)
+
+	/*
+	 * Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is
+	 * initialized by hardware. eSRAM is the ideal place to be used
+	 * for Cache-As-RAM (CAR) before system memory is available.
+	 *
+	 * Relocate this eSRAM to a suitable location in the physical
+	 * memory map and enable it.
+	 */
+
+	/* Host Memory Bound Register P03h:R08h */
+	mov	$((0x03 << 16) | (0x08 << 8)), %eax
+	mov	$(DRAM_BASE + DRAM_MAX_SIZE + ESRAM_SIZE), %edx
+	lea	1f, %esp
+	jmp	msg_port_write
+1:
+
+	/* eSRAM Block Page Control Register P05h:R82h */
+	mov	$((0x05 << 16) | (0x82 << 8)), %eax
+	mov	$(ESRAM_BLOCK_MODE | (CONFIG_ESRAM_BASE >> 24)), %edx
+	lea	2f, %esp
+	jmp	msg_port_write
+2:
+
+	post_code(POST_CAR_CPU_CACHE)
+	jmp	car_init_ret
+
+msg_port_read:
+	/*
+	 * Parameter:
+	 *   eax[23:16] - Message Port ID
+	 *   eax[15:08] - Register Address
+	 *
+	 * Return Value:
+	 *   eax - Message Port Register value
+	 *
+	 * Return Address: esp
+	 */
+
+	or	$((MSG_OP_READ << 24) | MSG_BYTE_ENABLE), %eax
+	mov	%eax, %ebx
+
+	/* Write MCR B0:D0:F0:RD0 */
+	mov	$((1 << 31) | MSG_CTRL_REG), %eax
+	mov	$0xcf8, %dx
+	out	%eax, %dx
+	mov	$0xcfc, %dx
+	mov	%ebx, %eax
+	out	%eax, %dx
+
+	/* Read MDR B0:D0:F0:RD4 */
+	mov	$((1 << 31) | MSG_DATA_REG), %eax
+	mov	$0xcf8, %dx
+	out	%eax, %dx
+	mov	$0xcfc, %dx
+	in	%dx, %eax
+
+	jmp	*%esp
+
+msg_port_write:
+	/*
+	 * Parameter:
+	 *   eax[23:16] - Message Port ID
+	 *   eax[15:08] - Register Address
+	 *   edx        - Message Port Register value to write
+	 *
+	 * Return Address: esp
+	 */
+
+	or	$((MSG_OP_WRITE << 24) | MSG_BYTE_ENABLE), %eax
+	mov	%eax, %esi
+	mov	%edx, %edi
+
+	/* Write MDR B0:D0:F0:RD4 */
+	mov	$((1 << 31) | MSG_DATA_REG), %eax
+	mov	$0xcf8, %dx
+	out	%eax, %dx
+	mov	$0xcfc, %dx
+	mov	%edi, %eax
+	out	%eax, %dx
+
+	/* Write MCR B0:D0:F0:RD0 */
+	mov	$((1 << 31) | MSG_CTRL_REG), %eax
+	mov	$0xcf8, %dx
+	out	%eax, %dx
+	mov	$0xcfc, %dx
+	mov	%esi, %eax
+	out	%eax, %dx
+
+	jmp	*%esp
Signature · 1 line
1.8.2.1
#7 lore raw

RFC PATCH v2 3/6 x86: quark: Add Cache-As-RAM initialization

Hi Bin,

Quoted 38 lines · Bin Meng

Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is initialized by hardware. eSRAM is the ideal place to be used for Cache-As-RAM (CAR) before system memory is available.

---

Changes in v2:
- Replace upper case register names (EAX etc.) with lower case
- Use some macros from <asm/arch/msg_port.h> and <asm/arch/quark.h>

 arch/x86/cpu/quark/car.S | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 arch/x86/cpu/quark/car.S
arch/x86/cpu/quark/car.S new file +16 -0
new file mode 100644
index 0000000..f32f9b1
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <config.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+#include <asm/arch/msg_port.h>
+
+.globl car_init
+car_init:
+       post_code(POST_CAR_START)
+
+       /*

arch/x86/cpu/quark/car.S line 26

Quoted 10 lines
arch/x86/cpu/quark/car.S new file +10 -0
+        * Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is
+        * initialized by hardware. eSRAM is the ideal place to be used
+        * for Cache-As-RAM (CAR) before system memory is available.
+        *
+        * Relocate this eSRAM to a suitable location in the physical
+        * memory map and enable it.
+        */
+
+       /* Host Memory Bound Register P03h:R08h */
+       mov     $((0x03 << 16) | (0x08 << 8)), %eax

Do you have #defines for these to?

Quoted 22 lines
arch/x86/cpu/quark/car.S new file +22 -0
+       mov     $(DRAM_BASE + DRAM_MAX_SIZE + ESRAM_SIZE), %edx
+       lea     1f, %esp
+       jmp     msg_port_write
+1:
+
+       /* eSRAM Block Page Control Register P05h:R82h */
+       mov     $((0x05 << 16) | (0x82 << 8)), %eax
+       mov     $(ESRAM_BLOCK_MODE | (CONFIG_ESRAM_BASE >> 24)), %edx
+       lea     2f, %esp
+       jmp     msg_port_write
+2:
+
+       post_code(POST_CAR_CPU_CACHE)
+       jmp     car_init_ret
+
+msg_port_read:
+       /*
+        * Parameter:
+        *   eax[23:16] - Message Port ID
+        *   eax[15:08] - Register Address
+        *
+        * Return Value:

arch/x86/cpu/quark/car.S line 58

Quoted 10 lines
arch/x86/cpu/quark/car.S new file +10 -0
+        *   eax - Message Port Register value
+        *
+        * Return Address: esp
+        */
+
+       or      $((MSG_OP_READ << 24) | MSG_BYTE_ENABLE), %eax
+       mov     %eax, %ebx
+
+       /* Write MCR B0:D0:F0:RD0 */
+       mov     $((1 << 31) | MSG_CTRL_REG), %eax

And this 1 << 31 ?

Quoted 47 lines
arch/x86/cpu/quark/car.S new file +46 -1
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %ebx, %eax
+       out     %eax, %dx
+
+       /* Read MDR B0:D0:F0:RD4 */
+       mov     $((1 << 31) | MSG_DATA_REG), %eax
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       in      %dx, %eax
+
+       jmp     *%esp
+
+msg_port_write:
+       /*
+        * Parameter:
+        *   eax[23:16] - Message Port ID
+        *   eax[15:08] - Register Address
+        *   edx        - Message Port Register value to write
+        *
+        * Return Address: esp
+        */
+
+       or      $((MSG_OP_WRITE << 24) | MSG_BYTE_ENABLE), %eax
+       mov     %eax, %esi
+       mov     %edx, %edi
+
+       /* Write MDR B0:D0:F0:RD4 */
+       mov     $((1 << 31) | MSG_DATA_REG), %eax
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %edi, %eax
+       out     %eax, %dx
+
+       /* Write MCR B0:D0:F0:RD0 */
+       mov     $((1 << 31) | MSG_CTRL_REG), %eax
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %esi, %eax
+       out     %eax, %dx
+
+       jmp     *%esp
--
Quoted 2 lines

1.8.2.1

Regards,
Simon

author
#8 lore raw

RFC PATCH v2 3/6 x86: quark: Add Cache-As-RAM initialization

Hi Simon,

Quoted 45 lines · Simon Glass

Hi Bin,

Quoted 42 lines · Bin Meng

Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is initialized by hardware. eSRAM is the ideal place to be used for Cache-As-RAM (CAR) before system memory is available.

---

Changes in v2:
- Replace upper case register names (EAX etc.) with lower case
- Use some macros from <asm/arch/msg_port.h> and <asm/arch/quark.h>

 arch/x86/cpu/quark/car.S | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 arch/x86/cpu/quark/car.S
arch/x86/cpu/quark/car.S new file +20 -0
new file mode 100644
index 0000000..f32f9b1
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <config.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+#include <asm/arch/msg_port.h>
+
+.globl car_init
+car_init:
+       post_code(POST_CAR_START)
+
+       /*
+        * Quark SoC contains an embedded 512KiB SRAM (eSRAM) that is
+        * initialized by hardware. eSRAM is the ideal place to be used
+        * for Cache-As-RAM (CAR) before system memory is available.
+        *
Quoted 8 lines

arch/x86/cpu/quark/car.S line 26

Quoted 6 lines
arch/x86/cpu/quark/car.S new file +6 -0
+        * Relocate this eSRAM to a suitable location in the physical
+        * memory map and enable it.
+        */
+
+       /* Host Memory Bound Register P03h:R08h */
+       mov     $((0x03 << 16) | (0x08 << 8)), %eax

Do you have #defines for these to?

I can add it to asm/arch/quark.h.

Quoted 26 lines
Quoted 26 lines
arch/x86/cpu/quark/car.S new file +26 -0
+       mov     $(DRAM_BASE + DRAM_MAX_SIZE + ESRAM_SIZE), %edx
+       lea     1f, %esp
+       jmp     msg_port_write
+1:
+
+       /* eSRAM Block Page Control Register P05h:R82h */
+       mov     $((0x05 << 16) | (0x82 << 8)), %eax
+       mov     $(ESRAM_BLOCK_MODE | (CONFIG_ESRAM_BASE >> 24)), %edx
+       lea     2f, %esp
+       jmp     msg_port_write
+2:
+
+       post_code(POST_CAR_CPU_CACHE)
+       jmp     car_init_ret
+
+msg_port_read:
+       /*
+        * Parameter:
+        *   eax[23:16] - Message Port ID
+        *   eax[15:08] - Register Address
+        *
+        * Return Value:
+        *   eax - Message Port Register value
+        *
+        * Return Address: esp
+        */
Quoted 8 lines

arch/x86/cpu/quark/car.S line 58

Quoted 6 lines
arch/x86/cpu/quark/car.S new file +6 -0
+
+       or      $((MSG_OP_READ << 24) | MSG_BYTE_ENABLE), %eax
+       mov     %eax, %ebx
+
+       /* Write MCR B0:D0:F0:RD0 */
+       mov     $((1 << 31) | MSG_CTRL_REG), %eax

And this 1 << 31 ?

I may have to add such generic pci macros (and 0xcf8, 0xcfc) to some other place in v3.

Quoted 39 lines
Quoted 39 lines
arch/x86/cpu/quark/car.S new file +39 -0
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %ebx, %eax
+       out     %eax, %dx
+
+       /* Read MDR B0:D0:F0:RD4 */
+       mov     $((1 << 31) | MSG_DATA_REG), %eax
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       in      %dx, %eax
+
+       jmp     *%esp
+
+msg_port_write:
+       /*
+        * Parameter:
+        *   eax[23:16] - Message Port ID
+        *   eax[15:08] - Register Address
+        *   edx        - Message Port Register value to write
+        *
+        * Return Address: esp
+        */
+
+       or      $((MSG_OP_WRITE << 24) | MSG_BYTE_ENABLE), %eax
+       mov     %eax, %esi
+       mov     %edx, %edi
+
+       /* Write MDR B0:D0:F0:RD4 */
+       mov     $((1 << 31) | MSG_DATA_REG), %eax
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %edi, %eax
+       out     %eax, %dx
+
+       /* Write MCR B0:D0:F0:RD0 */
+       mov     $((1 << 31) | MSG_CTRL_REG), %eax
Quoted 8 lines

arch/x86/cpu/quark/car.S

Quoted 8 lines
arch/x86/cpu/quark/car.S new file +7 -1
+       mov     $0xcf8, %dx
+       out     %eax, %dx
+       mov     $0xcfc, %dx
+       mov     %esi, %eax
+       out     %eax, %dx
+
+       jmp     *%esp
--

Regards,
Bin

author
#9 lore raw

RFC PATCH v2 4/6 x86: Add basic Intel Quark processor support

In reply to Bin Meng

Add minimum codes to support Intel Quark SoC. DRAM initialization is not ready yet so a hardcoded gd->ram_size is assigned.

---

Changes in v2:
- Use machine-specific
- Move vairous components' base addresses within Quark SoC to Kconfig
- Rebase to u-boot-86/master

 arch/x86/cpu/quark/Kconfig             | 118 +++++++++++++++++++++++++++++++++
 arch/x86/cpu/quark/Makefile            |   8 +++
 arch/x86/cpu/quark/dram.c              |  39 +++++++++++
 arch/x86/cpu/quark/pci.c               |  70 +++++++++++++++++++
 arch/x86/cpu/quark/quark.c             |  44 ++++++++++++
 arch/x86/include/asm/arch-quark/gpio.h |  13 ++++
 6 files changed, 292 insertions(+)
 create mode 100644 arch/x86/cpu/quark/Kconfig
 create mode 100644 arch/x86/cpu/quark/Makefile
 create mode 100644 arch/x86/cpu/quark/dram.c
 create mode 100644 arch/x86/cpu/quark/pci.c
 create mode 100644 arch/x86/cpu/quark/quark.c
 create mode 100644 arch/x86/include/asm/arch-quark/gpio.h
arch/x86/cpu/quark/Kconfig new file +118 -0
new file mode 100644
index 0000000..8bccf09
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+config INTEL_QUARK
+	bool
+	select HAVE_RMU
+
+if INTEL_QUARK
+
+config HAVE_RMU
+	bool "Add a Remote Management Unit (RMU) binary"
+	help
+	  Select this option to add a Remote Management Unit (RMU) binary
+	  to the resulting U-Boot image. It is a data block (up to 64K) of
+	  machine-specific code which must be put in the flash for the RMU
+	  within the Quark SoC processor to access when powered up before
+	  system BIOS is executed.
+
+config RMU_FILE
+	string "Remote Management Unit (RMU) binary filename"
+	depends on HAVE_RMU
+	default "rmu.bin"
+	help
+	  The filename of the file to use as Remote Management Unit (RMU)
+	  binary in the board directory.
+
+config RMU_ADDR
+	hex "Remote Management Unit (RMU) binary location"
+	depends on HAVE_RMU
+	default 0xfff00000
+	help
+	  The location of the RMU binary is determined by a strap. It must be
+	  put in flash at a location matching the strap-determined base address.
+
+	  The default base address of 0xfff00000 indicates that the binary must
+	  be located at offset 0 from the beginning of a 1MB flash device.
+
+config HAVE_CMC
+	bool
+	default HAVE_RMU
+
+config CMC_FILE
+	string
+	depends on HAVE_CMC
+	default RMU_FILE
+
+config CMC_ADDR
+	hex
+	depends on HAVE_CMC
+	default RMU_ADDR
+
+config ESRAM_BASE
+	hex
+	default 0x80000000
+	help
+	  Embedded SRAM (eSRAM) memory-mapped base address.
+
+config PCIE_ECAM_BASE
+	hex
+	default 0xe0000000
+
+config RCBA_BASE
+	hex
+	default 0xfed1c000
+	help
+	  Root Complex register block memory-mapped base address.
+
+config ACPI_PM1_BASE
+	hex
+	default 0x1000
+	help
+	  ACPI PM1 i/o-mapped base address.
+
+config ACPI_P_BASE
+	hex
+	default 0x1010
+	help
+	  ACPI PBLK i/o-mapped base address.
+
+config SPI_DMA_BASE
+	hex
+	default 0x1020
+	help
+	  SPI DMA i/o-mapped base address.
+
+config GPIO_BASE
+	hex
+	default 0x1080
+	help
+	  GPIO i/o-mapped base address.
+
+config GPE0_BASE
+	hex
+	default 0x1100
+	help
+	  GPE0 i/o-mapped base address.
+
+config WDT_BASE
+	hex
+	default 0x1140
+	help
+	  Watchdog timer i/o-mapped base address.
+
+config SYS_CAR_ADDR
+	hex
+	default ESRAM_BASE
+
+config SYS_CAR_SIZE
+	hex
+	default 0x8000
+	help
+	  Space in bytes in eSRAM used as Cache-As-ARM (CAR).
+	  Note this size must not exceed eSRAM's total size.
+
+endif
arch/x86/cpu/quark/Makefile new file +8 -0
new file mode 100644
index 0000000..168c1e6
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += car.o dram.o msg_port.o quark.o
+obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/quark/dram.c new file +39 -0
new file mode 100644
index 0000000..fbdc3cd
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+	/* hardcode the DRAM size for now */
+	gd->ram_size = DRAM_MAX_SIZE;
+	post_code(POST_DRAM);
+
+	return 0;
+}
+
+void dram_init_banksize(void)
+{
+	gd->bd->bi_dram[0].start = 0;
+	gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+/*
+ * This function looks for the highest region of memory lower than 4GB which
+ * has enough space for U-Boot where U-Boot is aligned on a page boundary.
+ * It overrides the default implementation found elsewhere which simply
+ * picks the end of ram, wherever that may be. The location of the stack,
+ * the relocation address, and how far U-Boot is moved by relocation are
+ * set in the global data structure.
+ */
+ulong board_get_usable_ram_top(ulong total_size)
+{
+	return gd->ram_size;
+}
arch/x86/cpu/quark/pci.c new file +70 -0

70 lines not on this page · raw message

arch/x86/cpu/quark/quark.c new file +44 -0

44 lines not on this page · raw message

arch/x86/include/asm/arch-quark/gpio.h new file +13 -0
new file mode 100644
index 0000000..ca8cba4
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _X86_ARCH_GPIO_H_
+#define _X86_ARCH_GPIO_H_
+
+/* Where in config space is the register that points to the GPIO registers? */
+#define PCI_CFG_GPIOBASE 0x44
+
+#endif /* _X86_ARCH_GPIO_H_ */
Signature · 1 line
1.8.2.1
#10 lore raw

RFC PATCH v2 4/6 x86: Add basic Intel Quark processor support

Hi Bin,

Quoted 12 lines · Bin Meng

Add minimum codes to support Intel Quark SoC. DRAM initialization is not ready yet so a hardcoded gd->ram_size is assigned.

---

Changes in v2:
- Use machine-specific
- Move vairous components' base addresses within Quark SoC to Kconfig
- Rebase to u-boot-86/master

All looks OK but for a few nits.

Quoted 85 lines
 arch/x86/cpu/quark/Kconfig             | 118 +++++++++++++++++++++++++++++++++
 arch/x86/cpu/quark/Makefile            |   8 +++
 arch/x86/cpu/quark/dram.c              |  39 +++++++++++
 arch/x86/cpu/quark/pci.c               |  70 +++++++++++++++++++
 arch/x86/cpu/quark/quark.c             |  44 ++++++++++++
 arch/x86/include/asm/arch-quark/gpio.h |  13 ++++
 6 files changed, 292 insertions(+)
 create mode 100644 arch/x86/cpu/quark/Kconfig
 create mode 100644 arch/x86/cpu/quark/Makefile
 create mode 100644 arch/x86/cpu/quark/dram.c
 create mode 100644 arch/x86/cpu/quark/pci.c
 create mode 100644 arch/x86/cpu/quark/quark.c
 create mode 100644 arch/x86/include/asm/arch-quark/gpio.h
arch/x86/cpu/quark/Kconfig new file +65 -0
new file mode 100644
index 0000000..8bccf09
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+config INTEL_QUARK
+       bool
+       select HAVE_RMU
+
+if INTEL_QUARK
+
+config HAVE_RMU
+       bool "Add a Remote Management Unit (RMU) binary"
+       help
+         Select this option to add a Remote Management Unit (RMU) binary
+         to the resulting U-Boot image. It is a data block (up to 64K) of
+         machine-specific code which must be put in the flash for the RMU
+         within the Quark SoC processor to access when powered up before
+         system BIOS is executed.
+
+config RMU_FILE
+       string "Remote Management Unit (RMU) binary filename"
+       depends on HAVE_RMU
+       default "rmu.bin"
+       help
+         The filename of the file to use as Remote Management Unit (RMU)
+         binary in the board directory.
+
+config RMU_ADDR
+       hex "Remote Management Unit (RMU) binary location"
+       depends on HAVE_RMU
+       default 0xfff00000
+       help
+         The location of the RMU binary is determined by a strap. It must be
+         put in flash at a location matching the strap-determined base address.
+
+         The default base address of 0xfff00000 indicates that the binary must
+         be located at offset 0 from the beginning of a 1MB flash device.
+
+config HAVE_CMC
+       bool
+       default HAVE_RMU
+
+config CMC_FILE
+       string
+       depends on HAVE_CMC
+       default RMU_FILE
+
+config CMC_ADDR
+       hex
+       depends on HAVE_CMC
+       default RMU_ADDR
+
+config ESRAM_BASE
+       hex
+       default 0x80000000
+       help
+         Embedded SRAM (eSRAM) memory-mapped base address.
+
+config PCIE_ECAM_BASE
+       hex
+       default 0xe0000000
+
+config RCBA_BASE

arch/x86/cpu/quark/Kconfig line 75

Quoted 10 lines
arch/x86/cpu/quark/Kconfig new file +10 -0
+       hex
+       default 0xfed1c000
+       help
+         Root Complex register block memory-mapped base address.
+
+config ACPI_PM1_BASE
+       hex
+       default 0x1000
+       help
+         ACPI PM1 i/o-mapped base address.

What is PM1?

arch/x86/cpu/quark/Kconfig line 81

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config ACPI_P_BASE
+       hex
+       default 0x1010
+       help
+         ACPI PBLK i/o-mapped base address.

What is PBLK?

Quoted 8 lines
arch/x86/cpu/quark/Kconfig new file +8 -0
+
+config SPI_DMA_BASE
+       hex
+       default 0x1020
+       help
+         SPI DMA i/o-mapped base address.
+
+config GPIO_BASE

arch/x86/cpu/quark/Kconfig line 99

Quoted 10 lines
arch/x86/cpu/quark/Kconfig new file +10 -0
+       hex
+       default 0x1080
+       help
+         GPIO i/o-mapped base address.
+
+config GPE0_BASE
+       hex
+       default 0x1100
+       help
+         GPE0 i/o-mapped base address.

What is GPE0?

Quoted 63 lines
arch/x86/cpu/quark/Kconfig new file +19 -0
+
+config WDT_BASE
+       hex
+       default 0x1140
+       help
+         Watchdog timer i/o-mapped base address.
+
+config SYS_CAR_ADDR
+       hex
+       default ESRAM_BASE
+
+config SYS_CAR_SIZE
+       hex
+       default 0x8000
+       help
+         Space in bytes in eSRAM used as Cache-As-ARM (CAR).
+         Note this size must not exceed eSRAM's total size.
+
+endif
arch/x86/cpu/quark/Makefile new file +8 -0
new file mode 100644
index 0000000..168c1e6
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y += car.o dram.o msg_port.o quark.o
+obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/quark/dram.c new file +24 -0
new file mode 100644
index 0000000..fbdc3cd
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+       /* hardcode the DRAM size for now */
+       gd->ram_size = DRAM_MAX_SIZE;
+       post_code(POST_DRAM);
+
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = 0;

arch/x86/cpu/quark/dram.c line 34

Quoted 10 lines
arch/x86/cpu/quark/dram.c new file +10 -0
+       gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+/*
+ * This function looks for the highest region of memory lower than 4GB which
+ * has enough space for U-Boot where U-Boot is aligned on a page boundary.
+ * It overrides the default implementation found elsewhere which simply
+ * picks the end of ram, wherever that may be. The location of the stack,
+ * the relocation address, and how far U-Boot is moved by relocation are
+ * set in the global data structure.

This comment probably doesn't make sense here.

Quoted 151 lines
arch/x86/cpu/quark/dram.c new file +5 -0
+ */
+ulong board_get_usable_ram_top(ulong total_size)
+{
+       return gd->ram_size;
+}
arch/x86/cpu/quark/pci.c new file +70 -0
new file mode 100644
index 0000000..354e15a
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <pci.h>
+#include <asm/pci.h>
+#include <asm/arch/device.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void board_pci_setup_hose(struct pci_controller *hose)
+{
+       hose->first_busno = 0;
+       hose->last_busno = 0;
+
+       /* PCI memory space */
+       pci_set_region(hose->regions + 0,
+                      CONFIG_PCI_MEM_BUS,
+                      CONFIG_PCI_MEM_PHYS,
+                      CONFIG_PCI_MEM_SIZE,
+                      PCI_REGION_MEM);
+
+       /* PCI IO space */
+       pci_set_region(hose->regions + 1,
+                      CONFIG_PCI_IO_BUS,
+                      CONFIG_PCI_IO_PHYS,
+                      CONFIG_PCI_IO_SIZE,
+                      PCI_REGION_IO);
+
+       pci_set_region(hose->regions + 2,
+                      CONFIG_PCI_PREF_BUS,
+                      CONFIG_PCI_PREF_PHYS,
+                      CONFIG_PCI_PREF_SIZE,
+                      PCI_REGION_PREFETCH);
+
+       pci_set_region(hose->regions + 3,
+                      0,
+                      0,
+                      gd->ram_size,
+                      PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+
+       hose->region_count = 4;
+}
+
+int board_pci_post_scan(struct pci_controller *hose)
+{
+       return 0;
+}
+
+int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev)
+{
+       /*
+        * TODO:
+        *
+        * For some unknown reason, the PCI enumeration process hangs
+        * when it scans to the PCIe root port 0 (D23:F0) & 1 (D23:F1).
+        *
+        * For now we just skip these two devices, and this needs to
+        * be revisited later.
+        */
+       if (dev == QUARK_HOST_BRIDGE ||
+           dev == QUARK_PCIE0 || dev == QUARK_PCIE1) {
+               return 1;
+       }
+
+       return 0;
+}
arch/x86/cpu/quark/quark.c new file +44 -0
new file mode 100644
index 0000000..47ba152
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/pci.h>
+#include <asm/post.h>
+#include <asm/processor.h>
+
+int arch_cpu_init(void)
+{
+       struct pci_controller *hose;
+       int ret;
+
+       post_code(POST_CPU_INIT);
+#ifdef CONFIG_SYS_X86_TSC_TIMER
+       timer_set_base(rdtsc());
+#endif
+
+       ret = x86_cpu_init_f();
+       if (ret)
+               return ret;
+
+       ret = pci_early_init_hose(&hose);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+int print_cpuinfo(void)
+{
+       post_code(POST_CPU_INFO);
+       return default_print_cpuinfo();
+}
+
+void reset_cpu(ulong addr)
+{
+       /* cold reset */
+       outb(0x08, PORT_RESET);
+}
arch/x86/include/asm/arch-quark/gpio.h new file +13 -1
new file mode 100644
index 0000000..ca8cba4
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _X86_ARCH_GPIO_H_
+#define _X86_ARCH_GPIO_H_
+
+/* Where in config space is the register that points to the GPIO registers? */
+#define PCI_CFG_GPIOBASE 0x44
+
+#endif /* _X86_ARCH_GPIO_H_ */
--
Quoted 2 lines

1.8.2.1

Regards,
Simon

author
#11 lore raw

RFC PATCH v2 4/6 x86: Add basic Intel Quark processor support

Hi Simon,

Quoted 107 lines · Simon Glass

Hi Bin,

Quoted 12 lines · Bin Meng

Add minimum codes to support Intel Quark SoC. DRAM initialization is not ready yet so a hardcoded gd->ram_size is assigned.

---

Changes in v2:
- Use machine-specific
- Move vairous components' base addresses within Quark SoC to Kconfig
- Rebase to u-boot-86/master

All looks OK but for a few nits.

Quoted 89 lines
 arch/x86/cpu/quark/Kconfig             | 118 +++++++++++++++++++++++++++++++++
 arch/x86/cpu/quark/Makefile            |   8 +++
 arch/x86/cpu/quark/dram.c              |  39 +++++++++++
 arch/x86/cpu/quark/pci.c               |  70 +++++++++++++++++++
 arch/x86/cpu/quark/quark.c             |  44 ++++++++++++
 arch/x86/include/asm/arch-quark/gpio.h |  13 ++++
 6 files changed, 292 insertions(+)
 create mode 100644 arch/x86/cpu/quark/Kconfig
 create mode 100644 arch/x86/cpu/quark/Makefile
 create mode 100644 arch/x86/cpu/quark/dram.c
 create mode 100644 arch/x86/cpu/quark/pci.c
 create mode 100644 arch/x86/cpu/quark/quark.c
 create mode 100644 arch/x86/include/asm/arch-quark/gpio.h
arch/x86/cpu/quark/Kconfig new file +69 -0
new file mode 100644
index 0000000..8bccf09
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+config INTEL_QUARK
+       bool
+       select HAVE_RMU
+
+if INTEL_QUARK
+
+config HAVE_RMU
+       bool "Add a Remote Management Unit (RMU) binary"
+       help
+         Select this option to add a Remote Management Unit (RMU) binary
+         to the resulting U-Boot image. It is a data block (up to 64K) of
+         machine-specific code which must be put in the flash for the RMU
+         within the Quark SoC processor to access when powered up before
+         system BIOS is executed.
+
+config RMU_FILE
+       string "Remote Management Unit (RMU) binary filename"
+       depends on HAVE_RMU
+       default "rmu.bin"
+       help
+         The filename of the file to use as Remote Management Unit (RMU)
+         binary in the board directory.
+
+config RMU_ADDR
+       hex "Remote Management Unit (RMU) binary location"
+       depends on HAVE_RMU
+       default 0xfff00000
+       help
+         The location of the RMU binary is determined by a strap. It must be
+         put in flash at a location matching the strap-determined base address.
+
+         The default base address of 0xfff00000 indicates that the binary must
+         be located at offset 0 from the beginning of a 1MB flash device.
+
+config HAVE_CMC
+       bool
+       default HAVE_RMU
+
+config CMC_FILE
+       string
+       depends on HAVE_CMC
+       default RMU_FILE
+
+config CMC_ADDR
+       hex
+       depends on HAVE_CMC
+       default RMU_ADDR
+
+config ESRAM_BASE
+       hex
+       default 0x80000000
+       help
+         Embedded SRAM (eSRAM) memory-mapped base address.
+
+config PCIE_ECAM_BASE
+       hex
+       default 0xe0000000
+
+config RCBA_BASE
+       hex
+       default 0xfed1c000
+       help
+         Root Complex register block memory-mapped base address.
Quoted 8 lines

arch/x86/cpu/quark/Kconfig line 75

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config ACPI_PM1_BASE
+       hex
+       default 0x1000
+       help
+         ACPI PM1 i/o-mapped base address.

What is PM1?

This is defined in ACPI spec. Given U-Boot does not support ACPI yet, and its full description is documented in the ACPI spec, I don't think we need describe what it actually does here as this help is not a user visible Kconfig option.

Quoted 8 lines

arch/x86/cpu/quark/Kconfig line 81

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config ACPI_P_BASE
+       hex
+       default 0x1010
+       help
+         ACPI PBLK i/o-mapped base address.

What is PBLK?

Defined in ACPI spec. Maybe I should define this as ACPI_PBLK_BASE.

Quoted 12 lines
Quoted 12 lines
arch/x86/cpu/quark/Kconfig new file +12 -0
+
+config SPI_DMA_BASE
+       hex
+       default 0x1020
+       help
+         SPI DMA i/o-mapped base address.
+
+config GPIO_BASE
+       hex
+       default 0x1080
+       help
+         GPIO i/o-mapped base address.
Quoted 8 lines

arch/x86/cpu/quark/Kconfig line 99

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config GPE0_BASE
+       hex
+       default 0x1100
+       help
+         GPE0 i/o-mapped base address.

What is GPE0?

Defined in ACPI spec. Maybe I should describe it as "ACPI GPE0", like above two.

Quoted 67 lines
Quoted 67 lines
arch/x86/cpu/quark/Kconfig new file +19 -0
+
+config WDT_BASE
+       hex
+       default 0x1140
+       help
+         Watchdog timer i/o-mapped base address.
+
+config SYS_CAR_ADDR
+       hex
+       default ESRAM_BASE
+
+config SYS_CAR_SIZE
+       hex
+       default 0x8000
+       help
+         Space in bytes in eSRAM used as Cache-As-ARM (CAR).
+         Note this size must not exceed eSRAM's total size.
+
+endif
arch/x86/cpu/quark/Makefile new file +8 -0
new file mode 100644
index 0000000..168c1e6
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y += car.o dram.o msg_port.o quark.o
+obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/quark/dram.c new file +28 -0
new file mode 100644
index 0000000..fbdc3cd
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+       /* hardcode the DRAM size for now */
+       gd->ram_size = DRAM_MAX_SIZE;
+       post_code(POST_DRAM);
+
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = 0;
+       gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+/*
Quoted 9 lines

arch/x86/cpu/quark/dram.c line 34

Quoted 6 lines
arch/x86/cpu/quark/dram.c new file +6 -0
+ * This function looks for the highest region of memory lower than 4GB which
+ * has enough space for U-Boot where U-Boot is aligned on a page boundary.
+ * It overrides the default implementation found elsewhere which simply
+ * picks the end of ram, wherever that may be. The location of the stack,
+ * the relocation address, and how far U-Boot is moved by relocation are
+ * set in the global data structure.

This comment probably doesn't make sense here.

This comment was taken from other codes. So far since we don't have MRC, it returns a hardcoded number. Do you think I need change this for this patch and when we support MRC we can add this comment back?

[snip]

Regards,
Bin

#12 lore raw

RFC PATCH v2 4/6 x86: Add basic Intel Quark processor support

Hi Bin,

Quoted 119 lines · Bin Meng

Hi Simon,

Quoted 107 lines · Simon Glass

Hi Bin,

Quoted 12 lines · Bin Meng

Add minimum codes to support Intel Quark SoC. DRAM initialization is not ready yet so a hardcoded gd->ram_size is assigned.

---

Changes in v2:
- Use machine-specific
- Move vairous components' base addresses within Quark SoC to Kconfig
- Rebase to u-boot-86/master

All looks OK but for a few nits.

Quoted 89 lines
 arch/x86/cpu/quark/Kconfig             | 118 +++++++++++++++++++++++++++++++++
 arch/x86/cpu/quark/Makefile            |   8 +++
 arch/x86/cpu/quark/dram.c              |  39 +++++++++++
 arch/x86/cpu/quark/pci.c               |  70 +++++++++++++++++++
 arch/x86/cpu/quark/quark.c             |  44 ++++++++++++
 arch/x86/include/asm/arch-quark/gpio.h |  13 ++++
 6 files changed, 292 insertions(+)
 create mode 100644 arch/x86/cpu/quark/Kconfig
 create mode 100644 arch/x86/cpu/quark/Makefile
 create mode 100644 arch/x86/cpu/quark/dram.c
 create mode 100644 arch/x86/cpu/quark/pci.c
 create mode 100644 arch/x86/cpu/quark/quark.c
 create mode 100644 arch/x86/include/asm/arch-quark/gpio.h
arch/x86/cpu/quark/Kconfig new file +69 -0
new file mode 100644
index 0000000..8bccf09
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+config INTEL_QUARK
+       bool
+       select HAVE_RMU
+
+if INTEL_QUARK
+
+config HAVE_RMU
+       bool "Add a Remote Management Unit (RMU) binary"
+       help
+         Select this option to add a Remote Management Unit (RMU) binary
+         to the resulting U-Boot image. It is a data block (up to 64K) of
+         machine-specific code which must be put in the flash for the RMU
+         within the Quark SoC processor to access when powered up before
+         system BIOS is executed.
+
+config RMU_FILE
+       string "Remote Management Unit (RMU) binary filename"
+       depends on HAVE_RMU
+       default "rmu.bin"
+       help
+         The filename of the file to use as Remote Management Unit (RMU)
+         binary in the board directory.
+
+config RMU_ADDR
+       hex "Remote Management Unit (RMU) binary location"
+       depends on HAVE_RMU
+       default 0xfff00000
+       help
+         The location of the RMU binary is determined by a strap. It must be
+         put in flash at a location matching the strap-determined base address.
+
+         The default base address of 0xfff00000 indicates that the binary must
+         be located at offset 0 from the beginning of a 1MB flash device.
+
+config HAVE_CMC
+       bool
+       default HAVE_RMU
+
+config CMC_FILE
+       string
+       depends on HAVE_CMC
+       default RMU_FILE
+
+config CMC_ADDR
+       hex
+       depends on HAVE_CMC
+       default RMU_ADDR
+
+config ESRAM_BASE
+       hex
+       default 0x80000000
+       help
+         Embedded SRAM (eSRAM) memory-mapped base address.
+
+config PCIE_ECAM_BASE
+       hex
+       default 0xe0000000
+
+config RCBA_BASE
+       hex
+       default 0xfed1c000
+       help
+         Root Complex register block memory-mapped base address.
Quoted 8 lines

arch/x86/cpu/quark/Kconfig line 75

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config ACPI_PM1_BASE
+       hex
+       default 0x1000
+       help
+         ACPI PM1 i/o-mapped base address.

What is PM1?

Quoted 4 lines

This is defined in ACPI spec. Given U-Boot does not support ACPI yet, and its full description is documented in the ACPI spec, I don't think we need describe what it actually does here as this help is not a user visible Kconfig option.

OK, but perhaps you can put the abbreviated names in the help?

Quoted 33 lines
Quoted 9 lines

arch/x86/cpu/quark/Kconfig line 81

Quoted 7 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config ACPI_P_BASE
+       hex
+       default 0x1010
+       help
+         ACPI PBLK i/o-mapped base address.

What is PBLK?

Defined in ACPI spec. Maybe I should define this as ACPI_PBLK_BASE.

Quoted 12 lines
Quoted 12 lines
arch/x86/cpu/quark/Kconfig new file +12 -0
+
+config SPI_DMA_BASE
+       hex
+       default 0x1020
+       help
+         SPI DMA i/o-mapped base address.
+
+config GPIO_BASE
+       hex
+       default 0x1080
+       help
+         GPIO i/o-mapped base address.
Quoted 8 lines

arch/x86/cpu/quark/Kconfig line 99

Quoted 6 lines
arch/x86/cpu/quark/Kconfig new file +6 -0
+
+config GPE0_BASE
+       hex
+       default 0x1100
+       help
+         GPE0 i/o-mapped base address.

What is GPE0?

Quoted 1 line

Defined in ACPI spec. Maybe I should describe it as "ACPI GPE0", like above two.

Whatever you think is fine for the option, but please explain lots in the help message.

Quoted 78 lines
Quoted 68 lines
Quoted 68 lines
arch/x86/cpu/quark/Kconfig new file +19 -0
+
+config WDT_BASE
+       hex
+       default 0x1140
+       help
+         Watchdog timer i/o-mapped base address.
+
+config SYS_CAR_ADDR
+       hex
+       default ESRAM_BASE
+
+config SYS_CAR_SIZE
+       hex
+       default 0x8000
+       help
+         Space in bytes in eSRAM used as Cache-As-ARM (CAR).
+         Note this size must not exceed eSRAM's total size.
+
+endif
arch/x86/cpu/quark/Makefile new file +8 -0
new file mode 100644
index 0000000..168c1e6
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y += car.o dram.o msg_port.o quark.o
+obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/quark/dram.c new file +28 -0
new file mode 100644
index 0000000..fbdc3cd
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/post.h>
+#include <asm/arch/quark.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+       /* hardcode the DRAM size for now */
+       gd->ram_size = DRAM_MAX_SIZE;
+       post_code(POST_DRAM);
+
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = 0;
+       gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+/*
Quoted 9 lines

arch/x86/cpu/quark/dram.c line 34

Quoted 6 lines
arch/x86/cpu/quark/dram.c new file +6 -0
+ * This function looks for the highest region of memory lower than 4GB which
+ * has enough space for U-Boot where U-Boot is aligned on a page boundary.
+ * It overrides the default implementation found elsewhere which simply
+ * picks the end of ram, wherever that may be. The location of the stack,
+ * the relocation address, and how far U-Boot is moved by relocation are
+ * set in the global data structure.

This comment probably doesn't make sense here.

Quoted 3 lines

This comment was taken from other codes. So far since we don't have MRC, it returns a hardcoded number. Do you think I need change this for this patch and when we support MRC we can add this comment back?

Ah I see. Well it's fine to leave as it is then.

Regards,
Simon

author
#13 lore raw

RFC PATCH v2 5/6 x86: Add basic Intel Galileo board support

In reply to Bin Meng

New board/intel/galileo board directory with minimum codes, plus board dts, defconfig and configuration files.

---

Changes in v2: None

 arch/x86/dts/Makefile           |  1 +
 arch/x86/dts/galileo.dts        | 43 +++++++++++++++++++++++++++++++++
 board/intel/galileo/Kconfig     | 21 ++++++++++++++++
 board/intel/galileo/MAINTAINERS |  6 +++++
 board/intel/galileo/Makefile    |  7 ++++++
 board/intel/galileo/galileo.c   | 19 +++++++++++++++
 board/intel/galileo/start.S     |  9 +++++++
 configs/galileo_defconfig       |  6 +++++
 include/configs/galileo.h       | 53 +++++++++++++++++++++++++++++++++++++++++
 9 files changed, 165 insertions(+)
 create mode 100644 arch/x86/dts/galileo.dts
 create mode 100644 board/intel/galileo/Kconfig
 create mode 100644 board/intel/galileo/MAINTAINERS
 create mode 100644 board/intel/galileo/Makefile
 create mode 100644 board/intel/galileo/galileo.c
 create mode 100644 board/intel/galileo/start.S
 create mode 100644 configs/galileo_defconfig
 create mode 100644 include/configs/galileo.h
arch/x86/dts/Makefile +1 -0
index 4e0171a..7a66133 100644
@@ -1,5 +1,6 @@
 dtb-y += chromebook_link.dtb \
 	crownbay.dtb \
+	galileo.dtb \
 	minnowmax.dtb
 
 targets += $(dtb-y)
arch/x86/dts/galileo.dts new file +43 -0

43 lines not on this page · raw message

board/intel/galileo/Kconfig new file +21 -0
new file mode 100644
index 0000000..85afbbc
@@ -0,0 +1,21 @@
+if TARGET_GALILEO
+
+config SYS_BOARD
+	default "galileo"
+
+config SYS_VENDOR
+	default "intel"
+
+config SYS_SOC
+	default "quark"
+
+config SYS_CONFIG_NAME
+	default "galileo"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+	select X86_RESET_VECTOR
+	select INTEL_QUARK
+	select BOARD_ROMSIZE_KB_1024
+
+endif
board/intel/galileo/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..dbbc82e
@@ -0,0 +1,6 @@
+INTEL GALILEO BOARD
+M:	Bin Meng <[email protected]>
+S:	Maintained
+F:	board/intel/galileo/
+F:	include/configs/galileo.h
+F:	configs/galileo_defconfig
board/intel/galileo/Makefile new file +7 -0
new file mode 100644
index 0000000..8356df1
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	+= galileo.o start.o
board/intel/galileo/galileo.c new file +19 -0
new file mode 100644
index 0000000..f2e7468
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+	return 0;
+}
+
+void setup_pch_gpios(u16 gpiobase, const struct pch_gpio_map *gpio)
+{
+	return;
+}
board/intel/galileo/start.S new file +9 -0
new file mode 100644
index 0000000..a71db69
@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+.globl early_board_init
+early_board_init:
+	jmp	early_board_init_ret
configs/galileo_defconfig new file +6 -0
new file mode 100644
index 0000000..f208651
@@ -0,0 +1,6 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff10000"
+CONFIG_X86=y
+CONFIG_TARGET_GALILEO=y
+CONFIG_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y
+CONFIG_DEFAULT_DEVICE_TREE="galileo"
include/configs/galileo.h new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
1.8.2.1
#14 lore raw

RFC PATCH v2 5/6 x86: Add basic Intel Galileo board support

Quoted 19 lines · Bin Meng

New board/intel/galileo board directory with minimum codes, plus board dts, defconfig and configuration files.

---

Changes in v2: None

 arch/x86/dts/Makefile           |  1 +
 arch/x86/dts/galileo.dts        | 43 +++++++++++++++++++++++++++++++++
 board/intel/galileo/Kconfig     | 21 ++++++++++++++++
 board/intel/galileo/MAINTAINERS |  6 +++++
 board/intel/galileo/Makefile    |  7 ++++++
 board/intel/galileo/galileo.c   | 19 +++++++++++++++
 board/intel/galileo/start.S     |  9 +++++++
 configs/galileo_defconfig       |  6 +++++
 include/configs/galileo.h       | 53 +++++++++++++++++++++++++++++++++++++++++
 9 files changed, 165 insertions(+)
Quoted 9 lines
 create mode 100644 arch/x86/dts/galileo.dts
 create mode 100644 board/intel/galileo/Kconfig
 create mode 100644 board/intel/galileo/MAINTAINERS
 create mode 100644 board/intel/galileo/Makefile
 create mode 100644 board/intel/galileo/galileo.c
 create mode 100644 board/intel/galileo/start.S
 create mode 100644 configs/galileo_defconfig
 create mode 100644 include/configs/galileo.h
author
#15 lore raw

RFC PATCH v2 6/6 x86: Enable the Intel quark/galileo build

In reply to Bin Meng

Make the Intel quark/galileo support avaiable in Kconfig and Makefile. With this patch, we can generate u-boot.rom for Intel galileo board.

---

Changes in v2:
- Use Arduino-certified

 arch/x86/Kconfig      | 17 +++++++++++++++++
 arch/x86/cpu/Makefile |  1 +
 2 files changed, 18 insertions(+)
arch/x86/Kconfig +17 -0
index defdce7..85dda2e 100644
@@ -52,6 +52,19 @@ config TARGET_MINNOWMAX
 	  Note that PCIE_ECAM_BASE is set up by the FSP so the value used
 	  by U-Boot matches that value.
 
+config TARGET_GALILEO
+	bool "Support Intel Galileo"
+	help
+	  This is the Intel Galileo board, which is the first in a family of
+	  Arduino-certified development and prototyping boards based on Intel
+	  architecture. It includes an Intel Quark SoC X1000 processor, a 32-bit
+	  single-core, single-thread, Intel Pentium processor instrunction set
+	  architecture (ISA) compatible, operating at speeds up to 400Mhz,
+	  along with 256MB DDR3 memory. It supports a wide range of industry
+	  standard I/O interfaces, including a full-sized mini-PCIe slot,
+	  one 100Mb Ethernet port, a microSD card slot, a USB host port and
+	  a USB client port.
+
 endchoice
 
 config RAMBASE
@@ -399,6 +412,8 @@ source "arch/x86/cpu/coreboot/Kconfig"
 
 source "arch/x86/cpu/ivybridge/Kconfig"
 
+source "arch/x86/cpu/quark/Kconfig"
+
 source "arch/x86/cpu/queensbay/Kconfig"
 
 source "board/coreboot/coreboot/Kconfig"
@@ -409,6 +424,8 @@ source "board/intel/crownbay/Kconfig"
 
 source "board/intel/minnowmax/Kconfig"
 
+source "board/intel/galileo/Kconfig"
+
 config PCIE_ECAM_BASE
 	hex
     default 0xe0000000
arch/x86/cpu/Makefile +1 -0
index 5acf8bb..6ded0a7 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_INTEL_BAYTRAIL) += baytrail/
 obj-$(CONFIG_SYS_COREBOOT) += coreboot/
 obj-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += ivybridge/
 obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/
+obj-$(CONFIG_INTEL_QUARK) += quark/
 obj-$(CONFIG_INTEL_QUEENSBAY) += queensbay/
 obj-y += lapic.o
 obj-y += mtrr.o
Signature · 1 line
1.8.2.1
#16 lore raw

RFC PATCH v2 6/6 x86: Enable the Intel quark/galileo build

Quoted 6 lines · Bin Meng

Make the Intel quark/galileo support avaiable in Kconfig and Makefile. With this patch, we can generate u-boot.rom for Intel galileo board.

Quoted 8 lines

---

Changes in v2:
- Use Arduino-certified

 arch/x86/Kconfig      | 17 +++++++++++++++++
 arch/x86/cpu/Makefile |  1 +
 2 files changed, 18 insertions(+)