LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support
@ 2015-03-13 22:54 Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h> Andrew Bresticker
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan

This series adds basic support for the Imagination Technologies Pistachio
SoC.  Pistachio will boot using device-tree only.  v4.0-rc1 already includes
support for several of the peripherals on Pistachio, including MMC, SPI,
I2C, DMA, watchdog timer, PWM, and IR.  Clock and pinctrl support for
Pistachio is coming soon, as well as an initial device-tree and support
for USB and ethernet.

Patches 1 and 2 are cleanups in preparation for adding Pistachio support,
with patch 1 having been posted by Kevin late last year [1].  Patch 3
documents Pistachio's required device-tree properties/nodes and its boot
protocol.  Patch 4 adds support for Pistachio itself and finally patch 5
adds a defconfig for Pistachio.

Boot tested on an IMG Pistachio BuB ("bring-up board") and build tested
for all other affected platforms.  Based on v4.0-rc3.  A tree with these
changes is available at [2].

Changes from v1:
 - Switched to MIPS UHI hand-off protocol

Cc: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
Cc: James Hartley <james.hartley@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>

[1] http://patchwork.linux-mips.org/patch/8837/
[2] https://github.com/abrestic/linux/tree/pistachio-platform-v2

Andrew Bresticker (3):
  MIPS: Allow platforms to specify the decompressor load address
  MIPS: Document Pistachio boot protocol and device-tree bindings
  MIPS: Add support for the IMG Pistachio SoC

Govindraj Raja (1):
  MIPS: pistachio: Add an initial defconfig

Kevin Cernekee (1):
  MIPS: Create a common <asm/mach-generic/war.h>

 .../devicetree/bindings/mips/img/pistachio.txt     |  42 +++
 arch/mips/Kbuild.platforms                         |   1 +
 arch/mips/Kconfig                                  |  27 ++
 arch/mips/boot/compressed/Makefile                 |   6 +-
 arch/mips/configs/pistachio_defconfig              | 336 +++++++++++++++++++++
 arch/mips/include/asm/mach-ar7/war.h               |  24 --
 arch/mips/include/asm/mach-ath25/war.h             |  25 --
 arch/mips/include/asm/mach-ath79/war.h             |  24 --
 arch/mips/include/asm/mach-au1x00/war.h            |  24 --
 arch/mips/include/asm/mach-bcm3384/war.h           |  24 --
 arch/mips/include/asm/mach-bcm47xx/war.h           |  24 --
 arch/mips/include/asm/mach-bcm63xx/war.h           |  24 --
 arch/mips/include/asm/mach-cobalt/war.h            |  24 --
 arch/mips/include/asm/mach-dec/war.h               |  24 --
 arch/mips/include/asm/mach-emma2rh/war.h           |  24 --
 arch/mips/include/asm/mach-generic/war.h           |  24 ++
 arch/mips/include/asm/mach-jazz/war.h              |  24 --
 arch/mips/include/asm/mach-jz4740/war.h            |  24 --
 arch/mips/include/asm/mach-lantiq/war.h            |  23 --
 arch/mips/include/asm/mach-lasat/war.h             |  24 --
 arch/mips/include/asm/mach-loongson/war.h          |  24 --
 arch/mips/include/asm/mach-loongson1/war.h         |  24 --
 arch/mips/include/asm/mach-netlogic/war.h          |  25 --
 arch/mips/include/asm/mach-paravirt/war.h          |  25 --
 arch/mips/include/asm/mach-pistachio/gpio.h        |  21 ++
 arch/mips/include/asm/mach-pistachio/irq.h         |  18 ++
 arch/mips/include/asm/mach-pnx833x/war.h           |  24 --
 arch/mips/include/asm/mach-ralink/war.h            |  24 --
 arch/mips/include/asm/mach-tx39xx/war.h            |  24 --
 arch/mips/include/asm/mach-vr41xx/war.h            |  24 --
 arch/mips/jz4740/Platform                          |   1 +
 arch/mips/pistachio/Makefile                       |   1 +
 arch/mips/pistachio/Platform                       |   8 +
 arch/mips/pistachio/init.c                         | 131 ++++++++
 arch/mips/pistachio/irq.c                          |  28 ++
 arch/mips/pistachio/time.c                         |  52 ++++
 36 files changed, 694 insertions(+), 532 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio.txt
 create mode 100644 arch/mips/configs/pistachio_defconfig
 delete mode 100644 arch/mips/include/asm/mach-ar7/war.h
 delete mode 100644 arch/mips/include/asm/mach-ath25/war.h
 delete mode 100644 arch/mips/include/asm/mach-ath79/war.h
 delete mode 100644 arch/mips/include/asm/mach-au1x00/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm3384/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm47xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm63xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-cobalt/war.h
 delete mode 100644 arch/mips/include/asm/mach-dec/war.h
 delete mode 100644 arch/mips/include/asm/mach-emma2rh/war.h
 create mode 100644 arch/mips/include/asm/mach-generic/war.h
 delete mode 100644 arch/mips/include/asm/mach-jazz/war.h
 delete mode 100644 arch/mips/include/asm/mach-jz4740/war.h
 delete mode 100644 arch/mips/include/asm/mach-lantiq/war.h
 delete mode 100644 arch/mips/include/asm/mach-lasat/war.h
 delete mode 100644 arch/mips/include/asm/mach-loongson/war.h
 delete mode 100644 arch/mips/include/asm/mach-loongson1/war.h
 delete mode 100644 arch/mips/include/asm/mach-netlogic/war.h
 delete mode 100644 arch/mips/include/asm/mach-paravirt/war.h
 create mode 100644 arch/mips/include/asm/mach-pistachio/gpio.h
 create mode 100644 arch/mips/include/asm/mach-pistachio/irq.h
 delete mode 100644 arch/mips/include/asm/mach-pnx833x/war.h
 delete mode 100644 arch/mips/include/asm/mach-ralink/war.h
 delete mode 100644 arch/mips/include/asm/mach-tx39xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-vr41xx/war.h
 create mode 100644 arch/mips/pistachio/Makefile
 create mode 100644 arch/mips/pistachio/Platform
 create mode 100644 arch/mips/pistachio/init.c
 create mode 100644 arch/mips/pistachio/irq.c
 create mode 100644 arch/mips/pistachio/time.c

-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h>
  2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
