mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
mmc: Move MMC boot code into its own file
Rather than having an #ifdef in the main mmc.c file, control this feature from the Makefile by moving the code into its own file. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
parent
5aed4cbba0
commit
c40704f4b1
4 changed files with 146 additions and 125 deletions
|
|
@ -25,6 +25,9 @@ obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
|
|||
obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
|
||||
obj-$(CONFIG_FTSDC021) += ftsdc021_sdhci.o
|
||||
obj-$(CONFIG_GENERIC_MMC) += mmc.o
|
||||
ifdef CONFIG_SUPPORT_EMMC_BOOT
|
||||
obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o
|
||||
endif
|
||||
obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
|
||||
obj-$(CONFIG_KONA_SDHCI) += kona_sdhci.o
|
||||
obj-$(CONFIG_MMC_SPI) += mmc_spi.o
|
||||
|
|
|
|||
|
|
@ -463,8 +463,7 @@ static int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
|
|||
return err;
|
||||
}
|
||||
|
||||
|
||||
static int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
|
||||
int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
|
||||
{
|
||||
struct mmc_cmd cmd;
|
||||
int timeout = 1000;
|
||||
|
|
@ -1686,126 +1685,3 @@ int mmc_initialize(bd_t *bis)
|
|||
mmc_do_preinit();
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SUPPORT_EMMC_BOOT
|
||||
/*
|
||||
* This function changes the size of boot partition and the size of rpmb
|
||||
* partition present on EMMC devices.
|
||||
*
|
||||
* Input Parameters:
|
||||
* struct *mmc: pointer for the mmc device strcuture
|
||||
* bootsize: size of boot partition
|
||||
* rpmbsize: size of rpmb partition
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
|
||||
int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize,
|
||||
unsigned long rpmbsize)
|
||||
{
|
||||
int err;
|
||||
struct mmc_cmd cmd;
|
||||
|
||||
/* Only use this command for raw EMMC moviNAND. Enter backdoor mode */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = MMC_CMD62_ARG1;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error1 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Boot partition changing mode */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = MMC_CMD62_ARG2;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error2 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
/* boot partition size is multiple of 128KB */
|
||||
bootsize = (bootsize * 1024) / 128;
|
||||
|
||||
/* Arg: boot partition size */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = bootsize;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error3 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
/* RPMB partition size is multiple of 128KB */
|
||||
rpmbsize = (rpmbsize * 1024) / 128;
|
||||
/* Arg: RPMB partition size */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = rpmbsize;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error4 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[177] which is BOOT_BUS_WIDTH
|
||||
* based on the passed in values for BOOT_BUS_WIDTH, RESET_BOOT_BUS_WIDTH
|
||||
* and BOOT_MODE.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_BUS_WIDTH,
|
||||
EXT_CSD_BOOT_BUS_WIDTH_MODE(mode) |
|
||||
EXT_CSD_BOOT_BUS_WIDTH_RESET(reset) |
|
||||
EXT_CSD_BOOT_BUS_WIDTH_WIDTH(width));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[179] which is PARTITION_CONFIG (formerly BOOT_CONFIG)
|
||||
* based on the passed in values for BOOT_ACK, BOOT_PARTITION_ENABLE and
|
||||
* PARTITION_ACCESS.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
|
||||
EXT_CSD_BOOT_ACK(ack) |
|
||||
EXT_CSD_BOOT_PART_NUM(part_num) |
|
||||
EXT_CSD_PARTITION_ACCESS(access));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[162] which is RST_n_FUNCTION based on the given value
|
||||
* for enable. Note that this is a write-once field for non-zero values.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_rst_n_function(struct mmc *mmc, u8 enable)
|
||||
{
|
||||
return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_RST_N_FUNCTION,
|
||||
enable);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
131
drivers/mmc/mmc_boot.c
Normal file
131
drivers/mmc/mmc_boot.c
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Google, Inc
|
||||
* Written by Amar <amarendra.xt@samsung.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <mmc.h>
|
||||
#include "mmc_private.h"
|
||||
|
||||
/*
|
||||
* This function changes the size of boot partition and the size of rpmb
|
||||
* partition present on EMMC devices.
|
||||
*
|
||||
* Input Parameters:
|
||||
* struct *mmc: pointer for the mmc device strcuture
|
||||
* bootsize: size of boot partition
|
||||
* rpmbsize: size of rpmb partition
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
|
||||
int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize,
|
||||
unsigned long rpmbsize)
|
||||
{
|
||||
int err;
|
||||
struct mmc_cmd cmd;
|
||||
|
||||
/* Only use this command for raw EMMC moviNAND. Enter backdoor mode */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = MMC_CMD62_ARG1;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error1 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Boot partition changing mode */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = MMC_CMD62_ARG2;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error2 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
/* boot partition size is multiple of 128KB */
|
||||
bootsize = (bootsize * 1024) / 128;
|
||||
|
||||
/* Arg: boot partition size */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = bootsize;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error3 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
/* RPMB partition size is multiple of 128KB */
|
||||
rpmbsize = (rpmbsize * 1024) / 128;
|
||||
/* Arg: RPMB partition size */
|
||||
cmd.cmdidx = MMC_CMD_RES_MAN;
|
||||
cmd.resp_type = MMC_RSP_R1b;
|
||||
cmd.cmdarg = rpmbsize;
|
||||
|
||||
err = mmc_send_cmd(mmc, &cmd, NULL);
|
||||
if (err) {
|
||||
debug("mmc_boot_partition_size_change: Error4 = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[177] which is BOOT_BUS_WIDTH
|
||||
* based on the passed in values for BOOT_BUS_WIDTH, RESET_BOOT_BUS_WIDTH
|
||||
* and BOOT_MODE.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_BUS_WIDTH,
|
||||
EXT_CSD_BOOT_BUS_WIDTH_MODE(mode) |
|
||||
EXT_CSD_BOOT_BUS_WIDTH_RESET(reset) |
|
||||
EXT_CSD_BOOT_BUS_WIDTH_WIDTH(width));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[179] which is PARTITION_CONFIG (formerly BOOT_CONFIG)
|
||||
* based on the passed in values for BOOT_ACK, BOOT_PARTITION_ENABLE and
|
||||
* PARTITION_ACCESS.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
|
||||
EXT_CSD_BOOT_ACK(ack) |
|
||||
EXT_CSD_BOOT_PART_NUM(part_num) |
|
||||
EXT_CSD_PARTITION_ACCESS(access));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify EXT_CSD[162] which is RST_n_FUNCTION based on the given value
|
||||
* for enable. Note that this is a write-once field for non-zero values.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int mmc_set_rst_n_function(struct mmc *mmc, u8 enable)
|
||||
{
|
||||
return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_RST_N_FUNCTION,
|
||||
enable);
|
||||
}
|
||||
|
|
@ -106,4 +106,15 @@ void mmc_list_add(struct mmc *mmc);
|
|||
*/
|
||||
int mmc_switch_part(struct mmc *mmc, unsigned int part_num);
|
||||
|
||||
/**
|
||||
* mmc_switch() - Issue and MMC switch mode command
|
||||
*
|
||||
* @mmc: MMC device
|
||||
* @set: Unused
|
||||
* @index: Cmdarg index
|
||||
* @value: Cmdarg value
|
||||
* @return 0 if OK, -ve on error
|
||||
*/
|
||||
int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value);
|
||||
|
||||
#endif /* _MMC_PRIVATE_H_ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue