Skip to content

Commit 4684e92

Browse files
committed
Merge tag 'soc-arm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC code updates from Arnd Bergmann: "The AMD Pensando DPU platform gets added to arm64, and some minor updates make it into Renesas' 32-bit platforms" * tag 'soc-arm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm: debug: reuse the config DEBUG_OMAP2UART{1,2} for OMAP{3,4,5} arm64: Add config for AMD Pensando SoC platforms MAINTAINERS: Add entry for AMD PENSANDO ARM: shmobile: sh73a0: Reserve boot area when SMP is enabled ARM: shmobile: r8a7779: Reserve boot area when SMP is enabled ARM: shmobile: rcar-gen2: Reserve boot area when SMP is enabled ARM: shmobile: rcar-gen2: Remove unneeded once handling
2 parents a39ba9b + a983879 commit 4684e92

File tree

6 files changed

+42
-13
lines changed

6 files changed

+42
-13
lines changed

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,13 @@ N: allwinner
18261826
N: sun[x456789]i
18271827
N: sun[25]0i
18281828

1829+
ARM/AMD PENSANDO ARM64 ARCHITECTURE
1830+
M: Brad Larson <blarson@amd.com>
1831+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1832+
S: Supported
1833+
F: Documentation/devicetree/bindings/*/amd,pensando*
1834+
F: arch/arm64/boot/dts/amd/elba*
1835+
18291836
ARM/Amlogic Meson SoC CLOCK FRAMEWORK
18301837
M: Neil Armstrong <neil.armstrong@linaro.org>
18311838
M: Jerome Brunet <jbrunet@baylibre.com>

arch/arm/Kconfig.debug

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,10 +1593,8 @@ config DEBUG_UART_PHYS
15931593
default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
15941594
default 0x48022000 if DEBUG_TI81XXUART2
15951595
default 0x48024000 if DEBUG_TI81XXUART3
1596-
default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
1597-
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
1598-
default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
1599-
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
1596+
default 0x4806a000 if DEBUG_OMAP2UART1
1597+
default 0x4806c000 if DEBUG_OMAP2UART2
16001598
default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
16011599
default 0x49020000 if DEBUG_OMAP3UART3
16021600
default 0x49042000 if DEBUG_OMAP3UART4
@@ -1719,10 +1717,8 @@ config DEBUG_UART_VIRT
17191717
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
17201718
default 0xfa022000 if DEBUG_TI81XXUART2
17211719
default 0xfa024000 if DEBUG_TI81XXUART3
1722-
default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
1723-
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
1724-
default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
1725-
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
1720+
default 0xfa06a000 if DEBUG_OMAP2UART1
1721+
default 0xfa06c000 if DEBUG_OMAP2UART2
17261722
default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
17271723
default 0xfa71e000 if DEBUG_QCOM_UARTDM
17281724
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

arch/arm/mach-shmobile/pm-rcar-gen2.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ void __init rcar_gen2_pm_init(void)
4646
{
4747
void __iomem *p;
4848
u32 bar;
49-
static int once;
5049
struct device_node *np;
5150
bool has_a7 = false;
5251
bool has_a15 = false;
5352
struct resource res;
5453
int error;
5554

56-
if (once++)
55+
if (!request_mem_region(0, SZ_256K, "Boot Area")) {
56+
pr_err("Failed to request boot area\n");
5757
return;
58+
}
5859

5960
for_each_of_cpu_node(np) {
6061
if (of_device_is_compatible(np, "arm,cortex-a15"))

arch/arm/mach-shmobile/smp-r8a7779.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@ static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
3838

3939
static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
4040
{
41-
void __iomem *base = ioremap(HPBREG_BASE, 0x1000);
41+
void __iomem *base;
42+
43+
if (!request_mem_region(0, SZ_4K, "Boot Area")) {
44+
pr_err("Failed to request boot area\n");
45+
return;
46+
}
47+
48+
base = ioremap(HPBREG_BASE, 0x1000);
4249

4350
/* Map the reset vector (in headsmp-scu.S, headsmp.S) */
4451
writel(__pa(shmobile_boot_vector), base + AVECR);

arch/arm/mach-shmobile/smp-sh73a0.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,16 @@ static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
4444

4545
static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
4646
{
47-
void __iomem *ap = ioremap(AP_BASE, PAGE_SIZE);
48-
void __iomem *sysc = ioremap(SYSC_BASE, PAGE_SIZE);
47+
void __iomem *ap, *sysc;
48+
49+
if (!request_mem_region(0, SZ_4K, "Boot Area")) {
50+
pr_err("Failed to request boot area\n");
51+
return;
52+
}
4953

5054
/* Map the reset vector (in headsmp.S) */
55+
ap = ioremap(AP_BASE, PAGE_SIZE);
56+
sysc = ioremap(SYSC_BASE, PAGE_SIZE);
5157
writel(0, ap + APARMBAREA); /* 4k */
5258
writel(__pa(shmobile_boot_vector), sysc + SBAR);
5359
iounmap(sysc);

arch/arm64/Kconfig.platforms

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,18 @@ config ARCH_NPCM
244244
General support for NPCM8xx BMC (Arbel).
245245
Nuvoton NPCM8xx BMC based on the Cortex A35.
246246

247+
config ARCH_PENSANDO
248+
bool "AMD Pensando Platforms"
249+
help
250+
This enables support for the ARMv8 based AMD Pensando SoC
251+
family to include the Elba SoC.
252+
253+
AMD Pensando SoCs support a range of Distributed Services
254+
Cards in PCIe format installed into servers. The Elba
255+
SoC includes 16 Cortex A-72 CPU cores, 144 P4-programmable
256+
cores for a minimal latency/jitter datapath, and network
257+
interfaces up to 200 Gb/s.
258+
247259
config ARCH_QCOM
248260
bool "Qualcomm Platforms"
249261
select GPIOLIB

0 commit comments

Comments
 (0)