* Re: [PATCH v3 06/11] x86/xen: Add i386 kexec/kdump implementation
From: H. Peter Anvin @ 2012-12-27 23:37 UTC (permalink / raw)
To: Daniel Kiper
Cc: xen-devel, konrad.wilk, andrew.cooper3, x86, kexec, linux-kernel,
virtualization, mingo, ebiederm, jbeulich, maxim.uvarov, tglx,
vgoyal
In-Reply-To: <5698071f-c96c-4891-81d6-a77c4e3b77c2@default>
On 12/27/2012 03:23 PM, Daniel Kiper wrote:
>> On 12/26/2012 06:18 PM, Daniel Kiper wrote:
>>> Add i386 kexec/kdump implementation.
>>>
>>> v2 - suggestions/fixes:
>>> - allocate transition page table pages below 4 GiB
>>> (suggested by Jan Beulich).
>>
>> Why?
>
> Sadly all addresses are passed via unsigned long
> variable to kexec hypercall.
>
So can you unf*ck your broken interface before imposing it on anyone else?
-hpa
--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.
^ permalink raw reply
* [PATCH v2] gettext: update to upstream version 0.18.2
From: Marko Lindqvist @ 2012-12-27 23:19 UTC (permalink / raw)
To: openembedded-core
remove_gets.patch dropped as upstream now contains
fix for the problem.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
.../gettext/gettext-0.18.1.1/remove_gets.patch | 58 --------------------
.../gnulib-uclibc-sched_param-def.patch | 0
.../parallel.patch | 0
.../wchar-uclibc.patch | 0
.../{gettext_0.18.1.1.bb => gettext_0.18.2.bb} | 7 +--
5 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch
rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/gnulib-uclibc-sched_param-def.patch (100%)
rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/parallel.patch (100%)
rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/wchar-uclibc.patch (100%)
rename meta/recipes-core/gettext/{gettext_0.18.1.1.bb => gettext_0.18.2.bb} (96%)
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch
deleted file mode 100644
index 3d3c400..0000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-eglibc 2.16 has removed gets so we need to check for it
-being there before using it.
-
-
-From glibc stdio.h
-
-The function has been officially removed in ISO C11. This opportunity
- is used to also remove it from the GNU feature list. It is now only
- available when explicitly using an old ISO C, Unix, or POSIX standard.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
-===================================================================
---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -0700
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
-===================================================================
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -0700
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
-===================================================================
---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -0700
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch b/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
rename to meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.2/parallel.patch
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch
rename to meta/recipes-core/gettext/gettext-0.18.2/parallel.patch
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
rename to meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.2.bb
similarity index 96%
rename from meta/recipes-core/gettext/gettext_0.18.1.1.bb
rename to meta/recipes-core/gettext/gettext_0.18.2.bb
index 4639481..3e93089 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.2.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "GPLv3+ & LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r19"
+PR = "r0"
DEPENDS = "gettext-native virtual/libiconv ncurses expat"
DEPENDS_class-native = "gettext-minimal-native"
PROVIDES = "virtual/libintl virtual/gettext"
@@ -13,7 +13,6 @@ PROVIDES_class-native = "virtual/gettext-native"
RCONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://parallel.patch \
- file://remove_gets.patch \
"
SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
@@ -21,8 +20,8 @@ SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
"
LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
-SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
-SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
+SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928"
+SRC_URI[sha256sum] = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c"
inherit autotools
--
1.7.10.4
^ permalink raw reply related
* [PATCH] [media] blackfin Kconfig: select is evil; use, instead depends on
From: Mauro Carvalho Chehab @ 2012-12-27 23:32 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
Select is evil as it has issues with dependencies. Better to convert
it to use depends on.
That fixes a breakage with out-of-tree compilation of the media
tree.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/platform/blackfin/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/blackfin/Kconfig b/drivers/media/platform/blackfin/Kconfig
index 519990e..cc23997 100644
--- a/drivers/media/platform/blackfin/Kconfig
+++ b/drivers/media/platform/blackfin/Kconfig
@@ -2,7 +2,6 @@ config VIDEO_BLACKFIN_CAPTURE
tristate "Blackfin Video Capture Driver"
depends on VIDEO_V4L2 && BLACKFIN && I2C
select VIDEOBUF2_DMA_CONTIG
- select VIDEO_BLACKFIN_PPI
help
V4L2 bridge driver for Blackfin video capture device.
Choose PPI or EPPI as its interface.
@@ -12,3 +11,5 @@ config VIDEO_BLACKFIN_CAPTURE
config VIDEO_BLACKFIN_PPI
tristate
+ depends on VIDEO_BLACKFIN_CAPTURE
+ default VIDEO_BLACKFIN_CAPTURE
--
1.7.11.7
^ permalink raw reply related
* Re: BUG: unable to handle kernel NULL pointer dereference at 0000000000000500
From: Sedat Dilek @ 2012-12-27 23:30 UTC (permalink / raw)
To: zlatko.calusic; +Cc: LKML, linux-mm
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
Hi Zlatko,
I am not sure if I hit the same problem as described in this thread.
Under heavy load, while building a customized toolchain for the Freetz
router project I got a BUG || NULL pointer derefence || kswapd ||
zone_balanced || pgdat_balanced() etc. (details see my screenshot).
I will try your patch from [1] ***only*** on top of my last
Linux-v3.8-rc1 GIT setup (post-v3.8-rc1 mainline + some net-fixes).
Regards,
- Sedat -
[1] https://patchwork.kernel.org/patch/1913241/
[-- Attachment #2: DSCN2605.JPG --]
[-- Type: image/jpeg, Size: 653838 bytes --]
^ permalink raw reply
* Re: [PATCH v3 06/11] x86/xen: Add i386 kexec/kdump implementation
From: Daniel Kiper @ 2012-12-27 23:23 UTC (permalink / raw)
To: hpa
Cc: kexec, xen-devel, konrad.wilk, tglx, ebiederm, maxim.uvarov,
andrew.cooper3, jbeulich, mingo, x86, virtualization, vgoyal,
linux-kernel
> On 12/26/2012 06:18 PM, Daniel Kiper wrote:
> > Add i386 kexec/kdump implementation.
> >
> > v2 - suggestions/fixes:
> > - allocate transition page table pages below 4 GiB
> > (suggested by Jan Beulich).
>
> Why?
Sadly all addresses are passed via unsigned long
variable to kexec hypercall.
Daniel
^ permalink raw reply
* Re: [PATCH v3 06/11] x86/xen: Add i386 kexec/kdump implementation
From: Daniel Kiper @ 2012-12-27 23:23 UTC (permalink / raw)
To: hpa
Cc: xen-devel, konrad.wilk, andrew.cooper3, x86, kexec, linux-kernel,
virtualization, mingo, ebiederm, jbeulich, maxim.uvarov, tglx,
vgoyal
> On 12/26/2012 06:18 PM, Daniel Kiper wrote:
> > Add i386 kexec/kdump implementation.
> >
> > v2 - suggestions/fixes:
> > - allocate transition page table pages below 4 GiB
> > (suggested by Jan Beulich).
>
> Why?
Sadly all addresses are passed via unsigned long
variable to kexec hypercall.
Daniel
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply
* Re: [PATCH v3 06/11] x86/xen: Add i386 kexec/kdump implementation
From: Daniel Kiper @ 2012-12-27 23:23 UTC (permalink / raw)
To: hpa
Cc: xen-devel, konrad.wilk, andrew.cooper3, x86, kexec, linux-kernel,
virtualization, mingo, ebiederm, jbeulich, maxim.uvarov, tglx,
vgoyal
> On 12/26/2012 06:18 PM, Daniel Kiper wrote:
> > Add i386 kexec/kdump implementation.
> >
> > v2 - suggestions/fixes:
> > - allocate transition page table pages below 4 GiB
> > (suggested by Jan Beulich).
>
> Why?
Sadly all addresses are passed via unsigned long
variable to kexec hypercall.
Daniel
^ permalink raw reply
* [PATCH 4/4] arm: vt8500: Remove remaining mach includes
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: linux-arm-kernel, linux-kernel, vt8500-wm8505-linux-kernel,
Tony Prisk
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
Remove the last two mach-vt8500/include/mach headers as they are
no longer required with multiplatform-only configuration.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/mach-vt8500/include/mach/timex.h | 26 -----------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ------------------------
2 files changed, 63 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
diff --git a/arch/arm/mach-vt8500/include/mach/timex.h b/arch/arm/mach-vt8500/include/mach/timex.h
deleted file mode 100644
index 8487e4c..0000000
--- a/arch/arm/mach-vt8500/include/mach/timex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-vt8500/include/mach/timex.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef MACH_TIMEX_H
-#define MACH_TIMEX_H
-
-#define CLOCK_TICK_RATE (3000000)
-
-#endif /* MACH_TIMEX_H */
diff --git a/arch/arm/mach-vt8500/include/mach/uncompress.h b/arch/arm/mach-vt8500/include/mach/uncompress.h
deleted file mode 100644
index e6e81fd..0000000
--- a/arch/arm/mach-vt8500/include/mach/uncompress.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/uncompress.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Based on arch/arm/mach-dove/include/mach/uncompress.h
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#define UART0_PHYS 0xd8200000
-#define UART0_ADDR(x) *(volatile unsigned char *)(UART0_PHYS + x)
-
-static void putc(const char c)
-{
- while (UART0_ADDR(0x1c) & 0x2)
- /* Tx busy, wait and poll */;
-
- UART0_ADDR(0) = c;
-}
-
-static void flush(void)
-{
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-#define arch_decomp_wdog()
--
1.7.9.5
^ permalink raw reply related
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: linux-arm-kernel, linux-kernel, vt8500-wm8505-linux-kernel,
Tony Prisk
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7).
Common features across all SoCs are split into ARCH_VT8500 and
unique features are specified by each SoC option.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
Documentation/devicetree/bindings/arm/vt8500.txt | 8 ++++++
arch/arm/Kconfig | 17 +++++++----
arch/arm/mach-vt8500/Kconfig | 33 ++++++++++++++++++++--
arch/arm/mach-vt8500/vt8500.c | 2 ++
4 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/vt8500.txt b/Documentation/devicetree/bindings/arm/vt8500.txt
index d657832..87dc1dd 100644
--- a/Documentation/devicetree/bindings/arm/vt8500.txt
+++ b/Documentation/devicetree/bindings/arm/vt8500.txt
@@ -12,3 +12,11 @@ compatible = "wm,wm8505";
Boards with the Wondermedia WM8650 SoC shall have the following properties:
Required root node property:
compatible = "wm,wm8650";
+
+Boards with the Wondermedia WM8750 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8750";
+
+Boards with the Wondermedia WM8850 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8850";
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f95ba14..fbb9492 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -952,20 +952,25 @@ config ARCH_OMAP
config ARCH_VT8500_SINGLE
bool "VIA/WonderMedia 85xx"
- select ARCH_HAS_CPUFREQ
- select ARCH_REQUIRE_GPIOLIB
- select CLKDEV_LOOKUP
+ select ARCH_VT8500
select COMMON_CLK
select CPU_ARM926T
- select GENERIC_CLOCKEVENTS
- select GENERIC_GPIO
- select HAVE_CLK
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select USE_OF
help
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+config ARCH_WM8750_SINGLE
+ bool "WonderMedia WM8750/WM8850"
+ select ARCH_VT8500
+ select COMMON_CLK
+ select MULTI_IRQ_HANDLER
+ select SPARSE_IRQ
+ select USE_OF
+ help
+ Support for WonderMedia WM8750/WM8850 System-on-Chip.
+
endchoice
menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 2ed0b7d..d67c7fa 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,12 +1,39 @@
config ARCH_VT8500
- bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5
- default ARCH_VT8500_SINGLE
+ bool
select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
- select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
select HAVE_CLK
+
+config ARCH_WM8505
+ bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE
+ depends on ARCH_MULTI_V5
+ default ARCH_VT8500_SINGLE
+ select ARCH_VT8500
+ select CPU_ARM926T
help
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+
+config ARCH_WM8750
+ bool "WonderMedia WM8750"
+ depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE
+ select ARCH_VT8500
+ select CPU_V6
+ help
+ Support for WonderMedia WM8750 System-on-Chip.
+
+config ARCH_WM8850
+ bool "WonderMedia WM8850"
+ depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE
+ select ARCH_VT8500
+ select CPU_V7
+ help
+ Support for WonderMedia WM8850 System-on-Chip.
+
+# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off
+config ARCH_WM8850_AUTO
+ def_bool y
+ depends on ARCH_WM8750_SINGLE && !ARCH_WM8750
+ select ARCH_WM8850
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 3c66d48..55162ab 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -183,6 +183,8 @@ static const char * const vt8500_dt_compat[] = {
"via,vt8500",
"wm,wm8650",
"wm,wm8505",
+ "wm,wm8750",
+ "wm,wm8850",
};
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
--
1.7.9.5
^ permalink raw reply related
* [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: linux-arm-kernel, linux-kernel, vt8500-wm8505-linux-kernel,
Tony Prisk
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch completes the move of arch-vt8500 to multiplatform only.
The remaining single-image Kconfig options are removed from
arch/arm/Kconfig and the options in arch/arm/mach-vt8500/Kconfig
are updated.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/Kconfig | 21 ---------------------
arch/arm/mach-vt8500/Kconfig | 13 +++----------
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fbb9492..76efd43 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -950,27 +950,6 @@ config ARCH_OMAP
help
Support for TI's OMAP platform (OMAP1/2/3/4).
-config ARCH_VT8500_SINGLE
- bool "VIA/WonderMedia 85xx"
- select ARCH_VT8500
- select COMMON_CLK
- select CPU_ARM926T
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
-
-config ARCH_WM8750_SINGLE
- bool "WonderMedia WM8750/WM8850"
- select ARCH_VT8500
- select COMMON_CLK
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for WonderMedia WM8750/WM8850 System-on-Chip.
-
endchoice
menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index d67c7fa..f466b58 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -8,9 +8,8 @@ config ARCH_VT8500
select HAVE_CLK
config ARCH_WM8505
- bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE
+ bool "VIA/WonderMedia 85xx"
depends on ARCH_MULTI_V5
- default ARCH_VT8500_SINGLE
select ARCH_VT8500
select CPU_ARM926T
help
@@ -18,7 +17,7 @@ config ARCH_WM8505
config ARCH_WM8750
bool "WonderMedia WM8750"
- depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V6
select ARCH_VT8500
select CPU_V6
help
@@ -26,14 +25,8 @@ config ARCH_WM8750
config ARCH_WM8850
bool "WonderMedia WM8850"
- depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V7
select ARCH_VT8500
select CPU_V7
help
Support for WonderMedia WM8850 System-on-Chip.
-
-# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off
-config ARCH_WM8850_AUTO
- def_bool y
- depends on ARCH_WM8750_SINGLE && !ARCH_WM8750
- select ARCH_WM8850
--
1.7.9.5
^ permalink raw reply related
* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: linux-arm-kernel, linux-kernel, vt8500-wm8505-linux-kernel,
Tony Prisk
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch moves debug-macro.S from arm/mach-vt8500/include/mach to
arm/include/debug/vt8500.S to provide multiplatform support.
Minor style changes in code for readability.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/Kconfig.debug | 8 ++++++
arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 -----------------------
2 files changed, 8 insertions(+), 31 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 661030d..bbb0a67 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -412,6 +412,13 @@ choice
of the tiles using the RS1 memory map, including all new A-class
core tiles, FPGA-based SMMs and software models.
+ config DEBUG_VT8500_UART0
+ bool "Use UART0 on VIA/Wondermedia SoCs"
+ depends on ARCH_VT8500
+ help
+ This option selects UART0 on VIA/Wondermedia System-on-a-chip
+ devices, including VT8500, WM8505, WM8650 and WM8850.
+
config DEBUG_LL_UART_NONE
bool "No low-level debugging UART"
depends on !ARCH_MULTIPLATFORM
@@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE
default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
+ default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S"
diff --git a/arch/arm/mach-vt8500/include/mach/debug-macro.S b/arch/arm/mach-vt8500/include/mach/debug-macro.S
deleted file mode 100644
index ca292f2..0000000
--- a/arch/arm/mach-vt8500/include/mach/debug-macro.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/arm/mach-vt8500/include/mach/debug-macro.S
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Debugging macro include header
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
- .macro addruart, rp, rv, tmp
- mov \rp, #0x00200000
- orr \rv, \rp, #0xf8000000
- orr \rp, \rp, #0xd8000000
- .endm
-
- .macro senduart,rd,rx
- strb \rd, [\rx, #0]
- .endm
-
- .macro busyuart,rd,rx
-1001: ldr \rd, [\rx, #0x1c]
- ands \rd, \rd, #0x2
- bne 1001b
- .endm
-
- .macro waituart,rd,rx
- .endm
--
1.7.9.5
^ permalink raw reply related
* [PATCH 0/4] arm: vt8500: Add new models and remove single-platform.
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: linux-arm-kernel, linux-kernel, vt8500-wm8505-linux-kernel,
Tony Prisk
Hi Arnd/Olaf,
These patches should be pretty self explanatory.
#1 - Adds support for WM8750 and WM8850.
#2 - Remove the single-platform Kconfig options.
#3 - Move the early debug code so it can be used for multiplatform.
#4 - Cleanup the unused headers in arch/arm/mach-vt8500/include.
Tony Prisk (4):
arm: vt8500: Add support for Wondermedia WM8750/WM8850
arm: vt8500: Remove single platform Kconfig options
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove remaining mach includes
Documentation/devicetree/bindings/arm/vt8500.txt | 8 +++++
arch/arm/Kconfig | 16 ----------
arch/arm/Kconfig.debug | 8 +++++
arch/arm/mach-vt8500/Kconfig | 26 +++++++++++++--
arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 ------------------
arch/arm/mach-vt8500/include/mach/timex.h | 26 ---------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ----------------------
arch/arm/mach-vt8500/vt8500.c | 2 ++
8 files changed, 41 insertions(+), 113 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
--
1.7.9.5
^ permalink raw reply
* [PATCH 4/4] arm: vt8500: Remove remaining mach includes
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
Remove the last two mach-vt8500/include/mach headers as they are
no longer required with multiplatform-only configuration.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/mach-vt8500/include/mach/timex.h | 26 -----------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ------------------------
2 files changed, 63 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
diff --git a/arch/arm/mach-vt8500/include/mach/timex.h b/arch/arm/mach-vt8500/include/mach/timex.h
deleted file mode 100644
index 8487e4c..0000000
--- a/arch/arm/mach-vt8500/include/mach/timex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-vt8500/include/mach/timex.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef MACH_TIMEX_H
-#define MACH_TIMEX_H
-
-#define CLOCK_TICK_RATE (3000000)
-
-#endif /* MACH_TIMEX_H */
diff --git a/arch/arm/mach-vt8500/include/mach/uncompress.h b/arch/arm/mach-vt8500/include/mach/uncompress.h
deleted file mode 100644
index e6e81fd..0000000
--- a/arch/arm/mach-vt8500/include/mach/uncompress.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/uncompress.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Based on arch/arm/mach-dove/include/mach/uncompress.h
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#define UART0_PHYS 0xd8200000
-#define UART0_ADDR(x) *(volatile unsigned char *)(UART0_PHYS + x)
-
-static void putc(const char c)
-{
- while (UART0_ADDR(0x1c) & 0x2)
- /* Tx busy, wait and poll */;
-
- UART0_ADDR(0) = c;
-}
-
-static void flush(void)
-{
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-#define arch_decomp_wdog()
--
1.7.9.5
^ permalink raw reply related
* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch moves debug-macro.S from arm/mach-vt8500/include/mach to
arm/include/debug/vt8500.S to provide multiplatform support.
Minor style changes in code for readability.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/Kconfig.debug | 8 ++++++
arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 -----------------------
2 files changed, 8 insertions(+), 31 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 661030d..bbb0a67 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -412,6 +412,13 @@ choice
of the tiles using the RS1 memory map, including all new A-class
core tiles, FPGA-based SMMs and software models.
+ config DEBUG_VT8500_UART0
+ bool "Use UART0 on VIA/Wondermedia SoCs"
+ depends on ARCH_VT8500
+ help
+ This option selects UART0 on VIA/Wondermedia System-on-a-chip
+ devices, including VT8500, WM8505, WM8650 and WM8850.
+
config DEBUG_LL_UART_NONE
bool "No low-level debugging UART"
depends on !ARCH_MULTIPLATFORM
@@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE
default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
+ default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S"
diff --git a/arch/arm/mach-vt8500/include/mach/debug-macro.S b/arch/arm/mach-vt8500/include/mach/debug-macro.S
deleted file mode 100644
index ca292f2..0000000
--- a/arch/arm/mach-vt8500/include/mach/debug-macro.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/arm/mach-vt8500/include/mach/debug-macro.S
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * Debugging macro include header
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
- .macro addruart, rp, rv, tmp
- mov \rp, #0x00200000
- orr \rv, \rp, #0xf8000000
- orr \rp, \rp, #0xd8000000
- .endm
-
- .macro senduart,rd,rx
- strb \rd, [\rx, #0]
- .endm
-
- .macro busyuart,rd,rx
-1001: ldr \rd, [\rx, #0x1c]
- ands \rd, \rd, #0x2
- bne 1001b
- .endm
-
- .macro waituart,rd,rx
- .endm
--
1.7.9.5
^ permalink raw reply related
* [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch completes the move of arch-vt8500 to multiplatform only.
The remaining single-image Kconfig options are removed from
arch/arm/Kconfig and the options in arch/arm/mach-vt8500/Kconfig
are updated.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/Kconfig | 21 ---------------------
arch/arm/mach-vt8500/Kconfig | 13 +++----------
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fbb9492..76efd43 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -950,27 +950,6 @@ config ARCH_OMAP
help
Support for TI's OMAP platform (OMAP1/2/3/4).
-config ARCH_VT8500_SINGLE
- bool "VIA/WonderMedia 85xx"
- select ARCH_VT8500
- select COMMON_CLK
- select CPU_ARM926T
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
-
-config ARCH_WM8750_SINGLE
- bool "WonderMedia WM8750/WM8850"
- select ARCH_VT8500
- select COMMON_CLK
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for WonderMedia WM8750/WM8850 System-on-Chip.
-
endchoice
menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index d67c7fa..f466b58 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -8,9 +8,8 @@ config ARCH_VT8500
select HAVE_CLK
config ARCH_WM8505
- bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE
+ bool "VIA/WonderMedia 85xx"
depends on ARCH_MULTI_V5
- default ARCH_VT8500_SINGLE
select ARCH_VT8500
select CPU_ARM926T
help
@@ -18,7 +17,7 @@ config ARCH_WM8505
config ARCH_WM8750
bool "WonderMedia WM8750"
- depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V6
select ARCH_VT8500
select CPU_V6
help
@@ -26,14 +25,8 @@ config ARCH_WM8750
config ARCH_WM8850
bool "WonderMedia WM8850"
- depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V7
select ARCH_VT8500
select CPU_V7
help
Support for WonderMedia WM8850 System-on-Chip.
-
-# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off
-config ARCH_WM8850_AUTO
- def_bool y
- depends on ARCH_WM8750_SINGLE && !ARCH_WM8750
- select ARCH_WM8850
--
1.7.9.5
^ permalink raw reply related
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz>
This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7).
Common features across all SoCs are split into ARCH_VT8500 and
unique features are specified by each SoC option.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
Documentation/devicetree/bindings/arm/vt8500.txt | 8 ++++++
arch/arm/Kconfig | 17 +++++++----
arch/arm/mach-vt8500/Kconfig | 33 ++++++++++++++++++++--
arch/arm/mach-vt8500/vt8500.c | 2 ++
4 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/vt8500.txt b/Documentation/devicetree/bindings/arm/vt8500.txt
index d657832..87dc1dd 100644
--- a/Documentation/devicetree/bindings/arm/vt8500.txt
+++ b/Documentation/devicetree/bindings/arm/vt8500.txt
@@ -12,3 +12,11 @@ compatible = "wm,wm8505";
Boards with the Wondermedia WM8650 SoC shall have the following properties:
Required root node property:
compatible = "wm,wm8650";
+
+Boards with the Wondermedia WM8750 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8750";
+
+Boards with the Wondermedia WM8850 SoC shall have the following properties:
+Required root node property:
+compatible = "wm,wm8850";
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f95ba14..fbb9492 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -952,20 +952,25 @@ config ARCH_OMAP
config ARCH_VT8500_SINGLE
bool "VIA/WonderMedia 85xx"
- select ARCH_HAS_CPUFREQ
- select ARCH_REQUIRE_GPIOLIB
- select CLKDEV_LOOKUP
+ select ARCH_VT8500
select COMMON_CLK
select CPU_ARM926T
- select GENERIC_CLOCKEVENTS
- select GENERIC_GPIO
- select HAVE_CLK
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select USE_OF
help
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+config ARCH_WM8750_SINGLE
+ bool "WonderMedia WM8750/WM8850"
+ select ARCH_VT8500
+ select COMMON_CLK
+ select MULTI_IRQ_HANDLER
+ select SPARSE_IRQ
+ select USE_OF
+ help
+ Support for WonderMedia WM8750/WM8850 System-on-Chip.
+
endchoice
menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 2ed0b7d..d67c7fa 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,12 +1,39 @@
config ARCH_VT8500
- bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5
- default ARCH_VT8500_SINGLE
+ bool
select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
- select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
select HAVE_CLK
+
+config ARCH_WM8505
+ bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE
+ depends on ARCH_MULTI_V5
+ default ARCH_VT8500_SINGLE
+ select ARCH_VT8500
+ select CPU_ARM926T
help
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+
+config ARCH_WM8750
+ bool "WonderMedia WM8750"
+ depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE
+ select ARCH_VT8500
+ select CPU_V6
+ help
+ Support for WonderMedia WM8750 System-on-Chip.
+
+config ARCH_WM8850
+ bool "WonderMedia WM8850"
+ depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE
+ select ARCH_VT8500
+ select CPU_V7
+ help
+ Support for WonderMedia WM8850 System-on-Chip.
+
+# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off
+config ARCH_WM8850_AUTO
+ def_bool y
+ depends on ARCH_WM8750_SINGLE && !ARCH_WM8750
+ select ARCH_WM8850
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 3c66d48..55162ab 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -183,6 +183,8 @@ static const char * const vt8500_dt_compat[] = {
"via,vt8500",
"wm,wm8650",
"wm,wm8505",
+ "wm,wm8750",
+ "wm,wm8850",
};
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
--
1.7.9.5
^ permalink raw reply related
* [PATCH 0/4] arm: vt8500: Add new models and remove single-platform.
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd/Olaf,
These patches should be pretty self explanatory.
#1 - Adds support for WM8750 and WM8850.
#2 - Remove the single-platform Kconfig options.
#3 - Move the early debug code so it can be used for multiplatform.
#4 - Cleanup the unused headers in arch/arm/mach-vt8500/include.
Tony Prisk (4):
arm: vt8500: Add support for Wondermedia WM8750/WM8850
arm: vt8500: Remove single platform Kconfig options
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove remaining mach includes
Documentation/devicetree/bindings/arm/vt8500.txt | 8 +++++
arch/arm/Kconfig | 16 ----------
arch/arm/Kconfig.debug | 8 +++++
arch/arm/mach-vt8500/Kconfig | 26 +++++++++++++--
arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 ------------------
arch/arm/mach-vt8500/include/mach/timex.h | 26 ---------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ----------------------
arch/arm/mach-vt8500/vt8500.c | 2 ++
8 files changed, 41 insertions(+), 113 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
--
1.7.9.5
^ permalink raw reply
* [Buildroot] [PATCH] package/keyutils: disable on avr32 & microblaze
From: Yann E. MORIN @ 2012-12-27 23:20 UTC (permalink / raw)
To: buildroot
keyutils builds on neither avr32, nor microblaze (probably because
the toolchains used fot those archictectures are way too old), with:
..../microblazeel-unknown-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -I. -DPKGBUILD="\"2012-12-27\"" -DPKGVERSION="\"keyutils-1.5.5\""
-DAPIVERSION="\"libkeyutils-1.4\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pipe -Os -g -Wall -Werror -UNO_GLIBC_KEYERR -o keyutils.o -c keyutils.c
cc1: warnings being treated as errors
key.dns_resolver.c: In function 'main':
key.dns_resolver.c:690: warning: dereferencing type-punned pointer will break strict-aliasing rules
Fixing with -fno-strict-aliasing only partially solves the issue for these
two archs, since the C library does not export the resolver symbols so the
link fails down the road...
- on microblaze, glibc-2.3.6 is tool old and does not set these symbols
as GLOBALs;
- on avr32, uClibc does not have these symbols.
It is much more easy to just disable keyutils for avr32 and microblaze.
Fixes both (avr2, microblaze):
http://autobuild.buildroot.net/results/aa86f6a68f5d0ea4914ab259ed270615bc9d6a99/
http://autobuild.buildroot.net/results/70ae127a6e353fd5c64c0c3b4e19a2e93d54ce52/
Merry X-Mas!
PS. Thanks Richard for the help understanding those issues.
Cc: Richard Braun <rbraun@sceen.net>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/keyutils/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
index 9b5a24b..9b9f9bc 100644
--- a/package/keyutils/Config.in
+++ b/package/keyutils/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_KEYUTILS
bool "keyutils"
+ depends on !BR2_avr32 && !BR2_microblaze
help
These tools are used to control the key management system
built into the Linux kernel.
--
1.7.2.5
^ permalink raw reply related
* Re: [dm-crypt] Avoiding fsck.ext4 destruction of crypto_luks data
From: Richard @ 2012-12-27 20:29 UTC (permalink / raw)
To: Emily Williams; +Cc: dm-crypt
In-Reply-To: <CA+VYMuZ43V_+NgdUUSdLL4hC16hwqvpwLHnSTo32SGV52TPbzg@mail.gmail.com>
On Thu, Dec 27, 2012 at 01:12:09AM -0500, Emily Williams wrote:
> Today I made a rather large mistake, running fsck.ext4 on the raw volume
> (/dev/sdk1) instead of the mapped volume
> (/dev/mapper/whatever-i-choose-to-call-it). I assume it is not possible to
> recover from this once it is done and the cryptosetup lukeOpen passphrase
> no longer works.
something strange going on fsck.ext4 will never do a destructive action
without asking.
Don't reboot, don't panic perhaps something can be saved.
No idea what really happened though.
Richard
---
Name and OpenPGP keys available from pgp key servers
^ permalink raw reply
* Re: [PATCH v3 02/11] x86/kexec: Add extra pointers to transition page table PGD, PUD, PMD and PTE
From: Daniel Kiper @ 2012-12-27 23:19 UTC (permalink / raw)
To: hpa
Cc: kexec, xen-devel, konrad.wilk, tglx, ebiederm, maxim.uvarov,
andrew.cooper3, jbeulich, mingo, x86, virtualization, vgoyal,
linux-kernel
> Hmm... this code is being redone at the moment... this might conflict.
Is this available somewhere? May I have a look at it?
Daniel
PS I am on holiday until 02/01/2013 and I could not
have access to my email box. Please be patient.
At worst case I will send reply when I will be
back at office.
^ permalink raw reply
* Re: [PATCH v3 02/11] x86/kexec: Add extra pointers to transition page table PGD, PUD, PMD and PTE
From: Daniel Kiper @ 2012-12-27 23:19 UTC (permalink / raw)
To: hpa
Cc: xen-devel, konrad.wilk, andrew.cooper3, x86, kexec, linux-kernel,
virtualization, mingo, ebiederm, jbeulich, maxim.uvarov, tglx,
vgoyal
> Hmm... this code is being redone at the moment... this might conflict.
Is this available somewhere? May I have a look at it?
Daniel
PS I am on holiday until 02/01/2013 and I could not
have access to my email box. Please be patient.
At worst case I will send reply when I will be
back at office.
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply
* Re: [PATCH v3 02/11] x86/kexec: Add extra pointers to transition page table PGD, PUD, PMD and PTE
From: Daniel Kiper @ 2012-12-27 23:19 UTC (permalink / raw)
To: hpa
Cc: xen-devel, konrad.wilk, andrew.cooper3, x86, kexec, linux-kernel,
virtualization, mingo, ebiederm, jbeulich, maxim.uvarov, tglx,
vgoyal
> Hmm... this code is being redone at the moment... this might conflict.
Is this available somewhere? May I have a look at it?
Daniel
PS I am on holiday until 02/01/2013 and I could not
have access to my email box. Please be patient.
At worst case I will send reply when I will be
back at office.
^ permalink raw reply
* Re: osf match, --ttl & --log options missing in iptables[-save] [-[L|S]]
From: Neal Murphy @ 2012-12-27 23:19 UTC (permalink / raw)
To: netfilter
In-Reply-To: <50DC913A.1080409@airpost.net>
On Thursday, December 27, 2012 01:19:38 PM you wrote:
> Another thing I noticed is, that if negation (!) is used on the --genre
> option, iptables -S or iptables-save position the negation wrong i.e:
>
> -A PROBERS -p tcp -m osf --genre ! Windows -j SET \
> --add-set other_probers src
Is this 'infix' notation (--genre ! Windows) invalid already? Or is it just
deprecated?
^ permalink raw reply
* Re: Regression in kernel 3.8-rc1 bisected to commit adfa79d: I now get many "unable to enumerate USB device" messages
From: Alan Stern @ 2012-12-27 23:18 UTC (permalink / raw)
To: Larry Finger; +Cc: LKML, linux-usb
In-Reply-To: <50DC6D5D.30806@lwfinger.net>
On Thu, 27 Dec 2012, Larry Finger wrote:
> I could not do exactly the experiment that you wanted, as ehci-hcd was loaded
> even though it was blacklisted. Rather than solve that problem, I generated a
> kernel from just before commit adfa79d with ohci-hcd built in and ehci-hcd as a
> module. This one generated the errors, but they stopped when ehci-hcd loaded. I
> also tested a 3.8-rc1 kernel with ehci-hcd and ehcd-pci built in and ohci-hcd as
> a module. No errors for that one. Your hypothesis looks correct.
>
> I hope there is some way to force ehci-pci to load as soon as ehci-hcd is
> loaded, and before ohci-hcd loads, but if there is not, I know how to prevent
> the errors on my system even though this solution won't help the users of distro
> kernels. At least this time the errors stop once all 3 modules are loaded, and
> the number of error outputs is limited.
This is now a userspace issue. Perhaps a change to a udev rule will
prevent ohci-hcd from loading until ehci-pci is in place. Or a change
to a startup script in your initramfs. However the problem gets
solved, there doesn't seem to be much the kernel can do about it.
Alan Stern
^ permalink raw reply
* [PATCH 3/3] libceph: WARN, don't BUG on unexpected connection states
From: Alex Elder @ 2012-12-27 23:17 UTC (permalink / raw)
To: ceph-devel
In-Reply-To: <50DCD544.8000602@inktank.com>
A number of assertions in the ceph messenger are implemented with
BUG_ON(), killing the system if connection's state doesn't match
what's expected. At this point our state model is (evidently) not
well understood enough for these assertions to trigger a BUG().
Convert all BUG_ON(con->state...) calls to be WARN_ON(con->state...)
so we learn about these issues without killing the machine.
We now recognize that a connection fault can occur due to a socket
closure at any time, regardless of the state of the connection. So
there is really nothing we can assert about the state of the
connection at that point so eliminate that assertion.
Reported-by: Ugis <ugis22@gmail.com>
Tested-by: Ugis <ugis22@gmail.com>
Signed-off-by: Alex Elder <elder@inktank.com>
---
net/ceph/messenger.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 4d111fd..075b9fd 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -561,7 +561,7 @@ void ceph_con_open(struct ceph_connection *con,
mutex_lock(&con->mutex);
dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
- BUG_ON(con->state != CON_STATE_CLOSED);
+ WARN_ON(con->state != CON_STATE_CLOSED);
con->state = CON_STATE_PREOPEN;
con->peer_name.type = (__u8) entity_type;
@@ -1509,7 +1509,7 @@ static int process_banner(struct ceph_connection *con)
static void fail_protocol(struct ceph_connection *con)
{
reset_connection(con);
- BUG_ON(con->state != CON_STATE_NEGOTIATING);
+ WARN_ON(con->state != CON_STATE_NEGOTIATING);
con->state = CON_STATE_CLOSED;
}
@@ -1635,7 +1635,7 @@ static int process_connect(struct ceph_connection
*con)
return -1;
}
- BUG_ON(con->state != CON_STATE_NEGOTIATING);
+ WARN_ON(con->state != CON_STATE_NEGOTIATING);
con->state = CON_STATE_OPEN;
con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
@@ -2132,7 +2132,6 @@ more:
if (ret < 0)
goto out;
- BUG_ON(con->state != CON_STATE_CONNECTING);
con->state = CON_STATE_NEGOTIATING;
/*
@@ -2160,7 +2159,7 @@ more:
goto more;
}
- BUG_ON(con->state != CON_STATE_OPEN);
+ WARN_ON(con->state != CON_STATE_OPEN);
if (con->in_base_pos < 0) {
/*
@@ -2382,10 +2381,6 @@ static void ceph_fault(struct ceph_connection *con)
dout("fault %p state %lu to peer %s\n",
con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));
- BUG_ON(con->state != CON_STATE_CONNECTING &&
- con->state != CON_STATE_NEGOTIATING &&
- con->state != CON_STATE_OPEN);
-
con_close_socket(con);
if (test_bit(CON_FLAG_LOSSYTX, &con->flags)) {
--
1.7.9.5
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
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.