[PATCH] 'detect' command to detect devices

[PATCH] 'detect' command to detect devices

[Sascha Hauer]

This adds a 'detect' callback for devices which can be used for
MMC/ATA/USB and maybe other stuff. See the first patch for details.

In short with this series we get a 'detect' command to trigger
a devices detect callback to detect SD/MMC cards. Currently only
SD/MMC is implemented, but this should also be used for USB/ATA
aswell later.

Sascha

----------------------------------------------------------------
Sascha Hauer (3):
      devices: add detect mechanism
      mci: implement detect driver callback
      mci fsl-esdhc: implement detect driver callback

 commands/Kconfig        |  9 +++++++
 commands/Makefile       |  1 +
 commands/detect.c       | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/base/driver.c   |  7 +++++
 drivers/mci/imx-esdhc.c | 13 +++++++--
 drivers/mci/mci-core.c  | 21 +++++++++++++++
 include/driver.h        |  8 ++++++
 include/mci.h           |  6 +++--
 8 files changed, 131 insertions(+), 4 deletions(-)
 create mode 100644 commands/detect.c

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] devices: add detect mechanism

[Sascha Hauer]

We often encounter the situation where slow devices should not be
probed during startup since probing is slow and maybe unnecessary
for unused devices. With MMC we have the 'probe' device parameter,
for ata we have the same, for USB we have the 'usb' command. Overall
this is not very consistent.
With MMC there is the additional problem that the probe parameter
is attached to the logical device when we often have the information
which physical device we want to probe.
This patch adds a 'detect' callback for devices and adds a command
to detect devices and to list the devices which are actually detecable.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/Kconfig      |  9 +++++++
 commands/Makefile     |  1 +
 commands/detect.c     | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/base/driver.c |  7 ++++++
 include/driver.h      |  8 ++++++
 5 files changed, 95 insertions(+)
 create mode 100644 commands/detect.c

diff --git a/commands/Kconfig b/commands/Kconfig
index 6a759ce..a62ed98 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -728,6 +728,15 @@ config CMD_CLK
 	  Say yes here to get clk_set_rate, clk_set_parent and clk_dump
 	  commands to manipulate clocks on your system.
 
+config CMD_DETECT
+	tristate
+	prompt "detect"
+	help
+	  say yes here to get the 'detect' command. Some devices take longer
+	  time to probe, like slow disks or SD/MMC cards. These can defer the
+	  actual probe of the client devices until they are needed. Use the
+	  'detect' command on the physical device to trigger probing.
+
 menuconfig CMD_WD
 	bool
 	depends on WATCHDOG
diff --git a/commands/Makefile b/commands/Makefile
index 953ecc2..419d93b 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -90,3 +90,4 @@ obj-$(CONFIG_CMD_TFTP)		+= tftp.o
 obj-$(CONFIG_CMD_FILETYPE)	+= filetype.o
 obj-$(CONFIG_CMD_BAREBOX_UPDATE)+= barebox-update.o
 obj-$(CONFIG_CMD_MIITOOL)	+= miitool.o
+obj-$(CONFIG_CMD_DETECT)	+= detect.o
diff --git a/commands/detect.c b/commands/detect.c
new file mode 100644
index 0000000..ec7b844
--- /dev/null
+++ b/commands/detect.c
@@ -0,0 +1,70 @@
+/*
+ * detect.c - detect devices command
+ *
+ * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#include <common.h>
+#include <command.h>
+#include <complete.h>
+#include <driver.h>
+#include <getopt.h>
+
+static int do_detect(int argc, char *argv[])
+{
+	struct device_d *dev;
+	int opt, i;
+	int do_list = 0;
+
+	while ((opt = getopt(argc, argv, "l")) > 0) {
+		switch (opt) {
+		case 'l':
+			do_list = 1;
+			break;
+		}
+	}
+
+	if (do_list) {
+		for_each_device(dev) {
+			if (dev->detect)
+				printf("%s\n", dev_name(dev));
+		}
+		return 0;
+	}
+
+	if (argc == optind)
+		return COMMAND_ERROR_USAGE;
+
+	for (i = optind; i < argc; i++) {
+		dev = get_device_by_name(argv[i]);
+		if (!dev)
+			return -ENODEV;
+		device_detect(dev);
+	}
+
+	return 0;
+}
+
+BAREBOX_CMD_HELP_START(detect)
+BAREBOX_CMD_HELP_USAGE("detect [OPTIONS] [device]\n")
+BAREBOX_CMD_HELP_OPT  ("-l",  "list detectable devices\n")
+BAREBOX_CMD_HELP_END
+
+BAREBOX_CMD_START(detect)
+	.cmd		= do_detect,
+	.usage		= "detect devices",
+	BAREBOX_CMD_COMPLETE(device_complete)
+	BAREBOX_CMD_HELP(cmd_detect_help)
+BAREBOX_CMD_END
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index c885630..810d001 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -93,6 +93,13 @@ int device_probe(struct device_d *dev)
 	return 0;
 }
 
+int device_detect(struct device_d *dev)
+{
+	if (!dev->detect)
+		return -ENOSYS;
+	return dev->detect(dev);
+}
+
 static int match(struct driver_d *drv, struct device_d *dev)
 {
 	int ret;
diff --git a/include/driver.h b/include/driver.h
index 3e6c36f..8b3af4d 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -109,6 +109,11 @@ struct device_d {
 	const struct of_device_id *of_id_entry;
 
 	void    (*info) (struct device_d *);
+	/*
+	 * For devices which take longer to probe this is called
+	 * when the driver should actually detect client devices
+	 */
+	int     (*detect) (struct device_d *);
 };
 
 /** @brief Describes a driver present in the system */
