sunxi: add gtbus-initialisation for sun9i

On sun9i, the GTBUS manages transaction priority and bandwidth
for multiple read ports when accessing DRAM. The initialisation
mirrors the settings from Allwinner's boot0 for now, even though
this may not be optimal for all applications (e.g. headless
systems might want to give priority to IO modules).

Adding a common callout to gtbus_init() from the SPL clock init
with a weakly defined implementation in sunxi/clock.c to fallback
to for platforms that don't require this.

[wens@csie.org: Moved gtbus_sun9i.c to arch/arm/mach-sunxi/; style cleanup]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h
index acbc94f4c3b83f347a6dd9da07aa022dda316e1c..ba18a0f551ad8cc56e798566800deb1acff33ed9 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h
@@ -23,6 +23,8 @@
 #define SUNXI_NFC_BASE                 (REGS_AHB0_BASE + 0x3000)
 #define SUNXI_TSC_BASE                 (REGS_AHB0_BASE + 0x4000)
 
+#define SUNXI_GTBUS_BASE               (REGS_AHB0_BASE + 0x9000)
+
 #define SUNXI_MMC0_BASE                        (REGS_AHB0_BASE + 0x0f000)
 #define SUNXI_MMC1_BASE                        (REGS_AHB0_BASE + 0x10000)
 #define SUNXI_MMC2_BASE                        (REGS_AHB0_BASE + 0x11000)

diff --git a/arch/arm/include/asm/arch-sunxi/gtbus.h b/arch/arm/include/asm/arch-sunxi/gtbus.h
new file mode 100644 (file)
index 0000000..b8308d5
--- /dev/null
+++ b/arch/arm/include/asm/arch-sunxi/gtbus.h
@@ -0,0 +1,21 @@
+/*
+ * GTBUS initialisation
+ *
+ * (C) Copyright 2016 Theobroma Systems Design und Consulting GmbH
+ *                    Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _SUNXI_GTBUS_H
+#define _SUNXI_GTBUS_H
+
+#if defined(CONFIG_MACH_SUN9I)
+#include <asm/arch/gtbus_sun9i.h>
+#endif
+
+#ifndef __ASSEMBLY__
+void gtbus_init(void);
+#endif
+
+#endif

diff --git a/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h b/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h
new file mode 100644 (file)
index 0000000..fd50826
--- /dev/null
+++ b/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h
@@ -0,0 +1,92 @@
+/*
+ * GTBUS initialisation for sun9i
+ *
+ * (C) Copyright 2016 Theobroma Systems Design und Consulting GmbH
+ *                    Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _SUNXI_GTBUS_SUN9I_H
+#define _SUNXI_GTBUS_SUN9I_H
+
+#include <linux/types.h>
+
+struct sunxi_gtbus_reg {
+       u32 mst_cfg[36];           /* 0x000 */
+       u8  reserved1[0x70];       /* 0x090 */
+       u32 bw_wdw_cfg;            /* 0x100 */
+       u32 mst_read_prio_cfg[2];  /* 0x104 */
+       u32 lvl2_mst_cfg;          /* 0x10c */
+       u32 sw_clk_on;             /* 0x110 */
+       u32 sw_clk_off;            /* 0x114 */
+       u32 pmu_mst_en;            /* 0x118 */
+       u32 pmu_cfg;               /* 0x11c */
+       u32 pmu_cnt[19];           /* 0x120 */
+       u32 reserved2[0x94];       /* 0x16c */
+       u32 cci400_config[3];      /* 0x200 */
+       u32 cci400_status[2];      /* 0x20c */
+};
+
+/* for register GT_MST_CFG_REG(n) */
+#define GT_ENABLE_REQ           (1<<31) /* clock on */
+#define GT_DISABLE_REQ          (1<<30) /* clock off */
+#define GT_QOS_SHIFT            28
+#define GT_THD1_SHIFT           16
+#define GT_REQN_MAX             0xf /* max no master requests in one cycle */
+#define GT_REQN_SHIFT           12
+#define GT_THD0_SHIFT           0
+
+#define GT_QOS_MAX              0x3
+#define GT_THD_MAX              0xfff
+#define GT_BW_WDW_MAX           0xffff
+
+/* mst_read_prio_cfg */
+#define GT_PRIO_LOW     0
+#define GT_PRIO_HIGH    1
+
+/* GTBUS port ids */
+#define GT_PORT_CPUM1   0
+#define GT_PORT_CPUM2   1
+#define GT_PORT_SATA    2
+#define        GT_PORT_USB3    3
+#define        GT_PORT_FE0     4
+#define        GT_PORT_BE1     5
+#define        GT_PORT_BE2     6
+#define        GT_PORT_IEP0    7
+#define        GT_PORT_FE1     8
+#define        GT_PORT_BE0     9
+#define        GT_PORT_FE2     10
+#define        GT_PORT_IEP1    11
+#define        GT_PORT_VED     12
+#define        GT_PORT_VEE     13
+#define        GT_PORT_FD      14
+#define        GT_PORT_CSI     15
+#define        GT_PORT_MP      16
+#define        GT_PORT_HSI     17
+#define        GT_PORT_SS      18
+#define        GT_PORT_TS      19
+#define        GT_PORT_DMA     20
+#define        GT_PORT_NDFC0   21
+#define        GT_PORT_NDFC1   22
+#define        GT_PORT_CPUS    23
+#define        GT_PORT_TH      24
+#define        GT_PORT_GMAC    25
+#define        GT_PORT_USB0    26
+#define        GT_PORT_MSTG0   27
+#define        GT_PORT_MSTG1   28
+#define        GT_PORT_MSTG2   29
+#define        GT_PORT_MSTG3   30
+#define        GT_PORT_USB1    31
+#define        GT_PORT_GPU0    32
+#define        GT_PORT_GPU1    33
+#define        GT_PORT_USB2    34
+#define        GT_PORT_CPUM0   35
+
+#define GP_MST_CFG_DEFAULT \
+       ((GT_QOS_MAX << GT_QOS_SHIFT)   | \
+        (GT_THD_MAX << GT_THD1_SHIFT)  | \
+        (GT_REQN_MAX << GT_REQN_SHIFT) | \
+        (GT_THD_MAX << GT_THD0_SHIFT))
+
+#endif

diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile
index 9d07d6b84c1ea98c90072d5e1ffa1e8ce9b7421d..e73114ee642c22861e567e69eff12a676a56d82f 100644 (file)
--- a/arch/arm/mach-sunxi/Makefile
+++ b/arch/arm/mach-sunxi/Makefile
@@ -32,7 +32,7 @@ obj-y                         += clock_sun8i_a83t.o
 else
 obj-$(CONFIG_MACH_SUN8I)       += clock_sun6i.o
 endif
-obj-$(CONFIG_MACH_SUN9I)       += clock_sun9i.o
+obj-$(CONFIG_MACH_SUN9I)       += clock_sun9i.o gtbus_sun9i.o
 
 obj-$(CONFIG_AXP152_POWER)     += pmic_bus.o
 obj-$(CONFIG_AXP209_POWER)     += pmic_bus.o

diff --git a/arch/arm/mach-sunxi/clock.c b/arch/arm/mach-sunxi/clock.c
index 0b8fc94711c8cc5788073422f89d592e34251609..e6f53f91e63a5eedf3cad1764d5f1d6696db6668 100644 (file)
--- a/arch/arm/mach-sunxi/clock.c
+++ b/arch/arm/mach-sunxi/clock.c
@@ -13,16 +13,22 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
+#include <asm/arch/gtbus.h>
 #include <asm/arch/sys_proto.h>
 
 __weak void clock_init_sec(void)
 {
 }
 
+__weak void gtbus_init(void)
+{
+}
+
 int clock_init(void)
 {
 #ifdef CONFIG_SPL_BUILD
        clock_init_safe();
+       gtbus_init();
 #endif
        clock_init_uart();
        clock_init_sec();

diff --git a/arch/arm/mach-sunxi/gtbus_sun9i.c b/arch/arm/mach-sunxi/gtbus_sun9i.c
new file mode 100644 (file)
index 0000000..c20d3c0
--- /dev/null
+++ b/arch/arm/mach-sunxi/gtbus_sun9i.c
@@ -0,0 +1,48 @@
+/*
+ * GTBUS initialisation for sun9i
+ *
+ * (C) Copyright 2016 Theobroma Systems Design und Consulting GmbH
+ *                    Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/gtbus_sun9i.h>
+#include <asm/arch/sys_proto.h>
+
+#ifdef CONFIG_SPL_BUILD
+
+void gtbus_init(void)
+{
+       struct sunxi_gtbus_reg * const gtbus =
+               (struct sunxi_gtbus_reg *)SUNXI_GTBUS_BASE;
+
+       /*
+        * We use the same setting that Allwinner used in Boot0 for now.
+        * It may be advantageous to adjust these for various workloads
+        * (e.g. headless use cases that focus on IO throughput).
+        */
+       writel((GT_PRIO_HIGH << GT_PORT_FE0) |
+              (GT_PRIO_HIGH << GT_PORT_BE1) |
+              (GT_PRIO_HIGH << GT_PORT_BE2) |
+              (GT_PRIO_HIGH << GT_PORT_IEP0) |
+              (GT_PRIO_HIGH << GT_PORT_FE1) |
+              (GT_PRIO_HIGH << GT_PORT_BE0) |
+              (GT_PRIO_HIGH << GT_PORT_FE2) |
+              (GT_PRIO_HIGH << GT_PORT_IEP1),
+              &gtbus->mst_read_prio_cfg[0]);
+
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_FE0]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_FE0]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_BE1]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_BE2]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_IEP0]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_FE1]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_BE0]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_FE2]);
+       writel(GP_MST_CFG_DEFAULT, &gtbus->mst_cfg[GT_PORT_IEP1]);
+}
+
+#endif