From: Krzysztof Kozlowski <krzk@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Kukjin Kim <kgene@kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org,
Tomasz Figa <tomasz.figa@gmail.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Pankaj Dubey <pankaj.dubey@samsung.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy
Date: Wed, 23 Oct 2019 12:54:43 +0200 [thread overview]
Message-ID: <20191023105443.GE10630@pi3> (raw)
In-Reply-To: <20191010203043.1241612-7-arnd@arndb.de>
On Thu, Oct 10, 2019 at 10:29:51PM +0200, Arnd Bergmann wrote:
> The only part of plat-samsung that is shared with arch-exynos
> is the CPU identification code.
>
> Having a separate exynos_cpu_id variable makes the two completely
> independent and is actually a bit less code in total.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-exynos/common.h | 6 +++---
> arch/arm/mach-exynos/exynos.c | 19 +++++++++++++++----
> arch/arm/mach-exynos/include/mach/map.h | 18 ------------------
> arch/arm/mach-exynos/platsmp.c | 4 +---
> arch/arm/mach-exynos/pm.c | 8 ++++----
> arch/arm/plat-samsung/cpu.c | 17 -----------------
> arch/arm/plat-samsung/include/plat/cpu.h | 2 --
> arch/arm/plat-samsung/include/plat/map-s5p.h | 2 --
> 8 files changed, 23 insertions(+), 53 deletions(-)
> delete mode 100644 arch/arm/mach-exynos/include/mach/map.h
>
> diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
> index 56411bb63d45..adf7db9c0885 100644
> --- a/arch/arm/mach-exynos/common.h
> +++ b/arch/arm/mach-exynos/common.h
> @@ -24,12 +24,12 @@
> #define EXYNOS5800_SOC_ID 0xE5422000
> #define EXYNOS5_SOC_MASK 0xFFFFF000
>
> -extern unsigned long samsung_cpu_id;
> +extern unsigned long exynos_cpu_id;
>
> #define IS_SAMSUNG_CPU(name, id, mask) \
> static inline int is_samsung_##name(void) \
> { \
> - return ((samsung_cpu_id & mask) == (id & mask)); \
> + return ((exynos_cpu_id & mask) == (id & mask)); \
> }
>
> IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK)
> @@ -147,7 +147,7 @@ extern struct cpuidle_exynos_data cpuidle_coupled_exynos_data;
>
> extern void exynos_set_delayed_reset_assertion(bool enable);
>
> -extern unsigned int samsung_rev(void);
> +extern unsigned int exynos_rev(void);
> extern void exynos_core_restart(u32 core_id);
> extern int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr);
> extern int exynos_get_boot_addr(u32 core_id, unsigned long *boot_addr);
> diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
> index 9aa483366ebc..da9300d655c6 100644
> --- a/arch/arm/mach-exynos/exynos.c
> +++ b/arch/arm/mach-exynos/exynos.c
> @@ -19,11 +19,10 @@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> -#include <mach/map.h>
> -#include <plat/cpu.h>
> -
> #include "common.h"
>
> +#define S5P_VA_CHIPID ((void __iomem __force *)0xF8000000)
How about keeping the S3C_VA and S3C_ADDR_BASE macros/defines and using
them? They still appear in arch/arm/include/debug/exynos.S so they could
be integrated into one header, unless you plan to remove it in further
patches.
> +
> static struct platform_device exynos_cpuidle = {
> .name = "exynos_cpuidle",
> #ifdef CONFIG_ARM_EXYNOS_CPUIDLE
> @@ -36,6 +35,14 @@ void __iomem *sysram_base_addr __ro_after_init;
> phys_addr_t sysram_base_phys __ro_after_init;
> void __iomem *sysram_ns_base_addr __ro_after_init;
>
> +unsigned long exynos_cpu_id;
> +static unsigned int exynos_cpu_rev;
> +
> +unsigned int exynos_rev(void)
> +{
> + return exynos_cpu_rev;
> +}
> +
> void __init exynos_sysram_init(void)
> {
> struct device_node *node;
> @@ -86,7 +93,11 @@ static void __init exynos_init_io(void)
> of_scan_flat_dt(exynos_fdt_map_chipid, NULL);
>
> /* detect cpu id and rev. */
> - s5p_init_cpu(S5P_VA_CHIPID);
> + exynos_cpu_id = readl_relaxed(S5P_VA_CHIPID);
> + exynos_cpu_rev = exynos_cpu_id & 0xFF;
> +
> + pr_info("Samsung CPU ID: 0x%08lx\n", exynos_cpu_id);
> +
> }
>
> /*
> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
> deleted file mode 100644
> index 22ebe3654633..000000000000
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -/*
> - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
> - * http://www.samsung.com/
> - *
> - * EXYNOS - Memory map definitions
> - */
> -
> -#ifndef __ASM_ARCH_MAP_H
> -#define __ASM_ARCH_MAP_H __FILE__
> -
> -#include <plat/map-base.h>
> -
> -#include <plat/map-s5p.h>
> -
> -#define EXYNOS_PA_CHIPID 0x10000000
> -
> -#endif /* __ASM_ARCH_MAP_H */
> diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
> index 0cbbae8bf1f8..d7fedbb2eefe 100644
> --- a/arch/arm/mach-exynos/platsmp.c
> +++ b/arch/arm/mach-exynos/platsmp.c
> @@ -22,8 +22,6 @@
> #include <asm/smp_scu.h>
> #include <asm/firmware.h>
>
> -#include <mach/map.h>
> -
> #include "common.h"
>
> extern void exynos4_secondary_startup(void);
> @@ -188,7 +186,7 @@ void exynos_scu_enable(void)
>
> static void __iomem *cpu_boot_reg_base(void)
> {
> - if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
> + if (soc_is_exynos4210() && exynos_rev() == EXYNOS4210_REV_1_1)
> return pmu_base_addr + S5P_INFORM5;
> return sysram_base_addr;
> }
> diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
> index 48e7fb38613e..624585641a9c 100644
> --- a/arch/arm/mach-exynos/pm.c
> +++ b/arch/arm/mach-exynos/pm.c
> @@ -26,18 +26,18 @@
>
> static inline void __iomem *exynos_boot_vector_addr(void)
> {
> - if (samsung_rev() == EXYNOS4210_REV_1_1)
> + if (exynos_rev() == EXYNOS4210_REV_1_1)
> return pmu_base_addr + S5P_INFORM7;
> - else if (samsung_rev() == EXYNOS4210_REV_1_0)
> + else if (exynos_rev() == EXYNOS4210_REV_1_0)
> return sysram_base_addr + 0x24;
> return pmu_base_addr + S5P_INFORM0;
> }
>
> static inline void __iomem *exynos_boot_vector_flag(void)
> {
> - if (samsung_rev() == EXYNOS4210_REV_1_1)
> + if (exynos_rev() == EXYNOS4210_REV_1_1)
> return pmu_base_addr + S5P_INFORM6;
> - else if (samsung_rev() == EXYNOS4210_REV_1_0)
> + else if (exynos_rev() == EXYNOS4210_REV_1_0)
> return sysram_base_addr + 0x20;
> return pmu_base_addr + S5P_INFORM1;
> }
> diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c
> index e1ba88ba31d8..8acba21bbf4b 100644
> --- a/arch/arm/plat-samsung/cpu.c
> +++ b/arch/arm/plat-samsung/cpu.c
> @@ -14,13 +14,6 @@
> #include <plat/cpu.h>
>
> unsigned long samsung_cpu_id;
> -static unsigned int samsung_cpu_rev;
> -
> -unsigned int samsung_rev(void)
> -{
> - return samsung_cpu_rev;
> -}
> -EXPORT_SYMBOL(samsung_rev);
>
> void __init s3c64xx_init_cpu(void)
> {
> @@ -34,15 +27,5 @@ void __init s3c64xx_init_cpu(void)
> samsung_cpu_id = readl_relaxed(S3C_VA_SYS + 0xA1C);
> }
>
> - samsung_cpu_rev = 0;
> -
> - pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id);
> -}
> -
> -void __init s5p_init_cpu(const void __iomem *cpuid_addr)
> -{
> - samsung_cpu_id = readl_relaxed(cpuid_addr);
> - samsung_cpu_rev = samsung_cpu_id & 0xFF;
> -
> pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id);
> }
> diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
> index fadcddbea064..02d7f991d5a3 100644
> --- a/arch/arm/plat-samsung/include/plat/cpu.h
> +++ b/arch/arm/plat-samsung/include/plat/cpu.h
> @@ -111,8 +111,6 @@ extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
> extern void s3c64xx_init_cpu(void);
> extern void s5p_init_cpu(const void __iomem *cpuid_addr);
You can remove it as well.
Best regards,
Krzysztof
>
> -extern unsigned int samsung_rev(void);
> -
> extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no);
>
> extern void s3c24xx_init_clocks(int xtal);
> diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h
> index d69a0ca09fb5..3812085f8761 100644
> --- a/arch/arm/plat-samsung/include/plat/map-s5p.h
> +++ b/arch/arm/plat-samsung/include/plat/map-s5p.h
> @@ -9,8 +9,6 @@
> #ifndef __ASM_PLAT_MAP_S5P_H
> #define __ASM_PLAT_MAP_S5P_H __FILE__
>
> -#define S5P_VA_CHIPID S3C_ADDR(0x02000000)
> -
> #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000))
> #define VA_VIC0 VA_VIC(0)
> #define VA_VIC1 VA_VIC(1)
> --
> 2.20.0
>
next prev parent reply other threads:[~2019-10-23 10:54 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann
2019-10-10 20:29 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Arnd Bergmann
2019-10-10 20:29 ` [PATCH 02/36] ARM: s3c: simplify mach/io.h Arnd Bergmann
2019-10-10 20:29 ` [PATCH 03/36] usb: gadget: s3c: use platform resources Arnd Bergmann
2019-10-23 10:06 ` Krzysztof Kozlowski
2019-10-23 12:46 ` Krzysztof Kozlowski
2019-10-23 13:26 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 04/36] usb: gadget: s3c-hsudc: remove platform header dependency Arnd Bergmann
2019-10-23 10:09 ` Krzysztof Kozlowski
2019-10-23 12:21 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 05/36] ARM: samsung: make pm-debug platform independent Arnd Bergmann
2019-10-23 10:27 ` Krzysztof Kozlowski
2019-10-23 12:13 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 06/36] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug Arnd Bergmann
2019-10-23 10:12 ` Krzysztof Kozlowski
2019-10-23 12:22 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy Arnd Bergmann
2019-10-23 10:54 ` Krzysztof Kozlowski [this message]
2019-10-23 12:37 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG Arnd Bergmann
2019-10-15 14:12 ` Ulf Hansson
2019-10-23 10:57 ` Krzysztof Kozlowski
2019-10-23 12:43 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 09/36] ARM: samsung: move pm check code to drivers/soc Arnd Bergmann
2019-10-23 11:32 ` Krzysztof Kozlowski
2019-10-23 12:45 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 10/36] ARM: s5pv210: use private pm save/restore Arnd Bergmann
2019-10-23 11:55 ` Krzysztof Kozlowski
2019-10-23 13:12 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
2019-10-11 5:51 ` Uwe Kleine-König
2019-10-22 14:01 ` Arnd Bergmann
2019-10-22 15:53 ` Uwe Kleine-König
2019-10-22 16:20 ` Arnd Bergmann
2019-10-15 14:13 ` Ulf Hansson
2019-10-15 14:23 ` Thierry Reding
2019-10-23 12:14 ` Krzysztof Kozlowski
2019-10-23 13:17 ` Arnd Bergmann
2019-10-23 14:12 ` Krzysztof Kozlowski
2019-10-10 20:29 ` [PATCH 12/36] ARM: s3c64xx: remove mach/hardware.h Arnd Bergmann
2019-10-16 10:09 ` Charles Keepax
2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann
2019-10-23 12:32 ` Krzysztof Kozlowski
2019-10-23 13:21 ` Arnd Bergmann
2019-10-10 20:29 ` [PATCH 14/36] ARM: s3c: move irqchip driver back into platform Arnd Bergmann
2019-10-10 20:29 ` [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung Arnd Bergmann
2019-10-10 22:20 ` Guenter Roeck
2019-10-10 22:29 ` Dmitry Torokhov
2019-10-10 22:44 ` Sebastian Reichel
2019-10-23 12:37 ` Krzysztof Kozlowski
2019-10-23 13:23 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann
2019-10-10 20:30 ` [PATCH 17/36] ARM: s3c: h1940-audio: turn into platform driver Arnd Bergmann
2019-10-10 20:30 ` [PATCH 18/36] ARM: s3c: gta02-audio: " Arnd Bergmann
2019-10-10 20:30 ` [PATCH 19/36] ARM: s3c: rx1950: " Arnd Bergmann
2019-10-10 20:30 ` [PATCH 20/36] ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS Arnd Bergmann
2019-10-11 10:50 ` Mark Brown
2019-10-10 20:30 ` [PATCH 21/36] ARM: s3c: move iis pinctrl config into boards Arnd Bergmann
2019-10-23 12:50 ` Krzysztof Kozlowski
2019-10-23 13:29 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 22/36] ARM: s3c: leds: move setpull() calls into board files Arnd Bergmann
2019-10-10 20:30 ` [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling " Arnd Bergmann
2019-10-15 14:12 ` Ulf Hansson
2019-10-16 13:12 ` Linus Walleij
2019-10-10 20:30 ` [PATCH 24/36] ARM: s3c: include mach/irqs.h where needed Arnd Bergmann
2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann
2019-10-10 20:30 ` [PATCH 26/36] ARM: s3c: bast: avoid irq_desc array usage Arnd Bergmann
2019-10-10 20:30 ` [PATCH 27/36] ARM: s3c: fix mmc gpio lookup tables Arnd Bergmann
2019-10-10 20:30 ` [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency Arnd Bergmann
2019-10-23 13:13 ` Krzysztof Kozlowski
2019-10-23 13:35 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 29/36] ARM: s3c: cpufreq: split out registers Arnd Bergmann
2019-10-10 20:30 ` [PATCH 30/36] ARM: s3c: remove cpufreq header dependencies Arnd Bergmann
2019-10-23 13:38 ` Krzysztof Kozlowski
2019-10-23 13:46 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 31/36] ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh Arnd Bergmann
2019-10-23 13:44 ` Krzysztof Kozlowski
2019-10-23 13:57 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 32/36] ARM: s3c: iotiming: make functions static Arnd Bergmann
2019-10-10 20:30 ` [PATCH 33/36] ARM: s3c: move low-level clk reg access into platform code Arnd Bergmann
2019-10-23 13:49 ` Krzysztof Kozlowski
2019-10-23 13:54 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann
2019-10-10 21:02 ` Russell King - ARM Linux admin
2019-10-10 21:53 ` Arnd Bergmann
2019-10-15 14:52 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Tomasz Figa
2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski
2019-10-23 13:39 ` Arnd Bergmann
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=20191023105443.GE10630@pi3 \
--to=krzk@kernel.org \
--cc=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=daniel.lezcano@linaro.org \
--cc=kgene@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=pankaj.dubey@samsung.com \
--cc=tomasz.figa@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).