UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

soc: fsl: qman: fixup liodns only on ppc targets 

ARM SoCs use SMMU so the liodn fixup done in the qman driver is no
longer making sense and it also breaks the ICID settings inherited
from u-boot. Do the fixups only for PPC targets.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
This commit is contained in:
Laurentiu Tudor 2019-04-27 10:10:23 +03:00 committed by Li Yang
parent 5842efa41f
commit d9ebd99d9a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/fsl/qbman/qman_ccsr.c
View File

@ -596,7 +596,7 @@ static int qman_init_ccsr(struct device *dev)
} }
#define LIO_CFG_LIODN_MASK 0x0fff0000 #define LIO_CFG_LIODN_MASK 0x0fff0000
void qman_liodn_fixup(u16 channel) void __qman_liodn_fixup(u16 channel)
{ {
static int done; static int done;
static u32 liodn_offset; static u32 liodn_offset;

9
drivers/soc/fsl/qbman/qman_priv.h
View File

@ -193,7 +193,14 @@ extern struct gen_pool *qm_cgralloc; /* CGR ID allocator */
u32 qm_get_pools_sdqcr(void); u32 qm_get_pools_sdqcr(void);
int qman_wq_alloc(void); int qman_wq_alloc(void);
void qman_liodn_fixup(u16 channel); #ifdef CONFIG_FSL_PAMU
#define qman_liodn_fixup __qman_liodn_fixup
#else
static inline void qman_liodn_fixup(u16 channel)
{
}
#endif
void __qman_liodn_fixup(u16 channel);
void qman_set_sdest(u16 channel, unsigned int cpu_idx); void qman_set_sdest(u16 channel, unsigned int cpu_idx);
struct qman_portal *qman_create_affine_portal( struct qman_portal *qman_create_affine_portal(