@ 2015-03-13 22:54 ` Andrew Bresticker
  2015-03-16 10:08   ` James Hogan
  2015-03-13 22:54 ` [PATCH V2 2/5] MIPS: Allow platforms to specify the decompressor load address Andrew Bresticker
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan, Kevin Cernekee

From: Kevin Cernekee <cernekee@gmail.com>

11 platforms require at least one of these workarounds to be enabled; 22
platforms do not.  In the latter case we can fall back to a generic version.

Note that this also deletes an orphaned reference to RM9000_CDEX_SMP_WAR.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
---
No changes from v1.
Changes from Kevin's v6:
 - Left cavium-octeon's war.h in-tact
---
 arch/mips/include/asm/mach-ar7/war.h       | 24 ------------------------
 arch/mips/include/asm/mach-ath25/war.h     | 25 -------------------------
 arch/mips/include/asm/mach-ath79/war.h     | 24 ------------------------
 arch/mips/include/asm/mach-au1x00/war.h    | 24 ------------------------
 arch/mips/include/asm/mach-bcm3384/war.h   | 24 ------------------------
 arch/mips/include/asm/mach-bcm47xx/war.h   | 24 ------------------------
 arch/mips/include/asm/mach-bcm63xx/war.h   | 24 ------------------------
 arch/mips/include/asm/mach-cobalt/war.h    | 24 ------------------------
 arch/mips/include/asm/mach-dec/war.h       | 24 ------------------------
 arch/mips/include/asm/mach-emma2rh/war.h   | 24 ------------------------
 arch/mips/include/asm/mach-generic/war.h   | 24 ++++++++++++++++++++++++
 arch/mips/include/asm/mach-jazz/war.h      | 24 ------------------------
 arch/mips/include/asm/mach-jz4740/war.h    | 24 ------------------------
 arch/mips/include/asm/mach-lantiq/war.h    | 23 -----------------------
 arch/mips/include/asm/mach-lasat/war.h     | 24 ------------------------
 arch/mips/include/asm/mach-loongson/war.h  | 24 ------------------------
 arch/mips/include/asm/mach-loongson1/war.h | 24 ------------------------
 arch/mips/include/asm/mach-netlogic/war.h  | 25 -------------------------
 arch/mips/include/asm/mach-paravirt/war.h  | 25 -------------------------
 arch/mips/include/asm/mach-pnx833x/war.h   | 24 ------------------------
 arch/mips/include/asm/mach-ralink/war.h    | 24 ------------------------
 arch/mips/include/asm/mach-tx39xx/war.h    | 24 ------------------------
 arch/mips/include/asm/mach-vr41xx/war.h    | 24 ------------------------
 23 files changed, 24 insertions(+), 530 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-ar7/war.h
 delete mode 100644 arch/mips/include/asm/mach-ath25/war.h
 delete mode 100644 arch/mips/include/asm/mach-ath79/war.h
 delete mode 100644 arch/mips/include/asm/mach-au1x00/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm3384/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm47xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-bcm63xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-cobalt/war.h
 delete mode 100644 arch/mips/include/asm/mach-dec/war.h
 delete mode 100644 arch/mips/include/asm/mach-emma2rh/war.h
 create mode 100644 arch/mips/include/asm/mach-generic/war.h
 delete mode 100644 arch/mips/include/asm/mach-jazz/war.h
 delete mode 100644 arch/mips/include/asm/mach-jz4740/war.h
 delete mode 100644 arch/mips/include/asm/mach-lantiq/war.h
 delete mode 100644 arch/mips/include/asm/mach-lasat/war.h
 delete mode 100644 arch/mips/include/asm/mach-loongson/war.h
 delete mode 100644 arch/mips/include/asm/mach-loongson1/war.h
 delete mode 100644 arch/mips/include/asm/mach-netlogic/war.h
 delete mode 100644 arch/mips/include/asm/mach-paravirt/war.h
 delete mode 100644 arch/mips/include/asm/mach-pnx833x/war.h
 delete mode 100644 arch/mips/include/asm/mach-ralink/war.h
 delete mode 100644 arch/mips/include/asm/mach-tx39xx/war.h
 delete mode 100644 arch/mips/include/asm/mach-vr41xx/war.h

diff --git a/arch/mips/include/asm/mach-ar7/war.h b/arch/mips/include/asm/mach-ar7/war.h
deleted file mode 100644
index 99071e5..0000000
--- a/arch/mips/include/asm/mach-ar7/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_AR7_WAR_H
-#define __ASM_MIPS_MACH_AR7_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_AR7_WAR_H */
diff --git a/arch/mips/include/asm/mach-ath25/war.h b/arch/mips/include/asm/mach-ath25/war.h
deleted file mode 100644
index e3a5250..0000000
--- a/arch/mips/include/asm/mach-ath25/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- */
-#ifndef __ASM_MACH_ATH25_WAR_H
-#define __ASM_MACH_ATH25_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define RM9000_CDEX_SMP_WAR		0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_ATH25_WAR_H */
diff --git a/arch/mips/include/asm/mach-ath79/war.h b/arch/mips/include/asm/mach-ath79/war.h
deleted file mode 100644
index 0bb3090..0000000
--- a/arch/mips/include/asm/mach-ath79/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_ATH79_WAR_H
-#define __ASM_MACH_ATH79_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_ATH79_WAR_H */
diff --git a/arch/mips/include/asm/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h
deleted file mode 100644
index 72e260d..0000000
--- a/arch/mips/include/asm/mach-au1x00/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_AU1X00_WAR_H
-#define __ASM_MIPS_MACH_AU1X00_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_AU1X00_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm3384/war.h b/arch/mips/include/asm/mach-bcm3384/war.h
deleted file mode 100644
index 59d7599..0000000
--- a/arch/mips/include/asm/mach-bcm3384/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM3384_WAR_H
-#define __ASM_MIPS_MACH_BCM3384_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_BCM3384_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h
deleted file mode 100644
index a3d2f44..0000000
--- a/arch/mips/include/asm/mach-bcm47xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H
-#define __ASM_MIPS_MACH_BCM47XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm63xx/war.h b/arch/mips/include/asm/mach-bcm63xx/war.h
deleted file mode 100644
index 05ee867..0000000
--- a/arch/mips/include/asm/mach-bcm63xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM63XX_WAR_H
-#define __ASM_MIPS_MACH_BCM63XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_BCM63XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h
deleted file mode 100644
index 34ae404..0000000
--- a/arch/mips/include/asm/mach-cobalt/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_COBALT_WAR_H
-#define __ASM_MIPS_MACH_COBALT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_COBALT_WAR_H */
diff --git a/arch/mips/include/asm/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h
deleted file mode 100644
index d29996f..0000000
--- a/arch/mips/include/asm/mach-dec/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_DEC_WAR_H
-#define __ASM_MIPS_MACH_DEC_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_DEC_WAR_H */
diff --git a/arch/mips/include/asm/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h
deleted file mode 100644
index 79ae82d..0000000
--- a/arch/mips/include/asm/mach-emma2rh/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_EMMA2RH_WAR_H
-#define __ASM_MIPS_MACH_EMMA2RH_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_EMMA2RH_WAR_H */
diff --git a/arch/mips/include/asm/mach-generic/war.h b/arch/mips/include/asm/mach-generic/war.h
new file mode 100644
index 0000000..a1bc2e7
--- /dev/null
+++ b/arch/mips/include/asm/mach-generic/war.h
@@ -0,0 +1,24 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
+ */
+#ifndef __ASM_MACH_GENERIC_WAR_H
+#define __ASM_MACH_GENERIC_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR	0
+#define R4600_V1_HIT_CACHEOP_WAR	0
+#define R4600_V2_HIT_CACHEOP_WAR	0
+#define R5432_CP0_INTERRUPT_WAR		0
+#define BCM1250_M3_WAR			0
+#define SIBYTE_1956_WAR			0
+#define MIPS4K_ICACHE_REFILL_WAR	0
+#define MIPS_CACHE_SYNC_WAR		0
+#define TX49XX_ICACHE_INDEX_INV_WAR	0
+#define ICACHE_REFILLS_WORKAROUND_WAR	0
+#define R10000_LLSC_WAR			0
+#define MIPS34K_MISSED_ITLB_WAR		0
+
+#endif /* __ASM_MACH_GENERIC_WAR_H */
diff --git a/arch/mips/include/asm/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h
deleted file mode 100644
index 5b18b9a..0000000
--- a/arch/mips/include/asm/mach-jazz/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_JAZZ_WAR_H
-#define __ASM_MIPS_MACH_JAZZ_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_JAZZ_WAR_H */
diff --git a/arch/mips/include/asm/mach-jz4740/war.h b/arch/mips/include/asm/mach-jz4740/war.h
deleted file mode 100644
index 9b511d3..0000000
--- a/arch/mips/include/asm/mach-jz4740/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_JZ4740_WAR_H
-#define __ASM_MIPS_MACH_JZ4740_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_JZ4740_WAR_H */
diff --git a/arch/mips/include/asm/mach-lantiq/war.h b/arch/mips/include/asm/mach-lantiq/war.h
deleted file mode 100644
index 358ca97..0000000
--- a/arch/mips/include/asm/mach-lantiq/war.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- */
-#ifndef __ASM_MIPS_MACH_LANTIQ_WAR_H
-#define __ASM_MIPS_MACH_LANTIQ_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif
diff --git a/arch/mips/include/asm/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h
deleted file mode 100644
index 741ae72..0000000
--- a/arch/mips/include/asm/mach-lasat/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_LASAT_WAR_H
-#define __ASM_MIPS_MACH_LASAT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_LASAT_WAR_H */
diff --git a/arch/mips/include/asm/mach-loongson/war.h b/arch/mips/include/asm/mach-loongson/war.h
deleted file mode 100644
index f2570df..0000000
--- a/arch/mips/include/asm/mach-loongson/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_LOONGSON_WAR_H
-#define __ASM_MACH_LOONGSON_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_LEMOTE_WAR_H */
diff --git a/arch/mips/include/asm/mach-loongson1/war.h b/arch/mips/include/asm/mach-loongson1/war.h
deleted file mode 100644
index 8fb50d0..0000000
--- a/arch/mips/include/asm/mach-loongson1/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_LOONGSON1_WAR_H
-#define __ASM_MACH_LOONGSON1_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_LOONGSON1_WAR_H */
diff --git a/arch/mips/include/asm/mach-netlogic/war.h b/arch/mips/include/asm/mach-netlogic/war.h
deleted file mode 100644
index 2c72168..0000000
--- a/arch/mips/include/asm/mach-netlogic/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2011 Netlogic Microsystems.
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_NLM_WAR_H
-#define __ASM_MIPS_MACH_NLM_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_NLM_WAR_H */
diff --git a/arch/mips/include/asm/mach-paravirt/war.h b/arch/mips/include/asm/mach-paravirt/war.h
deleted file mode 100644
index 36d3afb..0000000
--- a/arch/mips/include/asm/mach-paravirt/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- * Copyright (C) 2013 Cavium Networks <support@caviumnetworks.com>
- */
-#ifndef __ASM_MIPS_MACH_PARAVIRT_WAR_H
-#define __ASM_MIPS_MACH_PARAVIRT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_PARAVIRT_WAR_H */
diff --git a/arch/mips/include/asm/mach-pnx833x/war.h b/arch/mips/include/asm/mach-pnx833x/war.h
deleted file mode 100644
index e410df4..0000000
--- a/arch/mips/include/asm/mach-pnx833x/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_PNX833X_WAR_H
-#define __ASM_MIPS_MACH_PNX833X_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_PNX833X_WAR_H */
diff --git a/arch/mips/include/asm/mach-ralink/war.h b/arch/mips/include/asm/mach-ralink/war.h
deleted file mode 100644
index c074b5d..0000000
--- a/arch/mips/include/asm/mach-ralink/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_RALINK_WAR_H
-#define __ASM_MACH_RALINK_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_RALINK_WAR_H */
diff --git a/arch/mips/include/asm/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h
deleted file mode 100644
index 6a52e65..0000000
--- a/arch/mips/include/asm/mach-tx39xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_TX39XX_WAR_H
-#define __ASM_MIPS_MACH_TX39XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h
deleted file mode 100644
index ffe31e7..0000000
--- a/arch/mips/include/asm/mach-vr41xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_VR41XX_WAR_H
-#define __ASM_MIPS_MACH_VR41XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MIPS_MACH_VR41XX_WAR_H */
-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 2/5] MIPS: Allow platforms to specify the decompressor load address
  2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h> Andrew Bresticker
@ 2015-03-13 22:54 ` Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 3/5] MIPS: Document Pistachio boot protocol and device-tree bindings Andrew Bresticker
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan, Lars-Peter Clausen

