Skip to contentSkip to conversation

ARM: OMAP4: Fix the init code to have OMAP4460 errata available in DT build

PATCH New Santosh Shilimkar 2 participants 3 messages Feb 25, 2013 – Feb 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP4: Fix the init code to have OMAP4460 errata available in DT build

OMAP4460 ROM code bug needs the GIC distributor and local timer bases to be available for the bug work around. In current code, dt case these bases are not initialized leading to failure of the errata work-around.

Fix it by extracting the bases from dt blob and populating them.

---
Posting this one seperatly but will add along with rest of my fixes so that it doesn't get lost on the list.

 arch/arm/mach-omap2/omap4-common.c |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/mach-omap2/omap4-common.c +32 -0
index 6897ae2..d07740e 100644
@@ -261,8 +261,40 @@ static struct of_device_id irq_match[] __initdata = {
 	{ }
 };
 
+static struct of_device_id twd_match[] __initdata = {
+	{ .compatible = "arm,cortex-a9-twd-timer", },
+	{ }
+};
+
 void __init omap_gic_of_init(void)
 {
+	struct device_node *np;
+	const void *reg_prop;
+	unsigned long start = 0, size = 0;
+
+	/* Extract GIC distributor and TWD bases for OMAP4460 ROM Errata WA */
+	if (!cpu_is_omap446x())
+		goto skip_errata_init;
+
+	np = of_find_matching_node(NULL, irq_match);
+	if (np) {
+		reg_prop = of_get_property(np, "reg", NULL);
+		start = of_read_number(reg_prop, 1);
+		size = of_read_number(reg_prop + 4, 1);
+	}
+	gic_dist_base_addr = ioremap(start, size);
+	WARN_ON(!gic_dist_base_addr);
+
+	np = of_find_matching_node(NULL, twd_match);
+	if (np) {
+		reg_prop = of_get_property(np, "reg", NULL);
+		start = of_read_number(reg_prop, 1);
+		size = of_read_number(reg_prop + 4, 1);
+	}
+	twd_base = ioremap(start, size);
+	WARN_ON(!twd_base);
+
+skip_errata_init:
 	omap_wakeupgen_init();
 	of_irq_init(irq_match);
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: OMAP4: Fix the init code to have OMAP4460 errata available in DT build

Quoted 35 lines · Santosh Shilimkar

OMAP4460 ROM code bug needs the GIC distributor and local timer bases to be available for the bug work around. In current code, dt case these bases are not initialized leading to failure of the errata work-around.

Fix it by extracting the bases from dt blob and populating them.

---
Posting this one seperatly but will add along with rest of my fixes so that it doesn't get lost on the list.

 arch/arm/mach-omap2/omap4-common.c |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/mach-omap2/omap4-common.c +8 -0
index 6897ae2..d07740e 100644
@@ -261,8 +261,40 @@ static struct of_device_id irq_match[] __initdata = {
 	{ }
 };
 
+static struct of_device_id twd_match[] __initdata = {
+	{ .compatible = "arm,cortex-a9-twd-timer", },
+	{ }
+};
+
 void __init omap_gic_of_init(void)
 {
+	struct device_node *np;
+	const void *reg_prop;
+	unsigned long start = 0, size = 0;

arch/arm/mach-omap2/omap4-common.c static struct of_device_id irq_match[] __initdata = { · line 283

Quoted 10 lines
arch/arm/mach-omap2/omap4-common.c +10 -0
+
+	/* Extract GIC distributor and TWD bases for OMAP4460 ROM Errata WA */
+	if (!cpu_is_omap446x())
+		goto skip_errata_init;
+
+	np = of_find_matching_node(NULL, irq_match);
+	if (np) {
+		reg_prop = of_get_property(np, "reg", NULL);
+		start = of_read_number(reg_prop, 1);
+		size = of_read_number(reg_prop + 4, 1);

Alternatively, you could replace the above 3 lines with ...

gic_dist_base_addr = of_iomap(np, 0);

arch/arm/mach-omap2/omap4-common.c static struct of_device_id irq_match[] __initdata = { · line 292

Quoted 9 lines
arch/arm/mach-omap2/omap4-common.c +9 -0
+	}
+	gic_dist_base_addr = ioremap(start, size);
+	WARN_ON(!gic_dist_base_addr);
+
+	np = of_find_matching_node(NULL, twd_match);
+	if (np) {
+		reg_prop = of_get_property(np, "reg", NULL);
+		start = of_read_number(reg_prop, 1);
+		size = of_read_number(reg_prop + 4, 1);

Same here.

Cheers
Jon

#2 lore raw

PATCH 1/1 ARM: OMAP4: Fix the init code to have OMAP4460 errata available in DT build

Quoted 50 lines · Jon Hunter
Quoted 35 lines · Santosh Shilimkar

OMAP4460 ROM code bug needs the GIC distributor and local timer bases to be available for the bug work around. In current code, dt case these bases are not initialized leading to failure of the errata work-around.

Fix it by extracting the bases from dt blob and populating them.

---
Posting this one seperatly but will add along with rest of my fixes so that it doesn't get lost on the list.

  arch/arm/mach-omap2/omap4-common.c |   32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
arch/arm/mach-omap2/omap4-common.c +8 -0
index 6897ae2..d07740e 100644
@@ -261,8 +261,40 @@ static struct of_device_id irq_match[] __initdata = {
  	{ }
  };
 
+static struct of_device_id twd_match[] __initdata = {
+	{ .compatible = "arm,cortex-a9-twd-timer", },
+	{ }
+};
+
  void __init omap_gic_of_init(void)
  {
+	struct device_node *np;
+	const void *reg_prop;
+	unsigned long start = 0, size = 0;

arch/arm/mach-omap2/omap4-common.c static struct of_device_id irq_match[] __initdata = { · line 283

Quoted 10 lines
arch/arm/mach-omap2/omap4-common.c +10 -0
+
+	/* Extract GIC distributor and TWD bases for OMAP4460 ROM Errata WA */
+	if (!cpu_is_omap446x())
+		goto skip_errata_init;
+
+	np = of_find_matching_node(NULL, irq_match);
+	if (np) {
+		reg_prop = of_get_property(np, "reg", NULL);
+		start = of_read_number(reg_prop, 1);
+		size = of_read_number(reg_prop + 4, 1);

Alternatively, you could replace the above 3 lines with ...

Quoted 2 lines

gic_dist_base_addr = of_iomap(np, 0);

Nice !!
Will use the alternative. Thanks Jon for pointer.

Regards,
Santosh