From: Imre Deak Subject: [PATCH v4 5/6] ALSA: hda: add component support Date: Thu, 8 Jan 2015 17:54:17 +0200 Message-ID: <1420732458-11373-6-git-send-email-imre.deak@intel.com> References: <1420732458-11373-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1420732458-11373-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Takashi Iwai , intel-gfx@lists.freedesktop.org, alsa-devel@alsa-project.org Cc: Jani Nikula , Daniel Vetter List-Id: alsa-devel@alsa-project.org UmVnaXN0ZXIgYSBjb21wb25lbnQgbWFzdGVyIHRvIGJlIHVzZWQgdG8gaW50ZXJmYWNlIHdpdGgg dGhlIGk5MTUKZHJpdmVyLiBUaGlzIGlzIG1lYW50IHRvIHJlcGxhY2UgdGhlIGN1cnJlbnQgaW50 ZXJmYWNlIHdoaWNoIGlzIGJhc2VkIG9uCm1vZHVsZSBzeW1ib2wgbG9va3Vwcy4KCk5vdGUgdGhh dCBjdXJyZW50bHkgd2Uga2VlcCB0aGUgZXhpc3RpbmcgYmVoYXZpb3IgYW5kIHBpbiB0aGUgaTkx NQptb2R1bGUgd2hpbGUgdGhlIGhkYSBkcml2ZXIgaXMgbG9hZGVkLiBVc2luZyB0aGUgY29tcG9u ZW50IGludGVyZmFjZQphbGxvd3MgdXMgdG8gcmVtb3ZlIHRoaXMgZGVwZW5kZW5jeSBvbmNlIHN1 cHBvcnQgZm9yIGR5bmFtaWNhbGx5CmVuYWJsaW5nIC8gZGlzYWJsaW5nIHRoZSBIRE1JIGZ1bmN0 aW9uYWxpdHkgaXMgYWRkZWQgdG8gdGhlIGRyaXZlci4KCnYyOgotIGNoYW5nZSByb2xlcyBiZXR3 ZWVuIHRoZSBoZGEgYW5kIGk5MTUgY29tcG9uZW50cyAoRGFuaWVsKQp2MzoKLSByZW5hbWUgZGlz cGxheV9jb21wb25lbnQgdG8gYXVkaW9fY29tcG9uZW50IChEYW5pZWwpCnY0OgotIG1vdmUgcmVt b3ZhbCBvZiBpOTE1X3Bvd2Vyd2VsbC5oIGZyb20gdGhpcyBwYXRjaCB0byB0aGUgbmV4dCAoVGFr YXNoaSkKLSByZXF1ZXN0X21vZHVsZSBmYWlscyBpZiBtb2R1bGUgc3VwcG9ydCBpc24ndCBlbmFi bGVkLCBzbyBpZ25vcmUKICBhbnkgZXJyb3IgaXQgcmV0dXJucyBhbmQgZGVwZW5kIG9uIHRoZSBm b2xsb3dpbmcgTlVMTCBjaGVjayBvZiB0aGUKICBjb21wb25lbnQgb3BzIChUYWthc2hpKQotIGNo YW5nZSBvdmVyIHRvIHVzaW5nIGRldl8qIGluc3RlYWQgb2YgcHJfKiAoVGFrYXNoaSkKClNpZ25l ZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRh a2FzaGkgSXdhaSA8dGl3YWlAc3VzZS5kZT4KLS0tCiBzb3VuZC9wY2kvaGRhL2hkYV9pOTE1LmMg IHwgMTQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIHNv dW5kL3BjaS9oZGEvaGRhX2ludGVsLmMgfCAgIDUgKy0KIHNvdW5kL3BjaS9oZGEvaGRhX2ludGVs LmggfCAgIDQgKysKIDMgZmlsZXMgY2hhbmdlZCwgMTA1IGluc2VydGlvbnMoKyksIDQ0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NvdW5kL3BjaS9oZGEvaGRhX2k5MTUuYyBiL3NvdW5kL3Bj aS9oZGEvaGRhX2k5MTUuYwppbmRleCA2NmFjZDA5Li43MTQ4OTQ1IDEwMDY0NAotLS0gYS9zb3Vu ZC9wY2kvaGRhL2hkYV9pOTE1LmMKKysrIGIvc291bmQvcGNpL2hkYS9oZGFfaTkxNS5jCkBAIC0x OCw4ICsxOCwxMCBAQAogCiAjaW5jbHVkZSA8bGludXgvaW5pdC5oPgogI2luY2x1ZGUgPGxpbnV4 L21vZHVsZS5oPgorI2luY2x1ZGUgPGxpbnV4L3BjaS5oPgorI2luY2x1ZGUgPGxpbnV4L2NvbXBv bmVudC5oPgorI2luY2x1ZGUgPGRybS9pOTE1X2NvbXBvbmVudC5oPgogI2luY2x1ZGUgPHNvdW5k L2NvcmUuaD4KLSNpbmNsdWRlIDxkcm0vaTkxNV9wb3dlcndlbGwuaD4KICNpbmNsdWRlICJoZGFf cHJpdi5oIgogI2luY2x1ZGUgImhkYV9pbnRlbC5oIgogCkBAIC0zMSwzMiArMzMsMzMgQEAKICNk ZWZpbmUgQVpYX1JFR19FTTQJCQkweDEwMGMKICNkZWZpbmUgQVpYX1JFR19FTTUJCQkweDEwMTAK IAotc3RhdGljIGludCAoKmdldF9wb3dlcikodm9pZCk7Ci1zdGF0aWMgaW50ICgqcHV0X3Bvd2Vy KSh2b2lkKTsKLXN0YXRpYyBpbnQgKCpnZXRfY2RjbGspKHZvaWQpOwotCiBpbnQgaGRhX2Rpc3Bs YXlfcG93ZXIoc3RydWN0IGhkYV9pbnRlbCAqaGRhLCBib29sIGVuYWJsZSkKIHsKLQlpZiAoIWdl dF9wb3dlciB8fCAhcHV0X3Bvd2VyKQorCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCAqYWNv bXAgPSAmaGRhLT5hdWRpb19jb21wb25lbnQ7CisKKwlpZiAoIWFjb21wLT5vcHMpCiAJCXJldHVy biAtRU5PREVWOwogCi0JcHJfZGVidWcoIkhEQSBkaXNwbGF5IHBvd2VyICVzIFxuIiwKLQkJCWVu YWJsZSA/ICJFbmFibGUiIDogIkRpc2FibGUiKTsKKwlkZXZfZGJnKCZoZGEtPmNoaXAucGNpLT5k ZXYsICJkaXNwbGF5IHBvd2VyICVzXG4iLAorCQllbmFibGUgPyAiZW5hYmxlIiA6ICJkaXNhYmxl Iik7CiAJaWYgKGVuYWJsZSkKLQkJcmV0dXJuIGdldF9wb3dlcigpOworCQlhY29tcC0+b3BzLT5n ZXRfcG93ZXIoYWNvbXAtPmRldik7CiAJZWxzZQotCQlyZXR1cm4gcHV0X3Bvd2VyKCk7CisJCWFj b21wLT5vcHMtPnB1dF9wb3dlcihhY29tcC0+ZGV2KTsKKworCXJldHVybiAwOwogfQogCiB2b2lk IGhhc3dlbGxfc2V0X2JjbGsoc3RydWN0IGhkYV9pbnRlbCAqaGRhKQogewogCWludCBjZGNsa19m cmVxOwogCXVuc2lnbmVkIGludCBiY2xrX20sIGJjbGtfbjsKKwlzdHJ1Y3QgaTkxNV9hdWRpb19j b21wb25lbnQgKmFjb21wID0gJmhkYS0+YXVkaW9fY29tcG9uZW50OwogCi0JaWYgKCFnZXRfY2Rj bGspCisJaWYgKCFhY29tcC0+b3BzKQogCQlyZXR1cm47CiAKLQljZGNsa19mcmVxID0gZ2V0X2Nk Y2xrKCk7CisJY2RjbGtfZnJlcSA9IGFjb21wLT5vcHMtPmdldF9jZGNsa19mcmVxKGFjb21wLT5k ZXYpOwogCXN3aXRjaCAoY2RjbGtfZnJlcSkgewogCWNhc2UgMzM3NTAwOgogCQliY2xrX20gPSAx NjsKQEAgLTg0LDQ3ICs4NywxMDQgQEAgdm9pZCBoYXN3ZWxsX3NldF9iY2xrKHN0cnVjdCBoZGFf aW50ZWwgKmhkYSkKIAlhenhfd3JpdGV3KCZoZGEtPmNoaXAsIEVNNSwgYmNsa19uKTsKIH0KIAor c3RhdGljIGludCBoZGFfY29tcG9uZW50X21hc3Rlcl9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldikK K3sKKwlzdHJ1Y3Qgc25kX2NhcmQgKmNhcmQgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKKwlzdHJ1 Y3QgYXp4ICpjaGlwID0gY2FyZC0+cHJpdmF0ZV9kYXRhOworCXN0cnVjdCBoZGFfaW50ZWwgKmhk YSA9IGNvbnRhaW5lcl9vZihjaGlwLCBzdHJ1Y3QgaGRhX2ludGVsLCBjaGlwKTsKKwlzdHJ1Y3Qg aTkxNV9hdWRpb19jb21wb25lbnQgKmFjb21wID0gJmhkYS0+YXVkaW9fY29tcG9uZW50OworCWlu dCByZXQ7CisKKwlyZXQgPSBjb21wb25lbnRfYmluZF9hbGwoZGV2LCBhY29tcCk7CisJaWYgKHJl dCA8IDApCisJCXJldHVybiByZXQ7CisKKwlpZiAoV0FSTl9PTighKGFjb21wLT5kZXYgJiYgYWNv bXAtPm9wcyAmJiBhY29tcC0+b3BzLT5nZXRfcG93ZXIgJiYKKwkJICAgICAgYWNvbXAtPm9wcy0+ cHV0X3Bvd2VyICYmIGFjb21wLT5vcHMtPmdldF9jZGNsa19mcmVxKSkpIHsKKwkJcmV0ID0gLUVJ TlZBTDsKKwkJZ290byBvdXRfdW5iaW5kOworCX0KKworCS8qCisJICogQXRtLCB3ZSBkb24ndCBz dXBwb3J0IGR5bmFtaWMgdW5iaW5kaW5nIGluaXRpYXRlZCBieSB0aGUgY2hpbGQKKwkgKiBjb21w b25lbnQsIHNvIHBpbiBpdHMgY29udGFpbmluZyBtb2R1bGUgdW50aWwgd2UgdW5iaW5kLgorCSAq LworCWlmICghdHJ5X21vZHVsZV9nZXQoYWNvbXAtPm9wcy0+b3duZXIpKSB7CisJCXJldCA9IC1F Tk9ERVY7CisJCWdvdG8gb3V0X3VuYmluZDsKKwl9CisKKwlyZXR1cm4gMDsKKworb3V0X3VuYmlu ZDoKKwljb21wb25lbnRfdW5iaW5kX2FsbChkZXYsIGFjb21wKTsKKworCXJldHVybiByZXQ7Cit9 CisKK3N0YXRpYyB2b2lkIGhkYV9jb21wb25lbnRfbWFzdGVyX3VuYmluZChzdHJ1Y3QgZGV2aWNl ICpkZXYpCit7CisJc3RydWN0IHNuZF9jYXJkICpjYXJkID0gZGV2X2dldF9kcnZkYXRhKGRldik7 CisJc3RydWN0IGF6eCAqY2hpcCA9IGNhcmQtPnByaXZhdGVfZGF0YTsKKwlzdHJ1Y3QgaGRhX2lu dGVsICpoZGEgPSBjb250YWluZXJfb2YoY2hpcCwgc3RydWN0IGhkYV9pbnRlbCwgY2hpcCk7CisJ c3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50ICphY29tcCA9ICZoZGEtPmF1ZGlvX2NvbXBvbmVu dDsKKworCW1vZHVsZV9wdXQoYWNvbXAtPm9wcy0+b3duZXIpOworCWNvbXBvbmVudF91bmJpbmRf YWxsKGRldiwgYWNvbXApOworCVdBUk5fT04oYWNvbXAtPm9wcyB8fCBhY29tcC0+ZGV2KTsKK30K Kworc3RhdGljIGNvbnN0IHN0cnVjdCBjb21wb25lbnRfbWFzdGVyX29wcyBoZGFfY29tcG9uZW50 X21hc3Rlcl9vcHMgPSB7CisJLmJpbmQgPSBoZGFfY29tcG9uZW50X21hc3Rlcl9iaW5kLAorCS51 bmJpbmQgPSBoZGFfY29tcG9uZW50X21hc3Rlcl91bmJpbmQsCit9OworCitzdGF0aWMgaW50IGhk YV9jb21wb25lbnRfbWFzdGVyX21hdGNoKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0YSkK K3sKKwkvKiBpOTE1IGlzIHRoZSBvbmx5IHN1cHBvcnRlZCBjb21wb25lbnQgKi8KKwlyZXR1cm4g IXN0cmNtcChkZXYtPmRyaXZlci0+bmFtZSwgImk5MTUiKTsKK30KIAogaW50IGhkYV9pOTE1X2lu aXQoc3RydWN0IGhkYV9pbnRlbCAqaGRhKQogewotCWludCBlcnIgPSAwOworCXN0cnVjdCBjb21w b25lbnRfbWF0Y2ggKm1hdGNoID0gTlVMTDsKKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmaGRhLT5j aGlwLnBjaS0+ZGV2OworCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSAmaGRh LT5hdWRpb19jb21wb25lbnQ7CisJaW50IHJldDsKIAotCWdldF9wb3dlciA9IHN5bWJvbF9yZXF1 ZXN0KGk5MTVfcmVxdWVzdF9wb3dlcl93ZWxsKTsKLQlpZiAoIWdldF9wb3dlcikgewotCQlwcl93 YXJuKCJoZGEtaTkxNTogZ2V0X3Bvd2VyIHN5bWJvbCBnZXQgZmFpbFxuIik7Ci0JCXJldHVybiAt RU5PREVWOwotCX0KKwljb21wb25lbnRfbWF0Y2hfYWRkKGRldiwgJm1hdGNoLCBoZGFfY29tcG9u ZW50X21hc3Rlcl9tYXRjaCwgaGRhKTsKKwlyZXQgPSBjb21wb25lbnRfbWFzdGVyX2FkZF93aXRo X21hdGNoKGRldiwgJmhkYV9jb21wb25lbnRfbWFzdGVyX29wcywKKwkJCQkJICAgICAgbWF0Y2gp OworCWlmIChyZXQgPCAwKQorCQlnb3RvIG91dF9lcnI7CisKKwkvKgorCSAqIEF0bSwgd2UgZG9u J3Qgc3VwcG9ydCBkZWZlcnJpbmcgdGhlIGNvbXBvbmVudCBiaW5kaW5nLCBzbyBtYWtlIHN1cmUK KwkgKiBpOTE1IGlzIGxvYWRlZCBhbmQgdGhhdCB0aGUgYmluZGluZyBzdWNjZXNzZnVsbHkgY29t cGxldGVzLgorCSAqLworCXJlcXVlc3RfbW9kdWxlKCJpOTE1Iik7CiAKLQlwdXRfcG93ZXIgPSBz eW1ib2xfcmVxdWVzdChpOTE1X3JlbGVhc2VfcG93ZXJfd2VsbCk7Ci0JaWYgKCFwdXRfcG93ZXIp IHsKLQkJc3ltYm9sX3B1dChpOTE1X3JlcXVlc3RfcG93ZXJfd2VsbCk7Ci0JCWdldF9wb3dlciA9 IE5VTEw7Ci0JCXJldHVybiAtRU5PREVWOworCWlmICghYWNvbXAtPm9wcykgeworCQlyZXQgPSAt RU5PREVWOworCQlnb3RvIG91dF9tYXN0ZXJfZGVsOwogCX0KIAotCWdldF9jZGNsayA9IHN5bWJv bF9yZXF1ZXN0KGk5MTVfZ2V0X2NkY2xrX2ZyZXEpOwotCWlmICghZ2V0X2NkY2xrKQkvKiBtYXkg aGF2ZSBhYm5vcm1hbCBCQ0xLIGFuZCBhdWRpbyBwbGF5YmFjayByYXRlICovCi0JCXByX3dhcm4o ImhkYS1pOTE1OiBnZXRfY2RjbGsgc3ltYm9sIGdldCBmYWlsXG4iKTsKKwlkZXZfZGJnKGRldiwg ImJvdW5kIHRvIGk5MTUgY29tcG9uZW50IG1hc3RlclxuIik7CiAKLQlwcl9kZWJ1ZygiSERBIGRy aXZlciBnZXQgc3ltYm9sIHN1Y2Nlc3NmdWxseSBmcm9tIGk5MTUgbW9kdWxlXG4iKTsKKwlyZXR1 cm4gMDsKK291dF9tYXN0ZXJfZGVsOgorCWNvbXBvbmVudF9tYXN0ZXJfZGVsKGRldiwgJmhkYV9j b21wb25lbnRfbWFzdGVyX29wcyk7CitvdXRfZXJyOgorCWRldl9lcnIoZGV2LCAiZmFpbGVkIHRv IGFkZCBpOTE1IGNvbXBvbmVudCBtYXN0ZXIgKCVkKVxuIiwgcmV0KTsKIAotCXJldHVybiBlcnI7 CisJcmV0dXJuIHJldDsKIH0KIAogaW50IGhkYV9pOTE1X2V4aXQoc3RydWN0IGhkYV9pbnRlbCAq aGRhKQogewotCWlmIChnZXRfcG93ZXIpIHsKLQkJc3ltYm9sX3B1dChpOTE1X3JlcXVlc3RfcG93 ZXJfd2VsbCk7Ci0JCWdldF9wb3dlciA9IE5VTEw7Ci0JfQotCWlmIChwdXRfcG93ZXIpIHsKLQkJ c3ltYm9sX3B1dChpOTE1X3JlbGVhc2VfcG93ZXJfd2VsbCk7Ci0JCXB1dF9wb3dlciA9IE5VTEw7 Ci0JfQotCWlmIChnZXRfY2RjbGspIHsKLQkJc3ltYm9sX3B1dChpOTE1X2dldF9jZGNsa19mcmVx KTsKLQkJZ2V0X2NkY2xrID0gTlVMTDsKLQl9CisJc3RydWN0IGRldmljZSAqZGV2ID0gJmhkYS0+ Y2hpcC5wY2ktPmRldjsKKworCWNvbXBvbmVudF9tYXN0ZXJfZGVsKGRldiwgJmhkYV9jb21wb25l bnRfbWFzdGVyX29wcyk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL3NvdW5kL3BjaS9o ZGEvaGRhX2ludGVsLmMgYi9zb3VuZC9wY2kvaGRhL2hkYV9pbnRlbC5jCmluZGV4IDMyM2FiZjku Ljk1YTUzOTkgMTAwNjQ0Ci0tLSBhL3NvdW5kL3BjaS9oZGEvaGRhX2ludGVsLmMKKysrIGIvc291 bmQvcGNpL2hkYS9oZGFfaW50ZWwuYwpAQCAtMTg5MCwxMSArMTg5MCw4IEBAIHN0YXRpYyBpbnQg YXp4X3Byb2JlX2NvbnRpbnVlKHN0cnVjdCBhenggKmNoaXApCiAJaWYgKGNoaXAtPmRyaXZlcl9j YXBzICYgQVpYX0RDQVBTX0k5MTVfUE9XRVJXRUxMKSB7CiAjaWZkZWYgQ09ORklHX1NORF9IREFf STkxNQogCQllcnIgPSBoZGFfaTkxNV9pbml0KGhkYSk7Ci0JCWlmIChlcnIgPCAwKSB7Ci0JCQlk ZXZfZXJyKGNoaXAtPmNhcmQtPmRldiwKLQkJCQkiRXJyb3IgcmVxdWVzdCBwb3dlci13ZWxsIGZy b20gaTkxNVxuIik7CisJCWlmIChlcnIgPCAwKQogCQkJZ290byBvdXRfZnJlZTsKLQkJfQogCQll cnIgPSBoZGFfZGlzcGxheV9wb3dlcihoZGEsIHRydWUpOwogCQlpZiAoZXJyIDwgMCkgewogCQkJ ZGV2X2VycihjaGlwLT5jYXJkLT5kZXYsCmRpZmYgLS1naXQgYS9zb3VuZC9wY2kvaGRhL2hkYV9p bnRlbC5oIGIvc291bmQvcGNpL2hkYS9oZGFfaW50ZWwuaAppbmRleCA3MGI4MzA2Li4zNDg2MTE4 IDEwMDY0NAotLS0gYS9zb3VuZC9wY2kvaGRhL2hkYV9pbnRlbC5oCisrKyBiL3NvdW5kL3BjaS9o ZGEvaGRhX2ludGVsLmgKQEAgLTE2LDYgKzE2LDcgQEAKICNpZm5kZWYgX19TT1VORF9IREFfSU5U RUxfSAogI2RlZmluZSBfX1NPVU5EX0hEQV9JTlRFTF9ICiAKKyNpbmNsdWRlIDxkcm0vaTkxNV9j b21wb25lbnQuaD4KICNpbmNsdWRlICJoZGFfcHJpdi5oIgogCiBzdHJ1Y3QgaGRhX2ludGVsIHsK QEAgLTQxLDYgKzQyLDkgQEAgc3RydWN0IGhkYV9pbnRlbCB7CiAKIAkvKiBzZWNvbmRhcnkgcG93 ZXIgZG9tYWluIGZvciBoZG1pIGF1ZGlvIHVuZGVyIHZnYSBkZXZpY2UgKi8KIAlzdHJ1Y3QgZGV2 X3BtX2RvbWFpbiBoZG1pX3BtX2RvbWFpbjsKKworCS8qIGk5MTUgY29tcG9uZW50IGludGVyZmFj ZSAqLworCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCBhdWRpb19jb21wb25lbnQ7CiB9Owog CiAjaWZkZWYgQ09ORklHX1NORF9IREFfSTkxNQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==