Platforms which use raw zboot images may need to link the image at
a fixed address if there is no other way to communicate the load
address to the bootloader.  Allow the per-platform Kbuild files
to specify an optional zboot image load address (zload-y) and fall
back to calc_vmlinuz_load_addr if unset.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
---
No changes from v1.
---
 arch/mips/boot/compressed/Makefile | 6 ++++--
 arch/mips/jz4740/Platform          | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 61af6b6..82d0b13 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -12,6 +12,8 @@
 # Author: Wu Zhangjin <wuzhangjin@gmail.com>
 #
 
+include $(srctree)/arch/mips/Kbuild.platforms
+
 # set the default size of the mallocing area for decompressing
 BOOT_HEAP_SIZE := 0x400000
 
@@ -66,8 +68,8 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE
 # Calculate the load address of the compressed kernel image
 hostprogs-y := calc_vmlinuz_load_addr
 
-ifeq ($(CONFIG_MACH_JZ4740),y)
-VMLINUZ_LOAD_ADDRESS := 0x80600000
+ifneq ($(zload-y),)
+VMLINUZ_LOAD_ADDRESS := $(zload-y)
 else
 VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
 		$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform
index ba91be9..c41d300 100644
--- a/arch/mips/jz4740/Platform
+++ b/arch/mips/jz4740/Platform
@@ -1,3 +1,4 @@
 platform-$(CONFIG_MACH_JZ4740)	+= jz4740/
 cflags-$(CONFIG_MACH_JZ4740)	+= -I$(srctree)/arch/mips/include/asm/mach-jz4740
 load-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80010000
+zload-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80600000
-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 3/5] MIPS: Document Pistachio boot protocol and device-tree bindings
  2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h> Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 2/5] MIPS: Allow platforms to specify the decompressor load address Andrew Bresticker
@ 2015-03-13 22:54 ` Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC Andrew Bresticker
  2015-03-13 22:54 ` [PATCH V2 5/5] MIPS: pistachio: Add an initial defconfig Andrew Bresticker
  4 siblings, 0 replies; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan, Rob Herring,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala

The Pistachio SoC boots only with device-tree.  Document the required
properties and nodes as well as the boot protocol between the bootlaoder
and the kernel.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
---
Changes from v1:
 - switched to MIPS UHI hand-off protocol
