From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D0E0C4360F for ; Fri, 29 Mar 2019 04:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A20821773 for ; Fri, 29 Mar 2019 04:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728761AbfC2EOy (ORCPT ); Fri, 29 Mar 2019 00:14:54 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:48914 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728655AbfC2EOi (ORCPT ); Fri, 29 Mar 2019 00:14:38 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 84C19D4B1A73A2153A29; Fri, 29 Mar 2019 12:14:35 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.408.0; Fri, 29 Mar 2019 12:14:25 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , Jun Li , Valentin Schneider , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus Subject: [PATCH v5 10/13] usb: dwc3: Registering a role switch in the DRD code. Date: Fri, 29 Mar 2019 12:14:06 +0800 Message-ID: <20190329041409.70138-11-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190329041409.70138-1-chenyu56@huawei.com> References: <20190329041409.70138-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Type-C drivers use USB role switch API to inform the system about the negotiated data role, so registering a role switch in the DRD code in order to support platforms with USB Type-C connectors. Cc: Jun Li Cc: Valentin Schneider Cc: John Stultz Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen --- v2: * Assign fwnode in dwc3_role_switch. v3: * Add default mode property for usb role switch. * Add select USB_ROLE_SWITCH for USB_DWC3_DUAL_ROLE in Kconfig. * Do usb_role_switch_register only if property "usb-role-switch" * present. v4: * Add description for 'role_sw' and 'role_switch_default_mode'. v5: * Init dwc3 mode for usb_role_switch branch. --- --- drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.h | 6 +++++ drivers/usb/dwc3/drd.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 2b1494460d0c..661b1d2efc8b 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -44,6 +44,7 @@ config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) depends on (EXTCON=y || EXTCON=USB_DWC3) + select USB_ROLE_SWITCH help This is the default mode of working of DWC3 controller where both host and gadget features are enabled. diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 6a050d663ec7..e6d40f79faa7 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -958,6 +959,9 @@ struct dwc3_scratchpad_array { * @hsphy_mode: UTMI phy mode, one of following: * - USBPHY_INTERFACE_MODE_UTMI * - USBPHY_INTERFACE_MODE_UTMIW + * role_sw: usb_role_switch handle + * role_switch_default_mode: default operation mode of controller while + * usb role is USB_ROLE_NONE. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY @@ -1091,6 +1095,8 @@ struct dwc3 { struct extcon_dev *edev; struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; + struct usb_role_switch *role_sw; + enum usb_dr_mode role_switch_default_mode; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 726100d1ac0d..3a83596735c4 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -479,6 +479,43 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + u32 mode; + + switch (role) { + case USB_ROLE_HOST: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + case USB_ROLE_DEVICE: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + default: + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + mode = DWC3_GCTL_PRTCAP_HOST; + else + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + } + + dwc3_set_mode(dwc, mode); + return 0; +} + +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + unsigned long flags; + enum usb_role role; + + spin_lock_irqsave(&dwc->lock, flags); + role = dwc->current_otg_role; + spin_unlock_irqrestore(&dwc->lock, flags); + + return role; +} + int dwc3_drd_init(struct dwc3 *dwc) { int ret, irq; @@ -487,7 +524,28 @@ int dwc3_drd_init(struct dwc3 *dwc) if (IS_ERR(dwc->edev)) return PTR_ERR(dwc->edev); - if (dwc->edev) { + if (device_property_read_bool(dwc->dev, "usb-role-switch")) { + struct usb_role_switch_desc dwc3_role_switch = {0}; + u32 mode; + + if (device_property_read_bool(dwc->dev, + "role-switch-default-host")) { + dwc->role_switch_default_mode = USB_DR_MODE_HOST; + mode = DWC3_GCTL_PRTCAP_HOST; + } else { + dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL; + mode = DWC3_GCTL_PRTCAP_DEVICE; + } + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); + dwc3_role_switch.set = dwc3_usb_role_switch_set; + dwc3_role_switch.get = dwc3_usb_role_switch_get; + dwc->role_sw = usb_role_switch_register(dwc->dev, + &dwc3_role_switch); + if (IS_ERR(dwc->role_sw)) + return PTR_ERR(dwc->role_sw); + + dwc3_set_mode(dwc, mode); + } else if (dwc->edev) { dwc->edev_nb.notifier_call = dwc3_drd_notifier; ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); @@ -534,6 +592,9 @@ void dwc3_drd_exit(struct dwc3 *dwc) { unsigned long flags; + if (dwc->role_sw) + usb_role_switch_unregister(dwc->role_sw); + if (dwc->edev) extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); -- 2.15.0-rc2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yu Chen Subject: [PATCH v5 10/13] usb: dwc3: Registering a role switch in the DRD code. Date: Fri, 29 Mar 2019 12:14:06 +0800 Message-ID: <20190329041409.70138-11-chenyu56@huawei.com> References: <20190329041409.70138-1-chenyu56@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20190329041409.70138-1-chenyu56@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Yu Chen , Jun Li , Valentin Schneider , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus List-Id: devicetree@vger.kernel.org The Type-C drivers use USB role switch API to inform the system about the negotiated data role, so registering a role switch in the DRD code in order to support platforms with USB Type-C connectors. Cc: Jun Li Cc: Valentin Schneider Cc: John Stultz Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen --- v2: * Assign fwnode in dwc3_role_switch. v3: * Add default mode property for usb role switch. * Add select USB_ROLE_SWITCH for USB_DWC3_DUAL_ROLE in Kconfig. * Do usb_role_switch_register only if property "usb-role-switch" * present. v4: * Add description for 'role_sw' and 'role_switch_default_mode'. v5: * Init dwc3 mode for usb_role_switch branch. --- --- drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.h | 6 +++++ drivers/usb/dwc3/drd.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 2b1494460d0c..661b1d2efc8b 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -44,6 +44,7 @@ config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) depends on (EXTCON=y || EXTCON=USB_DWC3) + select USB_ROLE_SWITCH help This is the default mode of working of DWC3 controller where both host and gadget features are enabled. diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 6a050d663ec7..e6d40f79faa7 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -958,6 +959,9 @@ struct dwc3_scratchpad_array { * @hsphy_mode: UTMI phy mode, one of following: * - USBPHY_INTERFACE_MODE_UTMI * - USBPHY_INTERFACE_MODE_UTMIW + * role_sw: usb_role_switch handle + * role_switch_default_mode: default operation mode of controller while + * usb role is USB_ROLE_NONE. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY @@ -1091,6 +1095,8 @@ struct dwc3 { struct extcon_dev *edev; struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; + struct usb_role_switch *role_sw; + enum usb_dr_mode role_switch_default_mode; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 726100d1ac0d..3a83596735c4 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -479,6 +479,43 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + u32 mode; + + switch (role) { + case USB_ROLE_HOST: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + case USB_ROLE_DEVICE: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + default: + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + mode = DWC3_GCTL_PRTCAP_HOST; + else + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + } + + dwc3_set_mode(dwc, mode); + return 0; +} + +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + unsigned long flags; + enum usb_role role; + + spin_lock_irqsave(&dwc->lock, flags); + role = dwc->current_otg_role; + spin_unlock_irqrestore(&dwc->lock, flags); + + return role; +} + int dwc3_drd_init(struct dwc3 *dwc) { int ret, irq; @@ -487,7 +524,28 @@ int dwc3_drd_init(struct dwc3 *dwc) if (IS_ERR(dwc->edev)) return PTR_ERR(dwc->edev); - if (dwc->edev) { + if (device_property_read_bool(dwc->dev, "usb-role-switch")) { + struct usb_role_switch_desc dwc3_role_switch = {0}; + u32 mode; + + if (device_property_read_bool(dwc->dev, + "role-switch-default-host")) { + dwc->role_switch_default_mode = USB_DR_MODE_HOST; + mode = DWC3_GCTL_PRTCAP_HOST; + } else { + dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL; + mode = DWC3_GCTL_PRTCAP_DEVICE; + } + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); + dwc3_role_switch.set = dwc3_usb_role_switch_set; + dwc3_role_switch.get = dwc3_usb_role_switch_get; + dwc->role_sw = usb_role_switch_register(dwc->dev, + &dwc3_role_switch); + if (IS_ERR(dwc->role_sw)) + return PTR_ERR(dwc->role_sw); + + dwc3_set_mode(dwc, mode); + } else if (dwc->edev) { dwc->edev_nb.notifier_call = dwc3_drd_notifier; ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); @@ -534,6 +592,9 @@ void dwc3_drd_exit(struct dwc3 *dwc) { unsigned long flags; + if (dwc->role_sw) + usb_role_switch_unregister(dwc->role_sw); + if (dwc->edev) extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); -- 2.15.0-rc2 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,10/13] usb: dwc3: Registering a role switch in the DRD code. From: Yu Chen Message-Id: <20190329041409.70138-11-chenyu56@huawei.com> Date: Fri, 29 Mar 2019 12:14:06 +0800 To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Yu Chen , Jun Li , Valentin Schneider , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus List-ID: VGhlIFR5cGUtQyBkcml2ZXJzIHVzZSBVU0Igcm9sZSBzd2l0Y2ggQVBJIHRvIGluZm9ybSB0aGUK c3lzdGVtIGFib3V0IHRoZSBuZWdvdGlhdGVkIGRhdGEgcm9sZSwgc28gcmVnaXN0ZXJpbmcgYSBy b2xlCnN3aXRjaCBpbiB0aGUgRFJEIGNvZGUgaW4gb3JkZXIgdG8gc3VwcG9ydCBwbGF0Zm9ybXMg d2l0aApVU0IgVHlwZS1DIGNvbm5lY3RvcnMuCgpDYzogSnVuIExpIDxsaWp1bi5rZXJuZWxAZ21h aWwuY29tPgpDYzogVmFsZW50aW4gU2NobmVpZGVyIDx2YWxlbnRpbi5zY2huZWlkZXJAYXJtLmNv bT4KQ2M6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgpDYzogRmVsaXBlIEJh bGJpIDxiYWxiaUBrZXJuZWwub3JnPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu dXhmb3VuZGF0aW9uLm9yZz4KQ2M6IEhlaWtraSBLcm9nZXJ1cyA8aGVpa2tpLmtyb2dlcnVzQGxp bnV4LmludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9n ZXJ1c0BsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFl1IENoZW4gPGNoZW55dTU2QGh1 YXdlaS5jb20+Ci0tLQp2MjoKKiBBc3NpZ24gZndub2RlIGluIGR3YzNfcm9sZV9zd2l0Y2guCnYz OgoqIEFkZCBkZWZhdWx0IG1vZGUgcHJvcGVydHkgZm9yIHVzYiByb2xlIHN3aXRjaC4KKiBBZGQg c2VsZWN0IFVTQl9ST0xFX1NXSVRDSCBmb3IgVVNCX0RXQzNfRFVBTF9ST0xFIGluIEtjb25maWcu CiogRG8gdXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVyIG9ubHkgaWYgcHJvcGVydHkgInVzYi1yb2xl LXN3aXRjaCIKKiBwcmVzZW50Lgp2NDoKKiBBZGQgZGVzY3JpcHRpb24gZm9yICdyb2xlX3N3JyBh bmQgJ3JvbGVfc3dpdGNoX2RlZmF1bHRfbW9kZScuCnY1OgoqIEluaXQgZHdjMyBtb2RlIGZvciB1 c2Jfcm9sZV9zd2l0Y2ggYnJhbmNoLgotLS0KLS0tCiBkcml2ZXJzL3VzYi9kd2MzL0tjb25maWcg fCAgMSArCiBkcml2ZXJzL3VzYi9kd2MzL2NvcmUuaCAgfCAgNiArKysrKwogZHJpdmVycy91c2Iv ZHdjMy9kcmQuYyAgIHwgNjMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDY5IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24o LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9kd2MzL0tjb25maWcgYi9kcml2ZXJzL3VzYi9k d2MzL0tjb25maWcKaW5kZXggMmIxNDk0NDYwZDBjLi42NjFiMWQyZWZjOGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvdXNiL2R3YzMvS2NvbmZpZworKysgYi9kcml2ZXJzL3VzYi9kd2MzL0tjb25maWcK QEAgLTQ0LDYgKzQ0LDcgQEAgY29uZmlnIFVTQl9EV0MzX0RVQUxfUk9MRQogCWJvb2wgIkR1YWwg Um9sZSBtb2RlIgogCWRlcGVuZHMgb24gKChVU0I9eSB8fCBVU0I9VVNCX0RXQzMpICYmIChVU0Jf R0FER0VUPXkgfHwgVVNCX0dBREdFVD1VU0JfRFdDMykpCiAJZGVwZW5kcyBvbiAoRVhUQ09OPXkg fHwgRVhUQ09OPVVTQl9EV0MzKQorCXNlbGVjdCBVU0JfUk9MRV9TV0lUQ0gKIAloZWxwCiAJICBU aGlzIGlzIHRoZSBkZWZhdWx0IG1vZGUgb2Ygd29ya2luZyBvZiBEV0MzIGNvbnRyb2xsZXIgd2hl cmUKIAkgIGJvdGggaG9zdCBhbmQgZ2FkZ2V0IGZlYXR1cmVzIGFyZSBlbmFibGVkLgpkaWZmIC0t Z2l0IGEvZHJpdmVycy91c2IvZHdjMy9jb3JlLmggYi9kcml2ZXJzL3VzYi9kd2MzL2NvcmUuaApp bmRleCA2YTA1MGQ2NjNlYzcuLmU2ZDQwZjc5ZmFhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv ZHdjMy9jb3JlLmgKKysrIGIvZHJpdmVycy91c2IvZHdjMy9jb3JlLmgKQEAgLTI1LDYgKzI1LDcg QEAKICNpbmNsdWRlIDxsaW51eC91c2IvY2g5Lmg+CiAjaW5jbHVkZSA8bGludXgvdXNiL2dhZGdl dC5oPgogI2luY2x1ZGUgPGxpbnV4L3VzYi9vdGcuaD4KKyNpbmNsdWRlIDxsaW51eC91c2Ivcm9s ZS5oPgogI2luY2x1ZGUgPGxpbnV4L3VscGkvaW50ZXJmYWNlLmg+CiAKICNpbmNsdWRlIDxsaW51 eC9waHkvcGh5Lmg+CkBAIC05NTgsNiArOTU5LDkgQEAgc3RydWN0IGR3YzNfc2NyYXRjaHBhZF9h cnJheSB7CiAgKiBAaHNwaHlfbW9kZTogVVRNSSBwaHkgbW9kZSwgb25lIG9mIGZvbGxvd2luZzoK ICAqCQktIFVTQlBIWV9JTlRFUkZBQ0VfTU9ERV9VVE1JCiAgKgkJLSBVU0JQSFlfSU5URVJGQUNF X01PREVfVVRNSVcKKyAqIHJvbGVfc3c6IHVzYl9yb2xlX3N3aXRjaCBoYW5kbGUKKyAqIHJvbGVf c3dpdGNoX2RlZmF1bHRfbW9kZTogZGVmYXVsdCBvcGVyYXRpb24gbW9kZSBvZiBjb250cm9sbGVy IHdoaWxlCisgKgkJCXVzYiByb2xlIGlzIFVTQl9ST0xFX05PTkUuCiAgKiBAdXNiMl9waHk6IHBv aW50ZXIgdG8gVVNCMiBQSFkKICAqIEB1c2IzX3BoeTogcG9pbnRlciB0byBVU0IzIFBIWQogICog QHVzYjJfZ2VuZXJpY19waHk6IHBvaW50ZXIgdG8gVVNCMiBQSFkKQEAgLTEwOTEsNiArMTA5NSw4 IEBAIHN0cnVjdCBkd2MzIHsKIAlzdHJ1Y3QgZXh0Y29uX2RldgkqZWRldjsKIAlzdHJ1Y3Qgbm90 aWZpZXJfYmxvY2sJZWRldl9uYjsKIAllbnVtIHVzYl9waHlfaW50ZXJmYWNlCWhzcGh5X21vZGU7 CisJc3RydWN0IHVzYl9yb2xlX3N3aXRjaAkqcm9sZV9zdzsKKwllbnVtIHVzYl9kcl9tb2RlCXJv bGVfc3dpdGNoX2RlZmF1bHRfbW9kZTsKIAogCXUzMgkJCWZsYWRqOwogCXUzMgkJCWlycV9nYWRn ZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9kd2MzL2RyZC5jIGIvZHJpdmVycy91c2IvZHdj My9kcmQuYwppbmRleCA3MjYxMDBkMWFjMGQuLjNhODM1OTY3MzVjNCAxMDA2NDQKLS0tIGEvZHJp dmVycy91c2IvZHdjMy9kcmQuYworKysgYi9kcml2ZXJzL3VzYi9kd2MzL2RyZC5jCkBAIC00Nzks NiArNDc5LDQzIEBAIHN0YXRpYyBzdHJ1Y3QgZXh0Y29uX2RldiAqZHdjM19nZXRfZXh0Y29uKHN0 cnVjdCBkd2MzICpkd2MpCiAJcmV0dXJuIGVkZXY7CiB9CiAKK3N0YXRpYyBpbnQgZHdjM191c2Jf cm9sZV9zd2l0Y2hfc2V0KHN0cnVjdCBkZXZpY2UgKmRldiwgZW51bSB1c2Jfcm9sZSByb2xlKQor eworCXN0cnVjdCBkd2MzICpkd2MgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKKwl1MzIgbW9kZTsK KworCXN3aXRjaCAocm9sZSkgeworCWNhc2UgVVNCX1JPTEVfSE9TVDoKKwkJbW9kZSA9IERXQzNf R0NUTF9QUlRDQVBfSE9TVDsKKwkJYnJlYWs7CisJY2FzZSBVU0JfUk9MRV9ERVZJQ0U6CisJCW1v ZGUgPSBEV0MzX0dDVExfUFJUQ0FQX0RFVklDRTsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJaWYg KGR3Yy0+cm9sZV9zd2l0Y2hfZGVmYXVsdF9tb2RlID09IFVTQl9EUl9NT0RFX0hPU1QpCisJCQlt b2RlID0gRFdDM19HQ1RMX1BSVENBUF9IT1NUOworCQllbHNlCisJCQltb2RlID0gRFdDM19HQ1RM X1BSVENBUF9ERVZJQ0U7CisJCWJyZWFrOworCX0KKworCWR3YzNfc2V0X21vZGUoZHdjLCBtb2Rl KTsKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGVudW0gdXNiX3JvbGUgZHdjM191c2Jfcm9sZV9z d2l0Y2hfZ2V0KHN0cnVjdCBkZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHdjMyAqZHdjID0gZGV2 X2dldF9kcnZkYXRhKGRldik7CisJdW5zaWduZWQgbG9uZyBmbGFnczsKKwllbnVtIHVzYl9yb2xl IHJvbGU7CisKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZHdjLT5sb2NrLCBmbGFncyk7CisJcm9sZSA9 IGR3Yy0+Y3VycmVudF9vdGdfcm9sZTsKKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkd2MtPmxv Y2ssIGZsYWdzKTsKKworCXJldHVybiByb2xlOworfQorCiBpbnQgZHdjM19kcmRfaW5pdChzdHJ1 Y3QgZHdjMyAqZHdjKQogewogCWludCByZXQsIGlycTsKQEAgLTQ4Nyw3ICs1MjQsMjggQEAgaW50 IGR3YzNfZHJkX2luaXQoc3RydWN0IGR3YzMgKmR3YykKIAlpZiAoSVNfRVJSKGR3Yy0+ZWRldikp CiAJCXJldHVybiBQVFJfRVJSKGR3Yy0+ZWRldik7CiAKLQlpZiAoZHdjLT5lZGV2KSB7CisJaWYg KGRldmljZV9wcm9wZXJ0eV9yZWFkX2Jvb2woZHdjLT5kZXYsICJ1c2Itcm9sZS1zd2l0Y2giKSkg eworCQlzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoX2Rlc2MgZHdjM19yb2xlX3N3aXRjaCA9IHswfTsK KwkJdTMyIG1vZGU7CisKKwkJaWYgKGRldmljZV9wcm9wZXJ0eV9yZWFkX2Jvb2woZHdjLT5kZXYs CisJCQkJInJvbGUtc3dpdGNoLWRlZmF1bHQtaG9zdCIpKSB7CisJCQlkd2MtPnJvbGVfc3dpdGNo X2RlZmF1bHRfbW9kZSA9IFVTQl9EUl9NT0RFX0hPU1Q7CisJCQltb2RlID0gRFdDM19HQ1RMX1BS VENBUF9IT1NUOworCQl9IGVsc2UgeworCQkJZHdjLT5yb2xlX3N3aXRjaF9kZWZhdWx0X21vZGUg PSBVU0JfRFJfTU9ERV9QRVJJUEhFUkFMOworCQkJbW9kZSA9IERXQzNfR0NUTF9QUlRDQVBfREVW SUNFOworCQl9CisJCWR3YzNfcm9sZV9zd2l0Y2guZndub2RlID0gZGV2X2Z3bm9kZShkd2MtPmRl dik7CisJCWR3YzNfcm9sZV9zd2l0Y2guc2V0ID0gZHdjM191c2Jfcm9sZV9zd2l0Y2hfc2V0Owor CQlkd2MzX3JvbGVfc3dpdGNoLmdldCA9IGR3YzNfdXNiX3JvbGVfc3dpdGNoX2dldDsKKwkJZHdj LT5yb2xlX3N3ID0gdXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVyKGR3Yy0+ZGV2LAorCQkJCQkJCSZk d2MzX3JvbGVfc3dpdGNoKTsKKwkJaWYgKElTX0VSUihkd2MtPnJvbGVfc3cpKQorCQkJcmV0dXJu IFBUUl9FUlIoZHdjLT5yb2xlX3N3KTsKKworCQlkd2MzX3NldF9tb2RlKGR3YywgbW9kZSk7CisJ fSBlbHNlIGlmIChkd2MtPmVkZXYpIHsKIAkJZHdjLT5lZGV2X25iLm5vdGlmaWVyX2NhbGwgPSBk d2MzX2RyZF9ub3RpZmllcjsKIAkJcmV0ID0gZXh0Y29uX3JlZ2lzdGVyX25vdGlmaWVyKGR3Yy0+ ZWRldiwgRVhUQ09OX1VTQl9IT1NULAogCQkJCQkgICAgICAgJmR3Yy0+ZWRldl9uYik7CkBAIC01 MzQsNiArNTkyLDkgQEAgdm9pZCBkd2MzX2RyZF9leGl0KHN0cnVjdCBkd2MzICpkd2MpCiB7CiAJ dW5zaWduZWQgbG9uZyBmbGFnczsKIAorCWlmIChkd2MtPnJvbGVfc3cpCisJCXVzYl9yb2xlX3N3 aXRjaF91bnJlZ2lzdGVyKGR3Yy0+cm9sZV9zdyk7CisKIAlpZiAoZHdjLT5lZGV2KQogCQlleHRj b25fdW5yZWdpc3Rlcl9ub3RpZmllcihkd2MtPmVkZXYsIEVYVENPTl9VU0JfSE9TVCwKIAkJCQkJ ICAgJmR3Yy0+ZWRldl9uYik7Cg==