summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-01-31 18:28:07 -0500
committerTom Rini <trini@konsulko.com>2023-01-31 18:28:07 -0500
commit73a3f5139182a0389d505bf29b0ad4bc29424cf8 (patch)
tree8e2192a3d1ea6ec22acee93b0ac24f8885311af5 /cmd
parent237f56879e7cd01f84d9631d048fe0bb53172619 (diff)
parenta1f8abf4686065f46ac840e956a1aeb68d90d969 (diff)
Merge https://source.denx.de/u-boot/custodians/u-boot-mmc
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mmc.c49
1 files changed, 41 insertions, 8 deletions
diff --git a/cmd/mmc.c b/cmd/mmc.c
index c79d940798..94deb9a168 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 <dev> - enable background operations handshake on device\n"
" WARNING: This is a write-once setting.\n"
+ "mmc bkops <dev> [auto|manual] [enable|disable]\n"
+ " - configure background operations handshake on device\n"
#endif
);