power: add power sequence library
Subsystems (7)
v12 cover power: add power sequence library
Hi all,
This is a follow-up for my last power sequence framework patch set [1]. According to Rob Herring and Ulf Hansson's comments[2]. The kinds of power sequence instances will be added at postcore_initcall, the match criteria is compatible string first, if the compatible string is not matched between dts and library, it will try to use generic power sequence.
The host driver just needs to call of_pwrseq_on/of_pwrseq_off
if only one power sequence instance is needed, for more power sequences are used, using of_pwrseq_on_list/of_pwrseq_off_list instead (eg, USB hub driver).
In future, if there are special power sequence requirements, the special power sequence library can be created.
This patch set is tested on i.mx6 sabresx evk using a dts change, I use two hot-plug devices to simulate this use case, the related binding change is updated at patch [1/6], The udoo board changes were tested using my last power sequence patch set.[3]
Except for hard-wired MMC and USB devices, I find the USB ULPI PHY also need to power on itself before it can be found by ULPI bus.
Changes for v12:
- Add design doc and more comments at generic power sequence source file [Patch 2/9]
- Introduce four Arnd Bergmann patches and one my ehci related patches, these patches are used to get property DT/firmware information at USB code, and these information are needed for power sequence operation at USB. With these five patches, my chipidea hack patch in previous patch set can be removed. [Patch 3-7/9]
- Add -ENOENT judgement to avoid USB error if no power sequence library is chosen [9/9]
Rafael, if the first two power sequence patches are ok for you, would you consider accept these first, the other USB patches can go through USB tree at v4.12-rc1?
Changes for v11:
- Fix warning: (USB) selects POWER_SEQUENCE which has unmet direct dependencies (OF)
- Delete redundant copyright statement.
- Change pr_warn to pr_debug at wrseq_find_available_instance
- Refine kerneldoc
- %s/ENONET/ENOENT
- Allocate pwrseq list node before than carry out power sequence on
- Add mutex_lock/mutex_lock for pwrseq node browse at pwrseq_find_available_instance
- Add pwrseq_suspend/resume for API both single instance and list
- Add .pwrseq_suspend/resume for pwrseq_generic.c
- Add pwrseq_suspend_list and pwrseq_resume_list for USB hub suspend and resume routine
Changes for v10:
- Improve the kernel-doc for power sequence core, including exported APIs and main structure. [Patch 2/8]
- Change Kconfig, and let the user choose power sequence. [Patch 2/8]
- Delete EXPORT_SYMBOL and change related APIs as local, these APIs do not be intended to export currently. [Patch 2/8]
- Selete POWER_SEQUENCE at USB core's Kconfig. [Patch 4/8]
Changes for v9:
- Add Vaibhav Hiremath's reviewed-by [Patch 4/8]
- Rebase to v4.9-rc1
Changes for v8:
- Allocate one extra pwrseq instance if pwrseq_get has succeed, it can avoid preallocate instances problem which the number of instance is decided at compile time, thanks for Heiko Stuebner's suggestion [Patch 2/8]
- Delete pwrseq_compatible_sample.c which is the demo purpose to show compatible match method. [Patch 2/8]
- Add Maciej S. Szmigiero's tested-by. [Patch 7/8]
Changes for v7:
- Create kinds of power sequence instance at postcore_initcall, and match the instance with node using compatible string, the beneit of this is the host driver doesn't need to consider which pwrseq instance needs to be used, and pwrseq core will match it, however, it eats some memories if less power sequence instances are used. [Patch 2/8]
- Add pwrseq_compatible_sample.c to test match pwrseq using device_id. [Patch 2/8]
- Fix the comments Vaibhav Hiremath adds for error path for clock and do not use device_node for parameters at pwrseq_on. [Patch 2/8]
- Simplify the caller to use power sequence, follows Alan's commnets [Patch 4/8]
- Tested three pwrseq instances together using both specific compatible string and generic libraries.
Changes for v6:
- Add Matthias Kaehlcke's Reviewed-by and Tested-by. (patch [2/6])
- Change chipidea core of_node assignment for coming user. (patch [5/6])
- Applies Joshua Clayton's three dts changes for two boards, the USB device's reg has only #address-cells, but without #size-cells.
Changes for v5:
- Delete pwrseq_register/pwrseq_unregister, which is useless currently
- Fix the linker error when the pwrseq user is compiled as module
Changes for v4:
- Create the patch on next-20160722
- Fix the of_node is not NULL after chipidea driver is unbinded [Patch 5/6]
- Using more friendly wait method for reset gpio [Patch 2/6]
- Support multiple input clocks [Patch 2/6]
- Add Rob Herring's ack for DT changes
- Add Joshua Clayton's Tested-by
Changes for v3:
- Delete "power-sequence" property at binding-doc, and change related code at both library and user code.
- Change binding-doc example node name with Rob's comments
- of_get_named_gpio_flags only gets the gpio, but without setting gpio flags, add additional code request gpio with proper gpio flags
- Add Philipp Zabel's Ack and MAINTAINER's entry
Changes for v2:
- Delete "pwrseq" prefix and clock-names for properties at dt binding
- Should use structure not but its pointer for kzalloc
- Since chipidea core has no of_node, let core's of_node equals glue layer's at core's probe
[1] http://www.spinics.net/lists/linux-usb/msg142755.html
[2] http://www.spinics.net/lists/linux-usb/msg143106.html
[3] http://www.spinics.net/lists/linux-usb/msg142815.html
[4] http://www.spinics.net/lists/linux-usb/msg152375.html
Arnd Bergmann (4):
usb: separate out sysdev pointer from usb_bus
usb: chipidea: use bus->sysdev for DMA configuration
usb: ehci: fsl: use bus->sysdev for DMA configuration
usb: xhci: use bus->sysdev for DMA configuration
Peter Chen (5):
binding-doc: power: pwrseq-generic: add binding doc for generic power
sequence library
power: add power sequence library
usb: ehci: use bus->sysdev for DMA configuration
binding-doc: usb: usb-device: add optional properties for power
sequence
usb: core: add power sequence handling for USB devices
.../bindings/power/pwrseq/pwrseq-generic.txt | 48 +++ .../devicetree/bindings/usb/usb-device.txt | 10 +- Documentation/power/power-sequence/design.rst | 38 +++ MAINTAINERS | 9 + drivers/power/Kconfig | 1 + drivers/power/Makefile | 1 + drivers/power/pwrseq/Kconfig | 20 ++ drivers/power/pwrseq/Makefile | 2 + drivers/power/pwrseq/core.c | 335 +++++++++++++++++++++ drivers/power/pwrseq/pwrseq_generic.c | 234 ++++++++++++++ drivers/usb/Kconfig | 1 + drivers/usb/chipidea/core.c | 3 - drivers/usb/chipidea/host.c | 3 +- drivers/usb/chipidea/udc.c | 10 +- drivers/usb/core/buffer.c | 12 +- drivers/usb/core/hcd.c | 48 +-- drivers/usb/core/hub.c | 49 ++- drivers/usb/core/hub.h | 1 + drivers/usb/core/usb.c | 18 +- drivers/usb/host/ehci-fsl.c | 4 +- drivers/usb/host/ehci-mem.c | 38 +-- drivers/usb/host/xhci-mem.c | 12 +- drivers/usb/host/xhci-plat.c | 33 +- drivers/usb/host/xhci.c | 15 +- include/linux/power/pwrseq.h | 81 +++++ include/linux/usb.h | 1 + include/linux/usb/hcd.h | 3 + 27 files changed, 945 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt create mode 100644 Documentation/power/power-sequence/design.rst create mode 100644 drivers/power/pwrseq/Kconfig create mode 100644 drivers/power/pwrseq/Makefile create mode 100644 drivers/power/pwrseq/core.c create mode 100644 drivers/power/pwrseq/pwrseq_generic.c create mode 100644 include/linux/power/pwrseq.h
Signature · 1 line
2.7.4
PATCH v12 1/9 binding-doc: power: pwrseq-generic: add binding doc for generic power sequence library
Add binding doc for generic power sequence library.
--- .../bindings/power/pwrseq/pwrseq-generic.txt | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt
Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt new file +48 -0
@@ -0,0 +1,48 @@ +The generic power sequence library + +Some hard-wired devices (eg USB/MMC) need to do power sequence before +the device can be enumerated on the bus, the typical power sequence +like: enable USB PHY clock, toggle reset pin, etc. But current +Linux device driver lacks of such code to do it, it may cause some +hard-wired devices works abnormal or can't be recognized by +controller at all. The power sequence will be done before this device +can be found at the bus. + +The power sequence properties is under the device node. + +Optional properties: +- clocks: the input clocks for device. +- reset-gpios: Should specify the GPIO for reset. +- reset-duration-us: the duration in microsecond for assert reset signal. + +Below is the example of USB power sequence properties on USB device +nodes which have two level USB hubs. + +&usbotg1 { + vbus-supply = <®_usb_otg1_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_otg1_id>; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + genesys: hub at 1 { + compatible = "usb5e3,608"; + reg = <1>; + + clocks = <&clks IMX6SX_CLK_CKO>; + reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* hub reset pin */ + reset-duration-us = <10>; + + #address-cells = <1>; + #size-cells = <0>; + asix: ethernet at 1 { + compatible = "usbb95,1708"; + reg = <1>; + + clocks = <&clks IMX6SX_CLK_IPG>; + reset-gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* ethernet_rst */ + reset-duration-us = <15>; + }; + }; +};
Signature · 1 line
2.7.4
PATCH v12 2/9 power: add power sequence library
In reply to Peter ChenWe have an well-known problem that the device needs to do some power sequence before it can be recognized by related host, the typical example like hard-wired mmc devices and usb devices.
This power sequence is hard to be described at device tree and handled by related host driver, so we have created a common power sequence library to cover this requirement. The core code has supplied some common helpers for host driver, and individual power sequence libraries handle kinds of power sequence for devices. The pwrseq librares always need to allocate extra instance for compatible string match.
pwrseq_generic is intended for general purpose of power sequence, which handles gpios and clocks currently, and can cover other controls in future. The host driver just needs to call of_pwrseq_on/of_pwrseq_off if only one power sequence is needed, else call of_pwrseq_on_list /of_pwrseq_off_list instead (eg, USB hub driver).
For new power sequence library, it can add its compatible string to pwrseq_of_match_table, then the pwrseq core will match it with DT's, and choose this library at runtime.
Tested-by Joshua Clayton <[email protected]>
--- Documentation/power/power-sequence/design.rst | 38 +++ MAINTAINERS | 9 + drivers/power/Kconfig | 1 + drivers/power/Makefile | 1 + drivers/power/pwrseq/Kconfig | 20 ++ drivers/power/pwrseq/Makefile | 2 + drivers/power/pwrseq/core.c | 335 ++++++++++++++++++++++++++ drivers/power/pwrseq/pwrseq_generic.c | 234 ++++++++++++++++++ include/linux/power/pwrseq.h | 81 +++++++ 9 files changed, 721 insertions(+) create mode 100644 Documentation/power/power-sequence/design.rst create mode 100644 drivers/power/pwrseq/Kconfig create mode 100644 drivers/power/pwrseq/Makefile create mode 100644 drivers/power/pwrseq/core.c create mode 100644 drivers/power/pwrseq/pwrseq_generic.c create mode 100644 include/linux/power/pwrseq.h
Documentation/power/power-sequence/design.rst new file +38 -0
@@ -0,0 +1,38 @@ +==================================== +Power Sequence Library +==================================== + +:Date: Feb, 2017 +:Author: Peter Chen <[email protected]> + + +Introduction +============ + +We have an well-known problem that the device needs to do a power +sequence before it can be recognized by related host, the typical +examples are hard-wired mmc devices and usb devices. The host controller +can't know what kinds of this device in its bus if the power sequence has +not done, since the related devices driver's probe is runtime and +according to eunumeration results. Besides, the devices may have custom +power sequence, so the power sequence library which is independent with +the devices is needed. + +Design +============ + +The power sequence library includes the exported interfaces are called by +host controller driver and individual sequence source files to register +its power sequence instance to global power sequence list, and individual +sequence files create power sequence instance and implement custom power +sequence. + +The exported interfaces +.. kernel-doc:: drivers/power/pwrseq/core.c + :export: + +Since the power sequence describes hardware design, the description is +located at board description file, eg, device tree dts file. And +a specific power sequence belongs to device, so its description +is under the device node, please refer to: +Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt
MAINTAINERS +9 -0
@@ -9845,6 +9845,15 @@ F: include/linux/pm_* F: include/linux/powercap.h F: drivers/powercap/ +POWER SEQUENCE LIBRARY +M: Peter Chen <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +L: linux-pm at vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/power/pwrseq/ +F: drivers/power/pwrseq/ +F: include/linux/power/pwrseq.h + POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS M: Sebastian Reichel <[email protected]> L: linux-pm at vger.kernel.org
drivers/power/Kconfig +1 -0
@@ -1,3 +1,4 @@ source "drivers/power/avs/Kconfig" source "drivers/power/reset/Kconfig" source "drivers/power/supply/Kconfig" +source "drivers/power/pwrseq/Kconfig"
drivers/power/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_POWER_AVS) += avs/ obj-$(CONFIG_POWER_RESET) += reset/ obj-$(CONFIG_POWER_SUPPLY) += supply/ +obj-$(CONFIG_POWER_SEQUENCE) += pwrseq/
drivers/power/pwrseq/Kconfig new file +20 -0
@@ -0,0 +1,20 @@ +# +# Power Sequence library +# + +menuconfig POWER_SEQUENCE + bool "Power sequence control" + help + It is used for drivers which needs to do power sequence + (eg, turn on clock, toggle reset gpio) before the related + devices can be found by hardware, eg, USB bus. + +if POWER_SEQUENCE + +config PWRSEQ_GENERIC + bool "Generic power sequence control" + depends on OF + help + This is the generic power sequence control library, and is + supposed to support common power sequence usage. +endif
drivers/power/pwrseq/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +obj-$(CONFIG_POWER_SEQUENCE) += core.o +obj-$(CONFIG_PWRSEQ_GENERIC) += pwrseq_generic.o
drivers/power/pwrseq/core.c new file +335 -0
335 lines not on this page · raw message
drivers/power/pwrseq/pwrseq_generic.c new file +234 -0
234 lines not on this page · raw message
include/linux/power/pwrseq.h new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v12 3/9 usb: separate out sysdev pointer from usb_bus
In reply to Peter ChenFrom: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices.
The idea here is that you pass in the parent of_node along with the child device pointer, so it would behave exactly like the parent already does. The difference is that it also handles all the other attributes besides the mask.
sysdev will represent the physical device, as seen from firmware or bus.Splitting the usb_bus->controller field into the Linux-internal device (used for the sysfs hierarchy, for printks and for power management) and a new pointer (used for DMA, DT enumeration and phy lookup) probably covers all that we really need.
--- drivers/usb/core/buffer.c | 12 ++++++------ drivers/usb/core/hcd.c | 48 ++++++++++++++++++++++++++++------------------- drivers/usb/core/usb.c | 18 +++++++++--------- include/linux/usb.h | 1 + include/linux/usb/hcd.h | 3 +++ 5 files changed, 48 insertions(+), 34 deletions(-)
drivers/usb/core/buffer.c +6 -6
@@ -66,7 +66,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)int i, size;if (!IS_ENABLED (CONFIG_HAS_DMA ) || - (!hcd->self.controller->dma_mask && + (!is_device_dma_capable (hcd->self.sysdev) && !(hcd->driver->flags &HCD_LOCAL_MEM )))return 0 ;
@@ -75,7 +75,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)if (!size)continue ;snprintf (name,sizeof (name),"buffer-%d" , size); - hcd->pool[i] =dma_pool_create (name, hcd->self.controller, + hcd->pool[i] =dma_pool_create (name, hcd->self.sysdev, size, size,0 );if (!hcd->pool[i]) {hcd_buffer_destroy (hcd);
@@ -130,7 +130,7 @@ void *hcd_buffer_alloc(/* some USB hosts just use PIO */ if (!IS_ENABLED (CONFIG_HAS_DMA ) || - (!bus->controller->dma_mask && + (!is_device_dma_capable (bus->sysdev) && !(hcd->driver->flags &HCD_LOCAL_MEM ))) { *dma = ~(dma_addr_t )0 ;return kmalloc (size, mem_flags);
@@ -140,7 +140,7 @@ void *hcd_buffer_alloc(if (size <= pool_max[i])return dma_pool_alloc (hcd->pool[i], mem_flags, dma); } -return dma_alloc_coherent (hcd->self.controller, size, dma, mem_flags); +return dma_alloc_coherent (hcd->self.sysdev, size, dma, mem_flags); } void hcd_buffer_free(
@@ -157,7 +157,7 @@ void hcd_buffer_free(return ;if (!IS_ENABLED (CONFIG_HAS_DMA ) || - (!bus->controller->dma_mask && + (!is_device_dma_capable (bus->sysdev) && !(hcd->driver->flags &HCD_LOCAL_MEM ))) {kfree (addr);return ;
@@ -169,5 +169,5 @@ void hcd_buffer_free(return ; } } -dma_free_coherent (hcd->self.controller, size, addr, dma); +dma_free_coherent (hcd->self.sysdev, size, addr, dma); }
drivers/usb/core/hcd.c +29 -19
159 lines not on this page · raw message
drivers/usb/core/usb.c +9 -9
@@ -453,9 +453,9 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,* Note: calling dma_set_mask() on a USB device would set the * mask for the entire HCD, so don't do that. */ - dev->dev.dma_mask = bus->controller->dma_mask; - dev->dev.dma_pfn_offset = bus->controller->dma_pfn_offset; -set_dev_node (&dev->dev,dev_to_node (bus->controller)); + dev->dev.dma_mask = bus->sysdev->dma_mask; + dev->dev.dma_pfn_offset = bus->sysdev->dma_pfn_offset; +set_dev_node (&dev->dev,dev_to_node (bus->sysdev)); dev->state =USB_STATE_ATTACHED ; dev->lpm_disable_count =1 ;atomic_set (&dev->urbnum,0 );
@@ -803,7 +803,7 @@ struct urb *usb_buffer_map(struct urb *urb)if (!urb || !urb->dev || !(bus = urb->dev->bus) - || !(controller = bus->controller)) + || !(controller = bus->sysdev))return NULL ;if (controller->dma_mask) {
@@ -841,7 +841,7 @@ void usb_buffer_dmasync(struct urb *urb) || !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP) || !urb->dev || !(bus = urb->dev->bus) - || !(controller = bus->controller)) + || !(controller = bus->sysdev))return ;if (controller->dma_mask) {
@@ -875,7 +875,7 @@ void usb_buffer_unmap(struct urb *urb) || !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP) || !urb->dev || !(bus = urb->dev->bus) - || !(controller = bus->controller)) + || !(controller = bus->sysdev))return ;if (controller->dma_mask) {
@@ -925,7 +925,7 @@ int usb_buffer_map_sg(const struct usb_device *dev, int is_in,if (!dev || !(bus = dev->bus) - || !(controller = bus->controller) + || !(controller = bus->sysdev) || !controller->dma_mask)return -EINVAL ;
@@ -961,7 +961,7 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, int is_in,if (!dev || !(bus = dev->bus) - || !(controller = bus->controller) + || !(controller = bus->sysdev) || !controller->dma_mask)return ;
@@ -989,7 +989,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,if (!dev || !(bus = dev->bus) - || !(controller = bus->controller) + || !(controller = bus->sysdev) || !controller->dma_mask)return ;
include/linux/usb.h +1 -0
@@ -354,6 +354,7 @@ struct usb_devmap {*/ struct usb_bus {struct device *controller;/* host/master side hardware */ +struct device *sysdev;/* as seen from firmware or bus */ int busnum;/* Bus number (in order of reg) */ const char *bus_name;/* stable id (PCI slot_name etc) */ u8 uses_dma;/* Does the host controller use DMA? */
include/linux/usb/hcd.h +3 -0
@@ -437,6 +437,9 @@ extern int usb_hcd_alloc_bandwidth(struct usb_device *udev, struct usb_host_interface *new_alt);extern int usb_hcd_get_frame_number (struct usb_device *udev); +struct usb_hcd *__usb_create_hcd (const struct hc_driver *driver, +struct device *sysdev,struct device *dev,const char *bus_name, +struct usb_hcd *primary_hcd);extern struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,struct device *dev,const char *bus_name); extern struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,
Signature · 1 line
2.7.4
Re: [PATCH v12 3/9] usb: separate out sysdev pointer from usb_bus
Hi,
Quoted 45 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices.
The idea here is that you pass in the parent
of_nodealong with the child device pointer, so it would behave exactly like the parent already does. The difference is that it also handles all the other attributes besides the mask.sysdev will represent the physical device, as seen from firmware or bus.Splitting the
usb_bus->controllerfield into the Linux-internal device (used for the sysfs hierarchy, for printks and for power management) and a new pointer (used for DMA, DT enumeration and phy lookup) probably covers all that we really need.Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Brian Norris <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Tested-by Vivek Gautam <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Cc Felipe Balbi <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Sinjan Kumar <[email protected]>Cc David Fisher <[email protected]>Cc Catalin Marinas <[email protected]>Cc "Thang Q. Nguyen" <[email protected]>Cc Yoshihiro Shimoda <[email protected]>Cc Stephen Boyd <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Ming Lei <[email protected]>Cc Jon Masters <[email protected]>Cc Dann Frazier <[email protected]>Cc Peter Chen <[email protected]>Cc Leo Li <[email protected]>--- drivers/usb/core/buffer.c | 12 ++++++------ drivers/usb/core/hcd.c | 48 ++++++++++++++++++++++++++++------------------- drivers/usb/core/usb.c | 18 +++++++++--------- include/linux/usb.h | 1 + include/linux/usb/hcd.h | 3 +++ 5 files changed, 48 insertions(+), 34 deletions(-)
[snip]
drivers/usb/core/hcd.c static void init_giveback_urb_bh(struct giveback_urb_bh *bh) · line 2514
Quoted 4 lines
drivers/usb/core/hcd.c +0
-0@@ -2511,8 +2512,8 @@ static void init_giveback_urb_bh(struct giveback_urb_bh *bh)* Return: On success, a pointer to the created and initialized HCD structure. * On failure (e.g. if memory is unavailable), %NULL. */
sorry for the noise, but a minor nit here.
The comments section above explains usb_create_shared_hcd() method and so should be moved down to its place.
Quoted 21 lines
drivers/usb/core/hcd.c +4
-3-struct usb_hcd *usb_create_shared_hcd (const struct hc_driver *driver, -struct device *dev,const char *bus_name, +struct usb_hcd *__usb_create_hcd (const struct hc_driver *driver, +struct device *sysdev,struct device *dev,const char *bus_name,struct usb_hcd *primary_hcd) {struct usb_hcd *hcd;@@ -2553,8 +2554,9 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,usb_bus_init (&hcd->self); hcd->self.controller = dev; + hcd->self.sysdev = sysdev; hcd->self.bus_name = bus_name; - hcd->self.uses_dma = (dev->dma_mask !=NULL ); + hcd->self.uses_dma = (sysdev->dma_mask !=NULL );init_timer (&hcd->rh_timer); hcd->rh_timer.function = rh_timer_func;@@ -2569,6 +2571,14 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,"USB Host Controller" ;return hcd;
drivers/usb/core/hcd.c struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver, · line 2582
Quoted 10 lines
drivers/usb/core/hcd.c +8
-0} +EXPORT_SYMBOL_GPL (__usb_create_hcd); + +struct usb_hcd *usb_create_shared_hcd (const struct hc_driver *driver, +struct device *dev,const char *bus_name, +struct usb_hcd *primary_hcd) +{ +return __usb_create_hcd (driver, dev, dev, bus_name, primary_hcd); +}EXPORT_SYMBOL_GPL (usb_create_shared_hcd);
Regards
Vivek
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v12 3/9 usb: separate out sysdev pointer from usb_bus
Quoted 51 lines · Vivek Gautam
Hi,
Quoted 45 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices.
The idea here is that you pass in the parent
of_nodealong with the child device pointer, so it would behave exactly like the parent already does. The difference is that it also handles all the other attributes besides the mask.sysdev will represent the physical device, as seen from firmware or bus.Splitting the
usb_bus->controllerfield into the Linux-internal device (used for the sysfs hierarchy, for printks and for power management) and a new pointer (used for DMA, DT enumeration and phy lookup) probably covers all that we really need.Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Brian Norris <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Tested-by Vivek Gautam <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Cc Felipe Balbi <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Sinjan Kumar <[email protected]>Cc David Fisher <[email protected]>Cc Catalin Marinas <[email protected]>Cc "Thang Q. Nguyen" <[email protected]>Cc Yoshihiro Shimoda <[email protected]>Cc Stephen Boyd <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Ming Lei <[email protected]>Cc Jon Masters <[email protected]>Cc Dann Frazier <[email protected]>Cc Peter Chen <[email protected]>Cc Leo Li <[email protected]>--- drivers/usb/core/buffer.c | 12 ++++++------ drivers/usb/core/hcd.c | 48 ++++++++++++++++++++++++++++------------------- drivers/usb/core/usb.c | 18 +++++++++--------- include/linux/usb.h | 1 + include/linux/usb/hcd.h | 3 +++ 5 files changed, 48 insertions(+), 34 deletions(-)[snip]
Quoted 8 lines
drivers/usb/core/hcd.c static void init_giveback_urb_bh(struct giveback_urb_bh *bh) · line 2514
Quoted 4 lines
drivers/usb/core/hcd.c +0
-0@@ -2511,8 +2512,8 @@ static void init_giveback_urb_bh(struct giveback_urb_bh *bh)* Return: On success, a pointer to the created and initialized HCD structure. * On failure (e.g. if memory is unavailable), %NULL. */ sorry for the noise, but a minor nit here.
The comments section above explainsusb_create_shared_hcd()method and so should be moved down to its place.
Will update it at v13
Quoted 45 lines
Quoted 22 lines
drivers/usb/core/hcd.c +4
-3-struct usb_hcd *usb_create_shared_hcd (const struct hc_driver *driver, -struct device *dev,const char *bus_name, +struct usb_hcd *__usb_create_hcd (const struct hc_driver *driver, +struct device *sysdev,struct device *dev,const char *bus_name,struct usb_hcd *primary_hcd) {struct usb_hcd *hcd;@@ -2553,8 +2554,9 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,usb_bus_init (&hcd->self); hcd->self.controller = dev; + hcd->self.sysdev = sysdev; hcd->self.bus_name = bus_name; - hcd->self.uses_dma = (dev->dma_mask !=NULL ); + hcd->self.uses_dma = (sysdev->dma_mask !=NULL );init_timer (&hcd->rh_timer); hcd->rh_timer.function = rh_timer_func;@@ -2569,6 +2571,14 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,"USB Host Controller" ;return hcd;drivers/usb/core/hcd.c struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver, · line 2582
Quoted 10 lines
drivers/usb/core/hcd.c +8
-0} +EXPORT_SYMBOL_GPL (__usb_create_hcd); + +struct usb_hcd *usb_create_shared_hcd (const struct hc_driver *driver, +struct device *dev,const char *bus_name, +struct usb_hcd *primary_hcd) +{ +return __usb_create_hcd (driver, dev, dev, bus_name, primary_hcd); +}EXPORT_SYMBOL_GPL (usb_create_shared_hcd);Regards
VivekSignature · 7 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Best Regards, Peter Chen
PATCH v12 4/9 usb: chipidea: use bus->sysdev for DMA configuration
In reply to Peter ChenFrom: Arnd Bergmann <[email protected]>
Set the dma for chipidea from sysdev. This is inherited from its parent node. Also, do not set dma mask for child as it is not required now.
--- drivers/usb/chipidea/core.c | 3 --- drivers/usb/chipidea/host.c | 3 ++- drivers/usb/chipidea/udc.c | 10 ++++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/chipidea/core.c +0 -3
@@ -783,9 +783,6 @@ struct platform_device *ci_hdrc_add_device(struct device *dev, } pdev->dev.parent = dev; - pdev->dev.dma_mask = dev->dma_mask; - pdev->dev.dma_parms = dev->dma_parms; -dma_set_coherent_mask (&pdev->dev, dev->coherent_dma_mask); ret =platform_device_add_resources (pdev, res, nres);if (ret)
drivers/usb/chipidea/host.c +2 -1
@@ -123,7 +123,8 @@ static int host_start(struct ci_hdrc *ci)if (usb_disabled ())return -ENODEV ; - hcd =usb_create_hcd (&ci_ehci_hc_driver, ci->dev,dev_name (ci->dev)); + hcd =__usb_create_hcd (&ci_ehci_hc_driver, ci->dev->parent, + ci->dev,dev_name (ci->dev),NULL );if (!hcd)return -ENOMEM ;
drivers/usb/chipidea/udc.c +6 -4
@@ -423,7 +423,8 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) hwreq->req.status = -EALREADY ; - ret =usb_gadget_map_request (&ci->gadget, &hwreq->req, hwep->dir); + ret =usb_gadget_map_request_by_dev (ci->dev->parent, + &hwreq->req, hwep->dir);if (ret)return ret;
@@ -603,7 +604,8 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)list_del_init (&node->td); } -usb_gadget_unmap_request (&hwep->ci->gadget, &hwreq->req, hwep->dir); +usb_gadget_unmap_request_by_dev (hwep->ci->dev->parent, + &hwreq->req, hwep->dir); hwreq->req.actual += actual;
@@ -1899,13 +1901,13 @@ static int udc_start(struct ci_hdrc *ci)INIT_LIST_HEAD (&ci->gadget.ep_list);/* alloc resources */ - ci->qh_pool =dma_pool_create ("ci_hw_qh" , dev, + ci->qh_pool =dma_pool_create ("ci_hw_qh" , dev->parent,sizeof (struct ci_hw_qh ),64 ,CI_HDRC_PAGE_SIZE );if (ci->qh_pool ==NULL )return -ENOMEM ; - ci->td_pool =dma_pool_create ("ci_hw_td" , dev, + ci->td_pool =dma_pool_create ("ci_hw_td" , dev->parent,sizeof (struct ci_hw_td ),64 ,CI_HDRC_PAGE_SIZE );if (ci->td_pool ==NULL ) {
Signature · 1 line
2.7.4
PATCH v12 5/9 usb: ehci: fsl: use bus->sysdev for DMA configuration
In reply to Peter ChenFrom: Arnd Bergmann <[email protected]>
For the dual role ehci fsl driver, sysdev will handle the dma config.
--- drivers/usb/host/ehci-fsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-fsl.c +2 -2
@@ -96,8 +96,8 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev) } irq = res->start; - hcd =usb_create_hcd (&fsl_ehci_hc_driver, &pdev->dev, -dev_name (&pdev->dev)); + hcd =__usb_create_hcd (&fsl_ehci_hc_driver, pdev->dev.parent, + &pdev->dev,dev_name (&pdev->dev),NULL );if (!hcd) { retval = -ENOMEM ; goto err1;
Signature · 1 line
2.7.4
PATCH v12 6/9 usb: xhci: use bus->sysdev for DMA configuration
In reply to Peter ChenFrom: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
--- drivers/usb/host/xhci-mem.c | 12 ++++++------ drivers/usb/host/xhci-plat.c | 33 ++++++++++++++++++++++++++------- drivers/usb/host/xhci.c | 15 +++++++++++---- 3 files changed, 43 insertions(+), 17 deletions(-)
drivers/usb/host/xhci-mem.c +6 -6
@@ -586,7 +586,7 @@ static void xhci_free_stream_ctx(struct xhci_hcd *xhci,unsigned int num_stream_ctxs, struct xhci_stream_ctx *stream_ctx, dma_addr_t dma) { - struct device *dev = xhci_to_hcd(xhci)->self.controller; + struct device *dev = xhci_to_hcd(xhci)->self.sysdev;size_t size =sizeof (struct xhci_stream_ctx ) * num_stream_ctxs;if (size >MEDIUM_STREAM_ARRAY_SIZE )
@@ -614,7 +614,7 @@ static struct xhci_stream_ctx *xhci_alloc_stream_ctx(struct xhci_hcd *xhci, unsigned int num_stream_ctxs, dma_addr_t *dma, gfp_t mem_flags) { - struct device *dev = xhci_to_hcd(xhci)->self.controller; + struct device *dev = xhci_to_hcd(xhci)->self.sysdev;size_t size =sizeof (struct xhci_stream_ctx ) * num_stream_ctxs;if (size >MEDIUM_STREAM_ARRAY_SIZE )
@@ -1686,7 +1686,7 @@ void xhci_slot_copy(struct xhci_hcd *xhci,static int scratchpad_alloc (struct xhci_hcd *xhci,gfp_t flags) {int i; -struct device *dev =xhci_to_hcd (xhci)->self.controller; +struct device *dev =xhci_to_hcd (xhci)->self.sysdev;int num_sp =HCS_MAX_SCRATCHPAD (xhci->hcs_params2); xhci_dbg_trace(xhci, trace_xhci_dbg_init,
@@ -1758,7 +1758,7 @@ static void scratchpad_free(struct xhci_hcd *xhci) {int num_sp;int i; -struct device *dev =xhci_to_hcd (xhci)->self.controller; +struct device *dev =xhci_to_hcd (xhci)->self.sysdev;if (!xhci->scratchpad)return ;
@@ -1831,7 +1831,7 @@ void xhci_free_command(struct xhci_hcd *xhci,void xhci_mem_cleanup (struct xhci_hcd *xhci) { -struct device *dev =xhci_to_hcd (xhci)->self.controller; +struct device *dev =xhci_to_hcd (xhci)->self.sysdev;int size;int i, j, num_ports;
@@ -2373,7 +2373,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)int xhci_mem_init (struct xhci_hcd *xhci,gfp_t flags) {dma_addr_t dma; -struct device *dev =xhci_to_hcd (xhci)->self.controller; +struct device *dev =xhci_to_hcd (xhci)->self.sysdev;unsigned int val, val2;u64 val_64;struct xhci_segment *seg;
drivers/usb/host/xhci-plat.c +26 -7
@@ -14,6 +14,7 @@#include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/module.h> +#include <linux/pci.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/usb/phy.h>
@@ -148,6 +149,7 @@ static int xhci_plat_probe(struct platform_device *pdev) {const struct of_device_id *match;const struct hc_driver *driver; +struct device *sysdev;struct xhci_hcd *xhci;struct resource *res;struct usb_hcd *hcd;
@@ -164,22 +166,39 @@ static int xhci_plat_probe(struct platform_device *pdev)if (irq <0 )return -ENODEV ; +/* +* sysdev must point to a device that is known to the system firmware +* or PCI hardware. We handle these three cases here: +* 1. xhci_plat comes from firmware +* 2. xhci_plat is child of a device from firmware (dwc3-plat) +* 3. xhci_plat is grandchild of a pci device (dwc3-pci) +*/ + sysdev = &pdev->dev; +if (sysdev->parent && !sysdev->of_node && sysdev->parent->of_node) + sysdev = sysdev->parent; +#ifdef CONFIG_PCI + else if (sysdev->parent && sysdev->parent->parent && + sysdev->parent->parent->bus == &pci_bus_type) + sysdev = sysdev->parent->parent; +#endif +/* Try to set 64-bit DMA first */ -if (!pdev->dev.dma_mask) +if (WARN_ON (!sysdev->dma_mask))/* Platform did not initialize dma_mask */ - ret =dma_coerce_mask_and_coherent (&pdev->dev, + ret =dma_coerce_mask_and_coherent (sysdev,DMA_BIT_MASK (64 ));else - ret =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )); + ret =dma_set_mask_and_coherent (sysdev,DMA_BIT_MASK (64 ));/* If seting 64-bit DMA mask fails, fall back to 32-bit DMA mask */ if (ret) { - ret =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); + ret =dma_set_mask_and_coherent (sysdev,DMA_BIT_MASK (32 ));if (ret)return ret; } - hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );if (!hcd)return -ENOMEM ;
@@ -229,13 +248,13 @@ static int xhci_plat_probe(struct platform_device *pdev) goto disable_clk; } -if (device_property_read_bool (&pdev->dev,"usb3-lpm-capable" )) +if (device_property_read_bool (sysdev,"usb3-lpm-capable" )) xhci->quirks |=XHCI_LPM_SUPPORT ;if (device_property_read_bool (&pdev->dev,"quirk-broken-port-ped" )) xhci->quirks |=XHCI_BROKEN_PORT_PED ; - hcd->usb_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,0 ); + hcd->usb_phy =devm_usb_get_phy_by_phandle (sysdev,"usb-phy" ,0 );if (IS_ERR (hcd->usb_phy)) { ret =PTR_ERR (hcd->usb_phy);if (ret == -EPROBE_DEFER )
drivers/usb/host/xhci.c +11 -4
@@ -237,6 +237,9 @@ static int xhci_free_msi(struct xhci_hcd *xhci)static int xhci_setup_msi (struct xhci_hcd *xhci) {int ret; +/* +* TODO:Check with MSI Soc for sysdev +*/ struct pci_dev *pdev =to_pci_dev (xhci_to_hcd (xhci)->self.controller); ret =pci_enable_msi (pdev);
@@ -263,7 +266,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)*/ static void xhci_free_irq (struct xhci_hcd *xhci) { -struct pci_dev *pdev =to_pci_dev (xhci_to_hcd (xhci)->self.controller); +struct pci_dev *pdev =to_pci_dev (xhci_to_hcd (xhci)->self.sysdev);int ret;/* return if using legacy interrupt */
@@ -748,7 +751,7 @@ void xhci_shutdown(struct usb_hcd *hcd)struct xhci_hcd *xhci =hcd_to_xhci (hcd);if (xhci->quirks &XHCI_SPURIOUS_REBOOT ) -usb_disable_xhci_ports (to_pci_dev (hcd->self.controller)); +usb_disable_xhci_ports (to_pci_dev (hcd->self.sysdev));spin_lock_irq (&xhci->lock);xhci_halt (xhci);
@@ -765,7 +768,7 @@ void xhci_shutdown(struct usb_hcd *hcd)/* Yet another workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -pci_set_power_state (to_pci_dev (hcd->self.controller), PCI_D3hot); +pci_set_power_state (to_pci_dev (hcd->self.sysdev), PCI_D3hot); }#ifdef CONFIG_PM
@@ -4801,7 +4804,11 @@ int xhci_get_frame(struct usb_hcd *hcd)int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks) {struct xhci_hcd *xhci; -struct device *dev = hcd->self.controller; +/* +* TODO: Check with DWC3 clients for sysdev according to +* quirks +*/ +struct device *dev = hcd->self.sysdev;int retval;/* Accept arbitrarily long scatter-gather lists */
Signature · 1 line
2.7.4
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Hi,
Quoted 7 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
This patch doesn't work for me anymore on db820c target [1]. While the same kernel with reverts of patches [2] [3] and an older patch [4] by Grygorii Strashko works [5].
[1] https://github.com/vivekgautam1/linux/tree/linux-v4.10-rc7-usb-db820c-nonworking
[2] 8c9f2de459c7 usb: dwc3: Do not set dma coherent mask
[3] d64ff406e51e usb: dwc3: use bus->sysdev for DMA configuration
[4] https://lkml.org/lkml/2016/4/25/813
[5] https://github.com/vivekgautam1/linux/tree/linux-v4.10-rc7-usb-db820c
regards
Vivek
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 23 lines · Vivek Gautam
Hi,
Quoted 7 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
This patch doesn't work for me anymore on db820c target [1]. While the same kernel with reverts of patches [2] [3] and an older patch [4] by Grygorii Strashko works [5].
Quoted 7 lines
[1] https://github.com/vivekgautam1/linux/tree/linux-v4.10-rc7-usb-db820c-nonworking
[2]8c9f2de459c7usb: dwc3: Do not set dma coherent mask
[3]d64ff406e51eusb: dwc3: usebus->sysdevfor DMA configuration
[4] https://lkml.org/lkml/2016/4/25/813
[5] https://github.com/vivekgautam1/linux/tree/linux-v4.10-rc7-usb-db820c
The [2] and [3] have already at mainline, you may talk with Felipe about it.
Signature · 2 lines
Best Regards, Peter Chen
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
In reply to Peter ChenHi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0
drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );
As mentioned already in [1], usb_create_shared_hcd() is called to create the second bus, however it also needs to be converted.
Not exactly as Roger's suggestion but this worked for me:
- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,
+ xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
dev_name(&pdev->dev), hcd);
if (!xhci->shared_hcd) {
ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>
Thanks,
Jack
[1] https://lkml.org/lkml/2016/12/9/240
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 49 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd); if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>
Quoted 3 lines
Thanks,
Jack
Do you work at same platform with Vivek Gautam? I see his tested-by tag in this patch.
I have no dwc3 platform to test, I only got patches from [1], and rebase to Greg's usb-next, the rebase has a conflict, and I made a
change which is similar to revert below patch, but it is definitely not your problem.
commit 488dc164914ff5ce5e913abd32048d28fc0d06b8
Author: Mathias Nyman <[email protected]> Date: Fri Jan 20 15:38:24 2017 +0200
xhci: remove WARN_ON if dma mask is not set for platform devices
[1] http://www.spinics.net/lists/linux-usb/msg152375.html
Signature · 2 lines
Best Regards, Peter Chen
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 50 lines · Peter Chen
Quoted 49 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd); if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>
Quoted 6 lines
Quoted 3 lines
Thanks,
JackDo you work at same platform with Vivek Gautam? I see his tested-by tag in this patch.
The patches [1] had worked for me on 4.9-rc4.
But with
(a) usb-next merged on 4.10-rc7
(b) this patch and [PATCH 3/9] in this series:
[PATCH v12 3/9] usb: separate out sysdev pointer from usb_bus
and,
(c) phy patches for msm8996 [2] along with necessary device tree patches I get a hang when SuperSpeed device is being enumerated on db820c.
The change above suggested by Jack works for me too, and i hope that's the right way to do things.
I can give a Tested-by again with the changes for shared_hcd in the next version.
[1] https://lkml.org/lkml/2016/11/17/339
[2] https://lkml.org/lkml/2017/1/10/225
Quoted 23 lines
I have no dwc3 platform to test, I only got patches from [1], and rebase to Greg's usb-next, the rebase has a conflict, and I made a
change which is similar to revert below patch, but it is definitely not your problem.commit
488dc164914ff5ce5e913abd32048d28fc0d06b8Author: Mathias Nyman <[email protected]> Date: Fri Jan 20 15:38:24 2017 +0200xhci: remove
WARN_ONif dma mask is not set for platform devices[1] http://www.spinics.net/lists/linux-usb/msg152375.html
--
Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
In reply to Jack PhamQuoted 31 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.Not exactly as Roger's suggestion but this worked for me:
Review
Quoted 3 lines
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd);
But we're creating a shared_hcd and there is an API for that so why not use it instead of calling __usb_create_hcd()?
Quoted 20 lines
if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>Thanks,
Jack
Signature · 2 lines
cheers, -roger
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 32 lines · Roger Quadros
Quoted 29 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.
Quoted 9 lines
Review
Quoted 5 lines
Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd);But we're creating a
shared_hcdand there is an API for that so why not use it instead of calling__usb_create_hcd()?
Just realized after I pressed send that there is no sysdev parameter for create_shared_hcd().
Quoted 21 lines
Quoted 20 lines
if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>Thanks,
Jack
Signature · 2 lines
cheers, -roger
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 41 lines · Roger Quadros
Quoted 38 lines · Roger Quadros
Quoted 34 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd);
Quoted 6 lines
Quoted 3 lines
But we're creating a
shared_hcdand there is an API for that so why not use it instead of calling__usb_create_hcd()?Just realized after I pressed send that there is no sysdev parameter for
create_shared_hcd().
That's right. The create_shared_hcd() makes use of only pdev->dev, and we need to configure dma for shared_hcd as well though sysdev.
Sorry my mail client didn't show this mail in time. Please ignore my earlier comment.
Quoted 30 lines
Quoted 16 lines
Quoted 16 lines
if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>Quoted 6 lines
Quoted 5 lines
Thanks,
Jack--
cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
Quoted 42 lines · Vivek Gautam
Quoted 41 lines · Roger Quadros
Quoted 38 lines · Roger Quadros
Quoted 34 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd);
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
But we're creating a
shared_hcdand there is an API for that so why not use it instead of calling__usb_create_hcd()?Just realized after I pressed send that there is no sysdev parameter for
create_shared_hcd().
Roger, does this change also work for you? If it is, please add a tested-by tag for my v13 patch set.
Signature · 2 lines
Best Regards, Peter Chen
Re: [PATCH v12 6/9] usb: xhci: use bus->sysdev for DMA configuration
In reply to Roger QuadrosQuoted 32 lines · Roger Quadros
Quoted 29 lines · Jack Pham
Hi Peter, Sriram, Arnd,
Quoted 18 lines · Peter Chen
From: Arnd Bergmann <[email protected]>
For xhci-hcd platform device, all the DMA parameters are not configured properly, notably dma ops for dwc3 devices. So, set the dma for xhci from sysdev. sysdev is pointing to device that is known to the system firmware or hardware.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Sriram Dash <[email protected]>Tested-by Baolin Wang <[email protected]>Tested-by Vivek Gautam <[email protected]>Tested-by Alexander Sverdlin <[email protected]>Signed-off-by Mathias Nyman <[email protected]>---
drivers/usb/host/xhci-plat.c +0
-0drivers/usb/host/xhci-plat.c static int xhci_plat_probe(struct platform_device *pdev) · line 201
Quoted 4 lines
drivers/usb/host/xhci-plat.c +2
-1- hcd =usb_create_hcd (driver, &pdev->dev,dev_name (&pdev->dev)); + hcd =__usb_create_hcd (driver, sysdev, &pdev->dev, +dev_name (&pdev->dev),NULL );As mentioned already in [1],
usb_create_shared_hcd()is called to create the second bus, however it also needs to be converted.
Quoted 8 lines
Review
Quoted 5 lines
Not exactly as Roger's suggestion but this worked for me:
(quoted diff) +1
-1- xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev, dev_name(&pdev->dev), hcd);But we're creating a
shared_hcdand there is an API for that so why not use it instead of calling__usb_create_hcd()?
Do we not want to pass on the DMA configuration from sysdev to shared_hcd as well?
Quoted 29 lines
Quoted 16 lines
if (!xhci->shared_hcd) { ret = -ENOMEM;Without this, SuperSpeed devices fail to enumerate:
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 2 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
usb 2-1: new SuperSpeed USB device number 3 using xhci-hcd usb 2-1: device descriptor read/8, error -11
<and continues...>Quoted 5 lines
Thanks,
Jack--
cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v12 7/9 usb: ehci: use bus->sysdev for DMA configuration
In reply to Peter ChenSet the dma for ehci from sysdev. The sysdev is pointing to device that is known to the system firmware or hardware.
--- drivers/usb/host/ehci-mem.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/usb/host/ehci-mem.c +19 -19
@@ -46,21 +46,21 @@ static inline void ehci_qtd_init(struct ehci_hcd *ehci, struct ehci_qtd *qtd,INIT_LIST_HEAD (&qtd->qtd_list); } -static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci,gfp_t flags) +static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci,gfp_t flags) {struct ehci_qtd *qtd;dma_addr_t dma; - qtd =dma_pool_alloc (ehci->qtd_pool, flags, &dma); + qtd =dma_pool_alloc (ehci->qtd_pool, flags, &dma);if (qtd !=NULL ) {ehci_qtd_init (ehci, qtd, dma); }return qtd; } -static inline void ehci_qtd_free (struct ehci_hcd *ehci,struct ehci_qtd *qtd) +static inline void ehci_qtd_free (struct ehci_hcd *ehci,struct ehci_qtd *qtd) { -dma_pool_free (ehci->qtd_pool, qtd, qtd->qtd_dma); +dma_pool_free (ehci->qtd_pool, qtd, qtd->qtd_dma); }
@@ -72,12 +72,12 @@ static void qh_destroy(struct ehci_hcd *ehci, struct ehci_qh *qh)BUG (); }if (qh->dummy) -ehci_qtd_free (ehci, qh->dummy); +ehci_qtd_free (ehci, qh->dummy);dma_pool_free (ehci->qh_pool, qh->hw, qh->qh_dma);kfree (qh); } -static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci,gfp_t flags) +static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci,gfp_t flags) {struct ehci_qh *qh;dma_addr_t dma;
@@ -96,7 +96,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)INIT_LIST_HEAD (&qh->unlink_node);/* dummy td enables safe urb queuing */ - qh->dummy =ehci_qtd_alloc (ehci, flags); + qh->dummy =ehci_qtd_alloc (ehci, flags);if (qh->dummy ==NULL ) {ehci_dbg (ehci,"no dummy td\n" ); goto fail1;
@@ -117,7 +117,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)* This is the initialisation and cleanup code. */ -static void ehci_mem_cleanup (struct ehci_hcd *ehci) +static void ehci_mem_cleanup (struct ehci_hcd *ehci) {if (ehci->async)qh_destroy (ehci, ehci->async);
@@ -138,7 +138,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci) ehci->sitd_pool =NULL ;if (ehci->periodic) -dma_free_coherent (ehci_to_hcd (ehci)->self.controller, +dma_free_coherent (ehci_to_hcd (ehci)->self.sysdev, ehci->periodic_size *sizeof (u32), ehci->periodic, ehci->periodic_dma); ehci->periodic =NULL ;
@@ -154,8 +154,8 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)int i;/* QTDs for control/bulk/intr transfers */ - ehci->qtd_pool =dma_pool_create ("ehci_qtd" , -ehci_to_hcd (ehci)->self.controller, + ehci->qtd_pool =dma_pool_create ("ehci_qtd" , +ehci_to_hcd (ehci)->self.sysdev,sizeof (struct ehci_qtd ),32 /* byte alignment (for hw parts) */ ,4096 /* can't cross 4K */ );
@@ -164,22 +164,22 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags) }/* QHs for control/bulk/intr transfers */ - ehci->qh_pool =dma_pool_create ("ehci_qh" , -ehci_to_hcd (ehci)->self.controller, + ehci->qh_pool =dma_pool_create ("ehci_qh" , +ehci_to_hcd (ehci)->self.sysdev,sizeof (struct ehci_qh_hw ),32 /* byte alignment (for hw parts) */ ,4096 /* can't cross 4K */ );if (!ehci->qh_pool) { goto fail; } - ehci->async =ehci_qh_alloc (ehci, flags); + ehci->async =ehci_qh_alloc (ehci, flags);if (!ehci->async) { goto fail; }/* ITD for high speed ISO transfers */ - ehci->itd_pool =dma_pool_create ("ehci_itd" , -ehci_to_hcd (ehci)->self.controller, + ehci->itd_pool =dma_pool_create ("ehci_itd" , +ehci_to_hcd (ehci)->self.sysdev,sizeof (struct ehci_itd ),32 /* byte alignment (for hw parts) */ ,4096 /* can't cross 4K */ );
@@ -188,8 +188,8 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags) }/* SITD for full/low speed split ISO transfers */ - ehci->sitd_pool =dma_pool_create ("ehci_sitd" , -ehci_to_hcd (ehci)->self.controller, + ehci->sitd_pool =dma_pool_create ("ehci_sitd" , +ehci_to_hcd (ehci)->self.sysdev,sizeof (struct ehci_sitd ),32 /* byte alignment (for hw parts) */ ,4096 /* can't cross 4K */ );
@@ -199,7 +199,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)/* Hardware periodic table */ ehci->periodic = (__le32 *) -dma_alloc_coherent (ehci_to_hcd (ehci)->self.controller, +dma_alloc_coherent (ehci_to_hcd (ehci)->self.sysdev, ehci->periodic_size *sizeof (__le32), &ehci->periodic_dma, flags);if (ehci->periodic ==NULL ) {
Signature · 1 line
2.7.4
PATCH v12 8/9 binding-doc: usb: usb-device: add optional properties for power sequence
In reply to Peter ChenAdd optional properties for power sequence.
--- Documentation/devicetree/bindings/usb/usb-device.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-device.txt +9 -1
@@ -13,6 +13,10 @@ Required properties: - reg: the port number which this device is connecting to, the range is 1-31. +Optional properties: +power sequence properties, see +Documentation/devicetree/bindings/power/pwrseq/pwrseq-generic.txt for detail + Example: &usb1 {
@@ -21,8 +25,12 @@ Example: #address-cells = <1>; #size-cells = <0>; - hub: genesys at 1 { + genesys: hub at 1 { compatible = "usb5e3,608"; reg = <1>; + + clocks = <&clks IMX6SX_CLK_CKO>; + reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* hub reset pin */ + reset-duration-us = <10>; }; }
Signature · 1 line
2.7.4
PATCH v12 9/9 usb: core: add power sequence handling for USB devices
In reply to Peter ChenSome hard-wired USB devices need to do power sequence to let the device work normally, the typical power sequence like: enable USB PHY clock, toggle reset pin, etc. But current Linux USB driver lacks of such code to do it, it may cause some hard-wired USB devices works abnormal or can't be recognized by controller at all.
In this patch, it calls power sequence library APIs to finish the power sequence events. It will do power on sequence at hub's probe for all devices under this hub (includes root hub). At hub_disconnect, it will do power off sequence which is at powered on list.
Tested-by Joshua Clayton <[email protected]>
--- drivers/usb/Kconfig | 1 + drivers/usb/core/hub.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- drivers/usb/core/hub.h | 1 + 3 files changed, 47 insertions(+), 4 deletions(-)
drivers/usb/Kconfig +1 -0
@@ -40,6 +40,7 @@ config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD select USB_COMMON + select POWER_SEQUENCE select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial bus
drivers/usb/core/hub.c +45 -4
100 lines not on this page · raw message
drivers/usb/core/hub.h +1 -0
@@ -78,6 +78,7 @@ struct usb_hub {struct delayed_work init_work;struct work_struct events;struct usb_port **ports; +struct list_head pwrseq_on_list;/* powered pwrseq node list */ };/**
Signature · 1 line
2.7.4