2 files changed, 21 insertions, 1 deletions

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 00e4fed4a39b..9d021d002bec 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -60,8 +60,10 @@ static int l3_handle_target(struct omap_l3 *l3, void __iomem *base,
 {
         int k;
         u32 std_err_main, clear, masterid;
+        u8 op_code;
         void __iomem *l3_targ_base;
         void __iomem *l3_targ_stderr, *l3_targ_slvofslsb, *l3_targ_mstaddr;
+        void __iomem *l3_targ_hdr;
         struct l3_target_data *l3_targ_inst;
         struct l3_masters_data *master;
         char *target_name, *master_name = "UN IDENTIFIED";
@@ -96,6 +98,7 @@ static int l3_handle_target(struct omap_l3 *l3, void __iomem *base,
                          readl_relaxed(l3_targ_slvofslsb));
 
                 l3_targ_mstaddr = l3_targ_base + L3_TARG_STDERRLOG_MSTADDR;
+                l3_targ_hdr = l3_targ_base + L3_TARG_STDERRLOG_HDR;
                 break;
 
         case CUSTOM_ERROR:
@@ -103,6 +106,7 @@ static int l3_handle_target(struct omap_l3 *l3, void __iomem *base,
 
                 l3_targ_mstaddr = l3_targ_base +
                                   L3_TARG_STDERRLOG_CINFO_MSTADDR;
+                l3_targ_hdr = l3_targ_base + L3_TARG_STDERRLOG_CINFO_OPCODE;
                 break;
 
         default:
@@ -122,11 +126,14 @@ static int l3_handle_target(struct omap_l3 *l3, void __iomem *base,
                 }
         }
 
+        op_code = readl_relaxed(l3_targ_hdr) & 0x7;
+
         WARN(true,
-             "%s:L3 %s Error: MASTER %s TARGET %s%s\n",
+             "%s:L3 %s Error: MASTER %s TARGET %s (%s)%s\n",
              dev_name(l3->dev),
              err_description,
              master_name, target_name,
+             l3_transaction_type[op_code],
              err_string);
 
         /* clear the std error log*/
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index 4e18307470f6..6670fd98ce7c 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -29,14 +29,27 @@
 
 /* L3 TARG register offsets */
 #define L3_TARG_STDERRLOG_MAIN          0x48
+#define L3_TARG_STDERRLOG_HDR           0x4c
 #define L3_TARG_STDERRLOG_MSTADDR       0x50
 #define L3_TARG_STDERRLOG_SLVOFSLSB     0x5c
 #define L3_TARG_STDERRLOG_CINFO_MSTADDR 0x68
+#define L3_TARG_STDERRLOG_CINFO_OPCODE  0x6c
 #define L3_FLAGMUX_REGERR0              0xc
 #define L3_FLAGMUX_MASK0                0x8
 
 #define L3_TARGET_NOT_SUPPORTED         NULL
 
+static const char * const l3_transaction_type[] = {
+        /* 0 0 0 */ "Idle",
+        /* 0 0 1 */ "Write",
+        /* 0 1 0 */ "Read",
+        /* 0 1 1 */ "ReadEx",
+        /* 1 0 0 */ "Read Link",
+        /* 1 0 1 */ "Write Non-Posted",
+        /* 1 1 0 */ "Write Conditional",
+        /* 1 1 1 */ "Write Broadcast",
+};
+
 /**
  * struct l3_masters_data - L3 Master information
  * @id:         ID of the L3 Master