From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753685AbcC3O0x (ORCPT ); Wed, 30 Mar 2016 10:26:53 -0400 Received: from mga02.intel.com ([134.134.136.20]:8331 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752055AbcC3O0w (ORCPT ); Wed, 30 Mar 2016 10:26:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,416,1455004800"; d="scan'208";a="948063215" From: Jani Nikula To: Lyude , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, Ville =?utf-8?B?U3lyasOkbMOk?= , Lyude , Daniel Vetter , David Airlie , open list Subject: Re: [PATCH v4 RESEND 5/5] drm/i915: Get rid of intel_dp_dpcd_read_wake() In-Reply-To: <1459175606-13875-6-git-send-email-cpaul@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1459175606-13875-1-git-send-email-cpaul@redhat.com> <1459175606-13875-6-git-send-email-cpaul@redhat.com> User-Agent: Notmuch/0.21+91~gada1e33 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Wed, 30 Mar 2016 17:26:47 +0300 Message-ID: <87lh5011p4.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 28 Mar 2016, Lyude wrote: > Since we've fixed up drm_dp_dpcd_read() to allow for retries when things > timeout, there's no use for having this function anymore. Good riddens. > > Signed-off-by: Lyude > --- > drivers/gpu/drm/i915/intel_dp.c | 79 ++++++++++++----------------------------- > 1 file changed, 22 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index f069a82..43c2933 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -3184,47 +3184,14 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder) > } > > /* > - * Native read with retry for link status and receiver capability reads for > - * cases where the sink may still be asleep. > - * > - * Sinks are *supposed* to come up within 1ms from an off state, but we're also > - * supposed to retry 3 times per the spec. > - */ > -static ssize_t > -intel_dp_dpcd_read_wake(struct drm_dp_aux *aux, unsigned int offset, > - void *buffer, size_t size) > -{ > - ssize_t ret; > - int i; > - > - /* > - * Sometime we just get the same incorrect byte repeated > - * over the entire buffer. Doing just one throw away read > - * initially seems to "solve" it. > - */ > - drm_dp_dpcd_read(aux, DP_DPCD_REV, buffer, 1); Ville, care to check this series (except patch 1) with your display to see if it still works? BR, Jani. > - > - for (i = 0; i < 3; i++) { > - ret = drm_dp_dpcd_read(aux, offset, buffer, size); > - if (ret == size) > - return ret; > - msleep(1); > - } > - > - return ret; > -} > - > -/* > * Fetch AUX CH registers 0x202 - 0x207 which contain > * link status information > */ > bool > intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]) > { > - return intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_LANE0_1_STATUS, > - link_status, > - DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; > + return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status, > + DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; > } > > /* These are source-specific values. */ > @@ -3859,8 +3826,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > struct drm_i915_private *dev_priv = dev->dev_private; > uint8_t rev; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, 0x000, intel_dp->dpcd, > - sizeof(intel_dp->dpcd)) < 0) > + if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd, > + sizeof(intel_dp->dpcd)) < 0) > return false; /* aux transfer failed */ > > DRM_DEBUG_KMS("DPCD: %*ph\n", (int) sizeof(intel_dp->dpcd), intel_dp->dpcd); > @@ -3871,9 +3838,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > /* Check if the panel supports PSR */ > memset(intel_dp->psr_dpcd, 0, sizeof(intel_dp->psr_dpcd)); > if (is_edp(intel_dp)) { > - intel_dp_dpcd_read_wake(&intel_dp->aux, DP_PSR_SUPPORT, > - intel_dp->psr_dpcd, > - sizeof(intel_dp->psr_dpcd)); > + drm_dp_dpcd_read(&intel_dp->aux, DP_PSR_SUPPORT, > + intel_dp->psr_dpcd, > + sizeof(intel_dp->psr_dpcd)); > if (intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED) { > dev_priv->psr.sink_support = true; > DRM_DEBUG_KMS("Detected EDP PSR Panel.\n"); > @@ -3884,9 +3851,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > uint8_t frame_sync_cap; > > dev_priv->psr.sink_support = true; > - intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP, > - &frame_sync_cap, 1); > + drm_dp_dpcd_read(&intel_dp->aux, > + DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP, > + &frame_sync_cap, 1); > dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; > /* PSR2 needs frame sync as well */ > dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; > @@ -3902,15 +3869,13 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > /* Intermediate frequency support */ > if (is_edp(intel_dp) && > (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) && > - (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) && > + (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) && > (rev >= 0x03)) { /* eDp v1.4 or higher */ > __le16 sink_rates[DP_MAX_SUPPORTED_RATES]; > int i; > > - intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_SUPPORTED_LINK_RATES, > - sink_rates, > - sizeof(sink_rates)); > + drm_dp_dpcd_read(&intel_dp->aux, DP_SUPPORTED_LINK_RATES, > + sink_rates, sizeof(sink_rates)); > > for (i = 0; i < ARRAY_SIZE(sink_rates); i++) { > int val = le16_to_cpu(sink_rates[i]); > @@ -3933,9 +3898,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > if (intel_dp->dpcd[DP_DPCD_REV] == 0x10) > return true; /* no per-port downstream info */ > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_DOWNSTREAM_PORT_0, > - intel_dp->downstream_ports, > - DP_MAX_DOWNSTREAM_PORTS) < 0) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_DOWNSTREAM_PORT_0, > + intel_dp->downstream_ports, > + DP_MAX_DOWNSTREAM_PORTS) < 0) > return false; /* downstream port status fetch failed */ > > return true; > @@ -3949,11 +3914,11 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) > if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) > return; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3) > DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", > buf[0], buf[1], buf[2]); > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3) > DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", > buf[0], buf[1], buf[2]); > } > @@ -3969,7 +3934,7 @@ intel_dp_probe_mst(struct intel_dp *intel_dp) > if (intel_dp->dpcd[DP_DPCD_REV] < 0x12) > return false; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_MSTM_CAP, buf, 1)) { > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_MSTM_CAP, buf, 1)) { > if (buf[0] & DP_MST_CAP) { > DRM_DEBUG_KMS("Sink is MST capable\n"); > intel_dp->is_mst = true; > @@ -4106,7 +4071,7 @@ stop: > static bool > intel_dp_get_sink_irq(struct intel_dp *intel_dp, u8 *sink_irq_vector) > { > - return intel_dp_dpcd_read_wake(&intel_dp->aux, > + return drm_dp_dpcd_read(&intel_dp->aux, > DP_DEVICE_SERVICE_IRQ_VECTOR, > sink_irq_vector, 1) == 1; > } > @@ -4116,7 +4081,7 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector) > { > int ret; > > - ret = intel_dp_dpcd_read_wake(&intel_dp->aux, > + ret = drm_dp_dpcd_read(&intel_dp->aux, > DP_SINK_COUNT_ESI, > sink_irq_vector, 14); > if (ret != 14) > @@ -4377,7 +4342,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) > intel_dp->downstream_ports[0] & DP_DS_PORT_HPD) { > uint8_t reg; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_COUNT, > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_COUNT, > ®, 1) < 0) > return connector_status_unknown; -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v4 RESEND 5/5] drm/i915: Get rid of intel_dp_dpcd_read_wake() Date: Wed, 30 Mar 2016 17:26:47 +0300 Message-ID: <87lh5011p4.fsf@intel.com> References: <1459175606-13875-1-git-send-email-cpaul@redhat.com> <1459175606-13875-6-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1459175606-13875-6-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, open list , Daniel Vetter , Lyude List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyOCBNYXIgMjAxNiwgTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+IHdyb3RlOgo+IFNp bmNlIHdlJ3ZlIGZpeGVkIHVwIGRybV9kcF9kcGNkX3JlYWQoKSB0byBhbGxvdyBmb3IgcmV0cmll cyB3aGVuIHRoaW5ncwo+IHRpbWVvdXQsIHRoZXJlJ3Mgbm8gdXNlIGZvciBoYXZpbmcgdGhpcyBm dW5jdGlvbiBhbnltb3JlLiBHb29kIHJpZGRlbnMuCj4KPiBTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8 Y3BhdWxAcmVkaGF0LmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YyB8IDc5ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmls ZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwo+IGluZGV4IGYwNjlhODIuLjQzYzI5MzMgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMKPiBAQCAtMzE4NCw0NyArMzE4NCwxNCBAQCBzdGF0aWMgdm9pZCBjaHZfZHBf cG9zdF9wbGxfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKPiAgfQo+ICAK PiAgLyoKPiAtICogTmF0aXZlIHJlYWQgd2l0aCByZXRyeSBmb3IgbGluayBzdGF0dXMgYW5kIHJl Y2VpdmVyIGNhcGFiaWxpdHkgcmVhZHMgZm9yCj4gLSAqIGNhc2VzIHdoZXJlIHRoZSBzaW5rIG1h eSBzdGlsbCBiZSBhc2xlZXAuCj4gLSAqCj4gLSAqIFNpbmtzIGFyZSAqc3VwcG9zZWQqIHRvIGNv bWUgdXAgd2l0aGluIDFtcyBmcm9tIGFuIG9mZiBzdGF0ZSwgYnV0IHdlJ3JlIGFsc28KPiAtICog c3VwcG9zZWQgdG8gcmV0cnkgMyB0aW1lcyBwZXIgdGhlIHNwZWMuCj4gLSAqLwo+IC1zdGF0aWMg c3NpemVfdAo+IC1pbnRlbF9kcF9kcGNkX3JlYWRfd2FrZShzdHJ1Y3QgZHJtX2RwX2F1eCAqYXV4 LCB1bnNpZ25lZCBpbnQgb2Zmc2V0LAo+IC0JCQl2b2lkICpidWZmZXIsIHNpemVfdCBzaXplKQo+ IC17Cj4gLQlzc2l6ZV90IHJldDsKPiAtCWludCBpOwo+IC0KPiAtCS8qCj4gLQkgKiBTb21ldGlt ZSB3ZSBqdXN0IGdldCB0aGUgc2FtZSBpbmNvcnJlY3QgYnl0ZSByZXBlYXRlZAo+IC0JICogb3Zl ciB0aGUgZW50aXJlIGJ1ZmZlci4gRG9pbmcganVzdCBvbmUgdGhyb3cgYXdheSByZWFkCj4gLQkg KiBpbml0aWFsbHkgc2VlbXMgdG8gInNvbHZlIiBpdC4KPiAtCSAqLwo+IC0JZHJtX2RwX2RwY2Rf cmVhZChhdXgsIERQX0RQQ0RfUkVWLCBidWZmZXIsIDEpOwoKVmlsbGUsIGNhcmUgdG8gY2hlY2sg dGhpcyBzZXJpZXMgKGV4Y2VwdCBwYXRjaCAxKSB3aXRoIHlvdXIgZGlzcGxheSB0bwpzZWUgaWYg aXQgc3RpbGwgd29ya3M/CgpCUiwKSmFuaS4KCgo+IC0KPiAtCWZvciAoaSA9IDA7IGkgPCAzOyBp KyspIHsKPiAtCQlyZXQgPSBkcm1fZHBfZHBjZF9yZWFkKGF1eCwgb2Zmc2V0LCBidWZmZXIsIHNp emUpOwo+IC0JCWlmIChyZXQgPT0gc2l6ZSkKPiAtCQkJcmV0dXJuIHJldDsKPiAtCQltc2xlZXAo MSk7Cj4gLQl9Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiAtfQo+IC0KPiAtLyoKPiAgICogRmV0Y2gg QVVYIENIIHJlZ2lzdGVycyAweDIwMiAtIDB4MjA3IHdoaWNoIGNvbnRhaW4KPiAgICogbGluayBz dGF0dXMgaW5mb3JtYXRpb24KPiAgICovCj4gIGJvb2wKPiAgaW50ZWxfZHBfZ2V0X2xpbmtfc3Rh dHVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHVpbnQ4X3QgbGlua19zdGF0dXNbRFBfTElO S19TVEFUVVNfU0laRV0pCj4gIHsKPiAtCXJldHVybiBpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgm aW50ZWxfZHAtPmF1eCwKPiAtCQkJCSAgICAgICBEUF9MQU5FMF8xX1NUQVRVUywKPiAtCQkJCSAg ICAgICBsaW5rX3N0YXR1cywKPiAtCQkJCSAgICAgICBEUF9MSU5LX1NUQVRVU19TSVpFKSA9PSBE UF9MSU5LX1NUQVRVU19TSVpFOwo+ICsJcmV0dXJuIGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2Rw LT5hdXgsIERQX0xBTkUwXzFfU1RBVFVTLCBsaW5rX3N0YXR1cywKPiArCQkJCURQX0xJTktfU1RB VFVTX1NJWkUpID09IERQX0xJTktfU1RBVFVTX1NJWkU7Cj4gIH0KPiAgCj4gIC8qIFRoZXNlIGFy ZSBzb3VyY2Utc3BlY2lmaWMgdmFsdWVzLiAqLwo+IEBAIC0zODU5LDggKzM4MjYsOCBAQCBpbnRl bF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ICAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCXVpbnQ4X3QgcmV2 Owo+ICAKPiAtCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwgMHgw MDAsIGludGVsX2RwLT5kcGNkLAo+IC0JCQkJICAgIHNpemVvZihpbnRlbF9kcC0+ZHBjZCkpIDwg MCkKPiArCWlmIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCAweDAwMCwgaW50ZWxf ZHAtPmRwY2QsCj4gKwkJCSAgICAgc2l6ZW9mKGludGVsX2RwLT5kcGNkKSkgPCAwKQo+ICAJCXJl dHVybiBmYWxzZTsgLyogYXV4IHRyYW5zZmVyIGZhaWxlZCAqLwo+ICAKPiAgCURSTV9ERUJVR19L TVMoIkRQQ0Q6ICUqcGhcbiIsIChpbnQpIHNpemVvZihpbnRlbF9kcC0+ZHBjZCksIGludGVsX2Rw LT5kcGNkKTsKPiBAQCAtMzg3MSw5ICszODM4LDkgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKPiAgCS8qIENoZWNrIGlmIHRoZSBwYW5lbCBzdXBwb3J0cyBQ U1IgKi8KPiAgCW1lbXNldChpbnRlbF9kcC0+cHNyX2RwY2QsIDAsIHNpemVvZihpbnRlbF9kcC0+ cHNyX2RwY2QpKTsKPiAgCWlmIChpc19lZHAoaW50ZWxfZHApKSB7Cj4gLQkJaW50ZWxfZHBfZHBj ZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQX1BTUl9TVVBQT1JULAo+IC0JCQkJCWludGVs X2RwLT5wc3JfZHBjZCwKPiAtCQkJCQlzaXplb2YoaW50ZWxfZHAtPnBzcl9kcGNkKSk7Cj4gKwkJ ZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfUFNSX1NVUFBPUlQsCj4gKwkJCQkg aW50ZWxfZHAtPnBzcl9kcGNkLAo+ICsJCQkJIHNpemVvZihpbnRlbF9kcC0+cHNyX2RwY2QpKTsK PiAgCQlpZiAoaW50ZWxfZHAtPnBzcl9kcGNkWzBdICYgRFBfUFNSX0lTX1NVUFBPUlRFRCkgewo+ ICAJCQlkZXZfcHJpdi0+cHNyLnNpbmtfc3VwcG9ydCA9IHRydWU7Cj4gIAkJCURSTV9ERUJVR19L TVMoIkRldGVjdGVkIEVEUCBQU1IgUGFuZWwuXG4iKTsKPiBAQCAtMzg4NCw5ICszODUxLDkgQEAg aW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKPiAgCQkJdWludDhf dCBmcmFtZV9zeW5jX2NhcDsKPiAgCj4gIAkJCWRldl9wcml2LT5wc3Iuc2lua19zdXBwb3J0ID0g dHJ1ZTsKPiAtCQkJaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsCj4gLQkJ CQkJRFBfU0lOS19ERVZJQ0VfQVVYX0ZSQU1FX1NZTkNfQ0FQLAo+IC0JCQkJCSZmcmFtZV9zeW5j X2NhcCwgMSk7Cj4gKwkJCWRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsCj4gKwkJCQkJ IERQX1NJTktfREVWSUNFX0FVWF9GUkFNRV9TWU5DX0NBUCwKPiArCQkJCQkgJmZyYW1lX3N5bmNf Y2FwLCAxKTsKPiAgCQkJZGV2X3ByaXYtPnBzci5hdXhfZnJhbWVfc3luYyA9IGZyYW1lX3N5bmNf Y2FwID8gdHJ1ZSA6IGZhbHNlOwo+ICAJCQkvKiBQU1IyIG5lZWRzIGZyYW1lIHN5bmMgYXMgd2Vs bCAqLwo+ICAJCQlkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCA9IGRldl9wcml2LT5wc3IuYXV4 X2ZyYW1lX3N5bmM7Cj4gQEAgLTM5MDIsMTUgKzM4NjksMTMgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKPiAgCS8qIEludGVybWVkaWF0ZSBmcmVxdWVuY3kg c3VwcG9ydCAqLwo+ICAJaWYgKGlzX2VkcChpbnRlbF9kcCkgJiYKPiAgCSAgICAoaW50ZWxfZHAt PmRwY2RbRFBfRURQX0NPTkZJR1VSQVRJT05fQ0FQXSAmCURQX0RQQ0RfRElTUExBWV9DT05UUk9M X0NBUEFCTEUpICYmCj4gLQkgICAgKGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+ YXV4LCBEUF9FRFBfRFBDRF9SRVYsICZyZXYsIDEpID09IDEpICYmCj4gKwkgICAgKGRybV9kcF9k cGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQX0VEUF9EUENEX1JFViwgJnJldiwgMSkgPT0gMSkg JiYKPiAgCSAgICAocmV2ID49IDB4MDMpKSB7IC8qIGVEcCB2MS40IG9yIGhpZ2hlciAqLwo+ICAJ CV9fbGUxNiBzaW5rX3JhdGVzW0RQX01BWF9TVVBQT1JURURfUkFURVNdOwo+ICAJCWludCBpOwo+ ICAKPiAtCQlpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKPiAtCQkJCURQ X1NVUFBPUlRFRF9MSU5LX1JBVEVTLAo+IC0JCQkJc2lua19yYXRlcywKPiAtCQkJCXNpemVvZihz aW5rX3JhdGVzKSk7Cj4gKwkJZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfU1VQ UE9SVEVEX0xJTktfUkFURVMsCj4gKwkJCQlzaW5rX3JhdGVzLCBzaXplb2Yoc2lua19yYXRlcykp Owo+ICAKPiAgCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShzaW5rX3JhdGVzKTsgaSsrKSB7 Cj4gIAkJCWludCB2YWwgPSBsZTE2X3RvX2NwdShzaW5rX3JhdGVzW2ldKTsKPiBAQCAtMzkzMyw5 ICszODk4LDkgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkK PiAgCWlmIChpbnRlbF9kcC0+ZHBjZFtEUF9EUENEX1JFVl0gPT0gMHgxMCkKPiAgCQlyZXR1cm4g dHJ1ZTsgLyogbm8gcGVyLXBvcnQgZG93bnN0cmVhbSBpbmZvICovCj4gIAo+IC0JaWYgKGludGVs X2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9ET1dOU1RSRUFNX1BPUlRfMCwK PiAtCQkJCSAgICBpbnRlbF9kcC0+ZG93bnN0cmVhbV9wb3J0cywKPiAtCQkJCSAgICBEUF9NQVhf RE9XTlNUUkVBTV9QT1JUUykgPCAwKQo+ICsJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2Rw LT5hdXgsIERQX0RPV05TVFJFQU1fUE9SVF8wLAo+ICsJCQkgICAgIGludGVsX2RwLT5kb3duc3Ry ZWFtX3BvcnRzLAo+ICsJCQkgICAgIERQX01BWF9ET1dOU1RSRUFNX1BPUlRTKSA8IDApCj4gIAkJ cmV0dXJuIGZhbHNlOyAvKiBkb3duc3RyZWFtIHBvcnQgc3RhdHVzIGZldGNoIGZhaWxlZCAqLwo+ ICAKPiAgCXJldHVybiB0cnVlOwo+IEBAIC0zOTQ5LDExICszOTE0LDExIEBAIGludGVsX2RwX3By b2JlX291aShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ICAJaWYgKCEoaW50ZWxfZHAtPmRw Y2RbRFBfRE9XTl9TVFJFQU1fUE9SVF9DT1VOVF0gJiBEUF9PVUlfU1VQUE9SVCkpCj4gIAkJcmV0 dXJuOwo+ICAKPiAtCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwg RFBfU0lOS19PVUksIGJ1ZiwgMykgPT0gMykKPiArCWlmIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRl bF9kcC0+YXV4LCBEUF9TSU5LX09VSSwgYnVmLCAzKSA9PSAzKQo+ICAJCURSTV9ERUJVR19LTVMo IlNpbmsgT1VJOiAlMDJoeCUwMmh4JTAyaHhcbiIsCj4gIAkJCSAgICAgIGJ1ZlswXSwgYnVmWzFd LCBidWZbMl0pOwo+ICAKPiAtCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAt PmF1eCwgRFBfQlJBTkNIX09VSSwgYnVmLCAzKSA9PSAzKQo+ICsJaWYgKGRybV9kcF9kcGNkX3Jl YWQoJmludGVsX2RwLT5hdXgsIERQX0JSQU5DSF9PVUksIGJ1ZiwgMykgPT0gMykKPiAgCQlEUk1f REVCVUdfS01TKCJCcmFuY2ggT1VJOiAlMDJoeCUwMmh4JTAyaHhcbiIsCj4gIAkJCSAgICAgIGJ1 ZlswXSwgYnVmWzFdLCBidWZbMl0pOwo+ICB9Cj4gQEAgLTM5NjksNyArMzkzNCw3IEBAIGludGVs X2RwX3Byb2JlX21zdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ICAJaWYgKGludGVsX2Rw LT5kcGNkW0RQX0RQQ0RfUkVWXSA8IDB4MTIpCj4gIAkJcmV0dXJuIGZhbHNlOwo+ICAKPiAtCWlm IChpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfTVNUTV9DQVAsIGJ1 ZiwgMSkpIHsKPiArCWlmIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9NU1RN X0NBUCwgYnVmLCAxKSkgewo+ICAJCWlmIChidWZbMF0gJiBEUF9NU1RfQ0FQKSB7Cj4gIAkJCURS TV9ERUJVR19LTVMoIlNpbmsgaXMgTVNUIGNhcGFibGVcbiIpOwo+ICAJCQlpbnRlbF9kcC0+aXNf bXN0ID0gdHJ1ZTsKPiBAQCAtNDEwNiw3ICs0MDcxLDcgQEAgc3RvcDoKPiAgc3RhdGljIGJvb2wK PiAgaW50ZWxfZHBfZ2V0X3NpbmtfaXJxKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHU4ICpz aW5rX2lycV92ZWN0b3IpCj4gIHsKPiAtCXJldHVybiBpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgm aW50ZWxfZHAtPmF1eCwKPiArCXJldHVybiBkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4 LAo+ICAJCQkJICAgICAgIERQX0RFVklDRV9TRVJWSUNFX0lSUV9WRUNUT1IsCj4gIAkJCQkgICAg ICAgc2lua19pcnFfdmVjdG9yLCAxKSA9PSAxOwo+ICB9Cj4gQEAgLTQxMTYsNyArNDA4MSw3IEBA IGludGVsX2RwX2dldF9zaW5rX2lycV9lc2koc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdTgg KnNpbmtfaXJxX3ZlY3RvcikKPiAgewo+ICAJaW50IHJldDsKPiAgCj4gLQlyZXQgPSBpbnRlbF9k cF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKPiArCXJldCA9IGRybV9kcF9kcGNkX3Jl YWQoJmludGVsX2RwLT5hdXgsCj4gIAkJCQkJICAgICBEUF9TSU5LX0NPVU5UX0VTSSwKPiAgCQkJ CQkgICAgIHNpbmtfaXJxX3ZlY3RvciwgMTQpOwo+ICAJaWYgKHJldCAhPSAxNCkKPiBAQCAtNDM3 Nyw3ICs0MzQyLDcgQEAgaW50ZWxfZHBfZGV0ZWN0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKPiAgCSAgICBpbnRlbF9kcC0+ZG93bnN0cmVhbV9wb3J0c1swXSAmIERQX0RTX1BPUlRf SFBEKSB7Cj4gIAkJdWludDhfdCByZWc7Cj4gIAo+IC0JCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRf d2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfU0lOS19DT1VOVCwKPiArCQlpZiAoZHJtX2RwX2RwY2Rf cmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfU0lOS19DT1VOVCwKPiAgCQkJCQkgICAgJnJlZywgMSkg PCAwKQo+ICAJCQlyZXR1cm4gY29ubmVjdG9yX3N0YXR1c191bmtub3duOwoKLS0gCkphbmkgTmlr dWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK