Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/2] usb: gadget: f_ncm: Add OS descriptor support From: Romain Izard Message-Id: <20190416140732.21941-2-romain.izard.pro@gmail.com> Date: Tue, 16 Apr 2019 16:07:32 +0200 To: Felipe Balbi , Greg Kroah-Hartman , Andrzej Pietrasiewicz Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Izard List-ID: VG8gYmUgYWJsZSB0byB1c2UgdGhlIGRlZmF1bHQgVVNCIGNsYXNzIGRyaXZlcnMgYXZhaWxhYmxl IGluIE1pY3Jvc29mdApXaW5kb3dzLCB3ZSBuZWVkIHRvIGFkZCBPUyBkZXNjcmlwdG9ycyB0byB0 aGUgZXhwb3J0ZWQgVVNCIGdhZGdldCB0bwp0ZWxsIHRoZSBPUyB0aGF0IHdlIGFyZSBjb21wYXRp YmxlIHdpdGggdGhlIGJ1aWx0LWluIGRyaXZlcnMuCgpDb3B5IHRoZSBPUyBkZXNjcmlwdG9yIHN1 cHBvcnQgZnJvbSBmX3JuZGlzIGludG8gZl9uY20uIEFzIGEgcmVzdWx0LAp1c2luZyB0aGUgV0lO TkNNIGNvbXBhdGlibGUgSUQsIHRoZSBVc2JOY20gZHJpdmVyIGlzIGxvYWRlZCBvbgplbnVtZXJh dGlvbiB3aXRob3V0IHRoZSBuZWVkIGZvciBhIGN1c3RvbSBkcml2ZXIgb3IgaW5mIGZpbGUuCgpT aWduZWQtb2ZmLWJ5OiBSb21haW4gSXphcmQgPHJvbWFpbi5pemFyZC5wcm9AZ21haWwuY29tPgot LS0KIGRyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX25jbS5jIHwgNDcgKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi91X25jbS5oIHwg IDMgKysKIDIgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vZl9uY20uYyBiL2RyaXZl cnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX25jbS5jCmluZGV4IGQ1YzQ3ZTdhN2Y2MS4uMmQ2ZTc2 ZTRjZmZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vZl9uY20uYwor KysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vZl9uY20uYwpAQCAtMjMsNiArMjMsNyBA QAogI2luY2x1ZGUgInVfZXRoZXIuaCIKICNpbmNsdWRlICJ1X2V0aGVyX2NvbmZpZ2ZzLmgiCiAj aW5jbHVkZSAidV9uY20uaCIKKyNpbmNsdWRlICJjb25maWdmcy5oIgogCiAvKgogICogVGhpcyBm dW5jdGlvbiBpcyBhICJDREMgTmV0d29yayBDb250cm9sIE1vZGVsIiAoQ0RDIE5DTSkgRXRoZXJu ZXQgbGluay4KQEAgLTEzOTEsNiArMTM5MiwxNiBAQCBzdGF0aWMgaW50IG5jbV9iaW5kKHN0cnVj dCB1c2JfY29uZmlndXJhdGlvbiAqYywgc3RydWN0IHVzYl9mdW5jdGlvbiAqZikKIAkJcmV0dXJu IC1FSU5WQUw7CiAKIAluY21fb3B0cyA9IGNvbnRhaW5lcl9vZihmLT5maSwgc3RydWN0IGZfbmNt X29wdHMsIGZ1bmNfaW5zdCk7CisKKwlpZiAoY2Rldi0+dXNlX29zX3N0cmluZykgeworCQlmLT5v c19kZXNjX3RhYmxlID0ga3phbGxvYyhzaXplb2YoKmYtPm9zX2Rlc2NfdGFibGUpLAorCQkJCQkg ICBHRlBfS0VSTkVMKTsKKwkJaWYgKCFmLT5vc19kZXNjX3RhYmxlKQorCQkJcmV0dXJuIC1FTk9N RU07CisJCWYtPm9zX2Rlc2NfbiA9IDE7CisJCWYtPm9zX2Rlc2NfdGFibGVbMF0ub3NfZGVzYyA9 ICZuY21fb3B0cy0+bmNtX29zX2Rlc2M7CisJfQorCiAJLyoKIAkgKiBpbiBkcml2ZXJzL3VzYi9n YWRnZXQvY29uZmlnZnMuYzpjb25maWdmc19jb21wb3NpdGVfYmluZCgpCiAJICogY29uZmlndXJh dGlvbnMgYXJlIGJvdW5kIGluIHNlcXVlbmNlIHdpdGggbGlzdF9mb3JfZWFjaF9lbnRyeSwKQEAg LTE0MDQsMTMgKzE0MTUsMTUgQEAgc3RhdGljIGludCBuY21fYmluZChzdHJ1Y3QgdXNiX2NvbmZp Z3VyYXRpb24gKmMsIHN0cnVjdCB1c2JfZnVuY3Rpb24gKmYpCiAJCXN0YXR1cyA9IGdldGhlcl9y ZWdpc3Rlcl9uZXRkZXYobmNtX29wdHMtPm5ldCk7CiAJCW11dGV4X3VubG9jaygmbmNtX29wdHMt PmxvY2spOwogCQlpZiAoc3RhdHVzKQotCQkJcmV0dXJuIHN0YXR1czsKKwkJCWdvdG8gZmFpbDsK IAkJbmNtX29wdHMtPmJvdW5kID0gdHJ1ZTsKIAl9CiAJdXMgPSB1c2JfZ3N0cmluZ3NfYXR0YWNo KGNkZXYsIG5jbV9zdHJpbmdzLAogCQkJCSBBUlJBWV9TSVpFKG5jbV9zdHJpbmdfZGVmcykpOwot CWlmIChJU19FUlIodXMpKQotCQlyZXR1cm4gUFRSX0VSUih1cyk7CisJaWYgKElTX0VSUih1cykp IHsKKwkJc3RhdHVzID0gUFRSX0VSUih1cyk7CisJCWdvdG8gZmFpbDsKKwl9CiAJbmNtX2NvbnRy b2xfaW50Zi5pSW50ZXJmYWNlID0gdXNbU1RSSU5HX0NUUkxfSURYXS5pZDsKIAluY21fZGF0YV9u b3BfaW50Zi5pSW50ZXJmYWNlID0gdXNbU1RSSU5HX0RBVEFfSURYXS5pZDsKIAluY21fZGF0YV9p bnRmLmlJbnRlcmZhY2UgPSB1c1tTVFJJTkdfREFUQV9JRFhdLmlkOwpAQCAtMTQyNyw2ICsxNDQw LDEwIEBAIHN0YXRpYyBpbnQgbmNtX2JpbmQoc3RydWN0IHVzYl9jb25maWd1cmF0aW9uICpjLCBz dHJ1Y3QgdXNiX2Z1bmN0aW9uICpmKQogCW5jbV9jb250cm9sX2ludGYuYkludGVyZmFjZU51bWJl ciA9IHN0YXR1czsKIAluY21fdW5pb25fZGVzYy5iTWFzdGVySW50ZXJmYWNlMCA9IHN0YXR1czsK IAorCWlmIChjZGV2LT51c2Vfb3Nfc3RyaW5nKQorCQlmLT5vc19kZXNjX3RhYmxlWzBdLmlmX2lk ID0KKwkJCW5jbV9pYWRfZGVzYy5iRmlyc3RJbnRlcmZhY2U7CisKIAlzdGF0dXMgPSB1c2JfaW50 ZXJmYWNlX2lkKGMsIGYpOwogCWlmIChzdGF0dXMgPCAwKQogCQlnb3RvIGZhaWw7CkBAIC0xNTA2 LDYgKzE1MjMsOSBAQCBzdGF0aWMgaW50IG5jbV9iaW5kKHN0cnVjdCB1c2JfY29uZmlndXJhdGlv biAqYywgc3RydWN0IHVzYl9mdW5jdGlvbiAqZikKIAlyZXR1cm4gMDsKIAogZmFpbDoKKwlrZnJl ZShmLT5vc19kZXNjX3RhYmxlKTsKKwlmLT5vc19kZXNjX24gPSAwOworCiAJaWYgKG5jbS0+bm90 aWZ5X3JlcSkgewogCQlrZnJlZShuY20tPm5vdGlmeV9yZXEtPmJ1Zik7CiAJCXVzYl9lcF9mcmVl X3JlcXVlc3QobmNtLT5ub3RpZnksIG5jbS0+bm90aWZ5X3JlcSk7CkBAIC0xNTYwLDE2ICsxNTgw LDIyIEBAIHN0YXRpYyB2b2lkIG5jbV9mcmVlX2luc3Qoc3RydWN0IHVzYl9mdW5jdGlvbl9pbnN0 YW5jZSAqZikKIAkJZ2V0aGVyX2NsZWFudXAobmV0ZGV2X3ByaXYob3B0cy0+bmV0KSk7CiAJZWxz ZQogCQlmcmVlX25ldGRldihvcHRzLT5uZXQpOworCWtmcmVlKG9wdHMtPm5jbV9pbnRlcmZfZ3Jv dXApOwogCWtmcmVlKG9wdHMpOwogfQogCiBzdGF0aWMgc3RydWN0IHVzYl9mdW5jdGlvbl9pbnN0 YW5jZSAqbmNtX2FsbG9jX2luc3Qodm9pZCkKIHsKIAlzdHJ1Y3QgZl9uY21fb3B0cyAqb3B0czsK KwlzdHJ1Y3QgdXNiX29zX2Rlc2MgKmRlc2NzWzFdOworCWNoYXIgKm5hbWVzWzFdOworCXN0cnVj dCBjb25maWdfZ3JvdXAgKm5jbV9pbnRlcmZfZ3JvdXA7CiAKIAlvcHRzID0ga3phbGxvYyhzaXpl b2YoKm9wdHMpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIW9wdHMpCiAJCXJldHVybiBFUlJfUFRSKC1F Tk9NRU0pOworCW9wdHMtPm5jbV9vc19kZXNjLmV4dF9jb21wYXRfaWQgPSBvcHRzLT5uY21fZXh0 X2NvbXBhdF9pZDsKKwogCW11dGV4X2luaXQoJm9wdHMtPmxvY2spOwogCW9wdHMtPmZ1bmNfaW5z dC5mcmVlX2Z1bmNfaW5zdCA9IG5jbV9mcmVlX2luc3Q7CiAJb3B0cy0+bmV0ID0gZ2V0aGVyX3Nl dHVwX2RlZmF1bHQoKTsKQEAgLTE1NzgsOCArMTYwNCwyMCBAQCBzdGF0aWMgc3RydWN0IHVzYl9m dW5jdGlvbl9pbnN0YW5jZSAqbmNtX2FsbG9jX2luc3Qodm9pZCkKIAkJa2ZyZWUob3B0cyk7CiAJ CXJldHVybiBFUlJfQ0FTVChuZXQpOwogCX0KKwlJTklUX0xJU1RfSEVBRCgmb3B0cy0+bmNtX29z X2Rlc2MuZXh0X3Byb3ApOworCisJZGVzY3NbMF0gPSAmb3B0cy0+bmNtX29zX2Rlc2M7CisJbmFt ZXNbMF0gPSAibmNtIjsKIAogCWNvbmZpZ19ncm91cF9pbml0X3R5cGVfbmFtZSgmb3B0cy0+ZnVu Y19pbnN0Lmdyb3VwLCAiIiwgJm5jbV9mdW5jX3R5cGUpOworCW5jbV9pbnRlcmZfZ3JvdXAgPQor CQl1c2Jfb3NfZGVzY19wcmVwYXJlX2ludGVyZl9kaXIoJm9wdHMtPmZ1bmNfaW5zdC5ncm91cCwg MSwgZGVzY3MsCisJCQkJCSAgICAgICBuYW1lcywgVEhJU19NT0RVTEUpOworCWlmIChJU19FUlIo bmNtX2ludGVyZl9ncm91cCkpIHsKKwkJbmNtX2ZyZWVfaW5zdCgmb3B0cy0+ZnVuY19pbnN0KTsK KwkJcmV0dXJuIEVSUl9DQVNUKG5jbV9pbnRlcmZfZ3JvdXApOworCX0KKwlvcHRzLT5uY21faW50 ZXJmX2dyb3VwID0gbmNtX2ludGVyZl9ncm91cDsKIAogCXJldHVybiAmb3B0cy0+ZnVuY19pbnN0 OwogfQpAQCAtMTYwNSw2ICsxNjQzLDkgQEAgc3RhdGljIHZvaWQgbmNtX3VuYmluZChzdHJ1Y3Qg dXNiX2NvbmZpZ3VyYXRpb24gKmMsIHN0cnVjdCB1c2JfZnVuY3Rpb24gKmYpCiAKIAlocnRpbWVy X2NhbmNlbCgmbmNtLT50YXNrX3RpbWVyKTsKIAorCWtmcmVlKGYtPm9zX2Rlc2NfdGFibGUpOwor CWYtPm9zX2Rlc2NfbiA9IDA7CisKIAluY21fc3RyaW5nX2RlZnNbMF0uaWQgPSAwOwogCXVzYl9m cmVlX2FsbF9kZXNjcmlwdG9ycyhmKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZ2FkZ2V0 L2Z1bmN0aW9uL3VfbmNtLmggYi9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vdV9uY20uaApp bmRleCBkNDgzZTQ1YzBmNzcuLjcwZGEzMjAxYTFkMCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv Z2FkZ2V0L2Z1bmN0aW9uL3VfbmNtLmgKKysrIGIvZHJpdmVycy91c2IvZ2FkZ2V0L2Z1bmN0aW9u L3VfbmNtLmgKQEAgLTIwLDYgKzIwLDkgQEAgc3RydWN0IGZfbmNtX29wdHMgewogCXN0cnVjdCBu ZXRfZGV2aWNlCQkqbmV0OwogCWJvb2wJCQkJYm91bmQ7CiAKKwlzdHJ1Y3QgY29uZmlnX2dyb3Vw CQkqbmNtX2ludGVyZl9ncm91cDsKKwlzdHJ1Y3QgdXNiX29zX2Rlc2MJCW5jbV9vc19kZXNjOwor CWNoYXIJCQkJbmNtX2V4dF9jb21wYXRfaWRbMTZdOwogCS8qCiAJICogUmVhZC93cml0ZSBhY2Nl c3MgdG8gY29uZmlnZnMgYXR0cmlidXRlcyBpcyBoYW5kbGVkIGJ5IGNvbmZpZ2ZzLgogCSAqCg==