---
 .../devicetree/bindings/mips/img/pistachio.txt     | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio.txt

diff --git a/Documentation/devicetree/bindings/mips/img/pistachio.txt b/Documentation/devicetree/bindings/mips/img/pistachio.txt
new file mode 100644
index 0000000..a736d88
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/img/pistachio.txt
@@ -0,0 +1,42 @@
+Imagination Pistachio SoC
+=========================
+
+Required properties:
+--------------------
+ - compatible: Must include "img,pistachio".
+
+CPU nodes:
+----------
+A "cpus" node is required.  Required properties:
+ - #address-cells: Must be 1.
+ - #size-cells: Must be 0.
+A CPU sub-node is also required for at least CPU 0.  Since the topology may
+be probed via CPS, it is not necessary to specify secondary CPUs.  Required
+propertis:
+ - device_type: Must be "cpu".
+ - compatible: Must be "mti,interaptiv".
+ - reg: CPU number.
+ - clocks: Must include the CPU clock.  See ../../clock/clock-bindings.txt for
+   details on clock bindings.
+Example:
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "mti,interaptiv";
+			reg = <0>;
+			clocks = <&clk_core CLK_MIPS>;
+		};
+	};
+
+
+Boot protocol:
+--------------
+In accordance with the MIPS UHI specification[1], the bootloader must pass the
+following arguments to the kernel:
+ - $a0: -2.
+ - $a1: KSEG0 address of the flattened device-tree blob.
+
+[1] http://prplfoundation.org/wiki/MIPS_documentation
-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC
  2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
                   ` (2 preceding siblings ...)
  2015-03-13 22:54 ` [PATCH V2 3/5] MIPS: Document Pistachio boot protocol and device-tree bindings Andrew Bresticker
