[PATCH v4 0/3] Add SMP/SMT support for Ingenic sysost driver.

[PATCH v4 0/3] Add SMP/SMT support for Ingenic sysost driver.

[周琰杰 (Zhou Yanjie)]

1.On the hardware of X2000 SoC, the OST has been split into
  two parts, two 32bit timers for clockevent and one 64bit
  timer for clocksource (with different addresses), so it
  not appropriate to use only one "ingenic,x2000-ost", just
  remove it, then introduce "ingenic,x2000-ost32" and
  "ingenic,x2000-ost64".
2.The OST in Ingenic XBurst®2 SoCs has a global timer and
  up to 16 event timers, add support for the event timers.
3.Add dt-bindings and compatible strings for the X1600 SoC,
  the X1700 SoC, the X1830 SoC, the X2000 SoC, the X2500 SoC.

周琰杰 (Zhou Yanjie) (3):
  dt-bindings: timer: Remove unreasonable binding.
  dt-bindings: timer: Add bindings for new Ingenic SoCs.
  clocksource: Ingenic: Add SMP/SMT support for sysost driver.

 .../devicetree/bindings/timer/ingenic,sysost.yaml  |   8 +-
 drivers/clocksource/ingenic-sysost.c               | 405 ++++++++++++++++-----
 2 files changed, 313 insertions(+), 100 deletions(-)

-- 
2.7.4

[PATCH v4 1/3] dt-bindings: timer: Remove unreasonable binding.

[周琰杰 (Zhou Yanjie)]

On the hardware of X2000 SoC, the OST has been split into two parts,
two 32bit timers for clockevent and one 64bit timer for clocksource
(with different addresses), so it not appropriate to use only one
"ingenic,x2000-ost", just remove it, "ingenic,x2000-ost32" and
"ingenic,x2000-ost64" will be introduced in a later commit.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Acked-by: Rob Herring <robh@kernel.org>
---

Notes:
    v2:
    New patch.
    
    v2->v3:
    Add Rob Herring's Acked-by.
    
    v3->v4:
    No change.

 Documentation/devicetree/bindings/timer/ingenic,sysost.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml b/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
index 98648bf..ea3f9c4 100644
--- a/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
+++ b/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
@@ -20,7 +20,6 @@ properties:
   compatible:
     enum:
       - ingenic,x1000-ost
-      - ingenic,x2000-ost
 
   reg:
     maxItems: 1
-- 
2.7.4

[PATCH v4 2/3] dt-bindings: timer: Add bindings for new Ingenic SoCs.

[周琰杰 (Zhou Yanjie)]

Add the OST bindings for the X1600 SoC, the X1700 SoC, the X1830 SoC,
the X2000 SoC and the X2500 SoC from Ingenic.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Acked-by: Rob Herring <robh@kernel.org>
---

Notes:
    v1->v2:
    Remove imcompatible change.
    
    v2->v3:
    Add Rob Herring's Acked-by.
    
    v3->v4:
    Add bindings for the X1700 SoC.

 Documentation/devicetree/bindings/timer/ingenic,sysost.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml b/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
index ea3f9c4..1a59ba7 100644
--- a/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
+++ b/Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
@@ -20,6 +20,13 @@ properties:
   compatible:
     enum:
       - ingenic,x1000-ost
+      - ingenic,x1600-ost
+      - ingenic,x1700-ost
+      - ingenic,x1830-ost
+      - ingenic,x2000-ost64
+      - ingenic,x2000-ost32
+      - ingenic,x2500-ost64
+      - ingenic,x2500-ost32
 
   reg:
     maxItems: 1
-- 
2.7.4

[PATCH v4 3/3] clocksource: Ingenic: Add SMP/SMT support for sysost driver.

[周琰杰 (Zhou Yanjie)]

1.The OST in Ingenic XBurst®2 SoCs has a global timer and
  up to 16 event timers, add support for the event timers.
2.Add compatible strings for the X1600 SoC, the X1700 SoC,
  the X1830 SoC, the X2000 SoC, and the X2500 SoC.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---

Notes:
    v1->v2:
    No change.
    
    v2->v3:
    No change.
    
    v3->v4:
    Add compatible strings for the X1700 SoC.

 drivers/clocksource/ingenic-sysost.c | 405 ++++++++++++++++++++++++++---------
 1 file changed, 306 insertions(+), 99 deletions(-)

diff --git a/drivers/clocksource/ingenic-sysost.c b/drivers/clocksource/ingenic-sysost.c
index cb6fc2f..cf9bec9 100644
--- a/drivers/clocksource/ingenic-sysost.c
+++ b/drivers/clocksource/ingenic-sysost.c
@@ -14,6 +14,8 @@
 #include <linux/mfd/syscon.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/overflow.h>
 #include <linux/sched_clock.h>
 #include <linux/slab.h>
 #include <linux/syscore_ops.h>
@@ -22,10 +24,14 @@
 
 /* OST register offsets */
 #define OST_REG_OSTCCR			0x00
