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 128FDC32789 for ; Tue, 6 Nov 2018 14:55:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C917C20685 for ; Tue, 6 Nov 2018 14:55:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C917C20685 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389101AbeKGAUy (ORCPT ); Tue, 6 Nov 2018 19:20:54 -0500 Received: from mail.bootlin.com ([62.4.15.54]:51820 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389010AbeKGAUQ (ORCPT ); Tue, 6 Nov 2018 19:20:16 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id BC4852088E; Tue, 6 Nov 2018 15:54:39 +0100 (CET) Received: from localhost (unknown [185.94.189.188]) by mail.bootlin.com (Postfix) with ESMTPSA id 6AFB32084B; Tue, 6 Nov 2018 15:54:29 +0100 (CET) From: Maxime Ripard To: Kishon Vijay Abraham I , Boris Brezillon Cc: Thomas Petazzoni , Laurent Pinchart , linux-media@vger.kernel.org, Archit Taneja , Andrzej Hajda , Chen-Yu Tsai , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Krzysztof Witos , Rafal Ciepiela , Maxime Ripard Subject: [PATCH v2 7/9] drm/bridge: cdns: Separate DSI and D-PHY configuration Date: Tue, 6 Nov 2018 15:54:19 +0100 Message-Id: <8214d82bb1cfd2160f900deef8a9934b4efb0685.1541516029.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current configuration of the DSI bridge and its associated D-PHY is intertwined. In order to ease the future conversion to the phy framework for the D-PHY part, let's split the configuration in two. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/cdns-dsi.c | 96 ++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c index ce9496d13986..3ac6dd524b6d 100644 --- a/drivers/gpu/drm/bridge/cdns-dsi.c +++ b/drivers/gpu/drm/bridge/cdns-dsi.c @@ -545,6 +545,11 @@ bridge_to_cdns_dsi_input(struct drm_bridge *bridge) return container_of(bridge, struct cdns_dsi_input, bridge); } +static unsigned int mode_to_dpi_hfp(const struct drm_display_mode *mode) +{ + return mode->crtc_hsync_start - mode->crtc_hdisplay; +} + static int cdns_dsi_get_dphy_pll_cfg(struct cdns_dphy *dphy, struct cdns_dphy_cfg *cfg, unsigned int dpi_htotal, @@ -731,14 +736,12 @@ static unsigned int dpi_to_dsi_timing(unsigned int dpi_timing, static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, const struct drm_display_mode *mode, struct cdns_dsi_cfg *dsi_cfg, - struct cdns_dphy_cfg *dphy_cfg, bool mode_valid_check) { - unsigned long dsi_htotal = 0, dsi_hss_hsa_hse_hbp = 0; struct cdns_dsi_output *output = &dsi->output; - unsigned int dsi_hfp_ext = 0, dpi_hfp, tmp; + unsigned int tmp; bool sync_pulse = false; - int bpp, nlanes, ret; + int bpp, nlanes; memset(dsi_cfg, 0, sizeof(*dsi_cfg)); @@ -757,8 +760,6 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, mode->crtc_hsync_end : mode->crtc_hsync_start); dsi_cfg->hbp = dpi_to_dsi_timing(tmp, bpp, DSI_HBP_FRAME_OVERHEAD); - dsi_htotal += dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; - dsi_hss_hsa_hse_hbp += dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; if (sync_pulse) { if (mode_valid_check) @@ -768,49 +769,90 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, dsi_cfg->hsa = dpi_to_dsi_timing(tmp, bpp, DSI_HSA_FRAME_OVERHEAD); - dsi_htotal += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; - dsi_hss_hsa_hse_hbp += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; } dsi_cfg->hact = dpi_to_dsi_timing(mode_valid_check ? mode->hdisplay : mode->crtc_hdisplay, bpp, 0); - dsi_htotal += dsi_cfg->hact; + dsi_cfg->hfp = dpi_to_dsi_timing(mode_to_dpi_hfp(mode), bpp, + DSI_HFP_FRAME_OVERHEAD); - if (mode_valid_check) - dpi_hfp = mode->hsync_start - mode->hdisplay; - else - dpi_hfp = mode->crtc_hsync_start - mode->crtc_hdisplay; + return 0; +} + +static int cdns_dphy_validate(struct cdns_dsi *dsi, + struct cdns_dsi_cfg *dsi_cfg, + struct cdns_dphy_cfg *dphy_cfg, + const struct drm_display_mode *mode, + bool mode_valid_check) +{ + struct cdns_dsi_output *output = &dsi->output; + unsigned long dsi_htotal; + unsigned int dsi_hfp_ext = 0; + + int ret; - dsi_cfg->hfp = dpi_to_dsi_timing(dpi_hfp, bpp, DSI_HFP_FRAME_OVERHEAD); + dsi_htotal = dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; + if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + dsi_htotal += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; + + dsi_htotal += dsi_cfg->hact; dsi_htotal += dsi_cfg->hfp + DSI_HFP_FRAME_OVERHEAD; if (mode_valid_check) ret = cdns_dsi_get_dphy_pll_cfg(dsi->dphy, dphy_cfg, - mode->htotal, bpp, + mode->htotal, mode->clock * 1000, - dsi_htotal, nlanes, + mipi_dsi_pixel_format_to_bpp(output->dev->format), + dsi_htotal, + output->dev->lanes, &dsi_hfp_ext); else ret = cdns_dsi_get_dphy_pll_cfg(dsi->dphy, dphy_cfg, - mode->crtc_htotal, bpp, + mode->crtc_htotal, + mipi_dsi_pixel_format_to_bpp(output->dev->format), mode->crtc_clock * 1000, - dsi_htotal, nlanes, + dsi_htotal, + output->dev->lanes, &dsi_hfp_ext); - if (ret) return ret; dsi_cfg->hfp += dsi_hfp_ext; - dsi_htotal += dsi_hfp_ext; - dsi_cfg->htotal = dsi_htotal; + dsi_cfg->htotal = dsi_htotal + dsi_hfp_ext; + + return 0; +} + +static int cdns_dsi_check_conf(struct cdns_dsi *dsi, + const struct drm_display_mode *mode, + struct cdns_dsi_cfg *dsi_cfg, + struct cdns_dphy_cfg *dphy_cfg, + bool mode_valid_check) +{ + struct cdns_dsi_output *output = &dsi->output; + unsigned long dsi_hss_hsa_hse_hbp; + unsigned int nlanes = output->dev->lanes; + int ret; + + ret = cdns_dsi_mode2cfg(dsi, mode, dsi_cfg, mode_valid_check); + if (ret) + return ret; + + ret = cdns_dphy_validate(dsi, dsi_cfg, dphy_cfg, mode, mode_valid_check); + if (ret) + return ret; + + dsi_hss_hsa_hse_hbp = dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; + if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + dsi_hss_hsa_hse_hbp += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; /* * Make sure DPI(HFP) > DSI(HSS+HSA+HSE+HBP) to guarantee that the FIFO * is empty before we start a receiving a new line on the DPI * interface. */ - if ((u64)dphy_cfg->lane_bps * dpi_hfp * nlanes < + if ((u64)dphy_cfg->lane_bps * mode_to_dpi_hfp(mode) * nlanes < (u64)dsi_hss_hsa_hse_hbp * (mode_valid_check ? mode->clock : mode->crtc_clock) * 1000) return -EINVAL; @@ -842,7 +884,7 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, struct cdns_dsi_output *output = &dsi->output; struct cdns_dphy_cfg dphy_cfg; struct cdns_dsi_cfg dsi_cfg; - int bpp, nlanes, ret; + int bpp, ret; /* * VFP_DSI should be less than VFP_DPI and VFP_DSI should be at @@ -860,11 +902,9 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, if ((mode->hdisplay * bpp) % 32) return MODE_H_ILLEGAL; - nlanes = output->dev->lanes; - - ret = cdns_dsi_mode2cfg(dsi, mode, &dsi_cfg, &dphy_cfg, true); + ret = cdns_dsi_check_conf(dsi, mode, &dsi_cfg, &dphy_cfg, true); if (ret) - return MODE_CLOCK_RANGE; + return MODE_BAD; return MODE_OK; } @@ -990,7 +1030,7 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) bpp = mipi_dsi_pixel_format_to_bpp(output->dev->format); nlanes = output->dev->lanes; - WARN_ON_ONCE(cdns_dsi_mode2cfg(dsi, mode, &dsi_cfg, &dphy_cfg, false)); + WARN_ON_ONCE(cdns_dsi_check_conf(dsi, mode, &dsi_cfg, &dphy_cfg, false)); cdns_dsi_hs_init(dsi, &dphy_cfg); cdns_dsi_init_link(dsi); -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@bootlin.com (Maxime Ripard) Date: Tue, 6 Nov 2018 15:54:19 +0100 Subject: [PATCH v2 7/9] drm/bridge: cdns: Separate DSI and D-PHY configuration In-Reply-To: References: Message-ID: <8214d82bb1cfd2160f900deef8a9934b4efb0685.1541516029.git-series.maxime.ripard@bootlin.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The current configuration of the DSI bridge and its associated D-PHY is intertwined. In order to ease the future conversion to the phy framework for the D-PHY part, let's split the configuration in two. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/cdns-dsi.c | 96 ++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c index ce9496d13986..3ac6dd524b6d 100644 --- a/drivers/gpu/drm/bridge/cdns-dsi.c +++ b/drivers/gpu/drm/bridge/cdns-dsi.c @@ -545,6 +545,11 @@ bridge_to_cdns_dsi_input(struct drm_bridge *bridge) return container_of(bridge, struct cdns_dsi_input, bridge); } +static unsigned int mode_to_dpi_hfp(const struct drm_display_mode *mode) +{ + return mode->crtc_hsync_start - mode->crtc_hdisplay; +} + static int cdns_dsi_get_dphy_pll_cfg(struct cdns_dphy *dphy, struct cdns_dphy_cfg *cfg, unsigned int dpi_htotal, @@ -731,14 +736,12 @@ static unsigned int dpi_to_dsi_timing(unsigned int dpi_timing, static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, const struct drm_display_mode *mode, struct cdns_dsi_cfg *dsi_cfg, - struct cdns_dphy_cfg *dphy_cfg, bool mode_valid_check) { - unsigned long dsi_htotal = 0, dsi_hss_hsa_hse_hbp = 0; struct cdns_dsi_output *output = &dsi->output; - unsigned int dsi_hfp_ext = 0, dpi_hfp, tmp; + unsigned int tmp; bool sync_pulse = false; - int bpp, nlanes, ret; + int bpp, nlanes; memset(dsi_cfg, 0, sizeof(*dsi_cfg)); @@ -757,8 +760,6 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, mode->crtc_hsync_end : mode->crtc_hsync_start); dsi_cfg->hbp = dpi_to_dsi_timing(tmp, bpp, DSI_HBP_FRAME_OVERHEAD); - dsi_htotal += dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; - dsi_hss_hsa_hse_hbp += dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; if (sync_pulse) { if (mode_valid_check) @@ -768,49 +769,90 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, dsi_cfg->hsa = dpi_to_dsi_timing(tmp, bpp, DSI_HSA_FRAME_OVERHEAD); - dsi_htotal += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; - dsi_hss_hsa_hse_hbp += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; } dsi_cfg->hact = dpi_to_dsi_timing(mode_valid_check ? mode->hdisplay : mode->crtc_hdisplay, bpp, 0); - dsi_htotal += dsi_cfg->hact; + dsi_cfg->hfp = dpi_to_dsi_timing(mode_to_dpi_hfp(mode), bpp, + DSI_HFP_FRAME_OVERHEAD); - if (mode_valid_check) - dpi_hfp = mode->hsync_start - mode->hdisplay; - else - dpi_hfp = mode->crtc_hsync_start - mode->crtc_hdisplay; + return 0; +} + +static int cdns_dphy_validate(struct cdns_dsi *dsi, + struct cdns_dsi_cfg *dsi_cfg, + struct cdns_dphy_cfg *dphy_cfg, + const struct drm_display_mode *mode, + bool mode_valid_check) +{ + struct cdns_dsi_output *output = &dsi->output; + unsigned long dsi_htotal; + unsigned int dsi_hfp_ext = 0; + + int ret; - dsi_cfg->hfp = dpi_to_dsi_timing(dpi_hfp, bpp, DSI_HFP_FRAME_OVERHEAD); + dsi_htotal = dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; + if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + dsi_htotal += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; + + dsi_htotal += dsi_cfg->hact; dsi_htotal += dsi_cfg->hfp + DSI_HFP_FRAME_OVERHEAD; if (mode_valid_check) ret = cdns_dsi_get_dphy_pll_cfg(dsi->dphy, dphy_cfg, - mode->htotal, bpp, + mode->htotal, mode->clock * 1000, - dsi_htotal, nlanes, + mipi_dsi_pixel_format_to_bpp(output->dev->format), + dsi_htotal, + output->dev->lanes, &dsi_hfp_ext); else ret = cdns_dsi_get_dphy_pll_cfg(dsi->dphy, dphy_cfg, - mode->crtc_htotal, bpp, + mode->crtc_htotal, + mipi_dsi_pixel_format_to_bpp(output->dev->format), mode->crtc_clock * 1000, - dsi_htotal, nlanes, + dsi_htotal, + output->dev->lanes, &dsi_hfp_ext); - if (ret) return ret; dsi_cfg->hfp += dsi_hfp_ext; - dsi_htotal += dsi_hfp_ext; - dsi_cfg->htotal = dsi_htotal; + dsi_cfg->htotal = dsi_htotal + dsi_hfp_ext; + + return 0; +} + +static int cdns_dsi_check_conf(struct cdns_dsi *dsi, + const struct drm_display_mode *mode, + struct cdns_dsi_cfg *dsi_cfg, + struct cdns_dphy_cfg *dphy_cfg, + bool mode_valid_check) +{ + struct cdns_dsi_output *output = &dsi->output; + unsigned long dsi_hss_hsa_hse_hbp; + unsigned int nlanes = output->dev->lanes; + int ret; + + ret = cdns_dsi_mode2cfg(dsi, mode, dsi_cfg, mode_valid_check); + if (ret) + return ret; + + ret = cdns_dphy_validate(dsi, dsi_cfg, dphy_cfg, mode, mode_valid_check); + if (ret) + return ret; + + dsi_hss_hsa_hse_hbp = dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD; + if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + dsi_hss_hsa_hse_hbp += dsi_cfg->hsa + DSI_HSA_FRAME_OVERHEAD; /* * Make sure DPI(HFP) > DSI(HSS+HSA+HSE+HBP) to guarantee that the FIFO * is empty before we start a receiving a new line on the DPI * interface. */ - if ((u64)dphy_cfg->lane_bps * dpi_hfp * nlanes < + if ((u64)dphy_cfg->lane_bps * mode_to_dpi_hfp(mode) * nlanes < (u64)dsi_hss_hsa_hse_hbp * (mode_valid_check ? mode->clock : mode->crtc_clock) * 1000) return -EINVAL; @@ -842,7 +884,7 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, struct cdns_dsi_output *output = &dsi->output; struct cdns_dphy_cfg dphy_cfg; struct cdns_dsi_cfg dsi_cfg; - int bpp, nlanes, ret; + int bpp, ret; /* * VFP_DSI should be less than VFP_DPI and VFP_DSI should be at @@ -860,11 +902,9 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, if ((mode->hdisplay * bpp) % 32) return MODE_H_ILLEGAL; - nlanes = output->dev->lanes; - - ret = cdns_dsi_mode2cfg(dsi, mode, &dsi_cfg, &dphy_cfg, true); + ret = cdns_dsi_check_conf(dsi, mode, &dsi_cfg, &dphy_cfg, true); if (ret) - return MODE_CLOCK_RANGE; + return MODE_BAD; return MODE_OK; } @@ -990,7 +1030,7 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) bpp = mipi_dsi_pixel_format_to_bpp(output->dev->format); nlanes = output->dev->lanes; - WARN_ON_ONCE(cdns_dsi_mode2cfg(dsi, mode, &dsi_cfg, &dphy_cfg, false)); + WARN_ON_ONCE(cdns_dsi_check_conf(dsi, mode, &dsi_cfg, &dphy_cfg, false)); cdns_dsi_hs_init(dsi, &dphy_cfg); cdns_dsi_init_link(dsi); -- git-series 0.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH v2 7/9] drm/bridge: cdns: Separate DSI and D-PHY configuration Date: Tue, 6 Nov 2018 15:54:19 +0100 Message-ID: <8214d82bb1cfd2160f900deef8a9934b4efb0685.1541516029.git-series.maxime.ripard@bootlin.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CF126E395 for ; Tue, 6 Nov 2018 14:54:40 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kishon Vijay Abraham I , Boris Brezillon Cc: Rafal Ciepiela , Krzysztof Witos , Maxime Ripard , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , Laurent Pinchart , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhlIGN1cnJlbnQgY29uZmlndXJhdGlvbiBvZiB0aGUgRFNJIGJyaWRnZSBhbmQgaXRzIGFzc29j aWF0ZWQgRC1QSFkgaXMKaW50ZXJ0d2luZWQuIEluIG9yZGVyIHRvIGVhc2UgdGhlIGZ1dHVyZSBj b252ZXJzaW9uIHRvIHRoZSBwaHkgZnJhbWV3b3JrCmZvciB0aGUgRC1QSFkgcGFydCwgbGV0J3Mg c3BsaXQgdGhlIGNvbmZpZ3VyYXRpb24gaW4gdHdvLgoKU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJp cGFyZCA8bWF4aW1lLnJpcGFyZEBib290bGluLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYnJp ZGdlL2NkbnMtZHNpLmMgfCA5NiArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDY4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvY2Rucy1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9i cmlkZ2UvY2Rucy1kc2kuYwppbmRleCBjZTk0OTZkMTM5ODYuLjNhYzZkZDUyNGI2ZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9jZG5zLWRzaS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9icmlkZ2UvY2Rucy1kc2kuYwpAQCAtNTQ1LDYgKzU0NSwxMSBAQCBicmlkZ2VfdG9fY2Ru c19kc2lfaW5wdXQoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSkKIAlyZXR1cm4gY29udGFpbmVy X29mKGJyaWRnZSwgc3RydWN0IGNkbnNfZHNpX2lucHV0LCBicmlkZ2UpOwogfQogCitzdGF0aWMg dW5zaWduZWQgaW50IG1vZGVfdG9fZHBpX2hmcChjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9k ZSAqbW9kZSkKK3sKKwlyZXR1cm4gbW9kZS0+Y3J0Y19oc3luY19zdGFydCAtIG1vZGUtPmNydGNf aGRpc3BsYXk7Cit9CisKIHN0YXRpYyBpbnQgY2Ruc19kc2lfZ2V0X2RwaHlfcGxsX2NmZyhzdHJ1 Y3QgY2Ruc19kcGh5ICpkcGh5LAogCQkJCSAgICAgc3RydWN0IGNkbnNfZHBoeV9jZmcgKmNmZywK IAkJCQkgICAgIHVuc2lnbmVkIGludCBkcGlfaHRvdGFsLApAQCAtNzMxLDE0ICs3MzYsMTIgQEAg c3RhdGljIHVuc2lnbmVkIGludCBkcGlfdG9fZHNpX3RpbWluZyh1bnNpZ25lZCBpbnQgZHBpX3Rp bWluZywKIHN0YXRpYyBpbnQgY2Ruc19kc2lfbW9kZTJjZmcoc3RydWN0IGNkbnNfZHNpICpkc2ks CiAJCQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCQkJICAgICBz dHJ1Y3QgY2Ruc19kc2lfY2ZnICpkc2lfY2ZnLAotCQkJICAgICBzdHJ1Y3QgY2Ruc19kcGh5X2Nm ZyAqZHBoeV9jZmcsCiAJCQkgICAgIGJvb2wgbW9kZV92YWxpZF9jaGVjaykKIHsKLQl1bnNpZ25l ZCBsb25nIGRzaV9odG90YWwgPSAwLCBkc2lfaHNzX2hzYV9oc2VfaGJwID0gMDsKIAlzdHJ1Y3Qg Y2Ruc19kc2lfb3V0cHV0ICpvdXRwdXQgPSAmZHNpLT5vdXRwdXQ7Ci0JdW5zaWduZWQgaW50IGRz aV9oZnBfZXh0ID0gMCwgZHBpX2hmcCwgdG1wOworCXVuc2lnbmVkIGludCB0bXA7CiAJYm9vbCBz eW5jX3B1bHNlID0gZmFsc2U7Ci0JaW50IGJwcCwgbmxhbmVzLCByZXQ7CisJaW50IGJwcCwgbmxh bmVzOwogCiAJbWVtc2V0KGRzaV9jZmcsIDAsIHNpemVvZigqZHNpX2NmZykpOwogCkBAIC03NTcs OCArNzYwLDYgQEAgc3RhdGljIGludCBjZG5zX2RzaV9tb2RlMmNmZyhzdHJ1Y3QgY2Ruc19kc2kg KmRzaSwKIAkJICAgICAgIG1vZGUtPmNydGNfaHN5bmNfZW5kIDogbW9kZS0+Y3J0Y19oc3luY19z dGFydCk7CiAKIAlkc2lfY2ZnLT5oYnAgPSBkcGlfdG9fZHNpX3RpbWluZyh0bXAsIGJwcCwgRFNJ X0hCUF9GUkFNRV9PVkVSSEVBRCk7Ci0JZHNpX2h0b3RhbCArPSBkc2lfY2ZnLT5oYnAgKyBEU0lf SEJQX0ZSQU1FX09WRVJIRUFEOwotCWRzaV9oc3NfaHNhX2hzZV9oYnAgKz0gZHNpX2NmZy0+aGJw ICsgRFNJX0hCUF9GUkFNRV9PVkVSSEVBRDsKIAogCWlmIChzeW5jX3B1bHNlKSB7CiAJCWlmICht b2RlX3ZhbGlkX2NoZWNrKQpAQCAtNzY4LDQ5ICs3NjksOTAgQEAgc3RhdGljIGludCBjZG5zX2Rz aV9tb2RlMmNmZyhzdHJ1Y3QgY2Ruc19kc2kgKmRzaSwKIAogCQlkc2lfY2ZnLT5oc2EgPSBkcGlf dG9fZHNpX3RpbWluZyh0bXAsIGJwcCwKIAkJCQkJCSBEU0lfSFNBX0ZSQU1FX09WRVJIRUFEKTsK LQkJZHNpX2h0b3RhbCArPSBkc2lfY2ZnLT5oc2EgKyBEU0lfSFNBX0ZSQU1FX09WRVJIRUFEOwot CQlkc2lfaHNzX2hzYV9oc2VfaGJwICs9IGRzaV9jZmctPmhzYSArIERTSV9IU0FfRlJBTUVfT1ZF UkhFQUQ7CiAJfQogCiAJZHNpX2NmZy0+aGFjdCA9IGRwaV90b19kc2lfdGltaW5nKG1vZGVfdmFs aWRfY2hlY2sgPwogCQkJCQkgIG1vZGUtPmhkaXNwbGF5IDogbW9kZS0+Y3J0Y19oZGlzcGxheSwK IAkJCQkJICBicHAsIDApOwotCWRzaV9odG90YWwgKz0gZHNpX2NmZy0+aGFjdDsKKwlkc2lfY2Zn LT5oZnAgPSBkcGlfdG9fZHNpX3RpbWluZyhtb2RlX3RvX2RwaV9oZnAobW9kZSksIGJwcCwKKwkJ CQkJIERTSV9IRlBfRlJBTUVfT1ZFUkhFQUQpOwogCi0JaWYgKG1vZGVfdmFsaWRfY2hlY2spCi0J CWRwaV9oZnAgPSBtb2RlLT5oc3luY19zdGFydCAtIG1vZGUtPmhkaXNwbGF5OwotCWVsc2UKLQkJ ZHBpX2hmcCA9IG1vZGUtPmNydGNfaHN5bmNfc3RhcnQgLSBtb2RlLT5jcnRjX2hkaXNwbGF5Owor CXJldHVybiAwOworfQorCitzdGF0aWMgaW50IGNkbnNfZHBoeV92YWxpZGF0ZShzdHJ1Y3QgY2Ru c19kc2kgKmRzaSwKKwkJCSAgICAgIHN0cnVjdCBjZG5zX2RzaV9jZmcgKmRzaV9jZmcsCisJCQkg ICAgICBzdHJ1Y3QgY2Ruc19kcGh5X2NmZyAqZHBoeV9jZmcsCisJCQkgICAgICBjb25zdCBzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCSAgICAgIGJvb2wgbW9kZV92YWxpZF9jaGVj aykKK3sKKwlzdHJ1Y3QgY2Ruc19kc2lfb3V0cHV0ICpvdXRwdXQgPSAmZHNpLT5vdXRwdXQ7CisJ dW5zaWduZWQgbG9uZyBkc2lfaHRvdGFsOworCXVuc2lnbmVkIGludCBkc2lfaGZwX2V4dCA9IDA7 CisKKwlpbnQgcmV0OwogCi0JZHNpX2NmZy0+aGZwID0gZHBpX3RvX2RzaV90aW1pbmcoZHBpX2hm cCwgYnBwLCBEU0lfSEZQX0ZSQU1FX09WRVJIRUFEKTsKKwlkc2lfaHRvdGFsID0gZHNpX2NmZy0+ aGJwICsgRFNJX0hCUF9GUkFNRV9PVkVSSEVBRDsKKwlpZiAob3V0cHV0LT5kZXYtPm1vZGVfZmxh Z3MgJiBNSVBJX0RTSV9NT0RFX1ZJREVPX1NZTkNfUFVMU0UpCisJCWRzaV9odG90YWwgKz0gZHNp X2NmZy0+aHNhICsgRFNJX0hTQV9GUkFNRV9PVkVSSEVBRDsKKworCWRzaV9odG90YWwgKz0gZHNp X2NmZy0+aGFjdDsKIAlkc2lfaHRvdGFsICs9IGRzaV9jZmctPmhmcCArIERTSV9IRlBfRlJBTUVf T1ZFUkhFQUQ7CiAKIAlpZiAobW9kZV92YWxpZF9jaGVjaykKIAkJcmV0ID0gY2Ruc19kc2lfZ2V0 X2RwaHlfcGxsX2NmZyhkc2ktPmRwaHksIGRwaHlfY2ZnLAotCQkJCQkJbW9kZS0+aHRvdGFsLCBi cHAsCisJCQkJCQltb2RlLT5odG90YWwsCiAJCQkJCQltb2RlLT5jbG9jayAqIDEwMDAsCi0JCQkJ CQlkc2lfaHRvdGFsLCBubGFuZXMsCisJCQkJCQltaXBpX2RzaV9waXhlbF9mb3JtYXRfdG9fYnBw KG91dHB1dC0+ZGV2LT5mb3JtYXQpLAorCQkJCQkJZHNpX2h0b3RhbCwKKwkJCQkJCW91dHB1dC0+ ZGV2LT5sYW5lcywKIAkJCQkJCSZkc2lfaGZwX2V4dCk7CiAJZWxzZQogCQlyZXQgPSBjZG5zX2Rz aV9nZXRfZHBoeV9wbGxfY2ZnKGRzaS0+ZHBoeSwgZHBoeV9jZmcsCi0JCQkJCQltb2RlLT5jcnRj X2h0b3RhbCwgYnBwLAorCQkJCQkJbW9kZS0+Y3J0Y19odG90YWwsCisJCQkJCQltaXBpX2RzaV9w aXhlbF9mb3JtYXRfdG9fYnBwKG91dHB1dC0+ZGV2LT5mb3JtYXQpLAogCQkJCQkJbW9kZS0+Y3J0 Y19jbG9jayAqIDEwMDAsCi0JCQkJCQlkc2lfaHRvdGFsLCBubGFuZXMsCisJCQkJCQlkc2lfaHRv dGFsLAorCQkJCQkJb3V0cHV0LT5kZXYtPmxhbmVzLAogCQkJCQkJJmRzaV9oZnBfZXh0KTsKLQog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAlkc2lfY2ZnLT5oZnAgKz0gZHNpX2hmcF9leHQ7 Ci0JZHNpX2h0b3RhbCArPSBkc2lfaGZwX2V4dDsKLQlkc2lfY2ZnLT5odG90YWwgPSBkc2lfaHRv dGFsOworCWRzaV9jZmctPmh0b3RhbCA9IGRzaV9odG90YWwgKyBkc2lfaGZwX2V4dDsKKworCXJl dHVybiAwOworfQorCitzdGF0aWMgaW50IGNkbnNfZHNpX2NoZWNrX2NvbmYoc3RydWN0IGNkbnNf ZHNpICpkc2ksCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUs CisJCQkgICAgICAgc3RydWN0IGNkbnNfZHNpX2NmZyAqZHNpX2NmZywKKwkJCSAgICAgICBzdHJ1 Y3QgY2Ruc19kcGh5X2NmZyAqZHBoeV9jZmcsCisJCQkgICAgICAgYm9vbCBtb2RlX3ZhbGlkX2No ZWNrKQoreworCXN0cnVjdCBjZG5zX2RzaV9vdXRwdXQgKm91dHB1dCA9ICZkc2ktPm91dHB1dDsK Kwl1bnNpZ25lZCBsb25nIGRzaV9oc3NfaHNhX2hzZV9oYnA7CisJdW5zaWduZWQgaW50IG5sYW5l cyA9IG91dHB1dC0+ZGV2LT5sYW5lczsKKwlpbnQgcmV0OworCisJcmV0ID0gY2Ruc19kc2lfbW9k ZTJjZmcoZHNpLCBtb2RlLCBkc2lfY2ZnLCBtb2RlX3ZhbGlkX2NoZWNrKTsKKwlpZiAocmV0KQor CQlyZXR1cm4gcmV0OworCisJcmV0ID0gY2Ruc19kcGh5X3ZhbGlkYXRlKGRzaSwgZHNpX2NmZywg ZHBoeV9jZmcsIG1vZGUsIG1vZGVfdmFsaWRfY2hlY2spOworCWlmIChyZXQpCisJCXJldHVybiBy ZXQ7CisKKwlkc2lfaHNzX2hzYV9oc2VfaGJwID0gZHNpX2NmZy0+aGJwICsgRFNJX0hCUF9GUkFN RV9PVkVSSEVBRDsKKwlpZiAob3V0cHV0LT5kZXYtPm1vZGVfZmxhZ3MgJiBNSVBJX0RTSV9NT0RF X1ZJREVPX1NZTkNfUFVMU0UpCisJCWRzaV9oc3NfaHNhX2hzZV9oYnAgKz0gZHNpX2NmZy0+aHNh ICsgRFNJX0hTQV9GUkFNRV9PVkVSSEVBRDsKIAogCS8qCiAJICogTWFrZSBzdXJlIERQSShIRlAp ID4gRFNJKEhTUytIU0ErSFNFK0hCUCkgdG8gZ3VhcmFudGVlIHRoYXQgdGhlIEZJRk8KIAkgKiBp cyBlbXB0eSBiZWZvcmUgd2Ugc3RhcnQgYSByZWNlaXZpbmcgYSBuZXcgbGluZSBvbiB0aGUgRFBJ CiAJICogaW50ZXJmYWNlLgogCSAqLwotCWlmICgodTY0KWRwaHlfY2ZnLT5sYW5lX2JwcyAqIGRw aV9oZnAgKiBubGFuZXMgPAorCWlmICgodTY0KWRwaHlfY2ZnLT5sYW5lX2JwcyAqIG1vZGVfdG9f ZHBpX2hmcChtb2RlKSAqIG5sYW5lcyA8CiAJICAgICh1NjQpZHNpX2hzc19oc2FfaHNlX2hicCAq CiAJICAgIChtb2RlX3ZhbGlkX2NoZWNrID8gbW9kZS0+Y2xvY2sgOiBtb2RlLT5jcnRjX2Nsb2Nr KSAqIDEwMDApCiAJCXJldHVybiAtRUlOVkFMOwpAQCAtODQyLDcgKzg4NCw3IEBAIGNkbnNfZHNp X2JyaWRnZV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UsCiAJc3RydWN0IGNk bnNfZHNpX291dHB1dCAqb3V0cHV0ID0gJmRzaS0+b3V0cHV0OwogCXN0cnVjdCBjZG5zX2RwaHlf Y2ZnIGRwaHlfY2ZnOwogCXN0cnVjdCBjZG5zX2RzaV9jZmcgZHNpX2NmZzsKLQlpbnQgYnBwLCBu bGFuZXMsIHJldDsKKwlpbnQgYnBwLCByZXQ7CiAKIAkvKgogCSAqIFZGUF9EU0kgc2hvdWxkIGJl IGxlc3MgdGhhbiBWRlBfRFBJIGFuZCBWRlBfRFNJIHNob3VsZCBiZSBhdApAQCAtODYwLDExICs5 MDIsOSBAQCBjZG5zX2RzaV9icmlkZ2VfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJp ZGdlLAogCWlmICgobW9kZS0+aGRpc3BsYXkgKiBicHApICUgMzIpCiAJCXJldHVybiBNT0RFX0hf SUxMRUdBTDsKIAotCW5sYW5lcyA9IG91dHB1dC0+ZGV2LT5sYW5lczsKLQotCXJldCA9IGNkbnNf ZHNpX21vZGUyY2ZnKGRzaSwgbW9kZSwgJmRzaV9jZmcsICZkcGh5X2NmZywgdHJ1ZSk7CisJcmV0 ID0gY2Ruc19kc2lfY2hlY2tfY29uZihkc2ksIG1vZGUsICZkc2lfY2ZnLCAmZHBoeV9jZmcsIHRy dWUpOwogCWlmIChyZXQpCi0JCXJldHVybiBNT0RFX0NMT0NLX1JBTkdFOworCQlyZXR1cm4gTU9E RV9CQUQ7CiAKIAlyZXR1cm4gTU9ERV9PSzsKIH0KQEAgLTk5MCw3ICsxMDMwLDcgQEAgc3RhdGlj IHZvaWQgY2Ruc19kc2lfYnJpZGdlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQog CWJwcCA9IG1pcGlfZHNpX3BpeGVsX2Zvcm1hdF90b19icHAob3V0cHV0LT5kZXYtPmZvcm1hdCk7 CiAJbmxhbmVzID0gb3V0cHV0LT5kZXYtPmxhbmVzOwogCi0JV0FSTl9PTl9PTkNFKGNkbnNfZHNp X21vZGUyY2ZnKGRzaSwgbW9kZSwgJmRzaV9jZmcsICZkcGh5X2NmZywgZmFsc2UpKTsKKwlXQVJO X09OX09OQ0UoY2Ruc19kc2lfY2hlY2tfY29uZihkc2ksIG1vZGUsICZkc2lfY2ZnLCAmZHBoeV9j ZmcsIGZhbHNlKSk7CiAKIAljZG5zX2RzaV9oc19pbml0KGRzaSwgJmRwaHlfY2ZnKTsKIAljZG5z X2RzaV9pbml0X2xpbmsoZHNpKTsKLS0gCmdpdC1zZXJpZXMgMC45LjEKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==