@ 2015-03-13 22:54 ` Andrew Bresticker
  2015-03-16 11:04   ` James Hogan
  2015-03-13 22:54 ` [PATCH V2 5/5] MIPS: pistachio: Add an initial defconfig Andrew Bresticker
  4 siblings, 1 reply; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan

Add initial support for boards based on the Imagination Pistachio SoC.
Pistachio is based on a dual-core MIPS interAptiv CPU and will boot
using device-tree.

Signed-off-by: James Hartley <james.hartley@imgtec.com>
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
---
Changes from v1:
 - switched to MIPS UHI hand-off protocol
---
 arch/mips/Kbuild.platforms                  |   1 +
 arch/mips/Kconfig                           |  27 ++++++
 arch/mips/include/asm/mach-pistachio/gpio.h |  21 +++++
 arch/mips/include/asm/mach-pistachio/irq.h  |  18 ++++
 arch/mips/pistachio/Makefile                |   1 +
 arch/mips/pistachio/Platform                |   8 ++
 arch/mips/pistachio/init.c                  | 131 ++++++++++++++++++++++++++++
 arch/mips/pistachio/irq.c                   |  28 ++++++
 arch/mips/pistachio/time.c                  |  52 +++++++++++
 9 files changed, 287 insertions(+)
 create mode 100644 arch/mips/include/asm/mach-pistachio/gpio.h
 create mode 100644 arch/mips/include/asm/mach-pistachio/irq.h
 create mode 100644 arch/mips/pistachio/Makefile
 create mode 100644 arch/mips/pistachio/Platform
 create mode 100644 arch/mips/pistachio/init.c
 create mode 100644 arch/mips/pistachio/irq.c
 create mode 100644 arch/mips/pistachio/time.c

diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index e5fc463..2298baa 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -23,6 +23,7 @@ platforms += netlogic
 platforms += paravirt
 platforms += pmcs-msp71xx
 platforms += pnx833x
+platforms += pistachio
 platforms += ralink
 platforms += rb532
 platforms += sgi-ip22
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c7a1690..343b238 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -352,6 +352,33 @@ config MACH_LOONGSON1
 	  the ICT (Institute of Computing Technology) and the Chinese Academy
 	  of Sciences.
 
+config MACH_PISTACHIO
+	bool "IMG Pistachio SoC based boards"
+	select ARCH_REQUIRE_GPIOLIB
+	select BOOT_ELF32
+	select BOOT_RAW
+	select CEVT_R4K
+	select CLKSRC_MIPS_GIC
+	select COMMON_CLK
+	select CSRC_R4K
+	select DMA_MAYBE_COHERENT
+	select IRQ_CPU
+	select LIBFDT
+	select MFD_SYSCON
+	select MIPS_CPU_SCACHE
+	select MIPS_GIC
+	select PINCTRL
+	select REGULATOR
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select SYS_SUPPORTS_MIPS_CPS
+	select SYS_SUPPORTS_MULTITHREADING
+	select SYS_SUPPORTS_ZBOOT
+	select USE_OF
+	help
+	  This enables support for the IMG Pistachio SoC platform.
+
 config MIPS_MALTA
 	bool "MIPS Malta board"
 	select ARCH_MAY_HAVE_PC_FDC
diff --git a/arch/mips/include/asm/mach-pistachio/gpio.h b/arch/mips/include/asm/mach-pistachio/gpio.h
new file mode 100644
index 0000000..6c1649c
--- /dev/null
+++ b/arch/mips/include/asm/mach-pistachio/gpio.h
@@ -0,0 +1,21 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_PISTACHIO_GPIO_H
+#define __ASM_MACH_PISTACHIO_GPIO_H
+
+#include <asm-generic/gpio.h>
+
+#define gpio_get_value	__gpio_get_value
+#define gpio_set_value	__gpio_set_value
+#define gpio_cansleep	__gpio_cansleep
+#define gpio_to_irq	__gpio_to_irq
+
+#endif /* __ASM_MACH_PISTACHIO_GPIO_H */
diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/include/asm/mach-pistachio/irq.h
new file mode 100644
index 0000000..b94a09a
--- /dev/null
+++ b/arch/mips/include/asm/mach-pistachio/irq.h
@@ -0,0 +1,18 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_PISTACHIO_IRQ_H
+#define __ASM_MACH_PISTACHIO_IRQ_H
+
+#define NR_IRQS 256
+
+#include_next <irq.h>
+
+#endif /* __ASM_MACH_PISTACHIO_IRQ_H */
diff --git a/arch/mips/pistachio/Makefile b/arch/mips/pistachio/Makefile
new file mode 100644
index 0000000..32189c6
--- /dev/null
+++ b/arch/mips/pistachio/Makefile
@@ -0,0 +1 @@
+obj-y	+= init.o irq.o time.o
diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform
new file mode 100644
index 0000000..d80cd61
--- /dev/null
+++ b/arch/mips/pistachio/Platform
@@ -0,0 +1,8 @@
+#
+# IMG Pistachio SoC
+#
+platform-$(CONFIG_MACH_PISTACHIO)	+= pistachio/
+cflags-$(CONFIG_MACH_PISTACHIO)		+=				\
+		-I$(srctree)/arch/mips/include/asm/mach-pistachio
+load-$(CONFIG_MACH_PISTACHIO)		+= 0xffffffff80400000
+zload-$(CONFIG_MACH_PISTACHIO)		+= 0xffffffff81000000
diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
new file mode 100644
index 0000000..6b297d5
--- /dev/null
+++ b/arch/mips/pistachio/init.c
@@ -0,0 +1,131 @@
+/*
+ * Pistachio platform setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
+
+#include <asm/cacheflush.h>
+#include <asm/dma-coherence.h>
+#include <asm/fw/fw.h>
+#include <asm/mips-boards/generic.h>
+#include <asm/mips-cm.h>
+#include <asm/mips-cpc.h>
+#include <asm/prom.h>
+#include <asm/smp-ops.h>
+#include <asm/traps.h>
+
+const char *get_system_type(void)
+{
+	return "IMG Pistachio SoC";
+}
+
+static void __init plat_setup_iocoherency(void)
+{
+	/*
+	 * Kernel has been configured with software coherency
+	 * but we might choose to turn it off and use hardware
+	 * coherency instead.
+	 */
+	if (mips_cm_numiocu() != 0) {
+		/* Nothing special needs to be done to enable coherency */
+		pr_info("CMP IOCU detected\n");
+		hw_coherentio = 1;
+		if (coherentio == 0)
+			pr_info("Hardware DMA cache coherency disabled\n");
+		else
+			pr_info("Hardware DMA cache coherency enabled\n");
+	} else {
+		if (coherentio == 1)
+			pr_info("Hardware DMA cache coherency unsupported, but enabled from command line!\n");
+		else
+			pr_info("Software DMA cache coherency enabled\n");
+	}
+}
+
+void __init plat_mem_setup(void)
+{
+	if (fw_arg0 != -2)
+		panic("Device-tree not present");
+
+	__dt_setup_arch((void *)fw_arg1);
+	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+
+	plat_setup_iocoherency();
+}
+
+#define DEFAULT_CPC_BASE_ADDR 0x1bde0000
+
+phys_addr_t mips_cpc_default_phys_base(void)
+{
+	return DEFAULT_CPC_BASE_ADDR;
+}
+
+static void __init mips_nmi_setup(void)
+{
+	void *base;
+	extern char except_vec_nmi;
+
+	base = cpu_has_veic ?
+		(void *)(CAC_BASE + 0xa80) :
+		(void *)(CAC_BASE + 0x380);
+	memcpy(base, &except_vec_nmi, 0x80);
+	flush_icache_range((unsigned long)base,
+			   (unsigned long)base + 0x80);
+}
+
+static void __init mips_ejtag_setup(void)
+{
+	void *base;
+	extern char except_vec_ejtag_debug;
+
+	base = cpu_has_veic ?
+		(void *)(CAC_BASE + 0xa00) :
+		(void *)(CAC_BASE + 0x300);
+	memcpy(base, &except_vec_ejtag_debug, 0x80);
+	flush_icache_range((unsigned long)base,
+			   (unsigned long)base + 0x80);
+}
+
+void __init prom_init(void)
+{
+	board_nmi_handler_setup = mips_nmi_setup;
+	board_ejtag_handler_setup = mips_ejtag_setup;
+
+	mips_cm_probe();
+	mips_cpc_probe();
+	register_cps_smp_ops();
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+void __init device_tree_init(void)
+{
+	if (!initial_boot_params)
+		return;
+
+	unflatten_and_copy_device_tree();
+}
+
+static int __init plat_of_setup(void)
+{
+	if (!of_have_populated_dt())
+		panic("Device tree not present");
+
+	if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
+		panic("Failed to populate DT\n");
+
+	return 0;
+}
+arch_initcall(plat_of_setup);
diff --git a/arch/mips/pistachio/irq.c b/arch/mips/pistachio/irq.c
new file mode 100644
index 0000000..0a6b24c
--- /dev/null
+++ b/arch/mips/pistachio/irq.c
@@ -0,0 +1,28 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/mips-gic.h>
+#include <linux/kernel.h>
+
+#include <asm/cpu-features.h>
+#include <asm/irq_cpu.h>
+
+void __init arch_init_irq(void)
+{
+	pr_info("EIC is %s\n", cpu_has_veic ? "on" : "off");
+	pr_info("VINT is %s\n", cpu_has_vint ? "on" : "off");
+
+	if (!cpu_has_veic)
+		mips_cpu_irq_init();
+
+	irqchip_init();
+}
diff --git a/arch/mips/pistachio/time.c b/arch/mips/pistachio/time.c
new file mode 100644
index 0000000..67889fc
--- /dev/null
+++ b/arch/mips/pistachio/time.c
@@ -0,0 +1,52 @@
+/*
+ * Pistachio clocksource/timer setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/clocksource.h>
+#include <linux/init.h>
+#include <linux/irqchip/mips-gic.h>
+#include <linux/of.h>
+
+#include <asm/time.h>
+
+unsigned int get_c0_compare_int(void)
+{
+	return gic_get_c0_compare_int();
+}
+
+int get_c0_perfcount_int(void)
+{
+	return gic_get_c0_perfcount_int();
+}
+
+void __init plat_time_init(void)
+{
+	struct device_node *np;
+	struct clk *clk;
+
+	of_clk_init(NULL);
+	clocksource_of_init();
+
+	np = of_get_cpu_node(0, NULL);
+	if (!np) {
+		pr_err("Failed to get CPU node\n");
+		return;
+	}
+
+	clk = of_clk_get(np, 0);
+	if (IS_ERR(clk)) {
+		pr_err("Failed to get CPU clock: %ld\n", PTR_ERR(clk));
+		return;
+	}
+
+	mips_hpt_frequency = clk_get_rate(clk) / 2;
+	clk_put(clk);
+}
-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 5/5] MIPS: pistachio: Add an initial defconfig
  2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
                   ` (3 preceding siblings ...)
  2015-03-13 22:54 ` [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC Andrew Bresticker
@ 2015-03-13 22:54 ` Andrew Bresticker
  4 siblings, 0 replies; 8+ messages in thread
From: Andrew Bresticker @ 2015-03-13 22:54 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Andrew Bresticker,
	Ezequiel Garcia, James Hartley, James Hogan, Govindraj Raja

From: Govindraj Raja <govindraj.raja@imgtec.com>

Add a defconfig for Pistachio which enables drivers for all the
currently supported peripherals on the SoC.

Signed-off-by: Govindraj Raja <govindraj.raja@imgtec.com>
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
---
No changes from v1.
---
 arch/mips/configs/pistachio_defconfig | 336 ++++++++++++++++++++++++++++++++++
 1 file changed, 336 insertions(+)
 create mode 100644 arch/mips/configs/pistachio_defconfig

diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig
new file mode 100644
index 0000000..f22e92e
--- /dev/null
+++ b/arch/mips/configs/pistachio_defconfig
@@ -0,0 +1,336 @@
+CONFIG_MACH_PISTACHIO=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_MIPS_CPS=y
+# CONFIG_COMPACTION is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_ZSMALLOC=y
+CONFIG_NR_CPUS=4
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="localhost"
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_PROFILING=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+CONFIG_CPU_IDLE=y
+# CONFIG_MIPS_CPS_CPUIDLE is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_DIAG is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_IPV6_SIT=m
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_DSCP=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_DSCP=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_MARK=y
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_DEBUG_MENU=y
+CONFIG_MAC80211_VERBOSE_DEBUG=y
+CONFIG_RFKILL=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_ZRAM=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=m
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_VERITY=y
+CONFIG_NETDEVICES=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+CONFIG_STMMAC_ETH=y
+# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_PPP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_MCS7830=m
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_RT2X00=m
+CONFIG_RT2800USB=m
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_HW_RANDOM=y
+CONFIG_TCG_TPM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_IMG=y
+CONFIG_I2C_STUB=m
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_IMG_SPFI=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_IMGPDC_WDT=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_RC_DECODERS is not set
+CONFIG_RC_DEVICES=y
+CONFIG_IR_IMG=y
+CONFIG_IR_IMG_NEC=y
+CONFIG_IR_IMG_JVC=y
+CONFIG_IR_IMG_SONY=y
+CONFIG_IR_IMG_SHARP=y
+CONFIG_IR_IMG_SANYO=y
+CONFIG_IR_IMG_RC5=y
+CONFIG_IR_IMG_RC6=y
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SPI is not set
+CONFIG_SND_USB_AUDIO=m
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_DEFAULT_PERSIST is not set
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_TEST=m
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_IDMAC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_RTC_CLASS=y
+CONFIG_DMADEVICES=y
+CONFIG_IMG_MDC_DMA=y
+CONFIG_STAGING=y
+CONFIG_ASHMEM=y
+# CONFIG_ANDROID_TIMED_OUTPUT is not set
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_MEMORY=y
+CONFIG_IIO=y
+CONFIG_CC10001_ADC=y
+CONFIG_PWM=y
+CONFIG_PWM_IMG=y
+CONFIG_ANDROID=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FUSE_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_ECRYPT_FS=y
+CONFIG_HFSPLUS_FS=m
+CONFIG_UBIFS_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_RAM=y
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_CREDENTIALS=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_LKDTM=y
+CONFIG_TEST_UDELAY=m
+CONFIG_KEYS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+# CONFIG_XZ_DEC_X86 is not set
-- 
2.2.0.rc0.207.ga3a616c


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h>
  2015-03-13 22:54 ` [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h> Andrew Bresticker
@ 2015-03-16 10:08   ` James Hogan
  0 siblings, 0 replies; 8+ messages in thread
From: James Hogan @ 2015-03-16 10:08 UTC (permalink / raw)
  To: Andrew Bresticker, Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Ezequiel Garcia,
	James Hartley, Kevin Cernekee

