* [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database.
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
2011-02-23 8:03 ` Sricharan R
2011-02-23 8:14 ` Sricharan R
2011-02-21 13:46 ` [PATCH 2/6] omap3: Initialise the l3 device with the hwmod data Santosh Shilimkar
` (4 subsequent siblings)
5 siblings, 2 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan, Santosh Shilimkar
From: sricharan <r.sricharan@ti.com>
Add the error log registers, irqs of the l3 interconnect to the
hwmod data. The hwmod changes are aligned with Benoit Cousson.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 22 ++++++++++++++++++++--
arch/arm/plat-omap/include/plat/irqs.h | 2 ++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 8d81813..9a8f799 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -72,10 +72,26 @@ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_per = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 taret configuration and error log registers */
+static struct omap_hwmod_irq_info omap3xxx_l3_targ_irqs[] = {
+ { .irq = INT_34XX_L3_DBG_IRQ },
+ { .irq = INT_34XX_L3_APP_IRQ },
+};
+
+static struct omap_hwmod_addr_space omap3xxx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x68000000,
+ .pa_end = 0x68100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
- .master = &omap3xxx_mpu_hwmod,
- .slave = &omap3xxx_l3_main_hwmod,
+ .master = &omap3xxx_mpu_hwmod,
+ .slave = &omap3xxx_l3_main_hwmod,
+ .addr = omap3xxx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap3xxx_l3_targ_addrs),
.user = OCP_USER_MPU,
};
@@ -94,6 +110,8 @@ static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {
static struct omap_hwmod omap3xxx_l3_main_hwmod = {
.name = "l3_main",
.class = &l3_hwmod_class,
+ .mpu_irqs = omap3xxx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_l3_targ_irqs),
.masters = omap3xxx_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
.slaves = omap3xxx_l3_main_slaves,
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 2910de9..e614de1 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -315,6 +315,8 @@
#define INT_34XX_SSM_ABORT_IRQ 6
#define INT_34XX_SYS_NIRQ 7
#define INT_34XX_D2D_FW_IRQ 8
+#define INT_34XX_L3_DBG_IRQ 9
+#define INT_34XX_L3_APP_IRQ 10
#define INT_34XX_PRCM_MPU_IRQ 11
#define INT_34XX_MCBSP1_IRQ 16
#define INT_34XX_MCBSP2_IRQ 17
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* RE: [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database.
2011-02-21 13:46 ` [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database Santosh Shilimkar
@ 2011-02-23 8:03 ` Sricharan R
2011-02-23 8:14 ` Sricharan R
1 sibling, 0 replies; 24+ messages in thread
From: Sricharan R @ 2011-02-23 8:03 UTC (permalink / raw)
To: Santosh Shilimkar, linux-omap; +Cc: Felipe Balbi, Benoit Cousson
Hi Benoit,
>-----Original Message-----
>From: Santosh Shilimkar [mailto:santosh.shilimkar@ti.com]
>Sent: Monday, February 21, 2011 7:16 PM
>To: linux-omap@vger.kernel.org
>Cc: balbi@ti.com; b-cousson@ti.com; r.sricharan@ti.com; Santosh Shilimkar
>Subject: [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod
>database.
>
>From: sricharan <r.sricharan@ti.com>
>
>Add the error log registers, irqs of the l3 interconnect to the
>hwmod data. The hwmod changes are aligned with Benoit Cousson.
>
Updated the patch as per your comments for omap3.
----------------
[PATCH v2 1/6] omap3: hwmod_data: Add address space and irq in L3 hwmod.
Add the address spaces, irqs of the l3 interconnect to the hwmod data. The
hwmod changes are aligned with Benoit Cousson.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 22 ++++++++++++++++++++--
arch/arm/plat-omap/include/plat/irqs.h | 2 ++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 8d81813..9a8f799 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -72,10 +72,26 @@ static struct omap_hwmod_ocp_if
omap3xxx_l3_main__l4_per = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 taret configuration and error log registers */ static struct
+omap_hwmod_irq_info omap3xxx_l3_targ_irqs[] = {
+ { .irq = INT_34XX_L3_DBG_IRQ },
+ { .irq = INT_34XX_L3_APP_IRQ },
+};
+
+static struct omap_hwmod_addr_space omap3xxx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x68000000,
+ .pa_end = 0x68100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
- .master = &omap3xxx_mpu_hwmod,
- .slave = &omap3xxx_l3_main_hwmod,
+ .master = &omap3xxx_mpu_hwmod,
+ .slave = &omap3xxx_l3_main_hwmod,
+ .addr = omap3xxx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap3xxx_l3_targ_addrs),
.user = OCP_USER_MPU,
};
@@ -94,6 +110,8 @@ static struct omap_hwmod_ocp_if
*omap3xxx_l3_main_masters[] = { static struct omap_hwmod
omap3xxx_l3_main_hwmod = {
.name = "l3_main",
.class = &l3_hwmod_class,
+ .mpu_irqs = omap3xxx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_l3_targ_irqs),
.masters = omap3xxx_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
.slaves = omap3xxx_l3_main_slaves,
diff --git a/arch/arm/plat-omap/include/plat/irqs.h
b/arch/arm/plat-omap/include/plat/irqs.h
index 2910de9..e614de1 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -315,6 +315,8 @@
#define INT_34XX_SSM_ABORT_IRQ 6
#define INT_34XX_SYS_NIRQ 7
#define INT_34XX_D2D_FW_IRQ 8
+#define INT_34XX_L3_DBG_IRQ 9
+#define INT_34XX_L3_APP_IRQ 10
#define INT_34XX_PRCM_MPU_IRQ 11
#define INT_34XX_MCBSP1_IRQ 16
#define INT_34XX_MCBSP2_IRQ 17
--
1.7.0.4
Thanks,
sricharan
^ permalink raw reply related [flat|nested] 24+ messages in thread* RE: [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database.
2011-02-21 13:46 ` [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database Santosh Shilimkar
2011-02-23 8:03 ` Sricharan R
@ 2011-02-23 8:14 ` Sricharan R
1 sibling, 0 replies; 24+ messages in thread
From: Sricharan R @ 2011-02-23 8:14 UTC (permalink / raw)
To: Santosh Shilimkar, linux-omap; +Cc: Felipe Balbi, Benoit Cousson
>-----Original Message-----
>From: Santosh Shilimkar [mailto:santosh.shilimkar@ti.com]
>Sent: Monday, February 21, 2011 7:16 PM
>To: linux-omap@vger.kernel.org
>Cc: balbi@ti.com; b-cousson@ti.com; r.sricharan@ti.com; Santosh Shilimkar
>Subject: [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod
>database.
>
>From: sricharan <r.sricharan@ti.com>
>
>Add the error log registers, irqs of the l3 interconnect to the
>hwmod data. The hwmod changes are aligned with Benoit Cousson.
>
Changed as per your comments for omap3.
---------------
[PATCH v2 1/6] omap3: hwmod_data: Add address space and irq in L3 hwmod.
Add the address spaces, irqs of the l3 interconnect to the
hwmod data. The hwmod changes are aligned with Benoit Cousson.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
changed the subject line and changelog.
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 22 ++++++++++++++++++++--
arch/arm/plat-omap/include/plat/irqs.h | 2 ++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 8d81813..9a8f799 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -72,10 +72,26 @@ static struct omap_hwmod_ocp_if
omap3xxx_l3_main__l4_per = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 taret configuration and error log registers */
+static struct omap_hwmod_irq_info omap3xxx_l3_targ_irqs[] = {
+ { .irq = INT_34XX_L3_DBG_IRQ },
+ { .irq = INT_34XX_L3_APP_IRQ },
+};
+
+static struct omap_hwmod_addr_space omap3xxx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x68000000,
+ .pa_end = 0x68100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
- .master = &omap3xxx_mpu_hwmod,
- .slave = &omap3xxx_l3_main_hwmod,
+ .master = &omap3xxx_mpu_hwmod,
+ .slave = &omap3xxx_l3_main_hwmod,
+ .addr = omap3xxx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap3xxx_l3_targ_addrs),
.user = OCP_USER_MPU,
};
@@ -94,6 +110,8 @@ static struct omap_hwmod_ocp_if
*omap3xxx_l3_main_masters[] = {
static struct omap_hwmod omap3xxx_l3_main_hwmod = {
.name = "l3_main",
.class = &l3_hwmod_class,
+ .mpu_irqs = omap3xxx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_l3_targ_irqs),
.masters = omap3xxx_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
.slaves = omap3xxx_l3_main_slaves,
diff --git a/arch/arm/plat-omap/include/plat/irqs.h
b/arch/arm/plat-omap/include/plat/irqs.h
index 2910de9..e614de1 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -315,6 +315,8 @@
#define INT_34XX_SSM_ABORT_IRQ 6
#define INT_34XX_SYS_NIRQ 7
#define INT_34XX_D2D_FW_IRQ 8
+#define INT_34XX_L3_DBG_IRQ 9
+#define INT_34XX_L3_APP_IRQ 10
#define INT_34XX_PRCM_MPU_IRQ 11
#define INT_34XX_MCBSP1_IRQ 16
#define INT_34XX_MCBSP2_IRQ 17
--
1.7.0.4
Thanks,
Sricharan
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 2/6] omap3: Initialise the l3 device with the hwmod data.
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 3/6] omap3: l3: Introduce l3-interconnect error handling driver Santosh Shilimkar
` (3 subsequent siblings)
5 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan, Santosh Shilimkar
From: sricharan <r.sricharan@ti.com>
The l3 interconnect device is build with all the data required
to handle the error logging. The data is extracted from the
hwmod database.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/devices.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 381f4eb..2d46f55 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -34,6 +34,29 @@
#include "mux.h"
#include "control.h"
+static int __init omap3_l3_init(void)
+{
+ int l;
+ struct omap_hwmod *oh;
+ struct omap_device *od;
+ char oh_name[10];
+
+ l = snprintf(oh_name, 10, "l3_main");
+
+ oh = omap_hwmod_lookup(oh_name);
+
+ if (!oh)
+ pr_err("could not look up %s\n", oh_name);
+
+ od = omap_device_build("omap3-l3-interconnect", 0, oh, NULL, 0,
+ NULL, 0, 0);
+
+ WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
+
+ return PTR_ERR(od);
+}
+postcore_initcall(omap3_l3_init);
+
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
static struct resource cam_resources[] = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 3/6] omap3: l3: Introduce l3-interconnect error handling driver
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 1/6] omap3: hwmod_data: Add l3 error log data to hwmod database Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 2/6] omap3: Initialise the l3 device with the hwmod data Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database Santosh Shilimkar
` (2 subsequent siblings)
5 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan, Santosh Shilimkar
From: Felipe Balbi <balbi@ti.com>
The driver provides the information regarding the ocp errors
that gets logged in the interconnect.The error info provides
the details regarding the master or the target that
generated the error, type of error and the corresponding address.
The stack dump is also provided.
Signed-off-by: sricharan <r.sricharan@ti.com>
[r.sricharan@ti.com: Enhacements, major cleanup and made it functional]
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
[santosh.shilimkar@ti.com: Driver design changes as per OMAP4 version]
Signed-off-by: Felipe Balbi <balbi@ti.com>
[balbi@ti.com: Initial version of the driver]
Tested-by: sricharan <r.sricharan@ti.com>
---
arch/arm/mach-omap2/Makefile | 3 +
arch/arm/mach-omap2/l3_interconnect_3xxx.c | 314 ++++++++++++++++++++++++++
arch/arm/mach-omap2/l3_interconnect_3xxx.h | 338 ++++++++++++++++++++++++++++
3 files changed, 655 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/l3_interconnect_3xxx.c
create mode 100644 arch/arm/mach-omap2/l3_interconnect_3xxx.h
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 4ab82f6..623aee1 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -135,6 +135,9 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
# EMU peripherals
obj-$(CONFIG_OMAP3_EMU) += emu.o
+# L3 interconnect
+obj-$(CONFIG_ARCH_OMAP3) += l3_interconnect_3xxx.o
+
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o
diff --git a/arch/arm/mach-omap2/l3_interconnect_3xxx.c b/arch/arm/mach-omap2/l3_interconnect_3xxx.c
new file mode 100644
index 0000000..1d1aae3
--- /dev/null
+++ b/arch/arm/mach-omap2/l3_interconnect_3xxx.c
@@ -0,0 +1,314 @@
+ /*
+ * L3 Interconnect Driver
+ *
+ * Copyright (C) 2011 Texas Corporation
+ * Felipe Balbi <balbi@ti.com>
+ * Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * Sricharan <r.sricharan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include "l3_interconnect_3xxx.h"
+
+static inline u64 omap3_l3_readll(void __iomem *base, u16 reg)
+{
+ return __raw_readll(base + reg);
+}
+
+static inline void omap3_l3_writell(void __iomem *base, u16 reg, u64 value)
+{
+ __raw_writell(value, base + reg);
+}
+
+static inline enum omap3_l3_code omap3_l3_decode_error_code(u64 error)
+{
+ return (error & 0x0f000000) >> L3_ERROR_LOG_CODE;
+}
+
+static inline u32 omap3_l3_decode_addr(u64 error_addr)
+{
+ return error_addr & 0xffffffff;
+}
+
+static inline unsigned omap3_l3_decode_cmd(u64 error)
+{
+ return (error & 0x07) >> L3_ERROR_LOG_CMD;
+}
+
+static inline enum omap3_l3_initiator_id omap3_l3_decode_initid(u64 error)
+{
+ return (error & 0xff00) >> L3_ERROR_LOG_INITID;
+}
+
+static inline unsigned omap3_l3_decode_req_info(u64 error)
+{
+ return (error >> 32) & 0xffff;
+}
+
+static char *omap3_l3_code_string(u8 code)
+{
+ switch (code) {
+ case OMAP_L3_CODE_NOERROR:
+ return "No Error";
+ case OMAP_L3_CODE_UNSUP_CMD:
+ return "Unsupported Command";
+ case OMAP_L3_CODE_ADDR_HOLE:
+ return "Address Hole";
+ case OMAP_L3_CODE_PROTECT_VIOLATION:
+ return "Protection Violation";
+ case OMAP_L3_CODE_IN_BAND_ERR:
+ return "In-band Error";
+ case OMAP_L3_CODE_REQ_TOUT_NOT_ACCEPT:
+ return "Request Timeout Not Accepted";
+ case OMAP_L3_CODE_REQ_TOUT_NO_RESP:
+ return "Request Timeout, no response";
+ default:
+ return "UNKNOWN error";
+ }
+}
+
+static char *omap3_l3_initiator_string(u8 initid)
+{
+ switch (initid) {
+ case OMAP_L3_LCD:
+ return "LCD";
+ case OMAP_L3_SAD2D:
+ return "SAD2D";
+ case OMAP_L3_IA_MPU_SS_1:
+ case OMAP_L3_IA_MPU_SS_2:
+ case OMAP_L3_IA_MPU_SS_3:
+ case OMAP_L3_IA_MPU_SS_4:
+ case OMAP_L3_IA_MPU_SS_5:
+ return "MPU";
+ case OMAP_L3_IA_IVA_SS_1:
+ case OMAP_L3_IA_IVA_SS_2:
+ case OMAP_L3_IA_IVA_SS_3:
+ return "IVA_SS";
+ case OMAP_L3_IA_IVA_SS_DMA_1:
+ case OMAP_L3_IA_IVA_SS_DMA_2:
+ case OMAP_L3_IA_IVA_SS_DMA_3:
+ case OMAP_L3_IA_IVA_SS_DMA_4:
+ case OMAP_L3_IA_IVA_SS_DMA_5:
+ case OMAP_L3_IA_IVA_SS_DMA_6:
+ return "IVA_SS_DMA";
+ case OMAP_L3_IA_SGX:
+ return "SGX";
+ case OMAP_L3_IA_CAM_1:
+ case OMAP_L3_IA_CAM_2:
+ case OMAP_L3_IA_CAM_3:
+ return "CAM";
+ case OMAP_L3_IA_DAP:
+ return "DAP";
+ case OMAP_L3_SDMA_WR_1:
+ case OMAP_L3_SDMA_WR_2:
+ return "SDMA_WR";
+ case OMAP_L3_SDMA_RD_1:
+ case OMAP_L3_SDMA_RD_2:
+ case OMAP_L3_SDMA_RD_3:
+ case OMAP_L3_SDMA_RD_4:
+ return "SDMA_RD";
+ case OMAP_L3_USBOTG:
+ return "USB_OTG";
+ case OMAP_L3_USBHOST:
+ return "USB_HOST";
+ default:
+ return "UNKNOWN Initiator";
+ }
+}
+
+/**
+ * omap3_l3_block_irq - handles a register block's irq
+ * @l3: struct omap3_l3 *
+ * @base: register block base address
+ * @error: L3_ERROR_LOG register of our block
+ *
+ * Called in hard-irq context. Caller should take care of locking
+ *
+ * OMAP36xx TRM gives, on page 2001, Figure 9-10, the Typical Error
+ * Analysis Sequence, we are following that sequence here, please
+ * refer to that Figure for more information on the subject.
+ */
+static irqreturn_t omap3_l3_block_irq(struct omap3_l3 *l3,
+ u64 error, int error_addr)
+{
+ u8 code = omap3_l3_decode_error_code(error);
+ u8 initid = omap3_l3_decode_initid(error);
+ u8 multi = error & L3_ERROR_LOG_MULTI;
+ u32 address = omap3_l3_decode_addr(error_addr);
+
+ WARN(true, "%s Error seen by %s %s at address %x\n",
+ omap3_l3_code_string(code),
+ omap3_l3_initiator_string(initid),
+ multi ? "Multiple Errors" : "",
+ address);
+
+ return IRQ_HANDLED;
+}
+
+static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
+{
+ struct omap3_l3 *l3 = _l3;
+
+ u64 status, clear;
+ u64 error;
+ u64 error_addr;
+ u64 err_source = 0;
+ void __iomem *base;
+ int int_type;
+
+ irqreturn_t ret = IRQ_NONE;
+
+ if (irq == l3->app_irq)
+ int_type = L3_APPLICATION_ERROR;
+ else
+ int_type = L3_DEBUG_ERROR;
+
+ if (!int_type) {
+ status = omap3_l3_readll(l3->rt, L3_SI_FLAG_STATUS_0);
+ /*
+ * if we have a timeout error, there's nothing we can
+ * do besides rebooting the board. So let's BUG on any
+ * of such errors and handle the others. timeout error
+ * is severe and not expected to occur.
+ */
+ BUG_ON(status & L3_STATUS_0_TIMEOUT_MASK);
+ } else {
+ status = omap3_l3_readll(l3->rt, L3_SI_FLAG_STATUS_1);
+ /* No timeout error for debug sources */
+ }
+
+ base = ((l3->rt) + (*(omap3_l3_bases[int_type] + err_source)));
+
+ /* identify the error source */
+ for (err_source = 0; !(status & (1 << err_source)); err_source++)
+ ;
+ error = omap3_l3_readll(base, L3_ERROR_LOG);
+
+ if (error) {
+ error_addr = omap3_l3_readll(base, L3_ERROR_LOG_ADDR);
+
+ ret |= omap3_l3_block_irq(l3, error, error_addr);
+ }
+
+ /* Clear the status register */
+ clear = ((L3_AGENT_STATUS_CLEAR_IA << int_type) |
+ (L3_AGENT_STATUS_CLEAR_TA));
+
+ omap3_l3_writell(base, L3_AGENT_STATUS, clear);
+
+ /* clear the error log register */
+ omap3_l3_writell(base, L3_ERROR_LOG, error);
+
+ return ret;
+}
+
+static int __init omap3_l3_probe(struct platform_device *pdev)
+{
+ struct omap3_l3 *l3;
+ struct resource *res;
+ int ret;
+ int irq;
+
+ l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
+ if (!l3) {
+ ret = -ENOMEM;
+ goto err0;
+ }
+
+ platform_set_drvdata(pdev, l3);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "couldn't find resource\n");
+ ret = -ENODEV;
+ goto err1;
+ }
+ l3->rt = ioremap(res->start, resource_size(res));
+ if (!(l3->rt)) {
+ dev_err(&pdev->dev, "ioremap failed\n");
+ ret = -ENOMEM;
+ goto err2;
+ }
+
+ irq = platform_get_irq(pdev, 0);
+ ret = request_irq(irq, omap3_l3_app_irq,
+ IRQF_DISABLED | IRQF_TRIGGER_RISING,
+ "l3-debug-irq", l3);
+ if (ret) {
+ dev_err(&pdev->dev, "couldn't request debug irq\n");
+ goto err3;
+ }
+ l3->debug_irq = irq;
+
+ irq = platform_get_irq(pdev, 1);
+ ret = request_irq(irq, omap3_l3_app_irq,
+ IRQF_DISABLED | IRQF_TRIGGER_RISING,
+ "l3-app-irq", l3);
+
+ if (ret) {
+ dev_err(&pdev->dev, "couldn't request app irq\n");
+ goto err4;
+ }
+
+ l3->app_irq = irq;
+ goto err0;
+
+err4:
+err3:
+ iounmap(l3->rt);
+err2:
+err1:
+ kfree(l3);
+err0:
+ return ret;
+}
+
+static int __exit omap3_l3_remove(struct platform_device *pdev)
+{
+ struct omap3_l3 *l3 = platform_get_drvdata(pdev);
+
+ free_irq(l3->app_irq, l3);
+ free_irq(l3->debug_irq, l3);
+ iounmap(l3->rt);
+ kfree(l3);
+
+ return 0;
+}
+
+static struct platform_driver omap3_l3_driver = {
+ .remove = __exit_p(omap3_l3_remove),
+ .driver = {
+ .name = "omap3-l3-interconnect",
+ },
+};
+
+static int __init omap3_l3_init(void)
+{
+ return platform_driver_probe(&omap3_l3_driver, omap3_l3_probe);
+}
+postcore_initcall_sync(omap3_l3_init);
+
+static void __exit omap3_l3_exit(void)
+{
+ platform_driver_unregister(&omap3_l3_driver);
+}
+module_exit(omap3_l3_exit);
diff --git a/arch/arm/mach-omap2/l3_interconnect_3xxx.h b/arch/arm/mach-omap2/l3_interconnect_3xxx.h
new file mode 100644
index 0000000..d04db61
--- /dev/null
+++ b/arch/arm/mach-omap2/l3_interconnect_3xxx.h
@@ -0,0 +1,338 @@
+ /*
+ * L3 Interconnect Driver header
+ *
+ * Copyright (C) 2011 Texas Corporation
+ * Felipe Balbi <balbi@ti.com>
+ * Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * sricharan <r.sricharan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+#ifndef __ARCH_ARM_MACH_OMAP2_L3_INTERCONNECT_3XXX_H
+#define __ARCH_ARM_MACH_OMAP2_L3_INTERCONNECT_3XXX_H
+
+/* Register definitions. All 64-bit wide */
+#define L3_COMPONENT 0x000
+#define L3_CORE 0x018
+#define L3_AGENT_CONTROL 0x020
+#define L3_AGENT_STATUS 0x028
+#define L3_ERROR_LOG 0x058
+
+#define L3_ERROR_LOG_MULTI (1 << 31)
+#define L3_ERROR_LOG_SECONDARY (1 << 30)
+
+#define L3_ERROR_LOG_ADDR 0x060
+
+/* Register definitions for Sideband Interconnect */
+#define L3_SI_CONTROL 0x020
+#define L3_SI_FLAG_STATUS_0 0x510
+
+const u64 shift = 1;
+
+#define L3_STATUS_0_MPUIA_BRST (shift << 0)
+#define L3_STATUS_0_MPUIA_RSP (shift << 1)
+#define L3_STATUS_0_MPUIA_INBAND (shift << 2)
+#define L3_STATUS_0_IVAIA_BRST (shift << 6)
+#define L3_STATUS_0_IVAIA_RSP (shift << 7)
+#define L3_STATUS_0_IVAIA_INBAND (shift << 8)
+#define L3_STATUS_0_SGXIA_BRST (shift << 9)
+#define L3_STATUS_0_SGXIA_RSP (shift << 10)
+#define L3_STATUS_0_SGXIA_MERROR (shift << 11)
+#define L3_STATUS_0_CAMIA_BRST (shift << 12)
+#define L3_STATUS_0_CAMIA_RSP (shift << 13)
+#define L3_STATUS_0_CAMIA_INBAND (shift << 14)
+#define L3_STATUS_0_DISPIA_BRST (shift << 15)
+#define L3_STATUS_0_DISPIA_RSP (shift << 16)
+#define L3_STATUS_0_DMARDIA_BRST (shift << 18)
+#define L3_STATUS_0_DMARDIA_RSP (shift << 19)
+#define L3_STATUS_0_DMAWRIA_BRST (shift << 21)
+#define L3_STATUS_0_DMAWRIA_RSP (shift << 22)
+#define L3_STATUS_0_USBOTGIA_BRST (shift << 24)
+#define L3_STATUS_0_USBOTGIA_RSP (shift << 25)
+#define L3_STATUS_0_USBOTGIA_INBAND (shift << 26)
+#define L3_STATUS_0_USBHOSTIA_BRST (shift << 27)
+#define L3_STATUS_0_USBHOSTIA_INBAND (shift << 28)
+#define L3_STATUS_0_SMSTA_REQ (shift << 48)
+#define L3_STATUS_0_GPMCTA_REQ (shift << 49)
+#define L3_STATUS_0_OCMRAMTA_REQ (shift << 50)
+#define L3_STATUS_0_OCMROMTA_REQ (shift << 51)
+#define L3_STATUS_0_IVATA_REQ (shift << 54)
+#define L3_STATUS_0_SGXTA_REQ (shift << 55)
+#define L3_STATUS_0_SGXTA_SERROR (shift << 56)
+#define L3_STATUS_0_GPMCTA_SERROR (shift << 57)
+#define L3_STATUS_0_L4CORETA_REQ (shift << 58)
+#define L3_STATUS_0_L4PERTA_REQ (shift << 59)
+#define L3_STATUS_0_L4EMUTA_REQ (shift << 60)
+#define L3_STATUS_0_MAD2DTA_REQ (shift << 61)
+
+#define L3_STATUS_0_TIMEOUT_MASK (L3_STATUS_0_MPUIA_BRST \
+ | L3_STATUS_0_MPUIA_RSP \
+ | L3_STATUS_0_IVAIA_BRST \
+ | L3_STATUS_0_IVAIA_RSP \
+ | L3_STATUS_0_SGXIA_BRST \
+ | L3_STATUS_0_SGXIA_RSP \
+ | L3_STATUS_0_CAMIA_BRST \
+ | L3_STATUS_0_CAMIA_RSP \
+ | L3_STATUS_0_DISPIA_BRST \
+ | L3_STATUS_0_DISPIA_RSP \
+ | L3_STATUS_0_DMARDIA_BRST \
+ | L3_STATUS_0_DMARDIA_RSP \
+ | L3_STATUS_0_DMAWRIA_BRST \
+ | L3_STATUS_0_DMAWRIA_RSP \
+ | L3_STATUS_0_USBOTGIA_BRST \
+ | L3_STATUS_0_USBOTGIA_RSP \
+ | L3_STATUS_0_USBHOSTIA_BRST \
+ | L3_STATUS_0_SMSTA_REQ \
+ | L3_STATUS_0_GPMCTA_REQ \
+ | L3_STATUS_0_OCMRAMTA_REQ \
+ | L3_STATUS_0_OCMROMTA_REQ \
+ | L3_STATUS_0_IVATA_REQ \
+ | L3_STATUS_0_SGXTA_REQ \
+ | L3_STATUS_0_L4CORETA_REQ \
+ | L3_STATUS_0_L4PERTA_REQ \
+ | L3_STATUS_0_L4EMUTA_REQ \
+ | L3_STATUS_0_MAD2DTA_REQ)
+
+#define L3_SI_FLAG_STATUS_1 0x530
+
+#define L3_STATUS_1_MPU_DATAIA (1 << 0)
+#define L3_STATUS_1_DAPIA0 (1 << 3)
+#define L3_STATUS_1_DAPIA1 (1 << 4)
+#define L3_STATUS_1_IVAIA (1 << 6)
+
+#define L3_PM_ERROR_LOG 0x020
+#define L3_PM_CONTROL 0x028
+#define L3_PM_ERROR_CLEAR_SINGLE 0x030
+#define L3_PM_ERROR_CLEAR_MULTI 0x038
+#define L3_PM_REQ_INFO_PERMISSION(n) (0x048 + (0x020 * n))
+#define L3_PM_READ_PERMISSION(n) (0x050 + (0x020 * n))
+#define L3_PM_WRITE_PERMISSION(n) (0x058 + (0x020 * n))
+#define L3_PM_ADDR_MATCH(n) (0x060 + (0x020 * n))
+
+/* L3 error log bit fields. Common for IA and TA */
+#define L3_ERROR_LOG_CODE 24
+#define L3_ERROR_LOG_INITID 8
+#define L3_ERROR_LOG_CMD 0
+
+/* L3 agent status bit fields. */
+#define L3_AGENT_STATUS_CLEAR_IA 0x10000000
+#define L3_AGENT_STATUS_CLEAR_TA 0x01000000
+
+#define OMAP34xx_IRQ_L3_APP 10
+#define L3_APPLICATION_ERROR 0x0
+#define L3_DEBUG_ERROR 0x1
+
+enum omap3_l3_initiator_id {
+ /* LCD has 1 ID */
+ OMAP_L3_LCD = 29,
+ /* SAD2D has 1 ID */
+ OMAP_L3_SAD2D = 28,
+ /* MPU has 5 IDs */
+ OMAP_L3_IA_MPU_SS_1 = 27,
+ OMAP_L3_IA_MPU_SS_2 = 26,
+ OMAP_L3_IA_MPU_SS_3 = 25,
+ OMAP_L3_IA_MPU_SS_4 = 24,
+ OMAP_L3_IA_MPU_SS_5 = 23,
+ /* IVA2.2 SS has 3 IDs*/
+ OMAP_L3_IA_IVA_SS_1 = 22,
+ OMAP_L3_IA_IVA_SS_2 = 21,
+ OMAP_L3_IA_IVA_SS_3 = 20,
+ /* IVA 2.2 SS DMA has 6 IDS */
+ OMAP_L3_IA_IVA_SS_DMA_1 = 19,
+ OMAP_L3_IA_IVA_SS_DMA_2 = 18,
+ OMAP_L3_IA_IVA_SS_DMA_3 = 17,
+ OMAP_L3_IA_IVA_SS_DMA_4 = 16,
+ OMAP_L3_IA_IVA_SS_DMA_5 = 15,
+ OMAP_L3_IA_IVA_SS_DMA_6 = 14,
+ /* SGX has 1 ID */
+ OMAP_L3_IA_SGX = 13,
+ /* CAM has 3 ID */
+ OMAP_L3_IA_CAM_1 = 12,
+ OMAP_L3_IA_CAM_2 = 11,
+ OMAP_L3_IA_CAM_3 = 10,
+ /* DAP has 1 ID */
+ OMAP_L3_IA_DAP = 9,
+ /* SDMA WR has 2 IDs */
+ OMAP_L3_SDMA_WR_1 = 8,
+ OMAP_L3_SDMA_WR_2 = 7,
+ /* SDMA RD has 4 IDs */
+ OMAP_L3_SDMA_RD_1 = 6,
+ OMAP_L3_SDMA_RD_2 = 5,
+ OMAP_L3_SDMA_RD_3 = 4,
+ OMAP_L3_SDMA_RD_4 = 3,
+ /* HSUSB OTG has 1 ID */
+ OMAP_L3_USBOTG = 2,
+ /* HSUSB HOST has 1 ID */
+ OMAP_L3_USBHOST = 1,
+};
+
+enum omap3_l3_code {
+ OMAP_L3_CODE_NOERROR = 0,
+ OMAP_L3_CODE_UNSUP_CMD = 1,
+ OMAP_L3_CODE_ADDR_HOLE = 2,
+ OMAP_L3_CODE_PROTECT_VIOLATION = 3,
+ OMAP_L3_CODE_IN_BAND_ERR = 4,
+ /* codes 5 and 6 are reserved */
+ OMAP_L3_CODE_REQ_TOUT_NOT_ACCEPT = 7,
+ OMAP_L3_CODE_REQ_TOUT_NO_RESP = 8,
+ /* codes 9 - 15 are also reserved */
+};
+
+struct omap3_l3 {
+ struct device *dev;
+ struct clk *ick;
+
+ /* memory base*/
+ void __iomem *rt;
+
+ int debug_irq;
+ int app_irq;
+
+ /* true when and inband functional error occurs */
+ unsigned inband:1;
+};
+
+/* offsets for l3 agents in order with the Flag status register */
+unsigned int __iomem omap3_l3_app_bases[] = {
+ /* MPU IA */
+ 0x1400,
+ 0x1400,
+ 0x1400,
+ /* RESERVED */
+ 0,
+ 0,
+ 0,
+ /* IVA 2.2 IA */
+ 0x1800,
+ 0x1800,
+ 0x1800,
+ /* SGX IA */
+ 0x1c00,
+ 0x1c00,
+ /* RESERVED */
+ 0,
+ /* CAMERA IA */
+ 0x5800,
+ 0x5800,
+ 0x5800,
+ /* DISPLAY IA */
+ 0x5400,
+ 0x5400,
+ /* RESERVED */
+ 0,
+ /*SDMA RD IA */
+ 0x4c00,
+ 0x4c00,
+ /* RESERVED */
+ 0,
+ /* SDMA WR IA */
+ 0x5000,
+ 0x5000,
+ /* RESERVED */
+ 0,
+ /* USB OTG IA */
+ 0x4400,
+ 0x4400,
+ 0x4400,
+ /* USB HOST IA */
+ 0x4000,
+ 0x4000,
+ /* RESERVED */
+ 0,
+ 0,
+ 0,
+ 0,
+ /* SAD2D IA */
+ 0x3000,
+ 0x3000,
+ 0x3000,
+ /* RESERVED */
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ /* SMA TA */
+ 0x2000,
+ /* GPMC TA */
+ 0x2400,
+ /* OCM RAM TA */
+ 0x2800,
+ /* OCM ROM TA */
+ 0x2C00,
+ /* L4 CORE TA */
+ 0x6800,
+ /* L4 PER TA */
+ 0x6c00,
+ /* IVA 2.2 TA */
+ 0x6000,
+ /* SGX TA */
+ 0x6400,
+ /* L4 EMU TA */
+ 0x7000,
+ /* GPMC TA */
+ 0x2400,
+ /* L4 CORE TA */
+ 0x6800,
+ /* L4 PER TA */
+ 0x6c00,
+ /* L4 EMU TA */
+ 0x7000,
+ /* MAD2D TA */
+ 0x3400,
+ /* RESERVED */
+ 0,
+ 0,
+};
+
+unsigned int __iomem omap3_l3_debug_bases[] = {
+ /* MPU DATA IA */
+ 0x1400,
+ /* RESERVED */
+ 0,
+ 0,
+ /* DAP IA */
+ 0x5c00,
+ 0x5c00,
+ /* RESERVED */
+ 0,
+ /* IVA 2.2 IA */
+ 0x1800,
+ /* REST RESERVED */
+};
+
+u32 *omap3_l3_bases[] = {
+ omap3_l3_app_bases,
+ omap3_l3_debug_bases,
+};
+
+/*
+ * REVISIT define __raw_readll/__raw_writell here, but move them to
+ * <asm/io.h> at some point
+ */
+#define __raw_writell(v, a) (__chk_io_ptr(a), \
+ *(volatile u64 __force *)(a) = (v))
+#define __raw_readll(a) (__chk_io_ptr(a), \
+ *(volatile u64 __force *)(a))
+
+#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
` (2 preceding siblings ...)
2011-02-21 13:46 ` [PATCH 3/6] omap3: l3: Introduce l3-interconnect error handling driver Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
2011-02-21 14:39 ` Cousson, Benoit
2011-02-21 13:46 ` [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data Santosh Shilimkar
2011-02-21 13:46 ` [PATCH 6/6] omap4: l3: Introduce l3-interconnect error handling driver Santosh Shilimkar
5 siblings, 1 reply; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan, Santosh Shilimkar
From: sricharan <r.sricharan@ti.com>
Add the error log registers, irqs of the l3 interconnect to the
hwmod data. The hwmod change is aligned with Benoit Cousson.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: sricharan <r.sricharan@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c2806bd..95001d4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_1 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 target configuration and error log registers */
+static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
+ { .irq = 9 + OMAP44XX_IRQ_GIC_START },
+ { .irq = 10 + OMAP44XX_IRQ_GIC_START },
+};
+
+static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x44000000,
+ .pa_end = 0x44100000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x44800000,
+ .pa_end = 0x44900000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x45000000,
+ .pa_end = 0x45100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* mpu -> l3_main_1 */
static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
.master = &omap44xx_mpu_hwmod,
.slave = &omap44xx_l3_main_1_hwmod,
.clk = "l3_div_ck",
+ .addr = omap44xx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap44xx_l3_targ_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
@@ -248,6 +274,8 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
.name = "l3_main_1",
.class = &omap44xx_l3_hwmod_class,
+ .mpu_irqs = omap44xx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_l3_targ_irqs),
.slaves = omap44xx_l3_main_1_slaves,
.slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-21 13:46 ` [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database Santosh Shilimkar
@ 2011-02-21 14:39 ` Cousson, Benoit
2011-02-23 5:38 ` Sricharan R
` (2 more replies)
0 siblings, 3 replies; 24+ messages in thread
From: Cousson, Benoit @ 2011-02-21 14:39 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: linux-omap@vger.kernel.org, Balbi, Felipe, R, Sricharan
Hi Sricharan,
On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
> From: sricharan<r.sricharan@ti.com>
>
> Add the error log registers, irqs of the l3 interconnect to the
> hwmod data. The hwmod change is aligned with Benoit Cousson.
The change is almost aligned with Benoit Cousson :-)
The subject should be something like: omap4: hwmod data: Add address
space and irq in L3 hwmod
There is no errolog data in that patch. The changelog should be updated too.
> Signed-off-by: Santosh Shilimkar<santosh.shilimkar@ti.com>
> Signed-off-by: sricharan<r.sricharan@ti.com>
> Tested-by: sricharan<r.sricharan@ti.com>
> Cc: Benoit Cousson<b-cousson@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28 ++++++++++++++++++++++++++++
> 1 files changed, 28 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index c2806bd..95001d4 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_1 = {
> .user = OCP_USER_MPU | OCP_USER_SDMA,
> };
>
> +/* L3 target configuration and error log registers */
> +static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
> + { .irq = 9 + OMAP44XX_IRQ_GIC_START },
> + { .irq = 10 + OMAP44XX_IRQ_GIC_START },
> +};
> +
> +static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
> + {
> + .pa_start = 0x44000000,
> + .pa_end = 0x44100000,
> + .flags = ADDR_TYPE_RT,
> + },
> + {
> + .pa_start = 0x44800000,
> + .pa_end = 0x44900000,
> + .flags = ADDR_TYPE_RT,
> + },
> + {
> + .pa_start = 0x45000000,
> + .pa_end = 0x45100000,
> + .flags = ADDR_TYPE_RT,
IIRC, we do have one address space per l3_main instance, and we do have
3 instances and thus 3 hwmods.
So you should potentially duplicate the code below at hwmod structure
level and not only at address space level.
In that case, you will re-group the 3 instances in only one omap_device.
For the IRQ, in theory we should duplicate the same entry 3 times just
in case someone want to use only the second instance. But, I'm still not
convinced this is the right thing to do... so let's keep it only for
l3_main_1 for the moment.
Regards,
Benoit
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-21 14:39 ` Cousson, Benoit
@ 2011-02-23 5:38 ` Sricharan R
2011-02-23 8:04 ` Sricharan R
2011-02-23 8:14 ` Sricharan R
2 siblings, 0 replies; 24+ messages in thread
From: Sricharan R @ 2011-02-23 5:38 UTC (permalink / raw)
To: Benoit Cousson, Santosh Shilimkar; +Cc: linux-omap, Felipe Balbi
Hi Benoit,
>-----Original Message-----
>From: Cousson, Benoit [mailto:b-cousson@ti.com]
>Sent: Monday, February 21, 2011 8:10 PM
>To: Shilimkar, Santosh
>Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
>Subject: Re: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod
>database.
>
>Hi Sricharan,
>
>On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
>> From: sricharan<r.sricharan@ti.com>
>>
>> Add the error log registers, irqs of the l3 interconnect to the
>> hwmod data. The hwmod change is aligned with Benoit Cousson.
>
>The change is almost aligned with Benoit Cousson :-)
>
>The subject should be something like: omap4: hwmod data: Add address
>space and irq in L3 hwmod
>
>There is no errolog data in that patch. The changelog should be updated
>too.
Ok. I will change the subject and the change log as well.
>
>> Signed-off-by: Santosh Shilimkar<santosh.shilimkar@ti.com>
>> Signed-off-by: sricharan<r.sricharan@ti.com>
>> Tested-by: sricharan<r.sricharan@ti.com>
>> Cc: Benoit Cousson<b-cousson@ti.com>
>> ---
>> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28
>++++++++++++++++++++++++++++
>> 1 files changed, 28 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
b/arch/arm/mach-
>omap2/omap_hwmod_44xx_data.c
>> index c2806bd..95001d4 100644
>> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>> @@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if
>omap44xx_l4_cfg__l3_main_1 = {
>> .user = OCP_USER_MPU | OCP_USER_SDMA,
>> };
>>
>> +/* L3 target configuration and error log registers */
>> +static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
>> + { .irq = 9 + OMAP44XX_IRQ_GIC_START },
>> + { .irq = 10 + OMAP44XX_IRQ_GIC_START },
>> +};
>> +
>> +static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
>> + {
>> + .pa_start = 0x44000000,
>> + .pa_end = 0x44100000,
>> + .flags = ADDR_TYPE_RT,
>> + },
>> + {
>> + .pa_start = 0x44800000,
>> + .pa_end = 0x44900000,
>> + .flags = ADDR_TYPE_RT,
>> + },
>> + {
>> + .pa_start = 0x45000000,
>> + .pa_end = 0x45100000,
>> + .flags = ADDR_TYPE_RT,
>
>IIRC, we do have one address space per l3_main instance, and we do have
>3 instances and thus 3 hwmods.
>So you should potentially duplicate the code below at hwmod structure
>level and not only at address space level.
>
>In that case, you will re-group the 3 instances in only one omap_device.
>For the IRQ, in theory we should duplicate the same entry 3 times just
>in case someone want to use only the second instance. But, I'm still not
>convinced this is the right thing to do... so let's keep it only for
>l3_main_1 for the moment.
Ok.
>
>Regards,
>Benoit
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-21 14:39 ` Cousson, Benoit
2011-02-23 5:38 ` Sricharan R
@ 2011-02-23 8:04 ` Sricharan R
2011-03-04 21:34 ` Cousson, Benoit
2011-02-23 8:14 ` Sricharan R
2 siblings, 1 reply; 24+ messages in thread
From: Sricharan R @ 2011-02-23 8:04 UTC (permalink / raw)
To: Sricharan R, Benoit Cousson, Santosh Shilimkar; +Cc: linux-omap, Felipe Balbi
Hi Benoit,
>-----Original Message-----
>From: Sricharan R [mailto:r.sricharan@ti.com]
>Sent: Wednesday, February 23, 2011 11:09 AM
>To: Benoit Cousson; Santosh Shilimkar
>Cc: 'linux-omap@vger.kernel.org'; Felipe Balbi
>Subject: RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod
>database.
>
>Hi Benoit,
>>-----Original Message-----
>>From: Cousson, Benoit [mailto:b-cousson@ti.com]
>>Sent: Monday, February 21, 2011 8:10 PM
>>To: Shilimkar, Santosh
>>Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
>>Subject: Re: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to
hwmod
>>database.
>>
>>Hi Sricharan,
>>
>>On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
>>> From: sricharan<r.sricharan@ti.com>
>>>
>>> Add the error log registers, irqs of the l3 interconnect to the
>>> hwmod data. The hwmod change is aligned with Benoit Cousson.
>>
>>The change is almost aligned with Benoit Cousson :-)
>>
>>The subject should be something like: omap4: hwmod data: Add address
>>space and irq in L3 hwmod
>>
>>There is no errolog data in that patch. The changelog should be updated
>>too.
>Ok. I will change the subject and the change log as well.
Here is the updated patch as per your suggestion.
---------------
[PATCH v2 4/6] omap4: hwmod_data: Add address space and irq in L3 hwmod.
Add the address spaces, irqs of the l3 interconnect to the hwmod data. The
hwmod change is aligned with Benoit Cousson.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: sricharan <r.sricharan@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
changed the subject line and the changelog
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28
++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c2806bd..95001d4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if
omap44xx_l4_cfg__l3_main_1 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 target configuration and error log registers */ static struct
+omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
+ { .irq = 9 + OMAP44XX_IRQ_GIC_START },
+ { .irq = 10 + OMAP44XX_IRQ_GIC_START }, };
+
+static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x44000000,
+ .pa_end = 0x44100000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x44800000,
+ .pa_end = 0x44900000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x45000000,
+ .pa_end = 0x45100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* mpu -> l3_main_1 */
static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
.master = &omap44xx_mpu_hwmod,
.slave = &omap44xx_l3_main_1_hwmod,
.clk = "l3_div_ck",
+ .addr = omap44xx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap44xx_l3_targ_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
@@ -248,6 +274,8 @@ static struct omap_hwmod_ocp_if
*omap44xx_l3_main_1_slaves[] = { static struct omap_hwmod
omap44xx_l3_main_1_hwmod = {
.name = "l3_main_1",
.class = &omap44xx_l3_hwmod_class,
+ .mpu_irqs = omap44xx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_l3_targ_irqs),
.slaves = omap44xx_l3_main_1_slaves,
.slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
--
1.7.0.4
Thanks,
Sricharan
^ permalink raw reply related [flat|nested] 24+ messages in thread* RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-23 8:04 ` Sricharan R
@ 2011-03-04 21:34 ` Cousson, Benoit
2011-03-05 7:51 ` Santosh Shilimkar
0 siblings, 1 reply; 24+ messages in thread
From: Cousson, Benoit @ 2011-03-04 21:34 UTC (permalink / raw)
To: R, Sricharan, Shilimkar, Santosh
Cc: linux-omap@vger.kernel.org, Balbi, Felipe
Hi Sricharan,
I think you missed some of my feedbacks.
>From: R, Sricharan
>Sent: Wednesday, February 23, 2011 9:04 AM
>
>Hi Benoit,
>>From: Sricharan R [mailto:r.sricharan@ti.com]
>>Sent: Wednesday, February 23, 2011 11:09 AM
>>To: Benoit Cousson; Santosh Shilimkar
>>Cc: 'linux-omap@vger.kernel.org'; Felipe Balbi
>>Subject: RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog
>data to hwmod
>>database.
>>
>>Hi Benoit,
>>>
Texas Instruments France SA, 821 Avenue Jack Kilby, 06270 Villeneuve Loubet. 036 420 040 R.C.S Antibes. Capital de EUR 753.920
-----Original Message-----
>>>From: Cousson, Benoit [mailto:b-cousson@ti.com]
>>>Sent: Monday, February 21, 2011 8:10 PM
>>>To: Shilimkar, Santosh
>>>Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
>>>Subject: Re: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to
>hwmod
>>>database.
>>>
>>>Hi Sricharan,
>>>
>>>On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
>>>> From: sricharan<r.sricharan@ti.com>
>>>>
>>>> Add the error log registers, irqs of the l3 interconnect to the
>>>> hwmod data. The hwmod change is aligned with Benoit Cousson.
>>>
>>>The change is almost aligned with Benoit Cousson :-)
>>>
>>>The subject should be something like: omap4: hwmod data: Add address
>>>space and irq in L3 hwmod
>>>
>>>There is no errolog data in that patch. The changelog should
>be updated
>>>too.
>>Ok. I will change the subject and the change log as well.
>
>Here is the updated patch as per your suggestion.
>---------------
>[PATCH v2 4/6] omap4: hwmod_data: Add address space and irq in
>L3 hwmod.
>
>Add the address spaces, irqs of the l3 interconnect to the
>hwmod data. The
>hwmod change is aligned with Benoit Cousson.
>
>Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>Signed-off-by: sricharan <r.sricharan@ti.com>
>Tested-by: sricharan <r.sricharan@ti.com>
>Cc: Benoit Cousson <b-cousson@ti.com>
>---
>changed the subject line and the changelog
>
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28
>++++++++++++++++++++++++++++
> 1 files changed, 28 insertions(+), 0 deletions(-)
>
>diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>index c2806bd..95001d4 100644
>--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
>@@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if
>omap44xx_l4_cfg__l3_main_1 = {
> .user = OCP_USER_MPU | OCP_USER_SDMA,
> };
>
>+/* L3 target configuration and error log registers */ static struct
>+omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
>+ { .irq = 9 + OMAP44XX_IRQ_GIC_START },
>+ { .irq = 10 + OMAP44XX_IRQ_GIC_START }, };
>+
>+static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
should be named:
+static struct omap_hwmod_addr_space omap44xx_l3_main_1_addrs[] = {
+ {
+ .pa_start = 0x44000000,
+ .pa_end = 0x44100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
And that one should be separated because it belongs to l3_main_2
+static struct omap_hwmod_addr_space omap44xx_l3_main_2_addrs[] = {
+ {
+ .pa_start = 0x44800000,
+ .pa_end = 0x44900000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
And that one should be separated as well because it belongs to l3_main_3
static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
+ {
+ .pa_start = 0x45000000,
+ .pa_end = 0x45100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
You should thus update omap44xx_l3_main_1__l3_main_2 and omap44xx_l3_main_1__l3_main_3 as well with the proper address space.
Regards,
Benoit
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-03-04 21:34 ` Cousson, Benoit
@ 2011-03-05 7:51 ` Santosh Shilimkar
0 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-03-05 7:51 UTC (permalink / raw)
To: Benoit Cousson; +Cc: linux-omap, Felipe Balbi, Sricharan R
Benoit,
> -----Original Message-----
> From: Cousson, Benoit [mailto:b-cousson@ti.com]
> Sent: Saturday, March 05, 2011 3:04 AM
> To: R, Sricharan; Shilimkar, Santosh
> Cc: linux-omap@vger.kernel.org; Balbi, Felipe
> Subject: RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to
> hwmod database.
>
> Hi Sricharan,
>
> I think you missed some of my feedbacks.
>
Will fix your remarks on this one.
Can you also confirm your file name preference?
Once you confirm that I will rebase this series
against omap-for-linus, and send pull request to
Tony.
Regards,
Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database.
2011-02-21 14:39 ` Cousson, Benoit
2011-02-23 5:38 ` Sricharan R
2011-02-23 8:04 ` Sricharan R
@ 2011-02-23 8:14 ` Sricharan R
2 siblings, 0 replies; 24+ messages in thread
From: Sricharan R @ 2011-02-23 8:14 UTC (permalink / raw)
To: Benoit Cousson, Santosh Shilimkar; +Cc: linux-omap, Felipe Balbi
Hi Benoit,
>-----Original Message-----
>From: Sricharan R [mailto:r.sricharan@ti.com]
>Sent: Wednesday, February 23, 2011 11:09 AM
>To: Benoit Cousson; Santosh Shilimkar
>Cc: 'linux-omap@vger.kernel.org'; Felipe Balbi
>Subject: RE: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod
>database.
>
>Hi Benoit,
>>-----Original Message-----
>>From: Cousson, Benoit [mailto:b-cousson@ti.com]
>>Sent: Monday, February 21, 2011 8:10 PM
>>To: Shilimkar, Santosh
>>Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
>>Subject: Re: [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to
hwmod
>>database.
>>
>>Hi Sricharan,
>>
>>On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
>>> From: sricharan<r.sricharan@ti.com>
>>>
>>> Add the error log registers, irqs of the l3 interconnect to the
>>> hwmod data. The hwmod change is aligned with Benoit Cousson.
Hi Benoit,
>>
>>The change is almost aligned with Benoit Cousson :-)
>>
>>The subject should be something like: omap4: hwmod data: Add address
>>space and irq in L3 hwmod
>>
>>There is no errolog data in that patch. The changelog should be updated
>>too.
>Ok. I will change the subject and the change log as well.
>>
Here is the updated patch as per your suggestions.
---------------------
[PATCH v2 4/6] omap4: hwmod_data: Add address space and irq in L3 hwmod.
Add the address spaces, irqs of the l3 interconnect to the
hwmod data. The hwmod change is aligned with Benoit Cousson.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: sricharan <r.sricharan@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
changed the subject line and the changelog
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 28
++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c2806bd..95001d4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -229,11 +229,37 @@ static struct omap_hwmod_ocp_if
omap44xx_l4_cfg__l3_main_1 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* L3 target configuration and error log registers */
+static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
+ { .irq = 9 + OMAP44XX_IRQ_GIC_START },
+ { .irq = 10 + OMAP44XX_IRQ_GIC_START },
+};
+
+static struct omap_hwmod_addr_space omap44xx_l3_targ_addrs[] = {
+ {
+ .pa_start = 0x44000000,
+ .pa_end = 0x44100000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x44800000,
+ .pa_end = 0x44900000,
+ .flags = ADDR_TYPE_RT,
+ },
+ {
+ .pa_start = 0x45000000,
+ .pa_end = 0x45100000,
+ .flags = ADDR_TYPE_RT,
+ },
+};
+
/* mpu -> l3_main_1 */
static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
.master = &omap44xx_mpu_hwmod,
.slave = &omap44xx_l3_main_1_hwmod,
.clk = "l3_div_ck",
+ .addr = omap44xx_l3_targ_addrs,
+ .addr_cnt = ARRAY_SIZE(omap44xx_l3_targ_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
@@ -248,6 +274,8 @@ static struct omap_hwmod_ocp_if
*omap44xx_l3_main_1_slaves[] = {
static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
.name = "l3_main_1",
.class = &omap44xx_l3_hwmod_class,
+ .mpu_irqs = omap44xx_l3_targ_irqs,
+ .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_l3_targ_irqs),
.slaves = omap44xx_l3_main_1_slaves,
.slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
` (3 preceding siblings ...)
2011-02-21 13:46 ` [PATCH 4/6] omap4: hwmod_data: Add l3 errorlog data to hwmod database Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
2011-02-21 18:10 ` Cousson, Benoit
2011-02-21 13:46 ` [PATCH 6/6] omap4: l3: Introduce l3-interconnect error handling driver Santosh Shilimkar
5 siblings, 1 reply; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan
From: sricharan <r.sricharan@ti.com>
The l3 interconnect device is build with all the data required
to handle the error logging. The data is extracted from the
hwmod data base.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: sricharan <r.sricharan@ti.com>
Tested-by: sricharan <r.sricharan@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/devices.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2d46f55..25fa2ad 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -57,6 +57,29 @@ static int __init omap3_l3_init(void)
}
postcore_initcall(omap3_l3_init);
+static int __init omap4_l3_init(void)
+{
+ int l;
+ struct omap_hwmod *oh;
+ struct omap_device *od;
+ char oh_name[12];
+
+ l = snprintf(oh_name, 12, "l3_main_1");
+
+ oh = omap_hwmod_lookup(oh_name);
+
+ if (!oh)
+ pr_err("could not look up %s\n", oh_name);
+
+ od = omap_device_build("omap4-l3-interconnect", 0, oh, NULL,
+ 0, NULL, 0, 0);
+
+ WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
+
+ return PTR_ERR(od);
+}
+postcore_initcall(omap4_l3_init);
+
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
static struct resource cam_resources[] = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-02-21 13:46 ` [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data Santosh Shilimkar
@ 2011-02-21 18:10 ` Cousson, Benoit
2011-02-21 19:03 ` Santosh Shilimkar
0 siblings, 1 reply; 24+ messages in thread
From: Cousson, Benoit @ 2011-02-21 18:10 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: linux-omap@vger.kernel.org, Balbi, Felipe, R, Sricharan
On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
> From: sricharan<r.sricharan@ti.com>
>
> The l3 interconnect device is build with all the data required
> to handle the error logging. The data is extracted from the
> hwmod data base.
>
> Signed-off-by: sricharan<r.sricharan@ti.com>
> Signed-off-by: sricharan<r.sricharan@ti.com>
> Tested-by: sricharan<r.sricharan@ti.com>
Mmm, I'm not sure the tested-by is meaningfull in your case, since you
wrote the code and so everybody will assume you tested it.
One s-o-b should be probably enough.
> Cc: Benoit Cousson<b-cousson@ti.com>
> ---
> arch/arm/mach-omap2/devices.c | 23 +++++++++++++++++++++++
> 1 files changed, 23 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index 2d46f55..25fa2ad 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -57,6 +57,29 @@ static int __init omap3_l3_init(void)
> }
> postcore_initcall(omap3_l3_init);
>
> +static int __init omap4_l3_init(void)
> +{
> + int l;
> + struct omap_hwmod *oh;
> + struct omap_device *od;
> + char oh_name[12];
> +
> + l = snprintf(oh_name, 12, "l3_main_1");
> +
> + oh = omap_hwmod_lookup(oh_name);
> +
> + if (!oh)
> + pr_err("could not look up %s\n", oh_name);
> +
> + od = omap_device_build("omap4-l3-interconnect", 0, oh, NULL,
In order to stick to the OMAP device naming convention and to have
something not dependent of the chip version, I think we'd better name
the device like that: "omap_l3_noc". Since it is a Arteris "Network On
Chip" on OMAP4. We will not have to change it for OMAP5 then.
On OMAP3 the name can then be "omap_l3_smx" for the Sonics MX interconnect.
Please note that the L4 is in both case a Sonics 3220. But I don't think
the L4 is managed by this series.
Maybe the driver file name should be renamed accordingly.
Regards,
Benoit
> + 0, NULL, 0, 0);
> +
> + WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
> +
> + return PTR_ERR(od);
> +}
> +postcore_initcall(omap4_l3_init);
> +
> #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
>
> static struct resource cam_resources[] = {
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-02-21 18:10 ` Cousson, Benoit
@ 2011-02-21 19:03 ` Santosh Shilimkar
2011-03-03 18:31 ` Tony Lindgren
2011-03-07 10:22 ` Cousson, Benoit
0 siblings, 2 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 19:03 UTC (permalink / raw)
To: Benoit Cousson; +Cc: linux-omap, Felipe Balbi, Sricharan R
> -----Original Message-----
> From: Cousson, Benoit [mailto:b-cousson@ti.com]
> Sent: Monday, February 21, 2011 11:41 PM
> To: Shilimkar, Santosh
> Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
> Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
> hwmod data.
>
> On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
> > From: sricharan<r.sricharan@ti.com>
> >
> > The l3 interconnect device is build with all the data required
> > to handle the error logging. The data is extracted from the
> > hwmod data base.
> >
> > Signed-off-by: sricharan<r.sricharan@ti.com>
> > Signed-off-by: sricharan<r.sricharan@ti.com>
> > Tested-by: sricharan<r.sricharan@ti.com>
>
> Mmm, I'm not sure the tested-by is meaningfull in your case, since
> you wrote the code and so everybody will assume you tested it.
> One s-o-b should be probably enough.
>
Well he tested whole series including the patch from Felipe.
So a tested-by on whole series doesn't hurt, right ?
Just for record, I have seen tested by applied on whole series
Where as some of the patches in this series are just comment
updates.
> > Cc: Benoit Cousson<b-cousson@ti.com>
> > ---
> > arch/arm/mach-omap2/devices.c | 23 +++++++++++++++++++++++
> > 1 files changed, 23 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-
> omap2/devices.c
> > index 2d46f55..25fa2ad 100644
> > --- a/arch/arm/mach-omap2/devices.c
> > +++ b/arch/arm/mach-omap2/devices.c
> > @@ -57,6 +57,29 @@ static int __init omap3_l3_init(void)
> > }
> > postcore_initcall(omap3_l3_init);
> >
> > +static int __init omap4_l3_init(void)
> > +{
> > + int l;
> > + struct omap_hwmod *oh;
> > + struct omap_device *od;
> > + char oh_name[12];
> > +
> > + l = snprintf(oh_name, 12, "l3_main_1");
> > +
> > + oh = omap_hwmod_lookup(oh_name);
> > +
> > + if (!oh)
> > + pr_err("could not look up %s\n", oh_name);
> > +
> > + od = omap_device_build("omap4-l3-interconnect", 0, oh, NULL,
>
> In order to stick to the OMAP device naming convention and to have
> something not dependent of the chip version, I think we'd better
> name
> the device like that: "omap_l3_noc". Since it is a Arteris "Network
> On
> Chip" on OMAP4. We will not have to change it for OMAP5 then.
> On OMAP3 the name can then be "omap_l3_smx" for the Sonics MX
> interconnect.
>
Device name changes are fine but file name changes as per this.
dosn't look right if they are like
omap_l3_noc.c
omap_l3_smx.c
May be we can rename them like below
omap_l3_3xxx.c
omap_l3_4xxx.c
> Please note that the L4 is in both case a Sonics 3220. But I don't
> think
> the L4 is managed by this series.
> Maybe the driver file name should be renamed accordingly.
>
L4 is not included.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-02-21 19:03 ` Santosh Shilimkar
@ 2011-03-03 18:31 ` Tony Lindgren
2011-03-04 6:20 ` Santosh Shilimkar
2011-03-07 10:22 ` Cousson, Benoit
1 sibling, 1 reply; 24+ messages in thread
From: Tony Lindgren @ 2011-03-03 18:31 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: Benoit Cousson, linux-omap, Felipe Balbi, Sricharan R
* Santosh Shilimkar <santosh.shilimkar@ti.com> [110221 11:01]:
> > -----Original Message-----
> > From: Cousson, Benoit [mailto:b-cousson@ti.com]
> > Sent: Monday, February 21, 2011 11:41 PM
> > To: Shilimkar, Santosh
> > Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
> > Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
> > hwmod data.
> >
> > On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
> > > From: sricharan<r.sricharan@ti.com>
> > >
> > > The l3 interconnect device is build with all the data required
> > > to handle the error logging. The data is extracted from the
> > > hwmod data base.
> > >
> > > Signed-off-by: sricharan<r.sricharan@ti.com>
> > > Signed-off-by: sricharan<r.sricharan@ti.com>
> > > Tested-by: sricharan<r.sricharan@ti.com>
> >
> > Mmm, I'm not sure the tested-by is meaningfull in your case, since
> > you wrote the code and so everybody will assume you tested it.
> > One s-o-b should be probably enough.
> >
>
> Well he tested whole series including the patch from Felipe.
> So a tested-by on whole series doesn't hurt, right ?
>
> Just for record, I have seen tested by applied on whole series
> Where as some of the patches in this series are just comment
> updates.
Well Signed-off-by also means Tested-by. If not, it should
be specifically mentioned when the patch is posted. Something
like "PLEASE NOTE THAT THIS PATCH IS COMPLETELY UNTESTED".
Also one Signed-off-by is enough like Benoit pointed out :)
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-03-03 18:31 ` Tony Lindgren
@ 2011-03-04 6:20 ` Santosh Shilimkar
2011-03-04 18:08 ` Tony Lindgren
0 siblings, 1 reply; 24+ messages in thread
From: Santosh Shilimkar @ 2011-03-04 6:20 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Benoit Cousson, linux-omap, Felipe Balbi, Sricharan R
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Friday, March 04, 2011 12:01 AM
> To: Santosh Shilimkar
> Cc: Benoit Cousson; linux-omap@vger.kernel.org; Felipe Balbi;
> Sricharan R
> Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
> hwmod data.
>
> * Santosh Shilimkar <santosh.shilimkar@ti.com> [110221 11:01]:
> > > -----Original Message-----
> > > From: Cousson, Benoit [mailto:b-cousson@ti.com]
> > > Sent: Monday, February 21, 2011 11:41 PM
> > > To: Shilimkar, Santosh
> > > Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
> > > Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with
> the
> > > hwmod data.
> > >
> > > On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
> > > > From: sricharan<r.sricharan@ti.com>
> > > >
> > > > The l3 interconnect device is build with all the data required
> > > > to handle the error logging. The data is extracted from the
> > > > hwmod data base.
> > > >
> > > > Signed-off-by: sricharan<r.sricharan@ti.com>
> > > > Signed-off-by: sricharan<r.sricharan@ti.com>
> > > > Tested-by: sricharan<r.sricharan@ti.com>
> > >
> > > Mmm, I'm not sure the tested-by is meaningfull in your case,
> since
> > > you wrote the code and so everybody will assume you tested it.
> > > One s-o-b should be probably enough.
> > >
> >
> > Well he tested whole series including the patch from Felipe.
> > So a tested-by on whole series doesn't hurt, right ?
> >
> > Just for record, I have seen tested by applied on whole series
> > Where as some of the patches in this series are just comment
> > updates.
>
> Well Signed-off-by also means Tested-by. If not, it should
> be specifically mentioned when the patch is posted. Something
> like "PLEASE NOTE THAT THIS PATCH IS COMPLETELY UNTESTED".
>
Sure.
> Also one Signed-off-by is enough like Benoit pointed out :)
>
Ohhh... I missed this I first comment :)
One SOB is enough.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-03-04 6:20 ` Santosh Shilimkar
@ 2011-03-04 18:08 ` Tony Lindgren
2011-03-05 7:46 ` Santosh Shilimkar
0 siblings, 1 reply; 24+ messages in thread
From: Tony Lindgren @ 2011-03-04 18:08 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: Benoit Cousson, linux-omap, Felipe Balbi, Sricharan R
* Santosh Shilimkar <santosh.shilimkar@ti.com> [110303 22:19]:
> > From: Tony Lindgren [mailto:tony@atomide.com]
> > Also one Signed-off-by is enough like Benoit pointed out :)
> >
> Ohhh... I missed this I first comment :)
> One SOB is enough.
Santosh, can you do a pull request for me on this series
when the issues are fixed? Against omap-for-linus branch
please.
Tony
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-03-04 18:08 ` Tony Lindgren
@ 2011-03-05 7:46 ` Santosh Shilimkar
0 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-03-05 7:46 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Benoit Cousson, linux-omap, Felipe Balbi, Sricharan R
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Friday, March 04, 2011 11:38 PM
> To: Santosh Shilimkar
> Cc: Benoit Cousson; linux-omap@vger.kernel.org; Felipe Balbi;
> Sricharan R
> Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
> hwmod data.
>
> * Santosh Shilimkar <santosh.shilimkar@ti.com> [110303 22:19]:
> > > From: Tony Lindgren [mailto:tony@atomide.com]
> > > Also one Signed-off-by is enough like Benoit pointed out :)
> > >
> > Ohhh... I missed this I first comment :)
> > One SOB is enough.
>
> Santosh, can you do a pull request for me on this series
> when the issues are fixed? Against omap-for-linus branch
> please.
>
Sure will do.
Regards,
Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-02-21 19:03 ` Santosh Shilimkar
2011-03-03 18:31 ` Tony Lindgren
@ 2011-03-07 10:22 ` Cousson, Benoit
2011-03-07 11:19 ` Santosh Shilimkar
1 sibling, 1 reply; 24+ messages in thread
From: Cousson, Benoit @ 2011-03-07 10:22 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: linux-omap@vger.kernel.org, Balbi, Felipe, R, Sricharan
On 2/21/2011 8:03 PM, Shilimkar, Santosh wrote:
>> -----Original Message-----
>> From: Cousson, Benoit [mailto:b-cousson@ti.com]
>> Sent: Monday, February 21, 2011 11:41 PM
>> To: Shilimkar, Santosh
>> Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
>> Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
>> hwmod data.
>>
>> On 2/21/2011 2:46 PM, Shilimkar, Santosh wrote:
>>> From: sricharan<r.sricharan@ti.com>
>>>
>>> The l3 interconnect device is build with all the data required
>>> to handle the error logging. The data is extracted from the
>>> hwmod data base.
>>>
>>> Signed-off-by: sricharan<r.sricharan@ti.com>
>>> Signed-off-by: sricharan<r.sricharan@ti.com>
>>> Tested-by: sricharan<r.sricharan@ti.com>
>>
>> Mmm, I'm not sure the tested-by is meaningfull in your case, since
>> you wrote the code and so everybody will assume you tested it.
>> One s-o-b should be probably enough.
>>
>
> Well he tested whole series including the patch from Felipe.
> So a tested-by on whole series doesn't hurt, right ?
>
> Just for record, I have seen tested by applied on whole series
> Where as some of the patches in this series are just comment
> updates.
>
>>> Cc: Benoit Cousson<b-cousson@ti.com>
>>> ---
>>> arch/arm/mach-omap2/devices.c | 23 +++++++++++++++++++++++
>>> 1 files changed, 23 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-
>> omap2/devices.c
>>> index 2d46f55..25fa2ad 100644
>>> --- a/arch/arm/mach-omap2/devices.c
>>> +++ b/arch/arm/mach-omap2/devices.c
>>> @@ -57,6 +57,29 @@ static int __init omap3_l3_init(void)
>>> }
>>> postcore_initcall(omap3_l3_init);
>>>
>>> +static int __init omap4_l3_init(void)
>>> +{
>>> + int l;
>>> + struct omap_hwmod *oh;
>>> + struct omap_device *od;
>>> + char oh_name[12];
>>> +
>>> + l = snprintf(oh_name, 12, "l3_main_1");
>>> +
>>> + oh = omap_hwmod_lookup(oh_name);
>>> +
>>> + if (!oh)
>>> + pr_err("could not look up %s\n", oh_name);
>>> +
>>> + od = omap_device_build("omap4-l3-interconnect", 0, oh, NULL,
>>
>> In order to stick to the OMAP device naming convention and to have
>> something not dependent of the chip version, I think we'd better
>> name
>> the device like that: "omap_l3_noc". Since it is a Arteris "Network
>> On
>> Chip" on OMAP4. We will not have to change it for OMAP5 then.
>> On OMAP3 the name can then be "omap_l3_smx" for the Sonics MX
>> interconnect.
>>
> Device name changes are fine but file name changes as per this.
> dosn't look right if they are like
> omap_l3_noc.c
> omap_l3_smx.c
Why do you think that does not look right?
> May be we can rename them like below
> omap_l3_3xxx.c
> omap_l3_4xxx.c
The point is that it will really depend of the amount of SoC specifics
data are in this file. If most of the code is reusable on OMAP5 for
example, then it makes sense to use the name of the IP.
If that's not the case, then you'd better use the SoC name.
Regards,
Benoit
^ permalink raw reply [flat|nested] 24+ messages in thread* RE: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-03-07 10:22 ` Cousson, Benoit
@ 2011-03-07 11:19 ` Santosh Shilimkar
2011-03-07 11:25 ` Santosh Shilimkar
0 siblings, 1 reply; 24+ messages in thread
From: Santosh Shilimkar @ 2011-03-07 11:19 UTC (permalink / raw)
To: Benoit Cousson; +Cc: linux-omap, Felipe Balbi, Sricharan R
> -----Original Message-----
> From: Cousson, Benoit [mailto:b-cousson@ti.com]
> Sent: Monday, March 07, 2011 3:52 PM
> To: Shilimkar, Santosh
> Cc: linux-omap@vger.kernel.org; Balbi, Felipe; R, Sricharan
> Subject: Re: [PATCH 5/6] omap4: Initialise the l3 device with the
> hwmod data.
>
> On 2/21/2011 8:03 PM, Shilimkar, Santosh wrote:
[....]
> >> In order to stick to the OMAP device naming convention and to
> have
> >> something not dependent of the chip version, I think we'd better
> >> name
> >> the device like that: "omap_l3_noc". Since it is a Arteris
> "Network
> >> On
> >> Chip" on OMAP4. We will not have to change it for OMAP5 then.
> >> On OMAP3 the name can then be "omap_l3_smx" for the Sonics MX
> >> interconnect.
> >>
> > Device name changes are fine but file name changes as per this.
> > dosn't look right if they are like
> > omap_l3_noc.c
> > omap_l3_smx.c
>
> Why do you think that does not look right?
>
No strong preference but noc, smx didn't look ok to
me.
> > May be we can rename them like below
> > omap_l3_3xxx.c
> > omap_l3_4xxx.c
>
> The point is that it will really depend of the amount of SoC
> specifics
> data are in this file. If most of the code is reusable on OMAP5 for
> example, then it makes sense to use the name of the IP.
> If that's not the case, then you'd better use the SoC name.
>
Ok. So let's go with the IP names then.
New file names will be as above.
omap_l3_3xxx.c
omap_l3_4xxx.c
Regards,
Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data.
2011-03-07 11:19 ` Santosh Shilimkar
@ 2011-03-07 11:25 ` Santosh Shilimkar
0 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-03-07 11:25 UTC (permalink / raw)
To: Benoit Cousson; +Cc: linux-omap, Felipe Balbi, Sricharan R
> -----Original Message-----
> From: Santosh Shilimkar [mailto:santosh.shilimkar@ti.com]
> Sent: Monday, March 07, 2011 4:49 PM
> To: Benoit Cousson
> Cc: linux-omap@vger.kernel.org; Felipe Balbi; Sricharan R
> Subject: RE: [PATCH 5/6] omap4: Initialise the l3 device with the
> hwmod data.
>
[....]
> Ok. So let's go with the IP names then.
> New file names will be as above.
>
> omap_l3_3xxx.c
> omap_l3_4xxx.c
Sorry I mean ...
omap_l3_noc.c
omap_l3_smx.c
Regards,
Santosh
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 6/6] omap4: l3: Introduce l3-interconnect error handling driver
2011-02-21 13:46 [PATCH 0/6] omap3/4: Add l3-interconnect error logging support Santosh Shilimkar
` (4 preceding siblings ...)
2011-02-21 13:46 ` [PATCH 5/6] omap4: Initialise the l3 device with the hwmod data Santosh Shilimkar
@ 2011-02-21 13:46 ` Santosh Shilimkar
5 siblings, 0 replies; 24+ messages in thread
From: Santosh Shilimkar @ 2011-02-21 13:46 UTC (permalink / raw)
To: linux-omap; +Cc: balbi, b-cousson, r.sricharan, Santosh Shilimkar
The driver provides the information regarding the ocp errors
that gets logged in the interconnect. The error information
gives the detail regarding the target that was attempted
to be accessed and its corresponding address.
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/l3_interconnect_4xxx.c | 254 ++++++++++++++++++++++++++++
arch/arm/mach-omap2/l3_interconnect_4xxx.h | 132 ++++++++++++++
3 files changed, 387 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/l3_interconnect_4xxx.c
create mode 100644 arch/arm/mach-omap2/l3_interconnect_4xxx.h
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 623aee1..3ad18e6 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -137,6 +137,7 @@ obj-$(CONFIG_OMAP3_EMU) += emu.o
# L3 interconnect
obj-$(CONFIG_ARCH_OMAP3) += l3_interconnect_3xxx.o
+obj-$(CONFIG_ARCH_OMAP4) += l3_interconnect_4xxx.o
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o
diff --git a/arch/arm/mach-omap2/l3_interconnect_4xxx.c b/arch/arm/mach-omap2/l3_interconnect_4xxx.c
new file mode 100644
index 0000000..15a08ca
--- /dev/null
+++ b/arch/arm/mach-omap2/l3_interconnect_4xxx.c
@@ -0,0 +1,254 @@
+/*
+ * L3 Interconnect error handling driver
+ *
+ * Copyright (C) 2011 Texas Corporation
+ * Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * Sricharan <r.sricharan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include "l3_interconnect_4xxx.h"
+
+/*
+ * Interrupt Handler for L3 error detection.
+ * 1) Identify the L3 clockdomain partition to which the error belongs to.
+ * 2) Identify the slave where the error information is logged
+ * 3) Print the logged information.
+ * 4) Add dump stack to provide kernel trace.
+ *
+ * Two Types of errors :
+ * 1) Custom errors in L3 :
+ * Target like DMM/FW/EMIF generates SRESP=ERR error
+ * 2) Standard L3 error:
+ * - Unsupported CMD.
+ * L3 tries to access target while it is idle
+ * - OCP disconnect.
+ * - Address hole error:
+ * If DSS/ISS/FDIF/USBHOSTFS access a target where they
+ * do not have connectivity, the error is logged in
+ * their default target which is DMM2.
+ *
+ * On High Secure devices, firewall errors are possible and those
+ * can be trapped as well. But the trapping is implemented as part
+ * secure software and hence need not be implemented here.
+ */
+static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
+{
+
+ struct omap4_l3 *l3 = _l3;
+ int inttype, i, j;
+ int err_src = 0;
+ u32 std_err_main_addr, std_err_main, err_reg;
+ u32 base, slave_addr, clear;
+ char *source_name;
+
+ /* Get the Type of interrupt */
+ if (irq == l3->app_irq)
+ inttype = L3_APPLICATION_ERROR;
+ else
+ inttype = L3_DEBUG_ERROR;
+
+ for (i = 0; i < L3_MODULES; i++) {
+ /*
+ * Read the regerr register of the clock domain
+ * to determine the source
+ */
+ base = (u32)l3->l3_base[i];
+ err_reg = readl(base + l3_flagmux[i] + (inttype << 3));
+
+ /* Get the corresponding error and analyse */
+ if (err_reg) {
+ /* Identify the source from control status register */
+ for (j = 0; !(err_reg & (1 << j)); j++)
+ ;
+
+ err_src = j;
+ /* Read the stderrlog_main_source from clk domain */
+ std_err_main_addr = base + (*(l3_targ[i] + err_src));
+ std_err_main = readl(std_err_main_addr);
+
+ switch ((std_err_main & CUSTOM_ERROR)) {
+ case STANDARD_ERROR:
+ source_name =
+ l3_targ_stderrlog_main_name[i][err_src];
+
+ slave_addr = std_err_main_addr +
+ L3_SLAVE_ADDRESS_OFFSET;
+ WARN(true, "L3 standard error: SOURCE:%s at address 0x%x\n",
+ source_name, readl(slave_addr));
+ /* clear the std error log*/
+ clear = std_err_main | CLEAR_STDERR_LOG;
+ writel(clear, std_err_main_addr);
+ break;
+
+ case CUSTOM_ERROR:
+ source_name =
+ l3_targ_stderrlog_main_name[i][err_src];
+
+ WARN(true, "CUSTOM SRESP error with SOURCE:%s\n",
+ source_name);
+ /* clear the std error log*/
+ clear = std_err_main | CLEAR_STDERR_LOG;
+ writel(clear, std_err_main_addr);
+ break;
+
+ default:
+ /* Nothing to be handled here as of now */
+ break;
+ }
+ /* Error found so break the for loop */
+ break;
+ }
+ }
+ return IRQ_HANDLED;
+}
+
+static int __init omap4_l3_probe(struct platform_device *pdev)
+{
+ static struct omap4_l3 *l3;
+ struct resource *res;
+ int ret;
+ int irq;
+
+ l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
+ if (!l3)
+ ret = -ENOMEM;
+
+ platform_set_drvdata(pdev, l3);
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "couldn't find resource 0\n");
+ ret = -ENODEV;
+ goto err1;
+ }
+
+ l3->l3_base[0] = ioremap(res->start, resource_size(res));
+ if (!(l3->l3_base[0])) {
+ dev_err(&pdev->dev, "ioremap failed\n");
+ ret = -ENOMEM;
+ goto err2;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ if (!res) {
+ dev_err(&pdev->dev, "couldn't find resource 1\n");
+ ret = -ENODEV;
+ goto err3;
+ }
+
+ l3->l3_base[1] = ioremap(res->start, resource_size(res));
+ if (!(l3->l3_base[1])) {
+ dev_err(&pdev->dev, "ioremap failed\n");
+ ret = -ENOMEM;
+ goto err4;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+ if (!res) {
+ dev_err(&pdev->dev, "couldn't find resource 2\n");
+ ret = -ENODEV;
+ goto err5;
+ }
+
+ l3->l3_base[2] = ioremap(res->start, resource_size(res));
+ if (!(l3->l3_base[2])) {
+ dev_err(&pdev->dev, "ioremap failed\n");
+ ret = -ENOMEM;
+ goto err6;
+ }
+
+ /*
+ * Setup interrupt Handlers
+ */
+ irq = platform_get_irq(pdev, 0);
+ ret = request_irq(irq,
+ l3_interrupt_handler,
+ IRQF_DISABLED, "l3-dbg-irq", l3);
+ if (ret) {
+ pr_crit("L3: request_irq failed to register for 0x%x\n",
+ OMAP44XX_IRQ_L3_DBG);
+ goto err7;
+ }
+ l3->debug_irq = irq;
+
+ irq = platform_get_irq(pdev, 1);
+ ret = request_irq(irq,
+ l3_interrupt_handler,
+ IRQF_DISABLED, "l3-app-irq", l3);
+ if (ret) {
+ pr_crit("L3: request_irq failed to register for 0x%x\n",
+ OMAP44XX_IRQ_L3_APP);
+ goto err8;
+ }
+ l3->app_irq = irq;
+
+ goto err0;
+err8:
+err7:
+ iounmap(l3->l3_base[2]);
+err6:
+err5:
+ iounmap(l3->l3_base[1]);
+err4:
+err3:
+ iounmap(l3->l3_base[0]);
+err2:
+err1:
+ kfree(l3);
+err0:
+ return ret;
+}
+
+static int __exit omap4_l3_remove(struct platform_device *pdev)
+{
+ struct omap4_l3 *l3 = platform_get_drvdata(pdev);
+
+ free_irq(l3->app_irq, l3);
+ free_irq(l3->debug_irq, l3);
+ iounmap(l3->l3_base[0]);
+ iounmap(l3->l3_base[1]);
+ iounmap(l3->l3_base[2]);
+ kfree(l3);
+
+ return 0;
+}
+
+static struct platform_driver omap4_l3_driver = {
+ .remove = __exit_p(omap4_l3_remove),
+ .driver = {
+ .name = "omap4-l3-interconnect",
+ },
+};
+
+static int __init omap4_l3_init(void)
+{
+ return platform_driver_probe(&omap4_l3_driver, omap4_l3_probe);
+}
+postcore_initcall_sync(omap4_l3_init);
+
+static void __exit omap4_l3_exit(void)
+{
+ platform_driver_unregister(&omap4_l3_driver);
+}
+module_exit(omap4_l3_exit);
+
diff --git a/arch/arm/mach-omap2/l3_interconnect_4xxx.h b/arch/arm/mach-omap2/l3_interconnect_4xxx.h
new file mode 100644
index 0000000..b1e4573
--- /dev/null
+++ b/arch/arm/mach-omap2/l3_interconnect_4xxx.h
@@ -0,0 +1,132 @@
+ /*
+ * L3 Interconnect error handling driver header
+ *
+ * Copyright (C) 2011 Texas Corporation
+ * Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * sricharan <r.sricharan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+#ifndef __ARCH_ARM_MACH_OMAP2_L3_INTERCONNECT_3XXX_H
+#define __ARCH_ARM_MACH_OMAP2_L3_INTERCONNECT_3XXX_H
+
+/*
+ * L3 register offsets
+ */
+#define L3_MODULES 3
+#define CLEAR_STDERR_LOG (1 << 31)
+#define CUSTOM_ERROR 0x2
+#define STANDARD_ERROR 0x0
+#define INBAND_ERROR 0x0
+#define EMIF_KERRLOG_OFFSET 0x10
+#define L3_SLAVE_ADDRESS_OFFSET 0x14
+#define LOGICAL_ADDR_ERRORLOG 0x4
+#define L3_APPLICATION_ERROR 0x0
+#define L3_DEBUG_ERROR 0x1
+
+u32 l3_flagmux[L3_MODULES] = {
+ 0x50C,
+ 0x100C,
+ 0X020C
+};
+
+/*
+ * L3 Target standard Error register offsets
+ */
+u32 l3_targ_stderrlog_main_clk1[] = {
+ 0x148, /* DMM1 */
+ 0x248, /* DMM2 */
+ 0x348, /* ABE */
+ 0x448, /* L4CFG */
+ 0x648 /* CLK2 PWR DISC */
+};
+
+u32 l3_targ_stderrlog_main_clk2[] = {
+ 0x548, /* CORTEX M3 */
+ 0x348, /* DSS */
+ 0x148, /* GPMC */
+ 0x448, /* ISS */
+ 0x748, /* IVAHD */
+ 0xD48, /* missing in TRM corresponds to AES1*/
+ 0x948, /* L4 PER0*/
+ 0x248, /* OCMRAM */
+ 0x148, /* missing in TRM corresponds to GPMC sERROR*/
+ 0x648, /* SGX */
+ 0x848, /* SL2 */
+ 0x1648, /* C2C */
+ 0x1148, /* missing in TRM corresponds PWR DISC CLK1*/
+ 0xF48, /* missing in TRM corrsponds to SHA1*/
+ 0xE48, /* missing in TRM corresponds to AES2*/
+ 0xC48, /* L4 PER3 */
+ 0xA48, /* L4 PER1*/
+ 0xB48 /* L4 PER2*/
+};
+
+u32 l3_targ_stderrlog_main_clk3[] = {
+ 0x0148 /* EMUSS */
+};
+
+char *l3_targ_stderrlog_main_name[L3_MODULES][18] = {
+ {
+ "DMM1",
+ "DMM2",
+ "ABE",
+ "L4CFG",
+ "CLK2 PWR DISC",
+ },
+ {
+ "CORTEX M3" ,
+ "DSS ",
+ "GPMC ",
+ "ISS ",
+ "IVAHD ",
+ "AES1",
+ "L4 PER0",
+ "OCMRAM ",
+ "GPMC sERROR",
+ "SGX ",
+ "SL2 ",
+ "C2C ",
+ "PWR DISC CLK1",
+ "SHA1",
+ "AES2",
+ "L4 PER3",
+ "L4 PER1",
+ "L4 PER2",
+ },
+ {
+ "EMUSS",
+ },
+};
+
+u32 *l3_targ[L3_MODULES] = {
+ l3_targ_stderrlog_main_clk1,
+ l3_targ_stderrlog_main_clk2,
+ l3_targ_stderrlog_main_clk3,
+};
+
+struct omap4_l3 {
+ struct device *dev;
+ struct clk *ick;
+
+ /* memory base */
+ void __iomem *l3_base[4];
+
+ int debug_irq;
+ int app_irq;
+};
+
+#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread