Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,3/3] usb: typec: fusb302: Revert "Resolve fixed power role contract setup" From: Heikki Krogerus Message-Id: <20190417062452.GH1747@kuha.fi.intel.com> Date: Wed, 17 Apr 2019 09:24:52 +0300 To: Hans de Goede Cc: Greg Kroah-Hartman , Guenter Roeck , Adam Thomson , Kyle Tso , linux-usb@vger.kernel.org List-ID: T24gVHVlLCBBcHIgMTYsIDIwMTkgYXQgMTA6MDc6NTRQTSArMDIwMCwgSGFucyBkZSBHb2VkZSB3 cm90ZToKPiBTb21lIHRjcGMgZGV2aWNlLWRyaXZlcnMgbmVlZCB0byBleHBsaWNpdGx5IGJlIHRv bGQgdG8gd2F0Y2ggZm9yIGNvbm5lY3Rpb24KPiBldmVudHMsIG90aGVyd2lzZSB0aGUgdGNwYyB3 aWxsIG5vdCBnZW5lcmF0ZSBhbnkgVENQTV9DQ19FVkVOVHMgYW5kIGRldmljZXMKPiBiZWluZyBw bHVnZ2VkIGludG8gdGhlIFR5cGUtQyBwb3J0IHdpbGwgbm90IGJlIG5vdGljZWQuCj4gCj4gRm9y IGR1YWwtcm9sZSBwb3J0cyB0Y3BtX3N0YXJ0X2RycF90b2dnbGluZygpIGlzIHVzZWQgdG8gdGVs bCB0aGUgdGNwYyB0bwo+IHdhdGNoIGZvciBjb25uZWN0aW9uIGV2ZW50cy4gQnV0IGZvciBzaW5n bGUtcm9sZSBwb3J0cyB3ZSd2ZSBzbyBmYXIgYmVlbgo+IGZhbGxpbmcgYmFjayB0byBqdXN0IGNh bGxpbmcgdGNwbV9zZXRfY2MoKS4gRm9yIHNvbWUgdGNwYy1zIHN1Y2ggYXMgdGhlCj4gZnVzYjMw MiB0aGlzIGlzIG5vdCBlbm91Z2ggYW5kIG5vIFRDUE1fQ0NfRVZFTlQgd2lsbCBiZSBnZW5lcmF0 ZWQuCj4gCj4gQ29tbWl0IGVhM2I0ZDU1MjNiYyAoInVzYjogdHlwZWM6IGZ1c2IzMDI6IFJlc29s dmUgZml4ZWQgcG93ZXIgcm9sZQo+IGNvbnRyYWN0IHNldHVwIikgZml4ZWQgU1JQcyBub3Qgd29y a2luZyBiZWNhdXNlIG9mIHRoaXMgYnkgbWFraW5nIHRoZQo+IGZ1c2IzMDIgZHJpdmVyIHN0YXJ0 IGNvbm5lY3Rpb24gZGV0ZWN0aW9uIG9uIGV2ZXJ5IHRjcG1fc2V0X2NjKCkgY2FsbC4KPiBJdCB0 dXJucyBvdXQgdGhpcyBicmVha3Mgc3JjLT5zbmsgcG93ZXItcm9sZSBzd2FwcGluZyBiZWNhdXNl IGR1cmluZyB0aGUKPiBzd2FwIHdlIGZpcnN0IHNldCB0aGUgQ2MgcGlucyB0byBScCwgY2FsbGlu ZyBzZXRfY2MsIGFuZCB0aGVuIHNlbmQgYSBQU19SRFkKPiBtZXNzYWdlLiBCdXQgdGhlIGZ1c2Iz MDIgY2Fubm90IHNlbmQgUEQgbWVzc2FnZXMgd2hpbGUgaXRzIHRvZ2dsaW5nIGVuZ2luZQo+IGlz IGFjdGl2ZSwgc28gc2VuZGluZyB0aGUgUFNfUkRZIG1lc3NhZ2UgZmFpbHMuCj4gCj4gU3RydWN0 IHRjcGNfZGV2IG5vdyBoYXMgYSBuZXcgc3RhcnRfc3JwX2Nvbm5lY3Rpb25fZGV0ZWN0IGNhbGxi YWNrIGFuZAo+IGZ1c2IzMDIuYyBub3cgaW1wbGVtZW50cyB0aGlzLiBUaGlzIGNhbGxiYWNrIGdl dHMgY2FsbGVkIHdoZW4gd2UgdGhlCj4gZnVzYjMwMiBuZWVkcyB0byBzdGFydCBjb25uZWN0aW9u IGRldGVjdGlvbiwgZml4aW5nIGZ1c2IzMDIgU1JQcyBub3QKPiBzZWVpbmcgY29ubmVjdGVkIGRl dmljZXMuCj4gCj4gVGhpcyBhbGxvd3MgdXMgdG8gcmV2ZXJ0IHRoZSBjaGFuZ2VzIHRvIGZ1c2Iz MDIncyBzZXRfY2MgaW1wbGVtZW50YXRpb24sCj4gbWFraW5nIGl0IG9uY2UgYWdhaW4gcHVyZWx5 IHNldHVwIHRoZSBDYy1zIGFuZCBtYXRjaGluZyBkaXNjb25uZWN0Cj4gZGV0ZWN0aW9uLCBmaXhp bmcgc3JjLT5zbmsgcG93ZXItcm9sZSBzd2FwcGluZyBubyBsb25nZXIgd29ya2luZy4KPiAKPiBO b3RlIHRoYXQgc2luY2UgdGhlIGNvZGUgd2FzIHJlZmFjdG9yZWQgaW4gYmV0d2VlbiwgY29kZXdp c2UgdGhpcyBpcyBub3QgYQo+IHN0cmFpZ2h0IGZvcndhcmQgcmV2ZXJ0LiBGdW5jdGlvbmFsaXR5 IHdpc2UgdGhpcyBpcyBhIHN0cmFpZ2h0IHJldmVydCBhbmQKPiB0aGUgb3JpZ2luYWwgZnVuY3Rp b25hbGl0eSBpcyBmdWxseSByZXN0b3JlZC4KPiAKPiBGaXhlczogZWEzYjRkNTUyM2JjICgidXNi OiB0eXBlYzogZnVzYjMwMjogUmVzb2x2ZSBmaXhlZCBwb3dlciByb2xlIC4uLiIpCj4gQ2M6IEFk YW0gVGhvbXNvbiA8QWRhbS5UaG9tc29uLk9wZW5zb3VyY2VAZGlhc2VtaS5jb20+Cj4gU2lnbmVk LW9mZi1ieTogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KCkFja2VkLWJ5OiBI ZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+Cgo+IC0tLQo+ IENoYW5nZXMgaW4gdjI6Cj4gLU5vIGNoYW5nZXMKPiAtLS0KPiAgZHJpdmVycy91c2IvdHlwZWMv dGNwbS9mdXNiMzAyLmMgfCA1NSArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQo+ICAx IGZpbGUgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKPiAKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy91c2IvdHlwZWMvdGNwbS9mdXNiMzAyLmMgYi9kcml2ZXJzL3VzYi90 eXBlYy90Y3BtL2Z1c2IzMDIuYwo+IGluZGV4IGJhMDMwYjAzZDE1Ni4uNDMyOGE2Y2JmYjY5IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0vZnVzYjMwMi5jCj4gKysrIGIvZHJp dmVycy91c2IvdHlwZWMvdGNwbS9mdXNiMzAyLmMKPiBAQCAtNjA2LDE5ICs2MDYsMTYgQEAgc3Rh dGljIGludCB0Y3BtX3NldF9jYyhzdHJ1Y3QgdGNwY19kZXYgKmRldiwgZW51bSB0eXBlY19jY19z dGF0dXMgY2MpCj4gIAkJCSAgICBGVVNCX1JFR19TV0lUQ0hFUzBfQ0MyX1BVX0VOIHwKPiAgCQkJ ICAgIEZVU0JfUkVHX1NXSVRDSEVTMF9DQzFfUERfRU4gfAo+ICAJCQkgICAgRlVTQl9SRUdfU1dJ VENIRVMwX0NDMl9QRF9FTjsKPiAtCXU4IHN3aXRjaGVzMF9kYXRhID0gMHgwMDsKPiArCXU4IHJk X21kYSwgc3dpdGNoZXMwX2RhdGEgPSAweDAwOwo+ICAJaW50IHJldCA9IDA7Cj4gLQllbnVtIHRv Z2dsaW5nX21vZGUgbW9kZTsKPiAgCj4gIAltdXRleF9sb2NrKCZjaGlwLT5sb2NrKTsKPiAgCXN3 aXRjaCAoY2MpIHsKPiAgCWNhc2UgVFlQRUNfQ0NfT1BFTjoKPiAtCQltb2RlID0gVE9HR0xJTkdf TU9ERV9PRkY7Cj4gIAkJYnJlYWs7Cj4gIAljYXNlIFRZUEVDX0NDX1JEOgo+ICAJCXN3aXRjaGVz MF9kYXRhIHw9IEZVU0JfUkVHX1NXSVRDSEVTMF9DQzFfUERfRU4gfAo+ICAJCQkJICBGVVNCX1JF R19TV0lUQ0hFUzBfQ0MyX1BEX0VOOwo+IC0JCW1vZGUgPSBUT0dHTElOR19NT0RFX1NOSzsKPiAg CQlicmVhazsKPiAgCWNhc2UgVFlQRUNfQ0NfUlBfREVGOgo+ICAJY2FzZSBUWVBFQ19DQ19SUF8x XzU6Cj4gQEAgLTYyNiw3ICs2MjMsNiBAQCBzdGF0aWMgaW50IHRjcG1fc2V0X2NjKHN0cnVjdCB0 Y3BjX2RldiAqZGV2LCBlbnVtIHR5cGVjX2NjX3N0YXR1cyBjYykKPiAgCQlzd2l0Y2hlczBfZGF0 YSB8PSAoY2hpcC0+Y2NfcG9sYXJpdHkgPT0gVFlQRUNfUE9MQVJJVFlfQ0MxKSA/Cj4gIAkJCQkg IEZVU0JfUkVHX1NXSVRDSEVTMF9DQzFfUFVfRU4gOgo+ICAJCQkJICBGVVNCX1JFR19TV0lUQ0hF UzBfQ0MyX1BVX0VOOwo+IC0JCW1vZGUgPSBUT0dHTElOR19NT0RFX1NSQzsKPiAgCQlicmVhazsK PiAgCWRlZmF1bHQ6Cj4gIAkJZnVzYjMwMl9sb2coY2hpcCwgInVuc3VwcG9ydGVkIGNjIHZhbHVl ICVzIiwKPiBAQCAtNjM3LDYgKzYzMywxMiBAQCBzdGF0aWMgaW50IHRjcG1fc2V0X2NjKHN0cnVj dCB0Y3BjX2RldiAqZGV2LCBlbnVtIHR5cGVjX2NjX3N0YXR1cyBjYykKPiAgCj4gIAlmdXNiMzAy X2xvZyhjaGlwLCAiY2MgOj0gJXMiLCB0eXBlY19jY19zdGF0dXNfbmFtZVtjY10pOwo+ICAKPiAr CXJldCA9IGZ1c2IzMDJfc2V0X3RvZ2dsaW5nKGNoaXAsIFRPR0dMSU5HX01PREVfT0ZGKTsKPiAr CWlmIChyZXQgPCAwKSB7Cj4gKwkJZnVzYjMwMl9sb2coY2hpcCwgImNhbm5vdCBzZXQgdG9nZ2xp bmcgbW9kZSwgcmV0PSVkIiwgcmV0KTsKPiArCQlnb3RvIGRvbmU7Cj4gKwl9Cj4gKwo+ICAJcmV0 ID0gZnVzYjMwMl9pMmNfbWFza193cml0ZShjaGlwLCBGVVNCX1JFR19TV0lUQ0hFUzAsCj4gIAkJ CQkgICAgIHN3aXRjaGVzMF9tYXNrLCBzd2l0Y2hlczBfZGF0YSk7Cj4gIAlpZiAocmV0IDwgMCkg ewo+IEBAIC02NTUsMTAgKzY1Nyw0NSBAQCBzdGF0aWMgaW50IHRjcG1fc2V0X2NjKHN0cnVjdCB0 Y3BjX2RldiAqZGV2LCBlbnVtIHR5cGVjX2NjX3N0YXR1cyBjYykKPiAgCQlnb3RvIGRvbmU7Cj4g IAl9Cj4gIAo+IC0JcmV0ID0gZnVzYjMwMl9zZXRfdG9nZ2xpbmcoY2hpcCwgbW9kZSk7Cj4gLQlp ZiAocmV0IDwgMCkKPiAtCQlmdXNiMzAyX2xvZyhjaGlwLCAiY2Fubm90IHNldCB0b2dnbGluZyBt b2RlLCByZXQ9JWQiLCByZXQpOwo+IC0KPiArCS8qIGVuYWJsZS9kaXNhYmxlIGludGVycnVwdHMs IEJDX0xWTCBmb3IgU05LIGFuZCBDT01QX0NITkcgZm9yIFNSQyAqLwo+ICsJc3dpdGNoIChjYykg ewo+ICsJY2FzZSBUWVBFQ19DQ19SUF9ERUY6Cj4gKwljYXNlIFRZUEVDX0NDX1JQXzFfNToKPiAr CWNhc2UgVFlQRUNfQ0NfUlBfM18wOgo+ICsJCXJkX21kYSA9IHJkX21kYV92YWx1ZVtjY19zcmNf Y3VycmVudFtjY11dOwo+ICsJCXJldCA9IGZ1c2IzMDJfaTJjX3dyaXRlKGNoaXAsIEZVU0JfUkVH X01FQVNVUkUsIHJkX21kYSk7Cj4gKwkJaWYgKHJldCA8IDApIHsKPiArCQkJZnVzYjMwMl9sb2co Y2hpcCwKPiArCQkJCSAgICAiY2Fubm90IHNldCBTUkMgbWVhc3VyZSB2YWx1ZSwgcmV0PSVkIiwK PiArCQkJCSAgICByZXQpOwo+ICsJCQlnb3RvIGRvbmU7Cj4gKwkJfQo+ICsJCXJldCA9IGZ1c2Iz MDJfaTJjX21hc2tfd3JpdGUoY2hpcCwgRlVTQl9SRUdfTUFTSywKPiArCQkJCQkgICAgIEZVU0Jf UkVHX01BU0tfQkNfTFZMIHwKPiArCQkJCQkgICAgIEZVU0JfUkVHX01BU0tfQ09NUF9DSE5HLAo+ ICsJCQkJCSAgICAgRlVTQl9SRUdfTUFTS19DT01QX0NITkcpOwo+ICsJCWlmIChyZXQgPCAwKSB7 Cj4gKwkJCWZ1c2IzMDJfbG9nKGNoaXAsICJjYW5ub3Qgc2V0IFNSQyBpbnRlcnJ1cHQsIHJldD0l ZCIsCj4gKwkJCQkgICAgcmV0KTsKPiArCQkJZ290byBkb25lOwo+ICsJCX0KPiArCQljaGlwLT5p bnRyX2NvbXBfY2huZyA9IHRydWU7Cj4gKwkJYnJlYWs7Cj4gKwljYXNlIFRZUEVDX0NDX1JEOgo+ ICsJCXJldCA9IGZ1c2IzMDJfaTJjX21hc2tfd3JpdGUoY2hpcCwgRlVTQl9SRUdfTUFTSywKPiAr CQkJCQkgICAgIEZVU0JfUkVHX01BU0tfQkNfTFZMIHwKPiArCQkJCQkgICAgIEZVU0JfUkVHX01B U0tfQ09NUF9DSE5HLAo+ICsJCQkJCSAgICAgRlVTQl9SRUdfTUFTS19CQ19MVkwpOwo+ICsJCWlm IChyZXQgPCAwKSB7Cj4gKwkJCWZ1c2IzMDJfbG9nKGNoaXAsICJjYW5ub3Qgc2V0IFNSQyBpbnRl cnJ1cHQsIHJldD0lZCIsCj4gKwkJCQkgICAgcmV0KTsKPiArCQkJZ290byBkb25lOwo+ICsJCX0K PiArCQljaGlwLT5pbnRyX2JjX2x2bCA9IHRydWU7Cj4gKwkJYnJlYWs7Cj4gKwlkZWZhdWx0Ogo+ ICsJCWJyZWFrOwo+ICsJfQo+ICBkb25lOgo+ICAJbXV0ZXhfdW5sb2NrKCZjaGlwLT5sb2NrKTsK PiAgCj4gLS0gCj4gMi4yMS4wCgp0aGFua3MsCg==