forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bus: omap_l3_noc: Fix master id address decoding for OMAP5
The L3 Error handling on OMAP5 for the most part is very similar to that of OMAP4, and had leveraged common data structures and register layout definitions so far. Upon closer inspection, there are a few minor differences causing an incorrect decoding and reporting of the master NIU upon an error: 1. The L3_TARG_STDERRLOG_MSTADDR.STDERRLOG_MSTADDR occupies 11 bits on OMAP5 as against 8 bits on OMAP4, with the master NIU connID encoded in the 6 MSBs of the STDERRLOG_MSTADDR field. 2. The CLK3 FlagMux component has 1 input source on OMAP4 and 3 input sources on OMAP5. The common DEBUGSS source is at a different input on each SoC. Fix the above issues by using a OMAP5-specific compatible property and using SoC-specific data where there are differences. Signed-off-by: Suman Anna <[email protected]> Acked-by: Nishanth Menon <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
- Loading branch information
Showing
4 changed files
with
44 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
* OMAP L3 Interconnect error handling driver | ||
* | ||
* Copyright (C) 2011-2014 Texas Instruments Incorporated - http://www.ti.com/ | ||
* Copyright (C) 2011-2015 Texas Instruments Incorporated - http://www.ti.com/ | ||
* Santosh Shilimkar <[email protected]> | ||
* Sricharan <[email protected]> | ||
* | ||
|
@@ -233,7 +233,8 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) | |
} | ||
|
||
static const struct of_device_id l3_noc_match[] = { | ||
{.compatible = "ti,omap4-l3-noc", .data = &omap_l3_data}, | ||
{.compatible = "ti,omap4-l3-noc", .data = &omap4_l3_data}, | ||
{.compatible = "ti,omap5-l3-noc", .data = &omap5_l3_data}, | ||
{.compatible = "ti,dra7-l3-noc", .data = &dra_l3_data}, | ||
{.compatible = "ti,am4372-l3-noc", .data = &am4372_l3_data}, | ||
{}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
* OMAP L3 Interconnect error handling driver header | ||
* | ||
* Copyright (C) 2011-2014 Texas Instruments Incorporated - http://www.ti.com/ | ||
* Copyright (C) 2011-2015 Texas Instruments Incorporated - http://www.ti.com/ | ||
* Santosh Shilimkar <[email protected]> | ||
* sricharan <[email protected]> | ||
* | ||
|
@@ -175,16 +175,14 @@ static struct l3_flagmux_data omap_l3_flagmux_clk2 = { | |
}; | ||
|
||
|
||
static struct l3_target_data omap_l3_target_data_clk3[] = { | ||
{0x0100, "EMUSS",}, | ||
{0x0300, "DEBUG SOURCE",}, | ||
{0x0, "HOST CLK3",}, | ||
static struct l3_target_data omap4_l3_target_data_clk3[] = { | ||
{0x0100, "DEBUGSS",}, | ||
}; | ||
|
||
static struct l3_flagmux_data omap_l3_flagmux_clk3 = { | ||
static struct l3_flagmux_data omap4_l3_flagmux_clk3 = { | ||
.offset = 0x0200, | ||
.l3_targ = omap_l3_target_data_clk3, | ||
.num_targ_data = ARRAY_SIZE(omap_l3_target_data_clk3), | ||
.l3_targ = omap4_l3_target_data_clk3, | ||
.num_targ_data = ARRAY_SIZE(omap4_l3_target_data_clk3), | ||
}; | ||
|
||
static struct l3_masters_data omap_l3_masters[] = { | ||
|
@@ -215,21 +213,49 @@ static struct l3_masters_data omap_l3_masters[] = { | |
{ 0x32, "USBHOSTFS"} | ||
}; | ||
|
||
static struct l3_flagmux_data *omap_l3_flagmux[] = { | ||
static struct l3_flagmux_data *omap4_l3_flagmux[] = { | ||
&omap_l3_flagmux_clk1, | ||
&omap_l3_flagmux_clk2, | ||
&omap_l3_flagmux_clk3, | ||
&omap4_l3_flagmux_clk3, | ||
}; | ||
|
||
static const struct omap_l3 omap_l3_data = { | ||
.l3_flagmux = omap_l3_flagmux, | ||
.num_modules = ARRAY_SIZE(omap_l3_flagmux), | ||
static const struct omap_l3 omap4_l3_data = { | ||
.l3_flagmux = omap4_l3_flagmux, | ||
.num_modules = ARRAY_SIZE(omap4_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, | ||
}; | ||
|
||
/* OMAP5 data */ | ||
static struct l3_target_data omap5_l3_target_data_clk3[] = { | ||
{0x0100, "L3INSTR",}, | ||
{0x0300, "DEBUGSS",}, | ||
{0x0, "HOSTCLK3",}, | ||
}; | ||
|
||
static struct l3_flagmux_data omap5_l3_flagmux_clk3 = { | ||
.offset = 0x0200, | ||
.l3_targ = omap5_l3_target_data_clk3, | ||
.num_targ_data = ARRAY_SIZE(omap5_l3_target_data_clk3), | ||
}; | ||
|
||
static struct l3_flagmux_data *omap5_l3_flagmux[] = { | ||
&omap_l3_flagmux_clk1, | ||
&omap_l3_flagmux_clk2, | ||
&omap5_l3_flagmux_clk3, | ||
}; | ||
|
||
static const struct omap_l3 omap5_l3_data = { | ||
.l3_flagmux = omap5_l3_flagmux, | ||
.num_modules = ARRAY_SIZE(omap5_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 = 0x7E0, | ||
}; | ||
|
||
/* DRA7 data */ | ||
static struct l3_target_data dra_l3_target_data_clk1[] = { | ||
{0x2a00, "AES1",}, | ||
|