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: Patch "EDAC, amd64: Save and return err code from probe_one_instance()" has been added to the 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <151021856812786@kroah.com> Date: Thu, 09 Nov 2017 10:09:28 +0100 To: Yazen.Ghannam@amd.com, alexander.levin@verizon.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-ID: VGhpcyBpcyBhIG5vdGUgdG8gbGV0IHlvdSBrbm93IHRoYXQgSSd2ZSBqdXN0IGFkZGVkIHRoZSBw YXRjaCB0aXRsZWQKCiAgICBFREFDLCBhbWQ2NDogU2F2ZSBhbmQgcmV0dXJuIGVyciBjb2RlIGZy b20gcHJvYmVfb25lX2luc3RhbmNlKCkKCnRvIHRoZSA0Ljktc3RhYmxlIHRyZWUgd2hpY2ggY2Fu IGJlIGZvdW5kIGF0OgogICAgaHR0cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1saW51eC9rZXJu ZWwvZ2l0L3N0YWJsZS9zdGFibGUtcXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZpbGVuYW1lIG9m IHRoZSBwYXRjaCBpczoKICAgICBlZGFjLWFtZDY0LXNhdmUtYW5kLXJldHVybi1lcnItY29kZS1m cm9tLXByb2JlX29uZV9pbnN0YW5jZS5wYXRjaAphbmQgaXQgY2FuIGJlIGZvdW5kIGluIHRoZSBx dWV1ZS00Ljkgc3ViZGlyZWN0b3J5LgoKSWYgeW91LCBvciBhbnlvbmUgZWxzZSwgZmVlbHMgaXQg c2hvdWxkIG5vdCBiZSBhZGRlZCB0byB0aGUgc3RhYmxlIHRyZWUsCnBsZWFzZSBsZXQgPHN0YWJs ZUB2Z2VyLmtlcm5lbC5vcmc+IGtub3cgYWJvdXQgaXQuCgoKRnJvbSBmb29AYmF6IFRodSBOb3Yg IDkgMDk6NDg6MDEgQ0VUIDIwMTcKRnJvbTogWWF6ZW4gR2hhbm5hbSA8WWF6ZW4uR2hhbm5hbUBh bWQuY29tPgpEYXRlOiBGcmksIDEzIEphbiAyMDE3IDA5OjUyOjE5IC0wNjAwClN1YmplY3Q6IEVE QUMsIGFtZDY0OiBTYXZlIGFuZCByZXR1cm4gZXJyIGNvZGUgZnJvbSBwcm9iZV9vbmVfaW5zdGFu Y2UoKQoKRnJvbTogWWF6ZW4gR2hhbm5hbSA8WWF6ZW4uR2hhbm5hbUBhbWQuY29tPgoKClsgVXBz dHJlYW0gY29tbWl0IDIyODdjNjM2NDNmMGY1MmQ5ZDU0NTJiOWRjNDA3OWFlYzA4ODlmZTggXQoK V2Ugc2hvdWxkIHNhdmUgdGhlIHJldHVybiBjb2RlIGZyb20gcHJvYmVfb25lX2luc3RhbmNlKCkg c28gdGhhdCBpdCBjYW4KYmUgcmV0dXJuZWQgZnJvbSB0aGUgbW9kdWxlIGluaXQgZnVuY3Rpb24u IE90aGVyd2lzZSwgd2UnbGwgYmUgcmV0dXJuaW5nCnRoZSAtRU5PTUVNIGZyb20gYWJvdmUuCgpT aWduZWQtb2ZmLWJ5OiBZYXplbiBHaGFubmFtIDxZYXplbi5HaGFubmFtQGFtZC5jb20+CkNjOiBs aW51eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cDovL2xrbWwu a2VybmVsLm9yZy9yLzE0ODQzMjI3NDEtNDE4ODQtMS1naXQtc2VuZC1lbWFpbC1ZYXplbi5HaGFu bmFtQGFtZC5jb20KU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpT aWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQHZlcml6b24uY29tPgpT aWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24u b3JnPgotLS0KIGRyaXZlcnMvZWRhYy9hbWQ2NF9lZGFjLmMgfCAgICA2ICsrKystLQogMSBmaWxl IGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCgoKUGF0Y2hlcyBjdXJy ZW50bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20gWWF6ZW4uR2hhbm5hbUBh bWQuY29tIGFyZQoKcXVldWUtNC45L2VkYWMtYW1kNjQtYWRkLXg4NmNwdWlkLXNhbml0eS1jaGVj ay1kdXJpbmctaW5pdC5wYXRjaApxdWV1ZS00LjkvZWRhYy1hbWQ2NC1zYXZlLWFuZC1yZXR1cm4t ZXJyLWNvZGUtZnJvbS1wcm9iZV9vbmVfaW5zdGFuY2UucGF0Y2gKLS0KVG8gdW5zdWJzY3JpYmUg ZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWVkYWMiIGlu CnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUg bWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8u aHRtbAoKLS0tIGEvZHJpdmVycy9lZGFjL2FtZDY0X2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMv YW1kNjRfZWRhYy5jCkBAIC0zMDAxLDE0ICszMDAxLDE2IEBAIHN0YXRpYyBpbnQgX19pbml0IGFt ZDY0X2VkYWNfaW5pdCh2b2lkKQogCWlmICghbXNycykKIAkJZ290byBlcnJfZnJlZTsKIAotCWZv ciAoaSA9IDA7IGkgPCBhbWRfbmJfbnVtKCk7IGkrKykKLQkJaWYgKHByb2JlX29uZV9pbnN0YW5j ZShpKSkgeworCWZvciAoaSA9IDA7IGkgPCBhbWRfbmJfbnVtKCk7IGkrKykgeworCQllcnIgPSBw cm9iZV9vbmVfaW5zdGFuY2UoaSk7CisJCWlmIChlcnIpIHsKIAkJCS8qIHVud2luZCBwcm9wZXJs eSAqLwogCQkJd2hpbGUgKC0taSA+PSAwKQogCQkJCXJlbW92ZV9vbmVfaW5zdGFuY2UoaSk7CiAK IAkJCWdvdG8gZXJyX3BjaTsKIAkJfQorCX0KIAogCXNldHVwX3BjaV9kZXZpY2UoKTsKIAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54336 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753752AbdKIJJn (ORCPT ); Thu, 9 Nov 2017 04:09:43 -0500 Subject: Patch "EDAC, amd64: Save and return err code from probe_one_instance()" has been added to the 4.9-stable tree To: Yazen.Ghannam@amd.com, alexander.levin@verizon.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: , From: Date: Thu, 09 Nov 2017 10:09:28 +0100 Message-ID: <151021856812786@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled EDAC, amd64: Save and return err code from probe_one_instance() to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: edac-amd64-save-and-return-err-code-from-probe_one_instance.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Nov 9 09:48:01 CET 2017 From: Yazen Ghannam Date: Fri, 13 Jan 2017 09:52:19 -0600 Subject: EDAC, amd64: Save and return err code from probe_one_instance() From: Yazen Ghannam [ Upstream commit 2287c63643f0f52d9d5452b9dc4079aec0889fe8 ] We should save the return code from probe_one_instance() so that it can be returned from the module init function. Otherwise, we'll be returning the -ENOMEM from above. Signed-off-by: Yazen Ghannam Cc: linux-edac Link: http://lkml.kernel.org/r/1484322741-41884-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/amd64_edac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3001,14 +3001,16 @@ static int __init amd64_edac_init(void) if (!msrs) goto err_free; - for (i = 0; i < amd_nb_num(); i++) - if (probe_one_instance(i)) { + for (i = 0; i < amd_nb_num(); i++) { + err = probe_one_instance(i); + if (err) { /* unwind properly */ while (--i >= 0) remove_one_instance(i); goto err_pci; } + } setup_pci_device(); Patches currently in stable-queue which might be from Yazen.Ghannam@amd.com are queue-4.9/edac-amd64-add-x86cpuid-sanity-check-during-init.patch queue-4.9/edac-amd64-save-and-return-err-code-from-probe_one_instance.patch