Commit 221c057a authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding

soc/tegra: fuse: Cache values of straps and Chip ID registers

There is no need to re-read Chip ID and HW straps out from hardware each
time, it is a bit nicer to cache the values in memory.
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 45f019a6
...@@ -21,18 +21,15 @@ ...@@ -21,18 +21,15 @@
#define PMC_STRAPPING_OPT_A_RAM_CODE_MASK_SHORT \ #define PMC_STRAPPING_OPT_A_RAM_CODE_MASK_SHORT \
(0x3 << PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT) (0x3 << PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT)
static void __iomem *apbmisc_base;
static void __iomem *strapping_base;
static bool long_ram_code; static bool long_ram_code;
static u32 strapping;
static u32 chipid;
u32 tegra_read_chipid(void) u32 tegra_read_chipid(void)
{ {
if (!apbmisc_base) { WARN(!chipid, "Tegra Chip ID not yet available\n");
WARN(1, "Tegra Chip ID not yet available\n");
return 0;
}
return readl_relaxed(apbmisc_base + 4); return chipid;
} }
u8 tegra_get_chip_id(void) u8 tegra_get_chip_id(void)
...@@ -42,10 +39,7 @@ u8 tegra_get_chip_id(void) ...@@ -42,10 +39,7 @@ u8 tegra_get_chip_id(void)
u32 tegra_read_straps(void) u32 tegra_read_straps(void)
{ {
if (strapping_base) return strapping;
return readl_relaxed(strapping_base);
else
return 0;
} }
u32 tegra_read_ram_code(void) u32 tegra_read_ram_code(void)
...@@ -104,6 +98,7 @@ void __init tegra_init_revision(void) ...@@ -104,6 +98,7 @@ void __init tegra_init_revision(void)
void __init tegra_init_apbmisc(void) void __init tegra_init_apbmisc(void)
{ {
void __iomem *apbmisc_base, *strapping_base;
struct resource apbmisc, straps; struct resource apbmisc, straps;
struct device_node *np; struct device_node *np;
...@@ -163,10 +158,14 @@ void __init tegra_init_apbmisc(void) ...@@ -163,10 +158,14 @@ void __init tegra_init_apbmisc(void)
apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc)); apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
if (!apbmisc_base) if (!apbmisc_base)
pr_err("failed to map APBMISC registers\n"); pr_err("failed to map APBMISC registers\n");
else
chipid = readl_relaxed(apbmisc_base + 4);
strapping_base = ioremap_nocache(straps.start, resource_size(&straps)); strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
if (!strapping_base) if (!strapping_base)
pr_err("failed to map strapping options registers\n"); pr_err("failed to map strapping options registers\n");
else
strapping = readl_relaxed(strapping_base);
long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code"); long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
} }
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