From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-313747-1519830560-2-4047561876631862055 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES roenda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org' X-Spam-charsets: X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1519830559; b=hdKswOnZjPgZzbBcZxhpmFQNcBmNIRzGnkeodoHOfKZ8D6s N6TN8NsPghHCZyGkknoojl6I/1qolp7PukvwUUqMuKkmJMQQerbUZ3M9GxD751xh w1qXBRd+GHvKyKBWc3ngfRezl9XS6ZqSVS4u2XegF/8kbbByIzhmWX7FFmVdsKLo KzTrtlT5oh6Snitkjl4xAmFdEkbVjev2lNsR9PWZPt0idtqtpYIYTbyxkQVkCbRR OudMwKz0j9/rnZZrROl/9aQi5yr/hKI+ZlzoKtKX3YX/3btaLCwyL/B/Dl8jVCnA SCABzcWjIgqfPE3+iPyVkA1zFgAYEcngNGjK/8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1519830559; bh=voCkyig6Q6vzJRQ0q+lafekiaGeNH/35c90Y9lAZh6U=; b=fbJae1XHUcFI ek4/WHbR2TDRGBrrfXR/y2DE0KlJjByQi9odCqBydPwkYR3i+k/0qIL7VTpYYNiZ EMEdYkRlGgqrsqbm9gb6xI2pI3bojTn8cK97UHPLmXPAQjEsBsyAhCXFuHPimd+o tyIzzOVoM3zcj/UFJ9G5erfnUm6PoxMO9pSwGMJskFCPVNHdmSD19g+WETLvpu0c dxbg5b8lPTm/BeUHV6Sy5P6t75ZuPqK4dhk8t+OhQ94wA0xgfONkaP6qdAs7ISwK du3oDa18r9aLp1aPoVutnffwQp5Co8ZsQi6Sz6GlM/JujWcAEttqKn8WZHuuxpDR o5F4fKQcsg== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=redhat.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=redhat.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=redhat.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=redhat.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932497AbeB1PJE (ORCPT ); Wed, 28 Feb 2018 10:09:04 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43338 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932493AbeB1PIQ (ORCPT ); Wed, 28 Feb 2018 10:08:16 -0500 From: Hans de Goede To: Darren Hart , Andy Shevchenko , MyungJoo Ham , Chanwoo Choi , Mathias Nyman , Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck Cc: Hans de Goede , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v5 10/12] usb: typec: driver for Pericom PI3USB30532 Type-C cross switch Date: Wed, 28 Feb 2018 16:07:47 +0100 Message-Id: <20180228150749.26831-11-hdegoede@redhat.com> In-Reply-To: <20180228150749.26831-1-hdegoede@redhat.com> References: <20180228150749.26831-1-hdegoede@redhat.com> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Add a driver for the Pericom PI3USB30532 Type-C cross switch / mux chip found on some devices with a Type-C port. Reviewed-by: Heikki Krogerus Reviewed-by: Andy Shevchenko Signed-off-by: Hans de Goede --- Changes in v4: -Add Andy's Reviewed-by Changes in v2: -Cleanup pi3usb30532_set_conf() error handling -Add Heikki's Reviewed-by Changes in v1: -This is a rewrite of my previous driver which was using the drivers/mux framework to use the new drivers/usb/typec/mux framework --- MAINTAINERS | 6 ++ drivers/usb/typec/Kconfig | 2 + drivers/usb/typec/Makefile | 1 + drivers/usb/typec/mux/Kconfig | 10 ++ drivers/usb/typec/mux/Makefile | 3 + drivers/usb/typec/mux/pi3usb30532.c | 178 ++++++++++++++++++++++++++++++++++++ 6 files changed, 200 insertions(+) create mode 100644 drivers/usb/typec/mux/Kconfig create mode 100644 drivers/usb/typec/mux/Makefile create mode 100644 drivers/usb/typec/mux/pi3usb30532.c diff --git a/MAINTAINERS b/MAINTAINERS index 523f14b4216d..cc66ac1b9ee0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14530,6 +14530,12 @@ F: drivers/usb/ F: include/linux/usb.h F: include/linux/usb/ +USB TYPEC PI3USB30532 MUX DRIVER +M: Hans de Goede +L: linux-usb@vger.kernel.org +S: Maintained +F: drivers/usb/typec/mux/pi3usb30532.c + USB TYPEC SUBSYSTEM M: Heikki Krogerus L: linux-usb@vger.kernel.org diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig index a2a0684e7c82..030f88cb0c3f 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -85,4 +85,6 @@ config TYPEC_TPS6598X If you choose to build this driver as a dynamically linked module, the module will be called tps6598x.ko. +source "drivers/usb/typec/mux/Kconfig" + endif # TYPEC diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 56b2e9516ec1..1f599a6c30cc 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -6,3 +6,4 @@ obj-y += fusb302/ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o obj-$(CONFIG_TYPEC_UCSI) += ucsi/ obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o +obj-$(CONFIG_TYPEC) += mux/ diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig new file mode 100644 index 000000000000..9a954d2b8d8f --- /dev/null +++ b/drivers/usb/typec/mux/Kconfig @@ -0,0 +1,10 @@ +menu "USB Type-C Multiplexer/DeMultiplexer Switch support" + +config TYPEC_MUX_PI3USB30532 + tristate "Pericom PI3USB30532 Type-C cross switch driver" + depends on I2C + help + Say Y or M if your system has a Pericom PI3USB30532 Type-C cross + switch / mux chip found on some devices with a Type-C port. + +endmenu diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile new file mode 100644 index 000000000000..1332e469b8a0 --- /dev/null +++ b/drivers/usb/typec/mux/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TYPEC_MUX_PI3USB30532) += pi3usb30532.o diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi3usb30532.c new file mode 100644 index 000000000000..86cda9f388f3 --- /dev/null +++ b/drivers/usb/typec/mux/pi3usb30532.c @@ -0,0 +1,178 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Pericom PI3USB30532 Type-C cross switch / mux driver + * + * Copyright (c) 2017-2018 Hans de Goede + */ + +#include +#include +#include +#include +#include +#include + +#define PI3USB30532_CONF 0x00 + +#define PI3USB30532_CONF_OPEN 0x00 +#define PI3USB30532_CONF_SWAP 0x01 +#define PI3USB30532_CONF_4LANE_DP 0x02 +#define PI3USB30532_CONF_USB3 0x04 +#define PI3USB30532_CONF_USB3_AND_2LANE_DP 0x06 + +struct pi3usb30532 { + struct i2c_client *client; + struct mutex lock; /* protects the cached conf register */ + struct typec_switch sw; + struct typec_mux mux; + u8 conf; +}; + +static int pi3usb30532_set_conf(struct pi3usb30532 *pi, u8 new_conf) +{ + int ret = 0; + + if (pi->conf == new_conf) + return 0; + + ret = i2c_smbus_write_byte_data(pi->client, PI3USB30532_CONF, new_conf); + if (ret) { + dev_err(&pi->client->dev, "Error writing conf: %d\n", ret); + return ret; + } + + pi->conf = new_conf; + return 0; +} + +static int pi3usb30532_sw_set(struct typec_switch *sw, + enum typec_orientation orientation) +{ + struct pi3usb30532 *pi = container_of(sw, struct pi3usb30532, sw); + u8 new_conf; + int ret; + + mutex_lock(&pi->lock); + new_conf = pi->conf; + + switch (orientation) { + case TYPEC_ORIENTATION_NONE: + new_conf = PI3USB30532_CONF_OPEN; + break; + case TYPEC_ORIENTATION_NORMAL: + new_conf &= ~PI3USB30532_CONF_SWAP; + break; + case TYPEC_ORIENTATION_REVERSE: + new_conf |= PI3USB30532_CONF_SWAP; + break; + }; + + ret = pi3usb30532_set_conf(pi, new_conf); + mutex_unlock(&pi->lock); + + return ret; +} + +static int pi3usb30532_mux_set(struct typec_mux *mux, int state) +{ + struct pi3usb30532 *pi = container_of(mux, struct pi3usb30532, mux); + u8 new_conf; + int ret; + + mutex_lock(&pi->lock); + new_conf = pi->conf; + + switch (state) { + case TYPEC_MUX_NONE: + new_conf = PI3USB30532_CONF_OPEN; + break; + case TYPEC_MUX_USB: + new_conf = (new_conf & PI3USB30532_CONF_SWAP) | + PI3USB30532_CONF_USB3; + break; + case TYPEC_MUX_DP: + new_conf = (new_conf & PI3USB30532_CONF_SWAP) | + PI3USB30532_CONF_4LANE_DP; + break; + case TYPEC_MUX_DOCK: + new_conf = (new_conf & PI3USB30532_CONF_SWAP) | + PI3USB30532_CONF_USB3_AND_2LANE_DP; + break; + }; + + ret = pi3usb30532_set_conf(pi, new_conf); + mutex_unlock(&pi->lock); + + return ret; +} + +static int pi3usb30532_probe(struct i2c_client *client) +{ + struct device *dev = &client->dev; + struct pi3usb30532 *pi; + int ret; + + pi = devm_kzalloc(dev, sizeof(*pi), GFP_KERNEL); + if (!pi) + return -ENOMEM; + + pi->client = client; + pi->sw.dev = dev; + pi->sw.set = pi3usb30532_sw_set; + pi->mux.dev = dev; + pi->mux.set = pi3usb30532_mux_set; + mutex_init(&pi->lock); + + ret = i2c_smbus_read_byte_data(client, PI3USB30532_CONF); + if (ret < 0) { + dev_err(dev, "Error reading config register %d\n", ret); + return ret; + } + pi->conf = ret; + + ret = typec_switch_register(&pi->sw); + if (ret) { + dev_err(dev, "Error registering typec switch: %d\n", ret); + return ret; + } + + ret = typec_mux_register(&pi->mux); + if (ret) { + typec_switch_unregister(&pi->sw); + dev_err(dev, "Error registering typec mux: %d\n", ret); + return ret; + } + + i2c_set_clientdata(client, pi); + return 0; +} + +static int pi3usb30532_remove(struct i2c_client *client) +{ + struct pi3usb30532 *pi = i2c_get_clientdata(client); + + typec_mux_unregister(&pi->mux); + typec_switch_unregister(&pi->sw); + return 0; +} + +static const struct i2c_device_id pi3usb30532_table[] = { + { "pi3usb30532" }, + { } +}; +MODULE_DEVICE_TABLE(i2c, pi3usb30532_table); + +static struct i2c_driver pi3usb30532_driver = { + .driver = { + .name = "pi3usb30532", + }, + .probe_new = pi3usb30532_probe, + .remove = pi3usb30532_remove, + .id_table = pi3usb30532_table, +}; + +module_i2c_driver(pi3usb30532_driver); + +MODULE_AUTHOR("Hans de Goede "); +MODULE_DESCRIPTION("Pericom PI3USB30532 Type-C mux driver"); +MODULE_LICENSE("GPL"); -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,10/12] usb: typec: driver for Pericom PI3USB30532 Type-C cross switch From: Hans de Goede Message-Id: <20180228150749.26831-11-hdegoede@redhat.com> Date: Wed, 28 Feb 2018 16:07:47 +0100 To: Darren Hart , Andy Shevchenko , MyungJoo Ham , Chanwoo Choi , Mathias Nyman , Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck Cc: Hans de Goede , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: QWRkIGEgZHJpdmVyIGZvciB0aGUgUGVyaWNvbSBQSTNVU0IzMDUzMiBUeXBlLUMgY3Jvc3Mgc3dp dGNoIC8KbXV4IGNoaXAgZm91bmQgb24gc29tZSBkZXZpY2VzIHdpdGggYSBUeXBlLUMgcG9ydC4K ClJldmlld2VkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51eC5pbnRl bC5jb20+ClJldmlld2VkLWJ5OiBBbmR5IFNoZXZjaGVua28gPGFuZHkuc2hldmNoZW5rb0BnbWFp bC5jb20+ClNpZ25lZC1vZmYtYnk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+ Ci0tLQpDaGFuZ2VzIGluIHY0OgotQWRkIEFuZHkncyBSZXZpZXdlZC1ieQoKQ2hhbmdlcyBpbiB2 MjoKLUNsZWFudXAgcGkzdXNiMzA1MzJfc2V0X2NvbmYoKSBlcnJvciBoYW5kbGluZwotQWRkIEhl aWtraSdzIFJldmlld2VkLWJ5CgpDaGFuZ2VzIGluIHYxOgotVGhpcyBpcyBhIHJld3JpdGUgb2Yg bXkgcHJldmlvdXMgZHJpdmVyIHdoaWNoIHdhcyB1c2luZyB0aGUKIGRyaXZlcnMvbXV4IGZyYW1l d29yayB0byB1c2UgdGhlIG5ldyBkcml2ZXJzL3VzYi90eXBlYy9tdXggZnJhbWV3b3JrCi0tLQog TUFJTlRBSU5FUlMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDYgKysKIGRyaXZlcnMvdXNi L3R5cGVjL0tjb25maWcgICAgICAgICAgIHwgICAyICsKIGRyaXZlcnMvdXNiL3R5cGVjL01ha2Vm aWxlICAgICAgICAgIHwgICAxICsKIGRyaXZlcnMvdXNiL3R5cGVjL211eC9LY29uZmlnICAgICAg IHwgIDEwICsrCiBkcml2ZXJzL3VzYi90eXBlYy9tdXgvTWFrZWZpbGUgICAgICB8ICAgMyArCiBk cml2ZXJzL3VzYi90eXBlYy9tdXgvcGkzdXNiMzA1MzIuYyB8IDE3OCArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgMjAwIGluc2VydGlvbnMoKykK IGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL3VzYi90eXBlYy9tdXgvS2NvbmZpZwogY3JlYXRl IG1vZGUgMTAwNjQ0IGRyaXZlcnMvdXNiL3R5cGVjL211eC9NYWtlZmlsZQogY3JlYXRlIG1vZGUg MTAwNjQ0IGRyaXZlcnMvdXNiL3R5cGVjL211eC9waTN1c2IzMDUzMi5jCgpkaWZmIC0tZ2l0IGEv TUFJTlRBSU5FUlMgYi9NQUlOVEFJTkVSUwppbmRleCA1MjNmMTRiNDIxNmQuLmNjNjZhYzFiOWVl MCAxMDA2NDQKLS0tIGEvTUFJTlRBSU5FUlMKKysrIGIvTUFJTlRBSU5FUlMKQEAgLTE0NTMwLDYg KzE0NTMwLDEyIEBAIEY6CWRyaXZlcnMvdXNiLwogRjoJaW5jbHVkZS9saW51eC91c2IuaAogRjoJ aW5jbHVkZS9saW51eC91c2IvCiAKK1VTQiBUWVBFQyBQSTNVU0IzMDUzMiBNVVggRFJJVkVSCitN OglIYW5zIGRlIEdvZWRlIDxoZGVnb2VkZUByZWRoYXQuY29tPgorTDoJbGludXgtdXNiQHZnZXIu a2VybmVsLm9yZworUzoJTWFpbnRhaW5lZAorRjoJZHJpdmVycy91c2IvdHlwZWMvbXV4L3BpM3Vz YjMwNTMyLmMKKwogVVNCIFRZUEVDIFNVQlNZU1RFTQogTToJSGVpa2tpIEtyb2dlcnVzIDxoZWlr a2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgogTDoJbGludXgtdXNiQHZnZXIua2VybmVsLm9y ZwpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvdHlwZWMvS2NvbmZpZyBiL2RyaXZlcnMvdXNiL3R5 cGVjL0tjb25maWcKaW5kZXggYTJhMDY4NGU3YzgyLi4wMzBmODhjYjBjM2YgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvdXNiL3R5cGVjL0tjb25maWcKKysrIGIvZHJpdmVycy91c2IvdHlwZWMvS2NvbmZp ZwpAQCAtODUsNCArODUsNiBAQCBjb25maWcgVFlQRUNfVFBTNjU5OFgKIAkgIElmIHlvdSBjaG9v c2UgdG8gYnVpbGQgdGhpcyBkcml2ZXIgYXMgYSBkeW5hbWljYWxseSBsaW5rZWQgbW9kdWxlLCB0 aGUKIAkgIG1vZHVsZSB3aWxsIGJlIGNhbGxlZCB0cHM2NTk4eC5rby4KIAorc291cmNlICJkcml2 ZXJzL3VzYi90eXBlYy9tdXgvS2NvbmZpZyIKKwogZW5kaWYgIyBUWVBFQwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy91c2IvdHlwZWMvTWFrZWZpbGUgYi9kcml2ZXJzL3VzYi90eXBlYy9NYWtlZmlsZQpp bmRleCA1NmIyZTk1MTZlYzEuLjFmNTk5YTZjMzBjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv dHlwZWMvTWFrZWZpbGUKKysrIGIvZHJpdmVycy91c2IvdHlwZWMvTWFrZWZpbGUKQEAgLTYsMyAr Niw0IEBAIG9iai15CQkJCSs9IGZ1c2IzMDIvCiBvYmotJChDT05GSUdfVFlQRUNfV0NPVkUpCSs9 IHR5cGVjX3djb3ZlLm8KIG9iai0kKENPTkZJR19UWVBFQ19VQ1NJKQkrPSB1Y3NpLwogb2JqLSQo Q09ORklHX1RZUEVDX1RQUzY1OThYKQkrPSB0cHM2NTk4eC5vCitvYmotJChDT05GSUdfVFlQRUMp CQkrPSBtdXgvCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi90eXBlYy9tdXgvS2NvbmZpZyBiL2Ry aXZlcnMvdXNiL3R5cGVjL211eC9LY29uZmlnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMC4uOWE5NTRkMmI4ZDhmCi0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVycy91c2Iv dHlwZWMvbXV4L0tjb25maWcKQEAgLTAsMCArMSwxMCBAQAorbWVudSAiVVNCIFR5cGUtQyBNdWx0 aXBsZXhlci9EZU11bHRpcGxleGVyIFN3aXRjaCBzdXBwb3J0IgorCitjb25maWcgVFlQRUNfTVVY X1BJM1VTQjMwNTMyCisJdHJpc3RhdGUgIlBlcmljb20gUEkzVVNCMzA1MzIgVHlwZS1DIGNyb3Nz IHN3aXRjaCBkcml2ZXIiCisJZGVwZW5kcyBvbiBJMkMKKwloZWxwCisJICBTYXkgWSBvciBNIGlm IHlvdXIgc3lzdGVtIGhhcyBhIFBlcmljb20gUEkzVVNCMzA1MzIgVHlwZS1DIGNyb3NzCisJICBz d2l0Y2ggLyBtdXggY2hpcCBmb3VuZCBvbiBzb21lIGRldmljZXMgd2l0aCBhIFR5cGUtQyBwb3J0 LgorCitlbmRtZW51CmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi90eXBlYy9tdXgvTWFrZWZpbGUg Yi9kcml2ZXJzL3VzYi90eXBlYy9tdXgvTWFrZWZpbGUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwLi4xMzMyZTQ2OWI4YTAKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJz L3VzYi90eXBlYy9tdXgvTWFrZWZpbGUKQEAgLTAsMCArMSwzIEBACisjIFNQRFgtTGljZW5zZS1J ZGVudGlmaWVyOiBHUEwtMi4wCisKK29iai0kKENPTkZJR19UWVBFQ19NVVhfUEkzVVNCMzA1MzIp CSs9IHBpM3VzYjMwNTMyLm8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3R5cGVjL211eC9waTN1 c2IzMDUzMi5jIGIvZHJpdmVycy91c2IvdHlwZWMvbXV4L3BpM3VzYjMwNTMyLmMKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi44NmNkYTlmMzg4ZjMKLS0tIC9kZXYvbnVs bAorKysgYi9kcml2ZXJzL3VzYi90eXBlYy9tdXgvcGkzdXNiMzA1MzIuYwpAQCAtMCwwICsxLDE3 OCBAQAorLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjArCisvKgorICogUGVyaWNv bSBQSTNVU0IzMDUzMiBUeXBlLUMgY3Jvc3Mgc3dpdGNoIC8gbXV4IGRyaXZlcgorICoKKyAqIENv cHlyaWdodCAoYykgMjAxNy0yMDE4IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+ CisgKi8KKworI2luY2x1ZGUgPGxpbnV4L2kyYy5oPgorI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5o PgorI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgorI2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+Cisj aW5jbHVkZSA8bGludXgvdXNiL3RjcG0uaD4KKyNpbmNsdWRlIDxsaW51eC91c2IvdHlwZWNfbXV4 Lmg+CisKKyNkZWZpbmUgUEkzVVNCMzA1MzJfQ09ORgkJCTB4MDAKKworI2RlZmluZSBQSTNVU0Iz MDUzMl9DT05GX09QRU4JCQkweDAwCisjZGVmaW5lIFBJM1VTQjMwNTMyX0NPTkZfU1dBUAkJCTB4 MDEKKyNkZWZpbmUgUEkzVVNCMzA1MzJfQ09ORl80TEFORV9EUAkJMHgwMgorI2RlZmluZSBQSTNV U0IzMDUzMl9DT05GX1VTQjMJCQkweDA0CisjZGVmaW5lIFBJM1VTQjMwNTMyX0NPTkZfVVNCM19B TkRfMkxBTkVfRFAJMHgwNgorCitzdHJ1Y3QgcGkzdXNiMzA1MzIgeworCXN0cnVjdCBpMmNfY2xp ZW50ICpjbGllbnQ7CisJc3RydWN0IG11dGV4IGxvY2s7IC8qIHByb3RlY3RzIHRoZSBjYWNoZWQg Y29uZiByZWdpc3RlciAqLworCXN0cnVjdCB0eXBlY19zd2l0Y2ggc3c7CisJc3RydWN0IHR5cGVj X211eCBtdXg7CisJdTggY29uZjsKK307CisKK3N0YXRpYyBpbnQgcGkzdXNiMzA1MzJfc2V0X2Nv bmYoc3RydWN0IHBpM3VzYjMwNTMyICpwaSwgdTggbmV3X2NvbmYpCit7CisJaW50IHJldCA9IDA7 CisKKwlpZiAocGktPmNvbmYgPT0gbmV3X2NvbmYpCisJCXJldHVybiAwOworCisJcmV0ID0gaTJj X3NtYnVzX3dyaXRlX2J5dGVfZGF0YShwaS0+Y2xpZW50LCBQSTNVU0IzMDUzMl9DT05GLCBuZXdf Y29uZik7CisJaWYgKHJldCkgeworCQlkZXZfZXJyKCZwaS0+Y2xpZW50LT5kZXYsICJFcnJvciB3 cml0aW5nIGNvbmY6ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXBpLT5jb25m ID0gbmV3X2NvbmY7CisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgcGkzdXNiMzA1MzJfc3df c2V0KHN0cnVjdCB0eXBlY19zd2l0Y2ggKnN3LAorCQkJICAgICAgZW51bSB0eXBlY19vcmllbnRh dGlvbiBvcmllbnRhdGlvbikKK3sKKwlzdHJ1Y3QgcGkzdXNiMzA1MzIgKnBpID0gY29udGFpbmVy X29mKHN3LCBzdHJ1Y3QgcGkzdXNiMzA1MzIsIHN3KTsKKwl1OCBuZXdfY29uZjsKKwlpbnQgcmV0 OworCisJbXV0ZXhfbG9jaygmcGktPmxvY2spOworCW5ld19jb25mID0gcGktPmNvbmY7CisKKwlz d2l0Y2ggKG9yaWVudGF0aW9uKSB7CisJY2FzZSBUWVBFQ19PUklFTlRBVElPTl9OT05FOgorCQlu ZXdfY29uZiA9IFBJM1VTQjMwNTMyX0NPTkZfT1BFTjsKKwkJYnJlYWs7CisJY2FzZSBUWVBFQ19P UklFTlRBVElPTl9OT1JNQUw6CisJCW5ld19jb25mICY9IH5QSTNVU0IzMDUzMl9DT05GX1NXQVA7 CisJCWJyZWFrOworCWNhc2UgVFlQRUNfT1JJRU5UQVRJT05fUkVWRVJTRToKKwkJbmV3X2NvbmYg fD0gUEkzVVNCMzA1MzJfQ09ORl9TV0FQOworCQlicmVhazsKKwl9OworCisJcmV0ID0gcGkzdXNi MzA1MzJfc2V0X2NvbmYocGksIG5ld19jb25mKTsKKwltdXRleF91bmxvY2soJnBpLT5sb2NrKTsK KworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBpbnQgcGkzdXNiMzA1MzJfbXV4X3NldChzdHJ1 Y3QgdHlwZWNfbXV4ICptdXgsIGludCBzdGF0ZSkKK3sKKwlzdHJ1Y3QgcGkzdXNiMzA1MzIgKnBp ID0gY29udGFpbmVyX29mKG11eCwgc3RydWN0IHBpM3VzYjMwNTMyLCBtdXgpOworCXU4IG5ld19j b25mOworCWludCByZXQ7CisKKwltdXRleF9sb2NrKCZwaS0+bG9jayk7CisJbmV3X2NvbmYgPSBw aS0+Y29uZjsKKworCXN3aXRjaCAoc3RhdGUpIHsKKwljYXNlIFRZUEVDX01VWF9OT05FOgorCQlu ZXdfY29uZiA9IFBJM1VTQjMwNTMyX0NPTkZfT1BFTjsKKwkJYnJlYWs7CisJY2FzZSBUWVBFQ19N VVhfVVNCOgorCQluZXdfY29uZiA9IChuZXdfY29uZiAmIFBJM1VTQjMwNTMyX0NPTkZfU1dBUCkg fAorCQkJICAgUEkzVVNCMzA1MzJfQ09ORl9VU0IzOworCQlicmVhazsKKwljYXNlIFRZUEVDX01V WF9EUDoKKwkJbmV3X2NvbmYgPSAobmV3X2NvbmYgJiBQSTNVU0IzMDUzMl9DT05GX1NXQVApIHwK KwkJCSAgIFBJM1VTQjMwNTMyX0NPTkZfNExBTkVfRFA7CisJCWJyZWFrOworCWNhc2UgVFlQRUNf TVVYX0RPQ0s6CisJCW5ld19jb25mID0gKG5ld19jb25mICYgUEkzVVNCMzA1MzJfQ09ORl9TV0FQ KSB8CisJCQkgICBQSTNVU0IzMDUzMl9DT05GX1VTQjNfQU5EXzJMQU5FX0RQOworCQlicmVhazsK Kwl9OworCisJcmV0ID0gcGkzdXNiMzA1MzJfc2V0X2NvbmYocGksIG5ld19jb25mKTsKKwltdXRl eF91bmxvY2soJnBpLT5sb2NrKTsKKworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBpbnQgcGkz dXNiMzA1MzJfcHJvYmUoc3RydWN0IGkyY19jbGllbnQgKmNsaWVudCkKK3sKKwlzdHJ1Y3QgZGV2 aWNlICpkZXYgPSAmY2xpZW50LT5kZXY7CisJc3RydWN0IHBpM3VzYjMwNTMyICpwaTsKKwlpbnQg cmV0OworCisJcGkgPSBkZXZtX2t6YWxsb2MoZGV2LCBzaXplb2YoKnBpKSwgR0ZQX0tFUk5FTCk7 CisJaWYgKCFwaSkKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlwaS0+Y2xpZW50ID0gY2xpZW50Owor CXBpLT5zdy5kZXYgPSBkZXY7CisJcGktPnN3LnNldCA9IHBpM3VzYjMwNTMyX3N3X3NldDsKKwlw aS0+bXV4LmRldiA9IGRldjsKKwlwaS0+bXV4LnNldCA9IHBpM3VzYjMwNTMyX211eF9zZXQ7CisJ bXV0ZXhfaW5pdCgmcGktPmxvY2spOworCisJcmV0ID0gaTJjX3NtYnVzX3JlYWRfYnl0ZV9kYXRh KGNsaWVudCwgUEkzVVNCMzA1MzJfQ09ORik7CisJaWYgKHJldCA8IDApIHsKKwkJZGV2X2Vycihk ZXYsICJFcnJvciByZWFkaW5nIGNvbmZpZyByZWdpc3RlciAlZFxuIiwgcmV0KTsKKwkJcmV0dXJu IHJldDsKKwl9CisJcGktPmNvbmYgPSByZXQ7CisKKwlyZXQgPSB0eXBlY19zd2l0Y2hfcmVnaXN0 ZXIoJnBpLT5zdyk7CisJaWYgKHJldCkgeworCQlkZXZfZXJyKGRldiwgIkVycm9yIHJlZ2lzdGVy aW5nIHR5cGVjIHN3aXRjaDogJWRcbiIsIHJldCk7CisJCXJldHVybiByZXQ7CisJfQorCisJcmV0 ID0gdHlwZWNfbXV4X3JlZ2lzdGVyKCZwaS0+bXV4KTsKKwlpZiAocmV0KSB7CisJCXR5cGVjX3N3 aXRjaF91bnJlZ2lzdGVyKCZwaS0+c3cpOworCQlkZXZfZXJyKGRldiwgIkVycm9yIHJlZ2lzdGVy aW5nIHR5cGVjIG11eDogJWRcbiIsIHJldCk7CisJCXJldHVybiByZXQ7CisJfQorCisJaTJjX3Nl dF9jbGllbnRkYXRhKGNsaWVudCwgcGkpOworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50IHBp M3VzYjMwNTMyX3JlbW92ZShzdHJ1Y3QgaTJjX2NsaWVudCAqY2xpZW50KQoreworCXN0cnVjdCBw aTN1c2IzMDUzMiAqcGkgPSBpMmNfZ2V0X2NsaWVudGRhdGEoY2xpZW50KTsKKworCXR5cGVjX211 eF91bnJlZ2lzdGVyKCZwaS0+bXV4KTsKKwl0eXBlY19zd2l0Y2hfdW5yZWdpc3RlcigmcGktPnN3 KTsKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBpMmNfZGV2aWNlX2lkIHBp M3VzYjMwNTMyX3RhYmxlW10gPSB7CisJeyAicGkzdXNiMzA1MzIiIH0sCisJeyB9Cit9OworTU9E VUxFX0RFVklDRV9UQUJMRShpMmMsIHBpM3VzYjMwNTMyX3RhYmxlKTsKKworc3RhdGljIHN0cnVj dCBpMmNfZHJpdmVyIHBpM3VzYjMwNTMyX2RyaXZlciA9IHsKKwkuZHJpdmVyID0geworCQkubmFt ZSA9ICJwaTN1c2IzMDUzMiIsCisJfSwKKwkucHJvYmVfbmV3CT0gcGkzdXNiMzA1MzJfcHJvYmUs CisJLnJlbW92ZQkJPSBwaTN1c2IzMDUzMl9yZW1vdmUsCisJLmlkX3RhYmxlCT0gcGkzdXNiMzA1 MzJfdGFibGUsCit9OworCittb2R1bGVfaTJjX2RyaXZlcihwaTN1c2IzMDUzMl9kcml2ZXIpOwor CitNT0RVTEVfQVVUSE9SKCJIYW5zIGRlIEdvZWRlIDxoZGVnb2VkZUByZWRoYXQuY29tPiIpOwor TU9EVUxFX0RFU0NSSVBUSU9OKCJQZXJpY29tIFBJM1VTQjMwNTMyIFR5cGUtQyBtdXggZHJpdmVy Iik7CitNT0RVTEVfTElDRU5TRSgiR1BMIik7Cg==