Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 10:04:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

uniphier: change block_addressing flag to bool

Browse source 
The flag, uniphier_emmc_block_addressing, is boolean logic, so
"bool' is more suitable.

uniphier_emmc_is_over_2gb() is not boolean - it returns 1 / 0
depending on the card density, or a negative value on failure.
Rename it to make it less confusing.

Change-Id: Ia646b1929147b644e0df07c46b54ab80548bc3bd
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2020-02-03 18:40:37 +09:00
parent 43bbac27dc
commit 1046c1cae2
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plat/socionext/uniphier/uniphier_emmc.c
View file

@ -87,7 +87,7 @@ struct uniphier_mmc_cmd {
unsigned int is_data; unsigned int is_data;
}; };
static int uniphier_emmc_block_addressing; static bool uniphier_emmc_block_addressing;
static int uniphier_emmc_send_cmd(uintptr_t host_base, static int uniphier_emmc_send_cmd(uintptr_t host_base,
struct uniphier_mmc_cmd *cmd) struct uniphier_mmc_cmd *cmd)
@ -157,7 +157,8 @@ static int uniphier_emmc_switch_part(uintptr_t host_base, int part_num)
return uniphier_emmc_send_cmd(host_base, &cmd); return uniphier_emmc_send_cmd(host_base, &cmd);
} }
static int uniphier_emmc_is_over_2gb(uintptr_t host_base) static int uniphier_emmc_check_device_size(uintptr_t host_base,
bool *is_block_addressing)
{ {
struct uniphier_mmc_cmd cmd = {0}; struct uniphier_mmc_cmd cmd = {0};
uint32_t csd40, csd72; /* CSD[71:40], CSD[103:72] */ uint32_t csd40, csd72; /* CSD[71:40], CSD[103:72] */
@ -174,7 +175,10 @@ static int uniphier_emmc_is_over_2gb(uintptr_t host_base)
csd40 = mmio_read_32(host_base + SDHCI_RESPONSE + 4); csd40 = mmio_read_32(host_base + SDHCI_RESPONSE + 4);
csd72 = mmio_read_32(host_base + SDHCI_RESPONSE + 8); csd72 = mmio_read_32(host_base + SDHCI_RESPONSE + 8);
return !(~csd40 & 0xffc00380) && !(~csd72 & 0x3); /* C_SIZE == 0xfff && C_SIZE_MULT == 0x7 ? */
*is_block_addressing = !(~csd40 & 0xffc00380) && !(~csd72 & 0x3);
return 0;
} }
static int uniphier_emmc_load_image(uintptr_t host_base, static int uniphier_emmc_load_image(uintptr_t host_base,
@ -253,12 +257,11 @@ static int uniphier_emmc_hw_init(void)
while (mmio_read_8(host_base + SDHCI_SOFTWARE_RESET)) while (mmio_read_8(host_base + SDHCI_SOFTWARE_RESET))
; ;
ret = uniphier_emmc_is_over_2gb(host_base); ret = uniphier_emmc_check_device_size(host_base,
if (ret < 0) &uniphier_emmc_block_addressing);
if (ret)
return ret; return ret;
uniphier_emmc_block_addressing = ret;
cmd.cmdarg = UNIPHIER_EMMC_RCA << 16; cmd.cmdarg = UNIPHIER_EMMC_RCA << 16;
/* select card again */ /* select card again */