Skip to contentSkip to conversation

x86 platform support for Intel Quark SoC systems for v3.20

GIT PULL Ingo Molnar 1 participant 1 message Feb 20, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

If it's not too late for a v3.20 merge yet I'd like you to pull this tree that adds support for Intel Quark X1000 SoC boards, used in the low power 32-bit x86 Intel Galileo microcontroller board intended for the Arduino space:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus

# HEAD: c11a25f443e9bee06fe302b6a78ff44dac554036 x86/intel/quark: Fix simple_return.cocci warnings

There's been some preparatory core x86 patches for Quark CPU quirks merged already, but this rounds it all up and adds Kconfig enablement. It's a clean hardware enablement addition tree at this point.

out-of-topic modifications in x86-platform-for-linus:
-------------------------------------------------------
drivers/platform/x86/Kconfig # 28a375df16c2: x86/intel/quark: Add Isolate

Thanks,

Ingo

------------------>
Bryan O'Donoghue (2):
x86/intel/quark: Add Isolated Memory Regions for Quark X1000 x86/intel/quark: Add Intel Quark platform support

Fengguang Wu (2):
x86/intel/quark: Fix ptr_ret.cocci warnings x86/intel/quark: Fix simple_return.cocci warnings

 arch/x86/Kconfig                             |  16 +
 arch/x86/Kconfig.debug                       |  13 +
 arch/x86/include/asm/imr.h                   |  60 +++
 arch/x86/platform/Makefile                   |   1 +
 arch/x86/platform/intel-quark/Makefile       |   2 +
 arch/x86/platform/intel-quark/imr.c          | 661 +++++++++++++++++++++++++++
 arch/x86/platform/intel-quark/imr_selftest.c | 129 ++++++
 drivers/platform/x86/Kconfig                 |  25 +
 8 files changed, 907 insertions(+)
 create mode 100644 arch/x86/include/asm/imr.h
 create mode 100644 arch/x86/platform/intel-quark/Makefile
 create mode 100644 arch/x86/platform/intel-quark/imr.c
 create mode 100644 arch/x86/platform/intel-quark/imr_selftest.c
arch/x86/Kconfig +16 -0
index 5e28e2be3a41..1f97c7f0d049 100644
@@ -486,6 +486,22 @@ config X86_INTEL_MID
 	  Intel MID platforms are based on an Intel processor and chipset which
 	  consume less power than most of the x86 derivatives.
 
+config X86_INTEL_QUARK
+	bool "Intel Quark platform support"
+	depends on X86_32
+	depends on X86_EXTENDED_PLATFORM
+	depends on X86_PLATFORM_DEVICES
+	depends on X86_TSC
+	depends on PCI
+	depends on PCI_GOANY
+	depends on X86_IO_APIC
+	select IOSF_MBI
+	select INTEL_IMR
+	---help---
+	  Select to include support for Quark X1000 SoC.
+	  Say Y here if you have a Quark based system such as the Arduino
+	  compatible Intel Galileo.
+
 config X86_INTEL_LPSS
 	bool "Intel Low Power Subsystem Support"
 	depends on ACPI
arch/x86/Kconfig.debug +13 -0
index 61bd2ad94281..20028da8ae18 100644
@@ -313,6 +313,19 @@ config DEBUG_NMI_SELFTEST
 
 	  If unsure, say N.
 
+config DEBUG_IMR_SELFTEST
+	bool "Isolated Memory Region self test"
+	default n
+	depends on INTEL_IMR
+	---help---
+	  This option enables automated sanity testing of the IMR code.
+	  Some simple tests are run to verify IMR bounds checking, alignment
+	  and overlapping. This option is really only useful if you are
+	  debugging an IMR memory map or are modifying the IMR code and want to
+	  test your changes.
+
+	  If unsure say N here.
+
 config X86_DEBUG_STATIC_CPU_HAS
 	bool "Debug alternatives"
 	depends on DEBUG_KERNEL
arch/x86/include/asm/imr.h new file +60 -0

60 lines not on this page · raw message

arch/x86/platform/Makefile +1 -0
index 85afde1fa3e5..a62e0be3a2f1 100644
@@ -5,6 +5,7 @@ obj-y	+= geode/
 obj-y	+= goldfish/
 obj-y	+= iris/
 obj-y	+= intel-mid/
+obj-y	+= intel-quark/
 obj-y	+= olpc/
 obj-y	+= scx200/
 obj-y	+= sfi/
arch/x86/platform/intel-quark/Makefile new file +2 -0
new file mode 100644
index 000000000000..9cc57ed36022
@@ -0,0 +1,2 @@
+obj-$(CONFIG_INTEL_IMR) += imr.o
+obj-$(CONFIG_DEBUG_IMR_SELFTEST) += imr_selftest.o
arch/x86/platform/intel-quark/imr.c new file +661 -0

661 lines not on this page · raw message

arch/x86/platform/intel-quark/imr_selftest.c new file +129 -0

129 lines not on this page · raw message

drivers/platform/x86/Kconfig +25 -0
index 638e797037da..97527614141b 100644
@@ -735,6 +735,31 @@ config INTEL_IPS
 	  functionality.  If in doubt, say Y here; it will only load on
 	  supported platforms.
 
+config INTEL_IMR
+	bool "Intel Isolated Memory Region support"
+	default n
+	depends on X86_INTEL_QUARK && IOSF_MBI
+	---help---
+	  This option provides a means to manipulate Isolated Memory Regions.
+	  IMRs are a set of registers that define read and write access masks
+	  to prohibit certain system agents from accessing memory with 1 KiB
+	  granularity.
+
+	  IMRs make it possible to control read/write access to an address
+	  by hardware agents inside the SoC. Read and write masks can be
+	  defined for:
+		- eSRAM flush
+		- Dirty CPU snoop (write only)
+		- RMU access
+		- PCI Virtual Channel 0/Virtual Channel 1
+		- SMM mode
+		- Non SMM mode
+
+	  Quark contains a set of eight IMR registers and makes use of those
+	  registers during its bootup process.
+
+	  If you are running on a Galileo/Quark say Y here.
+
 config IBM_RTL
 	tristate "Device driver to enable PRTL support"
 	depends on X86 && PCI