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, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro" has been added to the 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <151308200497184@kroah.com> Date: Tue, 12 Dec 2017 13:33:24 +0100 To: jeremy.lefaure@lse.epita.fr, 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 YXRjaCB0aXRsZWQKCiAgICBFREFDLCBpNTAwMCwgaTU0MDA6IEZpeCB1c2Ugb2YgTVRSX0RSQU1f V0lEVEggbWFjcm8KCnRvIHRoZSA0Ljktc3RhYmxlIHRyZWUgd2hpY2ggY2FuIGJlIGZvdW5kIGF0 OgogICAgaHR0cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1saW51eC9rZXJuZWwvZ2l0L3N0YWJs ZS9zdGFibGUtcXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZpbGVuYW1lIG9mIHRoZSBwYXRjaCBp czoKICAgICBlZGFjLWk1MDAwLWk1NDAwLWZpeC11c2Utb2YtbXRyX2RyYW1fd2lkdGgtbWFjcm8u cGF0Y2gKYW5kIGl0IGNhbiBiZSBmb3VuZCBpbiB0aGUgcXVldWUtNC45IHN1YmRpcmVjdG9yeS4K CklmIHlvdSwgb3IgYW55b25lIGVsc2UsIGZlZWxzIGl0IHNob3VsZCBub3QgYmUgYWRkZWQgdG8g dGhlIHN0YWJsZSB0cmVlLApwbGVhc2UgbGV0IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiBrbm93 IGFib3V0IGl0LgoKCkZyb20gZm9vQGJheiBUdWUgRGVjIDEyIDEzOjI2OjE3IENFVCAyMDE3CkZy b206IErDqXLDqW15IExlZmF1cmUgPGplcmVteS5sZWZhdXJlQGxzZS5lcGl0YS5mcj4KRGF0ZTog V2VkLCA4IE1hciAyMDE3IDIwOjE4OjA5IC0wNTAwClN1YmplY3Q6IEVEQUMsIGk1MDAwLCBpNTQw MDogRml4IHVzZSBvZiBNVFJfRFJBTV9XSURUSCBtYWNybwoKRnJvbTogSsOpcsOpbXkgTGVmYXVy ZSA8amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZyPgoKClsgVXBzdHJlYW0gY29tbWl0IGU2MTU1 NWMyOWMyOGE0YTNiNmJhNjIwN2Y0YTA4ODNlZTIzNjAwNGQgXQoKVGhlIE1UUl9EUkFNX1dJRFRI IG1hY3JvIHJldHVybnMgdGhlIGRhdGEgd2lkdGguIEl0IGlzIHNvbWV0aW1lcyB1c2VkCmFzIGlm IGl0IHJldHVybmVkIGEgYm9vbGVhbiB0cnVlIGlmIHRoZSB3aWR0aCBpZiA4LiBGaXggdGhlIHRl c3RzIHdoZXJlCk1UUl9EUkFNX1dJRFRIIGlzIG1pc3VzZWQuCgpTaWduZWQtb2ZmLWJ5OiBKw4PC qXLDg8KpbXkgTGVmYXVyZSA8amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZyPgpDYzogbGludXgt ZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+Ckxpbms6IGh0dHA6Ly9sa21sLmtlcm5l bC5vcmcvci8yMDE3MDMwOTAxMTgwOS44MzQwLTEtamVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZy ClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1i eTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkB2ZXJpem9uLmNvbT4KU2lnbmVkLW9mZi1i eTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBk cml2ZXJzL2VkYWMvaTUwMDBfZWRhYy5jIHwgICAgMiArLQogZHJpdmVycy9lZGFjL2k1NDAwX2Vk YWMuYyB8ICAgIDUgKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAzIGRl bGV0aW9ucygtKQoKCgpQYXRjaGVzIGN1cnJlbnRseSBpbiBzdGFibGUtcXVldWUgd2hpY2ggbWln aHQgYmUgZnJvbSBqZXJlbXkubGVmYXVyZUBsc2UuZXBpdGEuZnIgYXJlCgpxdWV1ZS00LjkvZWRh Yy1pNTAwMC1pNTQwMC1maXgtZGVmaW5pdGlvbi1vZi1ucmVjbWVtYi1yZWdpc3Rlci5wYXRjaApx dWV1ZS00LjkvZWRhYy1pNTAwMC1pNTQwMC1maXgtdXNlLW9mLW10cl9kcmFtX3dpZHRoLW1hY3Jv LnBhdGNoCi0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1 bnN1YnNjcmliZSBsaW51eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jk b21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5r ZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2RyaXZlcnMvZWRhYy9pNTAwMF9l ZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2k1MDAwX2VkYWMuYwpAQCAtMTI5Myw3ICsxMjkzLDcg QEAgc3RhdGljIGludCBpNTAwMF9pbml0X2Nzcm93cyhzdHJ1Y3QgbWVtXwogCQkJZGltbS0+bXR5 cGUgPSBNRU1fRkJfRERSMjsKIAogCQkJLyogYXNrIHdoYXQgZGV2aWNlIHR5cGUgb24gdGhpcyBy b3cgKi8KLQkJCWlmIChNVFJfRFJBTV9XSURUSChtdHIpKQorCQkJaWYgKE1UUl9EUkFNX1dJRFRI KG10cikgPT0gOCkKIAkJCQlkaW1tLT5kdHlwZSA9IERFVl9YODsKIAkJCWVsc2UKIAkJCQlkaW1t LT5kdHlwZSA9IERFVl9YNDsKLS0tIGEvZHJpdmVycy9lZGFjL2k1NDAwX2VkYWMuYworKysgYi9k cml2ZXJzL2VkYWMvaTU0MDBfZWRhYy5jCkBAIC0xMjA3LDEzICsxMjA3LDE0IEBAIHN0YXRpYyBp bnQgaTU0MDBfaW5pdF9kaW1tcyhzdHJ1Y3QgbWVtX2MKIAogCQkJZGltbS0+bnJfcGFnZXMgPSBz aXplX21iIDw8IDg7CiAJCQlkaW1tLT5ncmFpbiA9IDg7Ci0JCQlkaW1tLT5kdHlwZSA9IE1UUl9E UkFNX1dJRFRIKG10cikgPyBERVZfWDggOiBERVZfWDQ7CisJCQlkaW1tLT5kdHlwZSA9IE1UUl9E UkFNX1dJRFRIKG10cikgPT0gOCA/CisJCQkJICAgICAgREVWX1g4IDogREVWX1g0OwogCQkJZGlt bS0+bXR5cGUgPSBNRU1fRkJfRERSMjsKIAkJCS8qCiAJCQkgKiBUaGUgZWNjYyBtZWNoYW5pc20g aXMgU0REQyAoYWthIFNFQ0MpLCB3aXRoCiAJCQkgKiBpcyBzaW1pbGFyIHRvIENoaXBraWxsLgog CQkJICovCi0JCQlkaW1tLT5lZGFjX21vZGUgPSBNVFJfRFJBTV9XSURUSChtdHIpID8KKwkJCWRp bW0tPmVkYWNfbW9kZSA9IE1UUl9EUkFNX1dJRFRIKG10cikgPT0gOCA/CiAJCQkJCSAgRURBQ19T OEVDRDhFRCA6IEVEQUNfUzRFQ0Q0RUQ7CiAJCQluZGltbXMrKzsKIAkJfQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57046 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688AbdLLMeU (ORCPT ); Tue, 12 Dec 2017 07:34:20 -0500 Subject: Patch "EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro" has been added to the 4.9-stable tree To: jeremy.lefaure@lse.epita.fr, alexander.levin@verizon.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: , From: Date: Tue, 12 Dec 2017 13:33:24 +0100 Message-ID: <151308200497184@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 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, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro 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-i5000-i5400-fix-use-of-mtr_dram_width-macro.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 Tue Dec 12 13:26:17 CET 2017 From: J�r�my Lefaure Date: Wed, 8 Mar 2017 20:18:09 -0500 Subject: EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro From: J�r�my Lefaure [ Upstream commit e61555c29c28a4a3b6ba6207f4a0883ee236004d ] The MTR_DRAM_WIDTH macro returns the data width. It is sometimes used as if it returned a boolean true if the width if 8. Fix the tests where MTR_DRAM_WIDTH is misused. Signed-off-by: Jérémy Lefaure Cc: linux-edac Link: http://lkml.kernel.org/r/20170309011809.8340-1-jeremy.lefaure@lse.epita.fr Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/i5000_edac.c | 2 +- drivers/edac/i5400_edac.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -1293,7 +1293,7 @@ static int i5000_init_csrows(struct mem_ dimm->mtype = MEM_FB_DDR2; /* ask what device type on this row */ - if (MTR_DRAM_WIDTH(mtr)) + if (MTR_DRAM_WIDTH(mtr) == 8) dimm->dtype = DEV_X8; else dimm->dtype = DEV_X4; --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c @@ -1207,13 +1207,14 @@ static int i5400_init_dimms(struct mem_c dimm->nr_pages = size_mb << 8; dimm->grain = 8; - dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4; + dimm->dtype = MTR_DRAM_WIDTH(mtr) == 8 ? + DEV_X8 : DEV_X4; dimm->mtype = MEM_FB_DDR2; /* * The eccc mechanism is SDDC (aka SECC), with * is similar to Chipkill. */ - dimm->edac_mode = MTR_DRAM_WIDTH(mtr) ? + dimm->edac_mode = MTR_DRAM_WIDTH(mtr) == 8 ? EDAC_S8ECD8ED : EDAC_S4ECD4ED; ndimms++; } Patches currently in stable-queue which might be from jeremy.lefaure@lse.epita.fr are queue-4.9/edac-i5000-i5400-fix-definition-of-nrecmemb-register.patch queue-4.9/edac-i5000-i5400-fix-use-of-mtr_dram_width-macro.patch