This patch adds changes necessary to move functionality present in PowerPC folders with ARM architectures that have DPAA1 QBMan hardware - Create new board/freescale/common/fsl_portals.c to house shared device tree fixups for DPAA1 devices with ARM and PowerPC cores - Add new header file to top includes directory to allow files in both architectures to grab the function prototypes - Port inhibit_portals() from PowerPC to ARM. This function is used in setup to disable interrupts on all QMan and BMan portals. It is needed because the interrupts are enabled by default for all portals including unused/uninitialised portals. When the kernel attempts to go to deep sleep the unused portals prevent it from doing so Signed-off-by: Ahmed Mansour <ahmed.mansour@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>master
Ahmed Mansour
7 years ago
committed by
York Sun
parent
1b76f3b8ab
commit
44262327aa
@ -0,0 +1,305 @@ |
||||
/*
|
||||
* Copyright 2008-2011 Freescale Semiconductor, Inc. |
||||
* Copyright 2017 NXP |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <libfdt.h> |
||||
#include <fdt_support.h> |
||||
|
||||
#include <asm/processor.h> |
||||
#include <asm/io.h> |
||||
#ifdef CONFIG_PPC |
||||
#include <asm/fsl_portals.h> |
||||
#include <asm/fsl_liodn.h> |
||||
#endif |
||||
#include <fsl_qbman.h> |
||||
|
||||
#define MAX_BPORTALS (CONFIG_SYS_BMAN_CINH_SIZE / CONFIG_SYS_BMAN_SP_CINH_SIZE) |
||||
#define MAX_QPORTALS (CONFIG_SYS_QMAN_CINH_SIZE / CONFIG_SYS_QMAN_SP_CINH_SIZE) |
||||
void setup_qbman_portals(void) |
||||
{ |
||||
void __iomem *bpaddr = (void *)CONFIG_SYS_BMAN_CINH_BASE + |
||||
CONFIG_SYS_BMAN_SWP_ISDR_REG; |
||||
void __iomem *qpaddr = (void *)CONFIG_SYS_QMAN_CINH_BASE + |
||||
CONFIG_SYS_QMAN_SWP_ISDR_REG; |
||||
#ifdef CONFIG_PPC |
||||
struct ccsr_qman *qman = (void *)CONFIG_SYS_FSL_QMAN_ADDR; |
||||
|
||||
/* Set the Qman initiator BAR to match the LAW (for DQRR stashing) */ |
||||
#ifdef CONFIG_PHYS_64BIT |
||||
out_be32(&qman->qcsp_bare, (u32)(CONFIG_SYS_QMAN_MEM_PHYS >> 32)); |
||||
#endif |
||||
out_be32(&qman->qcsp_bar, (u32)CONFIG_SYS_QMAN_MEM_PHYS); |
||||
#endif |
||||
#ifdef CONFIG_FSL_CORENET |
||||
int i; |
||||
|
||||
for (i = 0; i < CONFIG_SYS_QMAN_NUM_PORTALS; i++) { |
||||
u8 sdest = qp_info[i].sdest; |
||||
u16 fliodn = qp_info[i].fliodn; |
||||
u16 dliodn = qp_info[i].dliodn; |
||||
u16 liodn_off = qp_info[i].liodn_offset; |
||||
|
||||
out_be32(&qman->qcsp[i].qcsp_lio_cfg, (liodn_off << 16) | |
||||
dliodn); |
||||
/* set frame liodn */ |
||||
out_be32(&qman->qcsp[i].qcsp_io_cfg, (sdest << 16) | fliodn); |
||||
} |
||||
#endif |
||||
|
||||
/* Change default state of BMan ISDR portals to all 1s */ |
||||
inhibit_portals(bpaddr, CONFIG_SYS_BMAN_NUM_PORTALS, MAX_BPORTALS, |
||||
CONFIG_SYS_BMAN_SP_CINH_SIZE); |
||||
inhibit_portals(qpaddr, CONFIG_SYS_QMAN_NUM_PORTALS, MAX_QPORTALS, |
||||
CONFIG_SYS_QMAN_SP_CINH_SIZE); |
||||
} |
||||
|
||||
void inhibit_portals(void __iomem *addr, int max_portals, |
||||
int arch_max_portals, int portal_cinh_size) |
||||
{ |
||||
u32 val; |
||||
int i; |
||||
|
||||
/* arch_max_portals is the maximum based on memory size. This includes
|
||||
* the reserved memory in the SoC. max_portals the number of physical |
||||
* portals in the SoC |
||||
*/ |
||||
if (max_portals > arch_max_portals) { |
||||
printf("ERROR: portal config error\n"); |
||||
max_portals = arch_max_portals; |
||||
} |
||||
|
||||
for (i = 0; i < max_portals; i++) { |
||||
out_be32(addr, -1); |
||||
val = in_be32(addr); |
||||
if (!val) { |
||||
printf("ERROR: Stopped after %d portals\n", i); |
||||
return; |
||||
} |
||||
addr += portal_cinh_size; |
||||
} |
||||
debug("Cleared %d portals\n", i); |
||||
} |
||||
|
||||
#ifdef CONFIG_PPC |
||||
static int fdt_qportal(void *blob, int off, int id, char *name, |
||||
enum fsl_dpaa_dev dev, int create) |
||||
{ |
||||
int childoff, dev_off, ret = 0; |
||||
u32 dev_handle; |
||||
#ifdef CONFIG_FSL_CORENET |
||||
int num; |
||||
u32 liodns[2]; |
||||
#endif |
||||
|
||||
childoff = fdt_subnode_offset(blob, off, name); |
||||
if (create) { |
||||
char handle[64], *p; |
||||
|
||||
strncpy(handle, name, sizeof(handle)); |
||||
p = strchr(handle, '@'); |
||||
if (!strncmp(name, "fman", 4)) { |
||||
*p = *(p + 1); |
||||
p++; |
||||
} |
||||
*p = '\0'; |
||||
|
||||
dev_off = fdt_path_offset(blob, handle); |
||||
/* skip this node if alias is not found */ |
||||
if (dev_off == -FDT_ERR_BADPATH) |
||||
return 0; |
||||
if (dev_off < 0) |
||||
return dev_off; |
||||
|
||||
if (childoff <= 0) |
||||
childoff = fdt_add_subnode(blob, off, name); |
||||
|
||||
/* need to update the dev_off after adding a subnode */ |
||||
dev_off = fdt_path_offset(blob, handle); |
||||
if (dev_off < 0) |
||||
return dev_off; |
||||
|
||||
if (childoff > 0) { |
||||
dev_handle = fdt_get_phandle(blob, dev_off); |
||||
if (dev_handle <= 0) { |
||||
dev_handle = fdt_alloc_phandle(blob); |
||||
ret = fdt_set_phandle(blob, dev_off, |
||||
dev_handle); |
||||
if (ret < 0) |
||||
return ret; |
||||
} |
||||
|
||||
ret = fdt_setprop(blob, childoff, "dev-handle", |
||||
&dev_handle, sizeof(dev_handle)); |
||||
if (ret < 0) |
||||
return ret; |
||||
|
||||
#ifdef CONFIG_FSL_CORENET |
||||
num = get_dpaa_liodn(dev, &liodns[0], id); |
||||
ret = fdt_setprop(blob, childoff, "fsl,liodn", |
||||
&liodns[0], sizeof(u32) * num); |
||||
if (!strncmp(name, "pme", 3)) { |
||||
u32 pme_rev1, pme_rev2; |
||||
ccsr_pme_t *pme_regs = |
||||
(void *)CONFIG_SYS_FSL_CORENET_PME_ADDR; |
||||
|
||||
pme_rev1 = in_be32(&pme_regs->pm_ip_rev_1); |
||||
pme_rev2 = in_be32(&pme_regs->pm_ip_rev_2); |
||||
ret = fdt_setprop(blob, childoff, |
||||
"fsl,pme-rev1", &pme_rev1, |
||||
sizeof(u32)); |
||||
if (ret < 0) |
||||
return ret; |
||||
ret = fdt_setprop(blob, childoff, |
||||
"fsl,pme-rev2", &pme_rev2, |
||||
sizeof(u32)); |
||||
} |
||||
#endif |
||||
} else { |
||||
return childoff; |
||||
} |
||||
} else { |
||||
if (childoff > 0) |
||||
ret = fdt_del_node(blob, childoff); |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
#endif /* CONFIG_PPC */ |
||||
|
||||
void fdt_fixup_qportals(void *blob) |
||||
{ |
||||
int off, err; |
||||
unsigned int maj, min; |
||||
unsigned int ip_cfg; |
||||
struct ccsr_qman *qman = (void *)CONFIG_SYS_FSL_QMAN_ADDR; |
||||
u32 rev_1 = in_be32(&qman->ip_rev_1); |
||||
u32 rev_2 = in_be32(&qman->ip_rev_2); |
||||
char compat[64]; |
||||
int compat_len; |
||||
|
||||
maj = (rev_1 >> 8) & 0xff; |
||||
min = rev_1 & 0xff; |
||||
ip_cfg = rev_2 & 0xff; |
||||
|
||||
compat_len = sprintf(compat, "fsl,qman-portal-%u.%u.%u", |
||||
maj, min, ip_cfg) + 1; |
||||
compat_len += sprintf(compat + compat_len, "fsl,qman-portal") + 1; |
||||
|
||||
off = fdt_node_offset_by_compatible(blob, -1, "fsl,qman-portal"); |
||||
while (off != -FDT_ERR_NOTFOUND) { |
||||
#ifdef CONFIG_PPC |
||||
#ifdef CONFIG_FSL_CORENET |
||||
u32 liodns[2]; |
||||
#endif |
||||
const int *ci = fdt_getprop(blob, off, "cell-index", &err); |
||||
int i; |
||||
|
||||
if (!ci) |
||||
goto err; |
||||
|
||||
i = *ci; |
||||
#ifdef CONFIG_SYS_DPAA_FMAN |
||||
int j; |
||||
#endif |
||||
|
||||
#endif /* CONFIG_PPC */ |
||||
err = fdt_setprop(blob, off, "compatible", compat, compat_len); |
||||
if (err < 0) |
||||
goto err; |
||||
#ifdef CONFIG_PPC |
||||
#ifdef CONFIG_FSL_CORENET |
||||
liodns[0] = qp_info[i].dliodn; |
||||
liodns[1] = qp_info[i].fliodn; |
||||
err = fdt_setprop(blob, off, "fsl,liodn", |
||||
&liodns, sizeof(u32) * 2); |
||||
if (err < 0) |
||||
goto err; |
||||
#endif |
||||
|
||||
i++; |
||||
|
||||
err = fdt_qportal(blob, off, i, "crypto@0", FSL_HW_PORTAL_SEC, |
||||
IS_E_PROCESSOR(get_svr())); |
||||
if (err < 0) |
||||
goto err; |
||||
|
||||
#ifdef CONFIG_FSL_CORENET |
||||
#ifdef CONFIG_SYS_DPAA_PME |
||||
err = fdt_qportal(blob, off, i, "pme@0", FSL_HW_PORTAL_PME, 1); |
||||
if (err < 0) |
||||
goto err; |
||||
#else |
||||
fdt_qportal(blob, off, i, "pme@0", FSL_HW_PORTAL_PME, 0); |
||||
#endif |
||||
#endif |
||||
|
||||
#ifdef CONFIG_SYS_DPAA_FMAN |
||||
for (j = 0; j < CONFIG_SYS_NUM_FMAN; j++) { |
||||
char name[] = "fman@0"; |
||||
|
||||
name[sizeof(name) - 2] = '0' + j; |
||||
err = fdt_qportal(blob, off, i, name, |
||||
FSL_HW_PORTAL_FMAN1 + j, 1); |
||||
if (err < 0) |
||||
goto err; |
||||
} |
||||
#endif |
||||
#ifdef CONFIG_SYS_DPAA_RMAN |
||||
err = fdt_qportal(blob, off, i, "rman@0", |
||||
FSL_HW_PORTAL_RMAN, 1); |
||||
if (err < 0) |
||||
goto err; |
||||
#endif |
||||
#endif /* CONFIG_PPC */ |
||||
|
||||
err: |
||||
if (err < 0) { |
||||
printf("ERROR: unable to create props for %s: %s\n", |
||||
fdt_get_name(blob, off, NULL), |
||||
fdt_strerror(err)); |
||||
return; |
||||
} |
||||
|
||||
off = fdt_node_offset_by_compatible(blob, off, |
||||
"fsl,qman-portal"); |
||||
} |
||||
} |
||||
|
||||
void fdt_fixup_bportals(void *blob) |
||||
{ |
||||
int off, err; |
||||
unsigned int maj, min; |
||||
unsigned int ip_cfg; |
||||
struct ccsr_bman *bman = (void *)CONFIG_SYS_FSL_BMAN_ADDR; |
||||
u32 rev_1 = in_be32(&bman->ip_rev_1); |
||||
u32 rev_2 = in_be32(&bman->ip_rev_2); |
||||
char compat[64]; |
||||
int compat_len; |
||||
|
||||
maj = (rev_1 >> 8) & 0xff; |
||||
min = rev_1 & 0xff; |
||||
|
||||
ip_cfg = rev_2 & 0xff; |
||||
|
||||
compat_len = sprintf(compat, "fsl,bman-portal-%u.%u.%u", |
||||
maj, min, ip_cfg) + 1; |
||||
compat_len += sprintf(compat + compat_len, "fsl,bman-portal") + 1; |
||||
|
||||
off = fdt_node_offset_by_compatible(blob, -1, "fsl,bman-portal"); |
||||
while (off != -FDT_ERR_NOTFOUND) { |
||||
err = fdt_setprop(blob, off, "compatible", compat, compat_len); |
||||
if (err < 0) { |
||||
printf("ERROR: unable to create props for %s: %s\n", |
||||
fdt_get_name(blob, off, NULL), |
||||
fdt_strerror(err)); |
||||
return; |
||||
} |
||||
|
||||
off = fdt_node_offset_by_compatible(blob, off, |
||||
"fsl,bman-portal"); |
||||
} |
||||
} |
||||
@ -0,0 +1,75 @@ |
||||
/*
|
||||
* Copyright 2017 NXP |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef __FSL_QBMAN_H__ |
||||
#define __FSL_QBMAN_H__ |
||||
void fdt_fixup_qportals(void *blob); |
||||
void fdt_fixup_bportals(void *blob); |
||||
void inhibit_portals(void __iomem *addr, int max_portals, |
||||
int arch_max_portals, int portal_cinh_size); |
||||
void setup_qbman_portals(void); |
||||
|
||||
struct ccsr_qman { |
||||
#ifdef CONFIG_SYS_FSL_QMAN_V3 |
||||
u8 res0[0x200]; |
||||
#else |
||||
struct { |
||||
u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ |
||||
u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ |
||||
u32 res; |
||||
u32 qcsp_dd_cfg; /* 0xc - SW Portal Dynamic Debug cfg */ |
||||
} qcsp[32]; |
||||
#endif |
||||
/* Not actually reserved, but irrelevant to u-boot */ |
||||
u8 res[0xbf8 - 0x200]; |
||||
u32 ip_rev_1; |
||||
u32 ip_rev_2; |
||||
u32 fqd_bare; /* FQD Extended Base Addr Register */ |
||||
u32 fqd_bar; /* FQD Base Addr Register */ |
||||
u8 res1[0x8]; |
||||
u32 fqd_ar; /* FQD Attributes Register */ |
||||
u8 res2[0xc]; |
||||
u32 pfdr_bare; /* PFDR Extended Base Addr Register */ |
||||
u32 pfdr_bar; /* PFDR Base Addr Register */ |
||||
u8 res3[0x8]; |
||||
u32 pfdr_ar; /* PFDR Attributes Register */ |
||||
u8 res4[0x4c]; |
||||
u32 qcsp_bare; /* QCSP Extended Base Addr Register */ |
||||
u32 qcsp_bar; /* QCSP Base Addr Register */ |
||||
u8 res5[0x78]; |
||||
u32 ci_sched_cfg; /* Initiator Scheduling Configuration */ |
||||
u32 srcidr; /* Source ID Register */ |
||||
u32 liodnr; /* LIODN Register */ |
||||
u8 res6[4]; |
||||
u32 ci_rlm_cfg; /* Initiator Read Latency Monitor Cfg */ |
||||
u32 ci_rlm_avg; /* Initiator Read Latency Monitor Avg */ |
||||
u8 res7[0x2e8]; |
||||
#ifdef CONFIG_SYS_FSL_QMAN_V3 |
||||
struct { |
||||
u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ |
||||
u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ |
||||
u32 res; |
||||
u32 qcsp_dd_cfg; /* 0xc - SW Portal n Dynamic Debug cfg*/ |
||||
} qcsp[50]; |
||||
#endif |
||||
}; |
||||
|
||||
struct ccsr_bman { |
||||
/* Not actually reserved, but irrelevant to u-boot */ |
||||
u8 res[0xbf8]; |
||||
u32 ip_rev_1; |
||||
u32 ip_rev_2; |
||||
u32 fbpr_bare; /* FBPR Extended Base Addr Register */ |
||||
u32 fbpr_bar; /* FBPR Base Addr Register */ |
||||
u8 res1[0x8]; |
||||
u32 fbpr_ar; /* FBPR Attributes Register */ |
||||
u8 res2[0xf0]; |
||||
u32 srcidr; /* Source ID Register */ |
||||
u32 liodnr; /* LIODN Register */ |
||||
u8 res7[0x2f4]; |
||||
}; |
||||
|
||||
#endif /* __FSL_QBMAN_H__ */ |
||||
Loading…
Reference in new issue