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=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 72FA4C282C3 for ; Thu, 24 Jan 2019 23:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A459218A6 for ; Thu, 24 Jan 2019 23:28:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="txV6W1Zt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728345AbfAXX2V (ORCPT ); Thu, 24 Jan 2019 18:28:21 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:50109 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728063AbfAXX2U (ORCPT ); Thu, 24 Jan 2019 18:28:20 -0500 Received: by mail-pf1-f202.google.com with SMTP id x67so5930522pfk.16 for ; Thu, 24 Jan 2019 15:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=D/n+iLRONY/z6dZgG+EgYqvlkP4ooj+2tYEzHi4XON8=; b=txV6W1ZtraQlt92o41uu1lgVNKxl2QudDXVTpqZUX1sEpcpYGASapdFDOP9Tp4EuUs TV73GzGOZrUzx+fP3gd7iRe77Fl+NiW8iyDU2+BbJck6Re40dDYsLxuFY7n6aFV2ET/w HGVo/O7C9mit0ZagtYTYyvS6NpNAlh4kcCeFkk374tEf07QTFlexStj1z+970VSBkNm2 9jZRImP/0EDw1w4NDB6B6Q+J6u97QmVoKRGQCk8I9naVbseIVOeQ9gQ7bTRbxuNzQWfz oTXatJWHh0KY0qpJVFM03TF8A0+nnB5wZe1tpQCdiF7I6lw5UMfpo79IPVrhsr75O7cH xqzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=D/n+iLRONY/z6dZgG+EgYqvlkP4ooj+2tYEzHi4XON8=; b=SX3Gdbn5hK3EF78DNJqZQ0GY+jXCAnOLIgbMXGKPRRNhR3t2t6ruof7IH2KK7OYJ2H Cd99s01lNMfzDx2PkQjlF0MMNoBd0kBOqmeUDWiHoG9d6ZWQnN9l9c6cz4kFQV4dzQQb F9NqBEP+mvMUZIq6OaXI1es/GnpVRcvUWBXd7BJ5D+cqhZKq4Chfj1E8JXUbk//vfn1l DaiKvkPc7DhugYGpFUj9BNGb/lF75frd+izzpHHVUBflwfiE0Ffi0AFTiKZ/xYuiCayt z7bkKhvvNtQzAWX1wFQy9g012Yrv8HJ34O7alkgiIqObqMtwJwgarclf70i0nU7oaLnM LuFA== X-Gm-Message-State: AJcUukccsJLpz60hDfnLBoq6D5D5yx4aUJqmdq0pY2DZ8nfxxCNWmGR8 ecYgNu3SO3zkeEpOaM40AOem3ry0kEhS X-Google-Smtp-Source: ALg8bN6HHHD2nMkSDU1L8mSuEWBGcMe9KW51EMyzOioDKV6Cqj7V505GT7KeSuUfz7QfElfy2qXxsIQGLGmL X-Received: by 2002:a63:790f:: with SMTP id u15mr3805073pgc.125.1548372499784; Thu, 24 Jan 2019 15:28:19 -0800 (PST) Date: Thu, 24 Jan 2019 15:28:11 -0800 In-Reply-To: <20181117010748.24347-1-rajatja@google.com> Message-Id: <20190124232814.252661-1-rajatja@google.com> Mime-Version: 1.0 References: <20181117010748.24347-1-rajatja@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH v6 1/4] usb: split code locating ACPI companion into port and device From: Rajat Jain To: Marcel Holtmann , Johan Hedberg , Greg Kroah-Hartman , "David S. Miller" , Dmitry Torokhov , Rajat Jain , Alex Hung , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: rajatxjain@gmail.com, dtor@google.com, raghuram.hegde@intel.com, chethan.tumkur.narayan@intel.com, sukumar.ghorai@intel.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Torokhov In preparation for handling embedded USB devices let's split usb_acpi_find_companion() into usb_acpi_find_companion_for_device() and usb_acpi_find_companion_for_port(). Signed-off-by: Dmitry Torokhov Signed-off-by: Rajat Jain Acked-by: Greg Kroah-Hartman Tested-by: Sukumar Ghorai --- v6: same as v4 v5: same as v4 v4: Add Acked-by and Tested-by in signatures. v3: same as v1 v2: same as v1 drivers/usb/core/usb-acpi.c | 133 +++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index e221861b3187..8ff73c83e8e8 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -139,12 +139,79 @@ static struct acpi_device *usb_acpi_find_port(struct acpi_device *parent, return acpi_find_child_device(parent, raw, false); } -static struct acpi_device *usb_acpi_find_companion(struct device *dev) +static struct acpi_device * +usb_acpi_get_companion_for_port(struct usb_port *port_dev) { struct usb_device *udev; struct acpi_device *adev; acpi_handle *parent_handle; + int port1; + + /* Get the struct usb_device point of port's hub */ + udev = to_usb_device(port_dev->dev.parent->parent); + + /* + * The root hub ports' parent is the root hub. The non-root-hub + * ports' parent is the parent hub port which the hub is + * connected to. + */ + if (!udev->parent) { + adev = ACPI_COMPANION(&udev->dev); + port1 = usb_hcd_find_raw_port_number(bus_to_hcd(udev->bus), + port_dev->portnum); + } else { + parent_handle = usb_get_hub_port_acpi_handle(udev->parent, + udev->portnum); + if (!parent_handle) + return NULL; + + acpi_bus_get_device(parent_handle, &adev); + port1 = port_dev->portnum; + } + + return usb_acpi_find_port(adev, port1); +} + +static struct acpi_device * +usb_acpi_find_companion_for_port(struct usb_port *port_dev) +{ + struct acpi_device *adev; + struct acpi_pld_info *pld; + acpi_handle *handle; + acpi_status status; + + adev = usb_acpi_get_companion_for_port(port_dev); + if (!adev) + return NULL; + + handle = adev->handle; + status = acpi_get_physical_device_location(handle, &pld); + if (!ACPI_FAILURE(status) && pld) { + port_dev->location = USB_ACPI_LOCATION_VALID + | pld->group_token << 8 | pld->group_position; + port_dev->connect_type = usb_acpi_get_connect_type(handle, pld); + ACPI_FREE(pld); + } + return adev; +} + +static struct acpi_device * +usb_acpi_find_companion_for_device(struct usb_device *udev) +{ + struct acpi_device *adev; + + if (!udev->parent) + return NULL; + + /* root hub is only child (_ADR=0) under its parent, the HC */ + adev = ACPI_COMPANION(udev->dev.parent); + return acpi_find_child_device(adev, 0, false); +} + + +static struct acpi_device *usb_acpi_find_companion(struct device *dev) +{ /* * In the ACPI DSDT table, only usb root hub and usb ports are * acpi device nodes. The hierarchy like following. @@ -158,66 +225,10 @@ static struct acpi_device *usb_acpi_find_companion(struct device *dev) * So all binding process is divided into two parts. binding * root hub and usb ports. */ - if (is_usb_device(dev)) { - udev = to_usb_device(dev); - if (udev->parent) - return NULL; - - /* root hub is only child (_ADR=0) under its parent, the HC */ - adev = ACPI_COMPANION(dev->parent); - return acpi_find_child_device(adev, 0, false); - } else if (is_usb_port(dev)) { - struct usb_port *port_dev = to_usb_port(dev); - int port1 = port_dev->portnum; - struct acpi_pld_info *pld; - acpi_handle *handle; - acpi_status status; - - /* Get the struct usb_device point of port's hub */ - udev = to_usb_device(dev->parent->parent); - - /* - * The root hub ports' parent is the root hub. The non-root-hub - * ports' parent is the parent hub port which the hub is - * connected to. - */ - if (!udev->parent) { - struct usb_hcd *hcd = bus_to_hcd(udev->bus); - int raw; - - raw = usb_hcd_find_raw_port_number(hcd, port1); - - adev = usb_acpi_find_port(ACPI_COMPANION(&udev->dev), - raw); - - if (!adev) - return NULL; - } else { - parent_handle = - usb_get_hub_port_acpi_handle(udev->parent, - udev->portnum); - if (!parent_handle) - return NULL; - - acpi_bus_get_device(parent_handle, &adev); - - adev = usb_acpi_find_port(adev, port1); - - if (!adev) - return NULL; - } - handle = adev->handle; - status = acpi_get_physical_device_location(handle, &pld); - if (ACPI_FAILURE(status) || !pld) - return adev; - - port_dev->location = USB_ACPI_LOCATION_VALID - | pld->group_token << 8 | pld->group_position; - port_dev->connect_type = usb_acpi_get_connect_type(handle, pld); - ACPI_FREE(pld); - - return adev; - } + if (is_usb_device(dev)) + return usb_acpi_find_companion_for_device(to_usb_device(dev)); + else if (is_usb_port(dev)) + return usb_acpi_find_companion_for_port(to_usb_port(dev)); return NULL; } -- 2.20.1.321.g9e740568ce-goog 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: [v6,1/4] usb: split code locating ACPI companion into port and device From: Rajat Jain Message-Id: <20190124232814.252661-1-rajatja@google.com> Date: Thu, 24 Jan 2019 15:28:11 -0800 To: Marcel Holtmann , Johan Hedberg , Greg Kroah-Hartman , "David S. Miller" , Dmitry Torokhov , Rajat Jain , Alex Hung , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: rajatxjain@gmail.com, dtor@google.com, raghuram.hegde@intel.com, chethan.tumkur.narayan@intel.com, sukumar.ghorai@intel.com List-ID: RnJvbTogRG1pdHJ5IFRvcm9raG92IDxkdG9yQGNocm9taXVtLm9yZz4KCkluIHByZXBhcmF0aW9u IGZvciBoYW5kbGluZyBlbWJlZGRlZCBVU0IgZGV2aWNlcyBsZXQncyBzcGxpdAp1c2JfYWNwaV9m aW5kX2NvbXBhbmlvbigpIGludG8gdXNiX2FjcGlfZmluZF9jb21wYW5pb25fZm9yX2RldmljZSgp IGFuZAp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbl9mb3JfcG9ydCgpLgoKU2lnbmVkLW9mZi1ieTog RG1pdHJ5IFRvcm9raG92IDxkdG9yQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogUmFqYXQg SmFpbiA8cmFqYXRqYUBnb29nbGUuY29tPgpBY2tlZC1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxn cmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KVGVzdGVkLWJ5OiBTdWt1bWFyIEdob3JhaSA8c3Vr dW1hci5naG9yYWlAaW50ZWwuY29tPgotLS0KdjY6IHNhbWUgYXMgdjQKdjU6IHNhbWUgYXMgdjQK djQ6IEFkZCBBY2tlZC1ieSBhbmQgVGVzdGVkLWJ5IGluIHNpZ25hdHVyZXMuCnYzOiBzYW1lIGFz IHYxCnYyOiBzYW1lIGFzIHYxCgogZHJpdmVycy91c2IvY29yZS91c2ItYWNwaS5jIHwgMTMzICsr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcyIGlu c2VydGlvbnMoKyksIDYxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2Nv cmUvdXNiLWFjcGkuYyBiL2RyaXZlcnMvdXNiL2NvcmUvdXNiLWFjcGkuYwppbmRleCBlMjIxODYx YjMxODcuLjhmZjczYzgzZThlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvY29yZS91c2ItYWNw aS5jCisrKyBiL2RyaXZlcnMvdXNiL2NvcmUvdXNiLWFjcGkuYwpAQCAtMTM5LDEyICsxMzksNzkg QEAgc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAqdXNiX2FjcGlfZmluZF9wb3J0KHN0cnVjdCBh Y3BpX2RldmljZSAqcGFyZW50LAogCXJldHVybiBhY3BpX2ZpbmRfY2hpbGRfZGV2aWNlKHBhcmVu dCwgcmF3LCBmYWxzZSk7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKnVzYl9hY3Bp X2ZpbmRfY29tcGFuaW9uKHN0cnVjdCBkZXZpY2UgKmRldikKK3N0YXRpYyBzdHJ1Y3QgYWNwaV9k ZXZpY2UgKgordXNiX2FjcGlfZ2V0X2NvbXBhbmlvbl9mb3JfcG9ydChzdHJ1Y3QgdXNiX3BvcnQg KnBvcnRfZGV2KQogewogCXN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2OwogCXN0cnVjdCBhY3BpX2Rl dmljZSAqYWRldjsKIAlhY3BpX2hhbmRsZSAqcGFyZW50X2hhbmRsZTsKKwlpbnQgcG9ydDE7CisK KwkvKiBHZXQgdGhlIHN0cnVjdCB1c2JfZGV2aWNlIHBvaW50IG9mIHBvcnQncyBodWIgKi8KKwl1 ZGV2ID0gdG9fdXNiX2RldmljZShwb3J0X2Rldi0+ZGV2LnBhcmVudC0+cGFyZW50KTsKKworCS8q CisJICogVGhlIHJvb3QgaHViIHBvcnRzJyBwYXJlbnQgaXMgdGhlIHJvb3QgaHViLiBUaGUgbm9u LXJvb3QtaHViCisJICogcG9ydHMnIHBhcmVudCBpcyB0aGUgcGFyZW50IGh1YiBwb3J0IHdoaWNo IHRoZSBodWIgaXMKKwkgKiBjb25uZWN0ZWQgdG8uCisJICovCisJaWYgKCF1ZGV2LT5wYXJlbnQp IHsKKwkJYWRldiA9IEFDUElfQ09NUEFOSU9OKCZ1ZGV2LT5kZXYpOworCQlwb3J0MSA9IHVzYl9o Y2RfZmluZF9yYXdfcG9ydF9udW1iZXIoYnVzX3RvX2hjZCh1ZGV2LT5idXMpLAorCQkJCQkJICAg ICBwb3J0X2Rldi0+cG9ydG51bSk7CisJfSBlbHNlIHsKKwkJcGFyZW50X2hhbmRsZSA9IHVzYl9n ZXRfaHViX3BvcnRfYWNwaV9oYW5kbGUodWRldi0+cGFyZW50LAorCQkJCQkJCSAgICAgdWRldi0+ cG9ydG51bSk7CisJCWlmICghcGFyZW50X2hhbmRsZSkKKwkJCXJldHVybiBOVUxMOworCisJCWFj cGlfYnVzX2dldF9kZXZpY2UocGFyZW50X2hhbmRsZSwgJmFkZXYpOworCQlwb3J0MSA9IHBvcnRf ZGV2LT5wb3J0bnVtOworCX0KKworCXJldHVybiB1c2JfYWNwaV9maW5kX3BvcnQoYWRldiwgcG9y dDEpOworfQorCitzdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNlICoKK3VzYl9hY3BpX2ZpbmRfY29t cGFuaW9uX2Zvcl9wb3J0KHN0cnVjdCB1c2JfcG9ydCAqcG9ydF9kZXYpCit7CisJc3RydWN0IGFj cGlfZGV2aWNlICphZGV2OworCXN0cnVjdCBhY3BpX3BsZF9pbmZvICpwbGQ7CisJYWNwaV9oYW5k bGUgKmhhbmRsZTsKKwlhY3BpX3N0YXR1cyBzdGF0dXM7CisKKwlhZGV2ID0gdXNiX2FjcGlfZ2V0 X2NvbXBhbmlvbl9mb3JfcG9ydChwb3J0X2Rldik7CisJaWYgKCFhZGV2KQorCQlyZXR1cm4gTlVM TDsKKworCWhhbmRsZSA9IGFkZXYtPmhhbmRsZTsKKwlzdGF0dXMgPSBhY3BpX2dldF9waHlzaWNh bF9kZXZpY2VfbG9jYXRpb24oaGFuZGxlLCAmcGxkKTsKKwlpZiAoIUFDUElfRkFJTFVSRShzdGF0 dXMpICYmIHBsZCkgeworCQlwb3J0X2Rldi0+bG9jYXRpb24gPSBVU0JfQUNQSV9MT0NBVElPTl9W QUxJRAorCQkJfCBwbGQtPmdyb3VwX3Rva2VuIDw8IDggfCBwbGQtPmdyb3VwX3Bvc2l0aW9uOwor CQlwb3J0X2Rldi0+Y29ubmVjdF90eXBlID0gdXNiX2FjcGlfZ2V0X2Nvbm5lY3RfdHlwZShoYW5k bGUsIHBsZCk7CisJCUFDUElfRlJFRShwbGQpOworCX0KIAorCXJldHVybiBhZGV2OworfQorCitz dGF0aWMgc3RydWN0IGFjcGlfZGV2aWNlICoKK3VzYl9hY3BpX2ZpbmRfY29tcGFuaW9uX2Zvcl9k ZXZpY2Uoc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYpCit7CisJc3RydWN0IGFjcGlfZGV2aWNlICph ZGV2OworCisJaWYgKCF1ZGV2LT5wYXJlbnQpCisJCXJldHVybiBOVUxMOworCisJLyogcm9vdCBo dWIgaXMgb25seSBjaGlsZCAoX0FEUj0wKSB1bmRlciBpdHMgcGFyZW50LCB0aGUgSEMgKi8KKwlh ZGV2ID0gQUNQSV9DT01QQU5JT04odWRldi0+ZGV2LnBhcmVudCk7CisJcmV0dXJuIGFjcGlfZmlu ZF9jaGlsZF9kZXZpY2UoYWRldiwgMCwgZmFsc2UpOworfQorCisKK3N0YXRpYyBzdHJ1Y3QgYWNw aV9kZXZpY2UgKnVzYl9hY3BpX2ZpbmRfY29tcGFuaW9uKHN0cnVjdCBkZXZpY2UgKmRldikKK3sK IAkvKgogCSAqIEluIHRoZSBBQ1BJIERTRFQgdGFibGUsIG9ubHkgdXNiIHJvb3QgaHViIGFuZCB1 c2IgcG9ydHMgYXJlCiAJICogYWNwaSBkZXZpY2Ugbm9kZXMuIFRoZSBoaWVyYXJjaHkgbGlrZSBm b2xsb3dpbmcuCkBAIC0xNTgsNjYgKzIyNSwxMCBAQCBzdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNl ICp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbihzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJICogU28gYWxs IGJpbmRpbmcgcHJvY2VzcyBpcyBkaXZpZGVkIGludG8gdHdvIHBhcnRzLiBiaW5kaW5nCiAJICog cm9vdCBodWIgYW5kIHVzYiBwb3J0cy4KIAkgKi8KLQlpZiAoaXNfdXNiX2RldmljZShkZXYpKSB7 Ci0JCXVkZXYgPSB0b191c2JfZGV2aWNlKGRldik7Ci0JCWlmICh1ZGV2LT5wYXJlbnQpCi0JCQly ZXR1cm4gTlVMTDsKLQotCQkvKiByb290IGh1YiBpcyBvbmx5IGNoaWxkIChfQURSPTApIHVuZGVy IGl0cyBwYXJlbnQsIHRoZSBIQyAqLwotCQlhZGV2ID0gQUNQSV9DT01QQU5JT04oZGV2LT5wYXJl bnQpOwotCQlyZXR1cm4gYWNwaV9maW5kX2NoaWxkX2RldmljZShhZGV2LCAwLCBmYWxzZSk7Ci0J fSBlbHNlIGlmIChpc191c2JfcG9ydChkZXYpKSB7Ci0JCXN0cnVjdCB1c2JfcG9ydCAqcG9ydF9k ZXYgPSB0b191c2JfcG9ydChkZXYpOwotCQlpbnQgcG9ydDEgPSBwb3J0X2Rldi0+cG9ydG51bTsK LQkJc3RydWN0IGFjcGlfcGxkX2luZm8gKnBsZDsKLQkJYWNwaV9oYW5kbGUgKmhhbmRsZTsKLQkJ YWNwaV9zdGF0dXMgc3RhdHVzOwotCi0JCS8qIEdldCB0aGUgc3RydWN0IHVzYl9kZXZpY2UgcG9p bnQgb2YgcG9ydCdzIGh1YiAqLwotCQl1ZGV2ID0gdG9fdXNiX2RldmljZShkZXYtPnBhcmVudC0+ cGFyZW50KTsKLQotCQkvKgotCQkgKiBUaGUgcm9vdCBodWIgcG9ydHMnIHBhcmVudCBpcyB0aGUg cm9vdCBodWIuIFRoZSBub24tcm9vdC1odWIKLQkJICogcG9ydHMnIHBhcmVudCBpcyB0aGUgcGFy ZW50IGh1YiBwb3J0IHdoaWNoIHRoZSBodWIgaXMKLQkJICogY29ubmVjdGVkIHRvLgotCQkgKi8K LQkJaWYgKCF1ZGV2LT5wYXJlbnQpIHsKLQkJCXN0cnVjdCB1c2JfaGNkICpoY2QgPSBidXNfdG9f aGNkKHVkZXYtPmJ1cyk7Ci0JCQlpbnQgcmF3OwotCi0JCQlyYXcgPSB1c2JfaGNkX2ZpbmRfcmF3 X3BvcnRfbnVtYmVyKGhjZCwgcG9ydDEpOwotCi0JCQlhZGV2ID0gdXNiX2FjcGlfZmluZF9wb3J0 KEFDUElfQ09NUEFOSU9OKCZ1ZGV2LT5kZXYpLAotCQkJCQkJICByYXcpOwotCi0JCQlpZiAoIWFk ZXYpCi0JCQkJcmV0dXJuIE5VTEw7Ci0JCX0gZWxzZSB7Ci0JCQlwYXJlbnRfaGFuZGxlID0KLQkJ CQl1c2JfZ2V0X2h1Yl9wb3J0X2FjcGlfaGFuZGxlKHVkZXYtPnBhcmVudCwKLQkJCQl1ZGV2LT5w b3J0bnVtKTsKLQkJCWlmICghcGFyZW50X2hhbmRsZSkKLQkJCQlyZXR1cm4gTlVMTDsKLQotCQkJ YWNwaV9idXNfZ2V0X2RldmljZShwYXJlbnRfaGFuZGxlLCAmYWRldik7Ci0KLQkJCWFkZXYgPSB1 c2JfYWNwaV9maW5kX3BvcnQoYWRldiwgcG9ydDEpOwotCi0JCQlpZiAoIWFkZXYpCi0JCQkJcmV0 dXJuIE5VTEw7Ci0JCX0KLQkJaGFuZGxlID0gYWRldi0+aGFuZGxlOwotCQlzdGF0dXMgPSBhY3Bp X2dldF9waHlzaWNhbF9kZXZpY2VfbG9jYXRpb24oaGFuZGxlLCAmcGxkKTsKLQkJaWYgKEFDUElf RkFJTFVSRShzdGF0dXMpIHx8ICFwbGQpCi0JCQlyZXR1cm4gYWRldjsKLQotCQlwb3J0X2Rldi0+ bG9jYXRpb24gPSBVU0JfQUNQSV9MT0NBVElPTl9WQUxJRAotCQkJfCBwbGQtPmdyb3VwX3Rva2Vu IDw8IDggfCBwbGQtPmdyb3VwX3Bvc2l0aW9uOwotCQlwb3J0X2Rldi0+Y29ubmVjdF90eXBlID0g dXNiX2FjcGlfZ2V0X2Nvbm5lY3RfdHlwZShoYW5kbGUsIHBsZCk7Ci0JCUFDUElfRlJFRShwbGQp OwotCi0JCXJldHVybiBhZGV2OwotCX0KKwlpZiAoaXNfdXNiX2RldmljZShkZXYpKQorCQlyZXR1 cm4gdXNiX2FjcGlfZmluZF9jb21wYW5pb25fZm9yX2RldmljZSh0b191c2JfZGV2aWNlKGRldikp OworCWVsc2UgaWYgKGlzX3VzYl9wb3J0KGRldikpCisJCXJldHVybiB1c2JfYWNwaV9maW5kX2Nv bXBhbmlvbl9mb3JfcG9ydCh0b191c2JfcG9ydChkZXYpKTsKIAogCXJldHVybiBOVUxMOwogfQo=