Re: [PATCH v19 2/4] usb: gadget: Support for the usb charger framework
On 20 February 2017 at 18:08, kbuild test robotwrote: > Hi Baolin, > > [auto build test ERROR on v4.9-rc8] > [cannot apply to balbi-usb/next usb/usb-testing battery/master next-20170220] > [if your patch is applied to the wrong git tree, please drop us a note to > help improve the system] > > url: > https://github.com/0day-ci/linux/commits/Baolin-Wang/Introduce-usb-charger-framework-to-deal-with-the-usb-gadget-power-negotation/20170220-173051 > config: i386-randconfig-x015-201708 (attached as .config) > compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > All errors (new ones prefixed by >>): > >In file included from drivers/usb/gadget/udc/core.c:28:0: >include/linux/usb/charger.h: In function 'usb_charger_get_state': >>> include/linux/usb/charger.h:151:9: error: 'USB_CHARGER_REMOVE' undeclared >>> (first use in this function) > return USB_CHARGER_REMOVE; Ah, missed fixing the state name without enable USB charger. Will fix in next version. > ^~ >include/linux/usb/charger.h:151:9: note: each undeclared identifier is > reported only once for each function it appears in > > vim +/USB_CHARGER_REMOVE +151 include/linux/usb/charger.h > > 28929615 Baolin Wang 2017-02-20 145return UNKNOWN_TYPE; > 28929615 Baolin Wang 2017-02-20 146 } > 28929615 Baolin Wang 2017-02-20 147 > 28929615 Baolin Wang 2017-02-20 148 static inline enum usb_charger_state > 28929615 Baolin Wang 2017-02-20 149 usb_charger_get_state(struct > usb_charger *uchger) > 28929615 Baolin Wang 2017-02-20 150 { > 28929615 Baolin Wang 2017-02-20 @151return USB_CHARGER_REMOVE; > 28929615 Baolin Wang 2017-02-20 152 } > 28929615 Baolin Wang 2017-02-20 153 > 28929615 Baolin Wang 2017-02-20 154 static inline int > usb_charger_detect_type(struct usb_charger *uchger) > > :: The code at line 151 was first introduced by commit > :: 289296154f05985dedc08273f04d5b738450b3c7 usb: gadget: Introduce the > usb charger framework > > :: TO: Baolin Wang > :: CC: 0day robot > > --- > 0-DAY kernel test infrastructureOpen Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation -- Baolin.wang Best Regards -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v19 2/4] usb: gadget: Support for the usb charger framework
Hi Baolin, [auto build test ERROR on v4.9-rc8] [cannot apply to balbi-usb/next usb/usb-testing battery/master next-20170220] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Baolin-Wang/Introduce-usb-charger-framework-to-deal-with-the-usb-gadget-power-negotation/20170220-173051 config: i386-randconfig-x015-201708 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): In file included from drivers/usb/gadget/udc/core.c:28:0: include/linux/usb/charger.h: In function 'usb_charger_get_state': >> include/linux/usb/charger.h:151:9: error: 'USB_CHARGER_REMOVE' undeclared >> (first use in this function) return USB_CHARGER_REMOVE; ^~ include/linux/usb/charger.h:151:9: note: each undeclared identifier is reported only once for each function it appears in vim +/USB_CHARGER_REMOVE +151 include/linux/usb/charger.h 28929615 Baolin Wang 2017-02-20 145return UNKNOWN_TYPE; 28929615 Baolin Wang 2017-02-20 146 } 28929615 Baolin Wang 2017-02-20 147 28929615 Baolin Wang 2017-02-20 148 static inline enum usb_charger_state 28929615 Baolin Wang 2017-02-20 149 usb_charger_get_state(struct usb_charger *uchger) 28929615 Baolin Wang 2017-02-20 150 { 28929615 Baolin Wang 2017-02-20 @151return USB_CHARGER_REMOVE; 28929615 Baolin Wang 2017-02-20 152 } 28929615 Baolin Wang 2017-02-20 153 28929615 Baolin Wang 2017-02-20 154 static inline int usb_charger_detect_type(struct usb_charger *uchger) :: The code at line 151 was first introduced by commit :: 289296154f05985dedc08273f04d5b738450b3c7 usb: gadget: Introduce the usb charger framework :: TO: Baolin Wang:: CC: 0day robot --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
[PATCH v19 2/4] usb: gadget: Support for the usb charger framework
For supporting the usb charger, it adds the usb_charger_init() and usb_charger_exit() functions for usb charger initialization and exit. It will report to the usb charger when the gadget state is changed, then the usb charger can do the power things. Signed-off-by: Baolin WangReviewed-by: Li Jun Tested-by: Li Jun --- drivers/usb/gadget/udc/core.c | 19 ++- include/linux/usb/gadget.h|3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 9483489..90df022 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -576,12 +577,17 @@ int usb_gadget_vbus_connect(struct usb_gadget *gadget) * reporting how much power the device may consume. For example, this * could affect how quickly batteries are recharged. * + * It will also notify the USB charger how much power the device may + * consume if there is a USB charger linking with the gadget. + * * Returns zero on success, else negative errno. */ int usb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) { int ret = 0; + usb_charger_set_cur_limit_by_gadget(gadget, mA); + if (!gadget->ops->vbus_draw) { ret = -EOPNOTSUPP; goto out; @@ -963,6 +969,9 @@ static void usb_gadget_state_work(struct work_struct *work) struct usb_gadget *gadget = work_to_gadget(work); struct usb_udc *udc = gadget->udc; + /* when the gadget state is changed, then report to USB charger */ + usb_charger_plug_by_gadget(gadget, gadget->state); + if (udc) sysfs_notify(>dev.kobj, NULL, "state"); } @@ -1132,6 +1141,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, if (ret) goto err4; + ret = usb_charger_init(gadget); + if (ret) + goto err5; + usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED); udc->vbus = true; @@ -1143,7 +1156,7 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, if (ret != -EPROBE_DEFER) list_del(>pending); if (ret) - goto err5; + goto err6; break; } } @@ -1152,6 +1165,9 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, return 0; +err6: + usb_charger_exit(gadget); + err5: device_del(>dev); @@ -1263,6 +1279,7 @@ void usb_del_gadget_udc(struct usb_gadget *gadget) kobject_uevent(>dev.kobj, KOBJ_REMOVE); flush_work(>work); device_unregister(>dev); + usb_charger_exit(gadget); device_unregister(>dev); } EXPORT_SYMBOL_GPL(usb_del_gadget_udc); diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index e4516e9..b4d7be2 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -24,6 +24,7 @@ #include #include #include +#include #define UDC_TRACE_STR_MAX 512 @@ -328,6 +329,7 @@ struct usb_gadget_ops { * @in_epnum: last used in ep number * @mA: last set mA value * @otg_caps: OTG capabilities of this gadget. + * @charger: Negotiate the power with the usb charger. * @sg_supported: true if we can handle scatter-gather * @is_otg: True if the USB device port uses a Mini-AB jack, so that the * gadget driver must provide a USB OTG descriptor. @@ -387,6 +389,7 @@ struct usb_gadget { unsignedin_epnum; unsignedmA; struct usb_otg_caps *otg_caps; + struct usb_charger *charger; unsignedsg_supported:1; unsignedis_otg:1; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html