eeprom: starfive: Simplify get_ddr_size_from_eeprom()

Directly return the DDR size instead of the field of 'DxxxExxx'.
Move the function description to the header file.
Return 0 instead of 0xFF if read_eeprom() fails.

Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fixes: aea1bd95b61e ("eeprom: starfive: Enable ID EEPROM configuration")
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
This commit is contained in:
Hal Feng 2025-10-24 16:59:26 +08:00 committed by Leo Yu-Chi Liang
parent 841856ed96
commit 6015c98be5
3 changed files with 11 additions and 16 deletions

View File

@ -41,7 +41,7 @@ int spl_dram_init(void)
/* Read the definition of the DDR size from eeprom, and if not,
* use the definition in DT
*/
size = (get_ddr_size_from_eeprom() >> 16) & 0xFF;
size = get_ddr_size_from_eeprom();
if (check_ddr_size(size))
gd->ram_size = size << 30;

View File

@ -10,7 +10,13 @@
#include <linux/types.h>
u8 get_pcb_revision_from_eeprom(void);
u32 get_ddr_size_from_eeprom(void);
/**
* get_ddr_size_from_eeprom() - read DDR size from EEPROM
*
* @return: size in GiB or 0 on error.
*/
u8 get_ddr_size_from_eeprom(void);
/**
* get_mmc_size_from_eeprom() - read eMMC size from EEPROM

View File

@ -550,23 +550,12 @@ u8 get_pcb_revision_from_eeprom(void)
return pbuf.eeprom.atom1.data.pstr[6];
}
/**
* get_ddr_size_from_eeprom - get the DDR size
* pstr: VF7110A1-2228-D008E000-00000001
* VF7110A1/VF7110B1 : VisionFive JH7110A /VisionFive JH7110B
* D008: 8GB LPDDR4
* E000: No emmc device, ECxx: include emmc device, xx: Capacity size[GB]
* return: the field of 'D008E000'
*/
u32 get_ddr_size_from_eeprom(void)
u8 get_ddr_size_from_eeprom(void)
{
u32 pv = 0xFFFFFFFF;
if (read_eeprom())
return pv;
return 0;
return hextoul(&pbuf.eeprom.atom1.data.pstr[14], NULL);
return (hextoul(&pbuf.eeprom.atom1.data.pstr[14], NULL) >> 16) & 0xFF;
}
u32 get_mmc_size_from_eeprom(void)