Skip to content

L
linux
Commit 8c8e1ba3 authored by Herve Codina's avatar Herve Codina Committed by Christophe Leroy
Browse files
Options

soc: fsl: cpm1: tsa: Make SIRAM entries specific to CPM1 

Current code handles the CPM1 version of TSA. Compared against QUICC
Engine (QE) version of TSA, CPM1 SIRAM entries are slightly different.

In order to prepare the support for the QE version, clearly identify
these entries and functions handling them as CPM1 compatible.
Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/20240808071132.149251-11-herve.codina@bootlin.comSigned-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
parent 58edcace
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 29 deletions
drivers/soc/fsl/qe/tsa.c
View file @ 8c8e1ba3
...@@ -18,18 +18,18 @@ ...@@ -18,18 +18,18 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
/* TSA SI RAM routing tables entry */ /* TSA SI RAM routing tables entry (CPM1) */
#define TSA_SIRAM_ENTRY_LAST BIT(16) #define TSA_CPM1_SIRAM_ENTRY_LAST BIT(16)
#define TSA_SIRAM_ENTRY_BYTE BIT(17) #define TSA_CPM1_SIRAM_ENTRY_BYTE BIT(17)
#define TSA_SIRAM_ENTRY_CNT_MASK GENMASK(21, 18) #define TSA_CPM1_SIRAM_ENTRY_CNT_MASK GENMASK(21, 18)
#define TSA_SIRAM_ENTRY_CNT(x) FIELD_PREP(TSA_SIRAM_ENTRY_CNT_MASK, x) #define TSA_CPM1_SIRAM_ENTRY_CNT(x) FIELD_PREP(TSA_CPM1_SIRAM_ENTRY_CNT_MASK, x)
#define TSA_SIRAM_ENTRY_CSEL_MASK GENMASK(24, 22) #define TSA_CPM1_SIRAM_ENTRY_CSEL_MASK GENMASK(24, 22)
#define TSA_SIRAM_ENTRY_CSEL_NU FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x0) #define TSA_CPM1_SIRAM_ENTRY_CSEL_NU FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x0)
#define TSA_SIRAM_ENTRY_CSEL_SCC2 FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x2) #define TSA_CPM1_SIRAM_ENTRY_CSEL_SCC2 FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x2)
#define TSA_SIRAM_ENTRY_CSEL_SCC3 FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x3) #define TSA_CPM1_SIRAM_ENTRY_CSEL_SCC3 FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x3)
#define TSA_SIRAM_ENTRY_CSEL_SCC4 FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x4) #define TSA_CPM1_SIRAM_ENTRY_CSEL_SCC4 FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x4)
#define TSA_SIRAM_ENTRY_CSEL_SMC1 FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x5) #define TSA_CPM1_SIRAM_ENTRY_CSEL_SMC1 FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x5)
#define TSA_SIRAM_ENTRY_CSEL_SMC2 FIELD_PREP_CONST(TSA_SIRAM_ENTRY_CSEL_MASK, 0x6) #define TSA_CPM1_SIRAM_ENTRY_CSEL_SMC2 FIELD_PREP_CONST(TSA_CPM1_SIRAM_ENTRY_CSEL_MASK, 0x6)
/* SI mode register (32 bits) */ /* SI mode register (32 bits) */
#define TSA_SIMODE 0x00 #define TSA_SIMODE 0x00
...@@ -228,7 +228,7 @@ int tsa_serial_get_info(struct tsa_serial *tsa_serial, struct tsa_serial_info *i ...@@ -228,7 +228,7 @@ int tsa_serial_get_info(struct tsa_serial *tsa_serial, struct tsa_serial_info *i
} }
EXPORT_SYMBOL(tsa_serial_get_info); EXPORT_SYMBOL(tsa_serial_get_info);
static void tsa_init_entries_area(struct tsa *tsa, struct tsa_entries_area *area, static void tsa_cpm1_init_entries_area(struct tsa *tsa, struct tsa_entries_area *area,
u32 tdms, u32 tdm_id, bool is_rx) u32 tdms, u32 tdm_id, bool is_rx)
{ {
resource_size_t quarter; resource_size_t quarter;
...@@ -280,7 +280,13 @@ static void tsa_init_entries_area(struct tsa *tsa, struct tsa_entries_area *area ...@@ -280,7 +280,13 @@ static void tsa_init_entries_area(struct tsa *tsa, struct tsa_entries_area *area
} }
} }
static const char *tsa_serial_id2name(struct tsa *tsa, u32 serial_id) static void tsa_init_entries_area(struct tsa *tsa, struct tsa_entries_area *area,
u32 tdms, u32 tdm_id, bool is_rx)
{
tsa_cpm1_init_entries_area(tsa, area, tdms, tdm_id, is_rx);
}
static const char *tsa_cpm1_serial_id2name(struct tsa *tsa, u32 serial_id)
{ {
switch (serial_id) { switch (serial_id) {
case FSL_CPM_TSA_NU: return "Not used"; case FSL_CPM_TSA_NU: return "Not used";
...@@ -295,21 +301,26 @@ static const char *tsa_serial_id2name(struct tsa *tsa, u32 serial_id) ...@@ -295,21 +301,26 @@ static const char *tsa_serial_id2name(struct tsa *tsa, u32 serial_id)
return NULL; return NULL;
} }
static u32 tsa_serial_id2csel(struct tsa *tsa, u32 serial_id) static const char *tsa_serial_id2name(struct tsa *tsa, u32 serial_id)
{
return tsa_cpm1_serial_id2name(tsa, serial_id);
}
static u32 tsa_cpm1_serial_id2csel(struct tsa *tsa, u32 serial_id)
{ {
switch (serial_id) { switch (serial_id) {
case FSL_CPM_TSA_SCC2: return TSA_SIRAM_ENTRY_CSEL_SCC2; case FSL_CPM_TSA_SCC2: return TSA_CPM1_SIRAM_ENTRY_CSEL_SCC2;
case FSL_CPM_TSA_SCC3: return TSA_SIRAM_ENTRY_CSEL_SCC3; case FSL_CPM_TSA_SCC3: return TSA_CPM1_SIRAM_ENTRY_CSEL_SCC3;
case FSL_CPM_TSA_SCC4: return TSA_SIRAM_ENTRY_CSEL_SCC4; case FSL_CPM_TSA_SCC4: return TSA_CPM1_SIRAM_ENTRY_CSEL_SCC4;
case FSL_CPM_TSA_SMC1: return TSA_SIRAM_ENTRY_CSEL_SMC1; case FSL_CPM_TSA_SMC1: return TSA_CPM1_SIRAM_ENTRY_CSEL_SMC1;
case FSL_CPM_TSA_SMC2: return TSA_SIRAM_ENTRY_CSEL_SMC2; case FSL_CPM_TSA_SMC2: return TSA_CPM1_SIRAM_ENTRY_CSEL_SMC2;
default: default:
break; break;
} }
return TSA_SIRAM_ENTRY_CSEL_NU; return TSA_CPM1_SIRAM_ENTRY_CSEL_NU;
} }
static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area, static int tsa_cpm1_add_entry(struct tsa *tsa, struct tsa_entries_area *area,
u32 count, u32 serial_id) u32 count, u32 serial_id)
{ {
void __iomem *addr; void __iomem *addr;
...@@ -328,21 +339,21 @@ static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area, ...@@ -328,21 +339,21 @@ static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area,
if (area->last_entry) { if (area->last_entry) {
/* Clear last flag */ /* Clear last flag */
tsa_clrbits32(area->last_entry, TSA_SIRAM_ENTRY_LAST); tsa_clrbits32(area->last_entry, TSA_CPM1_SIRAM_ENTRY_LAST);
} }
left = count; left = count;
while (left) { while (left) {
val = TSA_SIRAM_ENTRY_BYTE | tsa_serial_id2csel(tsa, serial_id); val = TSA_CPM1_SIRAM_ENTRY_BYTE | tsa_cpm1_serial_id2csel(tsa, serial_id);
if (left > 16) { if (left > 16) {
cnt = 16; cnt = 16;
} else { } else {
cnt = left; cnt = left;
val |= TSA_SIRAM_ENTRY_LAST; val |= TSA_CPM1_SIRAM_ENTRY_LAST;
area->last_entry = addr; area->last_entry = addr;
} }
val |= TSA_SIRAM_ENTRY_CNT(cnt - 1); val |= TSA_CPM1_SIRAM_ENTRY_CNT(cnt - 1);
tsa_write32(addr, val); tsa_write32(addr, val);
addr += 4; addr += 4;
...@@ -352,6 +363,12 @@ static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area, ...@@ -352,6 +363,12 @@ static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area,
return 0; return 0;
} }
static int tsa_add_entry(struct tsa *tsa, struct tsa_entries_area *area,
u32 count, u32 serial_id)
{
return tsa_cpm1_add_entry(tsa, area, count, serial_id);
}
static int tsa_of_parse_tdm_route(struct tsa *tsa, struct device_node *tdm_np, static int tsa_of_parse_tdm_route(struct tsa *tsa, struct device_node *tdm_np,
u32 tdms, u32 tdm_id, bool is_rx) u32 tdms, u32 tdm_id, bool is_rx)
{ {
...@@ -636,7 +653,7 @@ static void tsa_init_si_ram(struct tsa *tsa) ...@@ -636,7 +653,7 @@ static void tsa_init_si_ram(struct tsa *tsa)
/* Fill all entries as the last one */ /* Fill all entries as the last one */
for (i = 0; i < tsa->si_ram_sz; i += 4) for (i = 0; i < tsa->si_ram_sz; i += 4)
tsa_write32(tsa->si_ram + i, TSA_SIRAM_ENTRY_LAST); tsa_write32(tsa->si_ram + i, TSA_CPM1_SIRAM_ENTRY_LAST);
} }
static int tsa_probe(struct platform_device *pdev) static int tsa_probe(struct platform_device *pdev)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7