V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: uniphier: support DDR PHY parameter dump command for LD11 

Add the LD11 SoC data and adjuts the printf() format because this is
a 64-bit SoC.  Otherwise, 16-digits pointer addresses would break
the log format.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-27 23:47:09 +09:00
parent adf55f63ae
commit 5f49845ecc
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-uniphier/Kconfig
View File

@ -99,7 +99,8 @@ config CMD_PINMON
config CMD_DDRPHY_DUMP config CMD_DDRPHY_DUMP
bool "Enable dump command of DDR PHY parameters" bool "Enable dump command of DDR PHY parameters"
depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || ARCH_UNIPHIER_SLD8 depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || \
ARCH_UNIPHIER_SLD8 || ARCH_UNIPHIER_LD11
default y default y
help help
The command "ddrphy" shows the resulting parameters of DDR PHY The command "ddrphy" shows the resulting parameters of DDR PHY

22
arch/arm/mach-uniphier/dram/cmd_ddrphy.c
View File

@ -22,6 +22,8 @@
/* field separator */ /* field separator */
#define FS " " #define FS " "
#define ptr_to_uint(p) ((unsigned int)(unsigned long)(p))
struct phy_param { struct phy_param {
resource_size_t base; resource_size_t base;
unsigned int nr_dx; unsigned int nr_dx;
@ -47,6 +49,11 @@ static const struct phy_param uniphier_sld8_phy_param[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
static const struct phy_param uniphier_ld11_phy_param[] = {
{ .base = 0x5bc01000, .nr_dx = 4, },
{ /* sentinel */ }
};
static void print_bdl(void __iomem *reg, int n) static void print_bdl(void __iomem *reg, int n)
{ {
u32 val = readl(reg); u32 val = readl(reg);
@ -174,15 +181,17 @@ static void mdl_dump(const struct phy_param *phy_param)
#define REG_DUMP(x) \ #define REG_DUMP(x) \
{ int ofst = PHY_ ## x; void __iomem *reg = phy_base + ofst; \ { int ofst = PHY_ ## x; void __iomem *reg = phy_base + ofst; \
printf("%3d: %-10s: %p : %08x\n", \ printf("%3d: %-10s: %08x : %08x\n", \
ofst >> PHY_REG_SHIFT, #x, reg, readl(reg)); } ofst >> PHY_REG_SHIFT, #x, \
ptr_to_uint(reg), readl(reg)); }
#define DX_REG_DUMP(dx, x) \ #define DX_REG_DUMP(dx, x) \
{ int ofst = PHY_DX_BASE + PHY_DX_STRIDE * (dx) + \ { int ofst = PHY_DX_BASE + PHY_DX_STRIDE * (dx) + \
PHY_DX_## x; \ PHY_DX_## x; \
void __iomem *reg = phy_base + ofst; \ void __iomem *reg = phy_base + ofst; \
printf("%3d: DX%d%-7s: %p : %08x\n", \ printf("%3d: DX%d%-7s: %08x : %08x\n", \
ofst >> PHY_REG_SHIFT, (dx), #x, reg, readl(reg)); } ofst >> PHY_REG_SHIFT, (dx), #x, \
ptr_to_uint(reg), readl(reg)); }
static void reg_dump(const struct phy_param *phy_param) static void reg_dump(const struct phy_param *phy_param)
{ {
@ -194,7 +203,7 @@ static void reg_dump(const struct phy_param *phy_param)
for (p = 0; phy_param->base; phy_param++, p++) { for (p = 0; phy_param->base; phy_param++, p++) {
phy_base = ioremap(phy_param->base, SZ_4K); phy_base = ioremap(phy_param->base, SZ_4K);
printf("== PHY%d (base: %p) ==\n", p, phy_base); printf("== PHY%d (base: %08x) ==\n", p, ptr_to_uint(phy_base));
printf(" No: Name : Address : Data\n"); printf(" No: Name : Address : Data\n");
REG_DUMP(RIDR); REG_DUMP(RIDR);
@ -246,6 +255,9 @@ static int do_ddr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
case SOC_UNIPHIER_SLD8: case SOC_UNIPHIER_SLD8:
phy_param = uniphier_sld8_phy_param; phy_param = uniphier_sld8_phy_param;
break; break;
case SOC_UNIPHIER_LD11:
phy_param = uniphier_ld11_phy_param;
break;
default: default:
printf("unsupported SoC\n"); printf("unsupported SoC\n");
return CMD_RET_FAILURE; return CMD_RET_FAILURE;