![NeilBrown](/assets/img/avatar_default.png)
Since commit3af5a67c86
("MIPS: Fix early CM probing") the MT7621 has not been able to boot. This commit caused mips_cm_probe() to be called before mt7621.c::proc_soc_init(). prom_soc_init() has a comment explaining that mips_cm_probe() "wipes out the bootloader config" and means that configuration registers are no longer available. It has some code to re-enable this config. Before this re-enable code is run, the sysc register cannot be read, so when SYSC_REG_CHIP_NAME0 is read, a garbage value is returned and panic() is called. If we move the config-repair code to the top of prom_soc_init(), the registers can be read and boot can proceed. Very occasionally, the first register read after the reconfiguration returns garbage, so add a call to __sync(). Fixes:3af5a67c86
("MIPS: Fix early CM probing") Signed-off-by: NeilBrown <neil@brown.name> Reviewed-by: Matt Redfearn <matt.redfearn@mips.com> Cc: John Crispin <john@phrozen.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: <stable@vger.kernel.org> # 4.5+ Patchwork: https://patchwork.linux-mips.org/patch/18859/ Signed-off-by: James Hogan <jhogan@kernel.org>
227 lines
6.7 KiB
C
227 lines
6.7 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published
|
|
* by the Free Software Foundation.
|
|
*
|
|
* Copyright (C) 2015 Nikolay Martynov <mar.kolya@gmail.com>
|
|
* Copyright (C) 2015 John Crispin <john@phrozen.org>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/mipsregs.h>
|
|
#include <asm/smp-ops.h>
|
|
#include <asm/mips-cps.h>
|
|
#include <asm/mach-ralink/ralink_regs.h>
|
|
#include <asm/mach-ralink/mt7621.h>
|
|
|
|
#include <pinmux.h>
|
|
|
|
#include "common.h"
|
|
|
|
#define SYSC_REG_SYSCFG 0x10
|
|
#define SYSC_REG_CPLL_CLKCFG0 0x2c
|
|
#define SYSC_REG_CUR_CLK_STS 0x44
|
|
#define CPU_CLK_SEL (BIT(30) | BIT(31))
|
|
|
|
#define MT7621_GPIO_MODE_UART1 1
|
|
#define MT7621_GPIO_MODE_I2C 2
|
|
#define MT7621_GPIO_MODE_UART3_MASK 0x3
|
|
#define MT7621_GPIO_MODE_UART3_SHIFT 3
|
|
#define MT7621_GPIO_MODE_UART3_GPIO 1
|
|
#define MT7621_GPIO_MODE_UART2_MASK 0x3
|
|
#define MT7621_GPIO_MODE_UART2_SHIFT 5
|
|
#define MT7621_GPIO_MODE_UART2_GPIO 1
|
|
#define MT7621_GPIO_MODE_JTAG 7
|
|
#define MT7621_GPIO_MODE_WDT_MASK 0x3
|
|
#define MT7621_GPIO_MODE_WDT_SHIFT 8
|
|
#define MT7621_GPIO_MODE_WDT_GPIO 1
|
|
#define MT7621_GPIO_MODE_PCIE_RST 0
|
|
#define MT7621_GPIO_MODE_PCIE_REF 2
|
|
#define MT7621_GPIO_MODE_PCIE_MASK 0x3
|
|
#define MT7621_GPIO_MODE_PCIE_SHIFT 10
|
|
#define MT7621_GPIO_MODE_PCIE_GPIO 1
|
|
#define MT7621_GPIO_MODE_MDIO_MASK 0x3
|
|
#define MT7621_GPIO_MODE_MDIO_SHIFT 12
|
|
#define MT7621_GPIO_MODE_MDIO_GPIO 1
|
|
#define MT7621_GPIO_MODE_RGMII1 14
|
|
#define MT7621_GPIO_MODE_RGMII2 15
|
|
#define MT7621_GPIO_MODE_SPI_MASK 0x3
|
|
#define MT7621_GPIO_MODE_SPI_SHIFT 16
|
|
#define MT7621_GPIO_MODE_SPI_GPIO 1
|
|
#define MT7621_GPIO_MODE_SDHCI_MASK 0x3
|
|
#define MT7621_GPIO_MODE_SDHCI_SHIFT 18
|
|
#define MT7621_GPIO_MODE_SDHCI_GPIO 1
|
|
|
|
static struct rt2880_pmx_func uart1_grp[] = { FUNC("uart1", 0, 1, 2) };
|
|
static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 3, 2) };
|
|
static struct rt2880_pmx_func uart3_grp[] = {
|
|
FUNC("uart3", 0, 5, 4),
|
|
FUNC("i2s", 2, 5, 4),
|
|
FUNC("spdif3", 3, 5, 4),
|
|
};
|
|
static struct rt2880_pmx_func uart2_grp[] = {
|
|
FUNC("uart2", 0, 9, 4),
|
|
FUNC("pcm", 2, 9, 4),
|
|
FUNC("spdif2", 3, 9, 4),
|
|
};
|
|
static struct rt2880_pmx_func jtag_grp[] = { FUNC("jtag", 0, 13, 5) };
|
|
static struct rt2880_pmx_func wdt_grp[] = {
|
|
FUNC("wdt rst", 0, 18, 1),
|
|
FUNC("wdt refclk", 2, 18, 1),
|
|
};
|
|
static struct rt2880_pmx_func pcie_rst_grp[] = {
|
|
FUNC("pcie rst", MT7621_GPIO_MODE_PCIE_RST, 19, 1),
|
|
FUNC("pcie refclk", MT7621_GPIO_MODE_PCIE_REF, 19, 1)
|
|
};
|
|
static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 20, 2) };
|
|
static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 22, 12) };
|
|
static struct rt2880_pmx_func spi_grp[] = {
|
|
FUNC("spi", 0, 34, 7),
|
|
FUNC("nand1", 2, 34, 7),
|
|
};
|
|
static struct rt2880_pmx_func sdhci_grp[] = {
|
|
FUNC("sdhci", 0, 41, 8),
|
|
FUNC("nand2", 2, 41, 8),
|
|
};
|
|
static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 49, 12) };
|
|
|
|
static struct rt2880_pmx_group mt7621_pinmux_data[] = {
|
|
GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1),
|
|
GRP("i2c", i2c_grp, 1, MT7621_GPIO_MODE_I2C),
|
|
GRP_G("uart3", uart3_grp, MT7621_GPIO_MODE_UART3_MASK,
|
|
MT7621_GPIO_MODE_UART3_GPIO, MT7621_GPIO_MODE_UART3_SHIFT),
|
|
GRP_G("uart2", uart2_grp, MT7621_GPIO_MODE_UART2_MASK,
|
|
MT7621_GPIO_MODE_UART2_GPIO, MT7621_GPIO_MODE_UART2_SHIFT),
|
|
GRP("jtag", jtag_grp, 1, MT7621_GPIO_MODE_JTAG),
|
|
GRP_G("wdt", wdt_grp, MT7621_GPIO_MODE_WDT_MASK,
|
|
MT7621_GPIO_MODE_WDT_GPIO, MT7621_GPIO_MODE_WDT_SHIFT),
|
|
GRP_G("pcie", pcie_rst_grp, MT7621_GPIO_MODE_PCIE_MASK,
|
|
MT7621_GPIO_MODE_PCIE_GPIO, MT7621_GPIO_MODE_PCIE_SHIFT),
|
|
GRP_G("mdio", mdio_grp, MT7621_GPIO_MODE_MDIO_MASK,
|
|
MT7621_GPIO_MODE_MDIO_GPIO, MT7621_GPIO_MODE_MDIO_SHIFT),
|
|
GRP("rgmii2", rgmii2_grp, 1, MT7621_GPIO_MODE_RGMII2),
|
|
GRP_G("spi", spi_grp, MT7621_GPIO_MODE_SPI_MASK,
|
|
MT7621_GPIO_MODE_SPI_GPIO, MT7621_GPIO_MODE_SPI_SHIFT),
|
|
GRP_G("sdhci", sdhci_grp, MT7621_GPIO_MODE_SDHCI_MASK,
|
|
MT7621_GPIO_MODE_SDHCI_GPIO, MT7621_GPIO_MODE_SDHCI_SHIFT),
|
|
GRP("rgmii1", rgmii1_grp, 1, MT7621_GPIO_MODE_RGMII1),
|
|
{ 0 }
|
|
};
|
|
|
|
phys_addr_t mips_cpc_default_phys_base(void)
|
|
{
|
|
panic("Cannot detect cpc address");
|
|
}
|
|
|
|
void __init ralink_clk_init(void)
|
|
{
|
|
int cpu_fdiv = 0;
|
|
int cpu_ffrac = 0;
|
|
int fbdiv = 0;
|
|
u32 clk_sts, syscfg;
|
|
u8 clk_sel = 0, xtal_mode;
|
|
u32 cpu_clk;
|
|
|
|
if ((rt_sysc_r32(SYSC_REG_CPLL_CLKCFG0) & CPU_CLK_SEL) != 0)
|
|
clk_sel = 1;
|
|
|
|
switch (clk_sel) {
|
|
case 0:
|
|
clk_sts = rt_sysc_r32(SYSC_REG_CUR_CLK_STS);
|
|
cpu_fdiv = ((clk_sts >> 8) & 0x1F);
|
|
cpu_ffrac = (clk_sts & 0x1F);
|
|
cpu_clk = (500 * cpu_ffrac / cpu_fdiv) * 1000 * 1000;
|
|
break;
|
|
|
|
case 1:
|
|
fbdiv = ((rt_sysc_r32(0x648) >> 4) & 0x7F) + 1;
|
|
syscfg = rt_sysc_r32(SYSC_REG_SYSCFG);
|
|
xtal_mode = (syscfg >> 6) & 0x7;
|
|
if (xtal_mode >= 6) {
|
|
/* 25Mhz Xtal */
|
|
cpu_clk = 25 * fbdiv * 1000 * 1000;
|
|
} else if (xtal_mode >= 3) {
|
|
/* 40Mhz Xtal */
|
|
cpu_clk = 40 * fbdiv * 1000 * 1000;
|
|
} else {
|
|
/* 20Mhz Xtal */
|
|
cpu_clk = 20 * fbdiv * 1000 * 1000;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
void __init ralink_of_remap(void)
|
|
{
|
|
rt_sysc_membase = plat_of_remap_node("mtk,mt7621-sysc");
|
|
rt_memc_membase = plat_of_remap_node("mtk,mt7621-memc");
|
|
|
|
if (!rt_sysc_membase || !rt_memc_membase)
|
|
panic("Failed to remap core resources");
|
|
}
|
|
|
|
void prom_soc_init(struct ralink_soc_info *soc_info)
|
|
{
|
|
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
|
|
unsigned char *name = NULL;
|
|
u32 n0;
|
|
u32 n1;
|
|
u32 rev;
|
|
|
|
/* Early detection of CMP support */
|
|
mips_cm_probe();
|
|
mips_cpc_probe();
|
|
|
|
if (mips_cps_numiocu(0)) {
|
|
/*
|
|
* mips_cm_probe() wipes out bootloader
|
|
* config for CM regions and we have to configure them
|
|
* again. This SoC cannot talk to pamlbus devices
|
|
* witout proper iocu region set up.
|
|
*
|
|
* FIXME: it would be better to do this with values
|
|
* from DT, but we need this very early because
|
|
* without this we cannot talk to pretty much anything
|
|
* including serial.
|
|
*/
|
|
write_gcr_reg0_base(MT7621_PALMBUS_BASE);
|
|
write_gcr_reg0_mask(~MT7621_PALMBUS_SIZE |
|
|
CM_GCR_REGn_MASK_CMTGT_IOCU0);
|
|
__sync();
|
|
}
|
|
|
|
n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
|
|
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
|
|
|
|
if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) {
|
|
name = "MT7621";
|
|
soc_info->compatible = "mtk,mt7621-soc";
|
|
} else {
|
|
panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
|
|
}
|
|
ralink_soc = MT762X_SOC_MT7621AT;
|
|
rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
|
|
|
|
snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
|
|
"MediaTek %s ver:%u eco:%u",
|
|
name,
|
|
(rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK,
|
|
(rev & CHIP_REV_ECO_MASK));
|
|
|
|
soc_info->mem_size_min = MT7621_DDR2_SIZE_MIN;
|
|
soc_info->mem_size_max = MT7621_DDR2_SIZE_MAX;
|
|
soc_info->mem_base = MT7621_DRAM_BASE;
|
|
|
|
rt2880_pinmux_data = mt7621_pinmux_data;
|
|
|
|
|
|
if (!register_cps_smp_ops())
|
|
return;
|
|
if (!register_cmp_smp_ops())
|
|
return;
|
|
if (!register_vsmp_smp_ops())
|
|
return;
|
|
}
|