Introducing Exynos ChipId driver
v7 cover Introducing Exynos ChipId driver
Once again I am attempting this quite old patch series to introduce Exynos Chipid driver.
Each Exynos SoC has ChipID block which can give information about SoC's product Id and revision number.
This patch series introduces Exynos Chipid SoC driver. At the same time it reduces dependency of mach-exynos files from plat-samsung, by removing soc_is_exynosMMMM and samsung_rev API. Instead of it now we can use soc_device_match API proposed by Arnd and getting discussed in thread [1].
Until now we are using static mapping of Exynos Chipid and using this static mapping to know about SoC name and revision via soc_is_exynosMMMM macro. This is quite cumbersome and every time new ARMv7 based Exynos SoC supports lands in mainline a bunch of such new macros needs to be added. Quite long back during support of Exynos5260 it has been discussed to solve this problem.
To solve this issue this patchset replaces use of soc_is_exynosMMMM by either of_machine_is_compatible or soc_device_match depending upon usecase.
This patchset depends on [2], and I have prepared it on top of my other patchset [3] (under-review) which introduces SCU device node for Exynos
I have tested this patch series on Exynos4210 based Origen board for normal SMP boot.
[1]: https://patchwork.kernel.org/patch/9361389/
[2]: http://www.mail-archive.com/[email protected]/msg1261739.html
[3]: http://www.spinics.net/lists/arm-kernel/msg540498.html
Revision 6 and it's discussion can be found here:
- https://lkml.org/lkml/2016/5/25/101
Revision 5 and it's discussion can be found here:
- http://lists.infradead.org/pipermail/linux-arm-kernel/2014-December/310046.html
Revision 4 and it's discussion can be found here:
- https://lkml.org/lkml/2014/12/3/115
Chances since v6:
- Removed platform driver from chipid, instead use early_init to register soc_device
- Removed export functions from exynos chipid driver
- Replace soc_is_exynosMMMM via either of_machine_is_compatible or soc_device_match in files in arm/mach-exynos folder
- This patchset depends on the following patch series by Geert Uytterhoeven. This series includes patch which introduces soc_device_match.
http://www.mail-archive.com/[email protected]/msg1261739.html
- Rebased on latest krzk/for-next branch and retested.
Change since v5:
- Addressed Rob's review comments.
- Rebased on latest krzk/for-next branch and retested.
Changes since v4:
- Removed custom sysfs entries as they were not providing any new information as pointed out by Arnd.
- Removed functions exporting product_id and revision, instead we will export exynos_chipid_info structure. It will be helpfull when we need to provide more fields of chipid outside of chipid, as commented by Yadwinder
- Converted all funcions as __init.
Change since v3:
- This patch set contains 5/6 and 6/6 patch from v3 series.
- Made EXYNOS_CHIPID config option non-user selectable, as suggested by Tomasz Figa.
- Made uniform macro for EXYNOS4/5_SOC_MASK as EXYNOS_SOC_MASK as suggested by Tomasz Figa.
- Made local variables static in chipid driver.
- Added existing SoC's product id's.
- Added platform driver support.
Changes since v2:
- Reorganized patches as suggested by Tomasz Figa.
- Addressed review comments of Tomasz Figa in i2c-s3c2410.c file.
Pankaj Dubey (2):
soc: samsung: add exynos chipid driver support
ARM: EXYNOS: refactoring of mach-exynos to enable chipid driver
arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/common.h | 92 ----------------- arch/arm/mach-exynos/exynos.c | 31 ------ arch/arm/mach-exynos/firmware.c | 10 +- arch/arm/mach-exynos/include/mach/map.h | 21 ---- arch/arm/mach-exynos/platsmp.c | 22 ++-- arch/arm/mach-exynos/pm.c | 41 +++++--- arch/arm/plat-samsung/cpu.c | 14 --- arch/arm/plat-samsung/include/plat/cpu.h | 2 - arch/arm/plat-samsung/include/plat/map-s5p.h | 2 - drivers/soc/samsung/Kconfig | 5 + drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 148 +++++++++++++++++++++++++++ 13 files changed, 201 insertions(+), 189 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h create mode 100644 drivers/soc/samsung/exynos-chipid.c
Signature · 1 line
2.7.4
PATCH v7 1/2 soc: samsung: add exynos chipid driver support
Exynos SoCs have Chipid, for identification of product IDs and SoC revisions. This patch intends to provide initialization code for all these functionalities, at the same time it provides some sysfs entries for accessing these information to user-space.
This driver uses existing binding for exynos-chipid.
--- drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 148 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 drivers/soc/samsung/exynos-chipid.c
drivers/soc/samsung/Kconfig +5 -0
@@ -14,4 +14,9 @@ config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST depends on PM_GENERIC_DOMAINS || COMPILE_TEST +config EXYNOS_CHIPID + bool "Exynos Chipid controller driver" if COMPILE_TEST + depends on (ARM && ARCH_EXYNOS) || ((ARM || ARM64) && COMPILE_TEST) + select SOC_BUS + endif
drivers/soc/samsung/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o +obj-$(CONFIG_EXYNOS_CHIPID) += exynos-chipid.o
drivers/soc/samsung/exynos-chipid.c new file +148 -0
148 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v7 1/2 soc: samsung: add exynos chipid driver support
Hi Pankaj,
Quoted 74 lines · Pankaj Dubey
Exynos SoCs have Chipid, for identification of product IDs and SoC revisions. This patch intends to provide initialization code for all these functionalities, at the same time it provides some sysfs entries for accessing these information to user-space.
This driver uses existing binding for exynos-chipid.
CC Grant Likely <[email protected]>CC Rob Herring <[email protected]>CC Linus Walleij <[email protected]>Signed-off-by Pankaj Dubey <[email protected]>--- drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 148 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+)create mode 100644
drivers/soc/samsung/exynos-chipid.cdrivers/soc/samsung/Kconfig +5
-0@@ -14,4 +14,9 @@ config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST depends on PM_GENERIC_DOMAINS || COMPILE_TEST +config EXYNOS_CHIPID + bool "Exynos Chipid controller driver" if COMPILE_TEST + depends on (ARM && ARCH_EXYNOS) || ((ARM || ARM64) && COMPILE_TEST) + select SOC_BUS + endifdrivers/soc/samsung/Makefile +1
-0@@ -1,3 +1,4 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o +obj-$(CONFIG_EXYNOS_CHIPID) += exynos-chipid.odrivers/soc/samsung/exynos-chipid.c new file +27
-0@@ -0,0 +1,148 @@ +/* +* Copyright (c) 2016 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS - CHIP ID support +* Author: Pankaj Dubey <[email protected]> +* +* 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. +*/ + +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/sys_soc.h> + +#define EXYNOS3250_SOC_ID 0xE3472000 +#define EXYNOS4210_SOC_ID 0x43210000 +#define EXYNOS4212_SOC_ID 0x43220000 +#define EXYNOS4412_SOC_ID 0xE4412000 +#define EXYNOS4415_SOC_ID 0xE4415000 +#define EXYNOS5250_SOC_ID 0x43520000 +#define EXYNOS5260_SOC_ID 0xE5260000
drivers/soc/samsung/exynos-chipid.c line 37
Quoted 10 lines
drivers/soc/samsung/exynos-chipid.c new file +10
-0+#define EXYNOS5410_SOC_ID 0xE5410000 +#define EXYNOS5420_SOC_ID 0xE5420000 +#define EXYNOS5440_SOC_ID 0xE5440000 +#define EXYNOS5800_SOC_ID 0xE5422000 + +#define EXYNOS_SOC_MASK 0xFFFFF000 + +#define EXYNOS4210_REV_0 0x0 +#define EXYNOS4210_REV_1_0 0x10 +#define EXYNOS4210_REV_1_1 0x11
EXYNOS4210_REV* defines are not used at all in this driver.
Quoted 37 lines
drivers/soc/samsung/exynos-chipid.c new file +37
-0+ +#define EXYNOS_SUBREV_MASK (0xF << 4) +#define EXYNOS_MAINREV_MASK (0xF << 0) +#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK | EXYNOS_MAINREV_MASK) + + +static const char *__init product_id_to_soc_id (unsigned int product_id) +{ +const char *soc_name; +unsigned int soc_id = product_id &EXYNOS_SOC_MASK ; + +switch (soc_id) { +case EXYNOS3250_SOC_ID : + soc_name ="EXYNOS3250" ; +break ; +case EXYNOS4210_SOC_ID : + soc_name ="EXYNOS4210" ; +break ; +case EXYNOS4212_SOC_ID : + soc_name ="EXYNOS4212" ; +break ; +case EXYNOS4412_SOC_ID : + soc_name ="EXYNOS4412" ; +break ; +case EXYNOS4415_SOC_ID : + soc_name ="EXYNOS4415" ; +break ; +case EXYNOS5250_SOC_ID : + soc_name ="EXYNOS5250" ; +break ; +case EXYNOS5260_SOC_ID : + soc_name ="EXYNOS5260" ; +break ; +case EXYNOS5420_SOC_ID : + soc_name ="EXYNOS5420" ; +break ; +case EXYNOS5440_SOC_ID :
drivers/soc/samsung/exynos-chipid.c line 84
Quoted 10 lines
drivers/soc/samsung/exynos-chipid.c new file +10
-0+ soc_name ="EXYNOS5440" ; +break ; +case EXYNOS5800_SOC_ID : + soc_name ="EXYNOS5800" ; +break ; +default : + soc_name ="UNKNOWN" ; + } +return soc_name; +}
This approach is a bit error prone. You have already missed Exynos5410 and early Exynos 4210 are not detected because of the incorrect SOC MASK. IMHO you should replace above code and defines with a simple array, where each ID is present only once, so it will be much easier to add future SoCs:
static const struct exynos_soc_id {
const char *name;
unsigned int id;
unsigned int mask;
} soc_ids[] = {
{ "EXYNOS3250", 0xE3472000, 0xFFFFF000 },
{ "EXYNOS4210", 0x43200000, 0xFFFE0000 },
{ "EXYNOS4212", 0x43220000, 0xFFFE0000 },
{ "EXYNOS4412", 0xE4412000, 0xFFFE0000 },
{ "EXYNOS4415", 0xE4415000, 0xFFFE0000 },
{ "EXYNOS5250", 0x43520000, 0xFFFFF000 },
{ "EXYNOS5260", 0xE5260000, 0xFFFFF000 },
{ "EXYNOS5410", 0xE5410000, 0xFFFFF000 },
{ "EXYNOS5420", 0xE5420000, 0xFFFFF000 },
{ "EXYNOS5440", 0xE5440000, 0xFFFFF000 },
{ "EXYNOS5800", 0xE5422000, 0xFFFFF000 },
};static const char * __init product_id_to_soc_id(unsigned int product_id)
{
int i;
for (i = 0; i < ARRAY_SIZE(soc_ids); i++)
if ((product_id & soc_ids[i].mask) == soc_ids[i].id)
return soc_ids[i].name;
return "UNKNOWN";
}I'm also not sure about Exynos 4415, which has been scheduled for removal.
Quoted 54 lines
drivers/soc/samsung/exynos-chipid.c new file +54
-0+ +static const struct of_device_id of_exynos_chipid_ids[] = { + { + .compatible ="samsung,exynos4210-chipid" , + }, + {}, +}; + +/** +* exynos_chipid_early_init: Early chipid initialization +*/ +int __init exynos_chipid_early_init (void ) +{ +struct soc_device_attribute *soc_dev_attr; +struct soc_device *soc_dev; +struct device_node *root; +struct device_node *np; +void __iomem *exynos_chipid_base; +const struct of_device_id *match; +u32 product_id; +u32 revision; + + np =of_find_matching_node_and_match (NULL , + of_exynos_chipid_ids, &match); +if (!np) +return -ENODEV ; + + exynos_chipid_base =of_iomap (np,0 ); + +if (!exynos_chipid_base) +return PTR_ERR (exynos_chipid_base); + + product_id =__raw_readl (exynos_chipid_base); + revision = product_id &EXYNOS_REV_MASK ; +iounmap (exynos_chipid_base); + + soc_dev_attr =kzalloc (sizeof (*soc_dev_attr),GFP_KERNEL ); +if (!soc_dev_attr) +return -ENODEV ; + + soc_dev_attr->family ="Samsung Exynos" ; + + root =of_find_node_by_path ("/" ); +of_property_read_string (root,"model" , &soc_dev_attr->machine); +of_node_put (root); + + soc_dev_attr->revision =kasprintf (GFP_KERNEL ,"%x" , revision); + soc_dev_attr->soc_id =product_id_to_soc_id (product_id); + + +pr_info ("Exynos: CPU[%s] CPU_REV[0x%x] Detected\n" , +product_id_to_soc_id (product_id), revision); + + soc_dev =soc_device_register (soc_dev_attr);
drivers/soc/samsung/exynos-chipid.c line 148
Quoted 10 lines
drivers/soc/samsung/exynos-chipid.c new file +10
-0+if (IS_ERR (soc_dev)) { +kfree (soc_dev_attr->revision); +kfree_const (soc_dev_attr->soc_id); +kfree (soc_dev_attr); +return PTR_ERR (soc_dev); + } + +return 0 ; +} +early_initcall (exynos_chipid_early_init);
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
PATCH v7 1/2 soc: samsung: add exynos chipid driver support
Quoted 15 lines · CET Marek Szyprowski
This approach is a bit error prone. You have already missed Exynos5410 and early Exynos 4210 are not detected because of the incorrect SOC MASK. IMHO you should replace above code and defines with a simple array, where each ID is present only once, so it will be much easier to add future SoCs:
static const struct exynos_soc_id { const char *name; unsigned int id; unsigned int mask; } soc_ids[] = { { "EXYNOS3250", 0xE3472000, 0xFFFFF000 }, { "EXYNOS4210", 0x43200000, 0xFFFE0000 }, { "EXYNOS4212", 0x43220000, 0xFFFE0000 }, { "EXYNOS4412", 0xE4412000, 0xFFFE0000 },
Quoted 8 lines
{ "EXYNOS4415", 0xE4415000, 0xFFFE0000 },
{ "EXYNOS5250", 0x43520000, 0xFFFFF000 },
{ "EXYNOS5260", 0xE5260000, 0xFFFFF000 },
{ "EXYNOS5410", 0xE5410000, 0xFFFFF000 },
{ "EXYNOS5420", 0xE5420000, 0xFFFFF000 },
{ "EXYNOS5440", 0xE5440000, 0xFFFFF000 },
{ "EXYNOS5800", 0xE5422000, 0xFFFFF000 },
};Good idea
Quoted 2 lines
I'm also not sure about Exynos 4415, which has been scheduled for removal.
I'd vote for leaving it in the driver, and possibly adding other models even if we don't support them in the other drivers, if only for documentation purposes.
Arnd
PATCH v7 1/2 soc: samsung: add exynos chipid driver support
In reply to Marek SzyprowskiHi Marek,
Quoted 136 lines · Marek Szyprowski
Hi Pankaj,
Quoted 76 lines · Pankaj Dubey
Exynos SoCs have Chipid, for identification of product IDs and SoC revisions. This patch intends to provide initialization code for all these functionalities, at the same time it provides some sysfs entries for accessing these information to user-space.
This driver uses existing binding for exynos-chipid.
CC Grant Likely <[email protected]>CC Rob Herring <[email protected]>CC Linus Walleij <[email protected]>Signed-off-by Pankaj Dubey <[email protected]>--- drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 148 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+)create mode 100644
drivers/soc/samsung/exynos-chipid.cdrivers/soc/samsung/Kconfig +4
-0@@ -14,4 +14,9 @@ config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST depends on PM_GENERIC_DOMAINS || COMPILE_TEST +config EXYNOS_CHIPID + bool "Exynos Chipid controller driver" if COMPILE_TEST + depends on (ARM && ARCH_EXYNOS) || ((ARM || ARM64) && COMPILE_TEST) + select SOC_BUS + endifdrivers/soc/samsung/Makefile +1
-0@@ -1,3 +1,4 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o +obj-$(CONFIG_EXYNOS_CHIPID) += exynos-chipid.odrivers/soc/samsung/exynos-chipid.c new file +27
-0@@ -0,0 +1,148 @@ +/* +* Copyright (c) 2016 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS - CHIP ID support +* Author: Pankaj Dubey <[email protected]> +* +* 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. +*/ + +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/sys_soc.h> + +#define EXYNOS3250_SOC_ID 0xE3472000 +#define EXYNOS4210_SOC_ID 0x43210000 +#define EXYNOS4212_SOC_ID 0x43220000 +#define EXYNOS4412_SOC_ID 0xE4412000 +#define EXYNOS4415_SOC_ID 0xE4415000 +#define EXYNOS5250_SOC_ID 0x43520000 +#define EXYNOS5260_SOC_ID 0xE5260000drivers/soc/samsung/exynos-chipid.c line 37
Quoted 10 lines
drivers/soc/samsung/exynos-chipid.c new file +10
-0+#define EXYNOS5410_SOC_ID 0xE5410000 +#define EXYNOS5420_SOC_ID 0xE5420000 +#define EXYNOS5440_SOC_ID 0xE5440000 +#define EXYNOS5800_SOC_ID 0xE5422000 + +#define EXYNOS_SOC_MASK 0xFFFFF000 + +#define EXYNOS4210_REV_0 0x0 +#define EXYNOS4210_REV_1_0 0x10 +#define EXYNOS4210_REV_1_1 0x11EXYNOS4210_REV* defines are not used at all in this driver.
Quoted 43 lines
drivers/soc/samsung/exynos-chipid.c new file +4
-0+ +#define EXYNOS_SUBREV_MASK (0xF << 4) +#define EXYNOS_MAINREV_MASK (0xF << 0) +#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK |
EXYNOS_MAINREV_MASK)drivers/soc/samsung/exynos-chipid.c new file +38
-0+ + +static const char *__init product_id_to_soc_id (unsigned int product_id) +{ +const char *soc_name; +unsigned int soc_id = product_id &EXYNOS_SOC_MASK ; + +switch (soc_id) { +case EXYNOS3250_SOC_ID : + soc_name ="EXYNOS3250" ; +break ; +case EXYNOS4210_SOC_ID : + soc_name ="EXYNOS4210" ; +break ; +case EXYNOS4212_SOC_ID : + soc_name ="EXYNOS4212" ; +break ; +case EXYNOS4412_SOC_ID : + soc_name ="EXYNOS4412" ; +break ; +case EXYNOS4415_SOC_ID : + soc_name ="EXYNOS4415" ; +break ; +case EXYNOS5250_SOC_ID : + soc_name ="EXYNOS5250" ; +break ; +case EXYNOS5260_SOC_ID : + soc_name ="EXYNOS5260" ; +break ; +case EXYNOS5420_SOC_ID : + soc_name ="EXYNOS5420" ; +break ; +case EXYNOS5440_SOC_ID : + soc_name ="EXYNOS5440" ; +break ; +case EXYNOS5800_SOC_ID : + soc_name ="EXYNOS5800" ; +break ;
Quoted 8 lines
drivers/soc/samsung/exynos-chipid.c line 84
Quoted 5 lines
drivers/soc/samsung/exynos-chipid.c new file +5
-0+default : + soc_name ="UNKNOWN" ; + } +return soc_name; +}This approach is a bit error prone. You have already missed Exynos5410 and early Exynos 4210 are not detected because of the incorrect SOC MASK.
Yes I missed to update Exynos4210 SoC Mask, thanks for pointing out.
Quoted 4 lines
IMHO you should replace above code and defines with a simple array, where each ID is present only once, so it will be much easier to add future SoCs:
Well, this looks good to me as well. I will incorporate these changes in v2 as suggested by you and reuse your code, along with your Signed-off-by for this part :)
Quoted 28 lines
static const struct exynos_soc_id { const char *name; unsigned int id; unsigned int mask; } soc_ids[] = { { "EXYNOS3250", 0xE3472000, 0xFFFFF000 }, { "EXYNOS4210", 0x43200000, 0xFFFE0000 }, { "EXYNOS4212", 0x43220000, 0xFFFE0000 }, { "EXYNOS4412", 0xE4412000, 0xFFFE0000 }, { "EXYNOS4415", 0xE4415000, 0xFFFE0000 }, { "EXYNOS5250", 0x43520000, 0xFFFFF000 }, { "EXYNOS5260", 0xE5260000, 0xFFFFF000 }, { "EXYNOS5410", 0xE5410000, 0xFFFFF000 }, { "EXYNOS5420", 0xE5420000, 0xFFFFF000 }, { "EXYNOS5440", 0xE5440000, 0xFFFFF000 }, { "EXYNOS5800", 0xE5422000, 0xFFFFF000 }, };static const char *
__initproduct_id_to_soc_id(unsigned int product_id){ int i; for (i = 0; i < ARRAY_SIZE(soc_ids); i++) if ((product_id & soc_ids[i].mask) == soc_ids[i].id) return soc_ids[i].name; return "UNKNOWN"; }
Quoted 2 lines
I'm also not sure about Exynos 4415, which has been scheduled for removal.
As suggested by Arnd, I will keep entry for Exynos 4415 in the driver.
Thanks,
Pankaj Dubey
PATCH v7 1/2 soc: samsung: add exynos chipid driver support
In reply to Pankaj DubeyQuoted 23 lines · CET Pankaj Dubey
Exynos SoCs have Chipid, for identification of product IDs and SoC revisions. This patch intends to provide initialization code for all these functionalities, at the same time it provides some sysfs entries for accessing these information to user-space.
This driver uses existing binding for exynos-chipid.
CC Grant Likely <[email protected]>CC Rob Herring <[email protected]>CC Linus Walleij <[email protected]>Signed-off-by Pankaj Dubey <[email protected]>--- drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 148 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 drivers/soc/samsung/exynos-chipid.cdrivers/soc/samsung/Kconfig +0
-0
drivers/soc/samsung/Kconfig config EXYNOS_PM_DOMAINS · line 21
Quoted 8 lines
drivers/soc/samsung/Kconfig +5
-0@@ -14,4 +14,9 @@ config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST depends on PM_GENERIC_DOMAINS || COMPILE_TEST +config EXYNOS_CHIPID + bool "Exynos Chipid controller driver" if COMPILE_TEST + depends on (ARM && ARCH_EXYNOS) || ((ARM || ARM64) && COMPILE_TEST) + select SOC_BUS +
Please add a help text.
Why is this not enabled for ARM64 EXYNOS?
drivers/soc/samsung/Kconfig config EXYNOS_PM_DOMAINS
Quoted 8 lines
drivers/soc/samsung/Kconfig +8
-0+ exynos_chipid_base = of_iomap(np, 0); + + if (!exynos_chipid_base) + return PTR_ERR(exynos_chipid_base); + + product_id = __raw_readl(exynos_chipid_base); + revision = product_id & EXYNOS_REV_MASK; + iounmap(exynos_chipid_base);
Never use __raw_readl/__raw_writel in device drivers, they are not endian safe, and we just removed all instances for Exynos a while back.
drivers/soc/samsung/Kconfig
Quoted 4 lines
drivers/soc/samsung/Kconfig +3
-0+ return 0; +} +early_initcall(exynos_chipid_early_init);
Why is this early? Please add a code comment if it's really needed to be an early_initcall, otherwise make it a device_initcall.
Arnd
PATCH v7 2/2 ARM: EXYNOS: refactoring of mach-exynos to enable chipid driver
In reply to Pankaj DubeyThis patch enables chipid driver for ARCH_EXYNOS and refactors machine code for using chipid driver for identification of SoC ID and SoC rev.
--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/common.h | 92 ---------------------------- arch/arm/mach-exynos/exynos.c | 31 ---------- arch/arm/mach-exynos/firmware.c | 10 +-- arch/arm/mach-exynos/include/mach/map.h | 21 ------- arch/arm/mach-exynos/platsmp.c | 22 ++++--- arch/arm/mach-exynos/pm.c | 41 ++++++++----- arch/arm/plat-samsung/cpu.c | 14 ----- arch/arm/plat-samsung/include/plat/cpu.h | 2 - arch/arm/plat-samsung/include/plat/map-s5p.h | 2 - 10 files changed, 47 insertions(+), 189 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/Kconfig +1 -0
@@ -16,6 +16,7 @@ menuconfig ARCH_EXYNOS select ARM_AMBA select ARM_GIC select COMMON_CLK_SAMSUNG + select EXYNOS_CHIPID select EXYNOS_THERMAL select EXYNOS_PMU select EXYNOS_SROM
arch/arm/mach-exynos/common.h +0 -92
104 lines not on this page · raw message
arch/arm/mach-exynos/exynos.c +0 -31
@@ -23,9 +23,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <plat/cpu.h> -#include "common.h" static struct platform_device exynos_cpuidle = {
@@ -67,37 +64,9 @@ static void __init exynos_init_late(void)exynos_pm_init (); } -static int __init exynos_fdt_map_chipid (unsigned long node,const char *uname, -int depth,void *data) -{ -struct map_desc iodesc; -const __be32 *reg; -int len; - -if (!of_flat_dt_is_compatible (node,"samsung,exynos4210-chipid" ) && - !of_flat_dt_is_compatible (node,"samsung,exynos5440-clock" )) -return 0 ; - - reg =of_get_flat_dt_prop (node,"reg" , &len); -if (reg ==NULL || len != (sizeof (unsigned long ) *2 )) -return 0 ; - - iodesc.pfn =__phys_to_pfn (be32_to_cpu (reg[0 ])); - iodesc.length =be32_to_cpu (reg[1 ]) -1 ; - iodesc.virtual = (unsigned long )S5P_VA_CHIPID ; - iodesc.type =MT_DEVICE ; -iotable_init (&iodesc,1 ); -return 1 ; -} -static void __init exynos_init_io (void ) {debug_ll_io_init (); - -of_scan_flat_dt (exynos_fdt_map_chipid,NULL ); - -/* detect cpu id and rev. */ -s5p_init_cpu (S5P_VA_CHIPID ); }/*
arch/arm/mach-exynos/firmware.c +5 -5
@@ -44,7 +44,7 @@ static int exynos_do_idle(unsigned long mode)writel_relaxed (virt_to_phys (exynos_cpu_resume_ns), sysram_ns_base_addr +0x24 );writel_relaxed (EXYNOS_AFTR_MAGIC , sysram_ns_base_addr +0x20 ); -if (soc_is_exynos3250 ()) { +if (of_machine_is_compatible ("samsung,exynos3250" )) {flush_cache_all ();exynos_smc (SMC_CMD_SAVE ,OP_TYPE_CORE ,SMC_POWERSTATE_IDLE ,0 );
@@ -65,7 +65,7 @@ static int exynos_cpu_boot(int cpu)* Exynos3250 doesn't need to send smc command for secondary CPU boot * because Exynos3250 removes WFE in secure mode. */ -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))return 0 ;/*
@@ -73,7 +73,7 @@ static int exynos_cpu_boot(int cpu)* But, Exynos4212 has only one secondary CPU so second parameter * isn't used for informing secure firmware about CPU id. */ -if (soc_is_exynos4212 ()) +if (of_machine_is_compatible ("samsung,exynos4212" )) cpu =0 ;exynos_smc (SMC_CMD_CPU1BOOT , cpu,0 ,0 );
@@ -94,7 +94,7 @@ static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)* additional offset for every CPU, with Exynos4412 being the only * exception. */ -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 * cpu;writel_relaxed (boot_addr, boot_reg);
@@ -110,7 +110,7 @@ static int exynos_get_cpu_boot_addr(int cpu, unsigned long *boot_addr) boot_reg = sysram_ns_base_addr +0x1c ; -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 * cpu; *boot_addr =readl_relaxed (boot_reg);
arch/arm/mach-exynos/include/mach/map.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ -* -* EXYNOS - Memory map definitions -* -* 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. -*/ - -#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 */
arch/arm/mach-exynos/platsmp.c +14 -8
@@ -19,6 +19,7 @@#include <linux/smp.h> #include <linux/io.h> #include <linux/of_address.h> +#include <linux/sys_soc.h> #include <linux/soc/samsung/exynos-regs-pmu.h> #include <asm/cacheflush.h>
@@ -27,8 +28,6 @@#include <asm/smp_scu.h> #include <asm/firmware.h> -#include <mach/map.h> -#include "common.h" extern void exynos4_secondary_startup (void );
@@ -93,7 +92,8 @@ void exynos_cpu_power_down(int cpu) {u32 core_conf; -if (cpu ==0 && (soc_is_exynos5420 () ||soc_is_exynos5800 ())) { +if (cpu ==0 && (of_machine_is_compatible ("samsung,exynos5420" ) || +of_machine_is_compatible ("samsung,exynos5800" ))) {/* * Bypass power down for CPU0 during suspend. Check for * the SYS_PWR_REG value to decide if we are suspending
@@ -120,7 +120,7 @@ void exynos_cpu_power_up(int cpu) {u32 core_conf =S5P_CORE_LOCAL_PWR_EN ; -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" )) core_conf |=S5P_CORE_AUTOWAKEUP_EN ; pmu_raw_writel(core_conf,
@@ -168,9 +168,14 @@ int exynos_cluster_power_state(int cluster) S5P_CORE_LOCAL_PWR_EN); } +static struct soc_device_attribute exynos4210_rev11[] = { + { .soc_id ="EXYNOS4210" , .revision ="11" , }, + { }, +}; +static void __iomem *cpu_boot_reg_base (void ) { -if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_device_match (exynos4210_rev11))return pmu_base_addr +S5P_INFORM5 ;return sysram_base_addr; }
@@ -182,9 +187,10 @@ static inline void __iomem *cpu_boot_reg(int cpu) boot_reg =cpu_boot_reg_base ();if (!boot_reg)return IOMEM_ERR_PTR (-ENODEV ); -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 *cpu; -else if (soc_is_exynos5420 () ||soc_is_exynos5800 ()) +else if (of_machine_is_compatible ("samsung,exynos5420" ) || +of_machine_is_compatible ("samsung,exynos5800" )) boot_reg +=4 ;return boot_reg; }
@@ -356,7 +362,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)call_firmware_op (cpu_boot, core_id); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))dsb_sev ();else arch_send_wakeup_ipi_mask (cpumask_of (cpu));
arch/arm/mach-exynos/pm.c +27 -14
113 lines not on this page · raw message
arch/arm/plat-samsung/cpu.c +0 -14
@@ -21,12 +21,6 @@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 ) { samsung_cpu_id =readl_relaxed (S3C_VA_SYS +0x118 );
@@ -43,11 +37,3 @@ void __init s3c64xx_init_cpu(void)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); -}
arch/arm/plat-samsung/include/plat/cpu.h +0 -2
@@ -115,8 +115,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); -extern unsigned int samsung_rev (void ); -extern void s3c24xx_init_uarts (struct s3c2410_uartcfg *cfg,int no);extern void s3c24xx_init_clocks (int xtal);
arch/arm/plat-samsung/include/plat/map-s5p.h +0 -2
@@ -13,8 +13,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)
Signature · 1 line
2.7.4
PATCH v7 2/2 ARM: EXYNOS: refactoring of mach-exynos to enable chipid driver
Quoted 5 lines · CET Pankaj Dubey
This patch enables chipid driver for
ARCH_EXYNOSand refactors machine code for using chipid driver for identification of SoC ID and SoC rev.Signed-off-by Pankaj Dubey <[email protected]>
Quoted 13 lines
--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/common.h | 92 ---------------------------- arch/arm/mach-exynos/exynos.c | 31 ---------- arch/arm/mach-exynos/firmware.c | 10 +-- arch/arm/mach-exynos/include/mach/map.h | 21 ------- arch/arm/mach-exynos/platsmp.c | 22 ++++--- arch/arm/mach-exynos/pm.c | 41 ++++++++----- arch/arm/plat-samsung/cpu.c | 14 ----- arch/arm/plat-samsung/include/plat/cpu.h | 2 - arch/arm/plat-samsung/include/plat/map-s5p.h | 2 - 10 files changed, 47 insertions(+), 189 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h
Nice code removal!
Review
Quoted 10 lines
(quoted diff) +0
-6- static void __init exynos_init_io(void) { debug_ll_io_init(); - - of_scan_flat_dt(exynos_fdt_map_chipid, NULL); - - /* detect cpu id and rev. */ - s5p_init_cpu(S5P_VA_CHIPID); }
This is now the default for .map_io, so you can remove the rest of the function as well and do
arch/arm/mach-exynos/exynos.c +0 -1
@@ -234,7 +234,6 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)") .l2c_aux_val = 0x3c400001, .l2c_aux_mask = 0xc20fffff, .smp = smp_ops(exynos_smp_ops), - .map_io = exynos_init_io, .init_early = exynos_firmware_init, .init_irq = exynos_init_irq, .init_machine = exynos_dt_machine_init,
arch/arm/mach-exynos/firmware.c static int exynos_do_idle(unsigned long mode) · line 50
Quoted 13 lines
arch/arm/mach-exynos/firmware.c +1
-1@@ -44,7 +44,7 @@ static int exynos_do_idle(unsigned long mode)writel_relaxed (virt_to_phys (exynos_cpu_resume_ns), sysram_ns_base_addr +0x24 );writel_relaxed (EXYNOS_AFTR_MAGIC , sysram_ns_base_addr +0x20 ); -if (soc_is_exynos3250 ()) { +if (of_machine_is_compatible ("samsung,exynos3250" )) {flush_cache_all ();exynos_smc (SMC_CMD_SAVE ,OP_TYPE_CORE ,SMC_POWERSTATE_IDLE ,0 );
I'd rather not see a proliferation of many such checks. Please try to rework it to have fewer checks, e.g. by having a separate instance of "struct firmware_ops" for each incompatible variant and making the decision once.
Quoted 16 lines
arch/arm/mach-exynos/firmware.c +6
-1+static struct soc_device_attribute exynos4210_rev11[] = { + { .soc_id ="EXYNOS4210" , .revision ="11" , }, + { }, +}; +static void __iomem *cpu_boot_reg_base (void ) { -if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_device_match (exynos4210_rev11))return pmu_base_addr +S5P_INFORM5 ;return sysram_base_addr; }@@ -182,9 +187,10 @@ static inline void __iomem *cpu_boot_reg(int cpu) boot_reg =cpu_boot_reg_base ();if (!boot_reg)
arch/arm/mach-exynos/firmware.c static inline void __iomem *cpu_boot_reg(int cpu) · line 196
Quoted 10 lines
arch/arm/mach-exynos/firmware.c +3
-2return IOMEM_ERR_PTR (-ENODEV ); -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 *cpu; -else if (soc_is_exynos5420 () ||soc_is_exynos5800 ()) +else if (of_machine_is_compatible ("samsung,exynos5420" ) || +of_machine_is_compatible ("samsung,exynos5800" )) boot_reg +=4 ;return boot_reg; }
Same here, it would be nicer to rework the code to compute the address once while called from a place where you already know this information and then store the register address.
arch/arm/mach-exynos/firmware.c
Quoted 10 lines
arch/arm/mach-exynos/firmware.c +9
-0+static struct soc_device_attribute exynos4210_rev11[] = { + { .soc_id ="EXYNOS4210" , .revision ="11" , }, + { }, +}; + +static struct soc_device_attribute exynos4210_rev10[] = { + { .soc_id ="EXYNOS4210" , .revision ="10" , }, + { }, +};
Please use a single 'soc_device_attribute' table and make use of the .data field to encode the difference.
Arnd
PATCH v7 2/2 ARM: EXYNOS: refactoring of mach-exynos to enable chipid driver
In reply to Pankaj DubeyQuoted 291 lines · Pankaj Dubey
This patch enables chipid driver for
ARCH_EXYNOSand refactors machine code for using chipid driver for identification of SoC ID and SoC rev.Signed-off-by Pankaj Dubey <[email protected]>--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/common.h | 92 ---------------------------- arch/arm/mach-exynos/exynos.c | 31 ---------- arch/arm/mach-exynos/firmware.c | 10 +-- arch/arm/mach-exynos/include/mach/map.h | 21 ------- arch/arm/mach-exynos/platsmp.c | 22 ++++--- arch/arm/mach-exynos/pm.c | 41 ++++++++----- arch/arm/plat-samsung/cpu.c | 14 ----- arch/arm/plat-samsung/include/plat/cpu.h | 2 - arch/arm/plat-samsung/include/plat/map-s5p.h | 2 - 10 files changed, 47 insertions(+), 189 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.harch/arm/mach-exynos/Kconfig +1
-0@@ -16,6 +16,7 @@ menuconfig ARCH_EXYNOS select ARM_AMBA select ARM_GIC select COMMON_CLK_SAMSUNG + select EXYNOS_CHIPID select EXYNOS_THERMAL select EXYNOS_PMU select EXYNOS_SROMarch/arm/mach-exynos/common.h +0
-92@@ -14,97 +14,6 @@#include <linux/platform_data/cpuidle-exynos.h> -#define EXYNOS3250_SOC_ID 0xE3472000 -#define EXYNOS3_SOC_MASK 0xFFFFF000 - -#define EXYNOS4210_CPU_ID 0x43210000 -#define EXYNOS4212_CPU_ID 0x43220000 -#define EXYNOS4412_CPU_ID 0xE4412200 -#define EXYNOS4_CPU_MASK 0xFFFE0000 - -#define EXYNOS5250_SOC_ID 0x43520000 -#define EXYNOS5410_SOC_ID 0xE5410000 -#define EXYNOS5420_SOC_ID 0xE5420000 -#define EXYNOS5440_SOC_ID 0xE5440000 -#define EXYNOS5800_SOC_ID 0xE5422000 -#define EXYNOS5_SOC_MASK 0xFFFFF000 - -extern unsigned long samsung_cpu_id; - -#define IS_SAMSUNG_CPU (name, id, mask) \ -static inline int is_samsung_##name(void) \ -{ \ - return ((samsung_cpu_id & mask) == (id & mask)); \ -} - -IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK) -IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5420, EXYNOS5420_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5440, EXYNOS5440_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) - -#if defined(CONFIG_SOC_EXYNOS3250 ) -# define soc_is_exynos3250 () is_samsung_exynos3250() -#else -# define soc_is_exynos3250 () 0 -#endif - -#if defined(CONFIG_CPU_EXYNOS4210 ) -# define soc_is_exynos4210 () is_samsung_exynos4210() -#else -# define soc_is_exynos4210 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS4212 ) -# define soc_is_exynos4212 () is_samsung_exynos4212() -#else -# define soc_is_exynos4212 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS4412 ) -# define soc_is_exynos4412 () is_samsung_exynos4412() -#else -# define soc_is_exynos4412 () 0 -#endif - -#define EXYNOS4210_REV_0 (0x0) -#define EXYNOS4210_REV_1_0 (0x10) -#define EXYNOS4210_REV_1_1 (0x11) - -#if defined(CONFIG_SOC_EXYNOS5250 ) -# define soc_is_exynos5250 () is_samsung_exynos5250() -#else -# define soc_is_exynos5250 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5410 ) -# define soc_is_exynos5410 () is_samsung_exynos5410() -#else -# define soc_is_exynos5410 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5420 ) -# define soc_is_exynos5420 () is_samsung_exynos5420() -#else -# define soc_is_exynos5420 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5440 ) -# define soc_is_exynos5440 () is_samsung_exynos5440() -#else -# define soc_is_exynos5440 () 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5800 ) -# define soc_is_exynos5800 () is_samsung_exynos5800() -#else -# define soc_is_exynos5800 () 0 -#endif -extern u32 cp15_save_diag;extern u32 cp15_save_power;@@ -161,7 +70,6 @@ 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 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);arch/arm/mach-exynos/exynos.c +0
-31@@ -23,9 +23,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <plat/cpu.h> -#include "common.h" static struct platform_device exynos_cpuidle = {@@ -67,37 +64,9 @@ static void __init exynos_init_late(void)exynos_pm_init (); } -static int __init exynos_fdt_map_chipid (unsigned long node,const char *uname, -int depth,void *data) -{ -struct map_desc iodesc; -const __be32 *reg; -int len; - -if (!of_flat_dt_is_compatible (node,"samsung,exynos4210-chipid" ) && - !of_flat_dt_is_compatible (node,"samsung,exynos5440-clock" )) -return 0 ; - - reg =of_get_flat_dt_prop (node,"reg" , &len); -if (reg ==NULL || len != (sizeof (unsigned long ) *2 )) -return 0 ; - - iodesc.pfn =__phys_to_pfn (be32_to_cpu (reg[0 ])); - iodesc.length =be32_to_cpu (reg[1 ]) -1 ; - iodesc.virtual = (unsigned long )S5P_VA_CHIPID ; - iodesc.type =MT_DEVICE ; -iotable_init (&iodesc,1 ); -return 1 ; -} -static void __init exynos_init_io (void ) {debug_ll_io_init (); - -of_scan_flat_dt (exynos_fdt_map_chipid,NULL ); - -/* detect cpu id and rev. */ -s5p_init_cpu (S5P_VA_CHIPID ); }/* arch/arm/mach-exynos/firmware.c +5
-5@@ -44,7 +44,7 @@ static int exynos_do_idle(unsigned long mode)writel_relaxed (virt_to_phys (exynos_cpu_resume_ns), sysram_ns_base_addr +0x24 );writel_relaxed (EXYNOS_AFTR_MAGIC , sysram_ns_base_addr +0x20 ); -if (soc_is_exynos3250 ()) { +if (of_machine_is_compatible ("samsung,exynos3250" )) {flush_cache_all ();exynos_smc (SMC_CMD_SAVE ,OP_TYPE_CORE ,SMC_POWERSTATE_IDLE ,0 );@@ -65,7 +65,7 @@ static int exynos_cpu_boot(int cpu)* Exynos3250 doesn't need to send smc command for secondary CPU boot * because Exynos3250 removes WFE in secure mode. */ -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))return 0 ;/* @@ -73,7 +73,7 @@ static int exynos_cpu_boot(int cpu)* But, Exynos4212 has only one secondary CPU so second parameter * isn't used for informing secure firmware about CPU id. */ -if (soc_is_exynos4212 ()) +if (of_machine_is_compatible ("samsung,exynos4212" )) cpu =0 ;exynos_smc (SMC_CMD_CPU1BOOT , cpu,0 ,0 );@@ -94,7 +94,7 @@ static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)* additional offset for every CPU, with Exynos4412 being the only * exception. */ -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 * cpu;writel_relaxed (boot_addr, boot_reg);@@ -110,7 +110,7 @@ static int exynos_get_cpu_boot_addr(int cpu, unsigned long *boot_addr) boot_reg = sysram_ns_base_addr +0x1c ; -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 * cpu; *boot_addr =readl_relaxed (boot_reg);arch/arm/mach-exynos/include/mach/map.h deleted +0
-21@@ -1,21 +0,0 @@ -/* -* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ -* -* EXYNOS - Memory map definitions -* -* 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. -*/ - -#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 */ arch/arm/mach-exynos/platsmp.c +1
-2@@ -19,6 +19,7 @@#include <linux/smp.h> #include <linux/io.h> #include <linux/of_address.h> +#include <linux/sys_soc.h> #include <linux/soc/samsung/exynos-regs-pmu.h> #include <asm/cacheflush.h> @@ -27,8 +28,6 @@#include <asm/smp_scu.h> #include <asm/firmware.h> -#include <mach/map.h> -#include "common.h" extern void exynos4_secondary_startup (void );
arch/arm/mach-exynos/platsmp.c void exynos_cpu_power_down(int cpu) · line 96
Quoted 6 lines
arch/arm/mach-exynos/platsmp.c +2
-1@@ -93,7 +92,8 @@ void exynos_cpu_power_down(int cpu) {u32 core_conf; -if (cpu ==0 && (soc_is_exynos5420 () ||soc_is_exynos5800 ())) { +if (cpu ==0 && (of_machine_is_compatible ("samsung,exynos5420" ) || +of_machine_is_compatible ("samsung,exynos5800" ))) {
NACK
Please see:ca489c58ef0b ("ARM: EXYNOS: Don't use LDREX and STREX after disabling cache coherency")
Such cases has to be fixed in different way...
Quoted 63 lines
arch/arm/mach-exynos/platsmp.c +11
-5/* * Bypass power down for CPU0 during suspend. Check for * the SYS_PWR_REG value to decide if we are suspending @@ -120,7 +120,7 @@ void exynos_cpu_power_up(int cpu) {u32 core_conf =S5P_CORE_LOCAL_PWR_EN ; -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" )) core_conf |=S5P_CORE_AUTOWAKEUP_EN ; pmu_raw_writel(core_conf,@@ -168,9 +168,14 @@ int exynos_cluster_power_state(int cluster) S5P_CORE_LOCAL_PWR_EN); } +static struct soc_device_attribute exynos4210_rev11[] = { + { .soc_id ="EXYNOS4210" , .revision ="11" , }, + { }, +}; +static void __iomem *cpu_boot_reg_base (void ) { -if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_device_match (exynos4210_rev11))return pmu_base_addr +S5P_INFORM5 ;return sysram_base_addr; }@@ -182,9 +187,10 @@ static inline void __iomem *cpu_boot_reg(int cpu) boot_reg =cpu_boot_reg_base ();if (!boot_reg)return IOMEM_ERR_PTR (-ENODEV ); -if (soc_is_exynos4412 ()) +if (of_machine_is_compatible ("samsung,exynos4412" )) boot_reg +=4 *cpu; -else if (soc_is_exynos5420 () ||soc_is_exynos5800 ()) +else if (of_machine_is_compatible ("samsung,exynos5420" ) || +of_machine_is_compatible ("samsung,exynos5800" )) boot_reg +=4 ;return boot_reg; }@@ -356,7 +362,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)call_firmware_op (cpu_boot, core_id); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))dsb_sev ();else arch_send_wakeup_ipi_mask (cpumask_of (cpu));arch/arm/mach-exynos/pm.c +1
-0@@ -19,6 +19,7 @@#include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/sys_soc.h> #include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-pmu.h>
arch/arm/mach-exynos/pm.c line 36
Quoted 7 lines
arch/arm/mach-exynos/pm.c +4
-0@@ -29,20 +30,30 @@#include "common.h" +static struct soc_device_attribute exynos4210_rev11[] = { + { .soc_id ="EXYNOS4210" , .revision ="11" , }, + { }, +};
This (and all others) look like static const.
Quoted 125 lines
arch/arm/mach-exynos/pm.c +22
-14+ +static struct soc_device_attribute exynos4210_rev10[] = { + { .soc_id ="EXYNOS4210" , .revision ="10" , }, + { }, +}; +static inline void __iomem *exynos_boot_vector_addr (void ) { -if (samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_device_match (exynos4210_rev11))return pmu_base_addr +S5P_INFORM7 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (soc_device_match (exynos4210_rev10))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 (soc_device_match (exynos4210_rev11))return pmu_base_addr +S5P_INFORM6 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (soc_device_match (exynos4210_rev10))return sysram_base_addr +0x20 ;return pmu_base_addr +S5P_INFORM1 ; }@@ -122,11 +133,13 @@ int exynos_pm_central_resume(void) }/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ -static void exynos_set_wakeupmask (long mask) +static void exynos_set_wakeupmask (void ) { -pmu_raw_writel (mask,S5P_WAKEUP_MASK ); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" )) { +pmu_raw_writel (0x40003ffe ,S5P_WAKEUP_MASK );pmu_raw_writel (0x0 ,S5P_WAKEUP_MASK2 ); + }else +pmu_raw_writel (0x0000ff3e ,S5P_WAKEUP_MASK ); }static void exynos_cpu_set_boot_vector (long flags)@@ -140,7 +153,7 @@ static int exynos_aftr_finisher(unsigned long flags) {int ret; -exynos_set_wakeupmask (soc_is_exynos3250 () ?0x40003ffe :0x0000ff3e ); +exynos_set_wakeupmask ();/* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf (SYS_AFTR );@@ -163,7 +176,7 @@ void exynos_enter_aftr(void)cpu_pm_enter (); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))exynos_set_boot_flag (cpuid,C2_STATE );exynos_pm_central_suspend ();@@ -192,7 +205,7 @@ void exynos_enter_aftr(void)exynos_pm_central_resume (); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))exynos_clear_boot_flag (cpuid,C2_STATE );cpu_pm_exit ();@@ -263,7 +276,7 @@ abort:while (exynos_cpu_power_state (1 ) !=S5P_CORE_LOCAL_PWR_EN )cpu_relax (); -if (soc_is_exynos3250 ()) { +if (of_machine_is_compatible ("samsung,exynos3250" )) {while (!pmu_raw_readl (S5P_PMU_SPARE2 ) && !atomic_read (&cpu1_wakeup))cpu_relax ();@@ -285,7 +298,7 @@ abort:call_firmware_op (cpu_boot,1 ); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))dsb_sev ();else arch_send_wakeup_ipi_mask (cpumask_of (1 ));@@ -297,7 +310,7 @@ fail:static int exynos_wfi_finisher (unsigned long flags) { -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))flush_cache_all ();cpu_do_idle ();@@ -319,7 +332,7 @@ static int exynos_cpu1_powerdown(void)*/ exynos_cpu_power_down (1 ); -if (soc_is_exynos3250 ()) +if (of_machine_is_compatible ("samsung,exynos3250" ))pmu_raw_writel (0 ,S5P_PMU_SPARE2 ); ret =cpu_suspend (0 , exynos_wfi_finisher);arch/arm/plat-samsung/cpu.c +0
-6@@ -21,12 +21,6 @@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 ) { samsung_cpu_id =readl_relaxed (S3C_VA_SYS +0x118 );
arch/arm/plat-samsung/cpu.c void __init s3c64xx_init_cpu(void) · line 52
Quoted 10 lines
arch/arm/plat-samsung/cpu.c +0
-7@@ -43,11 +37,3 @@ void __init s3c64xx_init_cpu(void)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);
Actually I kind of liked the CPU ID. :) You won't find this in cpuinfo... How about leaving this for debug purposes?
Best regards,
Krzysztof
Quoted 30 lines
arch/arm/plat-samsung/cpu.c +0
-1-}arch/arm/plat-samsung/include/plat/cpu.h +0
-2@@ -115,8 +115,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); -extern unsigned int samsung_rev (void ); -extern void s3c24xx_init_uarts (struct s3c2410_uartcfg *cfg,int no);extern void s3c24xx_init_clocks (int xtal);arch/arm/plat-samsung/include/plat/map-s5p.h +0
-2@@ -13,8 +13,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)Signature · 1 line
2.7.4