From patchwork Fri Oct 25 20:21:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 838611 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04806214409 for ; Fri, 25 Oct 2024 20:22:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887736; cv=pass; b=SXD69hFT2fk8yc/uJce207rzo3Aq2MOoukthJ1EsMAPHXQrCrANA+a0Y5pg39uaUpq80cl2JGmFAFOjllhMTvhl4FmVVXCi7ytSEVsG+7BrtINSHRfk4Jg7BzLCX0HM7/s5xAT+7vlp9t7QRXiS/XsDAW8eaQHKv6oBpBQ1vGzY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887736; c=relaxed/simple; bh=bFBF1fU/1hCUug9kd0yo6iuELjwChWvS4TF228+hrmc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=rHIaryuqvPfIX/Lq53APubaWVazZsB1c4nk9r3WWP5iAw5x7gLU44Ephlt6t/Gzm53TwRofVjOgD/aNGWuX3QC+NOjysIDo8mqhvqgqm+c9viIp2Wyzkso9mLtNhE6SmqfOi7JXTx0EeKY3FpIUVBK7i/knrw/MzVxYVeUaGs20= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=YOamJ3av; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=Oy++wSu1; arc=pass smtp.client-ip=85.215.255.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="YOamJ3av"; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="Oy++wSu1" ARC-Seal: i=1; a=rsa-sha256; t=1729887719; cv=none; d=strato.com; s=strato-dkim-0002; b=QtriEa8/k+Sa92y9R0ffn/tMYBnWaMGtEf5Kra8KLqsrGx/SG4/RPq/EJOUTviS61E ztc+P4GjPHHQ7cGM3zsokeuyVeRzkvsISDBVa4FznaEh+C1ghuvRTwtw2wQUBSlywugz miVI5YAwVf8CN7gTgxTKj6aGCYQzHLaKTY/vUnF6g/S4JRuIC+KzVy/FhUKQyisaBa9t 6I1+BSSQtQUcZJCXZhgO42I0Fk7K1EKp1jYuQwL/rCb/qrrXeoTTTMbkrM4cn1EsUWxi 10hqzgYj26Tl7A9GgEsuCjAJA+yXwvmiO1u23t5/urEdeslJpyzEWRGHw1wiuZUyFIR2 Omtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=k3Sjiggo0lZRu9KiyTS7uTb1sqtbe6N9KUJ3E0dKihc=; b=sDq8zgX5VovgckXvuEWZL1Gv/B6XBLpPonSntgEL2KSdhoowQI3NaweiAg3ZvR2mpD BVz0XWs92Jxi3UkLnAG9MvHqrWCztNUbJ3iWkER/6MqfsIPVdp1/wPIY/sOFZVWwdgWd LzutmJDNctiUjWZcELPHvAuC3oe7nG4mVYjRJ1DJJVwW9664A/hngqU9KiBzsM+5I/m3 7XGKm7Nt7yUGE8AvCoGEv0CW25fMAZO9GZBYz2GuPmgoYkLgOWZc9gT+ORRmpQqWa2do Dp/V/9C/CgPr3EusPphEuPqjKpcZkmsae22TBr6bCXCCa017//evJA53ZVgc3/Pz/RTx y6Nw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=k3Sjiggo0lZRu9KiyTS7uTb1sqtbe6N9KUJ3E0dKihc=; b=YOamJ3avEMMkoS2sztHio+4kr7LEnQ4jZaHROhErThfA97kvRze+CGHZHSPABwOENf pKhTP8e1n430mcCVvsN8AUYZs+u3C1cSuSEVGBGLJgELZKi/4WS4k/toKG97JGEAdNk1 dW0JPMUoHdPoTu+BMZ90s8f7Hj/SAwkAbTeZsFWnbq3ExluMCXGaz3ch6d1gEf5oAoQr woJf+cmDzbUwH6KEn4qZMd/zIu9KoJ2ba07ok/3cuivDXkvkByHTac+6KZjraUUyO+Qm u5xQ5usFCKdVPPyTkUql7IeW0kBfDrnoKwZY4e5Ju/GhvNN+7hOuABUMv7xyCgrjCbBI AV/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=k3Sjiggo0lZRu9KiyTS7uTb1sqtbe6N9KUJ3E0dKihc=; b=Oy++wSu1wsbKGXJ1QOkS63cwc5e1tLoHOMvSG4wSFsU+IfhGrm3fGf7JS7Uzv5wyQw gkqaWTKzWhbeuSFbKsAQ== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O256fJ4HnWXON1RD+6IXGo7S6YVZbGYm2ZHbmjWFWcm6Nbb9lHw==" Received: from Munilab01-lab.speedport.ip by smtp.strato.de (RZmta 51.2.11 AUTH) with ESMTPSA id za0ed209PKLxbew (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 25 Oct 2024 22:21:59 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, vfazio@xes-inc.com Cc: Bean Huo Subject: [PATCH v5 1/5] mmc-utils: Refactor common FFU code into functions to support additional FFU modes Date: Fri, 25 Oct 2024 22:21:44 +0200 Message-Id: <20241025202148.161586-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025202148.161586-1-beanhuo@iokpp.de> References: <20241025202148.161586-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bean Huo Refactor common FFU code into functions to support additional FFU modes. Follow-up patches will focus on implementing additional FFU modes and enhancements. Signed-off-by: Bean Huo Acked-by: Avri Altman --- mmc_cmds.c | 326 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 207 insertions(+), 119 deletions(-) diff --git a/mmc_cmds.c b/mmc_cmds.c index 3b1bcf4..1a35431 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -29,6 +29,7 @@ #include #include #include /* for BLKGETSIZE */ +#include #include "mmc.h" #include "mmc_cmds.h" @@ -2810,7 +2811,7 @@ out: return ret; } -static void set_ffu_single_cmd(struct mmc_ioc_multi_cmd *multi_cmd, +static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, __u8 *ext_csd, unsigned int bytes, __u8 *buf, off_t offset) { @@ -2831,91 +2832,81 @@ static void set_ffu_single_cmd(struct mmc_ioc_multi_cmd *multi_cmd, mmc_ioc_cmd_set_data(multi_cmd->cmds[2], buf + offset); } -int do_ffu(int nargs, char **argv) +/* + * Retrieves the number of sectors programmed during FFU download. + * + * @dev_fd: File descriptor for the eMMC device. + * @ext_csd: Pointer to the buffer holding the Extended CSD register data of the eMMC device. + * + * Return: The number of sectors programmed, or -1 if reading the EXT_CSD fails. + */ +static int get_ffu_sectors_programmed(int dev_fd, __u8 *ext_csd) { - int dev_fd, img_fd; - int retry = 3, ret = -EINVAL; - unsigned int sect_size; - __u8 ext_csd[512]; - __u8 *buf = NULL; - off_t fw_size, bytes_left, off; - char *device; - struct mmc_ioc_multi_cmd *multi_cmd = NULL; - unsigned int default_chunk = MMC_IOC_MAX_BYTES; - __u32 sect_done = 0; - - assert (nargs == 3 || nargs == 4); - device = argv[2]; - dev_fd = open(device, O_RDWR); - if (dev_fd < 0) { - perror("device open failed"); - exit(1); - } - img_fd = open(argv[1], O_RDONLY); - if (img_fd < 0) { - perror("image open failed"); - close(dev_fd); - exit(1); + if (read_extcsd(dev_fd, ext_csd)) { + fprintf(stderr, "Could not read EXT_CSD\n"); + return -1; } - ret = read_extcsd(dev_fd, ext_csd); - if (ret) { - fprintf(stderr, "Could not read EXT_CSD from %s\n", device); - goto out; - } + return per_byte_htole32((__u8 *)&ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0]); +} + +static bool ffu_is_supported(__u8 *ext_csd, char *device) +{ if (ext_csd[EXT_CSD_REV] < EXT_CSD_REV_V5_0) { - fprintf(stderr, - "The FFU feature is only available on devices >= " + fprintf(stderr, "The FFU feature is only available on devices >= " "MMC 5.0, not supported in %s\n", device); - goto out; + return false; } if (!(ext_csd[EXT_CSD_SUPPORTED_MODES] & EXT_CSD_FFU)) { fprintf(stderr, "FFU is not supported in %s\n", device); - goto out; + return false; } if (ext_csd[EXT_CSD_FW_CONFIG] & EXT_CSD_UPDATE_DISABLE) { fprintf(stderr, "Firmware update was disabled in %s\n", device); - goto out; + return false; } - fw_size = lseek(img_fd, 0, SEEK_END); - if (fw_size == 0) { - fprintf(stderr, "Wrong firmware size"); - goto out; - } + return true; +} +/* + * Performs FFU download of the firmware bundle. + * + * @dev_fd: File descriptor for the eMMC device on which the ioctl command will be performed. + * @ext_csd: Extended CSD register data of the eMMC device. + * @fw_buf: Pointer to the firmware buffer containing the firmware data to be downloaded. + * @fw_size: Size of the firmware in bytes. + * @chunk_size: Size of the chunks in which the firmware is sent to the device. + * + * Return: If successful, returns the number of sectors programmed. + * On failure, returns a negative error number. + */ +static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_size, + unsigned int chunk_size) +{ + int ret; + __u8 num_of_cmds = 4; + off_t bytes_left, off; + unsigned int bytes_per_loop, retry = 3; + struct mmc_ioc_multi_cmd *multi_cmd = NULL; + + if (!fw_buf || !ext_csd) { + fprintf(stderr, "unexpected NULL pointer\n"); + return -EINVAL; + } /* allocate maximum required */ - buf = malloc(fw_size); multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) + - 4 * sizeof(struct mmc_ioc_cmd)); - if (!buf || !multi_cmd) { + num_of_cmds * sizeof(struct mmc_ioc_cmd)); + if (!multi_cmd) { perror("failed to allocate memory"); - goto out; - } - - /* ensure fw is multiple of native sector size */ - sect_size = (ext_csd[EXT_CSD_DATA_SECTOR_SIZE] == 0) ? 512 : 4096; - if (fw_size % sect_size) { - fprintf(stderr, "Firmware data size (%jd) is not aligned!\n", (intmax_t)fw_size); - goto out; - } - - if (nargs == 4) { - default_chunk = strtol(argv[3], NULL, 10); - if (default_chunk > MMC_IOC_MAX_BYTES || default_chunk % 512) { - fprintf(stderr, "Invalid chunk size"); - goto out; - } + return -ENOMEM; } /* prepare multi_cmd for FFU based on cmd to be used */ - - multi_cmd->num_of_cmds = 4; - /* put device into ffu mode */ fill_switch_cmd(&multi_cmd->cmds[0], EXT_CSD_MODE_CONFIG, EXT_CSD_FFU_MODE); @@ -2924,25 +2915,18 @@ int do_ffu(int nargs, char **argv) fill_switch_cmd(&multi_cmd->cmds[3], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); - /* read firmware */ - lseek(img_fd, 0, SEEK_SET); - if (read(img_fd, buf, fw_size) != fw_size) { - perror("Could not read the firmware file: "); - ret = -ENOSPC; - goto out; - } - do_retry: bytes_left = fw_size; off = 0; + multi_cmd->num_of_cmds = num_of_cmds; + while (bytes_left) { - unsigned int chunk_size = bytes_left < default_chunk ? - bytes_left : default_chunk; + bytes_per_loop = bytes_left < chunk_size ? bytes_left : chunk_size; /* prepare multi_cmd for FFU based on cmd to be used */ - set_ffu_single_cmd(multi_cmd, ext_csd, chunk_size, buf, off); + set_ffu_download_cmd(multi_cmd, ext_csd, bytes_per_loop, fw_buf, off); - /* send ioctl with multi-cmd */ + /* send ioctl with multi-cmd, download firmware bundle */ ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); if (ret) { @@ -2955,83 +2939,187 @@ do_retry: goto out; } - bytes_left -= chunk_size; - off += chunk_size; + ret = get_ffu_sectors_programmed(dev_fd, ext_csd); + if (ret <= 0) { + ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]); + /* + * By spec, host should re-start download from the first sector if + * programmed count is 0 + */ + if (ret == 0 && retry > 0) { + retry--; + fprintf(stderr, "Programming failed. Retrying... (%d)\n", retry); + goto do_retry; + } + fprintf(stderr, "Programming failed! Aborting...\n"); + goto out; + } else { + fprintf(stderr, + "Programmed %d/%jd bytes\r", ret * 512, (intmax_t)fw_size); + } + + bytes_left -= bytes_per_loop; + off += bytes_per_loop; } - /* - * By spec - check if mode operation codes are supported in ffu features, - * if not then skip checking number of sectors programmed after install - */ - if (!ext_csd[EXT_CSD_FFU_FEATURES]) { - fprintf(stderr, "Please reboot to complete firmware installation on %s\n", device); - ret = 0; + ret = get_ffu_sectors_programmed(dev_fd, ext_csd); +out: + free(multi_cmd); + return ret; +} + +static int do_ffu_install(int dev_fd, const char *device) +{ + int ret; + __u8 ext_csd[512]; + struct mmc_ioc_multi_cmd *multi_cmd = NULL; + + multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) + 2 * sizeof(struct mmc_ioc_cmd)); + if (!multi_cmd) { + perror("failed to allocate memory"); + return -ENOMEM; + } + + /* Re-enter ffu mode and install the firmware */ + multi_cmd->num_of_cmds = 2; + fill_switch_cmd(&multi_cmd->cmds[0], EXT_CSD_MODE_CONFIG, EXT_CSD_FFU_MODE); + fill_switch_cmd(&multi_cmd->cmds[1], EXT_CSD_MODE_OPERATION_CODES, EXT_CSD_FFU_INSTALL); + + /* send ioctl with multi-cmd */ + ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); + if (ret) { + perror("Multi-cmd ioctl failed setting install mode"); + fill_switch_cmd(&multi_cmd->cmds[1], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); + /* In case multi-cmd ioctl failed before exiting from ffu mode */ + ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[1]); goto out; } + /* Check FFU install status */ ret = read_extcsd(dev_fd, ext_csd); if (ret) { fprintf(stderr, "Could not read EXT_CSD from %s\n", device); goto out; } - /* Test if we need to restart the download */ - sect_done = per_byte_htole32(&ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0]); - /* By spec, host should re-start download from the first sector if sect_done is 0 */ - if (sect_done == 0) { - if (retry--) { - fprintf(stderr, "Programming failed. Retrying... (%d)\n", retry); - goto do_retry; + /* Return status */ + ret = ext_csd[EXT_CSD_FFU_STATUS]; +out: + free(multi_cmd); + return ret; +} + +int do_ffu(int nargs, char **argv) +{ + int dev_fd, img_fd; + int ret = -EINVAL; + unsigned int sect_size; + __u8 ext_csd[512]; + __u8 *fw_buf = NULL; + off_t fw_size; + char *device; + unsigned int default_chunk = MMC_IOC_MAX_BYTES; + + assert(nargs == 3 || nargs == 4); + if (nargs == 4) { + default_chunk = strtol(argv[3], NULL, 10); + if (default_chunk > MMC_IOC_MAX_BYTES || default_chunk % 512) { + fprintf(stderr, "Invalid chunk size"); + exit(1); } - fprintf(stderr, "Programming failed! Aborting...\n"); + } + + device = argv[2]; + dev_fd = open(device, O_RDWR); + if (dev_fd < 0) { + perror("device open failed"); + exit(1); + } + img_fd = open(argv[1], O_RDONLY); + if (img_fd < 0) { + perror("image open failed"); + close(dev_fd); + exit(1); + } + + fw_size = lseek(img_fd, 0, SEEK_END); + if (fw_size == 0) { + fprintf(stderr, "Wrong firmware size"); goto out; } - if ((sect_done * sect_size) == fw_size) { - fprintf(stderr, "Programmed %jd/%jd bytes\n", (intmax_t)fw_size, (intmax_t)fw_size); - fprintf(stderr, "Programming finished with status %d \n", ret); + ret = read_extcsd(dev_fd, ext_csd); + if (ret) { + fprintf(stderr, "Could not read EXT_CSD from %s\n", device); + goto out; } - else { - fprintf(stderr, "FW size and number of sectors written mismatch. Status return %d\n", ret); + + /* Check if FFU is supported by eMMC device */ + if (!ffu_is_supported(ext_csd, device)) { + ret = -ENOTSUP; goto out; } - fprintf(stderr, "Installing firmware on %s...\n", device); - /* Re-enter ffu mode and install the firmware */ - multi_cmd->num_of_cmds = 2; + /* Ensure FW is multiple of native sector size */ + sect_size = (ext_csd[EXT_CSD_DATA_SECTOR_SIZE] == 0) ? 512 : 4096; + if (fw_size % sect_size) { + fprintf(stderr, "Firmware data size (%jd) is not aligned!\n", (intmax_t)fw_size); + ret = -EINVAL; + goto out; + } - /* set ext_csd to install mode */ - fill_switch_cmd(&multi_cmd->cmds[1], EXT_CSD_MODE_OPERATION_CODES, - EXT_CSD_FFU_INSTALL); + /* Allocate the firmware buffer with the maximum required size */ + fw_buf = malloc(fw_size); + if (!fw_buf) { + perror("failed to allocate memory"); + ret = -ENOMEM; + goto out; + } - /* send ioctl with multi-cmd */ - ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); + /* Read firmware */ + lseek(img_fd, 0, SEEK_SET); + if (read(img_fd, fw_buf, fw_size) != fw_size) { + perror("Could not read the firmware file: "); + ret = -ENOSPC; + goto out; + } - if (ret) { - perror("Multi-cmd ioctl failed setting install mode"); - /* In case multi-cmd ioctl failed before exiting from ffu mode */ - ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]); + /* Download firmware bundle */ + ret = do_ffu_download(dev_fd, ext_csd, fw_buf, fw_size, default_chunk); + /* Check programmed sectors */ + if (ret > 0 && (ret * 512) == fw_size) { + fprintf(stderr, "Programmed %jd/%jd bytes\n", (intmax_t)fw_size, (intmax_t)fw_size); + } else { + if (ret > 0 && (ret * 512) != fw_size) + fprintf(stderr, "FW size %jd and bytes %d programmed mismatch.\n", + (intmax_t)fw_size, ret * 512); + else + fprintf(stderr, "Firmware bundle download failed with status %d\n", ret); + + ret = -EIO; goto out; } - ret = read_extcsd(dev_fd, ext_csd); - if (ret) { - fprintf(stderr, "Could not read EXT_CSD from %s\n", device); + /* + * By spec - check if MODE_OPERATION_CODES is supported in FFU_FEATURES, if not, proceed + * with CMD0/HW Reset/Power cycle to complete the installation + */ + if (!ext_csd[EXT_CSD_FFU_FEATURES]) { + fprintf(stderr, "Please reboot to complete firmware installation on %s\n", device); + ret = 0; goto out; } - /* return status */ - ret = ext_csd[EXT_CSD_FFU_STATUS]; - if (ret) { + fprintf(stderr, "Installing firmware on %s...\n", device); + ret = do_ffu_install(dev_fd, device); + if (ret) fprintf(stderr, "%s: error %d during FFU install:\n", device, ret); - goto out; - } else { + else fprintf(stderr, "FFU finished successfully\n"); - } out: - free(buf); - free(multi_cmd); + if (fw_buf) + free(fw_buf); close(img_fd); close(dev_fd); return ret; From patchwork Fri Oct 25 20:21:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 839529 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.167]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C743121440C for ; Fri, 25 Oct 2024 20:22:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.167 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887736; cv=pass; b=dCNLU9WR4Q9AlVlKJTWtkRiHR6owtbvBgWPO3UJdtysjU6lWn+nO40dFQG+UAgEXPZgdsY8BBSMs5VgN4yUaSlZSdxWx+1NFPzzzafJSOWlJCUkD9HMhxXLBXx1dDf4jAgtxvLRqvOgXN8N+ZopXmXoyGfqb+1iw4A4jkhs+fCM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887736; c=relaxed/simple; bh=MzQ2o0AyOM7uIUolx8vUHiqsKCHmSi3a5BdH2Meh/a8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=l6T08DXNteK8Qw0su8QcKn2djiwnFRvoYDJICeg2v7HalOEcvf73EzndvaQu3RTzq4GOAzFfvCAp/6dWz275So+czCYdpEEq402mVQIsjhO3rpqhehiReX7sTXmluRR5Z56j3qoupreVAJx9M1Q7egHB5QPGuhEfHs2MxacqZnE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=ZUr4slxK; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=NkzEZPfw; arc=pass smtp.client-ip=81.169.146.167 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="ZUr4slxK"; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="NkzEZPfw" ARC-Seal: i=1; a=rsa-sha256; t=1729887719; cv=none; d=strato.com; s=strato-dkim-0002; b=Pcd90q5oXxxUEj2WlHtGeApX3Z1HOzJUvSwQiIWPEDQLYvlJMAbFGJ9MuPF4O07Kz+ h6aTRFoDUAErrCYmjcdvBi5E36Ss0KkqnJyb3q4NnB8RgFJS4PPFUTULD8L6Ew2F7cwX mPynN1No/KDTKmCK6oBrYf0gimlyM7HulMDQRje/tLRMB4Eu5awDojI+kN0dA+mz1+5b yVUMOEbvoedF7iUef5EJT0Ju+f+NhJlDOpg+Wl4ztJxtc8Jvm25gMVDfjVVXYjuVj4x2 7BxQGk9zUY3aO5RkE1tnMMS1VmrZWLFsCKLMlrsfU7UrZrshj/FwKepR4jVbp9j1UiZj uUtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=KyF9xri1DVk974O0eO8n43yCGmKk6r9EdSlmmqdziI4=; b=Dh0y4U0+1DmDUM7YAeS8DDj3vCp/OEbJUULBGnMKRPVZ5PiA3GeRHScSojtgQVI/2f UEcHSs0+h+v236mFQp88+GRT7+HP82UsNSsWw6YZns8frTublljRYMtvE4KWHEZbGV9i xqZ+M+7155Qz6QbuccdeOwV/ceUxX7OWt4FL7En7MIR4LNcWGzvpyZHhNJwII4sbTAtV syJ3niirz2rQ8dgcqNtxrhc6kXwpyLxI+8zo1KQSEVBVx2h5xw0FP7J1rt8z/09f9D1K Emf9G3CWDcmhPxNJoT/Bs7J9eCfuCZvndFsiC/3ak3uBKGbEx/8kE7D2sRcJl7vo/917 NJ3A== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=KyF9xri1DVk974O0eO8n43yCGmKk6r9EdSlmmqdziI4=; b=ZUr4slxKv+z8ffIEMMDjuspvcqgDfjH4Yt1nt/7/VHJMxb0lt368H8du0IuZfH3sgR HXjAkTa3Pw53WcRUq6Q9gXyMrt9607izS31c1sqhGrRdjneromda/NO7NytUrbil9mgJ QL7mFUBZNGFC0jF43Sm04hliNzlHTaonWyyjVDAQrBmY6biHOaEWLAkMx0Z7JqYKv1xN HyYFgSQGzZVEVRvUFVQt2I3O6LvybGrKgFT7Rx60cY6t7HGUwmauEMDxBgVC4Eb3qPXC +a/Axnwq6QnbRTR4sB1FfDsLU00g0kmv3Ai1B7QXa7RFmfoLL+TcgaM7Z/cP6iu/6aGz whXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=KyF9xri1DVk974O0eO8n43yCGmKk6r9EdSlmmqdziI4=; b=NkzEZPfw7LQHv/Z7JyLFWE1T++7URca/7vFO/RGag5coPYw04J7Pl/W/O4mA7VpHJQ dDoyx5ksB73D1CFTBUDQ== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O256fJ4HnWXON1RD+6IXGo7S6YVZbGYm2ZHbmjWFWcm6Nbb9lHw==" Received: from Munilab01-lab.speedport.ip by smtp.strato.de (RZmta 51.2.11 AUTH) with ESMTPSA id za0ed209PKLxbex (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 25 Oct 2024 22:21:59 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, vfazio@xes-inc.com Cc: Bean Huo Subject: [PATCH v5 2/5] mmc-utils: Add FFU optional mode 1 Date: Fri, 25 Oct 2024 22:21:45 +0200 Message-Id: <20241025202148.161586-3-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025202148.161586-1-beanhuo@iokpp.de> References: <20241025202148.161586-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bean Huo Added optional FFU mode 1, in this mode, begins with CMD6, followed by repeated CMD23+CMD25 for downloading the firmware bundle. Once the entire firmware image is downloaded, the FFU mode is exited with CMD6, ensuring the download is treated as an atomic operation. Signed-off-by: Bean Huo Acked-by: Avri Altman --- mmc.1 | 3 ++ mmc.c | 5 ++ mmc_cmds.c | 134 ++++++++++++++++++++++++++++++++++++++++++----------- mmc_cmds.h | 1 + 4 files changed, 116 insertions(+), 27 deletions(-) diff --git a/mmc.1 b/mmc.1 index e153557..f69ab8f 100644 --- a/mmc.1 +++ b/mmc.1 @@ -192,6 +192,9 @@ Run Field Firmware Update with \fIimage\-file\-name\fR on the device. .br if [\fIchunk\-bytes\fR] is omitted, mmc-utils will try to run ffu using the largest possible chunks: max(image-file, 512k). .TP +.BI opt_ffu1 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] +Optional FFU mode 1, it's the same as 'ffu', but uses CMD23+CMD25 for repeated downloads and remains in FFU mode until completion. +.TP .BI erase " " \fItype\fR " " \fIstart-address\fR " " \fIend\-address\fR " " \fIdevice\fR Send Erase CMD38 with specific argument to the device. .br diff --git a/mmc.c b/mmc.c index 2c5b9b5..67bd90b 100644 --- a/mmc.c +++ b/mmc.c @@ -234,6 +234,11 @@ static struct Command commands[] = { "should be in decimal bytes and sector aligned.\n", NULL }, + { do_opt_ffu1, -2, + "opt_ffu1", " [chunk-bytes]\n" + "Optional FFU mode 1, it's the same as 'ffu', but uses CMD23+CMD25 for repeated downloads and remains in FFU mode until completion.\n", + NULL + }, { do_erase, -4, "erase", " " " " " " "\n" "Send Erase CMD38 with specific argument to the \n\n" diff --git a/mmc_cmds.c b/mmc_cmds.c index 1a35431..53a1658 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -59,6 +59,13 @@ #define WPTYPE_PWRON 2 #define WPTYPE_PERM 3 + +// Firmware Update (FFU) download modes +enum ffu_download_mode { + FFU_DEFAULT_MODE, // Default mode: Uses CMD23+CMD25; exits FFU mode after each loop. + FFU_OPT_MODE1 // Optional mode 1: Uses CMD23+CMD25; but stays in FFU mode during download. +}; + static inline __u32 per_byte_htole32(__u8 *arr) { return arr[0] | arr[1] << 8 | arr[2] << 16 | arr[3] << 24; @@ -2813,23 +2820,40 @@ out: static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, __u8 *ext_csd, unsigned int bytes, __u8 *buf, - off_t offset) + off_t offset, enum ffu_download_mode ffu_mode) { __u32 arg = per_byte_htole32(&ext_csd[EXT_CSD_FFU_ARG_0]); - /* send block count */ - set_single_cmd(&multi_cmd->cmds[1], MMC_SET_BLOCK_COUNT, 0, 0, - bytes / 512); - multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; - - /* - * send image chunk: blksz and blocks essentially do not matter, as - * long as the product is fw_size, but some hosts don't handle larger - * blksz well. - */ - set_single_cmd(&multi_cmd->cmds[2], MMC_WRITE_MULTIPLE_BLOCK, 1, - bytes / 512, arg); - mmc_ioc_cmd_set_data(multi_cmd->cmds[2], buf + offset); + /* prepare multi_cmd for FFU based on cmd to be used */ + if (ffu_mode == FFU_DEFAULT_MODE) { + /* put device into ffu mode */ + fill_switch_cmd(&multi_cmd->cmds[0], EXT_CSD_MODE_CONFIG, EXT_CSD_FFU_MODE); + /* send block count */ + set_single_cmd(&multi_cmd->cmds[1], MMC_SET_BLOCK_COUNT, 0, 0, + bytes / 512); + multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; + + /* + * send image chunk: blksz and blocks essentially do not matter, as + * long as the product is fw_size, but some hosts don't handle larger + * blksz well. + */ + set_single_cmd(&multi_cmd->cmds[2], MMC_WRITE_MULTIPLE_BLOCK, 1, + bytes / 512, arg); + mmc_ioc_cmd_set_data(multi_cmd->cmds[2], buf + offset); + /* return device into normal mode */ + fill_switch_cmd(&multi_cmd->cmds[3], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); + } else if (ffu_mode == FFU_OPT_MODE1) { + /* + * FFU mode 2 uses CMD23+CMD25 for repeated downloads and remains in FFU mode + * during FW bundle downloading until completion. In this mode, multi_cmd only + * has 2 sub-commands. + */ + set_single_cmd(&multi_cmd->cmds[0], MMC_SET_BLOCK_COUNT, 0, 0, bytes / 512); + multi_cmd->cmds[0].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; + set_single_cmd(&multi_cmd->cmds[1], MMC_WRITE_MULTIPLE_BLOCK, 1, bytes / 512, arg); + mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf + offset); + } } /* @@ -2873,6 +2897,36 @@ static bool ffu_is_supported(__u8 *ext_csd, char *device) return true; } +static int enter_ffu_mode(int dev_fd) +{ + int ret; + struct mmc_ioc_cmd cmd; + + memset(&cmd, 0, sizeof(cmd)); + + fill_switch_cmd(&cmd, EXT_CSD_MODE_CONFIG, EXT_CSD_FFU_MODE); + ret = ioctl(dev_fd, MMC_IOC_CMD, &cmd); + if (ret) + perror("enter FFU mode failed!"); + + return ret; +} + +static int exit_ffu_mode(int dev_fd) +{ + int ret; + struct mmc_ioc_cmd cmd; + + memset(&cmd, 0, sizeof(cmd)); + + fill_switch_cmd(&cmd, EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); + ret = ioctl(dev_fd, MMC_IOC_CMD, &cmd); + if (ret) + perror("exit FFU mode failed!"); + + return ret; +} + /* * Performs FFU download of the firmware bundle. * @@ -2881,12 +2935,13 @@ static bool ffu_is_supported(__u8 *ext_csd, char *device) * @fw_buf: Pointer to the firmware buffer containing the firmware data to be downloaded. * @fw_size: Size of the firmware in bytes. * @chunk_size: Size of the chunks in which the firmware is sent to the device. + * @ffu_mode: FFU mode for firmware download mode * * Return: If successful, returns the number of sectors programmed. * On failure, returns a negative error number. */ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_size, - unsigned int chunk_size) + unsigned int chunk_size, enum ffu_download_mode ffu_mode) { int ret; __u8 num_of_cmds = 4; @@ -2898,6 +2953,10 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz fprintf(stderr, "unexpected NULL pointer\n"); return -EINVAL; } + + if (ffu_mode != FFU_DEFAULT_MODE) /* in default mode, mmc_ioc_multi_cmd contains 4 commands */ + num_of_cmds = 2; + /* allocate maximum required */ multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) + num_of_cmds * sizeof(struct mmc_ioc_cmd)); @@ -2906,14 +2965,15 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz return -ENOMEM; } - /* prepare multi_cmd for FFU based on cmd to be used */ - /* put device into ffu mode */ - fill_switch_cmd(&multi_cmd->cmds[0], EXT_CSD_MODE_CONFIG, - EXT_CSD_FFU_MODE); - - /* return device into normal mode */ - fill_switch_cmd(&multi_cmd->cmds[3], EXT_CSD_MODE_CONFIG, - EXT_CSD_NORMAL_MODE); + if (ffu_mode != FFU_DEFAULT_MODE) { + /* + * If the device is not in FFU mode 1, the command to enter FFU mode will be sent + * independently, separate from the firmware bundle download command. + */ + ret = enter_ffu_mode(dev_fd); + if (ret) + goto out; + } do_retry: bytes_left = fw_size; @@ -2924,7 +2984,7 @@ do_retry: bytes_per_loop = bytes_left < chunk_size ? bytes_left : chunk_size; /* prepare multi_cmd for FFU based on cmd to be used */ - set_ffu_download_cmd(multi_cmd, ext_csd, bytes_per_loop, fw_buf, off); + set_ffu_download_cmd(multi_cmd, ext_csd, bytes_per_loop, fw_buf, off, ffu_mode); /* send ioctl with multi-cmd, download firmware bundle */ ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); @@ -2935,7 +2995,7 @@ do_retry: * In case multi-cmd ioctl failed before exiting from * ffu mode */ - ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]); + exit_ffu_mode(dev_fd); goto out; } @@ -2962,6 +3022,16 @@ do_retry: off += bytes_per_loop; } + if (ffu_mode != FFU_DEFAULT_MODE) { + /* + * If the device is not in FFU mode 1, the command to exit FFU mode will be sent + * independently, separate from the firmware bundle download command. + */ + ret = exit_ffu_mode(dev_fd); + if (ret) + goto out; + } + ret = get_ffu_sectors_programmed(dev_fd, ext_csd); out: free(multi_cmd); @@ -3009,7 +3079,7 @@ out: return ret; } -int do_ffu(int nargs, char **argv) +static int __do_ffu(int nargs, char **argv, enum ffu_download_mode ffu_mode) { int dev_fd, img_fd; int ret = -EINVAL; @@ -3085,7 +3155,7 @@ int do_ffu(int nargs, char **argv) } /* Download firmware bundle */ - ret = do_ffu_download(dev_fd, ext_csd, fw_buf, fw_size, default_chunk); + ret = do_ffu_download(dev_fd, ext_csd, fw_buf, fw_size, default_chunk, ffu_mode); /* Check programmed sectors */ if (ret > 0 && (ret * 512) == fw_size) { fprintf(stderr, "Programmed %jd/%jd bytes\n", (intmax_t)fw_size, (intmax_t)fw_size); @@ -3125,6 +3195,16 @@ out: return ret; } +int do_ffu(int nargs, char **argv) +{ + return __do_ffu(nargs, argv, FFU_DEFAULT_MODE); +} + +int do_opt_ffu1(int nargs, char **argv) +{ + return __do_ffu(nargs, argv, FFU_OPT_MODE1); +} + int do_general_cmd_read(int nargs, char **argv) { int dev_fd; diff --git a/mmc_cmds.h b/mmc_cmds.h index 5f2bef1..351155b 100644 --- a/mmc_cmds.h +++ b/mmc_cmds.h @@ -42,6 +42,7 @@ int do_rpmb_write_block(int nargs, char **argv); int do_cache_en(int nargs, char **argv); int do_cache_dis(int nargs, char **argv); int do_ffu(int nargs, char **argv); +int do_opt_ffu1(int nargs, char **argv); int do_read_scr(int argc, char **argv); int do_read_cid(int argc, char **argv); int do_read_csd(int argc, char **argv); From patchwork Fri Oct 25 20:21:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 839528 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 054BD1925AB for ; Fri, 25 Oct 2024 20:25:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.164 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887913; cv=pass; b=h5vf5amEoL3gPx7Ks8/FwnLQsPvS97OXkt4pCMF61E64B10Vo1v+2Wb35VKMH0lF8LZcitTCmn25eoY15gtFvAi/OQsZj81NYnWtl4WYtpi+Na3fT5poaHNyt8EhZ/h8FTiCsAN0aTmatoQxzEbzzCD/xtPTlIJoUzARMATO7/0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887913; c=relaxed/simple; bh=fp1k/NkCPxwbukQcVqaIbDB9uCBxUDYLknbXvycq82g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=gcJClXt++fuGIYq/5igmgVrkuvUZeK5OGt9yzxdnQgzZekivzxYU6L3BuXr5ILiE+YAMHjuMhBuIC35hDNeyeNP/EfmXC5CIJlNmTVbzB1Oz9ii/oVZOULmSpJr00ZcGcb+n1Pniu8kHgO6tNGQ3GP7DG6GNnzzRsrx5so2B9hc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=ZYh5mvfu; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=KpQTTXbp; arc=pass smtp.client-ip=81.169.146.164 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="ZYh5mvfu"; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="KpQTTXbp" ARC-Seal: i=1; a=rsa-sha256; t=1729887719; cv=none; d=strato.com; s=strato-dkim-0002; b=UJUjPmEEuxuD1Nyx+Qcqr+1aIIFou6t6z9sdqqqw4jrqotJ4Qned0tFYTcRahceuay il1SuEkHvitYpltOw+Qt8spOj9Pdg91IzgOUpjsBrFEpN//jMWQfDWC+scOf5qVNZqeT 0DKgKCKSjEiNzKL47vPh3gYKCBt0qY6GwN6+QJAU0Kv8KfBuVnR814qdAOFGWzVzZAc0 UL+eDkPSYwp1CNLmrhk1nbA/qPJcMMjg3xxiiIjr58mTXZunA6HyiBe7zLAwkqNclybc cOLjEs7X5biNaNUMdQKp65iXnZb5HToUmF89Scf8sYewLovz+NupDDz1TU5yluDkzmCO aQkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=UH0q/lXb3bzTen8WCFIlB7A3eJqaXnA2J1FmsRftutM=; b=e8H2RMetVEB3T3mjr9g/c1Rq+MRLEYox8Y9J0qHfcnR5WwRZ+RxQElzecm28c90Z3M BQZ+vXm9sGsPjf8NOheo+FJilUvqPS/km99HAZvBiD4nfY00MYWnNcUIzN3QhYeQWDAn DmEJMl3r6nmyBzspv/L36ynaRuPBI+N9x1f5C+yV7Y/ONaPkETaIQnFlLQIImKtLFjkb JlqiivJuVOVC0OMBiiQI3AC9hpovZK6e0IUA3WpjY2knhi+3XQ4IiIkVi/eVYdla7xAN zceojgQdqxUlXQIvWrzVa9v864sABQD7bVaMcjcnSKawWmQxVYQ7PAtFLaVQgrvIlr97 wawA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=UH0q/lXb3bzTen8WCFIlB7A3eJqaXnA2J1FmsRftutM=; b=ZYh5mvfuK0SCEOH2nFlj7EHwiHPVrb8eOgHU16xC8Vevga8HNHqDBsRQ3+GHfTxNDE N/N5CJ/KAnPahdKMFbOjYU7X5EGKVVnVW/F7DaZttLJJZ9oGwvSoUDhxxmyNg0uiRo5j zmTMwPG/i2MvGCgekd+ClP2HBOhQ8msLG9SAUigo271U0f7mIqQML+RiiUfIdysVfShj NpQafyeBnhzVVoFR70aKu5vwf5RVEnWqeh0/XMAA4Y3XPMIYLEauUItSIOnIoq4I3ip4 nPSuH9KofAZuh6ECScbsB3scELiiy2Wj0j1bVRZugHWFbzwzdHdHOfDVofjHyhaOQrcv Vybg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=UH0q/lXb3bzTen8WCFIlB7A3eJqaXnA2J1FmsRftutM=; b=KpQTTXbptb4O+L8TpopIoy0GjuV9iBLxZo8gPSndqbqLlBLG3h99P14+J8UFpOG/lu HeSn++NFejDs/Q8u2ZBg== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O256fJ4HnWXON1RD+6IXGo7S6YVZbGYm2ZHbmjWFWcm6Nbb9lHw==" Received: from Munilab01-lab.speedport.ip by smtp.strato.de (RZmta 51.2.11 AUTH) with ESMTPSA id za0ed209PKLxbey (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 25 Oct 2024 22:21:59 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, vfazio@xes-inc.com Cc: Bean Huo Subject: [PATCH v5 3/5] mmc-utils: Add FFU optional mode 2 using CMD25+CMD12 for Open-ended write download FW Date: Fri, 25 Oct 2024 22:21:46 +0200 Message-Id: <20241025202148.161586-4-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025202148.161586-1-beanhuo@iokpp.de> References: <20241025202148.161586-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bean Huo Introduced a new FFU mode 2 of leveraging CMD25+CMD12 for Open-ended Multiple-block write to download the firmware bundle. In this mmode, the device remains in FFU mode during firmware download until the downloading is completed. Signed-off-by: Bean Huo Acked-by: Avri Altman --- mmc.1 | 3 +++ mmc.c | 5 +++++ mmc.h | 1 + mmc_cmds.c | 14 +++++++++++++- mmc_cmds.h | 1 + 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mmc.1 b/mmc.1 index f69ab8f..bc2f1b8 100644 --- a/mmc.1 +++ b/mmc.1 @@ -195,6 +195,9 @@ if [\fIchunk\-bytes\fR] is omitted, mmc-utils will try to run ffu using the larg .BI opt_ffu1 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] Optional FFU mode 1, it's the same as 'ffu', but uses CMD23+CMD25 for repeated downloads and remains in FFU mode until completion. .TP +.BI opt_ffu2 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] +Optional FFU mode 2, uses CMD25+CMD12 Open-ended Multiple-block write to download and remains in FFU mode until completion. +.TP .BI erase " " \fItype\fR " " \fIstart-address\fR " " \fIend\-address\fR " " \fIdevice\fR Send Erase CMD38 with specific argument to the device. .br diff --git a/mmc.c b/mmc.c index 67bd90b..53a708b 100644 --- a/mmc.c +++ b/mmc.c @@ -239,6 +239,11 @@ static struct Command commands[] = { "Optional FFU mode 1, it's the same as 'ffu', but uses CMD23+CMD25 for repeated downloads and remains in FFU mode until completion.\n", NULL }, + { do_opt_ffu2, -2, + "opt_ffu2", " [chunk-bytes]\n" + "Optional FFU mode 2, uses CMD25+CMD12 Open-ended Multiple-block write to download and remains in FFU mode until completion.\n", + NULL + }, { do_erase, -4, "erase", " " " " " " "\n" "Send Erase CMD38 with specific argument to the \n\n" diff --git a/mmc.h b/mmc.h index 6f1bf3e..14dac38 100644 --- a/mmc.h +++ b/mmc.h @@ -27,6 +27,7 @@ #define MMC_BOOT_INITIATION_ARG 0xFFFFFFFA #define MMC_SWITCH 6 /* ac [31:0] See below R1b */ #define MMC_SEND_EXT_CSD 8 /* adtc R1 */ +#define MMC_STOP_TRANSMISSION 12 /* ac R1b */ #define MMC_SEND_STATUS 13 /* ac [31:16] RCA R1 */ #define R1_SWITCH_ERROR (1 << 7) /* sx, c */ #define MMC_SWITCH_MODE_WRITE_BYTE 0x03 /* Set target to value */ diff --git a/mmc_cmds.c b/mmc_cmds.c index 53a1658..fb04821 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -63,7 +63,8 @@ // Firmware Update (FFU) download modes enum ffu_download_mode { FFU_DEFAULT_MODE, // Default mode: Uses CMD23+CMD25; exits FFU mode after each loop. - FFU_OPT_MODE1 // Optional mode 1: Uses CMD23+CMD25; but stays in FFU mode during download. + FFU_OPT_MODE1, // Optional mode 1: Uses CMD23+CMD25; but stays in FFU mode during download. + FFU_OPT_MODE2 // Optional mode 2: Uses CMD25+CMD12 Open-ended Multiple-block write to download }; static inline __u32 per_byte_htole32(__u8 *arr) @@ -2853,6 +2854,12 @@ static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, multi_cmd->cmds[0].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; set_single_cmd(&multi_cmd->cmds[1], MMC_WRITE_MULTIPLE_BLOCK, 1, bytes / 512, arg); mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf + offset); + } else if (ffu_mode == FFU_OPT_MODE2) { + set_single_cmd(&multi_cmd->cmds[0], MMC_WRITE_MULTIPLE_BLOCK, 1, bytes / 512, arg); + multi_cmd->cmds[0].flags = MMC_RSP_R1 | MMC_CMD_ADTC; + mmc_ioc_cmd_set_data(multi_cmd->cmds[0], buf + offset); + set_single_cmd(&multi_cmd->cmds[1], MMC_STOP_TRANSMISSION, 0, 0, 0); + multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; } } @@ -3205,6 +3212,11 @@ int do_opt_ffu1(int nargs, char **argv) return __do_ffu(nargs, argv, FFU_OPT_MODE1); } +int do_opt_ffu2(int nargs, char **argv) +{ + return __do_ffu(nargs, argv, FFU_OPT_MODE2); +} + int do_general_cmd_read(int nargs, char **argv) { int dev_fd; diff --git a/mmc_cmds.h b/mmc_cmds.h index 351155b..4098931 100644 --- a/mmc_cmds.h +++ b/mmc_cmds.h @@ -43,6 +43,7 @@ int do_cache_en(int nargs, char **argv); int do_cache_dis(int nargs, char **argv); int do_ffu(int nargs, char **argv); int do_opt_ffu1(int nargs, char **argv); +int do_opt_ffu2(int nargs, char **argv); int do_read_scr(int argc, char **argv); int do_read_cid(int argc, char **argv); int do_read_csd(int argc, char **argv); From patchwork Fri Oct 25 20:21:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 838609 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27FB920F3F6 for ; Fri, 25 Oct 2024 20:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887916; cv=pass; b=b7a0t+ABSvgJaR0/AQcHn/bNUCjbd+84S7fv1YqjOBXmSbaXuo8ds7aPE/u5wNIXgn33zb0/mP1MUWWgwd7LIOXxzEptNu0cmyR+myHG0uIC/ZV7xpiFIR43hhnLV/JH9n0FFZltSVJo6T/oyFivu4EJoywY93umsfaiY8ku7Vo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887916; c=relaxed/simple; bh=3BUn02X0fHs8bKvwX3NuCU9yIk3EnJF4E7rceUcVTcE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=VQEDhQG8kf9fhIzhQQBvEqtxJxu6MK40GbeYpgbM1LSr5sOMIeUpXHc/cMp59B0d0kJ0o605bbHLinD00K95R3hZGX4949rWaI6Cs4xLInlwZK1dCUynsdJPh+DYu9k78r3fMnqOr7Z+KghG/sl7dlXz9t+3vCgVJHxZKH2PmnU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=rZjCP2lh; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=vcYhNbv+; arc=pass smtp.client-ip=85.215.255.82 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="rZjCP2lh"; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="vcYhNbv+" ARC-Seal: i=1; a=rsa-sha256; t=1729887719; cv=none; d=strato.com; s=strato-dkim-0002; b=VbcmF/BIxHl1yrX2s+V0bfEDetnZXRPTzyNzK0BEMfJx08sV5X1U65xXlYR0cdzrbF 72D9hT0cmvPS9pdLJAL7Hy3SrQ3UXt13hlfYCHMs7FId6SyJV99HoHiIqOZQb28gmbTh dD7vVs1uvuHYOacaAuA8jd2/x9L7/qv0gkTHGYQBZ82t7rr5ODQTYIJFuXBsJ2eAoiFI WeTzTwqWGZDNHvAjmbjyNkY8b/Fp4XSeg+3SD3wapzqqY7v4kzpjxqhz5DAT6B5/QQuU VNXNeYbA4SE+wq9eTg3O2jUKVaMCyiupu6akI3Xfh+lM5V6Q8r4emH8O7CyrItUEQUbw K0HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=W2jTWpp1FTgpkwAASe7cSc1004YrfOqCbSUm0hlMca0=; b=g8QUhZIsRNSmY8PD1K0VJku2MlfUFoi3+zT53wRsqYE4hpWejXNEM8MwCctRo6Mygx OjoBvIfK5Rm/s+gRPFDkVgwIjGq1h0yER1fQe9GSG68ENe3CwWDz94F5ogE+5uYk5QY9 UT/xrtLBAvZr2aNlSj0O6Irzx042jgskmVlnd2Yfly0k6K6BFqnw26IwsKEjWLnVYk1N J+s0BqcLT6er6utgBf2MpQgPCNZmMzO2r2g68X3b2WlGUZCskCULNNlbfIDrMjY1VYK2 /KIEGkAgTeWqx4BeAU+lTQUuiBrAlt3Jd7d4reUmXWEICuLEJdHCkLIk4hedTg3mufFx bm3w== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=W2jTWpp1FTgpkwAASe7cSc1004YrfOqCbSUm0hlMca0=; b=rZjCP2lhnUWgz6Z06nf1EG9sQZHhMyvP6mdru2j5XUCOcvzIJUbTNwW5D72Sjx+Jld thVawOWEIPPehQAXwWka5CYkUDz+5/orBAbhaRbZ08eE+dnEzZbRuSdxXo4wm4wHH/jq mmKa1Pa9ak5XJfo0JNij6RebpnfolzkPoWvg4Or3lUhd7RisF/wcDMSscVDJbuke3UBc VQJIDFaxsTCcK1Nj5ldZ8MltM68yhno5RIEKnnHT2GPijmRXNAXuvSnmr+dpf+QE2xEk 6xwPNgsdSA6K4BZiD3XixSsmD+OejWpIOhGMBUjKcsh0GaCSP6W7Gw//51PKt8mHoaEi wMpQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1729887719; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=W2jTWpp1FTgpkwAASe7cSc1004YrfOqCbSUm0hlMca0=; b=vcYhNbv+Nuqkvvzxs7TZ6uWz4l6rxEEO0GZHVfttIzIn+3Mc4GzCb+JNtviV4LzT4Y Ox0jBGME8ZYtW9QlKwCw== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O256fJ4HnWXON1RD+6IXGo7S6YVZbGYm2ZHbmjWFWcm6Nbb9lHw==" Received: from Munilab01-lab.speedport.ip by smtp.strato.de (RZmta 51.2.11 AUTH) with ESMTPSA id za0ed209PKLxbez (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 25 Oct 2024 22:21:59 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, vfazio@xes-inc.com Cc: Bean Huo Subject: [PATCH v5 4/5] mmc-utils: Add FFU optional mode 4 that uses CMD6 and CMD24 single-block write to download firmware Date: Fri, 25 Oct 2024 22:21:47 +0200 Message-Id: <20241025202148.161586-5-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025202148.161586-1-beanhuo@iokpp.de> References: <20241025202148.161586-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bean Huo Add FFU optional mode 3, which initiates firmware download with CMD6 to enter FFU mode, followed by CMD24 for single-block write, after each CMD24 single-block write, CMD6 is issued to exit FFU mode. Which means in this mode, during FW downloading, the device will not remain FFU mode. Signed-off-by: Bean Huo Acked-by: Avri Altman --- mmc.1 | 3 +++ mmc.c | 5 +++++ mmc_cmds.c | 28 ++++++++++++++++++++++------ mmc_cmds.h | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/mmc.1 b/mmc.1 index bc2f1b8..acb37c1 100644 --- a/mmc.1 +++ b/mmc.1 @@ -198,6 +198,9 @@ Optional FFU mode 1, it's the same as 'ffu', but uses CMD23+CMD25 for repeated d .BI opt_ffu2 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] Optional FFU mode 2, uses CMD25+CMD12 Open-ended Multiple-block write to download and remains in FFU mode until completion. .TP +.BI opt_ffu3 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] +Optional FFU mode 3, uses CMD24 Single-block write for downloading, exiting FFU mode after each block is written. +.TP .BI erase " " \fItype\fR " " \fIstart-address\fR " " \fIend\-address\fR " " \fIdevice\fR Send Erase CMD38 with specific argument to the device. .br diff --git a/mmc.c b/mmc.c index 53a708b..d2a4d2a 100644 --- a/mmc.c +++ b/mmc.c @@ -244,6 +244,11 @@ static struct Command commands[] = { "Optional FFU mode 2, uses CMD25+CMD12 Open-ended Multiple-block write to download and remains in FFU mode until completion.\n", NULL }, + { do_opt_ffu3, -2, + "opt_ffu3", " [chunk-bytes]\n" + "Optional FFU mode 3, uses CMD24 Single-block write for downloading, exiting FFU mode after each block written.\n", + NULL + }, { do_erase, -4, "erase", " " " " " " "\n" "Send Erase CMD38 with specific argument to the \n\n" diff --git a/mmc_cmds.c b/mmc_cmds.c index fb04821..2553de2 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -64,7 +64,8 @@ enum ffu_download_mode { FFU_DEFAULT_MODE, // Default mode: Uses CMD23+CMD25; exits FFU mode after each loop. FFU_OPT_MODE1, // Optional mode 1: Uses CMD23+CMD25; but stays in FFU mode during download. - FFU_OPT_MODE2 // Optional mode 2: Uses CMD25+CMD12 Open-ended Multiple-block write to download + FFU_OPT_MODE2, // Optional mode 2: Uses CMD25+CMD12 Open-ended Multiple-block write to download + FFU_OPT_MODE3 // Optional mode 3: Uses CMD24 Single-block write to download }; static inline __u32 per_byte_htole32(__u8 *arr) @@ -2860,6 +2861,11 @@ static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, mmc_ioc_cmd_set_data(multi_cmd->cmds[0], buf + offset); set_single_cmd(&multi_cmd->cmds[1], MMC_STOP_TRANSMISSION, 0, 0, 0); multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; + } else if (ffu_mode == FFU_OPT_MODE3) { + fill_switch_cmd(&multi_cmd->cmds[0], EXT_CSD_MODE_CONFIG, EXT_CSD_FFU_MODE); + set_single_cmd(&multi_cmd->cmds[1], MMC_WRITE_BLOCK, 1, 1, arg); + mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf + offset); + fill_switch_cmd(&multi_cmd->cmds[2], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); } } @@ -2961,8 +2967,13 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz return -EINVAL; } - if (ffu_mode != FFU_DEFAULT_MODE) /* in default mode, mmc_ioc_multi_cmd contains 4 commands */ + if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2) { + /* in FFU_OPT_MODE1 and FFU_OPT_MODE2, mmc_ioc_multi_cmd contains 2 commands */ num_of_cmds = 2; + } else if (ffu_mode == FFU_OPT_MODE3) { + num_of_cmds = 3; /* in FFU_OPT_MODE3, mmc_ioc_multi_cmd contains 3 commands */ + chunk_size = 512; /* FFU_OPT_MODE3 uses CMD24 single-block write */ + } /* allocate maximum required */ multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) + @@ -2972,9 +2983,9 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz return -ENOMEM; } - if (ffu_mode != FFU_DEFAULT_MODE) { + if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2) { /* - * If the device is not in FFU mode 1, the command to enter FFU mode will be sent + * In FFU_OPT_MODE1 and FFU_OPT_MODE2, the command to enter FFU mode will be sent * independently, separate from the firmware bundle download command. */ ret = enter_ffu_mode(dev_fd); @@ -3029,9 +3040,9 @@ do_retry: off += bytes_per_loop; } - if (ffu_mode != FFU_DEFAULT_MODE) { + if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2) { /* - * If the device is not in FFU mode 1, the command to exit FFU mode will be sent + * In FFU_OPT_MODE1 and FFU_OPT_MODE2, the command to exit FFU mode will be sent * independently, separate from the firmware bundle download command. */ ret = exit_ffu_mode(dev_fd); @@ -3217,6 +3228,11 @@ int do_opt_ffu2(int nargs, char **argv) return __do_ffu(nargs, argv, FFU_OPT_MODE2); } +int do_opt_ffu3(int nargs, char **argv) +{ + return __do_ffu(nargs, argv, FFU_OPT_MODE3); +} + int do_general_cmd_read(int nargs, char **argv) { int dev_fd; diff --git a/mmc_cmds.h b/mmc_cmds.h index 4098931..0fbb2b5 100644 --- a/mmc_cmds.h +++ b/mmc_cmds.h @@ -44,6 +44,7 @@ int do_cache_dis(int nargs, char **argv); int do_ffu(int nargs, char **argv); int do_opt_ffu1(int nargs, char **argv); int do_opt_ffu2(int nargs, char **argv); +int do_opt_ffu3(int nargs, char **argv); int do_read_scr(int argc, char **argv); int do_read_cid(int argc, char **argv); int do_read_csd(int argc, char **argv); From patchwork Fri Oct 25 20:21:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 838610 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 212EF1925AB for ; Fri, 25 Oct 2024 20:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887907; cv=pass; b=on07ErUTqXL1C+GGiWwWDBmYg5peiffd0n4oZ7NfzqD4uPtyNMmxlaqkxEpQ2QJ/c2xRKuQn6e6+1SMXrCYynkW0+79xeBeIFkmrgCY4fmmzWbrucca9XRSAFG7qloG3lmVuor3iucS4NXiJuAAD6xCDgEQ/Sbi0++M//HZY+zc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729887907; c=relaxed/simple; bh=6PQ39GKuXfAUME8HbJ0aQj6mKhy6lHTPYVmXvkVFBfM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=VtGYg9OR+fZ/YXXsEY4iIi1TQGHY8RjsOaUWtQFuI7wWp7+iN+fSm2M5JTmxCBu+tfZY4SNrO0gAAaah64EhmE2+Mue334yFYNZ0Ccs+MdrAdnxMSAOmFX32lhi0/b9GoAAaRcGbK3soDTRTwO1Aq65had28nEkreXnPeZ6AZvI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=q1oKxday; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=UllaFivU; arc=pass smtp.client-ip=85.215.255.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="q1oKxday"; dkim=permerror (0-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="UllaFivU" ARC-Seal: i=1; a=rsa-sha256; t=1729887720; cv=none; d=strato.com; s=strato-dkim-0002; b=hfW4u91qSvrtkEWFsVurZ9uTI9VS58zj72ldyBEcUxF8eqNflC3A6a36nP6SSFIN9s 88upGkbOd3qbLSf08y/2EjLOMhSWInoQqi6/UZJJWmVEdTwlCZb5ljofmXqv+N7wvj98 WD19IW3S4fYcwP9ZMavZ/otyzi46zqclLI376Q4/eOv8BPegjQkLQq26N+Jx1wmgisyI kng7okAmggfQM+JV0ak9Je2EfQmB7lXZnstggtxaPVh4jG/WBLqT9pJpBLMu4ahuU9eW /k16VsU13B+7HNrRvBxkKhBIJe+3ZgG1kSspuxBBJWIp0l5fcuc0BLDmHL8fz/DbjMAk JY2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887720; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Bjr2GODXtzmbEbFbBTd5R0ilCQZ78NJ3oqWW3iNC0a4=; b=jZWR3ev7KdsEwpq24w/hhzbRxNRO10y7xeM+6XaHt4Bl4bSmjuL18Sy9TaQQd4s+Ji cp954IXY0KX05AuQCWODxFLNrJUgjM4hm0g7A+fX8cizMrnXMnPZH6DqE2PA5RkkmNR4 qpy7/8jOYj3CnsHDFMzz5eKfuykgp2G6Kq3mBa38xcZshta0c/h4JrbYKiV7IUTWwcZx AkS4zU1mMqky/f/TVOPnqszvVbP40bD2S/mg8yjm+F8dsMjbLcx0OV+2VpYES8MdyR34 HFXghw186lJjJSRg8gdpyofvNuZ6cp3gh62eL7WNb55v++sKv+TrHUYVqRSdm/TY7URg Q1ow== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1729887720; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Bjr2GODXtzmbEbFbBTd5R0ilCQZ78NJ3oqWW3iNC0a4=; b=q1oKxday3aGHKzlgLH1c8GF7QPQ1ymwvfSTUuzRPgSL3Fb6QrmulCIlrst/3frWZ/F 9qf85BRfemvqO7amaq5e5p7pp1WtR3eVUzSdz27iwC9dtZQLe1cxnUqPLA+yl13Xq60E mwRGoCoWIOskarbFDLQPze8aygenV8YCgwLrqOXHd6JbwFxG6NFfCBQeeuA9k+LqvInC BD93G+xuNXGdD6vq/g92SZcPYZR3Dn4fYzG2/uyXVyNzbvt+Gep8t9B6EUW0ACzLfyUC eh+Vvtcb4p6dfCc44PJDXzFJ5+HIuGHOknWLs0vhYgNGyLbESYK4fTTJyafHm497Ew5E RMxA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1729887720; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Bjr2GODXtzmbEbFbBTd5R0ilCQZ78NJ3oqWW3iNC0a4=; b=UllaFivU30elhsc3qyqqRP8eC8C8VgNaMt05reQ8aDEh0q0K4pHTuZTKZgqS/2rap3 t/cUjUQ9Emc1+B6QmPBw== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O256fJ4HnWXON1RD+6IXGo7S6YVZbGYm2ZHbmjWFWcm6Nbb9lHw==" Received: from Munilab01-lab.speedport.ip by smtp.strato.de (RZmta 51.2.11 AUTH) with ESMTPSA id za0ed209PKM0bf0 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 25 Oct 2024 22:22:00 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, vfazio@xes-inc.com Cc: Bean Huo Subject: [PATCH v5 5/5] mmc-utils: Add FFU optional mode 4 for firmware download using repeated CMD24 single-block write command Date: Fri, 25 Oct 2024 22:21:48 +0200 Message-Id: <20241025202148.161586-6-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025202148.161586-1-beanhuo@iokpp.de> References: <20241025202148.161586-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bean Huo Add FFU mode 4 which enters FFU mode with CMD6, followed by repeated CMD24 commands to perform single-block writes for the firmware download. After downloading all firmware data, CMD6 is issued to exit FFU mode. Signed-off-by: Bean Huo Acked-by: Avri Altman --- mmc.1 | 3 +++ mmc.c | 5 +++++ mmc_cmds.c | 36 ++++++++++++++++++++++++++---------- mmc_cmds.h | 1 + 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/mmc.1 b/mmc.1 index acb37c1..543742c 100644 --- a/mmc.1 +++ b/mmc.1 @@ -201,6 +201,9 @@ Optional FFU mode 2, uses CMD25+CMD12 Open-ended Multiple-block write to downloa .BI opt_ffu3 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] Optional FFU mode 3, uses CMD24 Single-block write for downloading, exiting FFU mode after each block is written. .TP +.BI opt_ffu4 " \fIimage\-file\-name\fR " " \fIdevice\fR " " [\fIchunk\-bytes\fR] +Optional FFU mode 4, uses CMD24 Single-block write for repeated downloads, remaining in FFU mode until completion. +.TP .BI erase " " \fItype\fR " " \fIstart-address\fR " " \fIend\-address\fR " " \fIdevice\fR Send Erase CMD38 with specific argument to the device. .br diff --git a/mmc.c b/mmc.c index d2a4d2a..077e901 100644 --- a/mmc.c +++ b/mmc.c @@ -249,6 +249,11 @@ static struct Command commands[] = { "Optional FFU mode 3, uses CMD24 Single-block write for downloading, exiting FFU mode after each block written.\n", NULL }, + { do_opt_ffu4, -2, + "opt_ffu4", " [chunk-bytes]\n" + "Optional FFU mode 4, uses CMD24 Single-block write for repeated downloads, remaining in FFU mode until completion.\n", + NULL + }, { do_erase, -4, "erase", " " " " " " "\n" "Send Erase CMD38 with specific argument to the \n\n" diff --git a/mmc_cmds.c b/mmc_cmds.c index 2553de2..dbe18ab 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -65,7 +65,8 @@ enum ffu_download_mode { FFU_DEFAULT_MODE, // Default mode: Uses CMD23+CMD25; exits FFU mode after each loop. FFU_OPT_MODE1, // Optional mode 1: Uses CMD23+CMD25; but stays in FFU mode during download. FFU_OPT_MODE2, // Optional mode 2: Uses CMD25+CMD12 Open-ended Multiple-block write to download - FFU_OPT_MODE3 // Optional mode 3: Uses CMD24 Single-block write to download + FFU_OPT_MODE3, // Optional mode 3: Uses CMD24 Single-block write to download + FFU_OPT_MODE4 // Optional mode 4: Uses CMD24 Single-block write to download, but stays in FFU mode during download. }; static inline __u32 per_byte_htole32(__u8 *arr) @@ -2866,6 +2867,9 @@ static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, set_single_cmd(&multi_cmd->cmds[1], MMC_WRITE_BLOCK, 1, 1, arg); mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf + offset); fill_switch_cmd(&multi_cmd->cmds[2], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE); + } else if (ffu_mode == FFU_OPT_MODE4) { + set_single_cmd(&multi_cmd->cmds[0], MMC_WRITE_BLOCK, 1, 1, arg); + mmc_ioc_cmd_set_data(multi_cmd->cmds[0], buf + offset); } } @@ -2973,6 +2977,9 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz } else if (ffu_mode == FFU_OPT_MODE3) { num_of_cmds = 3; /* in FFU_OPT_MODE3, mmc_ioc_multi_cmd contains 3 commands */ chunk_size = 512; /* FFU_OPT_MODE3 uses CMD24 single-block write */ + } else if (ffu_mode == FFU_OPT_MODE4) { + num_of_cmds = 1; /* in FFU_OPT_MODE4, it is single command mode */ + chunk_size = 512; /* FFU_OPT_MODE4 uses CMD24 single-block write */ } /* allocate maximum required */ @@ -2983,10 +2990,11 @@ static int do_ffu_download(int dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_siz return -ENOMEM; } - if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2) { + if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2 || ffu_mode == FFU_OPT_MODE4) { /* - * In FFU_OPT_MODE1 and FFU_OPT_MODE2, the command to enter FFU mode will be sent - * independently, separate from the firmware bundle download command. + * In FFU_OPT_MODE1, FFU_OPT_MODE2 and FFU_OPT_MODE4, the command to enter FFU + * mode will be sent independently, separate from the firmware bundle download + * command. */ ret = enter_ffu_mode(dev_fd); if (ret) @@ -3004,11 +3012,14 @@ do_retry: /* prepare multi_cmd for FFU based on cmd to be used */ set_ffu_download_cmd(multi_cmd, ext_csd, bytes_per_loop, fw_buf, off, ffu_mode); - /* send ioctl with multi-cmd, download firmware bundle */ - ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); + if (num_of_cmds > 1) + /* send ioctl with multi-cmd, download firmware bundle */ + ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd); + else + ret = ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[0]); if (ret) { - perror("Multi-cmd ioctl"); + perror("ioctl failed"); /* * In case multi-cmd ioctl failed before exiting from * ffu mode @@ -3040,10 +3051,10 @@ do_retry: off += bytes_per_loop; } - if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2) { + if (ffu_mode == FFU_OPT_MODE1 || ffu_mode == FFU_OPT_MODE2 || ffu_mode == FFU_OPT_MODE4) { /* - * In FFU_OPT_MODE1 and FFU_OPT_MODE2, the command to exit FFU mode will be sent - * independently, separate from the firmware bundle download command. + * In FFU_OPT_MODE1, FFU_OPT_MODE2 and FFU_OPT_MODE4, the command to exit FFU mode + * will be sent independently, separate from the firmware bundle download command. */ ret = exit_ffu_mode(dev_fd); if (ret) @@ -3233,6 +3244,11 @@ int do_opt_ffu3(int nargs, char **argv) return __do_ffu(nargs, argv, FFU_OPT_MODE3); } +int do_opt_ffu4(int nargs, char **argv) +{ + return __do_ffu(nargs, argv, FFU_OPT_MODE4); +} + int do_general_cmd_read(int nargs, char **argv) { int dev_fd; diff --git a/mmc_cmds.h b/mmc_cmds.h index 0fbb2b5..407cbe6 100644 --- a/mmc_cmds.h +++ b/mmc_cmds.h @@ -45,6 +45,7 @@ int do_ffu(int nargs, char **argv); int do_opt_ffu1(int nargs, char **argv); int do_opt_ffu2(int nargs, char **argv); int do_opt_ffu3(int nargs, char **argv); +int do_opt_ffu4(int nargs, char **argv); int do_read_scr(int argc, char **argv); int do_read_cid(int argc, char **argv); int do_read_csd(int argc, char **argv);