On 4/09/24 17:52, Avri Altman wrote:
> CMD22 shall precede CMD32 and CMD33 to configure 38-bit erase start
> address and 38 bit erase stop address.
>
> Signed-off-by: Avri Altman <avri.altman@xxxxxxx>
> ---
> drivers/mmc/core/core.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 06f63fbaadfb..8d9f2c44d2a2 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1645,8 +1645,14 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from,
> cmd.opcode = SD_ERASE_WR_BLK_START;
> else
> cmd.opcode = MMC_ERASE_GROUP_START;
> - cmd.arg = from;
> + cmd.arg = from & 0xFFFFFFFF;
Not needed
> cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
> +
> + if (mmc_card_ult_capacity(card)) {
> + cmd.ext_addr = (from >> 32) & 0x3F;
'0x3F' not needed
> + cmd.has_ext_addr = 1;
'true' if use bool
> + }
> +
> err = mmc_wait_for_cmd(card->host, &cmd, 0);
> if (err) {
> pr_err("mmc_erase: group start error %d, "
> @@ -1660,8 +1666,14 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from,
> cmd.opcode = SD_ERASE_WR_BLK_END;
> else
> cmd.opcode = MMC_ERASE_GROUP_END;
> - cmd.arg = to;
> + cmd.arg = to & 0xFFFFFFFF;
Not needed
> cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
> +
> + if (mmc_card_ult_capacity(card)) {
> + cmd.ext_addr = (to >> 32) & 0x3F;
'0x3F' not needed
> + cmd.has_ext_addr = 1;
'true' if use bool
> + }
> +
> err = mmc_wait_for_cmd(card->host, &cmd, 0);
> if (err) {
> pr_err("mmc_erase: group end error %d, status %#x\n",
