[PATCH 1/3] ARM: zynq: Move common.h to generic location

[Michal Simek]

include/soc/zynq/ is the right location for this header
to be able to share information from this header with other
drivers which require it.

Signed-off-by: Michal Simek <***@xilinx.com>
---

arch/arm/mach-zynq/common.c | 2 +-
arch/arm/mach-zynq/hotplug.c | 2 +-
arch/arm/mach-zynq/platsmp.c | 2 +-
arch/arm/mach-zynq/slcr.c | 2 +-
{arch/arm/mach-zynq => include/soc/zynq}/common.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename {arch/arm/mach-zynq => include/soc/zynq}/common.h (100%)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 31a6fa40ba37..ead1935aac79 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -42,7 +42,7 @@
#include <asm/system_info.h>
#include <asm/hardware/cache-l2x0.h>

-#include "common.h"
+#include <soc/zynq/common.h>

#define ZYNQ_DEVCFG_MCTRL 0x80
#define ZYNQ_DEVCFG_PS_VERSION_SHIFT 28
diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c
index 5052c70326e4..95d74f68032a 100644
--- a/arch/arm/mach-zynq/hotplug.c
+++ b/arch/arm/mach-zynq/hotplug.c
@@ -16,7 +16,7 @@

#include <asm/cacheflush.h>
#include <asm/cp15.h>
-#include "common.h"
+#include <soc/zynq/common.h>

static inline void zynq_cpu_enter_lowpower(void)
{
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index abc82ef085c1..56581ccd7c14 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -25,7 +25,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_scu.h>
#include <linux/irqchip/arm-gic.h>
-#include "common.h"
+#include <soc/zynq/common.h>

/*
* Store number of cores in the system
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index c43a2d16e223..cb7c46165728 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -19,7 +19,7 @@
#include <linux/of_address.h>
#include <linux/regmap.h>
#include <linux/clk/zynq.h>
-#include "common.h"
+#include <soc/zynq/common.h>

/* register offsets */
#define SLCR_UNLOCK_OFFSET 0x8 /* SCLR unlock register */
diff --git a/arch/arm/mach-zynq/common.h b/include/soc/zynq/common.h
similarity index 100%
rename from arch/arm/mach-zynq/common.h
rename to include/soc/zynq/common.h
--
1.8.2.3

[Michal Simek]

Enable generic allocator by default because it is used by OCMC driver.

Signed-off-by: Michal Simek <***@xilinx.com>
---

arch/arm/mach-zynq/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index aaa5162c1509..d447adefd397 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -5,6 +5,7 @@ config ARCH_ZYNQ
select ARM_GIC
select ARM_GLOBAL_TIMER if !CPU_FREQ
select CADENCE_TTC_TIMER
+ select GENERIC_ALLOCATOR
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select ICST
--
1.8.2.3

[Michal Simek]

Get OCM configuration from SLCR.

Signed-off-by: Michal Simek <***@xilinx.com>
---

arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
include/soc/zynq/common.h | 1 +
2 files changed, 16 insertions(+)

diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index cb7c46165728..0c3e45090c09 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -27,6 +27,7 @@
#define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Control */
#define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
#define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
+#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */

#define SLCR_UNLOCK_MAGIC 0xDF0D
#define SLCR_A9_CPU_CLKSTOP 0x10
@@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
}

/**
+ * zynq_slcr_get_ocm_config - Get SLCR OCM config
+ *
+ * Return: OCM config bits
+ */
+u32 zynq_slcr_get_ocm_config(void)
+{
+ u32 val;
+
+ zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
+
+ return val;
+}
+
+/**
* zynq_slcr_cpu_start - Start cpu
* @cpu: cpu number
*/
diff --git a/include/soc/zynq/common.h b/include/soc/zynq/common.h
index f652f0a884a6..fc6b1ed37455 100644
--- a/include/soc/zynq/common.h
+++ b/include/soc/zynq/common.h
@@ -25,6 +25,7 @@ extern void zynq_slcr_system_reset(void);
extern void zynq_slcr_cpu_stop(int cpu);
extern void zynq_slcr_cpu_start(int cpu);
extern u32 zynq_slcr_get_device_id(void);
+extern u32 zynq_slcr_get_ocm_config(void);

#ifdef CONFIG_SMP
extern void secondary_startup(void);
--
1.8.2.3

[Sören Brinkmann]

Hi Michal,

Post by Michal Simek
Get OCM configuration from SLCR.
=20
---
=20
arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
include/soc/zynq/common.h | 1 +
2 files changed, 16 insertions(+)
=20
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index cb7c46165728..0c3e45090c09 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -27,6 +27,7 @@
#define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Cont=

rol */

Post by Michal Simek
#define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
#define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
+#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */
=20
#define SLCR_UNLOCK_MAGIC 0xDF0D
#define SLCR_A9_CPU_CLKSTOP 0x10
@@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
}
=20
/**
+ * zynq_slcr_get_ocm_config - Get SLCR OCM config
+ *
+ * Return: OCM config bits
+ */
+u32 zynq_slcr_get_ocm_config(void)
+{
+ u32 val;
+
+ zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
+
+ return val;
+}

a different idea would be, instead of creating this specific API call
for the OCMC to let the OCMC driver use regmap and making git a subnode
of the SLCR.
In the long run that might be a better option otherwise we'll end up
with a whole bunch of zynq_slcr_get_foo() calls for each driver that
needs to read an SLCR register.

Thanks,
S=C3=B6ren

[Michal Simek]

Hi Soren,

Post by Sören Brinkmann
Hi Michal,

Post by Michal Simek
Get OCM configuration from SLCR.
---
arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
include/soc/zynq/common.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index cb7c46165728..0c3e45090c09 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -27,6 +27,7 @@
#define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Control */
#define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
#define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
+#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */
#define SLCR_UNLOCK_MAGIC 0xDF0D
#define SLCR_A9_CPU_CLKSTOP 0x10
@@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
}
/**
+ * zynq_slcr_get_ocm_config - Get SLCR OCM config
+ *
+ * Return: OCM config bits
+ */
+u32 zynq_slcr_get_ocm_config(void)
+{
+ u32 val;
+
+ zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
+
+ return val;
+}

a different idea would be, instead of creating this specific API call
for the OCMC to let the OCMC driver use regmap and making git a subnode
of the SLCR.
In the long run that might be a better option otherwise we'll end up
with a whole bunch of zynq_slcr_get_foo() calls for each driver that
needs to read an SLCR register.

yes using regmap is also possible and I know that.

Thanks,
Michal

[Sören Brinkmann]

Post by Michal Simek
include/soc/zynq/ is the right location for this header
to be able to share information from this header with other
drivers which require it.
=20
---
=20
arch/arm/mach-zynq/common.c | 2 +-
arch/arm/mach-zynq/hotplug.c | 2 +-
arch/arm/mach-zynq/platsmp.c | 2 +-
arch/arm/mach-zynq/slcr.c | 2 +-

In the 3.18 merge window arch/arm/mach-zynq/pm.c had been added which i=
s
not covered in this version of the patch.

S=C3=B6ren

[Michal Simek]

Post by Michal Simek
include/soc/zynq/ is the right location for this header
to be able to share information from this header with other
drivers which require it.
---
arch/arm/mach-zynq/common.c | 2 +-
arch/arm/mach-zynq/hotplug.c | 2 +-
arch/arm/mach-zynq/platsmp.c | 2 +-
arch/arm/mach-zynq/slcr.c | 2 +-

In the 3.18 merge window arch/arm/mach-zynq/pm.c had been added which is
not covered in this version of the patch.

Thanks will send v2.
Michal