Commit f9677375 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull Intel Quark SoC support from Ingo Molnar:
 "This 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.

  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"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/quark: Fix simple_return.cocci warnings
  x86/intel/quark: Fix ptr_ret.cocci warnings
  x86/intel/quark: Add Intel Quark platform support
  x86/intel/quark: Add Isolated Memory Regions for Quark X1000
parents f3c233d7 c11a25f4

arch/x86/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -488,6 +488,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
Original line number Diff line number Diff line
@@ -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

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * imr.h: Isolated Memory Region API

 *

 * Copyright(c) 2013 Intel Corporation.

 * Copyright(c) 2015 Bryan O'Donoghue <pure.logic@nexus-software.ie>

 *

 * 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.

 */

#ifndef _IMR_H

#define _IMR_H



#include <linux/types.h>



/*

 * IMR agent access mask bits

 * See section 12.7.4.7 from quark-x1000-datasheet.pdf for register

 * definitions.

 */

#define IMR_ESRAM_FLUSH		BIT(31)

#define IMR_CPU_SNOOP		BIT(30)		/* Applicable only to write */

#define IMR_RMU			BIT(29)

#define IMR_VC1_SAI_ID3		BIT(15)

#define IMR_VC1_SAI_ID2		BIT(14)

#define IMR_VC1_SAI_ID1		BIT(13)

#define IMR_VC1_SAI_ID0		BIT(12)

#define IMR_VC0_SAI_ID3		BIT(11)

#define IMR_VC0_SAI_ID2		BIT(10)

#define IMR_VC0_SAI_ID1		BIT(9)

#define IMR_VC0_SAI_ID0		BIT(8)

#define IMR_CPU_0		BIT(1)		/* SMM mode */

#define IMR_CPU			BIT(0)		/* Non SMM mode */

#define IMR_ACCESS_NONE		0



/*

 * Read/Write access-all bits here include some reserved bits

 * These are the values firmware uses and are accepted by hardware.

 * The kernel defines read/write access-all in the same way as firmware

 * in order to have a consistent and crisp definition across firmware,

 * bootloader and kernel.

 */

#define IMR_READ_ACCESS_ALL	0xBFFFFFFF

#define IMR_WRITE_ACCESS_ALL	0xFFFFFFFF



/* Number of IMRs provided by Quark X1000 SoC */

#define QUARK_X1000_IMR_MAX	0x08

#define QUARK_X1000_IMR_REGBASE 0x40



/* IMR alignment bits - only bits 31:10 are checked for IMR validity */

#define IMR_ALIGN		0x400

#define IMR_MASK		(IMR_ALIGN - 1)



int imr_add_range(phys_addr_t base, size_t size,

		  unsigned int rmask, unsigned int wmask, bool lock);



int imr_remove_range(phys_addr_t base, size_t size);



#endif /* _IMR_H */

arch/x86/platform/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INTEL_IMR) += imr.o

obj-$(CONFIG_DEBUG_IMR_SELFTEST) += imr_selftest.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE