colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imx9: soc: Change FSB directly access to fuse API

Browse Source 
To support OSCCA enabled part which has disabled FSB access from SOC,
change directly read from FSB to use fuse_read API.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Peng Fan
2024-09-19 12:01:23 +08:00
committed by Fabio Estevam
parent e06ca06207
commit 2f00c3e493
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/include/asm/arch-imx9/imx-regs.h
View File

@@ -52,6 +52,9 @@
#define MARKETING_GRADING_MASK GENMASK(5, 4) #define MARKETING_GRADING_MASK GENMASK(5, 4)
#define SPEED_GRADING_MASK GENMASK(11, 6) #define SPEED_GRADING_MASK GENMASK(11, 6)
#define NUM_WORDS_PER_BANK 8
#define HW_CFG1 19
#define HW_CFG2 20
#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
#include <asm/types.h> #include <asm/types.h>

38
arch/arm/mach-imx/imx9/soc.c
View File

@@ -96,10 +96,16 @@ int mmc_get_env_dev(void)
*/ */
u32 get_cpu_speed_grade_hz(void) u32 get_cpu_speed_grade_hz(void)
{ {
u32 speed, max_speed; int ret;
u32 bank, word, speed, max_speed;
u32 val; u32 val;
fuse_read(2, 3, &val); bank = HW_CFG1 / NUM_WORDS_PER_BANK;
word = HW_CFG1 % NUM_WORDS_PER_BANK;
ret = fuse_read(bank, word, &val);
if (ret)
val = 0; /* If read fuse failed, return as blank fuse */
val = FIELD_GET(SPEED_GRADING_MASK, val) & 0xF; val = FIELD_GET(SPEED_GRADING_MASK, val) & 0xF;
speed = MHZ(2300) - val * MHZ(100); speed = MHZ(2300) - val * MHZ(100);
@@ -122,9 +128,15 @@ u32 get_cpu_speed_grade_hz(void)
*/ */
u32 get_cpu_temp_grade(int *minc, int *maxc) u32 get_cpu_temp_grade(int *minc, int *maxc)
{ {
u32 val; int ret;
u32 bank, word, val;
bank = HW_CFG1 / NUM_WORDS_PER_BANK;
word = HW_CFG1 % NUM_WORDS_PER_BANK;
ret = fuse_read(bank, word, &val);
if (ret)
val = 0; /* If read fuse failed, return as blank fuse */
fuse_read(2, 3, &val);
val = FIELD_GET(MARKETING_GRADING_MASK, val); val = FIELD_GET(MARKETING_GRADING_MASK, val);
if (minc && maxc) { if (minc && maxc) {
@@ -160,9 +172,21 @@ static void set_cpu_info(struct ele_get_info_data *info)
static u32 get_cpu_variant_type(u32 type) static u32 get_cpu_variant_type(u32 type)
{ {
/* word 19 */ u32 bank, word, val, val2;
u32 val = readl((ulong)FSB_BASE_ADDR + 0x8000 + (19 << 2)); int ret;
u32 val2 = readl((ulong)FSB_BASE_ADDR + 0x8000 + (20 << 2));
bank = HW_CFG1 / NUM_WORDS_PER_BANK;
word = HW_CFG1 % NUM_WORDS_PER_BANK;
ret = fuse_read(bank, word, &val);
if (ret)
val = 0; /* If read fuse failed, return as blank fuse */
bank = HW_CFG2 / NUM_WORDS_PER_BANK;
word = HW_CFG2 % NUM_WORDS_PER_BANK;
ret = fuse_read(bank, word, &val2);
if (ret)
val2 = 0; /* If read fuse failed, return as blank fuse */
bool npu_disable = !!(val & BIT(13)); bool npu_disable = !!(val & BIT(13));
bool core1_disable = !!(val & BIT(15)); bool core1_disable = !!(val & BIT(15));
u32 pack_9x9_fused = BIT(4) | BIT(17) | BIT(19) | BIT(24); u32 pack_9x9_fused = BIT(4) | BIT(17) | BIT(19) | BIT(24);