From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C94BC3DA7A for ; Thu, 5 Jan 2023 14:19:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C508D855B0; Thu, 5 Jan 2023 15:19:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672928353; bh=sPnjPFGfY5v1yJJEgKeM84GDr1s11XDtY+/R7yLT6iY=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=WafE8QDDsOiGYhZAqWvrvvAVNDSZJdphudgMwfyBHPb6CVHFUTSL+tixWkc9NKDgR KaIG2mHGbytcIiG2EcvPhiBAGLEg8yNNaT1Olc/DemfjJDGvEH+GxB5/4WSLwK2NRo X9vEGJ062Jsotp6fRejeXNf9AZwd44jlgcpTiX6g88Mn789u6ZB8wKBGf48xijVYfS Z/0wMk/FZUywterec/HwAig/jA6TZo5gIqL/Ihiwh0KTyzbnOCWDY+w33tY6PKGc1K +aNARQXeYtCQMLesOeAPuZwY393WAlufr6PiaqRx5t8nM6BGX1XzRX4blAiJtxCIMq ABZGMLhi/Rr1g== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 4FB96855A8; Thu, 5 Jan 2023 15:19:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672928351; bh=sPnjPFGfY5v1yJJEgKeM84GDr1s11XDtY+/R7yLT6iY=; h=From:To:Cc:Subject:Date:From; b=QIAt1Y9MBzh3rm/jpZg5GpKEByHi7Pt5yGkto/gLvxGNWhqoAsYy3eZBtTXUqsrZ9 OMr20Cvcmc+qumKKj0NGQmOs1Eotm1vwGZ+qJ5JWBgbarW7l11dLEmkLrXJqL50Dtf Ne55MfCnCydG5Drbi8+oaCgx8OpTqDX6E5wAvBo3X1FWPi1KtPAXxgyI5h1+x28hYj DC10nkcu3BwKde/PTdDJ7389lrUUSqCryg/8PsGdwcz99q7Jr5YmAi+lf+zP5Pyl5q dsXfBdxh4ZTa5dMEZ84F2PFYGBxGWhkMbLWbT5AKsB3V/9PwQLFvBTbZTyP1j5exc7 fNlltoQdfjP+w== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Jaehoon Chung , Peng Fan Subject: [PATCH v2] cmd: mmc: Expand bkops handling Date: Thu, 5 Jan 2023 15:19:08 +0100 Message-Id: <20230105141908.160343-1-marex@denx.de> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Add more capable "bkops" command which allows enabling and disabling both manual and automatic bkops. The existing 'mmc bkops-enable' subcommand is poorly named to cover all the possibilities, hence the new-ish subcommand. Note that both commands are wrappers around the same common code. Signed-off-by: Marek Vasut --- Cc: Jaehoon Chung Cc: Peng Fan --- V2: - Add kerneldoc comment to mmc_set_bkops_enable - Drop ifdef around mmc_set_bkops_enable in mmc.h --- cmd/mmc.c | 49 +++++++++++++++++++++++++++++++++++++++-------- drivers/mmc/mmc.c | 14 +++++++++----- include/mmc.h | 14 +++++++++++--- 3 files changed, 61 insertions(+), 16 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index c79d9407986..94deb9a1686 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -1020,16 +1020,12 @@ static int do_mmc_setdsr(struct cmd_tbl *cmdtp, int flag, } #ifdef CONFIG_CMD_BKOPS_ENABLE -static int do_mmc_bkops_enable(struct cmd_tbl *cmdtp, int flag, - int argc, char *const argv[]) +static int mmc_bkops_common(char *device, bool autobkops, bool enable) { - int dev; struct mmc *mmc; + int dev; - if (argc != 2) - return CMD_RET_USAGE; - - dev = dectoul(argv[1], NULL); + dev = dectoul(device, NULL); mmc = init_mmc_device(dev, false); if (!mmc) @@ -1040,7 +1036,41 @@ static int do_mmc_bkops_enable(struct cmd_tbl *cmdtp, int flag, return CMD_RET_FAILURE; } - return mmc_set_bkops_enable(mmc); + return mmc_set_bkops_enable(mmc, autobkops, enable); +} + +static int do_mmc_bkops(struct cmd_tbl *cmdtp, int flag, + int argc, char * const argv[]) +{ + bool autobkops, enable; + + if (argc != 4) + return CMD_RET_USAGE; + + if (!strcmp(argv[2], "manual")) + autobkops = false; + else if (!strcmp(argv[2], "auto")) + autobkops = true; + else + return CMD_RET_FAILURE; + + if (!strcmp(argv[3], "disable")) + enable = false; + else if (!strcmp(argv[3], "enable")) + enable = true; + else + return CMD_RET_FAILURE; + + return mmc_bkops_common(argv[1], autobkops, enable); +} + +static int do_mmc_bkops_enable(struct cmd_tbl *cmdtp, int flag, + int argc, char * const argv[]) +{ + if (argc != 2) + return CMD_RET_USAGE; + + return mmc_bkops_common(argv[1], false, true); } #endif @@ -1102,6 +1132,7 @@ static struct cmd_tbl cmd_mmc[] = { U_BOOT_CMD_MKENT(setdsr, 2, 0, do_mmc_setdsr, "", ""), #ifdef CONFIG_CMD_BKOPS_ENABLE U_BOOT_CMD_MKENT(bkops-enable, 2, 0, do_mmc_bkops_enable, "", ""), + U_BOOT_CMD_MKENT(bkops, 4, 0, do_mmc_bkops, "", ""), #endif }; @@ -1188,6 +1219,8 @@ U_BOOT_CMD( #ifdef CONFIG_CMD_BKOPS_ENABLE "mmc bkops-enable - enable background operations handshake on device\n" " WARNING: This is a write-once setting.\n" + "mmc bkops [auto|manual] [enable|disable]\n" + " - configure background operations handshake on device\n" #endif ); diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46b..afbc497b12c 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -3127,9 +3127,10 @@ int mmc_init_device(int num) #endif #ifdef CONFIG_CMD_BKOPS_ENABLE -int mmc_set_bkops_enable(struct mmc *mmc) +int mmc_set_bkops_enable(struct mmc *mmc, bool autobkops, bool enable) { int err; + u32 bit = autobkops ? BIT(1) : BIT(0); ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN); err = mmc_send_ext_csd(mmc, ext_csd); @@ -3143,18 +3144,21 @@ int mmc_set_bkops_enable(struct mmc *mmc) return -EMEDIUMTYPE; } - if (ext_csd[EXT_CSD_BKOPS_EN] & 0x1) { + if (enable && (ext_csd[EXT_CSD_BKOPS_EN] & bit)) { puts("Background operations already enabled\n"); return 0; } - err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BKOPS_EN, 1); + err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BKOPS_EN, + enable ? bit : 0); if (err) { - puts("Failed to enable manual background operations\n"); + printf("Failed to %sable manual background operations\n", + enable ? "en" : "dis"); return err; } - puts("Enabled manual background operations\n"); + printf("%sabled %s background operations\n", + enable ? "En" : "Dis", autobkops ? "auto" : "manual"); return 0; } diff --git a/include/mmc.h b/include/mmc.h index 571fa625d02..36dd841d5d1 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -892,9 +892,17 @@ int mmc_rpmb_write(struct mmc *mmc, void *addr, unsigned short blk, int mmc_rpmb_route_frames(struct mmc *mmc, void *req, unsigned long reqlen, void *rsp, unsigned long rsplen); -#ifdef CONFIG_CMD_BKOPS_ENABLE -int mmc_set_bkops_enable(struct mmc *mmc); -#endif +/** + * mmc_set_bkops_enable() - enable background operations + * @param mmc Pointer to a MMC device struct + * @param autobkops Enable automatic bkops, not manual bkops + * @param enable Enable bkops, not disable + * + * Enable or disable automatic or manual background operation of the eMMC. + * + * Return: 0 on success, <0 on error. + */ +int mmc_set_bkops_enable(struct mmc *mmc, bool autobkops, bool enable); /** * Start device initialization and return immediately; it does not block on -- 2.39.0