summaryrefslogtreecommitdiff
path: root/drivers/bus/omap_l3_noc.h
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-04-16 11:01:02 -0500
committerNishanth Menon <nm@ti.com>2014-05-05 14:33:46 -0500
commitd4d8819e205854cc102e366f30b8eadd60a58e97 (patch)
tree410e8709f090a439c50012b6fec0bfefcf780553 /drivers/bus/omap_l3_noc.h
parent97708c08c9955306742872ff7f2e47faec864ee7 (diff)
bus: omap_l3_noc: fix masterid detection
As per Documentation (OMAP4+), then masterid is infact encoded as follows: "L3_TARG_STDERRLOG_MSTADDR[7:0] STDERRLOG_MSTADDR stores the NTTP master address. The master address is the concatenation of Prefix & Initiator ConnID. It is defined on 8 bits. The 6 MSBs are used to distinguish the different initiators." So, when we matchup currently with the master ID list, we never get a proper match other than when MPU is the master (thanks to 0). Now, on other platforms such as AM437x, this tends to be bits[5:0]. Fix this by using the relevant 6MSBits to identify the master ID for standard and custom errors. Reported-by: Darren Etheridge <detheridge@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by: Darren Etheridge <detheridge@ti.com> Tested-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'drivers/bus/omap_l3_noc.h')
-rw-r--r--drivers/bus/omap_l3_noc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index 64869fe656e5..ba8692444665 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -84,6 +84,7 @@ struct l3_flagmux_data {
* @l3_masters: array pointing to master data containing name and register
* offset for the master.
* @num_master: number of masters
+ * @mst_addr_mask: Mask representing MSTADDR information of NTTP packet
* @debug_irq: irq number of the debug interrupt (populated runtime)
* @app_irq: irq number of the application interrupt (populated runtime)
*/
@@ -96,6 +97,7 @@ struct omap_l3 {
struct l3_masters_data *l3_masters;
int num_masters;
+ u32 mst_addr_mask;
int debug_irq;
int app_irq;
@@ -200,6 +202,8 @@ static const struct omap_l3 omap_l3_data = {
.num_modules = ARRAY_SIZE(omap_l3_flagmux),
.l3_masters = omap_l3_masters,
.num_masters = ARRAY_SIZE(omap_l3_masters),
+ /* The 6 MSBs of register field used to distinguish initiator */
+ .mst_addr_mask = 0xFC,
};
#endif /* __OMAP_L3_NOC_H */