Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1300400
| From | Noralf Trønnes <noralf@tronnes.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 8/8] ARM: bcm2835: Add Kconfig support for bcm2836 |
| Date | 2016-01-03 23:00 +0100 |
| Message-ID | <qMYQY-2Ao-29@gated-at.bofh.it> (permalink) |
| References | <qGu9c-8tX-3@gated-at.bofh.it> <qGu9c-8tX-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Den 17.12.2015 00:55, skrev Eric Anholt:
> This should be a complete port of bcm2835 functionality to bcm2836
> (Raspberry Pi 2).
>
> Signed-off-by: Eric Anholt <eric@anholt.net>
> ---
>
> v2: Implement Arnd's feedback to not split to ARCH_BCM2836, and
> instead use more conditionals in ARCH_BCM2835. Also reduce diff
> between 2835 and 2836.
>
> arch/arm/Kconfig.debug | 10 ++++++++--
> arch/arm/boot/dts/Makefile | 3 ++-
> arch/arm/mach-bcm/Kconfig | 8 ++++----
> 3 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 259c0ca..957b876 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -143,7 +143,12 @@ choice
>
> config DEBUG_BCM2835
> bool "Kernel low-level debugging on BCM2835 PL011 UART"
> - depends on ARCH_BCM2835
> + depends on ARCH_BCM2835 && ARCH_MULTI_V6
> + select DEBUG_UART_PL01X
> +
> + config DEBUG_BCM2836
> + bool "Kernel low-level debugging on BCM2836 PL011 UART"
> + depends on ARCH_BCM2835 && ARCH_MULTI_V7
> select DEBUG_UART_PL01X
>
> config DEBUG_BCM_5301X
> @@ -1402,6 +1407,7 @@ config DEBUG_UART_PHYS
> default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
> default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
> default 0x20201000 if DEBUG_BCM2835
> + default 0x3f201000 if DEBUG_BCM2836
> default 0x3e000000 if DEBUG_BCM_KONA_UART
> default 0x4000e400 if DEBUG_LL_UART_EFM32
> default 0x40081000 if DEBUG_LPC18XX_UART0
> @@ -1485,7 +1491,7 @@ config DEBUG_UART_VIRT
> default 0xf0000be0 if ARCH_EBSA110
> default 0xf0010000 if DEBUG_ASM9260_UART
> default 0xf01fb000 if DEBUG_NOMADIK_UART
> - default 0xf0201000 if DEBUG_BCM2835
> + default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
This results in a BUG on Pi2 (bcm2836) because the address ends up in the
8MB VMALLOC_OFFSET "hole" between lowmem and vmalloc:
BUG: mapping for 0x3f201000 at 0xf0201000 out of vmalloc space
...
vmalloc : 0xf0800000 - 0xff800000 ( 240 MB)
lowmem : 0xc0000000 - 0xf0000000 ( 768 MB)
Moving the address a bit should work for both (tested on 2836):
default 0xf1201000 if DEBUG_BCM2835 || DEBUG_BCM2836
For reference this is the default memory configuration on Pi1 (bcm2835):
vmalloc : 0xdc800000 - 0xff800000 ( 560 MB)
lowmem : 0xc0000000 - 0xdc000000 ( 448 MB)
Noralf.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/8] Raspberry Pi 2 support. Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
[PATCH v2 8/8] ARM: bcm2835: Add Kconfig support for bcm2836 Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
Re: [PATCH v2 8/8] ARM: bcm2835: Add Kconfig support for bcm2836 Eric Anholt <eric@anholt.net> - 2015-12-26 23:40 +0100
Re: [PATCH v2 8/8] ARM: bcm2835: Add Kconfig support for bcm2836 Noralf Trønnes <noralf@tronnes.org> - 2016-01-03 23:00 +0100
[PATCH v2 5/8] ARM: bcm2835: Move the CPU/peripheral include out of common RPi DT. Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
[PATCH v2 1/8] irq: bcm2836: Fix initialization of the LOCAL_IRQ_CNT*IRQ timers Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
[PATCH v2 3/8] dt-bindings: Add root properties for Raspberry Pi 2 Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
Re: [PATCH v2 3/8] dt-bindings: Add root properties for Raspberry Pi 2 Rob Herring <robh@kernel.org> - 2015-12-19 05:20 +0100
[PATCH v2 2/8] irq: bcm2836: Add SMP support for the 2836 Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
Re: [PATCH v2 2/8] irq: bcm2836: Add SMP support for the 2836 Baruch Siach <baruch@tkos.co.il> - 2015-12-17 06:30 +0100
[PATCH v2 6/8] ARM: bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
Re: [PATCH v2 6/8] ARM: bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B Alexander Aring <alex.aring@gmail.com> - 2015-12-22 11:20 +0100
[PATCH v2 7/8] ARM: bcm2835: Add a compat string for bcm2836 machine probe Eric Anholt <eric@anholt.net> - 2015-12-17 01:00 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Arnd Bergmann <arnd@arndb.de> - 2015-12-17 01:10 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Eric Anholt <eric@anholt.net> - 2015-12-17 01:40 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Stefan Wahren <stefan.wahren@i2se.com> - 2015-12-17 10:00 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Arnd Bergmann <arnd@arndb.de> - 2015-12-17 11:30 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Alexander Aring <alex.aring@gmail.com> - 2015-12-18 11:10 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Alexander Aring <alex.aring@gmail.com> - 2015-12-18 12:00 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Alexander Aring <alex.aring@gmail.com> - 2015-12-20 23:20 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Eric Anholt <eric@anholt.net> - 2015-12-22 00:10 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Alexander Aring <alex.aring@gmail.com> - 2015-12-22 15:30 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Eric Anholt <eric@anholt.net> - 2015-12-22 20:10 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Noralf Trønnes <noralf@tronnes.org> - 2015-12-26 22:50 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Arnd Bergmann <arnd@arndb.de> - 2015-12-22 00:20 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Alexander Aring <alex.aring@gmail.com> - 2015-12-22 15:30 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Arnd Bergmann <arnd@arndb.de> - 2015-12-22 22:30 +0100
Re: [PATCH v2 0/8] Raspberry Pi 2 support. Eric Anholt <eric@anholt.net> - 2015-12-25 01:10 +0100
csiph-web