@@ -152,6 +157,9 @@ int register_device(struct device_d *);
  */
 int device_probe(struct device_d *dev);
 
+/* detect devices attached to this device (cards, disks,...) */
+int device_detect(struct device_d *dev);
+
 /* Unregister a device. This function can fail, e.g. when the device
  * has children.
  */
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] mci: implement detect driver callback

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/mci-core.c | 21 +++++++++++++++++++++
 include/mci.h          |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 416168f..50068a7 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1596,6 +1596,24 @@ static int mci_init(void)
 
 device_initcall(mci_init);
 
+int mci_detect_card(struct mci_host *host)
+{
+	int rc;
+
+	rc = mci_check_if_already_initialized(host->mci);
+	if (rc != 0)
+		return 0;
+
+	return mci_card_probe(host->mci);
+}
+
+static int mci_detect(struct device_d *dev)
+{
+	struct mci *mci = container_of(dev, struct mci, dev);
+
+	return mci_detect_card(mci->host);
+}
+
 /**
  * Create a new mci device (for convenience)
  * @param host mci_host for this MCI device
@@ -1619,6 +1637,9 @@ int mci_register(struct mci_host *host)
 
 	mci->dev.platform_data = host;
 	mci->dev.parent = host->hw_dev;
+	mci->host = host;
+	host->mci = mci;
+	mci->dev.detect = mci_detect;
 
 	ret = register_device(&mci->dev);
 	if (ret)
diff --git a/include/mci.h b/include/mci.h
index 1eb967d..eb8a195 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -285,9 +285,12 @@ struct mci_ios {
 #define MMC_1_8V_SDR_MODE	4
 };
 
+struct mci;
+
 /** host information */
 struct mci_host {
 	struct device_d *hw_dev;	/**< the host MCI hardware device */
+	struct mci *mci;
 	char *devname;			/**< the devicename for the card, defaults to disk%d */
 	unsigned voltages;
 	unsigned host_caps;	/**< Host's interface capabilities, refer MMC_VDD_* */
@@ -308,8 +311,6 @@ struct mci_host {
 	int (*card_write_protected)(struct mci_host *);
 };
 
-struct mci;
-
 #define MMC_NUM_BOOT_PARTITION	2
 #define MMC_NUM_GP_PARTITION	4
 #define MMC_NUM_PHY_PARTITION	6
@@ -362,5 +363,6 @@ struct mci {
 };
 
 int mci_register(struct mci_host*);
+int mci_detect_card(struct mci_host *);
 
 #endif /* _MCI_H_ */
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] mci fsl-esdhc: implement detect driver callback

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/imx-esdhc.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index 1e3b307..1c710e8 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -495,6 +495,13 @@ static int esdhc_reset(void __iomem *regs)
 	return 0;
 }
 
+static int fsl_esdhc_detect(struct device_d *dev)
+{
+	struct fsl_esdhc_host *host = dev->priv;
+
+	return mci_detect_card(&host->mci);
+}
+
 static int fsl_esdhc_probe(struct device_d *dev)
 {
 	struct fsl_esdhc_host *host;
@@ -552,15 +559,17 @@ static int fsl_esdhc_probe(struct device_d *dev)
 	host->mci.card_present = esdhc_card_present;
 	host->mci.hw_dev = dev;
 
+	dev->detect = fsl_esdhc_detect,
+
 	rate = clk_get_rate(host->clk);
 	host->mci.f_min = rate >> 12;
 	if (host->mci.f_min < 200000)
 		host->mci.f_min = 200000;
 	host->mci.f_max = rate;
 
-	mci_register(&host->mci);
+	dev->priv = host;
 
-	return 0;
+	return mci_register(&host->mci);
 }
 
 static __maybe_unused struct of_device_id fsl_esdhc_compatible[] = {
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox