From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934060AbdEKSbk (ORCPT ); Thu, 11 May 2017 14:31:40 -0400 Received: from anholt.net ([50.246.234.109]:56208 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934036AbdEKSbg (ORCPT ); Thu, 11 May 2017 14:31:36 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org, Boris Brezillon , Archit Taneja , Andrzej Hajda , Laurent Pinchart , CK Hu , Philipp Zabel , Yannick Fertre , Philippe Cornu Cc: linux-kernel@vger.kernel.org, Eric Anholt Subject: [PATCH v2 1/7] drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge. Date: Thu, 11 May 2017 11:31:22 -0700 Message-Id: <20170511183128.25085-1-eric@anholt.net> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many DRM drivers have common code to make a stub connector implementation that wraps a drm_panel. By wrapping the panel in a DRM bridge, all of the connector code (including calls during encoder enable/disable) goes away. v2: Fix build with CONFIG_DRM=m, drop "dev" argument that should just be the panel's dev, move kerneldoc up a level and document _remove(). Signed-off-by: Eric Anholt Acked-by: Daniel Vetter --- Documentation/gpu/drm-kms-helpers.rst | 6 ++ drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/bridge/Kconfig | 11 +- drivers/gpu/drm/bridge/lvds-encoder.c | 157 ++++----------------------- drivers/gpu/drm/bridge/panel.c | 197 ++++++++++++++++++++++++++++++++++ include/drm/drm_bridge.h | 7 ++ 6 files changed, 238 insertions(+), 141 deletions(-) create mode 100644 drivers/gpu/drm/bridge/panel.c diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst index c075aadd7078..7c5e2549a58a 100644 --- a/Documentation/gpu/drm-kms-helpers.rst +++ b/Documentation/gpu/drm-kms-helpers.rst @@ -143,6 +143,12 @@ Bridge Helper Reference .. kernel-doc:: drivers/gpu/drm/drm_bridge.c :export: +Panel-Bridge Helper Reference +----------------------------- + +.. kernel-doc:: drivers/gpu/drm/bridge/panel.c + :export: + .. _drm_panel_helper: Panel Helper Reference diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index c156fecfb362..4cc9c02cc3f2 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -24,6 +24,7 @@ drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_PCI) += ati_pcigart.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o +drm-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm-$(CONFIG_OF) += drm_of.o drm-$(CONFIG_AGP) += drm_agpsupport.o drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index f6968d3b4b41..c4daca38743c 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -4,6 +4,14 @@ config DRM_BRIDGE help Bridge registration and lookup framework. +config DRM_PANEL_BRIDGE + def_bool y + depends on DRM_BRIDGE + select DRM_KMS_HELPER + select DRM_PANEL + help + DRM bridge wrapper of DRM panels + menu "Display Interface Bridges" depends on DRM && DRM_BRIDGE @@ -27,8 +35,7 @@ config DRM_DUMB_VGA_DAC config DRM_LVDS_ENCODER tristate "Transparent parallel to LVDS encoder support" depends on OF - select DRM_KMS_HELPER - select DRM_PANEL + select DRM_PANEL_BRIDGE help Support for transparent parallel to LVDS encoders that don't require any configuration. diff --git a/drivers/gpu/drm/bridge/lvds-encoder.c b/drivers/gpu/drm/bridge/lvds-encoder.c index f1f67a279426..0903ba574f61 100644 --- a/drivers/gpu/drm/bridge/lvds-encoder.c +++ b/drivers/gpu/drm/bridge/lvds-encoder.c @@ -8,144 +8,18 @@ */ #include -#include -#include -#include -#include -#include +#include #include #include -struct lvds_encoder { - struct device *dev; - - struct drm_bridge bridge; - struct drm_connector connector; - struct drm_panel *panel; -}; - -static inline struct lvds_encoder * -drm_bridge_to_lvds_encoder(struct drm_bridge *bridge) -{ - return container_of(bridge, struct lvds_encoder, bridge); -} - -static inline struct lvds_encoder * -drm_connector_to_lvds_encoder(struct drm_connector *connector) -{ - return container_of(connector, struct lvds_encoder, connector); -} - -static int lvds_connector_get_modes(struct drm_connector *connector) -{ - struct lvds_encoder *lvds = drm_connector_to_lvds_encoder(connector); - - return drm_panel_get_modes(lvds->panel); -} - -static const struct drm_connector_helper_funcs lvds_connector_helper_funcs = { - .get_modes = lvds_connector_get_modes, -}; - -static const struct drm_connector_funcs lvds_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, - .reset = drm_atomic_helper_connector_reset, - .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = drm_connector_cleanup, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, -}; - -static int lvds_encoder_attach(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - struct drm_connector *connector = &lvds->connector; - int ret; - - if (!bridge->encoder) { - DRM_ERROR("Missing encoder\n"); - return -ENODEV; - } - - drm_connector_helper_add(connector, &lvds_connector_helper_funcs); - - ret = drm_connector_init(bridge->dev, connector, &lvds_connector_funcs, - DRM_MODE_CONNECTOR_LVDS); - if (ret) { - DRM_ERROR("Failed to initialize connector\n"); - return ret; - } - - drm_mode_connector_attach_encoder(&lvds->connector, bridge->encoder); - - ret = drm_panel_attach(lvds->panel, &lvds->connector); - if (ret < 0) - return ret; - - return 0; -} - -static void lvds_encoder_detach(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - - drm_panel_detach(lvds->panel); -} - -static void lvds_encoder_pre_enable(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - - drm_panel_prepare(lvds->panel); -} - -static void lvds_encoder_enable(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - - drm_panel_enable(lvds->panel); -} - -static void lvds_encoder_disable(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - - drm_panel_disable(lvds->panel); -} - -static void lvds_encoder_post_disable(struct drm_bridge *bridge) -{ - struct lvds_encoder *lvds = drm_bridge_to_lvds_encoder(bridge); - - drm_panel_unprepare(lvds->panel); -} - -static const struct drm_bridge_funcs lvds_encoder_bridge_funcs = { - .attach = lvds_encoder_attach, - .detach = lvds_encoder_detach, - .pre_enable = lvds_encoder_pre_enable, - .enable = lvds_encoder_enable, - .disable = lvds_encoder_disable, - .post_disable = lvds_encoder_post_disable, -}; - static int lvds_encoder_probe(struct platform_device *pdev) { - struct lvds_encoder *lvds; struct device_node *port; struct device_node *endpoint; - struct device_node *panel; - - lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL); - if (!lvds) - return -ENOMEM; - - lvds->dev = &pdev->dev; - platform_set_drvdata(pdev, lvds); - - lvds->bridge.funcs = &lvds_encoder_bridge_funcs; - lvds->bridge.of_node = pdev->dev.of_node; + struct device_node *panel_node; + struct drm_panel *panel; + struct drm_bridge *bridge; /* Locate the panel DT node. */ port = of_graph_get_port_by_id(pdev->dev.of_node, 1); @@ -161,29 +35,34 @@ static int lvds_encoder_probe(struct platform_device *pdev) return -ENXIO; } - panel = of_graph_get_remote_port_parent(endpoint); + panel_node = of_graph_get_remote_port_parent(endpoint); of_node_put(endpoint); - if (!panel) { + if (!panel_node) { dev_dbg(&pdev->dev, "no remote endpoint for port 1\n"); return -ENXIO; } - lvds->panel = of_drm_find_panel(panel); - of_node_put(panel); - if (!lvds->panel) { + panel = of_drm_find_panel(panel_node); + of_node_put(panel_node); + if (!panel) { dev_dbg(&pdev->dev, "panel not found, deferring probe\n"); return -EPROBE_DEFER; } - /* Register the bridge. */ - return drm_bridge_add(&lvds->bridge); + bridge = drm_panel_bridge_add(panel, DRM_MODE_CONNECTOR_LVDS); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); + + platform_set_drvdata(pdev, bridge); + + return 0; } static int lvds_encoder_remove(struct platform_device *pdev) { - struct lvds_encoder *encoder = platform_get_drvdata(pdev); + struct drm_bridge *bridge = platform_get_drvdata(pdev); - drm_bridge_remove(&encoder->bridge); + drm_bridge_remove(bridge); return 0; } diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c new file mode 100644 index 000000000000..fd1a78cb1205 --- /dev/null +++ b/drivers/gpu/drm/bridge/panel.c @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2016 Laurent Pinchart + * Copyright (C) 2017 Broadcom + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct panel_bridge { + struct drm_bridge bridge; + struct drm_connector connector; + struct drm_panel *panel; + u32 connector_type; +}; + +static inline struct panel_bridge * +drm_bridge_to_panel_bridge(struct drm_bridge *bridge) +{ + return container_of(bridge, struct panel_bridge, bridge); +} + +static inline struct panel_bridge * +drm_connector_to_panel_bridge(struct drm_connector *connector) +{ + return container_of(connector, struct panel_bridge, connector); +} + +static int panel_bridge_connector_get_modes(struct drm_connector *connector) +{ + struct panel_bridge *panel_bridge = + drm_connector_to_panel_bridge(connector); + + return drm_panel_get_modes(panel_bridge->panel); +} + +static const struct drm_connector_helper_funcs panel_bridge_connector_helper_funcs = { + .get_modes = panel_bridge_connector_get_modes, +}; + +static const struct drm_connector_funcs panel_bridge_connector_funcs = { + .dpms = drm_atomic_helper_connector_dpms, + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int panel_bridge_attach(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + struct drm_connector *connector = &panel_bridge->connector; + int ret; + + if (!bridge->encoder) { + DRM_ERROR("Missing encoder\n"); + return -ENODEV; + } + + drm_connector_helper_add(connector, + &panel_bridge_connector_helper_funcs); + + ret = drm_connector_init(bridge->dev, connector, + &panel_bridge_connector_funcs, + panel_bridge->connector_type); + if (ret) { + DRM_ERROR("Failed to initialize connector\n"); + return ret; + } + + drm_mode_connector_attach_encoder(&panel_bridge->connector, + bridge->encoder); + + ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector); + if (ret < 0) + return ret; + + return 0; +} + +static void panel_bridge_detach(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_panel_detach(panel_bridge->panel); +} + +static void panel_bridge_pre_enable(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_panel_prepare(panel_bridge->panel); +} + +static void panel_bridge_enable(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_panel_enable(panel_bridge->panel); +} + +static void panel_bridge_disable(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_panel_disable(panel_bridge->panel); +} + +static void panel_bridge_post_disable(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_panel_unprepare(panel_bridge->panel); +} + +static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { + .attach = panel_bridge_attach, + .detach = panel_bridge_detach, + .pre_enable = panel_bridge_pre_enable, + .enable = panel_bridge_enable, + .disable = panel_bridge_disable, + .post_disable = panel_bridge_post_disable, +}; + +/** + * drm_panel_bridge_add - Creates a drm_bridge and drm_connector that + * just calls the appropriate functions from drm_panel. + * + * @panel: The drm_panel being wrapped. Must be non-NULL. + * @connector_type: The DRM_MODE_CONNECTOR_* for the connector to be + * created. + * + * For drivers converting from directly using drm_panel: The expected + * usage pattern is that during either encoder module probe or DSI + * host attach, a drm_panel will be looked up through + * drm_of_find_panel_or_bridge(). drm_panel_bridge_add() is used to + * wrap that panel in the new bridge, and the result can then be + * passed to drm_bridge_attach(). The drm_panel_prepare() and related + * functions can be dropped from the encoder driver (they're now + * called by the KMS helpers before calling into the encoder), along + * with connector creation. When done with the bridge, + * drm_bridge_detach() should be called as normal, then + * drm_panel_bridge_remove() to free it. + */ +struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel, + u32 connector_type) +{ + struct panel_bridge *panel_bridge; + int ret; + + if (!panel) + return ERR_PTR(EINVAL); + + panel_bridge = devm_kzalloc(panel->dev, sizeof(*panel_bridge), + GFP_KERNEL); + if (!panel_bridge) + return ERR_PTR(-ENOMEM); + + panel_bridge->connector_type = connector_type; + panel_bridge->panel = panel; + + panel_bridge->bridge.funcs = &panel_bridge_bridge_funcs; + panel_bridge->bridge.of_node = panel->dev->of_node; + + ret = drm_bridge_add(&panel_bridge->bridge); + if (ret) + return ERR_PTR(ret); + + return &panel_bridge->bridge; +} +EXPORT_SYMBOL(drm_panel_bridge_add); + +/** + * drm_panel_bridge_remove - Unregisters and frees a drm_bridge + * created by drm_panel_bridge_add(). + * + * @bridge: The drm_bridge being freed. + */ +void drm_panel_bridge_remove(struct drm_bridge *bridge) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + drm_bridge_remove(bridge); + devm_kfree(panel_bridge->panel->dev, bridge); +} +EXPORT_SYMBOL(drm_panel_bridge_remove); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index fdd82fcbf168..bad2178ea3e0 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -29,6 +29,7 @@ #include struct drm_bridge; +struct drm_panel; /** * struct drm_bridge_funcs - drm_bridge control functions @@ -221,4 +222,10 @@ void drm_bridge_mode_set(struct drm_bridge *bridge, void drm_bridge_pre_enable(struct drm_bridge *bridge); void drm_bridge_enable(struct drm_bridge *bridge); +#ifdef CONFIG_DRM_PANEL +struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel, + u32 connector_type); +void drm_panel_bridge_remove(struct drm_bridge *bridge); +#endif + #endif -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH v2 1/7] drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge. Date: Thu, 11 May 2017 11:31:22 -0700 Message-ID: <20170511183128.25085-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 35B106E58F for ; Thu, 11 May 2017 18:31:35 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, Boris Brezillon , Archit Taneja , Andrzej Hajda , Laurent Pinchart , CK Hu , Philipp Zabel , Yannick Fertre , Philippe Cornu Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org TWFueSBEUk0gZHJpdmVycyBoYXZlIGNvbW1vbiBjb2RlIHRvIG1ha2UgYSBzdHViIGNvbm5lY3Rv cgppbXBsZW1lbnRhdGlvbiB0aGF0IHdyYXBzIGEgZHJtX3BhbmVsLiAgQnkgd3JhcHBpbmcgdGhl IHBhbmVsIGluIGEgRFJNCmJyaWRnZSwgYWxsIG9mIHRoZSBjb25uZWN0b3IgY29kZSAoaW5jbHVk aW5nIGNhbGxzIGR1cmluZyBlbmNvZGVyCmVuYWJsZS9kaXNhYmxlKSBnb2VzIGF3YXkuCgp2Mjog Rml4IGJ1aWxkIHdpdGggQ09ORklHX0RSTT1tLCBkcm9wICJkZXYiIGFyZ3VtZW50IHRoYXQgc2hv dWxkIGp1c3QKICAgIGJlIHRoZSBwYW5lbCdzIGRldiwgbW92ZSBrZXJuZWxkb2MgdXAgYSBsZXZl bCBhbmQgZG9jdW1lbnQKICAgIF9yZW1vdmUoKS4KClNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0 IDxlcmljQGFuaG9sdC5uZXQ+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGZmd2xsLmNoPgotLS0KIERvY3VtZW50YXRpb24vZ3B1L2RybS1rbXMtaGVscGVycy5yc3QgfCAg IDYgKysKIGRyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZSAgICAgICAgICAgICAgfCAgIDEgKwogZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnICAgICAgICB8ICAxMSArLQogZHJpdmVycy9ncHUv ZHJtL2JyaWRnZS9sdmRzLWVuY29kZXIuYyB8IDE1NyArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYyAgICAgICAgfCAxOTcgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oICAgICAg ICAgICAgICB8ICAgNyArKwogNiBmaWxlcyBjaGFuZ2VkLCAyMzggaW5zZXJ0aW9ucygrKSwgMTQx IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uv cGFuZWwuYwoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZ3B1L2RybS1rbXMtaGVscGVycy5y c3QgYi9Eb2N1bWVudGF0aW9uL2dwdS9kcm0ta21zLWhlbHBlcnMucnN0CmluZGV4IGMwNzVhYWRk NzA3OC4uN2M1ZTI1NDlhNThhIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2dwdS9kcm0ta21z LWhlbHBlcnMucnN0CisrKyBiL0RvY3VtZW50YXRpb24vZ3B1L2RybS1rbXMtaGVscGVycy5yc3QK QEAgLTE0Myw2ICsxNDMsMTIgQEAgQnJpZGdlIEhlbHBlciBSZWZlcmVuY2UKIC4uIGtlcm5lbC1k b2M6OiBkcml2ZXJzL2dwdS9kcm0vZHJtX2JyaWRnZS5jCiAgICA6ZXhwb3J0OgogCitQYW5lbC1C cmlkZ2UgSGVscGVyIFJlZmVyZW5jZQorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKwor Li4ga2VybmVsLWRvYzo6IGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYworICAgOmV4cG9y dDoKKwogLi4gX2RybV9wYW5lbF9oZWxwZXI6CiAKIFBhbmVsIEhlbHBlciBSZWZlcmVuY2UKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZSBiL2RyaXZlcnMvZ3B1L2RybS9NYWtl ZmlsZQppbmRleCBjMTU2ZmVjZmIzNjIuLjRjYzljMDJjYzNmMiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL01ha2VmaWxlCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZQpAQCAtMjQs NiArMjQsNyBAQCBkcm0tJChDT05GSUdfQ09NUEFUKSArPSBkcm1faW9jMzIubwogZHJtLSQoQ09O RklHX0RSTV9HRU1fQ01BX0hFTFBFUikgKz0gZHJtX2dlbV9jbWFfaGVscGVyLm8KIGRybS0kKENP TkZJR19QQ0kpICs9IGF0aV9wY2lnYXJ0Lm8KIGRybS0kKENPTkZJR19EUk1fUEFORUwpICs9IGRy bV9wYW5lbC5vCitkcm0tJChDT05GSUdfRFJNX1BBTkVMX0JSSURHRSkgKz0gYnJpZGdlL3BhbmVs Lm8KIGRybS0kKENPTkZJR19PRikgKz0gZHJtX29mLm8KIGRybS0kKENPTkZJR19BR1ApICs9IGRy bV9hZ3BzdXBwb3J0Lm8KIGRybS0kKENPTkZJR19ERUJVR19GUykgKz0gZHJtX2RlYnVnZnMubyBk cm1fZGVidWdmc19jcmMubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9LY29u ZmlnIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnCmluZGV4IGY2OTY4ZDNiNGI0MS4u YzRkYWNhMzg3NDNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL0tjb25maWcK KysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnCkBAIC00LDYgKzQsMTQgQEAgY29u ZmlnIERSTV9CUklER0UKIAloZWxwCiAJICBCcmlkZ2UgcmVnaXN0cmF0aW9uIGFuZCBsb29rdXAg ZnJhbWV3b3JrLgogCitjb25maWcgRFJNX1BBTkVMX0JSSURHRQorCWRlZl9ib29sIHkKKwlkZXBl bmRzIG9uIERSTV9CUklER0UKKwlzZWxlY3QgRFJNX0tNU19IRUxQRVIKKwlzZWxlY3QgRFJNX1BB TkVMCisJaGVscAorCSAgRFJNIGJyaWRnZSB3cmFwcGVyIG9mIERSTSBwYW5lbHMKKwogbWVudSAi RGlzcGxheSBJbnRlcmZhY2UgQnJpZGdlcyIKIAlkZXBlbmRzIG9uIERSTSAmJiBEUk1fQlJJREdF CiAKQEAgLTI3LDggKzM1LDcgQEAgY29uZmlnIERSTV9EVU1CX1ZHQV9EQUMKIGNvbmZpZyBEUk1f TFZEU19FTkNPREVSCiAJdHJpc3RhdGUgIlRyYW5zcGFyZW50IHBhcmFsbGVsIHRvIExWRFMgZW5j b2RlciBzdXBwb3J0IgogCWRlcGVuZHMgb24gT0YKLQlzZWxlY3QgRFJNX0tNU19IRUxQRVIKLQlz ZWxlY3QgRFJNX1BBTkVMCisJc2VsZWN0IERSTV9QQU5FTF9CUklER0UKIAloZWxwCiAJICBTdXBw b3J0IGZvciB0cmFuc3BhcmVudCBwYXJhbGxlbCB0byBMVkRTIGVuY29kZXJzIHRoYXQgZG9uJ3Qg cmVxdWlyZQogCSAgYW55IGNvbmZpZ3VyYXRpb24uCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYnJpZGdlL2x2ZHMtZW5jb2Rlci5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9sdmRzLWVu Y29kZXIuYwppbmRleCBmMWY2N2EyNzk0MjYuLjA5MDNiYTU3NGY2MSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9sdmRzLWVuY29kZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YnJpZGdlL2x2ZHMtZW5jb2Rlci5jCkBAIC04LDE0NCArOCwxOCBAQAogICovCiAKICNpbmNsdWRl IDxkcm0vZHJtUC5oPgotI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgotI2luY2x1 ZGUgPGRybS9kcm1fY29ubmVjdG9yLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9jcnRjX2hlbHBlci5o PgotI2luY2x1ZGUgPGRybS9kcm1fZW5jb2Rlci5oPgotI2luY2x1ZGUgPGRybS9kcm1fbW9kZXNl dF9oZWxwZXJfdnRhYmxlcy5oPgorI2luY2x1ZGUgPGRybS9kcm1fYnJpZGdlLmg+CiAjaW5jbHVk ZSA8ZHJtL2RybV9wYW5lbC5oPgogCiAjaW5jbHVkZSA8bGludXgvb2ZfZ3JhcGguaD4KIAotc3Ry dWN0IGx2ZHNfZW5jb2RlciB7Ci0Jc3RydWN0IGRldmljZSAqZGV2OwotCi0Jc3RydWN0IGRybV9i cmlkZ2UgYnJpZGdlOwotCXN0cnVjdCBkcm1fY29ubmVjdG9yIGNvbm5lY3RvcjsKLQlzdHJ1Y3Qg ZHJtX3BhbmVsICpwYW5lbDsKLX07Ci0KLXN0YXRpYyBpbmxpbmUgc3RydWN0IGx2ZHNfZW5jb2Rl ciAqCi1kcm1fYnJpZGdlX3RvX2x2ZHNfZW5jb2RlcihzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdl KQotewotCXJldHVybiBjb250YWluZXJfb2YoYnJpZGdlLCBzdHJ1Y3QgbHZkc19lbmNvZGVyLCBi cmlkZ2UpOwotfQotCi1zdGF0aWMgaW5saW5lIHN0cnVjdCBsdmRzX2VuY29kZXIgKgotZHJtX2Nv bm5lY3Rvcl90b19sdmRzX2VuY29kZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikK LXsKLQlyZXR1cm4gY29udGFpbmVyX29mKGNvbm5lY3Rvciwgc3RydWN0IGx2ZHNfZW5jb2Rlciwg Y29ubmVjdG9yKTsKLX0KLQotc3RhdGljIGludCBsdmRzX2Nvbm5lY3Rvcl9nZXRfbW9kZXMoc3Ry dWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKLXsKLQlzdHJ1Y3QgbHZkc19lbmNvZGVyICps dmRzID0gZHJtX2Nvbm5lY3Rvcl90b19sdmRzX2VuY29kZXIoY29ubmVjdG9yKTsKLQotCXJldHVy biBkcm1fcGFuZWxfZ2V0X21vZGVzKGx2ZHMtPnBhbmVsKTsKLX0KLQotc3RhdGljIGNvbnN0IHN0 cnVjdCBkcm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcyBsdmRzX2Nvbm5lY3Rvcl9oZWxwZXJfZnVu Y3MgPSB7Ci0JLmdldF9tb2RlcyA9IGx2ZHNfY29ubmVjdG9yX2dldF9tb2RlcywKLX07Ci0KLXN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBsdmRzX2Nvbm5lY3Rvcl9mdW5j cyA9IHsKLQkuZHBtcyA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kcG1zLAotCS5yZXNl dCA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9yZXNldCwKLQkuZmlsbF9tb2RlcyA9IGRy bV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKLQkuZGVzdHJveSA9IGRybV9j b25uZWN0b3JfY2xlYW51cCwKLQkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGRybV9hdG9taWNf aGVscGVyX2Nvbm5lY3Rvcl9kdXBsaWNhdGVfc3RhdGUsCi0JLmF0b21pY19kZXN0cm95X3N0YXRl ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2Rlc3Ryb3lfc3RhdGUsCi19OwotCi1zdGF0 aWMgaW50IGx2ZHNfZW5jb2Rlcl9hdHRhY2goc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSkKLXsK LQlzdHJ1Y3QgbHZkc19lbmNvZGVyICpsdmRzID0gZHJtX2JyaWRnZV90b19sdmRzX2VuY29kZXIo YnJpZGdlKTsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yID0gJmx2ZHMtPmNvbm5l Y3RvcjsKLQlpbnQgcmV0OwotCi0JaWYgKCFicmlkZ2UtPmVuY29kZXIpIHsKLQkJRFJNX0VSUk9S KCJNaXNzaW5nIGVuY29kZXJcbiIpOwotCQlyZXR1cm4gLUVOT0RFVjsKLQl9Ci0KLQlkcm1fY29u bmVjdG9yX2hlbHBlcl9hZGQoY29ubmVjdG9yLCAmbHZkc19jb25uZWN0b3JfaGVscGVyX2Z1bmNz KTsKLQotCXJldCA9IGRybV9jb25uZWN0b3JfaW5pdChicmlkZ2UtPmRldiwgY29ubmVjdG9yLCAm bHZkc19jb25uZWN0b3JfZnVuY3MsCi0JCQkJIERSTV9NT0RFX0NPTk5FQ1RPUl9MVkRTKTsKLQlp ZiAocmV0KSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGluaXRpYWxpemUgY29ubmVjdG9yXG4i KTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlkcm1fbW9kZV9jb25uZWN0b3JfYXR0YWNoX2VuY29k ZXIoJmx2ZHMtPmNvbm5lY3RvciwgYnJpZGdlLT5lbmNvZGVyKTsKLQotCXJldCA9IGRybV9wYW5l bF9hdHRhY2gobHZkcy0+cGFuZWwsICZsdmRzLT5jb25uZWN0b3IpOwotCWlmIChyZXQgPCAwKQot CQlyZXR1cm4gcmV0OwotCi0JcmV0dXJuIDA7Ci19Ci0KLXN0YXRpYyB2b2lkIGx2ZHNfZW5jb2Rl cl9kZXRhY2goc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSkKLXsKLQlzdHJ1Y3QgbHZkc19lbmNv ZGVyICpsdmRzID0gZHJtX2JyaWRnZV90b19sdmRzX2VuY29kZXIoYnJpZGdlKTsKLQotCWRybV9w YW5lbF9kZXRhY2gobHZkcy0+cGFuZWwpOwotfQotCi1zdGF0aWMgdm9pZCBsdmRzX2VuY29kZXJf cHJlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQotewotCXN0cnVjdCBsdmRzX2Vu Y29kZXIgKmx2ZHMgPSBkcm1fYnJpZGdlX3RvX2x2ZHNfZW5jb2RlcihicmlkZ2UpOwotCi0JZHJt X3BhbmVsX3ByZXBhcmUobHZkcy0+cGFuZWwpOwotfQotCi1zdGF0aWMgdm9pZCBsdmRzX2VuY29k ZXJfZW5hYmxlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCi17Ci0Jc3RydWN0IGx2ZHNfZW5j b2RlciAqbHZkcyA9IGRybV9icmlkZ2VfdG9fbHZkc19lbmNvZGVyKGJyaWRnZSk7Ci0KLQlkcm1f cGFuZWxfZW5hYmxlKGx2ZHMtPnBhbmVsKTsKLX0KLQotc3RhdGljIHZvaWQgbHZkc19lbmNvZGVy X2Rpc2FibGUoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSkKLXsKLQlzdHJ1Y3QgbHZkc19lbmNv ZGVyICpsdmRzID0gZHJtX2JyaWRnZV90b19sdmRzX2VuY29kZXIoYnJpZGdlKTsKLQotCWRybV9w YW5lbF9kaXNhYmxlKGx2ZHMtPnBhbmVsKTsKLX0KLQotc3RhdGljIHZvaWQgbHZkc19lbmNvZGVy X3Bvc3RfZGlzYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQotewotCXN0cnVjdCBsdmRz X2VuY29kZXIgKmx2ZHMgPSBkcm1fYnJpZGdlX3RvX2x2ZHNfZW5jb2RlcihicmlkZ2UpOwotCi0J ZHJtX3BhbmVsX3VucHJlcGFyZShsdmRzLT5wYW5lbCk7Ci19Ci0KLXN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX2JyaWRnZV9mdW5jcyBsdmRzX2VuY29kZXJfYnJpZGdlX2Z1bmNzID0gewotCS5hdHRh Y2ggPSBsdmRzX2VuY29kZXJfYXR0YWNoLAotCS5kZXRhY2ggPSBsdmRzX2VuY29kZXJfZGV0YWNo LAotCS5wcmVfZW5hYmxlID0gbHZkc19lbmNvZGVyX3ByZV9lbmFibGUsCi0JLmVuYWJsZSA9IGx2 ZHNfZW5jb2Rlcl9lbmFibGUsCi0JLmRpc2FibGUgPSBsdmRzX2VuY29kZXJfZGlzYWJsZSwKLQku cG9zdF9kaXNhYmxlID0gbHZkc19lbmNvZGVyX3Bvc3RfZGlzYWJsZSwKLX07Ci0KIHN0YXRpYyBp bnQgbHZkc19lbmNvZGVyX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiB7Ci0J c3RydWN0IGx2ZHNfZW5jb2RlciAqbHZkczsKIAlzdHJ1Y3QgZGV2aWNlX25vZGUgKnBvcnQ7CiAJ c3RydWN0IGRldmljZV9ub2RlICplbmRwb2ludDsKLQlzdHJ1Y3QgZGV2aWNlX25vZGUgKnBhbmVs OwotCi0JbHZkcyA9IGRldm1fa3phbGxvYygmcGRldi0+ZGV2LCBzaXplb2YoKmx2ZHMpLCBHRlBf S0VSTkVMKTsKLQlpZiAoIWx2ZHMpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JbHZkcy0+ZGV2ID0g JnBkZXYtPmRldjsKLQlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBsdmRzKTsKLQotCWx2ZHMt PmJyaWRnZS5mdW5jcyA9ICZsdmRzX2VuY29kZXJfYnJpZGdlX2Z1bmNzOwotCWx2ZHMtPmJyaWRn ZS5vZl9ub2RlID0gcGRldi0+ZGV2Lm9mX25vZGU7CisJc3RydWN0IGRldmljZV9ub2RlICpwYW5l bF9ub2RlOworCXN0cnVjdCBkcm1fcGFuZWwgKnBhbmVsOworCXN0cnVjdCBkcm1fYnJpZGdlICpi cmlkZ2U7CiAKIAkvKiBMb2NhdGUgdGhlIHBhbmVsIERUIG5vZGUuICovCiAJcG9ydCA9IG9mX2dy YXBoX2dldF9wb3J0X2J5X2lkKHBkZXYtPmRldi5vZl9ub2RlLCAxKTsKQEAgLTE2MSwyOSArMzUs MzQgQEAgc3RhdGljIGludCBsdmRzX2VuY29kZXJfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldikKIAkJcmV0dXJuIC1FTlhJTzsKIAl9CiAKLQlwYW5lbCA9IG9mX2dyYXBoX2dldF9y ZW1vdGVfcG9ydF9wYXJlbnQoZW5kcG9pbnQpOworCXBhbmVsX25vZGUgPSBvZl9ncmFwaF9nZXRf cmVtb3RlX3BvcnRfcGFyZW50KGVuZHBvaW50KTsKIAlvZl9ub2RlX3B1dChlbmRwb2ludCk7Ci0J aWYgKCFwYW5lbCkgeworCWlmICghcGFuZWxfbm9kZSkgewogCQlkZXZfZGJnKCZwZGV2LT5kZXYs ICJubyByZW1vdGUgZW5kcG9pbnQgZm9yIHBvcnQgMVxuIik7CiAJCXJldHVybiAtRU5YSU87CiAJ fQogCi0JbHZkcy0+cGFuZWwgPSBvZl9kcm1fZmluZF9wYW5lbChwYW5lbCk7Ci0Jb2Zfbm9kZV9w dXQocGFuZWwpOwotCWlmICghbHZkcy0+cGFuZWwpIHsKKwlwYW5lbCA9IG9mX2RybV9maW5kX3Bh bmVsKHBhbmVsX25vZGUpOworCW9mX25vZGVfcHV0KHBhbmVsX25vZGUpOworCWlmICghcGFuZWwp IHsKIAkJZGV2X2RiZygmcGRldi0+ZGV2LCAicGFuZWwgbm90IGZvdW5kLCBkZWZlcnJpbmcgcHJv YmVcbiIpOwogCQlyZXR1cm4gLUVQUk9CRV9ERUZFUjsKIAl9CiAKLQkvKiBSZWdpc3RlciB0aGUg YnJpZGdlLiAqLwotCXJldHVybiBkcm1fYnJpZGdlX2FkZCgmbHZkcy0+YnJpZGdlKTsKKwlicmlk Z2UgPSBkcm1fcGFuZWxfYnJpZGdlX2FkZChwYW5lbCwgRFJNX01PREVfQ09OTkVDVE9SX0xWRFMp OworCWlmIChJU19FUlIoYnJpZGdlKSkKKwkJcmV0dXJuIFBUUl9FUlIoYnJpZGdlKTsKKworCXBs YXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGJyaWRnZSk7CisKKwlyZXR1cm4gMDsKIH0KIAogc3Rh dGljIGludCBsdmRzX2VuY29kZXJfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYp CiB7Ci0Jc3RydWN0IGx2ZHNfZW5jb2RlciAqZW5jb2RlciA9IHBsYXRmb3JtX2dldF9kcnZkYXRh KHBkZXYpOworCXN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UgPSBwbGF0Zm9ybV9nZXRfZHJ2ZGF0 YShwZGV2KTsKIAotCWRybV9icmlkZ2VfcmVtb3ZlKCZlbmNvZGVyLT5icmlkZ2UpOworCWRybV9i cmlkZ2VfcmVtb3ZlKGJyaWRnZSk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwu YwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmZkMWE3OGNiMTIwNQot LS0gL2Rldi9udWxsCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYwpAQCAtMCww ICsxLDE5NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNiBMYXVyZW50IFBpbmNoYXJ0IDxs YXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTcg QnJvYWRjb20KKyAqCisgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy ZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcworICogcHVibGlzaGVkIGJ5IHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIgb2YKKyAqIHRoZSBMaWNlbnNl LCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICovCisKKyNpbmNsdWRl IDxkcm0vZHJtUC5oPgorI2luY2x1ZGUgPGRybS9kcm1fcGFuZWwuaD4KKyNpbmNsdWRlIDxkcm0v ZHJtX2F0b21pY19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2Nvbm5lY3Rvci5oPgorI2lu Y2x1ZGUgPGRybS9kcm1fY3J0Y19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2VuY29kZXIu aD4KKyNpbmNsdWRlIDxkcm0vZHJtX21vZGVzZXRfaGVscGVyX3Z0YWJsZXMuaD4KKyNpbmNsdWRl IDxkcm0vZHJtX3BhbmVsLmg+CisKK3N0cnVjdCBwYW5lbF9icmlkZ2UgeworCXN0cnVjdCBkcm1f YnJpZGdlIGJyaWRnZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBjb25uZWN0b3I7CisJc3RydWN0 IGRybV9wYW5lbCAqcGFuZWw7CisJdTMyIGNvbm5lY3Rvcl90eXBlOworfTsKKworc3RhdGljIGlu bGluZSBzdHJ1Y3QgcGFuZWxfYnJpZGdlICoKK2RybV9icmlkZ2VfdG9fcGFuZWxfYnJpZGdlKHN0 cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCit7CisJcmV0dXJuIGNvbnRhaW5lcl9vZihicmlkZ2Us IHN0cnVjdCBwYW5lbF9icmlkZ2UsIGJyaWRnZSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0 IHBhbmVsX2JyaWRnZSAqCitkcm1fY29ubmVjdG9yX3RvX3BhbmVsX2JyaWRnZShzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yKQoreworCXJldHVybiBjb250YWluZXJfb2YoY29ubmVjdG9y LCBzdHJ1Y3QgcGFuZWxfYnJpZGdlLCBjb25uZWN0b3IpOworfQorCitzdGF0aWMgaW50IHBhbmVs X2JyaWRnZV9jb25uZWN0b3JfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IpCit7CisJc3RydWN0IHBhbmVsX2JyaWRnZSAqcGFuZWxfYnJpZGdlID0KKwkJZHJtX2Nvbm5l Y3Rvcl90b19wYW5lbF9icmlkZ2UoY29ubmVjdG9yKTsKKworCXJldHVybiBkcm1fcGFuZWxfZ2V0 X21vZGVzKHBhbmVsX2JyaWRnZS0+cGFuZWwpOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzIHBhbmVsX2JyaWRnZV9jb25uZWN0b3JfaGVscGVyX2Z1 bmNzID0geworCS5nZXRfbW9kZXMgPSBwYW5lbF9icmlkZ2VfY29ubmVjdG9yX2dldF9tb2RlcywK K307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBwYW5lbF9icmlk Z2VfY29ubmVjdG9yX2Z1bmNzID0geworCS5kcG1zID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVj dG9yX2RwbXMsCisJLnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3Jlc2V0LAor CS5maWxsX21vZGVzID0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29ubmVjdG9yX21vZGVzLAor CS5kZXN0cm95ID0gZHJtX2Nvbm5lY3Rvcl9jbGVhbnVwLAorCS5hdG9taWNfZHVwbGljYXRlX3N0 YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSwKKwkuYXRv bWljX2Rlc3Ryb3lfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZGVzdHJveV9z dGF0ZSwKK307CisKK3N0YXRpYyBpbnQgcGFuZWxfYnJpZGdlX2F0dGFjaChzdHJ1Y3QgZHJtX2Jy aWRnZSAqYnJpZGdlKQoreworCXN0cnVjdCBwYW5lbF9icmlkZ2UgKnBhbmVsX2JyaWRnZSA9IGRy bV9icmlkZ2VfdG9fcGFuZWxfYnJpZGdlKGJyaWRnZSk7CisJc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciA9ICZwYW5lbF9icmlkZ2UtPmNvbm5lY3RvcjsKKwlpbnQgcmV0OworCisJaWYg KCFicmlkZ2UtPmVuY29kZXIpIHsKKwkJRFJNX0VSUk9SKCJNaXNzaW5nIGVuY29kZXJcbiIpOwor CQlyZXR1cm4gLUVOT0RFVjsKKwl9CisKKwlkcm1fY29ubmVjdG9yX2hlbHBlcl9hZGQoY29ubmVj dG9yLAorCQkJCSAmcGFuZWxfYnJpZGdlX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MpOworCisJcmV0 ID0gZHJtX2Nvbm5lY3Rvcl9pbml0KGJyaWRnZS0+ZGV2LCBjb25uZWN0b3IsCisJCQkJICZwYW5l bF9icmlkZ2VfY29ubmVjdG9yX2Z1bmNzLAorCQkJCSBwYW5lbF9icmlkZ2UtPmNvbm5lY3Rvcl90 eXBlKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiRmFpbGVkIHRvIGluaXRpYWxpemUgY29u bmVjdG9yXG4iKTsKKwkJcmV0dXJuIHJldDsKKwl9CisKKwlkcm1fbW9kZV9jb25uZWN0b3JfYXR0 YWNoX2VuY29kZXIoJnBhbmVsX2JyaWRnZS0+Y29ubmVjdG9yLAorCQkJCQkgIGJyaWRnZS0+ZW5j b2Rlcik7CisKKwlyZXQgPSBkcm1fcGFuZWxfYXR0YWNoKHBhbmVsX2JyaWRnZS0+cGFuZWwsICZw YW5lbF9icmlkZ2UtPmNvbm5lY3Rvcik7CisJaWYgKHJldCA8IDApCisJCXJldHVybiByZXQ7CisK KwlyZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgcGFuZWxfYnJpZGdlX2RldGFjaChzdHJ1Y3Qg ZHJtX2JyaWRnZSAqYnJpZGdlKQoreworCXN0cnVjdCBwYW5lbF9icmlkZ2UgKnBhbmVsX2JyaWRn ZSA9IGRybV9icmlkZ2VfdG9fcGFuZWxfYnJpZGdlKGJyaWRnZSk7CisKKwlkcm1fcGFuZWxfZGV0 YWNoKHBhbmVsX2JyaWRnZS0+cGFuZWwpOworfQorCitzdGF0aWMgdm9pZCBwYW5lbF9icmlkZ2Vf cHJlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQoreworCXN0cnVjdCBwYW5lbF9i cmlkZ2UgKnBhbmVsX2JyaWRnZSA9IGRybV9icmlkZ2VfdG9fcGFuZWxfYnJpZGdlKGJyaWRnZSk7 CisKKwlkcm1fcGFuZWxfcHJlcGFyZShwYW5lbF9icmlkZ2UtPnBhbmVsKTsKK30KKworc3RhdGlj IHZvaWQgcGFuZWxfYnJpZGdlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQorewor CXN0cnVjdCBwYW5lbF9icmlkZ2UgKnBhbmVsX2JyaWRnZSA9IGRybV9icmlkZ2VfdG9fcGFuZWxf YnJpZGdlKGJyaWRnZSk7CisKKwlkcm1fcGFuZWxfZW5hYmxlKHBhbmVsX2JyaWRnZS0+cGFuZWwp OworfQorCitzdGF0aWMgdm9pZCBwYW5lbF9icmlkZ2VfZGlzYWJsZShzdHJ1Y3QgZHJtX2JyaWRn ZSAqYnJpZGdlKQoreworCXN0cnVjdCBwYW5lbF9icmlkZ2UgKnBhbmVsX2JyaWRnZSA9IGRybV9i cmlkZ2VfdG9fcGFuZWxfYnJpZGdlKGJyaWRnZSk7CisKKwlkcm1fcGFuZWxfZGlzYWJsZShwYW5l bF9icmlkZ2UtPnBhbmVsKTsKK30KKworc3RhdGljIHZvaWQgcGFuZWxfYnJpZGdlX3Bvc3RfZGlz YWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQoreworCXN0cnVjdCBwYW5lbF9icmlkZ2Ug KnBhbmVsX2JyaWRnZSA9IGRybV9icmlkZ2VfdG9fcGFuZWxfYnJpZGdlKGJyaWRnZSk7CisKKwlk cm1fcGFuZWxfdW5wcmVwYXJlKHBhbmVsX2JyaWRnZS0+cGFuZWwpOworfQorCitzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9icmlkZ2VfZnVuY3MgcGFuZWxfYnJpZGdlX2JyaWRnZV9mdW5jcyA9IHsK KwkuYXR0YWNoID0gcGFuZWxfYnJpZGdlX2F0dGFjaCwKKwkuZGV0YWNoID0gcGFuZWxfYnJpZGdl X2RldGFjaCwKKwkucHJlX2VuYWJsZSA9IHBhbmVsX2JyaWRnZV9wcmVfZW5hYmxlLAorCS5lbmFi bGUgPSBwYW5lbF9icmlkZ2VfZW5hYmxlLAorCS5kaXNhYmxlID0gcGFuZWxfYnJpZGdlX2Rpc2Fi bGUsCisJLnBvc3RfZGlzYWJsZSA9IHBhbmVsX2JyaWRnZV9wb3N0X2Rpc2FibGUsCit9OworCisv KioKKyAqIGRybV9wYW5lbF9icmlkZ2VfYWRkIC0gQ3JlYXRlcyBhIGRybV9icmlkZ2UgYW5kIGRy bV9jb25uZWN0b3IgdGhhdAorICoganVzdCBjYWxscyB0aGUgYXBwcm9wcmlhdGUgZnVuY3Rpb25z IGZyb20gZHJtX3BhbmVsLgorICoKKyAqIEBwYW5lbDogVGhlIGRybV9wYW5lbCBiZWluZyB3cmFw cGVkLiAgTXVzdCBiZSBub24tTlVMTC4KKyAqIEBjb25uZWN0b3JfdHlwZTogVGhlIERSTV9NT0RF X0NPTk5FQ1RPUl8qIGZvciB0aGUgY29ubmVjdG9yIHRvIGJlCisgKiBjcmVhdGVkLgorICoKKyAq IEZvciBkcml2ZXJzIGNvbnZlcnRpbmcgZnJvbSBkaXJlY3RseSB1c2luZyBkcm1fcGFuZWw6IFRo ZSBleHBlY3RlZAorICogdXNhZ2UgcGF0dGVybiBpcyB0aGF0IGR1cmluZyBlaXRoZXIgZW5jb2Rl ciBtb2R1bGUgcHJvYmUgb3IgRFNJCisgKiBob3N0IGF0dGFjaCwgYSBkcm1fcGFuZWwgd2lsbCBi ZSBsb29rZWQgdXAgdGhyb3VnaAorICogZHJtX29mX2ZpbmRfcGFuZWxfb3JfYnJpZGdlKCkuICBk cm1fcGFuZWxfYnJpZGdlX2FkZCgpIGlzIHVzZWQgdG8KKyAqIHdyYXAgdGhhdCBwYW5lbCBpbiB0 aGUgbmV3IGJyaWRnZSwgYW5kIHRoZSByZXN1bHQgY2FuIHRoZW4gYmUKKyAqIHBhc3NlZCB0byBk cm1fYnJpZGdlX2F0dGFjaCgpLiAgVGhlIGRybV9wYW5lbF9wcmVwYXJlKCkgYW5kIHJlbGF0ZWQK KyAqIGZ1bmN0aW9ucyBjYW4gYmUgZHJvcHBlZCBmcm9tIHRoZSBlbmNvZGVyIGRyaXZlciAodGhl eSdyZSBub3cKKyAqIGNhbGxlZCBieSB0aGUgS01TIGhlbHBlcnMgYmVmb3JlIGNhbGxpbmcgaW50 byB0aGUgZW5jb2RlciksIGFsb25nCisgKiB3aXRoIGNvbm5lY3RvciBjcmVhdGlvbi4gIFdoZW4g ZG9uZSB3aXRoIHRoZSBicmlkZ2UsCisgKiBkcm1fYnJpZGdlX2RldGFjaCgpIHNob3VsZCBiZSBj YWxsZWQgYXMgbm9ybWFsLCB0aGVuCisgKiBkcm1fcGFuZWxfYnJpZGdlX3JlbW92ZSgpIHRvIGZy ZWUgaXQuCisgKi8KK3N0cnVjdCBkcm1fYnJpZGdlICpkcm1fcGFuZWxfYnJpZGdlX2FkZChzdHJ1 Y3QgZHJtX3BhbmVsICpwYW5lbCwKKwkJCQkJdTMyIGNvbm5lY3Rvcl90eXBlKQoreworCXN0cnVj dCBwYW5lbF9icmlkZ2UgKnBhbmVsX2JyaWRnZTsKKwlpbnQgcmV0OworCisJaWYgKCFwYW5lbCkK KwkJcmV0dXJuIEVSUl9QVFIoRUlOVkFMKTsKKworCXBhbmVsX2JyaWRnZSA9IGRldm1fa3phbGxv YyhwYW5lbC0+ZGV2LCBzaXplb2YoKnBhbmVsX2JyaWRnZSksCisJCQkJICAgIEdGUF9LRVJORUwp OworCWlmICghcGFuZWxfYnJpZGdlKQorCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKworCXBh bmVsX2JyaWRnZS0+Y29ubmVjdG9yX3R5cGUgPSBjb25uZWN0b3JfdHlwZTsKKwlwYW5lbF9icmlk Z2UtPnBhbmVsID0gcGFuZWw7CisKKwlwYW5lbF9icmlkZ2UtPmJyaWRnZS5mdW5jcyA9ICZwYW5l bF9icmlkZ2VfYnJpZGdlX2Z1bmNzOworCXBhbmVsX2JyaWRnZS0+YnJpZGdlLm9mX25vZGUgPSBw YW5lbC0+ZGV2LT5vZl9ub2RlOworCisJcmV0ID0gZHJtX2JyaWRnZV9hZGQoJnBhbmVsX2JyaWRn ZS0+YnJpZGdlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gRVJSX1BUUihyZXQpOworCisJcmV0dXJu ICZwYW5lbF9icmlkZ2UtPmJyaWRnZTsKK30KK0VYUE9SVF9TWU1CT0woZHJtX3BhbmVsX2JyaWRn ZV9hZGQpOworCisvKioKKyAqIGRybV9wYW5lbF9icmlkZ2VfcmVtb3ZlIC0gVW5yZWdpc3RlcnMg YW5kIGZyZWVzIGEgZHJtX2JyaWRnZQorICogY3JlYXRlZCBieSBkcm1fcGFuZWxfYnJpZGdlX2Fk ZCgpLgorICoKKyAqIEBicmlkZ2U6IFRoZSBkcm1fYnJpZGdlIGJlaW5nIGZyZWVkLgorICovCit2 b2lkIGRybV9wYW5lbF9icmlkZ2VfcmVtb3ZlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCit7 CisJc3RydWN0IHBhbmVsX2JyaWRnZSAqcGFuZWxfYnJpZGdlID0gZHJtX2JyaWRnZV90b19wYW5l bF9icmlkZ2UoYnJpZGdlKTsKKworCWRybV9icmlkZ2VfcmVtb3ZlKGJyaWRnZSk7CisJZGV2bV9r ZnJlZShwYW5lbF9icmlkZ2UtPnBhbmVsLT5kZXYsIGJyaWRnZSk7Cit9CitFWFBPUlRfU1lNQk9M KGRybV9wYW5lbF9icmlkZ2VfcmVtb3ZlKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9i cmlkZ2UuaCBiL2luY2x1ZGUvZHJtL2RybV9icmlkZ2UuaAppbmRleCBmZGQ4MmZjYmYxNjguLmJh ZDIxNzhlYTNlMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oCisrKyBiL2lu Y2x1ZGUvZHJtL2RybV9icmlkZ2UuaApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgPGRybS9k cm1fbW9kZXMuaD4KIAogc3RydWN0IGRybV9icmlkZ2U7CitzdHJ1Y3QgZHJtX3BhbmVsOwogCiAv KioKICAqIHN0cnVjdCBkcm1fYnJpZGdlX2Z1bmNzIC0gZHJtX2JyaWRnZSBjb250cm9sIGZ1bmN0 aW9ucwpAQCAtMjIxLDQgKzIyMiwxMCBAQCB2b2lkIGRybV9icmlkZ2VfbW9kZV9zZXQoc3RydWN0 IGRybV9icmlkZ2UgKmJyaWRnZSwKIHZvaWQgZHJtX2JyaWRnZV9wcmVfZW5hYmxlKHN0cnVjdCBk cm1fYnJpZGdlICpicmlkZ2UpOwogdm9pZCBkcm1fYnJpZGdlX2VuYWJsZShzdHJ1Y3QgZHJtX2Jy aWRnZSAqYnJpZGdlKTsKIAorI2lmZGVmIENPTkZJR19EUk1fUEFORUwKK3N0cnVjdCBkcm1fYnJp ZGdlICpkcm1fcGFuZWxfYnJpZGdlX2FkZChzdHJ1Y3QgZHJtX3BhbmVsICpwYW5lbCwKKwkJCQkJ dTMyIGNvbm5lY3Rvcl90eXBlKTsKK3ZvaWQgZHJtX3BhbmVsX2JyaWRnZV9yZW1vdmUoc3RydWN0 IGRybV9icmlkZ2UgKmJyaWRnZSk7CisjZW5kaWYKKwogI2VuZGlmCi0tIAoyLjExLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=