From: James Hogan <james.hogan@imgtec.com>
To: Andrew Bresticker <abrestic@chromium.org>,
Ralf Baechle <ralf@linux-mips.org>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-mips@linux-mips.org>,
Ezequiel Garcia <ezequiel.garcia@imgtec.com>,
James Hartley <james.hartley@imgtec.com>,
Kevin Cernekee <cernekee@gmail.com>
Subject: Re: [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h>
Date: Mon, 16 Mar 2015 10:08:02 +0000 [thread overview]
Message-ID: <5506AB82.4050001@imgtec.com> (raw)
In-Reply-To: <1426287249-27185-2-git-send-email-abrestic@chromium.org>
[-- 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 --]
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com>
To: Andrew Bresticker <abrestic@chromium.org>,
Ralf Baechle <ralf@linux-mips.org>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mips@linux-mips.org,
Ezequiel Garcia <ezequiel.garcia@imgtec.com>,
James Hartley <james.hartley@imgtec.com>,
Kevin Cernekee <cernekee@gmail.com>
Subject: Re: [PATCH V2 1/5] MIPS: Create a common <asm/mach-generic/war.h>
Date: Mon, 16 Mar 2015 10:08:02 +0000 [thread overview]
Message-ID: <5506AB82.4050001@imgtec.com> (raw)
Message-ID: <20150316100802.haUuKaXGDi6hrk2Sn-gxC1HJDdPdD9zlFFfwNihiCus@z> (raw)
In-Reply-To: <1426287249-27185-2-git-send-email-abrestic@chromium.org>
[-- 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 --]
next prev parent reply other threads:[~2015-03-16 10:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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-16 11:04 ` James Hogan
2015-03-13 22:54 ` [PATCH V2 5/5] MIPS: pistachio: Add an initial defconfig Andrew Bresticker
2015-03-13 22:54 ` Andrew Bresticker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5506AB82.4050001@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=abrestic@chromium.org \
--cc=cernekee@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel.garcia@imgtec.com \
--cc=james.hartley@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.