[-- Attachment #1: Type: text/plain, Size: 30150 bytes --]

Hi Andrew,

On 13/03/15 22:54, Andrew Bresticker wrote:
> From: Kevin Cernekee <cernekee@gmail.com>
> 
> 11 platforms require at least one of these workarounds to be enabled; 22
> platforms do not.  In the latter case we can fall back to a generic version.
> 
> Note that this also deletes an orphaned reference to RM9000_CDEX_SMP_WAR.
> 
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
> Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
> ---
> No changes from v1.
> Changes from Kevin's v6:
>  - Left cavium-octeon's war.h in-tact

Based on the content of mach-generic/war.h and the list of files in the
diffstat with some grepping/hashing/diffing to verify correctness &
completeness, this looks good to me.

Reviewed-by: James Hogan <james.hogan@imgtec.com>

I suppose some possible future clean ups would be to convert the
remaining ones to #include_next <war.h> after defining only overrides
(like irq.h does, assuming that's an idiom people are happy with), and
for mach-generic/war.h to have #ifndef guards around each WAR
definition. That way they could all share the common definitions,
including cavium-octeon which only adds octeon specific ones rather than
changing any of the ones defined in mach-generic/war.h.

Cheers
James

> ---
>  arch/mips/include/asm/mach-ar7/war.h       | 24 ------------------------
>  arch/mips/include/asm/mach-ath25/war.h     | 25 -------------------------
>  arch/mips/include/asm/mach-ath79/war.h     | 24 ------------------------
>  arch/mips/include/asm/mach-au1x00/war.h    | 24 ------------------------
>  arch/mips/include/asm/mach-bcm3384/war.h   | 24 ------------------------
>  arch/mips/include/asm/mach-bcm47xx/war.h   | 24 ------------------------
>  arch/mips/include/asm/mach-bcm63xx/war.h   | 24 ------------------------
>  arch/mips/include/asm/mach-cobalt/war.h    | 24 ------------------------
>  arch/mips/include/asm/mach-dec/war.h       | 24 ------------------------
>  arch/mips/include/asm/mach-emma2rh/war.h   | 24 ------------------------
>  arch/mips/include/asm/mach-generic/war.h   | 24 ++++++++++++++++++++++++
>  arch/mips/include/asm/mach-jazz/war.h      | 24 ------------------------
>  arch/mips/include/asm/mach-jz4740/war.h    | 24 ------------------------
>  arch/mips/include/asm/mach-lantiq/war.h    | 23 -----------------------
>  arch/mips/include/asm/mach-lasat/war.h     | 24 ------------------------
>  arch/mips/include/asm/mach-loongson/war.h  | 24 ------------------------
>  arch/mips/include/asm/mach-loongson1/war.h | 24 ------------------------
>  arch/mips/include/asm/mach-netlogic/war.h  | 25 -------------------------
>  arch/mips/include/asm/mach-paravirt/war.h  | 25 -------------------------
>  arch/mips/include/asm/mach-pnx833x/war.h   | 24 ------------------------
>  arch/mips/include/asm/mach-ralink/war.h    | 24 ------------------------
>  arch/mips/include/asm/mach-tx39xx/war.h    | 24 ------------------------
>  arch/mips/include/asm/mach-vr41xx/war.h    | 24 ------------------------
>  23 files changed, 24 insertions(+), 530 deletions(-)
>  delete mode 100644 arch/mips/include/asm/mach-ar7/war.h
>  delete mode 100644 arch/mips/include/asm/mach-ath25/war.h
>  delete mode 100644 arch/mips/include/asm/mach-ath79/war.h
>  delete mode 100644 arch/mips/include/asm/mach-au1x00/war.h
>  delete mode 100644 arch/mips/include/asm/mach-bcm3384/war.h
>  delete mode 100644 arch/mips/include/asm/mach-bcm47xx/war.h
>  delete mode 100644 arch/mips/include/asm/mach-bcm63xx/war.h
>  delete mode 100644 arch/mips/include/asm/mach-cobalt/war.h
>  delete mode 100644 arch/mips/include/asm/mach-dec/war.h
>  delete mode 100644 arch/mips/include/asm/mach-emma2rh/war.h
>  create mode 100644 arch/mips/include/asm/mach-generic/war.h
>  delete mode 100644 arch/mips/include/asm/mach-jazz/war.h
>  delete mode 100644 arch/mips/include/asm/mach-jz4740/war.h
>  delete mode 100644 arch/mips/include/asm/mach-lantiq/war.h
>  delete mode 100644 arch/mips/include/asm/mach-lasat/war.h
>  delete mode 100644 arch/mips/include/asm/mach-loongson/war.h
>  delete mode 100644 arch/mips/include/asm/mach-loongson1/war.h
>  delete mode 100644 arch/mips/include/asm/mach-netlogic/war.h
>  delete mode 100644 arch/mips/include/asm/mach-paravirt/war.h
>  delete mode 100644 arch/mips/include/asm/mach-pnx833x/war.h
>  delete mode 100644 arch/mips/include/asm/mach-ralink/war.h
>  delete mode 100644 arch/mips/include/asm/mach-tx39xx/war.h
>  delete mode 100644 arch/mips/include/asm/mach-vr41xx/war.h
> 
> diff --git a/arch/mips/include/asm/mach-ar7/war.h b/arch/mips/include/asm/mach-ar7/war.h
> deleted file mode 100644
> index 99071e5..0000000
> --- a/arch/mips/include/asm/mach-ar7/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_AR7_WAR_H
> -#define __ASM_MIPS_MACH_AR7_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_AR7_WAR_H */
> diff --git a/arch/mips/include/asm/mach-ath25/war.h b/arch/mips/include/asm/mach-ath25/war.h
> deleted file mode 100644
> index e3a5250..0000000
> --- a/arch/mips/include/asm/mach-ath25/war.h
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
> - */
> -#ifndef __ASM_MACH_ATH25_WAR_H
> -#define __ASM_MACH_ATH25_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define RM9000_CDEX_SMP_WAR		0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MACH_ATH25_WAR_H */
> diff --git a/arch/mips/include/asm/mach-ath79/war.h b/arch/mips/include/asm/mach-ath79/war.h
> deleted file mode 100644
> index 0bb3090..0000000
> --- a/arch/mips/include/asm/mach-ath79/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MACH_ATH79_WAR_H
> -#define __ASM_MACH_ATH79_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MACH_ATH79_WAR_H */
> diff --git a/arch/mips/include/asm/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h
> deleted file mode 100644
> index 72e260d..0000000
> --- a/arch/mips/include/asm/mach-au1x00/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_AU1X00_WAR_H
> -#define __ASM_MIPS_MACH_AU1X00_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_AU1X00_WAR_H */
> diff --git a/arch/mips/include/asm/mach-bcm3384/war.h b/arch/mips/include/asm/mach-bcm3384/war.h
> deleted file mode 100644
> index 59d7599..0000000
> --- a/arch/mips/include/asm/mach-bcm3384/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_BCM3384_WAR_H
> -#define __ASM_MIPS_MACH_BCM3384_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_BCM3384_WAR_H */
> diff --git a/arch/mips/include/asm/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h
> deleted file mode 100644
> index a3d2f44..0000000
> --- a/arch/mips/include/asm/mach-bcm47xx/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H
> -#define __ASM_MIPS_MACH_BCM47XX_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */
> diff --git a/arch/mips/include/asm/mach-bcm63xx/war.h b/arch/mips/include/asm/mach-bcm63xx/war.h
> deleted file mode 100644
> index 05ee867..0000000
> --- a/arch/mips/include/asm/mach-bcm63xx/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_BCM63XX_WAR_H
> -#define __ASM_MIPS_MACH_BCM63XX_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_BCM63XX_WAR_H */
> diff --git a/arch/mips/include/asm/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h
> deleted file mode 100644
> index 34ae404..0000000
> --- a/arch/mips/include/asm/mach-cobalt/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_COBALT_WAR_H
> -#define __ASM_MIPS_MACH_COBALT_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_COBALT_WAR_H */
> diff --git a/arch/mips/include/asm/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h
> deleted file mode 100644
> index d29996f..0000000
> --- a/arch/mips/include/asm/mach-dec/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_DEC_WAR_H
> -#define __ASM_MIPS_MACH_DEC_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_DEC_WAR_H */
> diff --git a/arch/mips/include/asm/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h
> deleted file mode 100644
> index 79ae82d..0000000
> --- a/arch/mips/include/asm/mach-emma2rh/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_EMMA2RH_WAR_H
> -#define __ASM_MIPS_MACH_EMMA2RH_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_EMMA2RH_WAR_H */
> diff --git a/arch/mips/include/asm/mach-generic/war.h b/arch/mips/include/asm/mach-generic/war.h
> new file mode 100644
> index 0000000..a1bc2e7
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-generic/war.h
> @@ -0,0 +1,24 @@
> +/*
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License.  See the file "COPYING" in the main directory of this archive
> + * for more details.
> + *
> + * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> + */
> +#ifndef __ASM_MACH_GENERIC_WAR_H
> +#define __ASM_MACH_GENERIC_WAR_H
> +
> +#define R4600_V1_INDEX_ICACHEOP_WAR	0
> +#define R4600_V1_HIT_CACHEOP_WAR	0
> +#define R4600_V2_HIT_CACHEOP_WAR	0
> +#define R5432_CP0_INTERRUPT_WAR		0
> +#define BCM1250_M3_WAR			0
> +#define SIBYTE_1956_WAR			0
> +#define MIPS4K_ICACHE_REFILL_WAR	0
> +#define MIPS_CACHE_SYNC_WAR		0
> +#define TX49XX_ICACHE_INDEX_INV_WAR	0
> +#define ICACHE_REFILLS_WORKAROUND_WAR	0
> +#define R10000_LLSC_WAR			0
> +#define MIPS34K_MISSED_ITLB_WAR		0
> +
> +#endif /* __ASM_MACH_GENERIC_WAR_H */
> diff --git a/arch/mips/include/asm/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h
> deleted file mode 100644
> index 5b18b9a..0000000
> --- a/arch/mips/include/asm/mach-jazz/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_JAZZ_WAR_H
> -#define __ASM_MIPS_MACH_JAZZ_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_JAZZ_WAR_H */
> diff --git a/arch/mips/include/asm/mach-jz4740/war.h b/arch/mips/include/asm/mach-jz4740/war.h
> deleted file mode 100644
> index 9b511d3..0000000
> --- a/arch/mips/include/asm/mach-jz4740/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_JZ4740_WAR_H
> -#define __ASM_MIPS_MACH_JZ4740_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_JZ4740_WAR_H */
> diff --git a/arch/mips/include/asm/mach-lantiq/war.h b/arch/mips/include/asm/mach-lantiq/war.h
> deleted file mode 100644
> index 358ca97..0000000
> --- a/arch/mips/include/asm/mach-lantiq/war.h
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - */
> -#ifndef __ASM_MIPS_MACH_LANTIQ_WAR_H
> -#define __ASM_MIPS_MACH_LANTIQ_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif
> diff --git a/arch/mips/include/asm/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h
> deleted file mode 100644
> index 741ae72..0000000
> --- a/arch/mips/include/asm/mach-lasat/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_LASAT_WAR_H
> -#define __ASM_MIPS_MACH_LASAT_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_LASAT_WAR_H */
> diff --git a/arch/mips/include/asm/mach-loongson/war.h b/arch/mips/include/asm/mach-loongson/war.h
> deleted file mode 100644
> index f2570df..0000000
> --- a/arch/mips/include/asm/mach-loongson/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MACH_LOONGSON_WAR_H
> -#define __ASM_MACH_LOONGSON_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MACH_LEMOTE_WAR_H */
> diff --git a/arch/mips/include/asm/mach-loongson1/war.h b/arch/mips/include/asm/mach-loongson1/war.h
> deleted file mode 100644
> index 8fb50d0..0000000
> --- a/arch/mips/include/asm/mach-loongson1/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MACH_LOONGSON1_WAR_H
> -#define __ASM_MACH_LOONGSON1_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MACH_LOONGSON1_WAR_H */
> diff --git a/arch/mips/include/asm/mach-netlogic/war.h b/arch/mips/include/asm/mach-netlogic/war.h
> deleted file mode 100644
> index 2c72168..0000000
> --- a/arch/mips/include/asm/mach-netlogic/war.h
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2011 Netlogic Microsystems.
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_NLM_WAR_H
> -#define __ASM_MIPS_MACH_NLM_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_NLM_WAR_H */
> diff --git a/arch/mips/include/asm/mach-paravirt/war.h b/arch/mips/include/asm/mach-paravirt/war.h
> deleted file mode 100644
> index 36d3afb..0000000
> --- a/arch/mips/include/asm/mach-paravirt/war.h
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - * Copyright (C) 2013 Cavium Networks <support@caviumnetworks.com>
> - */
> -#ifndef __ASM_MIPS_MACH_PARAVIRT_WAR_H
> -#define __ASM_MIPS_MACH_PARAVIRT_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_PARAVIRT_WAR_H */
> diff --git a/arch/mips/include/asm/mach-pnx833x/war.h b/arch/mips/include/asm/mach-pnx833x/war.h
> deleted file mode 100644
> index e410df4..0000000
> --- a/arch/mips/include/asm/mach-pnx833x/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_PNX833X_WAR_H
> -#define __ASM_MIPS_MACH_PNX833X_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_PNX833X_WAR_H */
> diff --git a/arch/mips/include/asm/mach-ralink/war.h b/arch/mips/include/asm/mach-ralink/war.h
> deleted file mode 100644
> index c074b5d..0000000
> --- a/arch/mips/include/asm/mach-ralink/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MACH_RALINK_WAR_H
> -#define __ASM_MACH_RALINK_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MACH_RALINK_WAR_H */
> diff --git a/arch/mips/include/asm/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h
> deleted file mode 100644
> index 6a52e65..0000000
> --- a/arch/mips/include/asm/mach-tx39xx/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_TX39XX_WAR_H
> -#define __ASM_MIPS_MACH_TX39XX_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */
> diff --git a/arch/mips/include/asm/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h
> deleted file mode 100644
> index ffe31e7..0000000
> --- a/arch/mips/include/asm/mach-vr41xx/war.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
> - */
> -#ifndef __ASM_MIPS_MACH_VR41XX_WAR_H
> -#define __ASM_MIPS_MACH_VR41XX_WAR_H
> -
> -#define R4600_V1_INDEX_ICACHEOP_WAR	0
> -#define R4600_V1_HIT_CACHEOP_WAR	0
> -#define R4600_V2_HIT_CACHEOP_WAR	0
> -#define R5432_CP0_INTERRUPT_WAR		0
> -#define BCM1250_M3_WAR			0
> -#define SIBYTE_1956_WAR			0
> -#define MIPS4K_ICACHE_REFILL_WAR	0
> -#define MIPS_CACHE_SYNC_WAR		0
> -#define TX49XX_ICACHE_INDEX_INV_WAR	0
> -#define ICACHE_REFILLS_WORKAROUND_WAR	0
> -#define R10000_LLSC_WAR			0
> -#define MIPS34K_MISSED_ITLB_WAR		0
> -
> -#endif /* __ASM_MIPS_MACH_VR41XX_WAR_H */
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC
  2015-03-13 22:54 ` [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC Andrew Bresticker
@ 2015-03-16 11:04   ` James Hogan
  0 siblings, 0 replies; 8+ messages in thread
From: James Hogan @ 2015-03-16 11:04 UTC (permalink / raw)
  To: Andrew Bresticker, Ralf Baechle
  Cc: devicetree, linux-kernel, linux-mips, Ezequiel Garcia, James Hartley

[-- Attachment #1: Type: text/plain, Size: 2249 bytes --]

Hi Andrew,

On 13/03/15 22:54, Andrew Bresticker wrote:
> diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
> index e5fc463..2298baa 100644
> --- a/arch/mips/Kbuild.platforms
> +++ b/arch/mips/Kbuild.platforms
> @@ -23,6 +23,7 @@ platforms += netlogic
>  platforms += paravirt
>  platforms += pmcs-msp71xx
>  platforms += pnx833x
> +platforms += pistachio

Please keep this sorted alphabetically.

>  platforms += ralink
>  platforms += rb532
>  platforms += sgi-ip22

...

> diff --git a/arch/mips/include/asm/mach-pistachio/gpio.h b/arch/mips/include/asm/mach-pistachio/gpio.h
> new file mode 100644
> index 0000000..6c1649c
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-pistachio/gpio.h
> @@ -0,0 +1,21 @@
> +/*
> + * Pistachio IRQ setup
> + *
> + * Copyright (C) 2014 Google, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + */
> +
> +#ifndef __ASM_MACH_PISTACHIO_GPIO_H
> +#define __ASM_MACH_PISTACHIO_GPIO_H
> +
> +#include <asm-generic/gpio.h>
> +
> +#define gpio_get_value	__gpio_get_value
> +#define gpio_set_value	__gpio_set_value
> +#define gpio_cansleep	__gpio_cansleep
> +#define gpio_to_irq	__gpio_to_irq

Makes me wish ARCH_HAVE_CUSTOM_GPIO_H could be selected on a
per-platform basis :P. Never mind.

> +
> +#endif /* __ASM_MACH_PISTACHIO_GPIO_H */

...

> diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
> new file mode 100644
> index 0000000..6b297d5
> --- /dev/null
> +++ b/arch/mips/pistachio/init.c
> @@ -0,0 +1,131 @@

...

> +static int __init plat_of_setup(void)
> +{
> +	if (!of_have_populated_dt())
> +		panic("Device tree not present");
> +
> +	if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
> +		panic("Failed to populate DT\n");

No need for newline in panic message.

> +
> +	return 0;
> +}
> +arch_initcall(plat_of_setup);

...

Otherwise from what I can tell this patch looks good to me (though I
probably wouldn't know if something important was missing from it).

Thanks!
James


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-03-16 11:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-13 22:54 [PATCH V2 0/5] MIPS: Initial IMG Pistachio SoC support Andrew Bresticker
2015-03-13 22:54 ` [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h> Andrew Bresticker
2015-03-16 10:08   ` James Hogan
2015-03-13 22:54 ` [PATCH V2 2/5] MIPS: Allow platforms to specify the decompressor load address Andrew Bresticker
2015-03-13 22:54 ` [PATCH V2 3/5] MIPS: Document Pistachio boot protocol and device-tree bindings Andrew Bresticker
2015-03-13 22:54 ` [PATCH V2 4/5] MIPS: Add support for the IMG Pistachio SoC Andrew Bresticker
2015-03-16 11:04   ` James Hogan
2015-03-13 22:54 ` [PATCH V2 5/5] MIPS: pistachio: Add an initial defconfig Andrew Bresticker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).