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: [v2] arch/x86: Fix boot_cpu_data.microcode version output From: Filippo Sironi Message-Id: <65549531-EA3A-49ED-BECA-D5F85B9F09E4@amazon.de> Date: Tue, 31 Jul 2018 11:46:09 +0000 To: Prarit Bhargava Cc: "bp@alien8.de" , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "tony.luck@intel.com" , "stable@vger.kernel.org" List-ID: PiBPbiAzMS4gSnVsIDIwMTgsIGF0IDEzOjI3LCBQcmFyaXQgQmhhcmdhdmEgPHByYXJpdEByZWRo YXQuY29tPiB3cm90ZToKPiAKPiBJIHRlc3RlZCB0aGlzIG9uIEFNRCBSeXplbiAmIEludGVsIEJy b2Fkd2VsbCBzeXN0ZW0gYW5kIGR1bXBlZCB0aGUKPiBib290X2NwdV9kYXRhIGJlZm9yZSBhbmQg YWZ0ZXIgYSBtaWNyb2NvZGUgdXBkYXRlLiAgT24gdGhlIEludGVsCj4gc3lzdGVtIEkgYWxzbyBk aWQgYSBmYXRhbCBNQ0UgdXNpbmcgbWNlLWluamVjdCB0byBjb25maXJtIHRoZSBvdXRwdXQKPiBm cm9tIHRoZSBtY2UgaGFuZGxpbmcgY29kZS4KPiAKPiBQLgo+IAo+IC0tLTg8LS0tCj4gCj4gT24g c3lzdGVtcyB3aGVyZSBhIHJ1bnRpbWUgbWljcm9jb2RlIHVwZGF0ZSBoYXMgb2NjdXJyZWQgdGhl IG1pY3JvY29kZQo+IHZlcnNpb24gb3V0cHV0IGluIGEgTUNFIGxvZyByZWNvcmQgaXMgd3Jvbmcg YmVjYXVzZQo+IGJvb3RfY3B1X2RhdGEubWljcm9jb2RlIGlzIG5vdCB1cGRhdGVkIGR1cmluZyBy dW50aW1lLgo+IAo+IFVwZGF0ZSBib290X2NwdV9kYXRhLm1pY3JvY29kZSB3aGVuIHRoZSBCU1An cyBtaWNyb2NvZGUgaXMgdXBkYXRlZC4KPiAKPiBGaXhlczogZmE5NGQwYzZlMGYzICgieDg2L01D RTogU2F2ZSBtaWNyb2NvZGUgcmV2aXNpb24gaW4gbWFjaGluZSBjaGVjayByZWNvcmRzIikKPiBT dWdnZXN0ZWQtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmNvbT4KPiBTaWduZWQtb2Zm LWJ5OiBQcmFyaXQgQmhhcmdhdmEgPHByYXJpdEByZWRoYXQuY29tPgo+IENjOiBzdGFibGVAdmdl ci5rZXJuZWwub3JnCj4gQ2M6IHNpcm9uaUBhbWF6b24uZGUKPiBDYzogdG9ueS5sdWNrQGludGVs LmNvbQo+IC0tLQo+IENoYW5nZXMgaW4gdjI6IFVzZSBtY19hbWQtPmhkci5wYXRjaF9pZCBvbiBB TUQKPiAKPiBhcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9hbWQuYyAgIHwgNCArKysrCj4g YXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvaW50ZWwuYyB8IDQgKysrKwo+IDIgZmlsZXMg Y2hhbmdlZCwgOCBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5l bC9jcHUvbWljcm9jb2RlL2FtZC5jIGIvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvYW1k LmMKPiBpbmRleCAwNjI0OTU3YWEwNjguLjYzYjA3MjM3N2JhNCAxMDA2NDQKPiAtLS0gYS9hcmNo L3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9hbWQuYwo+ICsrKyBiL2FyY2gveDg2L2tlcm5lbC9j cHUvbWljcm9jb2RlL2FtZC5jCj4gQEAgLTUzNyw2ICs1MzcsMTAgQEAgc3RhdGljIGVudW0gdWNv ZGVfc3RhdGUgYXBwbHlfbWljcm9jb2RlX2FtZChpbnQgY3B1KQo+IAl1Y2ktPmNwdV9zaWcucmV2 ID0gbWNfYW1kLT5oZHIucGF0Y2hfaWQ7Cj4gCWMtPm1pY3JvY29kZSA9IG1jX2FtZC0+aGRyLnBh dGNoX2lkOwo+IAo+ICsJLyogVXBkYXRlIGJvb3RfY3B1X2RhdGEncyByZXZpc2lvbiB0b28sIGlm IHdlJ3JlIG9uIHRoZSBCU1A6ICovCj4gKwlpZiAoYy0+Y3B1X2luZGV4ID09IGJvb3RfY3B1X2Rh dGEuY3B1X2luZGV4KQo+ICsJCWJvb3RfY3B1X2RhdGEubWljcm9jb2RlID0gIG1jX2FtZC0+aGRy LnBhdGNoX2lkOwo+ICsKPiAJcmV0dXJuIFVDT0RFX1VQREFURUQ7Cj4gfQo+IAo+IGRpZmYgLS1n aXQgYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9pbnRlbC5jIGIvYXJjaC94ODYva2Vy bmVsL2NwdS9taWNyb2NvZGUvaW50ZWwuYwo+IGluZGV4IDk3Y2NmNGMzYjQ1Yi4uMjU2ZDMzNmNi YzA0IDEwMDY0NAo+IC0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWljcm9jb2RlL2ludGVsLmMK PiArKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9pbnRlbC5jCj4gQEAgLTg1MSw2 ICs4NTEsMTAgQEAgc3RhdGljIGVudW0gdWNvZGVfc3RhdGUgYXBwbHlfbWljcm9jb2RlX2ludGVs KGludCBjcHUpCj4gCXVjaS0+Y3B1X3NpZy5yZXYgPSByZXY7Cj4gCWMtPm1pY3JvY29kZSA9IHJl djsKPiAKPiArCS8qIFVwZGF0ZSBib290X2NwdV9kYXRhJ3MgcmV2aXNpb24gdG9vLCBpZiB3ZSdy ZSBvbiB0aGUgQlNQOiAqLwo+ICsJaWYgKGMtPmNwdV9pbmRleCA9PSBib290X2NwdV9kYXRhLmNw dV9pbmRleCkKPiArCQlib290X2NwdV9kYXRhLm1pY3JvY29kZSA9IHJldjsKPiArCj4gCXJldHVy biBVQ09ERV9VUERBVEVEOwo+IH0KClRoZXJlIG1heSBiZSBhIGNoYW5jZSBvZiBza2lwcGluZyB0 aGlzIGNvZGUsIEkgdGhpbmsuCgpJZiB0aGUgbWljcm9jb2RlIGlzIGxvYWRlZCBvbiB0aGUgaHlw ZXJ0aHJlYWQgc2libGluZyBvZiB0aGUgYm9vdCBjcHUKYmVmb3JlIGJlaW5nIGxvYWRlZCBvbiB0 aGUgYm9vdCBjcHUsIHRoZSBib290IGNwdSB3aWxsIGV4aXQgZWFybGllcgpmcm9tIGFwcGx5X21p Y3JvY29kZV9pbnRlbCgpIC0gaW4gaWYgKHJldiA+PSBtYy0+aGRyLnJldikgeyAuLi4gfS4KCihU aGlzIHNlZW1zIHRvIGJlIHBvc3NpYmxlIGluIGFwcGx5X21pY3JvY29kZV9hbWQoKSBhcyB3ZWxs LikKCkluIG15IHRyZWUgd2l0aCB0aGUgYWZvcmVtZW50aW9uZWQgY2hhbmdlIC0gSW50ZWwgb25s eSAtIEkgYWxzbyBoYWQKdGhlIGZvbGxvd2luZyBwYXRjaDoKCgp3aGljaCBwcmV2ZW50cyB0aGUg aXNzdWUuCgo+IC0tIAo+IDIuMTcuMAo+IAo+IAoKQW1hem9uIERldmVsb3BtZW50IENlbnRlciBH ZXJtYW55IEdtYkgKQmVybGluIC0gRHJlc2RlbiAtIEFhY2hlbgptYWluIG9mZmljZTogS3JhdXNl bnN0ci4gMzgsIDEwMTE3IEJlcmxpbgpHZXNjaGFlZnRzZnVlaHJlcjogRHIuIFJhbGYgSGVyYnJp Y2gsIENocmlzdGlhbiBTY2hsYWVnZXIKVXN0LUlEOiBERTI4OTIzNzg3OQpFaW5nZXRyYWdlbiBh bSBBbXRzZ2VyaWNodCBDaGFybG90dGVuYnVyZyBIUkIgMTQ5MTczIEIKLS0tClRvIHVuc3Vic2Ny aWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1lZGFj IiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpN b3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1p bmZvLmh0bWwKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9pbnRl bC5jIGIvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvaW50ZWwuYwppbmRleCA5N2NjZjRj M2I0NWIuLjRiYzg2OWU4MjllYiAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2NwdS9taWNy b2NvZGUvaW50ZWwuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9pbnRlbC5j CkBAIC03OTcsNiArNzk3LDcgQEAgc3RhdGljIGVudW0gdWNvZGVfc3RhdGUgYXBwbHlfbWljcm9j b2RlX2ludGVsKGludCBjcHUpCiAgICAgICAgc3RydWN0IG1pY3JvY29kZV9pbnRlbCAqbWM7CiAg ICAgICAgc3RhdGljIGludCBwcmV2X3JldjsKICAgICAgICB1MzIgcmV2OworICAgICAgIGVudW0g dWNvZGVfc3RhdGUgcmV0OwogCiAgICAgICAgLyogV2Ugc2hvdWxkIGJpbmQgdGhlIHRhc2sgdG8g dGhlIENQVSAqLwogICAgICAgIGlmIChXQVJOX09OKHJhd19zbXBfcHJvY2Vzc29yX2lkKCkgIT0g Y3B1KSkKQEAgLTgxNyw5ICs4MTgsOCBAQCBzdGF0aWMgZW51bSB1Y29kZV9zdGF0ZSBhcHBseV9t aWNyb2NvZGVfaW50ZWwoaW50IGNwdSkKICAgICAgICAgKi8KICAgICAgICByZXYgPSBpbnRlbF9n ZXRfbWljcm9jb2RlX3JldmlzaW9uKCk7CiAgICAgICAgaWYgKHJldiA+PSBtYy0+aGRyLnJldikg ewotICAgICAgICAgICAgICAgdWNpLT5jcHVfc2lnLnJldiA9IHJldjsKLSAgICAgICAgICAgICAg IGMtPm1pY3JvY29kZSA9IHJldjsKLSAgICAgICAgICAgICAgIHJldHVybiBVQ09ERV9PSzsKKyAg ICAgICAgICAgICAgIHJldCA9IFVDT0RFX09LOworICAgICAgICAgICAgICAgZ290byBvdXQ7CiAg ICAgICAgfQogCiAgICAgICAgLyoKQEAgLTg0OCwxMCArODQ4LDEyIEBAIHN0YXRpYyBlbnVtIHVj b2RlX3N0YXRlIGFwcGx5X21pY3JvY29kZV9pbnRlbChpbnQgY3B1KQogICAgICAgICAgICAgICAg cHJldl9yZXYgPSByZXY7CiAgICAgICAgfQogCisgICAgICAgcmV0ID0gVUNPREVfVVBEQVRFRDsK K291dDoKICAgICAgICB1Y2ktPmNwdV9zaWcucmV2ID0gcmV2OwogICAgICAgIGMtPm1pY3JvY29k ZSA9IHJldjsKIAotICAgICAgIHJldHVybiBVQ09ERV9VUERBVEVEOworICAgICAgIHJldHVybiBy ZXQ7CiB9CiAKIHN0YXRpYyBlbnVtIHVjb2RlX3N0YXRlIGdlbmVyaWNfbG9hZF9taWNyb2NvZGUo aW50IGNwdSwgdm9pZCAqZGF0YSwgc2l6ZV90IHNpemUsCg==