+#define OST_REG_OSTER			0x04
 #define OST_REG_OSTCR			0x08
 #define OST_REG_OSTFR			0x0c
+#define OST_REG_OSTCNTH			0x0c
 #define OST_REG_OSTMR			0x10
+#define OST_REG_OSTCNTL			0x10
 #define OST_REG_OST1DFR			0x14
+#define OST_REG_OSTCNTB			0x14
 #define OST_REG_OST1CNT			0x18
 #define OST_REG_OST2CNTL		0x20
 #define OST_REG_OSTCNT2HBUF		0x24
@@ -54,13 +60,26 @@
 #define OSTECR_OST1ENC			BIT(0)
 #define OSTECR_OST2ENC			BIT(1)
 
+enum ingenic_ost_version {
+	ID_X1000,
+	ID_X2000,
+};
+
 struct ingenic_soc_info {
+	enum ingenic_ost_version version;
+	const struct ingenic_ost_clk_info *clk_info;
+
 	unsigned int num_channels;
+	unsigned int base_offset;
+
+	bool has_global_timer;
+	bool has_event_timer;
 };
 
 struct ingenic_ost_clk_info {
 	struct clk_init_data init_data;
-	u8 ostccr_reg;
+	unsigned int idx;
+	u32 ostcntl_reg;
 };
 
 struct ingenic_ost_clk {
@@ -70,19 +89,33 @@ struct ingenic_ost_clk {
 	const struct ingenic_ost_clk_info *info;
 };
 
+struct ingenic_ost_timer {
+	void __iomem *base;
+	unsigned int cpu;
+	unsigned int channel;
+	struct clock_event_device cevt;
+	struct ingenic_ost *ost;
+	struct clk *clk;
+	char name[20];
+};
+
 struct ingenic_ost {
 	void __iomem *base;
 	const struct ingenic_soc_info *soc_info;
-	struct clk *clk, *percpu_timer_clk, *global_timer_clk;
-	struct clock_event_device cevt;
+	struct clk *clk, *global_timer_clk;
+	struct device_node *np;
 	struct clocksource cs;
-	char name[20];
 
 	struct clk_hw_onecell_data *clocks;
+	struct ingenic_ost_timer __percpu *timers;
+
+	int irq;
 };
 
 static struct ingenic_ost *ingenic_ost;
 
+static void __iomem *ost64_ostcntl_reg __read_mostly;
+
 static inline struct ingenic_ost_clk *to_ost_clk(struct clk_hw *hw)
 {
 	return container_of(hw, struct ingenic_ost_clk, hw);
@@ -93,9 +126,10 @@ static unsigned long ingenic_ost_percpu_timer_recalc_rate(struct clk_hw *hw,
 {
 	struct ingenic_ost_clk *ost_clk = to_ost_clk(hw);
 	const struct ingenic_ost_clk_info *info = ost_clk->info;
+	struct ingenic_ost_timer *timer = per_cpu_ptr(ost_clk->ost->timers, info->idx);
 	unsigned int prescale;
 
-	prescale = readl(ost_clk->ost->base + info->ostccr_reg);
+	prescale = readl(timer->base + OST_REG_OSTCCR);
 
 	prescale = FIELD_GET(OSTCCR_PRESCALE1_MASK, prescale);
 
@@ -106,12 +140,14 @@ static unsigned long ingenic_ost_global_timer_recalc_rate(struct clk_hw *hw,
 		unsigned long parent_rate)
 {
 	struct ingenic_ost_clk *ost_clk = to_ost_clk(hw);
-	const struct ingenic_ost_clk_info *info = ost_clk->info;
 	unsigned int prescale;
 
-	prescale = readl(ost_clk->ost->base + info->ostccr_reg);
+	prescale = readl(ost_clk->ost->base + OST_REG_OSTCCR);
 
-	prescale = FIELD_GET(OSTCCR_PRESCALE2_MASK, prescale);
+	if (ost_clk->ost->soc_info->version >= ID_X2000)
+		prescale = FIELD_GET(OSTCCR_PRESCALE1_MASK, prescale);
+	else
+		prescale = FIELD_GET(OSTCCR_PRESCALE2_MASK, prescale);
 
 	return parent_rate >> (prescale * 2);
 }
@@ -146,13 +182,14 @@ static int ingenic_ost_percpu_timer_set_rate(struct clk_hw *hw, unsigned long re
 {
 	struct ingenic_ost_clk *ost_clk = to_ost_clk(hw);
 	const struct ingenic_ost_clk_info *info = ost_clk->info;
+	struct ingenic_ost_timer *timer = per_cpu_ptr(ost_clk->ost->timers, info->idx);
 	u8 prescale = ingenic_ost_get_prescale(parent_rate, req_rate);
 	int val;
 
-	val = readl(ost_clk->ost->base + info->ostccr_reg);
+	val = readl(timer->base + OST_REG_OSTCCR);
 	val &= ~OSTCCR_PRESCALE1_MASK;
 	val |= FIELD_PREP(OSTCCR_PRESCALE1_MASK, prescale);
-	writel(val, ost_clk->ost->base + info->ostccr_reg);
+	writel(val, timer->base + OST_REG_OSTCCR);
 
 	return 0;
 }
@@ -161,14 +198,20 @@ static int ingenic_ost_global_timer_set_rate(struct clk_hw *hw, unsigned long re
 		unsigned long parent_rate)
 {
 	struct ingenic_ost_clk *ost_clk = to_ost_clk(hw);
-	const struct ingenic_ost_clk_info *info = ost_clk->info;
 	u8 prescale = ingenic_ost_get_prescale(parent_rate, req_rate);
 	int val;
 
-	val = readl(ost_clk->ost->base + info->ostccr_reg);
-	val &= ~OSTCCR_PRESCALE2_MASK;
-	val |= FIELD_PREP(OSTCCR_PRESCALE2_MASK, prescale);
-	writel(val, ost_clk->ost->base + info->ostccr_reg);
+	val = readl(ost_clk->ost->base + OST_REG_OSTCCR);
+
+	if (ost_clk->ost->soc_info->version >= ID_X2000) {
+		val &= ~OSTCCR_PRESCALE1_MASK;
+		val |= FIELD_PREP(OSTCCR_PRESCALE1_MASK, prescale);
+	} else {
+		val &= ~OSTCCR_PRESCALE2_MASK;
+		val |= FIELD_PREP(OSTCCR_PRESCALE2_MASK, prescale);
+	}
+
+	writel(val, ost_clk->ost->base + OST_REG_OSTCCR);
 
 	return 0;
 }
@@ -188,15 +231,15 @@ static const struct clk_ops ingenic_ost_global_timer_ops = {
 static const char * const ingenic_ost_clk_parents[] = { "ext" };
 
 static const struct ingenic_ost_clk_info x1000_ost_clk_info[] = {
-	[OST_CLK_PERCPU_TIMER] = {
+	[OST_CLK_EVENT_TIMER] = {
 		.init_data = {
-			.name = "percpu timer",
+			.name = "event timer",
 			.parent_names = ingenic_ost_clk_parents,
 			.num_parents = ARRAY_SIZE(ingenic_ost_clk_parents),
 			.ops = &ingenic_ost_percpu_timer_ops,
 			.flags = CLK_SET_RATE_UNGATE,
 		},
-		.ostccr_reg = OST_REG_OSTCCR,
+		.idx = 0,
 	},
 
 	[OST_CLK_GLOBAL_TIMER] = {
@@ -207,18 +250,50 @@ static const struct ingenic_ost_clk_info x1000_ost_clk_info[] = {
 			.ops = &ingenic_ost_global_timer_ops,
 			.flags = CLK_SET_RATE_UNGATE,
 		},
-		.ostccr_reg = OST_REG_OSTCCR,
+		.ostcntl_reg = OST_REG_OST2CNTL,
 	},
 };
 
-static u64 notrace ingenic_ost_global_timer_read_cntl(void)
-{
-	struct ingenic_ost *ost = ingenic_ost;
-	unsigned int count;
+static const struct ingenic_ost_clk_info x2000_ost32_clk_info[] = {
+	[OST_CLK_EVENT_TIMER0] = {
+		.init_data = {
+			.name = "event timer0",
+			.parent_names = ingenic_ost_clk_parents,
+			.num_parents = ARRAY_SIZE(ingenic_ost_clk_parents),
+			.ops = &ingenic_ost_percpu_timer_ops,
+			.flags = CLK_SET_RATE_UNGATE,
+		},
+		.idx = 0,
+	},
+
+	[OST_CLK_EVENT_TIMER1] = {
+		.init_data = {
+			.name = "event timer1",
+			.parent_names = ingenic_ost_clk_parents,
+			.num_parents = ARRAY_SIZE(ingenic_ost_clk_parents),
+			.ops = &ingenic_ost_percpu_timer_ops,
+			.flags = CLK_SET_RATE_UNGATE,
+		},
+		.idx = 1,
+	},
+};
 
-	count = readl(ost->base + OST_REG_OST2CNTL);
+static const struct ingenic_ost_clk_info x2000_ost64_clk_info[] = {
+	[OST_CLK_GLOBAL_TIMER] = {
+		.init_data = {
+			.name = "global timer",
+			.parent_names = ingenic_ost_clk_parents,
+			.num_parents = ARRAY_SIZE(ingenic_ost_clk_parents),
+			.ops = &ingenic_ost_global_timer_ops,
+			.flags = CLK_SET_RATE_UNGATE,
+		},
+		.ostcntl_reg = OST_REG_OSTCNTL,
+	},
+};
 
-	return count;
+static u64 notrace ingenic_ost_global_timer_read_cntl(void)
+{
+	return readl(ost64_ostcntl_reg);
 }
 
 static u64 notrace ingenic_ost_clocksource_read(struct clocksource *cs)
@@ -226,16 +301,21 @@ static u64 notrace ingenic_ost_clocksource_read(struct clocksource *cs)
 	return ingenic_ost_global_timer_read_cntl();
 }
 
-static inline struct ingenic_ost *to_ingenic_ost(struct clock_event_device *evt)
+static inline struct ingenic_ost_timer *
+to_ingenic_ost_timer(struct clock_event_device *evt)
 {
-	return container_of(evt, struct ingenic_ost, cevt);
+	return container_of(evt, struct ingenic_ost_timer, cevt);
 }
 
 static int ingenic_ost_cevt_set_state_shutdown(struct clock_event_device *evt)
 {
-	struct ingenic_ost *ost = to_ingenic_ost(evt);
+	struct ingenic_ost_timer *timer = to_ingenic_ost_timer(evt);
+	struct ingenic_ost *ost = timer->ost;
 
-	writel(OSTECR_OST1ENC, ost->base + OST_REG_OSTECR);
+	if (ost->soc_info->version >= ID_X2000)
+		writel(0, timer->base + OST_REG_OSTER);
+	else
+		writel(OSTECR_OST1ENC, timer->base + OST_REG_OSTECR);
 
 	return 0;
 }
@@ -243,26 +323,34 @@ static int ingenic_ost_cevt_set_state_shutdown(struct clock_event_device *evt)
 static int ingenic_ost_cevt_set_next(unsigned long next,
 				     struct clock_event_device *evt)
 {
-	struct ingenic_ost *ost = to_ingenic_ost(evt);
-
-	writel((u32)~OSTFR_FFLAG, ost->base + OST_REG_OSTFR);
-	writel(next, ost->base + OST_REG_OST1DFR);
-	writel(OSTCR_OST1CLR, ost->base + OST_REG_OSTCR);
-	writel(OSTESR_OST1ENS, ost->base + OST_REG_OSTESR);
-	writel((u32)~OSTMR_FMASK, ost->base + OST_REG_OSTMR);
+	struct ingenic_ost_timer *timer = to_ingenic_ost_timer(evt);
+	struct ingenic_ost *ost = timer->ost;
+
+	writel((u32)~OSTFR_FFLAG, timer->base + OST_REG_OSTFR);
+	writel(next, timer->base + OST_REG_OST1DFR);
+	writel(OSTCR_OST1CLR, timer->base + OST_REG_OSTCR);
+
+	if (ost->soc_info->version >= ID_X2000) {
+		writel(OSTESR_OST1ENS, timer->base + OST_REG_OSTER);
+	} else {
+		writel(OSTESR_OST1ENS, timer->base + OST_REG_OSTESR);
+		writel((u32)~OSTMR_FMASK, timer->base + OST_REG_OSTMR);
+	}
 
 	return 0;
 }
 
 static irqreturn_t ingenic_ost_cevt_cb(int irq, void *dev_id)
 {
-	struct clock_event_device *evt = dev_id;
-	struct ingenic_ost *ost = to_ingenic_ost(evt);
+	struct ingenic_ost_timer *timer = dev_id;
+	struct ingenic_ost *ost = timer->ost;
 
-	writel(OSTECR_OST1ENC, ost->base + OST_REG_OSTECR);
+	if (ost->soc_info->version >= ID_X2000)
+		writel(0, timer->base + OST_REG_OSTER);
+	else
+		writel(OSTECR_OST1ENC, timer->base + OST_REG_OSTECR);
 
-	if (evt->event_handler)
-		evt->event_handler(evt);
+	timer->cevt.event_handler(&timer->cevt);
 
 	return IRQ_HANDLED;
 }
@@ -272,6 +360,7 @@ static int __init ingenic_ost_register_clock(struct ingenic_ost *ost,
 			struct clk_hw_onecell_data *clocks)
 {
 	struct ingenic_ost_clk *ost_clk;
+	struct ingenic_ost_timer *timer;
 	int val, err;
 
 	ost_clk = kzalloc(sizeof(*ost_clk), GFP_KERNEL);
@@ -283,10 +372,26 @@ static int __init ingenic_ost_register_clock(struct ingenic_ost *ost,
 	ost_clk->info = info;
 	ost_clk->ost = ost;
 
-	/* Reset clock divider */
-	val = readl(ost->base + info->ostccr_reg);
-	val &= ~(OSTCCR_PRESCALE1_MASK | OSTCCR_PRESCALE2_MASK);
-	writel(val, ost->base + info->ostccr_reg);
+	if (ost->soc_info->has_event_timer) {
+		timer = per_cpu_ptr(ost->timers, info->idx);
+
+		/* Reset clock divider */
+		val = readl(timer->base + OST_REG_OSTCCR);
+		val &= ~(OSTCCR_PRESCALE1_MASK);
+		writel(val, timer->base + OST_REG_OSTCCR);
+	}
+
+	if (ost->soc_info->has_global_timer) {
+		/* Reset clock divider */
+		val = readl(ost->base + OST_REG_OSTCCR);
+
+		if (ost_clk->ost->soc_info->version >= ID_X2000)
+			val &= ~OSTCCR_PRESCALE1_MASK;
+		else
+			val &= ~OSTCCR_PRESCALE2_MASK;
+
+		writel(val, ost->base + OST_REG_OSTCCR);
+	}
 
 	err = clk_hw_register(NULL, &ost_clk->hw);
 	if (err) {
@@ -310,57 +415,51 @@ static struct clk * __init ingenic_ost_get_clock(struct device_node *np, int id)
 	return of_clk_get_from_provider(&args);
 }
 
-static int __init ingenic_ost_percpu_timer_init(struct device_node *np,
-					 struct ingenic_ost *ost)
+static int __init ingenic_ost_setup_cevt(unsigned int cpu)
 {
-	unsigned int timer_virq, channel = OST_CLK_PERCPU_TIMER;
+	struct ingenic_ost *ost = ingenic_ost;
+	struct ingenic_ost_timer *timer = this_cpu_ptr(ost->timers);
 	unsigned long rate;
 	int err;
 
-	ost->percpu_timer_clk = ingenic_ost_get_clock(np, channel);
-	if (IS_ERR(ost->percpu_timer_clk))
-		return PTR_ERR(ost->percpu_timer_clk);
+	timer->clk = ingenic_ost_get_clock(ost->np, timer->channel);
+	if (IS_ERR(timer->clk))
+		return PTR_ERR(timer->clk);
 
-	err = clk_prepare_enable(ost->percpu_timer_clk);
+	err = clk_prepare_enable(timer->clk);
 	if (err)
 		goto err_clk_put;
 
-	rate = clk_get_rate(ost->percpu_timer_clk);
+	rate = clk_get_rate(timer->clk);
 	if (!rate) {
 		err = -EINVAL;
 		goto err_clk_disable;
 	}
 
-	timer_virq = of_irq_get(np, 0);
-	if (!timer_virq) {
-		err = -EINVAL;
-		goto err_clk_disable;
-	}
+	snprintf(timer->name, sizeof(timer->name), "OST event timer%u", cpu);
 
-	snprintf(ost->name, sizeof(ost->name), "OST percpu timer");
+	/* Unmask full comparison match interrupt */
+	writel((u32)~OSTMR_FMASK, timer->base + OST_REG_OSTMR);
 
-	err = request_irq(timer_virq, ingenic_ost_cevt_cb, IRQF_TIMER,
-			  ost->name, &ost->cevt);
-	if (err)
-		goto err_irq_dispose_mapping;
+	timer->cpu = smp_processor_id();
+	timer->cevt.cpumask = cpumask_of(smp_processor_id());
+	timer->cevt.features = CLOCK_EVT_FEAT_ONESHOT;
+	timer->cevt.name = timer->name;
+	timer->cevt.rating = 400;
+	timer->cevt.set_state_shutdown = ingenic_ost_cevt_set_state_shutdown;
+	timer->cevt.set_next_event = ingenic_ost_cevt_set_next;
 
-	ost->cevt.cpumask = cpumask_of(smp_processor_id());
-	ost->cevt.features = CLOCK_EVT_FEAT_ONESHOT;
-	ost->cevt.name = ost->name;
-	ost->cevt.rating = 400;
-	ost->cevt.set_state_shutdown = ingenic_ost_cevt_set_state_shutdown;
-	ost->cevt.set_next_event = ingenic_ost_cevt_set_next;
+	clockevents_config_and_register(&timer->cevt, rate, 4, 0xffffffff);
 
-	clockevents_config_and_register(&ost->cevt, rate, 4, 0xffffffff);
+	if (ost->soc_info->version >= ID_X2000)
+		enable_percpu_irq(ost->irq, IRQ_TYPE_NONE);
 
 	return 0;
 
-err_irq_dispose_mapping:
-	irq_dispose_mapping(timer_virq);
 err_clk_disable:
-	clk_disable_unprepare(ost->percpu_timer_clk);
+	clk_disable_unprepare(timer->clk);
 err_clk_put:
-	clk_put(ost->percpu_timer_clk);
+	clk_put(timer->clk);
 	return err;
 }
 
@@ -386,11 +485,14 @@ static int __init ingenic_ost_global_timer_init(struct device_node *np,
 		goto err_clk_disable;
 	}
 
-	/* Clear counter CNT registers */
-	writel(OSTCR_OST2CLR, ost->base + OST_REG_OSTCR);
-
-	/* Enable OST channel */
-	writel(OSTESR_OST2ENS, ost->base + OST_REG_OSTESR);
+	/* Clear counter CNT registers and enable OST channel */
+	if (ost->soc_info->version >= ID_X2000) {
+		writel(OSTCR_OST1CLR, ost->base + OST_REG_OSTCR);
+		writel(OSTESR_OST1ENS, ost->base + OST_REG_OSTER);
+	} else {
+		writel(OSTCR_OST2CLR, ost->base + OST_REG_OSTCR);
+		writel(OSTESR_OST2ENS, ost->base + OST_REG_OSTESR);
+	}
 
 	cs->name = "ingenic-ost";
 	cs->rating = 400;
@@ -412,18 +514,54 @@ static int __init ingenic_ost_global_timer_init(struct device_node *np,
 }
 
 static const struct ingenic_soc_info x1000_soc_info = {
+	.version = ID_X1000,
+	.clk_info = x1000_ost_clk_info,
+
+	.num_channels = 2,
+
+	.has_global_timer = true,
+	.has_event_timer = true,
+};
+
+static const struct ingenic_soc_info x2000_soc_ost32_info = {
+	.version = ID_X2000,
+	.clk_info = x2000_ost32_clk_info,
+
 	.num_channels = 2,
+	.base_offset = 0x100,
+
+	.has_global_timer = false,
+	.has_event_timer = true,
+};
+
+static const struct ingenic_soc_info x2000_soc_ost64_info = {
+	.version = ID_X2000,
+	.clk_info = x2000_ost64_clk_info,
+
+	.num_channels = 1,
+
+	.has_global_timer = true,
+	.has_event_timer = false,
 };
 
 static const struct of_device_id __maybe_unused ingenic_ost_of_matches[] __initconst = {
 	{ .compatible = "ingenic,x1000-ost", .data = &x1000_soc_info },
+	{ .compatible = "ingenic,x1600-ost", .data = &x1000_soc_info },
+	{ .compatible = "ingenic,x1700-ost", .data = &x1000_soc_info },
+	{ .compatible = "ingenic,x1830-ost", .data = &x1000_soc_info },
+	{ .compatible = "ingenic,x2000-ost32", .data = &x2000_soc_ost32_info },
+	{ .compatible = "ingenic,x2000-ost64", .data = &x2000_soc_ost64_info },
+	{ .compatible = "ingenic,x2500-ost32", .data = &x2000_soc_ost32_info },
+	{ .compatible = "ingenic,x2500-ost64", .data = &x2000_soc_ost64_info },
 	{ /* sentinel */ }
 };
 
 static int __init ingenic_ost_probe(struct device_node *np)
 {
 	const struct of_device_id *id = of_match_node(ingenic_ost_of_matches, np);
+	struct ingenic_ost_timer *timer;
 	struct ingenic_ost *ost;
+	unsigned int cpu;
 	unsigned int i;
 	int ret;
 
@@ -431,6 +569,9 @@ static int __init ingenic_ost_probe(struct device_node *np)
 	if (!ost)
 		return -ENOMEM;
 
+	ost->np = np;
+	ost->soc_info = id->data;
+
 	ost->base = of_io_request_and_map(np, 0, of_node_full_name(np));
 	if (IS_ERR(ost->base)) {
 		pr_err("%s: Failed to map OST registers\n", __func__);
@@ -440,8 +581,8 @@ static int __init ingenic_ost_probe(struct device_node *np)
 
 	ost->clk = of_clk_get_by_name(np, "ost");
 	if (IS_ERR(ost->clk)) {
-		ret = PTR_ERR(ost->clk);
 		pr_crit("%s: Cannot get OST clock\n", __func__);
+		ret = PTR_ERR(ost->clk);
 		goto err_free_ost;
 	}
 
@@ -451,8 +592,6 @@ static int __init ingenic_ost_probe(struct device_node *np)
 		goto err_put_clk;
 	}
 
-	ost->soc_info = id->data;
-
 	ost->clocks = kzalloc(struct_size(ost->clocks, hws, ost->soc_info->num_channels),
 			      GFP_KERNEL);
 	if (!ost->clocks) {
@@ -462,17 +601,57 @@ static int __init ingenic_ost_probe(struct device_node *np)
 
 	ost->clocks->num = ost->soc_info->num_channels;
 
-	for (i = 0; i < ost->clocks->num; i++) {
-		ret = ingenic_ost_register_clock(ost, i, &x1000_ost_clk_info[i], ost->clocks);
+	if (ost->soc_info->has_event_timer) {
+		ost->timers = alloc_percpu(struct ingenic_ost_timer);
+		if (!ost->timers) {
+			ret = -ENOMEM;
+			goto err_unregister_ost_clocks;
+		}
+
+		ost->irq = irq_of_parse_and_map(np, 0);
+		if (ost->irq < 0) {
+			pr_crit("%s: Cannot to get OST IRQ\n", __func__);
+			ret = ost->irq;
+			goto err_free_ost_timers;
+		}
+
+		for (cpu = 0; cpu < num_possible_cpus(); cpu++) {
+			timer = per_cpu_ptr(ost->timers, cpu);
+
+			timer->base = ost->base + ost->soc_info->base_offset * cpu;
+			timer->channel = ost->soc_info->has_global_timer + cpu;
+
+			timer->ost = ost;
+			timer->cpu = cpu;
+		}
+
+		for (i = ost->soc_info->has_global_timer;
+			 i < ost->soc_info->has_global_timer + num_possible_cpus(); i++) {
+			ret = ingenic_ost_register_clock(ost, i, &ost->soc_info->clk_info[i], ost->clocks);
+			if (ret) {
+				pr_crit("%s: Cannot register clock %d\n", __func__, i);
+				goto err_free_ost_timers;
+			}
+		}
+	}
+
+	for (i = 0; i < ost->soc_info->has_global_timer; i++) {
+		ret = ingenic_ost_register_clock(ost, i, &ost->soc_info->clk_info[i], ost->clocks);
 		if (ret) {
 			pr_crit("%s: Cannot register clock %d\n", __func__, i);
-			goto err_unregister_ost_clocks;
+			goto err_free_ost_clocks;
 		}
+
+		ost64_ostcntl_reg = ost->base + ost->soc_info->clk_info->ostcntl_reg;
 	}
 
 	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, ost->clocks);
 	if (ret) {
 		pr_crit("%s: Cannot add OF clock provider\n", __func__);
+
+		if (ost->soc_info->has_event_timer)
+			goto err_free_ost_timers;
+
 		goto err_unregister_ost_clocks;
 	}
 
@@ -480,10 +659,13 @@ static int __init ingenic_ost_probe(struct device_node *np)
 
 	return 0;
 
+err_free_ost_timers:
+	free_percpu(ost->timers);
 err_unregister_ost_clocks:
 	for (i = 0; i < ost->clocks->num; i++)
 		if (ost->clocks->hws[i])
 			clk_hw_unregister(ost->clocks->hws[i]);
+err_free_ost_clocks:
 	kfree(ost->clocks);
 err_clk_disable:
 	clk_disable_unprepare(ost->clk);
@@ -512,29 +694,54 @@ static int __init ingenic_ost_init(struct device_node *np)
 	if (IS_ERR(ost))
 		return PTR_ERR(ost);
 
-	ret = ingenic_ost_global_timer_init(np, ost);
-	if (ret) {
-		pr_crit("%s: Unable to init global timer: %x\n", __func__, ret);
-		goto err_free_ingenic_ost;
+	if (ost->soc_info->has_event_timer) {
+		if (ost->soc_info->version >= ID_X2000)
+			ret = request_percpu_irq(ost->irq, ingenic_ost_cevt_cb,
+					  "OST event timer", ost->timers);
+		else
+			ret = request_irq(ost->irq, ingenic_ost_cevt_cb, IRQF_TIMER,
+					  "OST event timer", ost->timers);
+
+		if (ret) {
+			pr_crit("%s: Unable to request IRQ: %d\n", __func__, ret);
+			goto err_free_ingenic_ost;
+		}
+
+		/* Setup clock events on each CPU core */
+		ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "Ingenic XBurst: online",
+					ingenic_ost_setup_cevt, NULL);
+		if (ret < 0) {
+			pr_crit("%s: Unable to init event timers: %d\n", __func__, ret);
+			goto err_free_ingenic_ost;
+		}
 	}
 
-	ret = ingenic_ost_percpu_timer_init(np, ost);
-	if (ret)
-		goto err_ost_global_timer_cleanup;
+	if (ost->soc_info->has_global_timer) {
+		ret = ingenic_ost_global_timer_init(np, ost);
+		if (ret) {
+			pr_crit("%s: Unable to init global timer: %d\n", __func__, ret);
 
-	/* Register the sched_clock at the end as there's no way to undo it */
-	rate = clk_get_rate(ost->global_timer_clk);
-	sched_clock_register(ingenic_ost_global_timer_read_cntl, 32, rate);
+			if (!ost->soc_info->has_event_timer)
+				goto err_free_ingenic_ost;
+		}
+
+		/* Register the sched_clock at the end as there's no way to undo it */
+		rate = clk_get_rate(ost->global_timer_clk);
+		sched_clock_register(ingenic_ost_global_timer_read_cntl, 32, rate);
+	}
 
 	return 0;
 
-err_ost_global_timer_cleanup:
-	clocksource_unregister(&ost->cs);
-	clk_disable_unprepare(ost->global_timer_clk);
-	clk_put(ost->global_timer_clk);
 err_free_ingenic_ost:
 	kfree(ost);
 	return ret;
 }
 
 TIMER_OF_DECLARE(x1000_ost,  "ingenic,x1000-ost",  ingenic_ost_init);
+TIMER_OF_DECLARE(x1600_ost,  "ingenic,x1600-ost",  ingenic_ost_init);
+TIMER_OF_DECLARE(x1700_ost,  "ingenic,x1700-ost",  ingenic_ost_init);
+TIMER_OF_DECLARE(x1830_ost,  "ingenic,x1830-ost",  ingenic_ost_init);
+TIMER_OF_DECLARE(x2000_ost32,  "ingenic,x2000-ost32",  ingenic_ost_init);
+TIMER_OF_DECLARE(x2000_ost64,  "ingenic,x2000-ost64",  ingenic_ost_init);
+TIMER_OF_DECLARE(x2500_ost32,  "ingenic,x2500-ost32",  ingenic_ost_init);
+TIMER_OF_DECLARE(x2500_ost64,  "ingenic,x2500-ost64",  ingenic_ost_init);
-- 
2.7.4

Re: [PATCH v4 3/3] clocksource: Ingenic: Add SMP/SMT support for sysost driver.

[kernel test robot]

Hi "周琰杰,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on tip/timers/core]
[also build test WARNING on robh/for-next v5.18-rc2 next-20220411]
[cannot apply to daniel-lezcano/clockevents/next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Zhou-Yanjie/Add-SMP-SMT-support-for-Ingenic-sysost-driver/20220411-223537
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 8afbcaf8690dac19ebf570a4e4fef9c59c75bf8e
config: openrisc-randconfig-s032-20220411 (https://download.01.org/0day-ci/archive/20220412/202204120622.OSuTgle5-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # apt-get install sparse
        # sparse version: v0.6.4-dirty
        # https://github.com/intel-lab-lkp/linux/commit/facdbd1eb8f72863d589c575577f6130d8cf6ed1
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Zhou-Yanjie/Add-SMP-SMT-support-for-Ingenic-sysost-driver/20220411-223537
        git checkout facdbd1eb8f72863d589c575577f6130d8cf6ed1
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=openrisc SHELL=/bin/bash drivers/clocksource/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>


sparse warnings: (new ones prefixed by >>)
>> drivers/clocksource/ingenic-sysost.c:703:65: sparse: sparse: incorrect type in argument 5 (different address spaces) @@     expected void *dev @@     got struct ingenic_ost_timer [noderef] __percpu *timers @@
   drivers/clocksource/ingenic-sysost.c:703:65: sparse:     expected void *dev
   drivers/clocksource/ingenic-sysost.c:703:65: sparse:     got struct ingenic_ost_timer [noderef] __percpu *timers

vim +703 drivers/clocksource/ingenic-sysost.c

   678	
   679	static int __init ingenic_ost_init(struct device_node *np)
   680	{
   681		struct ingenic_ost *ost;
   682		unsigned long rate;
   683		int ret;
   684	
   685		ret = ingenic_ost_probe(np);
   686		if (ret) {
   687			pr_crit("%s: Failed to initialize OST clocks: %d\n", __func__, ret);
   688			return ret;
   689		}
   690	
   691		of_node_clear_flag(np, OF_POPULATED);
   692	
   693		ost = ingenic_ost;
   694		if (IS_ERR(ost))
   695			return PTR_ERR(ost);
   696	
   697		if (ost->soc_info->has_event_timer) {
   698			if (ost->soc_info->version >= ID_X2000)
   699				ret = request_percpu_irq(ost->irq, ingenic_ost_cevt_cb,
   700						  "OST event timer", ost->timers);
   701			else
   702				ret = request_irq(ost->irq, ingenic_ost_cevt_cb, IRQF_TIMER,
 > 703						  "OST event timer", ost->timers);
   704	
   705			if (ret) {
   706				pr_crit("%s: Unable to request IRQ: %d\n", __func__, ret);
   707				goto err_free_ingenic_ost;
   708			}
   709	
   710			/* Setup clock events on each CPU core */
   711			ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "Ingenic XBurst: online",
   712						ingenic_ost_setup_cevt, NULL);
   713			if (ret < 0) {
   714				pr_crit("%s: Unable to init event timers: %d\n", __func__, ret);
   715				goto err_free_ingenic_ost;
   716			}
   717		}
   718	
   719		if (ost->soc_info->has_global_timer) {
   720			ret = ingenic_ost_global_timer_init(np, ost);
   721			if (ret) {
   722				pr_crit("%s: Unable to init global timer: %d\n", __func__, ret);
   723	
   724				if (!ost->soc_info->has_event_timer)
   725					goto err_free_ingenic_ost;
   726			}
   727	
   728			/* Register the sched_clock at the end as there's no way to undo it */
   729			rate = clk_get_rate(ost->global_timer_clk);
   730			sched_clock_register(ingenic_ost_global_timer_read_cntl, 32, rate);
   731		}
   732	
   733		return 0;
   734	
   735	err_free_ingenic_ost:
   736		kfree(ost);
   737		return ret;
   738	}
   739	

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp

Re: [PATCH v4 0/3] Add SMP/SMT support for Ingenic sysost driver.

[Zhou Furong]

Hi,

On 2022/4/11 22:33, 周琰杰 (Zhou Yanjie) wrote:
> 1.On the hardware of X2000 SoC, the OST has been split into
>    two parts, two 32bit timers for clockevent and one 64bit
>    timer for clocksource (with different addresses), so it
>    not appropriate to use only one "ingenic,x2000-ost", just
>    remove it, then introduce "ingenic,x2000-ost32" and
>    "ingenic,x2000-ost64".
> 2.The OST in Ingenic XBurst®2 SoCs has a global timer and
>    up to 16 event timers, add support for the event timers.
> 3.Add dt-bindings and compatible strings for the X1600 SoC,
>    the X1700 SoC, the X1830 SoC, the X2000 SoC, the X2500 SoC.
> 
> 周琰杰 (Zhou Yanjie) (3):
Please consider config your git, Non-english characters may not always 
display correctly.



Best regards,
Furong