| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1457340783-1522-5-git-send-email-baolu.lu@linux.intel.com>
Date: Mon, 7 Mar 2016 16:53:00 +0800
From: Lu Baolu <baolu.lu@...ux.intel.com>
To: Felipe Balbi <balbi@...nel.org>,
Mathias Nyman <mathias.nyman@...el.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Lee Jones <lee.jones@...aro.org>,
Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
MyungJoo Ham <myungjoo.ham@...sung.com>,
Chanwoo Choi <cw00.choi@...sung.com>
Cc: linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
Lu Baolu <baolu.lu@...ux.intel.com>,
David Cohen <david.a.cohen@...ux.intel.com>,
Fengguang Wu <fengguang.wu@...el.com>
Subject: [PATCH v2 4/7] usb: mux: add driver for Intel gpio controlled port mux
In some Intel platforms, a single usb port is shared between USB host
and device controller. The shared port is under control of GPIO pins.
This patch adds the support for USB GPIO controlled port mux.
Signed-off-by: David Cohen <david.a.cohen@...ux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@...ux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
Reviewed-by: Felipe Balbi <balbi@...nel.org>
Signed-off-by: Fengguang Wu <fengguang.wu@...el.com>
---
MAINTAINERS | 1 +
drivers/usb/mux/Kconfig | 9 +++
drivers/usb/mux/Makefile | 1 +
drivers/usb/mux/intel-mux-gpio.c | 125 +++++++++++++++++++++++++++++++++++++++
4 files changed, 136 insertions(+)
create mode 100644 drivers/usb/mux/intel-mux-gpio.c
diff --git a/MAINTAINERS b/MAINTAINERS
index a93d26a..ab876eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11406,6 +11406,7 @@ L: linux-usb@...r.kernel.org
S: Supported
F: drivers/usb/mux/intel-mux.c
F: include/linux/usb/intel-mux.h
+F: drivers/usb/mux/intel-mux-gpio.c
USB PRINTER DRIVER (usblp)
M: Pete Zaitcev <zaitcev@...hat.com>
diff --git a/drivers/usb/mux/Kconfig b/drivers/usb/mux/Kconfig
index 8fedc4f..060bf5c 100644
--- a/drivers/usb/mux/Kconfig
+++ b/drivers/usb/mux/Kconfig
@@ -6,4 +6,13 @@ config INTEL_USB_MUX
select EXTCON
def_bool n
+config INTEL_MUX_GPIO
+ tristate "Intel dual role port mux controlled by GPIOs"
+ depends on GPIOLIB
+ depends on X86 && ACPI
+ select INTEL_USB_MUX
+ help
+ Say Y here to enable support for Intel dual role port mux
+ controlled by GPIOs.
+
endmenu
diff --git a/drivers/usb/mux/Makefile b/drivers/usb/mux/Makefile
index 84f0ae8..66f765c 100644
--- a/drivers/usb/mux/Makefile
+++ b/drivers/usb/mux/Makefile
@@ -2,3 +2,4 @@
# Makefile for USB port mux drivers
#
obj-$(CONFIG_INTEL_USB_MUX) += intel-mux.o
+obj-$(CONFIG_INTEL_MUX_GPIO) += intel-mux-gpio.o
diff --git a/drivers/usb/mux/intel-mux-gpio.c b/drivers/usb/mux/intel-mux-gpio.c
new file mode 100644
index 0000000..adcb496
--- /dev/null
+++ b/drivers/usb/mux/intel-mux-gpio.c
@@ -0,0 +1,125 @@
+/*
+ * USB Dual Role Port Mux driver controlled by gpios
+ *
+ * Copyright (c) 2016, Intel Corporation.
+ * Author: David Cohen <david.a.cohen@...ux.intel.com>
+ * Author: Lu Baolu <baolu.lu@...ux.intel.com>
+ *
+ * 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.
+ */
+
+#include <linux/acpi.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/usb/intel-mux.h>
+
+struct vuport {
+ struct intel_mux_dev umdev;
+ struct gpio_desc *gpio_vbus_en;
+ struct gpio_desc *gpio_usb_mux;
+};
+
+/*
+ * id == 0, HOST connected, USB port should be set to peripheral
+ * id == 1, HOST disconnected, USB port should be set to host
+ *
+ * Peripheral: set USB mux to peripheral and disable VBUS
+ * Host: set USB mux to host and enable VBUS
+ */
+static inline int vuport_set_port(struct intel_mux_dev *umdev, int id)
+{
+ struct vuport *vup = container_of(umdev, struct vuport, umdev);
+
+ dev_dbg(umdev->dev, "USB PORT ID: %s\n", id ? "HOST" : "PERIPHERAL");
+
+ gpiod_set_value_cansleep(vup->gpio_usb_mux, !id);
+ gpiod_set_value_cansleep(vup->gpio_vbus_en, id);
+
+ return 0;
+}
+
+static int vuport_cable_set(struct intel_mux_dev *umdev)
+{
+ return vuport_set_port(umdev, 1);
+}
+
+static int vuport_cable_unset(struct intel_mux_dev *umdev)
+{
+ return vuport_set_port(umdev, 0);
+}
+
+static int vuport_probe(struct platform_device *pdev)
+{
+ struct intel_mux_dev *umdev;
+ struct device *dev = &pdev->dev;
+ struct vuport *vup;
+
+ vup = devm_kzalloc(dev, sizeof(*vup), GFP_KERNEL);
+ if (!vup)
+ return -ENOMEM;
+
+ /* retrieve vbus and mux gpios */
+ vup->gpio_vbus_en = devm_gpiod_get_optional(dev,
+ "vbus_en", GPIOD_ASIS);
+ if (IS_ERR(vup->gpio_vbus_en))
+ return PTR_ERR(vup->gpio_vbus_en);
+
+ vup->gpio_usb_mux = devm_gpiod_get_optional(dev,
+ "usb_mux", GPIOD_ASIS);
+ if (IS_ERR(vup->gpio_usb_mux))
+ return PTR_ERR(vup->gpio_usb_mux);
+
+ /* populate the mux generic structure */
+ umdev = &vup->umdev;
+ umdev->dev = dev;
+ umdev->cable_name = "USB-HOST";
+ umdev->cable_set_cb = vuport_cable_set;
+ umdev->cable_unset_cb = vuport_cable_unset;
+
+ return intel_usb_mux_register(umdev);
+}
+
+static int vuport_remove(struct platform_device *pdev)
+{
+ return intel_usb_mux_unregister(&pdev->dev);
+}
+
+#ifdef CONFIG_PM_SLEEP
+/*
+ * In case a micro A cable was plugged in while device was sleeping,
+ * we missed the interrupt. We need to poll usb id gpio when waking the
+ * driver to detect the missed event.
+ * We use 'complete' callback to give time to all extcon listeners to
+ * resume before we send new events.
+ */
+static const struct dev_pm_ops vuport_pm_ops = {
+ .complete = intel_usb_mux_complete,
+};
+#endif
+
+static const struct platform_device_id vuport_platform_ids[] = {
+ { .name = "intel-mux-gpio", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, vuport_platform_ids);
+
+static struct platform_driver vuport_driver = {
+ .driver = {
+ .name = "intel-mux-gpio",
+#ifdef CONFIG_PM_SLEEP
+ .pm = &vuport_pm_ops,
+#endif
+ },
+ .probe = vuport_probe,
+ .remove = vuport_remove,
+ .id_table = vuport_platform_ids,
+};
+
+module_platform_driver(vuport_driver);
+
+MODULE_AUTHOR("David Cohen <david.a.cohen@...ux.intel.com>");
+MODULE_AUTHOR("Lu Baolu <baolu.lu@...ux.intel.com>");
+MODULE_DESCRIPTION("Intel USB gpio mux driver");
+MODULE_LICENSE("GPL v2");
--
2.1.4
Powered by blists - more mailing lists