usb: dwc2: Add support for dual-role
Subsystems (2)
v5 cover usb: dwc2: Add support for dual-role
From: Dinh Nguyen <[email protected]>
Hello,
This is version 5 of the patch series that combines the dwc2 gadget and host driver into a single dual role driver. Here are the main differences from V4:
- Squashed 5 patches from V4 into patch 2. Patchset is now only 7 patches.
- Makefile moved to be the last patch in the series.
- When building for kernel modules, dwc2.ko will get built for all modes(host, gadget, and dual-role). dwc2_platform.ko and dwc2_pci.ko will get built for platform SOC and PCI.
For v5, the series is rebased on top of v3.18-rc1.
As usual, tested on SOCFPGA(host, gadget, and dual-role) and on Rpi-B (host mode only).
I have pushed this series to a git repo to make it more convenient for people to test/review.
git://git.rocketboards.org/linux-socfpga-next.git dwc2_dual_role_v5
Thanks,
Dinh Nguyen (7):
usb: dwc2: Update the gadget driver to use common dwc2_hsotg structure
usb: dwc2: Move gadget probe function into platform code
usb: dwc2: Initialize the USB core for peripheral mode
usb: dwc2: Update common interrupt handler to call gadget interrupt
handler
usb: dwc2: Add call_gadget functions for perpheral mode interrupts
usb: dwc2: gadget: Do not fail probe if there isn't a clock node
usb: dwc2: Update Kconfig to support dual-role
drivers/usb/dwc2/Kconfig | 61 ++++++---- drivers/usb/dwc2/Makefile | 32 ++--- drivers/usb/dwc2/core.c | 10 -- drivers/usb/dwc2/core.h | 192 +++++++++++++++++------------ drivers/usb/dwc2/core_intr.c | 16 ++- drivers/usb/dwc2/gadget.c | 283 +++++++++++++------------------------------ drivers/usb/dwc2/hcd.c | 3 +- drivers/usb/dwc2/hcd.h | 10 -- drivers/usb/dwc2/pci.c | 7 ++ drivers/usb/dwc2/platform.c | 52 ++++++++ 10 files changed, 331 insertions(+), 335 deletions(-)
Signature · 1 line
2.0.3
PATCH v5 1/7 usb: dwc2: Update the gadget driver to use common dwc2_hsotg structure
From: Dinh Nguyen <[email protected]>
Adds the gadget data structure and appropriate data structure pointers to the common dwc2_hsotg data structure. To keep the driver data dereference code looking clean, the gadget variable declares are only available for peripheral and dual-role mode. This is needed so that the dwc2_hsotg data structure can be used by the hcd and gadget drivers.
Updates gadget.c to use the dwc2_hsotg data structure and gadget pointers that have been moved into the common dwc2_hsotg structure.
---
v5: Keep the changes to mininum and maintain hcd and gadget driver to build
and work separately. Use IS_ENABLED() instead of #if defined
v3: Updated with paulz's suggestion to avoid double pointers.
v2: Left the function parameter name as 'hsotg' and just changed its type.
--- drivers/usb/dwc2/core.h | 156 ++++++++++++++++++++++++---------------------- drivers/usb/dwc2/gadget.c | 147 +++++++++++++++++++++---------------------- 2 files changed, 155 insertions(+), 148 deletions(-)
drivers/usb/dwc2/core.h +81 -75
@@ -84,7 +84,7 @@ static const char * const s3c_hsotg_supply_names[] = {*/ #define EP0_MPS_LIMIT 64 -struct s3c_hsotg ; +struct dwc2_hsotg ;struct s3c_hsotg_req ;/**
@@ -130,7 +130,7 @@ struct s3c_hsotg_req;struct s3c_hsotg_ep {struct usb_ep ep;struct list_head queue; -struct s3c_hsotg *parent; +struct dwc2_hsotg *parent;struct s3c_hsotg_req *req;struct dentry *debugfs;
@@ -155,67 +155,6 @@ struct s3c_hsotg_ep { };/** -* struct s3c_hsotg - driver state. -* @dev: The parent device supplied to the probe function -* @driver: USB gadget driver -* @phy: The otg phy transceiver structure for phy control. -* @uphy: The otg phy transceiver structure for old USB phy control. -* @plat: The platform specific configuration data. This can be removed once -* all SoCs support usb transceiver. -* @regs: The memory area mapped for accessing registers. -* @irq: The IRQ number we are using -* @supplies: Definition of USB power supplies -* @phyif: PHY interface width -* @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos. -* @num_of_eps: Number of available EPs (excluding EP0) -* @debug_root: root directrory for debugfs. -* @debug_file: main status file for debugfs. -* @debug_fifo: FIFO status file for debugfs. -* @ep0_reply: Request used for ep0 reply. -* @ep0_buff: Buffer for EP0 reply data, if needed. -* @ctrl_buff: Buffer for EP0 control requests. -* @ctrl_req: Request for EP0 control packets. -* @setup: NAK management for EP0 SETUP -* @last_rst: Time of last reset -* @eps: The endpoints being supplied to the gadget framework -*/ -struct s3c_hsotg { -struct device *dev; -struct usb_gadget_driver *driver; -struct phy *phy; -struct usb_phy *uphy; -struct s3c_hsotg_plat *plat; - -spinlock_t lock; - -void __iomem *regs; -int irq; -struct clk *clk; - -struct regulator_bulk_data supplies[ARRAY_SIZE (s3c_hsotg_supply_names)]; - -u32 phyif; -int fifo_mem; -unsigned int dedicated_fifos:1 ; -unsigned char num_of_eps; -u32 fifo_map; - -struct dentry *debug_root; -struct dentry *debug_file; -struct dentry *debug_fifo; - -struct usb_request *ep0_reply; -struct usb_request *ctrl_req; -u8 ep0_buff[8 ]; -u8 ctrl_buff[8 ]; - -struct usb_gadget gadget; -unsigned int setup; -unsigned long last_rst; -struct s3c_hsotg_ep *eps; -}; - -/** * struct s3c_hsotg_req - data transfer request * @req: The USB gadget request * @queue: The list of requests for the endpoint this is queued for.
@@ -229,6 +168,7 @@ struct s3c_hsotg_req {unsigned char mapped; }; +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE )#define call_gadget (_hs, _entry) \ do { \ if ((_hs)->gadget.speed != USB_SPEED_UNKNOWN && \
@@ -238,6 +178,9 @@ do { \ spin_lock(&_hs->lock); \ } \ } while (0) +#else +#define call_gadget (_hs, _entry) do {} while (0) +#endif struct dwc2_hsotg ;struct dwc2_host_chan ;
@@ -495,11 +438,13 @@ struct dwc2_hw_params {* struct dwc2_hsotg - Holds the state of the driver, including the non-periodic * and periodic schedules * +* These are common for both host and peripheral modes: +* * @dev: The struct device pointer * @regs: Pointer to controller regs -* @core_params: Parameters that define how the core should be configured * @hw_params: Parameters that were autodetected from the * hardware registers +* @core_params: Parameters that define how the core should be configured * @op_state: The operational State, during transitions (a_host=> * a_peripheral and b_device=>b_host) this may not match * the core, but allows the software to determine
@@ -508,6 +453,8 @@ struct dwc2_hw_params {* - USB_DR_MODE_PERIPHERAL * - USB_DR_MODE_HOST * - USB_DR_MODE_OTG +* @lock: Spinlock that protects all the driver data structures +* @priv: Stores a pointer to the struct usb_hcd * @queuing_high_bandwidth: True if multiple packets of a high-bandwidth * transfer are in process of being queued * @srp_success: Stores status of SRP request in the case of a FS PHY
@@ -517,6 +464,9 @@ struct dwc2_hw_params {* interrupt * @wkp_timer: Timer object for handling Wakeup Detected interrupt * @lx_state: Lx state of connected device +* +* These are for host mode: +* * @flags: Flags for handling root port state changes * @non_periodic_sched_inactive: Inactive QHs in the non-periodic schedule. * Transfers associated with these QHs are not currently
@@ -585,11 +535,31 @@ struct dwc2_hw_params {* @status_buf_dma: DMA address for status_buf * @start_work: Delayed work for handling host A-cable connection * @reset_work: Delayed work for handling a port reset -* @lock: Spinlock that protects all the driver data structures -* @priv: Stores a pointer to the struct usb_hcd * @otg_port: OTG port number * @frame_list: Frame list * @frame_list_dma: Frame list DMA address +* +* These are for peripheral mode: +* +* @driver: USB gadget driver +* @phy: The otg phy transceiver structure for phy control. +* @uphy: The otg phy transceiver structure for old USB phy control. +* @plat: The platform specific configuration data. This can be removed once +* all SoCs support usb transceiver. +* @supplies: Definition of USB power supplies +* @phyif: PHY interface width +* @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos. +* @num_of_eps: Number of available EPs (excluding EP0) +* @debug_root: Root directrory for debugfs. +* @debug_file: Main status file for debugfs. +* @debug_fifo: FIFO status file for debugfs. +* @ep0_reply: Request used for ep0 reply. +* @ep0_buff: Buffer for EP0 reply data, if needed. +* @ctrl_buff: Buffer for EP0 control requests. +* @ctrl_req: Request for EP0 control packets. +* @setup: NAK management for EP0 SETUP +* @last_rst: Time of last reset +* @eps: The endpoints being supplied to the gadget framework */ struct dwc2_hsotg {struct device *dev;
@@ -601,6 +571,9 @@ struct dwc2_hsotg {enum usb_otg_state op_state;enum usb_dr_mode dr_mode; +spinlock_t lock; +void *priv; + unsigned int queuing_high_bandwidth:1; unsigned int srp_success:1;
@@ -609,6 +582,14 @@ struct dwc2_hsotg {struct timer_list wkp_timer;enum dwc2_lx_state lx_state; +/* DWC OTG HW Release versions */ +#define DWC2_CORE_REV_2_71a 0x4f54271a +#define DWC2_CORE_REV_2_90a 0x4f54290a +#define DWC2_CORE_REV_2_92a 0x4f54292a +#define DWC2_CORE_REV_2_94a 0x4f54294a +#define DWC2_CORE_REV_3_00a 0x4f54300a + +#if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) union dwc2_hcd_internal_flags { u32 d32; struct {
@@ -655,19 +636,10 @@ struct dwc2_hsotg {struct delayed_work start_work;struct delayed_work reset_work; -spinlock_t lock; -void *priv;u8 otg_port;u32 *frame_list;dma_addr_t frame_list_dma; -/* DWC OTG HW Release versions */ -#define DWC2_CORE_REV_2_71a 0x4f54271a -#define DWC2_CORE_REV_2_90a 0x4f54290a -#define DWC2_CORE_REV_2_92a 0x4f54292a -#define DWC2_CORE_REV_2_94a 0x4f54294a -#define DWC2_CORE_REV_3_00a 0x4f54300a -#ifdef DEBUG u32 frrem_samples;u64 frrem_accum;
@@ -686,6 +658,40 @@ struct dwc2_hsotg {u32 hfnum_other_samples_b;u64 hfnum_other_frrem_accum_b;#endif +#endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */ + +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +/* Gadget structures */ +struct usb_gadget_driver *driver; +struct phy *phy; +struct usb_phy *uphy; +struct s3c_hsotg_plat *plat; + +int irq; +struct clk *clk; + +struct regulator_bulk_data supplies[ARRAY_SIZE (s3c_hsotg_supply_names)]; + +u32 phyif; +int fifo_mem; + unsigned int dedicated_fifos:1; +unsigned char num_of_eps; +u32 fifo_map; + +struct dentry *debug_root; +struct dentry *debug_file; +struct dentry *debug_fifo; + +struct usb_request *ep0_reply; +struct usb_request *ctrl_req; +u8 ep0_buff[8 ]; +u8 ctrl_buff[8 ]; + +struct usb_gadget gadget; +unsigned int setup; +unsigned long last_rst; +struct s3c_hsotg_ep *eps; +#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ };/* Reasons for halting a host channel */
drivers/usb/dwc2/gadget.c +74 -73
578 lines not on this page · raw message
Signature · 1 line
2.0.3
PATCH v5 2/7 usb: dwc2: Move gadget probe function into platform code
In reply to [email protected]From: Dinh Nguyen <[email protected]>
This patch will aggregate the probing of gadget/hcd driver into platform.c. The gadget probe funtion is converted into gadget_init that is now only responsible for gadget only initialization. All the gadget resources is now handled by platform.c
Since the host workqueue will not get initialized if the driver is configured for peripheral mode only. Thus we need to check for wq_otg before calling queue_work().
Also, we move spin_lock_init to common location for both host and gadget that is either in platform.c or pci.c.
We also ove suspend/resume code to common platform code, and update it to use the new PM API (struct dev_pm_ops).
Lastly, move the "samsung,s3c6400-hsotg" binding into dwc2_of_match_table.
---
v5: Reworked by squashing the following commits into this one:
* [PATCHv4 02/12] usb: dwc2: move "samsung,s3c6400-hsotg" into common platform
* [PATCHv4 03/12] usb: dwc2: Update the gadget driver to use common dwc2_hsotg structure
* [PATCHv4 09/12] usb: dwc2: initialize the spin_lock for both host and gadget
* [PATCHv4 10/12] usb: dwc2: Add suspend/resume for gadget
* [PATCHv4 11/12] usb: dwc2: check that the host work queue is valid Also use IS_ENABLED instead of #if defined
--- drivers/usb/dwc2/core.h | 34 +++++++++++++++- drivers/usb/dwc2/core_intr.c | 8 ++-- drivers/usb/dwc2/gadget.c | 97 +++++++++----------------------------------- drivers/usb/dwc2/hcd.c | 1 - drivers/usb/dwc2/hcd.h | 10 ----- drivers/usb/dwc2/pci.c | 1 + drivers/usb/dwc2/platform.c | 32 +++++++++++++++ 7 files changed, 91 insertions(+), 92 deletions(-)
drivers/usb/dwc2/core.h +33 -1
@@ -667,7 +667,6 @@ struct dwc2_hsotg {struct usb_phy *uphy;struct s3c_hsotg_plat *plat; -int irq;struct clk *clk;struct regulator_bulk_data supplies[ARRAY_SIZE (s3c_hsotg_supply_names)];
@@ -961,4 +960,37 @@ extern void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);*/ extern u16 dwc2_get_otg_version (struct dwc2_hsotg *hsotg); +/* Gadget defines */ +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +extern int s3c_hsotg_remove (struct dwc2_hsotg *hsotg); +extern int s3c_hsotg_suspend (struct dwc2_hsotg *dwc2); +extern int s3c_hsotg_resume (struct dwc2_hsotg *dwc2); +extern int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq); +#else +static inline int s3c_hsotg_remove (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int s3c_hsotg_suspend (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int s3c_hsotg_resume (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq) +{return 0 ; } +#endif + +#if IS_ENABLED (CONFIG_USB_DWC2_HOST ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +extern int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg); +extern void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg); +extern void dwc2_hcd_start (struct dwc2_hsotg *hsotg); +#else +static inline void dwc2_set_all_params (struct dwc2_core_params *params,int value) {} +static inline int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg) +{return 0 ; } +static inline void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg) {} +static inline void dwc2_hcd_start (struct dwc2_hsotg *hsotg) {} +static inline void dwc2_hcd_remove (struct dwc2_hsotg *hsotg) {} +static inline int dwc2_hcd_init (struct dwc2_hsotg *hsotg,int irq, +const struct dwc2_core_params *params) +{return 0 ; } +#endif +#endif /* __DWC2_CORE_H__ */
drivers/usb/dwc2/core_intr.c +5 -3
@@ -287,9 +287,11 @@ static void dwc2_handle_conn_id_status_change_intr(struct dwc2_hsotg *hsotg)* Release lock before scheduling workq as it holds spinlock during * scheduling. */ -spin_unlock (&hsotg->lock); -queue_work (hsotg->wq_otg, &hsotg->wf_otg); -spin_lock (&hsotg->lock); +if (hsotg->wq_otg) { +spin_unlock (&hsotg->lock); +queue_work (hsotg->wq_otg, &hsotg->wf_otg); +spin_lock (&hsotg->lock); + }/* Clear interrupt */ writel (GINTSTS_CONIDSTSCHNG , hsotg->regs +GINTSTS );
drivers/usb/dwc2/gadget.c +20 -77
183 lines not on this page · raw message
drivers/usb/dwc2/hcd.c +0 -1
@@ -2839,7 +2839,6 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, hcd->has_tt =1 ; -spin_lock_init (&hsotg->lock); ((struct wrapper_priv_data *) &hcd->hcd_priv)->hsotg = hsotg; hsotg->priv = hcd;
drivers/usb/dwc2/hcd.h +0 -10
@@ -668,9 +668,6 @@ extern irqreturn_t dwc2_handle_hcd_intr(struct dwc2_hsotg *hsotg);*/ extern void dwc2_hcd_stop (struct dwc2_hsotg *hsotg); -extern void dwc2_hcd_start (struct dwc2_hsotg *hsotg); -extern void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg); -/** * dwc2_hcd_is_b_host() - Returns 1 if core currently is acting as B host, * and 0 otherwise
@@ -680,13 +677,6 @@ extern void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg);extern int dwc2_hcd_is_b_host (struct dwc2_hsotg *hsotg);/** -* dwc2_hcd_get_frame_number() - Returns current frame number -* -* @hsotg: The DWC2 HCD -*/ -extern int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg); - -/** * dwc2_hcd_dump_state() - Dumps hsotg state * * @hsotg: The DWC2 HCD
drivers/usb/dwc2/pci.c +1 -0
@@ -141,6 +141,7 @@ static int dwc2_driver_probe(struct pci_dev *dev,pci_set_master (dev); +spin_lock_init (&hsotg->lock); retval =dwc2_hcd_init (hsotg, dev->irq, &dwc2_module_params);if (retval) {pci_disable_device (dev);
drivers/usb/dwc2/platform.c +32 -0
@@ -121,6 +121,7 @@ static int dwc2_driver_remove(struct platform_device *dev)struct dwc2_hsotg *hsotg =platform_get_drvdata (dev);dwc2_hcd_remove (hsotg); +s3c_hsotg_remove (hsotg);return 0 ; }
@@ -129,6 +130,7 @@ static const struct of_device_id dwc2_of_match_table[] = { { .compatible = "brcm,bcm2835-usb", .data = ¶ms_bcm2835 }, { .compatible = "rockchip,rk3066-usb", .data = ¶ms_rk3066 }, { .compatible = "snps,dwc2", .data = NULL }, + { .compatible = "samsung,s3c6400-hsotg", .data = NULL}, {}, };MODULE_DEVICE_TABLE (of, dwc2_of_match_table);
@@ -204,6 +206,10 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->dr_mode =of_usb_get_dr_mode (dev->dev.of_node); +spin_lock_init (&hsotg->lock); + retval =dwc2_gadget_init (hsotg, irq); +if (retval) +return retval; retval =dwc2_hcd_init (hsotg, irq, params);if (retval)return retval;
@@ -213,10 +219,36 @@ static int dwc2_driver_probe(struct platform_device *dev)return retval; } +static int dwc2_suspend (struct device *dev) +{ +struct dwc2_hsotg *dwc2 =dev_get_drvdata (dev); +int ret =0 ; + +if (dwc2_is_device_mode (dwc2)) + ret =s3c_hsotg_suspend (dwc2); +return ret; +} + +static int dwc2_resume (struct device *dev) +{ +struct dwc2_hsotg *dwc2 =dev_get_drvdata (dev); +int ret =0 ; + +if (dwc2_is_device_mode (dwc2)) + ret =s3c_hsotg_resume (dwc2); + +return ret; +} + +static const struct dev_pm_ops dwc2_dev_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (dwc2_suspend, dwc2_resume) +}; +static struct platform_driver dwc2_platform_driver = { .driver = { .name = dwc2_driver_name, .of_match_table = dwc2_of_match_table, + .pm = &dwc2_dev_pm_ops, }, .probe = dwc2_driver_probe, .remove = dwc2_driver_remove,
Signature · 1 line
2.0.3
Re: [PATCHv5 2/7] usb: dwc2: Move gadget probe function into platform code
Hi,
Quoted 11 lines · On Monday, October 20, 2014 01:52:01 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
This patch will aggregate the probing of gadget/hcd driver into
platform.c. The gadget probe funtion is converted intogadget_initthat is now only responsible for gadget only initialization. All the gadget resources is now handled byplatform.cSince the host workqueue will not get initialized if the driver is configured for peripheral mode only. Thus we need to check for
wq_otgbefore callingqueue_work().
Quoted 7 lines
Also, we move
spin_lock_initto common location for both host and gadget that is either inplatform.corpci.c.We also ove suspend/resume code to common platform code, and update it to use the new PM API (struct
dev_pm_ops).Lastly, move the "samsung,s3c6400-hsotg" binding into
dwc2_of_match_table.
This patch seems to break bisectability. It moves all the gadget probing to platform.c but Kconfig/Makefile are not updated (platform.c will be compiled only for CONFIG_USB_DWC2_PLATFORM=y which in turn depends on CONFIG_USB_DWC2_HOST). IMO patch #7 should be merged into this one (#2).
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 407 lines
Signed-off-by Dinh Nguyen <[email protected]>Acked-by Paul Zimmerman <[email protected]>---
v5: Reworked by squashing the following commits into this one:
* [PATCHv4 02/12] usb: dwc2: move "samsung,s3c6400-hsotg" into common platform
* [PATCHv4 03/12] usb: dwc2: Update the gadget driver to use commondwc2_hsotgstructure
* [PATCHv4 09/12] usb: dwc2: initialize thespin_lockfor both host and gadget
* [PATCHv4 10/12] usb: dwc2: Add suspend/resume for gadget
* [PATCHv4 11/12] usb: dwc2: check that the host work queue is valid Also useIS_ENABLEDinstead of #if defined--- drivers/usb/dwc2/core.h | 34 +++++++++++++++- drivers/usb/dwc2/core_intr.c | 8 ++-- drivers/usb/dwc2/gadget.c | 97 +++++++++----------------------------------- drivers/usb/dwc2/hcd.c | 1 - drivers/usb/dwc2/hcd.h | 10 ----- drivers/usb/dwc2/pci.c | 1 + drivers/usb/dwc2/platform.c | 32 +++++++++++++++ 7 files changed, 91 insertions(+), 92 deletions(-)drivers/usb/dwc2/core.h +33
-1@@ -667,7 +667,6 @@ struct dwc2_hsotg {struct usb_phy *uphy;struct s3c_hsotg_plat *plat; -int irq;struct clk *clk;struct regulator_bulk_data supplies[ARRAY_SIZE (s3c_hsotg_supply_names)];@@ -961,4 +960,37 @@ extern void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);*/ extern u16 dwc2_get_otg_version (struct dwc2_hsotg *hsotg); +/* Gadget defines */ +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +extern int s3c_hsotg_remove (struct dwc2_hsotg *hsotg); +extern int s3c_hsotg_suspend (struct dwc2_hsotg *dwc2); +extern int s3c_hsotg_resume (struct dwc2_hsotg *dwc2); +extern int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq); +#else +static inline int s3c_hsotg_remove (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int s3c_hsotg_suspend (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int s3c_hsotg_resume (struct dwc2_hsotg *dwc2) +{return 0 ; } +static inline int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq) +{return 0 ; } +#endif + +#if IS_ENABLED (CONFIG_USB_DWC2_HOST ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +extern int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg); +extern void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg); +extern void dwc2_hcd_start (struct dwc2_hsotg *hsotg); +#else +static inline void dwc2_set_all_params (struct dwc2_core_params *params,int value) {} +static inline int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg) +{return 0 ; } +static inline void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg) {} +static inline void dwc2_hcd_start (struct dwc2_hsotg *hsotg) {} +static inline void dwc2_hcd_remove (struct dwc2_hsotg *hsotg) {} +static inline int dwc2_hcd_init (struct dwc2_hsotg *hsotg,int irq, +const struct dwc2_core_params *params) +{return 0 ; } +#endif +#endif /* __DWC2_CORE_H__ */ drivers/usb/dwc2/core_intr.c +5
-3@@ -287,9 +287,11 @@ static void dwc2_handle_conn_id_status_change_intr(struct dwc2_hsotg *hsotg)* Release lock before scheduling workq as it holds spinlock during * scheduling. */ -spin_unlock (&hsotg->lock); -queue_work (hsotg->wq_otg, &hsotg->wf_otg); -spin_lock (&hsotg->lock); +if (hsotg->wq_otg) { +spin_unlock (&hsotg->lock); +queue_work (hsotg->wq_otg, &hsotg->wf_otg); +spin_lock (&hsotg->lock); + }/* Clear interrupt */ writel (GINTSTS_CONIDSTSCHNG , hsotg->regs +GINTSTS );drivers/usb/dwc2/gadget.c +20
-77@@ -3404,26 +3404,21 @@ static void s3c_hsotg_delete_debug(struct dwc2_hsotg *hsotg) }/** -* s3c_hsotg_probe - probe function for hsotg driver -* @pdev: The platform information for the driver +* dwc2_gadget_init - init function for gadget +* @dwc2: The data structure for the DWC2 driver. +* @irq: The IRQ number for the controller. */ -static int s3c_hsotg_probe (struct platform_device *pdev) +int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq) { -struct s3c_hsotg_plat *plat =dev_get_platdata (&pdev->dev); +struct device *dev = hsotg->dev; +struct s3c_hsotg_plat *plat = dev->platform_data;struct phy *phy;struct usb_phy *uphy; -struct device *dev = &pdev->dev;struct s3c_hsotg_ep *eps; -struct dwc2_hsotg *hsotg; -struct resource *res;int epnum;int ret;int i; - hsotg =devm_kzalloc (&pdev->dev,sizeof (struct dwc2_hsotg ),GFP_KERNEL ); -if (!hsotg) -return -ENOMEM ; -/* Set default UTMI width */ hsotg->phyif =GUSBCFG_PHYIF16 ;@@ -3431,14 +3426,14 @@ static int s3c_hsotg_probe(struct platform_device *pdev)* Attempt to find a generic PHY, then look for an old style * USB PHY, finally fall back to pdata */ - phy =devm_phy_get (&pdev->dev,"usb2-phy" ); + phy =devm_phy_get (dev,"usb2-phy" );if (IS_ERR (phy)) { uphy =devm_usb_get_phy (dev,USB_PHY_TYPE_USB2 );if (IS_ERR (uphy)) {/* Fallback for pdata */ - plat =dev_get_platdata (&pdev->dev); + plat =dev_get_platdata (dev);if (!plat) { -dev_err (&pdev->dev, +dev_err (dev,"no platform data or transceiver defined\n" );return -EPROBE_DEFER ; }@@ -3455,36 +3450,12 @@ static int s3c_hsotg_probe(struct platform_device *pdev) hsotg->phyif =GUSBCFG_PHYIF8 ; } - hsotg->dev = dev; - - hsotg->clk =devm_clk_get (&pdev->dev,"otg" ); + hsotg->clk =devm_clk_get (dev,"otg" );if (IS_ERR (hsotg->clk)) {dev_err (dev,"cannot get otg clock\n" );return PTR_ERR (hsotg->clk); } -platform_set_drvdata (pdev, hsotg); - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - - hsotg->regs =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (hsotg->regs)) { - ret =PTR_ERR (hsotg->regs); - goto err_clk; - } - - ret =platform_get_irq (pdev,0 ); -if (ret <0 ) { -dev_err (dev,"cannot find IRQ\n" ); - goto err_clk; - } - -spin_lock_init (&hsotg->lock); - - hsotg->irq = ret; - -dev_info (dev,"regs %p, irq %d\n" , hsotg->regs, hsotg->irq); - hsotg->gadget.max_speed =USB_SPEED_HIGH ; hsotg->gadget.ops = &s3c_hsotg_gadget_ops; hsotg->gadget.name =dev_name (dev);@@ -3501,7 +3472,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) ret =devm_regulator_bulk_get (dev,ARRAY_SIZE (hsotg->supplies), hsotg->supplies);if (ret) { -dev_err (hsotg->dev,"failed to request supplies: %d\n" , ret); +dev_err (dev,"failed to request supplies: %d\n" , ret); goto err_clk; }@@ -3520,7 +3491,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)s3c_hsotg_hw_cfg (hsotg);s3c_hsotg_init (hsotg); - ret =devm_request_irq (&pdev->dev, hsotg->irq, s3c_hsotg_irq,0 , + ret =devm_request_irq (dev, irq, s3c_hsotg_irq,0 ,dev_name (dev), hsotg);if (ret <0 ) {s3c_hsotg_phy_disable (hsotg);@@ -3572,7 +3543,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) ret =regulator_bulk_disable (ARRAY_SIZE (hsotg->supplies), hsotg->supplies);if (ret) { -dev_err (&pdev->dev,"failed to disable supplies: %d\n" , ret); +dev_err (dev,"failed to disable supplies: %d\n" , ret); goto err_ep_mem; }@@ -3597,15 +3568,14 @@ err_clk:return ret; } +EXPORT_SYMBOL_GPL (dwc2_gadget_init);/** * s3c_hsotg_remove - remove function for hsotg driver * @pdev: The platform information for the driver */ -static int s3c_hsotg_remove (struct platform_device *pdev) +int s3c_hsotg_remove (struct dwc2_hsotg *hsotg) { -struct dwc2_hsotg *hsotg =platform_get_drvdata (pdev); -usb_del_gadget_udc (&hsotg->gadget);s3c_hsotg_delete_debug (hsotg);@@ -3619,10 +3589,10 @@ static int s3c_hsotg_remove(struct platform_device *pdev)return 0 ; } +EXPORT_SYMBOL_GPL (s3c_hsotg_remove); -static int s3c_hsotg_suspend (struct platform_device *pdev,pm_message_t state) +int s3c_hsotg_suspend (struct dwc2_hsotg *hsotg) { -struct dwc2_hsotg *hsotg =platform_get_drvdata (pdev);unsigned long flags;int ret =0 ;@@ -3648,10 +3618,10 @@ static int s3c_hsotg_suspend(struct platform_device *pdev, pm_message_t state)return ret; } +EXPORT_SYMBOL_GPL (s3c_hsotg_suspend); -static int s3c_hsotg_resume (struct platform_device *pdev) +int s3c_hsotg_resume (struct dwc2_hsotg *hsotg) { -struct dwc2_hsotg *hsotg =platform_get_drvdata (pdev);unsigned long flags;int ret =0 ;@@ -3672,31 +3642,4 @@ static int s3c_hsotg_resume(struct platform_device *pdev)return ret; } - -#ifdef CONFIG_OF -static const struct of_device_id s3c_hsotg_of_ids[] = { - { .compatible ="samsung,s3c6400-hsotg" , }, - { .compatible ="snps,dwc2" , }, - {/* sentinel */ } -}; -MODULE_DEVICE_TABLE (of, s3c_hsotg_of_ids); -#endif - -static struct platform_driver s3c_hsotg_driver = { - .driver = { - .name ="s3c-hsotg" , - .owner =THIS_MODULE , - .of_match_table =of_match_ptr (s3c_hsotg_of_ids), - }, - .probe = s3c_hsotg_probe, - .remove = s3c_hsotg_remove, - .suspend = s3c_hsotg_suspend, - .resume = s3c_hsotg_resume, -}; - -module_platform_driver (s3c_hsotg_driver); - -MODULE_DESCRIPTION ("Samsung S3C USB High-speed/OtG device" ); -MODULE_AUTHOR ("Ben Dooks <[email protected]>" ); -MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c-hsotg" ); +EXPORT_SYMBOL_GPL (s3c_hsotg_resume);drivers/usb/dwc2/hcd.c +0
-1@@ -2839,7 +2839,6 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, hcd->has_tt =1 ; -spin_lock_init (&hsotg->lock); ((struct wrapper_priv_data *) &hcd->hcd_priv)->hsotg = hsotg; hsotg->priv = hcd;drivers/usb/dwc2/hcd.h +0
-10@@ -668,9 +668,6 @@ extern irqreturn_t dwc2_handle_hcd_intr(struct dwc2_hsotg *hsotg);*/ extern void dwc2_hcd_stop (struct dwc2_hsotg *hsotg); -extern void dwc2_hcd_start (struct dwc2_hsotg *hsotg); -extern void dwc2_hcd_disconnect (struct dwc2_hsotg *hsotg); -/** * dwc2_hcd_is_b_host() - Returns 1 if core currently is acting as B host, * and 0 otherwise @@ -680,13 +677,6 @@ extern void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg);extern int dwc2_hcd_is_b_host (struct dwc2_hsotg *hsotg);/** -* dwc2_hcd_get_frame_number() - Returns current frame number -* -* @hsotg: The DWC2 HCD -*/ -extern int dwc2_hcd_get_frame_number (struct dwc2_hsotg *hsotg); - -/** * dwc2_hcd_dump_state() - Dumps hsotg state * * @hsotg: The DWC2 HCD drivers/usb/dwc2/pci.c +1
-0@@ -141,6 +141,7 @@ static int dwc2_driver_probe(struct pci_dev *dev,pci_set_master (dev); +spin_lock_init (&hsotg->lock); retval =dwc2_hcd_init (hsotg, dev->irq, &dwc2_module_params);if (retval) {pci_disable_device (dev);drivers/usb/dwc2/platform.c +32
-0@@ -121,6 +121,7 @@ static int dwc2_driver_remove(struct platform_device *dev)struct dwc2_hsotg *hsotg =platform_get_drvdata (dev);dwc2_hcd_remove (hsotg); +s3c_hsotg_remove (hsotg);return 0 ; }@@ -129,6 +130,7 @@ static const struct of_device_id dwc2_of_match_table[] = { { .compatible = "brcm,bcm2835-usb", .data = ¶ms_bcm2835 }, { .compatible = "rockchip,rk3066-usb", .data = ¶ms_rk3066 }, { .compatible = "snps,dwc2", .data = NULL }, + { .compatible = "samsung,s3c6400-hsotg", .data = NULL}, {}, };MODULE_DEVICE_TABLE (of, dwc2_of_match_table);@@ -204,6 +206,10 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->dr_mode =of_usb_get_dr_mode (dev->dev.of_node); +spin_lock_init (&hsotg->lock); + retval =dwc2_gadget_init (hsotg, irq); +if (retval) +return retval; retval =dwc2_hcd_init (hsotg, irq, params);if (retval)return retval;@@ -213,10 +219,36 @@ static int dwc2_driver_probe(struct platform_device *dev)return retval; } +static int dwc2_suspend (struct device *dev) +{ +struct dwc2_hsotg *dwc2 =dev_get_drvdata (dev); +int ret =0 ; + +if (dwc2_is_device_mode (dwc2)) + ret =s3c_hsotg_suspend (dwc2); +return ret; +} + +static int dwc2_resume (struct device *dev) +{ +struct dwc2_hsotg *dwc2 =dev_get_drvdata (dev); +int ret =0 ; + +if (dwc2_is_device_mode (dwc2)) + ret =s3c_hsotg_resume (dwc2); + +return ret; +} + +static const struct dev_pm_ops dwc2_dev_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (dwc2_suspend, dwc2_resume) +}; +static struct platform_driver dwc2_platform_driver = { .driver = { .name = dwc2_driver_name, .of_match_table = dwc2_of_match_table, + .pm = &dwc2_dev_pm_ops, }, .probe = dwc2_driver_probe, .remove = dwc2_driver_remove,
RE: [PATCHv5 2/7] usb: dwc2: Move gadget probe function into platform code
Quoted 21 lines
From: Bartlomiej Zolnierkiewicz [mailto:[email protected]]
Sent: Wednesday, October 22, 2014 4:16 AMQuoted 17 lines · On Monday, October 20, 2014 01:52:01 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
This patch will aggregate the probing of gadget/hcd driver into
platform.c. The gadget probe funtion is converted intogadget_initthat is now only responsible for gadget only initialization. All the gadget resources is now handled byplatform.cSince the host workqueue will not get initialized if the driver is configured for peripheral mode only. Thus we need to check for
wq_otgbefore callingqueue_work().Also, we move
spin_lock_initto common location for both host and gadget that is either inplatform.corpci.c.We also ove suspend/resume code to common platform code, and update it to use the new PM API (struct
dev_pm_ops).
Quoted 6 lines
Quoted 1 line
Lastly, move the "samsung,s3c6400-hsotg" binding into
dwc2_of_match_table.This patch seems to break bisectability. It moves all the gadget probing to
platform.cbut Kconfig/Makefile are not updated (platform.cwill be compiled only forCONFIG_USB_DWC2_PLATFORM=ywhich in turn depends onCONFIG_USB_DWC2_HOST). IMO patch #7 should be merged into this one (#2).
It doesn't break the compile, I already tested it. It does break the operation of the driver until patch #7 is applied, but I think that's OK in the middle of a patch series. I think it's a bit much to expect the driver to keep working at each step of a patch series like this.
Signature · 1 line
Paul
Re: [PATCHv5 2/7] usb: dwc2: Move gadget probe function into platform code
Quoted 28 lines · Paul Zimmerman
Quoted 21 lines
From: Bartlomiej Zolnierkiewicz [mailto:[email protected]]
Sent: Wednesday, October 22, 2014 4:16 AMQuoted 17 lines · On Monday, October 20, 2014 01:52:01 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
This patch will aggregate the probing of gadget/hcd driver into
platform.c. The gadget probe funtion is converted intogadget_initthat is now only responsible for gadget only initialization. All the gadget resources is now handled byplatform.cSince the host workqueue will not get initialized if the driver is configured for peripheral mode only. Thus we need to check for
wq_otgbefore callingqueue_work().Also, we move
spin_lock_initto common location for both host and gadget that is either inplatform.corpci.c.We also ove suspend/resume code to common platform code, and update it to use the new PM API (struct
dev_pm_ops).Quoted 6 lines
Quoted 1 line
Lastly, move the "samsung,s3c6400-hsotg" binding into
dwc2_of_match_table.This patch seems to break bisectability. It moves all the gadget probing to
platform.cbut Kconfig/Makefile are not updated (platform.cwill be compiled only forCONFIG_USB_DWC2_PLATFORM=ywhich in turn depends onCONFIG_USB_DWC2_HOST). IMO patch #7 should be merged into this one (#2).
Quoted 4 lines
It doesn't break the compile, I already tested it. It does break the operation of the driver until patch #7 is applied, but I think that's OK in the middle of a patch series. I think it's a bit much to expect the driver to keep working at each step of a patch series like this.
It's your driver and, at the end of the day, your headache; but the very day you need to run a git bisect and you end up in the middle of one of these commits, you'll regret this statement :-)
There's usually a way to make sure things continue to work even if it means duplicating some code until the conversion is completed, or adding temporary flags which get added and removed within the same series, etc.
my 2 cents
Signature · 1 line
balbi
PATCH v5 3/7 usb: dwc2: Initialize the USB core for peripheral mode
In reply to [email protected]From: Dinh Nguyen <[email protected]>
Initialize the USB driver to peripheral mode when a B-Device connector is attached.
---
v5: move the export of s3c_hsotg_core_init into this patch
--- drivers/usb/dwc2/core.h | 2 ++ drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc2/hcd.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc2/core.h +2 -0
@@ -966,6 +966,7 @@ extern int s3c_hsotg_remove(struct dwc2_hsotg *hsotg);extern int s3c_hsotg_suspend (struct dwc2_hsotg *dwc2);extern int s3c_hsotg_resume (struct dwc2_hsotg *dwc2);extern int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq); +extern void s3c_hsotg_core_init (struct dwc2_hsotg *dwc2);#else static inline int s3c_hsotg_remove (struct dwc2_hsotg *dwc2) {return 0 ; }
@@ -975,6 +976,7 @@ static inline int s3c_hsotg_resume(struct dwc2_hsotg *dwc2) {return 0 ; }static inline int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq) {return 0 ; } +static inline void s3c_hsotg_core_init (struct dwc2_hsotg *dwc2) {}#endif #if IS_ENABLED (CONFIG_USB_DWC2_HOST ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE )
drivers/usb/dwc2/gadget.c +1 -1
@@ -2125,7 +2125,7 @@ static int s3c_hsotg_corereset(struct dwc2_hsotg *hsotg)* * Issue a soft reset to the core, and await the core finishing it. */ -static void s3c_hsotg_core_init (struct dwc2_hsotg *hsotg) +void s3c_hsotg_core_init (struct dwc2_hsotg *hsotg) {s3c_hsotg_corereset (hsotg);
drivers/usb/dwc2/hcd.c +1 -0
@@ -1371,6 +1371,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work) hsotg->op_state =OTG_STATE_B_PERIPHERAL ;dwc2_core_init (hsotg, false,-1 );dwc2_enable_global_interrupts (hsotg); +s3c_hsotg_core_init (hsotg); }else {/* A-Device connector (Host Mode) */ dev_dbg (hsotg->dev,"connId A\n" );
Signature · 1 line
2.0.3
PATCH v5 4/7 usb: dwc2: Update common interrupt handler to call gadget interrupt handler
In reply to [email protected]From: Dinh Nguyen <[email protected]>
Make dwc2_handle_common_intr call the gadget interrupt function when operating in peripheral mode. Remove the spinlock functions in s3c_hsotg_irq as dwc2_handle_common_intr() already has the spinlocks.
Move the registeration of the IRQ to common code for platform and PCI.
Remove duplicate interrupt conditions that was in gadget, as those are handled by dwc2 common interrupt handler.
---
v5: remove individual devm_request_irq from gadget and hcd, and place a
single devm_request_irq in platform and pci.
v2: Keep interrupt handler for host and peripheral modes separate
--- drivers/usb/dwc2/core.c | 10 -------- drivers/usb/dwc2/core.h | 3 +++ drivers/usb/dwc2/core_intr.c | 3 +++ drivers/usb/dwc2/gadget.c | 57 ++------------------------------------------ drivers/usb/dwc2/pci.c | 6 +++++ drivers/usb/dwc2/platform.c | 9 +++++++ 6 files changed, 23 insertions(+), 65 deletions(-)
drivers/usb/dwc2/core.c +0 -10
@@ -458,16 +458,6 @@ int dwc2_core_init(struct dwc2_hsotg *hsotg, bool select_phy, int irq)/* Clear the SRP success bit for FS-I2c */ hsotg->srp_success =0 ; -if (irq >=0 ) { -dev_dbg (hsotg->dev,"registering common handler for irq%d\n" , - irq); - retval =devm_request_irq (hsotg->dev, irq, - dwc2_handle_common_intr,IRQF_SHARED , -dev_name (hsotg->dev), hsotg); -if (retval) -return retval; - } -/* Enable common interrupts */ dwc2_enable_common_interrupts (hsotg);
drivers/usb/dwc2/core.h +3 -0
@@ -967,6 +967,7 @@ extern int s3c_hsotg_suspend(struct dwc2_hsotg *dwc2);extern int s3c_hsotg_resume (struct dwc2_hsotg *dwc2);extern int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq);extern void s3c_hsotg_core_init (struct dwc2_hsotg *dwc2); +irqreturn_t s3c_hsotg_irq (int irq,void *pw);#else static inline int s3c_hsotg_remove (struct dwc2_hsotg *dwc2) {return 0 ; }
@@ -977,6 +978,8 @@ static inline int s3c_hsotg_resume(struct dwc2_hsotg *dwc2)static inline int dwc2_gadget_init (struct dwc2_hsotg *hsotg,int irq) {return 0 ; }static inline void s3c_hsotg_core_init (struct dwc2_hsotg *dwc2) {} +static inline irqreturn_t s3c_hsotg_irq (int irq,void *pw) +{return IRQ_HANDLED ; }#endif #if IS_ENABLED (CONFIG_USB_DWC2_HOST ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE )
drivers/usb/dwc2/core_intr.c +3 -0
@@ -474,6 +474,9 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev)spin_lock (&hsotg->lock); +if (dwc2_is_device_mode (hsotg)) + retval =s3c_hsotg_irq (irq, dev); + gintsts =dwc2_read_common_intr (hsotg);if (gintsts & ~GINTSTS_PRTINT ) retval =IRQ_HANDLED ;
drivers/usb/dwc2/gadget.c +2 -55
101 lines not on this page · raw message
drivers/usb/dwc2/pci.c +6 -0
@@ -141,6 +141,12 @@ static int dwc2_driver_probe(struct pci_dev *dev,pci_set_master (dev); + retval =devm_request_irq (hsotg->dev, dev->irq, + dwc2_handle_common_intr,IRQF_SHARED , +dev_name (hsotg->dev), hsotg); +if (retval) +return retval; +spin_lock_init (&hsotg->lock); retval =dwc2_hcd_init (hsotg, dev->irq, &dwc2_module_params);if (retval) {
drivers/usb/dwc2/platform.c +9 -0
@@ -196,6 +196,15 @@ static int dwc2_driver_probe(struct platform_device *dev)return irq; } +dev_dbg (hsotg->dev,"registering common handler for irq%d\n" , + irq); + + retval =devm_request_irq (hsotg->dev, irq, + dwc2_handle_common_intr,IRQF_SHARED , +dev_name (hsotg->dev), hsotg); +if (retval) +return retval; + res =platform_get_resource (dev,IORESOURCE_MEM ,0 ); hsotg->regs =devm_ioremap_resource (&dev->dev, res);if (IS_ERR (hsotg->regs))
Signature · 1 line
2.0.3
PATCH v5 5/7 usb: dwc2: Add call_gadget functions for perpheral mode interrupts
In reply to [email protected]From: Dinh Nguyen <[email protected]>
Update the dwc2 wakeup and suspend interrupt functions to use call_gadget when the IP is in peripheral mode.
--- drivers/usb/dwc2/core_intr.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc2/core_intr.c +2 -0
@@ -339,6 +339,7 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) }/* Change to L0 state */ hsotg->lx_state =DWC2_L0 ; +call_gadget (hsotg, resume); }else {if (hsotg->lx_state !=DWC2_L1 ) {u32 pcgcctl =readl (hsotg->regs +PCGCTL );
@@ -399,6 +400,7 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)"DSTS.Suspend Status=%d HWCFG4.Power Optimize=%d\n" , !!(dsts &DSTS_SUSPSTS ), hsotg->hw_params.power_optimized); +call_gadget (hsotg, suspend); }else {if (hsotg->op_state ==OTG_STATE_A_PERIPHERAL ) {dev_dbg (hsotg->dev,"a_peripheral->a_host\n" );
Signature · 1 line
2.0.3
PATCH v5 6/7 usb: dwc2: gadget: Do not fail probe if there isn't a clock node
In reply to [email protected]From: Dinh Nguyen <[email protected]>
Since the dwc2 hcd driver is currently not looking for a clock node during init, we should not completely fail if there isn't a clock provided. For dual-role mode, we will only fail init for a non-clock node error. We then update the HCD to only call gadget funtions if there is a proper clock node.
---
v5: reworked to not access gadget functions from the hcd.
--- drivers/usb/dwc2/core.h | 3 +-- drivers/usb/dwc2/core_intr.c | 9 ++++++--- drivers/usb/dwc2/hcd.c | 3 ++- drivers/usb/dwc2/platform.c | 19 +++++++++++++++---- 4 files changed, 24 insertions(+), 10 deletions(-)
drivers/usb/dwc2/core.h +1 -2
@@ -660,6 +660,7 @@ struct dwc2_hsotg {#endif #endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */ +struct clk *clk;#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) ||IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE )/* Gadget structures */ struct usb_gadget_driver *driver;
@@ -667,8 +668,6 @@ struct dwc2_hsotg {struct usb_phy *uphy;struct s3c_hsotg_plat *plat; -struct clk *clk; -struct regulator_bulk_data supplies[ARRAY_SIZE (s3c_hsotg_supply_names)];u32 phyif;
drivers/usb/dwc2/core_intr.c +6 -3
@@ -339,7 +339,8 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) }/* Change to L0 state */ hsotg->lx_state =DWC2_L0 ; -call_gadget (hsotg, resume); +if (!IS_ERR (hsotg->clk)) +call_gadget (hsotg, resume); }else {if (hsotg->lx_state !=DWC2_L1 ) {u32 pcgcctl =readl (hsotg->regs +PCGCTL );
@@ -400,7 +401,8 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)"DSTS.Suspend Status=%d HWCFG4.Power Optimize=%d\n" , !!(dsts &DSTS_SUSPSTS ), hsotg->hw_params.power_optimized); -call_gadget (hsotg, suspend); +if (!IS_ERR (hsotg->clk)) +call_gadget (hsotg, suspend); }else {if (hsotg->op_state ==OTG_STATE_A_PERIPHERAL ) {dev_dbg (hsotg->dev,"a_peripheral->a_host\n" );
@@ -477,7 +479,8 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev)spin_lock (&hsotg->lock);if (dwc2_is_device_mode (hsotg)) - retval =s3c_hsotg_irq (irq, dev); +if (!IS_ERR (hsotg->clk)) + retval =s3c_hsotg_irq (irq, dev); gintsts =dwc2_read_common_intr (hsotg);if (gintsts & ~GINTSTS_PRTINT )
drivers/usb/dwc2/hcd.c +2 -1
@@ -1371,7 +1371,8 @@ static void dwc2_conn_id_status_change(struct work_struct *work) hsotg->op_state =OTG_STATE_B_PERIPHERAL ;dwc2_core_init (hsotg, false,-1 );dwc2_enable_global_interrupts (hsotg); -s3c_hsotg_core_init (hsotg); +if (!IS_ERR (hsotg->clk)) +s3c_hsotg_core_init (hsotg); }else {/* A-Device connector (Host Mode) */ dev_dbg (hsotg->dev,"connId A\n" );
drivers/usb/dwc2/platform.c +15 -4
@@ -217,8 +217,17 @@ static int dwc2_driver_probe(struct platform_device *dev)spin_lock_init (&hsotg->lock); retval =dwc2_gadget_init (hsotg, irq); -if (retval) -return retval; +if (retval) { +/* +* We will not fail the driver initialization for dual-role +* if no clock node is supplied. However, all gadget +* functionality will be disabled if a clock node is not +* provided. Host functionality will continue. +* TO-DO: make clock node a requirement for the HCD. +*/ +if (!IS_ERR (hsotg->clk)) +return retval; + } retval =dwc2_hcd_init (hsotg, irq, params);if (retval)return retval;
@@ -234,7 +243,8 @@ static int dwc2_suspend(struct device *dev)int ret =0 ;if (dwc2_is_device_mode (dwc2)) - ret =s3c_hsotg_suspend (dwc2); +if (!IS_ERR (dwc2->clk)) + ret =s3c_hsotg_suspend (dwc2);return ret; }
@@ -244,7 +254,8 @@ static int dwc2_resume(struct device *dev)int ret =0 ;if (dwc2_is_device_mode (dwc2)) - ret =s3c_hsotg_resume (dwc2); +if (!IS_ERR (dwc2->clk)) + ret =s3c_hsotg_resume (dwc2);return ret; }
Signature · 1 line
2.0.3
PATCH v5 7/7 usb: dwc2: Update Kconfig to support dual-role
In reply to [email protected]From: Dinh Nguyen <[email protected]>
Update DWC2 kconfig and makefile to support dual-role mode. The platform file will always get compiled for the case where the controller is directly connected to the CPU. So for loadable modules, dwc2.ko is built for host, peripheral, and dual-role mode. The PCI bus interface will be called dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko.
---
v5: dwc2.ko for all modes along with dwc2_platform.ko and dwc2_pci.ko will
get built for kernel modules.
v3: Add USB_GADGET=y and USB_GADGET=USB_DWC2 for peripheral and dual-role
config options.
v2: Remove reference to dwc2_gadget
--- drivers/usb/dwc2/Kconfig | 61 ++++++++++++++++++++++++++++------------------- drivers/usb/dwc2/Makefile | 32 ++++++++++++------------- 2 files changed, 53 insertions(+), 40 deletions(-)
drivers/usb/dwc2/Kconfig +37 -24
@@ -1,5 +1,5 @@ config USB_DWC2 - bool "DesignWare USB2 DRD Core Support" + tristate "DesignWare USB2 DRD Core Support" depends on USB help Say Y here if your system has a Dual Role Hi-Speed USB
@@ -10,31 +10,53 @@ config USB_DWC2 bus interface module (if you have a PCI bus system) will be called dwc2_pci.ko, and the platform interface module (for controllers directly connected to the CPU) will be called - dwc2_platform.ko. For gadget mode, there will be a single - module called dwc2_gadget.ko. - - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The - host and gadget drivers are still currently separate drivers. - There are plans to merge the dwc2_gadget driver with the dwc2 - host driver in the near future to create a dual-role driver. + dwc2_platform.ko. For all modes(host, gadget and dual-role), there + will be a single module called dwc2.ko. if USB_DWC2 +choice + bool "DWC2 Mode Selection" + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) + default USB_DWC2_HOST if (USB && !USB_GADGET) + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) + config USB_DWC2_HOST - tristate "Host only mode" + bool "Host only mode" depends on USB help The Designware USB2.0 high-speed host controller - integrated into many SoCs. + integrated into many SoCs. Select this option if you want the + driver to operate in Host-only mode. + +comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" + +config USB_DWC2_PERIPHERAL + bool "Gadget only mode" + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 + help + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. Select this option if you want the + driver to operate in Peripheral-only mode. This option requires + USB_GADGET=y. + +config USB_DWC2_DUAL_ROLE + bool "Dual Role mode" + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) + help + Select this option if you want the driver to work in a dual-role + mode. In this mode both host and gadget features are enabled, and + the role will be determined by the cable that gets plugged-in. This + option requires USB_GADGET=y. +endchoice config USB_DWC2_PLATFORM bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOST - help - The Designware USB2.0 platform interface module for - controllers directly connected to the CPU. This is only - used for host mode. + default y + help + The Designware USB2.0 platform interface module for + controllers directly connected to the CPU. config USB_DWC2_PCI bool "DWC2 PCI"
@@ -44,15 +66,6 @@ config USB_DWC2_PCI The Designware USB2.0 PCI interface module for controllers connected to a PCI bus. This is only used for host mode. -comment "Gadget mode requires USB Gadget support to be enabled" - -config USB_DWC2_PERIPHERAL - tristate "Gadget only mode" - depends on USB_GADGET - help - The Designware USB2.0 high-speed gadget controller - integrated into many SoCs. - config USB_DWC2_DEBUG bool "Enable Debugging Messages" help
drivers/usb/dwc2/Makefile +16 -16
@@ -1,28 +1,28 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG -obj-$(CONFIG_USB_DWC2_HOST) += dwc2.o +obj-$(CONFIG_USB_DWC2) += dwc2.o dwc2-y := core.o core_intr.o -dwc2-y += hcd.o hcd_intr.o -dwc2-y += hcd_queue.o hcd_ddma.o + +ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),) + dwc2-y += hcd.o hcd_intr.o + dwc2-y += hcd_queue.o hcd_ddma.o +endif + +ifneq ($(filter y,$(CONFIG_USB_DWC2_PERIPHERAL) $(CONFIG_USB_DWC2_DUAL_ROLE)),) + dwc2-y += gadget.o +endif # NOTE: The previous s3c-hsotg peripheral mode only driver has been moved to # this location and renamed gadget.c. When building for dynamically linked -# modules, dwc2_gadget.ko will get built for peripheral mode. For host mode, -# the core module will be dwc2.ko, the PCI bus interface module will called -# dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko. -# At present the host and gadget driver will be separate drivers, but there -# are plans in the near future to create a dual-role driver. +# modules, dwc2.ko will get built for host mode, peripheral mode, and dual-role +# mode. The PCI bus interface module will called dwc2_pci.ko and the platform +# interface module will be called dwc2_platform.ko. ifneq ($(CONFIG_USB_DWC2_PCI),) - obj-$(CONFIG_USB_DWC2_HOST) += dwc2_pci.o + obj-$(CONFIG_USB_DWC2) += dwc2_pci.o dwc2_pci-y := pci.o endif -ifneq ($(CONFIG_USB_DWC2_PLATFORM),) - obj-$(CONFIG_USB_DWC2_HOST) += dwc2_platform.o - dwc2_platform-y := platform.o -endif - -obj-$(CONFIG_USB_DWC2_PERIPHERAL) += dwc2_gadget.o -dwc2_gadget-y := gadget.o +obj-$(CONFIG_USB_DWC2) += dwc2_platform.o +dwc2_platform-y := platform.o
Signature · 1 line
2.0.3
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
[email protected] schreef op ma 20-10-2014 om 13:52 [-0500]:
Quoted 26 lines
From: Dinh Nguyen <[email protected]>
Update DWC2 kconfig and makefile to support dual-role mode. The platform file will always get compiled for the case where the controller is directly connected to the CPU. So for loadable modules, dwc2.ko is built for host, peripheral, and dual-role mode. The PCI bus interface will be called dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko.
Signed-off-by Dinh Nguyen <[email protected]>Acked-by Paul Zimmerman <[email protected]>---
v5: dwc2.ko for all modes along with dwc2_platform.ko and dwc2_pci.ko will
get built for kernel modules.
v3: Add USB_GADGET=y and USB_GADGET=USB_DWC2 for peripheral and dual-role
config options.
v2: Remove reference todwc2_gadget--- drivers/usb/dwc2/Kconfig | 61 ++++++++++++++++++++++++++++------------------- drivers/usb/dwc2/Makefile | 32 ++++++++++++------------- 2 files changed, 53 insertions(+), 40 deletions(-)drivers/usb/dwc2/Kconfig +0
-0
drivers/usb/dwc2/Kconfig line 3
Quoted 4 lines
drivers/usb/dwc2/Kconfig +1
-1@@ -1,5 +1,5 @@ config USB_DWC2 - bool "DesignWare USB2 DRD Core Support" + tristate "DesignWare USB2 DRD Core Support" depends on USB
(Side note: drivers/usb/dwc2/Kconfig is sourced (in drivers/usb/Kconfig) even if USB is _not_ set. But USB_DCW2 still depends on USB. Why is that?)
Quoted 14 lines
drivers/usb/dwc2/Kconfig +1
-7help Say Y here if your system has a Dual Role Hi-Speed USB@@ -10,31 +10,53 @@ config USB_DWC2 bus interface module (if you have a PCI bus system) will be called dwc2_pci.ko, and the platform interface module (for controllers directly connected to the CPU) will be called - dwc2_platform.ko. For gadget mode, there will be a single - module called dwc2_gadget.ko. - - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The - host and gadget drivers are still currently separate drivers. - There are plans to merge the dwc2_gadget driver with the dwc2 - host driver in the near future to create a dual-role driver. + dwc2_platform.ko. For all modes(host, gadget and dual-role), there
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 23
Quoted 10 lines
drivers/usb/dwc2/Kconfig +7
-0+ will be a single module called dwc2.ko. if USB_DWC2 +choice + bool "DWC2 Mode Selection" + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) + default USB_DWC2_HOST if (USB && !USB_GADGET) + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) +
Juggling kconfig tristate logic is still rather hard for me, but don't the above three "if" rules all evaluate to non-zero if both USB and USB_GADGET are 'm'? If that's correct perhaps USB_DWC2_DUAL_ROLE should be the last default (assuming the last default wins, that is).
Besides, will the default USB_DWC2_PERIPHERAL ever trigger as !USB can't be true at this point, can it?
Quoted 20 lines
drivers/usb/dwc2/Kconfig +14
-2config USB_DWC2_HOST - tristate "Host only mode" + bool "Host only mode" depends on USB help The Designware USB2.0 high-speed host controller - integrated into many SoCs. + integrated into many SoCs. Select this option if you want the + driver to operate in Host-only mode. + +comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" + +config USB_DWC2_PERIPHERAL + bool "Gadget only mode" + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 + help + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. Select this option if you want the + driver to operate in Peripheral-only mode. This option requires + USB_GADGET=y.
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 51
Quoted 10 lines
drivers/usb/dwc2/Kconfig +10
-0+ +config USB_DWC2_DUAL_ROLE + bool "Dual Role mode" + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) + help + Select this option if you want the driver to work in a dual-role + mode. In this mode both host and gadget features are enabled, and + the role will be determined by the cable that gets plugged-in. This + option requires USB_GADGET=y. +endchoice
(I wonder how the dependencies of these three config entries interact with the three defaults of this choice. Since we're dealing with three options here this requires a piece of paper, a pencil, and clear mind to figure out. Maybe I'll try that in a few days...)
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 56
Quoted 9 lines
drivers/usb/dwc2/Kconfig +1
-5config USB_DWC2_PLATFORM bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOST - help - The Designware USB2.0 platform interface module for - controllers directly connected to the CPU. This is only - used for host mode. + default y
You now have to default lines. Which one wins?
drivers/usb/dwc2/Makefile
Quoted 24 lines
drivers/usb/dwc2/Kconfig +3
-9+ help + The Designware USB2.0 platform interface module for + controllers directly connected to the CPU. config USB_DWC2_PCI bool "DWC2 PCI"@@ -44,15 +66,6 @@ config USB_DWC2_PCI The Designware USB2.0 PCI interface module for controllers connected to a PCI bus. This is only used for host mode. -comment "Gadget mode requires USB Gadget support to be enabled" - -config USB_DWC2_PERIPHERAL - tristate "Gadget only mode" - depends on USB_GADGET - help - The Designware USB2.0 high-speed gadget controller - integrated into many SoCs. - config USB_DWC2_DEBUG bool "Enable Debugging Messages" helpdrivers/usb/dwc2/Makefile +0
-0
Paul Bolle
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 23 lines · Paul Bolle
[email protected] schreef op ma 20-10-2014 om 13:52 [-0500]:
Quoted 21 lines
From: Dinh Nguyen <[email protected]>
Update DWC2 kconfig and makefile to support dual-role mode. The platform file will always get compiled for the case where the controller is directly connected to the CPU. So for loadable modules, dwc2.ko is built for host, peripheral, and dual-role mode. The PCI bus interface will be called dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko.
Signed-off-by Dinh Nguyen <[email protected]>Acked-by Paul Zimmerman <[email protected]>---
v5: dwc2.ko for all modes along with dwc2_platform.ko and dwc2_pci.ko will
get built for kernel modules.
v3: Add USB_GADGET=y and USB_GADGET=USB_DWC2 for peripheral and dual-role
config options.
v2: Remove reference todwc2_gadget--- drivers/usb/dwc2/Kconfig | 61 ++++++++++++++++++++++++++++------------------- drivers/usb/dwc2/Makefile | 32 ++++++++++++------------- 2 files changed, 53 insertions(+), 40 deletions(-)
Quoted 13 lines
drivers/usb/dwc2/Kconfig line 3
Quoted 9 lines
drivers/usb/dwc2/Kconfig +1
-1@@ -1,5 +1,5 @@ config USB_DWC2 - bool "DesignWare USB2 DRD Core Support" + tristate "DesignWare USB2 DRD Core Support" depends on USB(Side note:
drivers/usb/dwc2/Kconfigis sourced (indrivers/usb/Kconfig) even if USB is _not_ set. ButUSB_DCW2still depends on USB. Why is that?)
Because USB is for Host-Side support. DWC2 driver should only get built for when USB is enabled. I think you're getting USB and USB_SUPPORT mixed up.
In addition, thanks to your comment, I realized that DWC2 should also be available to build when USB_GADGET is enabled. A patch has been sent:
http://marc.info/?l=linux-usb&m=141392377124818&w=2
Quoted 19 lines
Quoted 19 lines
drivers/usb/dwc2/Kconfig +2
-7help Say Y here if your system has a Dual Role Hi-Speed USB@@ -10,31 +10,53 @@ config USB_DWC2 bus interface module (if you have a PCI bus system) will be called dwc2_pci.ko, and the platform interface module (for controllers directly connected to the CPU) will be called - dwc2_platform.ko. For gadget mode, there will be a single - module called dwc2_gadget.ko. - - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The - host and gadget drivers are still currently separate drivers. - There are plans to merge the dwc2_gadget driver with the dwc2 - host driver in the near future to create a dual-role driver. + dwc2_platform.ko. For all modes(host, gadget and dual-role), there + will be a single module called dwc2.ko. if USB_DWC2
Quoted 11 lines
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 23
Quoted 6 lines
drivers/usb/dwc2/Kconfig +6
-0+choice + bool "DWC2 Mode Selection" + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) + default USB_DWC2_HOST if (USB && !USB_GADGET) + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) +Juggling kconfig tristate logic is still rather hard for me, but don't the above three "if" rules all evaluate to non-zero if both USB and
USB_GADGETare 'm'? If that's correct perhapsUSB_DWC2_DUAL_ROLEshould be the last default (assuming the last default wins, that is).
As the way it is, the functionality is correct. As this is the same as DWC3's Kconfig, perhaps Felipe can comment if something doesn't seem correct.
Quoted 3 lines
Besides, will the default
USB_DWC2_PERIPHERALever trigger as !USB can't be true at this point, can it?
Yes it can. USB is for Host-side support, so you can have a condition where you just want to build for GADGET and !USB.
Quoted 37 lines
Quoted 21 lines
drivers/usb/dwc2/Kconfig +14
-2config USB_DWC2_HOST - tristate "Host only mode" + bool "Host only mode" depends on USB help The Designware USB2.0 high-speed host controller - integrated into many SoCs. + integrated into many SoCs. Select this option if you want the + driver to operate in Host-only mode. + +comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" + +config USB_DWC2_PERIPHERAL + bool "Gadget only mode" + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 + help + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. Select this option if you want the + driver to operate in Peripheral-only mode. This option requires + USB_GADGET=y.drivers/usb/dwc2/Kconfig config USB_DWC2 · line 51
Quoted 10 lines
drivers/usb/dwc2/Kconfig +10
-0+ +config USB_DWC2_DUAL_ROLE + bool "Dual Role mode" + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) + help + Select this option if you want the driver to work in a dual-role + mode. In this mode both host and gadget features are enabled, and + the role will be determined by the cable that gets plugged-in. This + option requires USB_GADGET=y. +endchoice(I wonder how the dependencies of these three config entries interact with the three defaults of this choice. Since we're dealing with three options here this requires a piece of paper, a pencil, and clear mind to figure out. Maybe I'll try that in a few days...)
Quoted 11 lines
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 56
Quoted 9 lines
drivers/usb/dwc2/Kconfig +1
-5config USB_DWC2_PLATFORM bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOST - help - The Designware USB2.0 platform interface module for - controllers directly connected to the CPU. This is only - used for host mode. + default yYou now have to default lines. Which one wins?
Yes, "default y" should be removed.
Thanks,
Dinh
RE: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 17 lines
From: Dinh Nguyen [mailto:[email protected]]
Sent: Tuesday, October 21, 2014 1:48 PMdrivers/usb/dwc2/Kconfig +1
-1@@ -1,5 +1,5 @@ config USB_DWC2 - bool "DesignWare USB2 DRD Core Support" + tristate "DesignWare USB2 DRD Core Support" depends on USB help Say Y here if your system has a Dual Role Hi-Speed USB@@ -10,31 +10,53 @@ config USB_DWC2 bus interface module (if you have a PCI bus system) will be called dwc2_pci.ko, and the platform interface module (for
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 14
Quoted 10 lines
drivers/usb/dwc2/Kconfig +2
-7controllers directly connected to the CPU) will be called - dwc2_platform.ko. For gadget mode, there will be a single - module called dwc2_gadget.ko. - - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The - host and gadget drivers are still currently separate drivers. - There are plans to merge the dwc2_gadget driver with the dwc2 - host driver in the near future to create a dual-role driver. + dwc2_platform.ko. For all modes(host, gadget and dual-role), there + will be a single module called dwc2.ko.
Maybe "For all modes (host, gadget and dual-role), there will be an additional module named dwc2.ko." That would be clearer.
Quoted 18 lines
drivers/usb/dwc2/Kconfig +10
-2if USB_DWC2 +choice + bool "DWC2 Mode Selection" + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) + default USB_DWC2_HOST if (USB && !USB_GADGET) + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) + config USB_DWC2_HOST - tristate "Host only mode" + bool "Host only mode" depends on USB help The Designware USB2.0 high-speed host controller - integrated into many SoCs. + integrated into many SoCs. Select this option if you want the + driver to operate in Host-only mode. +
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 41
Quoted 10 lines
drivers/usb/dwc2/Kconfig +10
-0+comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" + +config USB_DWC2_PERIPHERAL + bool "Gadget only mode" + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 + help + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. Select this option if you want the + driver to operate in Peripheral-only mode. This option requires + USB_GADGET=y.
Shouldn't this be "This option requires USB_GADGET to be enabled"? It doesn't have to be built-in.
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 50
Quoted 8 lines
drivers/usb/dwc2/Kconfig +8
-0+config USB_DWC2_DUAL_ROLE + bool "Dual Role mode" + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) + help + Select this option if you want the driver to work in a dual-role + mode. In this mode both host and gadget features are enabled, and + the role will be determined by the cable that gets plugged-in. This + option requires USB_GADGET=y.
Ditto.
Once you fix these, plus the extraneous "default y" that Paul Bolle pointed out, you can add my acked-by.
Signature · 3 lines
Paul
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
In reply to Dinh NguyenQuoted 8 lines · Dinh Nguyen
Quoted 3 lines · Paul Bolle
(Side note:
drivers/usb/dwc2/Kconfigis sourced (indrivers/usb/Kconfig) even if USB is _not_ set. ButUSB_DCW2still depends on USB. Why is that?)Because USB is for Host-Side support. DWC2 driver should only get built for when USB is enabled. I think you're getting USB and
USB_SUPPORTmixed up.
No, I don't think I did. Because in drivers/usb/Kconfig we see
if USB
[...]
endif
[...]
source "drivers/usb/dwc2/Kconfig"
[...]Quoted 4 lines
In addition, thanks to your comment, I realized that DWC2 should also be available to build when
USB_GADGETis enabled. A patch has been sent:
I haven't checked, but doesn't this mean USB_DWC2 could just depend on USB_SUPPORT?
Paul Bolle
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 11 lines · Paul Bolle
Quoted 8 lines · Dinh Nguyen
Quoted 3 lines · Paul Bolle
(Side note:
drivers/usb/dwc2/Kconfigis sourced (indrivers/usb/Kconfig) even if USB is _not_ set. ButUSB_DCW2still depends on USB. Why is that?)Because USB is for Host-Side support. DWC2 driver should only get built for when USB is enabled. I think you're getting USB and
USB_SUPPORTmixed up.No, I don't think I did. Because in
drivers/usb/Kconfigwe see
Quoted 11 lines
if USB
[...]
endif
[...]
source "drivers/usb/dwc2/Kconfig"
[...]Well, CONFIG_USB enables the host stack that is needed by the DWC2 driver, without CONFIG_USB, the DWC2 driver will not be able to build.
Quoted 9 lines
Quoted 5 lines
In addition, thanks to your comment, I realized that DWC2 should also be available to build when
USB_GADGETis enabled. A patch has been sent:I haven't checked, but doesn't this mean
USB_DWC2could just depend onUSB_SUPPORT?
I don't think so because USB_SUPPORT will not select USB or USB_GAGDGET, and the DWC2 driver will need either 1 or both for it to build correctly.
Dinh
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 9 lines · Dinh Nguyen
Quoted 1 line · Paul Bolle
On Tue, 2014-10-21 at 15:47 -0500, Dinh Nguyen wrote:
Well,
CONFIG_USBenables the host stack that is needed by the DWC2 driver, withoutCONFIG_USB, the DWC2 driver will not be able to build.Quoted 4 lines
Quoted 4 lines
In addition, thanks to your comment, I realized that DWC2 should also be available to build when
USB_GADGETis enabled. A patch has been sent:
Doesn't that patch contradict your statement? It allows USB_DWC2 to be set even if USB is not set.
Quoted 5 lines
Quoted 3 lines
I haven't checked, but doesn't this mean
USB_DWC2could just depend onUSB_SUPPORT?I don't think so because
USB_SUPPORTwill not select USB orUSB_GAGDGET, and the DWC2 driver will need either 1 or both for it to build correctly.
My comment was not well thought through. It was a waste of your time.
Paul Bolle
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
In reply to [email protected]Hi,
Quoted 79 lines · On Monday, October 20, 2014 01:52:06 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
Update DWC2 kconfig and makefile to support dual-role mode. The platform file will always get compiled for the case where the controller is directly connected to the CPU. So for loadable modules, dwc2.ko is built for host, peripheral, and dual-role mode. The PCI bus interface will be called dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko.
Signed-off-by Dinh Nguyen <[email protected]>Acked-by Paul Zimmerman <[email protected]>---
v5: dwc2.ko for all modes along with dwc2_platform.ko and dwc2_pci.ko will
get built for kernel modules.
v3: Add USB_GADGET=y and USB_GADGET=USB_DWC2 for peripheral and dual-role
config options.
v2: Remove reference todwc2_gadget--- drivers/usb/dwc2/Kconfig | 61 ++++++++++++++++++++++++++++------------------- drivers/usb/dwc2/Makefile | 32 ++++++++++++------------- 2 files changed, 53 insertions(+), 40 deletions(-)drivers/usb/dwc2/Kconfig +28
-10@@ -1,5 +1,5 @@ config USB_DWC2 - bool "DesignWare USB2 DRD Core Support" + tristate "DesignWare USB2 DRD Core Support" depends on USB help Say Y here if your system has a Dual Role Hi-Speed USB@@ -10,31 +10,53 @@ config USB_DWC2 bus interface module (if you have a PCI bus system) will be called dwc2_pci.ko, and the platform interface module (for controllers directly connected to the CPU) will be called - dwc2_platform.ko. For gadget mode, there will be a single - module called dwc2_gadget.ko. - - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The - host and gadget drivers are still currently separate drivers. - There are plans to merge the dwc2_gadget driver with the dwc2 - host driver in the near future to create a dual-role driver. + dwc2_platform.ko. For all modes(host, gadget and dual-role), there + will be a single module called dwc2.ko. if USB_DWC2 +choice + bool "DWC2 Mode Selection" + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) + default USB_DWC2_HOST if (USB && !USB_GADGET) + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) + config USB_DWC2_HOST - tristate "Host only mode" + bool "Host only mode" depends on USB help The Designware USB2.0 high-speed host controller - integrated into many SoCs. + integrated into many SoCs. Select this option if you want the + driver to operate in Host-only mode. + +comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" + +config USB_DWC2_PERIPHERAL + bool "Gadget only mode" + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 + help + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. Select this option if you want the + driver to operate in Peripheral-only mode. This option requires + USB_GADGET=y. + +config USB_DWC2_DUAL_ROLE + bool "Dual Role mode" + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) + help
drivers/usb/dwc2/Kconfig config USB_DWC2 · line 55
Quoted 10 lines
drivers/usb/dwc2/Kconfig +5
-1+ Select this option if you want the driver to work in a dual-role + mode. In this mode both host and gadget features are enabled, and + the role will be determined by the cable that gets plugged-in. This + option requires USB_GADGET=y. +endchoice config USB_DWC2_PLATFORM bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOST
It should be "default USB_DWC2_HOST || USB_DWC2_PERIPHERAL" because USB_DWC2_PLATFORM replaces current USB_DWC2_PERIPHERAL functionality.
Additionaly USB_DWC2_PLATFORM should be changed to tristate (USB_DWC2_PERIPHERAL was a tristeate before your changes).
BTW It is a bit late but it would be great if you could split your patchset on two. First one merging gadget functionality into core/platform code and the second one adding USB_DWC2_DUAL_ROLE functionality.
Quoted 65 lines
drivers/usb/dwc2/Kconfig +4
-13- help - The Designware USB2.0 platform interface module for - controllers directly connected to the CPU. This is only - used for host mode. + default y + help + The Designware USB2.0 platform interface module for + controllers directly connected to the CPU. config USB_DWC2_PCI bool "DWC2 PCI"@@ -44,15 +66,6 @@ config USB_DWC2_PCI The Designware USB2.0 PCI interface module for controllers connected to a PCI bus. This is only used for host mode. -comment "Gadget mode requires USB Gadget support to be enabled" - -config USB_DWC2_PERIPHERAL - tristate "Gadget only mode" - depends on USB_GADGET - help - The Designware USB2.0 high-speed gadget controller - integrated into many SoCs. - config USB_DWC2_DEBUG bool "Enable Debugging Messages" helpdrivers/usb/dwc2/Makefile +14
-9@@ -1,28 +1,28 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG -obj-$(CONFIG_USB_DWC2_HOST) += dwc2.o +obj-$(CONFIG_USB_DWC2) += dwc2.o dwc2-y := core.o core_intr.o -dwc2-y += hcd.o hcd_intr.o -dwc2-y += hcd_queue.o hcd_ddma.o + +ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),) + dwc2-y += hcd.o hcd_intr.o + dwc2-y += hcd_queue.o hcd_ddma.o +endif + +ifneq ($(filter y,$(CONFIG_USB_DWC2_PERIPHERAL) $(CONFIG_USB_DWC2_DUAL_ROLE)),) + dwc2-y += gadget.o +endif # NOTE: The previous s3c-hsotg peripheral mode only driver has been moved to # this location and renamed gadget.c. When building for dynamically linked -# modules, dwc2_gadget.ko will get built for peripheral mode. For host mode, -# the core module will be dwc2.ko, the PCI bus interface module will called -# dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko. -# At present the host and gadget driver will be separate drivers, but there -# are plans in the near future to create a dual-role driver. +# modules, dwc2.ko will get built for host mode, peripheral mode, and dual-role +# mode. The PCI bus interface module will called dwc2_pci.ko and the platform +# interface module will be called dwc2_platform.ko. ifneq ($(CONFIG_USB_DWC2_PCI),) - obj-$(CONFIG_USB_DWC2_HOST) += dwc2_pci.o + obj-$(CONFIG_USB_DWC2) += dwc2_pci.o dwc2_pci-y := pci.o
drivers/usb/dwc2/Makefile line 27
Quoted 10 lines
drivers/usb/dwc2/Makefile +1
-7endif -ifneq ($(CONFIG_USB_DWC2_PLATFORM),) - obj-$(CONFIG_USB_DWC2_HOST) += dwc2_platform.o - dwc2_platform-y := platform.o -endif - -obj-$(CONFIG_USB_DWC2_PERIPHERAL) += dwc2_gadget.o -dwc2_gadget-y := gadget.o +obj-$(CONFIG_USB_DWC2) += dwc2_platform.o
Shouldn't it use CONFIG_USB_DWC2_PLATFORM instead of CONFIG_USB_DWC2?
drivers/usb/dwc2/Makefile line 28
Quoted 1 line
drivers/usb/dwc2/Makefile +1
-0+dwc2_platform-y := platform.o
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 4 lines · Bartlomiej Zolnierkiewicz
BTW It is a bit late but it would be great if you could split your patchset on two. First one merging gadget functionality into core/platform code and the second one adding
USB_DWC2_DUAL_ROLEfunctionality.
On the second thought I think that the dual-role is needed to preserve existing functionality (available through separate gadget and host drivers) so please scrap the above comment.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
RE: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
In reply to Bartlomiej ZolnierkiewiczQuoted 14 lines
From: Bartlomiej Zolnierkiewicz [mailto:[email protected]]
Sent: Wednesday, October 22, 2014 5:26 AMdrivers/usb/dwc2/Kconfig config USB_DWC2 · line 55
Quoted 6 lines · On Monday, October 20, 2014 01:52:06 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
config
USB_DWC2_PLATFORMdrivers/usb/dwc2/Kconfig +0
-1bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOSTIt should be "default
USB_DWC2_HOST||USB_DWC2_PERIPHERAL" becauseUSB_DWC2_PLATFORMreplaces currentUSB_DWC2_PERIPHERALfunctionality.
Quoted 2 lines
Additionaly
USB_DWC2_PLATFORMshould be changed to tristate (USB_DWC2_PERIPHERALwas a tristeate before your changes).
Dinh, I think this is a good point. Is there any reason why USB_DWC2_PLATFORM (and USB_DWC2_PCI for that matter) can't be tristate? That's what DWC3 does.
Signature · 1 line
Paul
Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role
Quoted 14 lines · Paul Zimmerman
Quoted 14 lines
From: Bartlomiej Zolnierkiewicz [mailto:[email protected]]
Sent: Wednesday, October 22, 2014 5:26 AMdrivers/usb/dwc2/Kconfig config USB_DWC2 · line 55
Quoted 6 lines · On Monday, October 20, 2014 01:52:06 PM [email protected] wrote:
From: Dinh Nguyen <[email protected]>
config
USB_DWC2_PLATFORMdrivers/usb/dwc2/Kconfig +0
-1bool "DWC2 Platform" - depends on USB_DWC2_HOST default USB_DWC2_HOSTIt should be "default
USB_DWC2_HOST||USB_DWC2_PERIPHERAL" becauseUSB_DWC2_PLATFORMreplaces currentUSB_DWC2_PERIPHERALfunctionality.
Quoted 7 lines
Quoted 2 lines
Additionaly
USB_DWC2_PLATFORMshould be changed to tristate (USB_DWC2_PERIPHERALwas a tristeate before your changes).Dinh, I think this is a good point. Is there any reason why
USB_DWC2_PLATFORM(andUSB_DWC2_PCIfor that matter) can't be tristate? That's what DWC3 does.
Yes, in my v6, I have made this change.
Thanks,
Dinh