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 3.18-stable tree From: Greg Kroah-Hartman Message-Id: <151328353917129@kroah.com> Date: Thu, 14 Dec 2017 21:32:19 +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 V0lEVEggbWFjcm8KCnRvIHRoZSAzLjE4LXN0YWJsZSB0cmVlIHdoaWNoIGNhbiBiZSBmb3VuZCBh dDoKICAgIGh0dHA6Ly93d3cua2VybmVsLm9yZy9naXQvP3A9bGludXgva2VybmVsL2dpdC9zdGFi bGUvc3RhYmxlLXF1ZXVlLmdpdDthPXN1bW1hcnkKClRoZSBmaWxlbmFtZSBvZiB0aGUgcGF0Y2gg aXM6CiAgICAgZWRhYy1pNTAwMC1pNTQwMC1maXgtdXNlLW9mLW10cl9kcmFtX3dpZHRoLW1hY3Jv LnBhdGNoCmFuZCBpdCBjYW4gYmUgZm91bmQgaW4gdGhlIHF1ZXVlLTMuMTggc3ViZGlyZWN0b3J5 LgoKSWYgeW91LCBvciBhbnlvbmUgZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBhZGRlZCB0 byB0aGUgc3RhYmxlIHRyZWUsCnBsZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+IGtu b3cgYWJvdXQgaXQuCgoKRnJvbSBmb29AYmF6IFRodSBEZWMgMTQgMjE6MzA6NDcgQ0VUIDIwMTcK RnJvbTogSsOpcsOpbXkgTGVmYXVyZSA8amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZyPgpEYXRl OiBXZWQsIDggTWFyIDIwMTcgMjA6MTg6MDkgLTA1MDAKU3ViamVjdDogRURBQywgaTUwMDAsIGk1 NDAwOiBGaXggdXNlIG9mIE1UUl9EUkFNX1dJRFRIIG1hY3JvCgpGcm9tOiBKw6lyw6lteSBMZWZh dXJlIDxqZXJlbXkubGVmYXVyZUBsc2UuZXBpdGEuZnI+CgoKWyBVcHN0cmVhbSBjb21taXQgZTYx NTU1YzI5YzI4YTRhM2I2YmE2MjA3ZjRhMDg4M2VlMjM2MDA0ZCBdCgpUaGUgTVRSX0RSQU1fV0lE VEggbWFjcm8gcmV0dXJucyB0aGUgZGF0YSB3aWR0aC4gSXQgaXMgc29tZXRpbWVzIHVzZWQKYXMg aWYgaXQgcmV0dXJuZWQgYSBib29sZWFuIHRydWUgaWYgdGhlIHdpZHRoIGlmIDguIEZpeCB0aGUg dGVzdHMgd2hlcmUKTVRSX0RSQU1fV0lEVEggaXMgbWlzdXNlZC4KClNpZ25lZC1vZmYtYnk6IErD g8KpcsODwqlteSBMZWZhdXJlIDxqZXJlbXkubGVmYXVyZUBsc2UuZXBpdGEuZnI+CkNjOiBsaW51 eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cDovL2xrbWwua2Vy bmVsLm9yZy9yLzIwMTcwMzA5MDExODA5LjgzNDAtMS1qZXJlbXkubGVmYXVyZUBsc2UuZXBpdGEu ZnIKU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpTaWduZWQtb2Zm LWJ5OiBTYXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQHZlcml6b24uY29tPgpTaWduZWQtb2Zm LWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0K IGRyaXZlcnMvZWRhYy9pNTAwMF9lZGFjLmMgfCAgICAyICstCiBkcml2ZXJzL2VkYWMvaTU0MDBf ZWRhYy5jIHwgICAgNSArKystLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDMg ZGVsZXRpb25zKC0pCgoKClBhdGNoZXMgY3VycmVudGx5IGluIHN0YWJsZS1xdWV1ZSB3aGljaCBt aWdodCBiZSBmcm9tIGplcmVteS5sZWZhdXJlQGxzZS5lcGl0YS5mciBhcmUKCnF1ZXVlLTMuMTgv ZWRhYy1pNTAwMC1pNTQwMC1maXgtZGVmaW5pdGlvbi1vZi1ucmVjbWVtYi1yZWdpc3Rlci5wYXRj aApxdWV1ZS0zLjE4L2VkYWMtaTUwMDAtaTU0MDAtZml4LXVzZS1vZi1tdHJfZHJhbV93aWR0aC1t YWNyby5wYXRjaAotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGlu ZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1h am9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3Zn ZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgotLS0gYS9kcml2ZXJzL2VkYWMvaTUw MDBfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pNTAwMF9lZGFjLmMKQEAgLTEyOTMsNyArMTI5 Myw3IEBAIHN0YXRpYyBpbnQgaTUwMDBfaW5pdF9jc3Jvd3Moc3RydWN0IG1lbV8KIAkJCWRpbW0t Pm10eXBlID0gTUVNX0ZCX0REUjI7CiAKIAkJCS8qIGFzayB3aGF0IGRldmljZSB0eXBlIG9uIHRo aXMgcm93ICovCi0JCQlpZiAoTVRSX0RSQU1fV0lEVEgobXRyKSkKKwkJCWlmIChNVFJfRFJBTV9X SURUSChtdHIpID09IDgpCiAJCQkJZGltbS0+ZHR5cGUgPSBERVZfWDg7CiAJCQllbHNlCiAJCQkJ ZGltbS0+ZHR5cGUgPSBERVZfWDQ7Ci0tLSBhL2RyaXZlcnMvZWRhYy9pNTQwMF9lZGFjLmMKKysr IGIvZHJpdmVycy9lZGFjL2k1NDAwX2VkYWMuYwpAQCAtMTIwNywxMyArMTIwNywxNCBAQCBzdGF0 aWMgaW50IGk1NDAwX2luaXRfZGltbXMoc3RydWN0IG1lbV9jCiAKIAkJCWRpbW0tPm5yX3BhZ2Vz ID0gc2l6ZV9tYiA8PCA4OwogCQkJZGltbS0+Z3JhaW4gPSA4OwotCQkJZGltbS0+ZHR5cGUgPSBN VFJfRFJBTV9XSURUSChtdHIpID8gREVWX1g4IDogREVWX1g0OworCQkJZGltbS0+ZHR5cGUgPSBN VFJfRFJBTV9XSURUSChtdHIpID09IDggPworCQkJCSAgICAgIERFVl9YOCA6IERFVl9YNDsKIAkJ CWRpbW0tPm10eXBlID0gTUVNX0ZCX0REUjI7CiAJCQkvKgogCQkJICogVGhlIGVjY2MgbWVjaGFu aXNtIGlzIFNEREMgKGFrYSBTRUNDKSwgd2l0aAogCQkJICogaXMgc2ltaWxhciB0byBDaGlwa2ls bC4KIAkJCSAqLwotCQkJZGltbS0+ZWRhY19tb2RlID0gTVRSX0RSQU1fV0lEVEgobXRyKSA/CisJ CQlkaW1tLT5lZGFjX21vZGUgPSBNVFJfRFJBTV9XSURUSChtdHIpID09IDggPwogCQkJCQkgIEVE QUNfUzhFQ0Q4RUQgOiBFREFDX1M0RUNENEVEOwogCQkJbmRpbW1zKys7CiAJCX0K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47422 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbdLNUch (ORCPT ); Thu, 14 Dec 2017 15:32:37 -0500 Subject: Patch "EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro" has been added to the 3.18-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: Thu, 14 Dec 2017 21:32:19 +0100 Message-ID: <151328353917129@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 3.18-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-3.18 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 Dec 14 21:30:47 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-3.18/edac-i5000-i5400-fix-definition-of-nrecmemb-register.patch queue-3.18/edac-i5000-i5400-fix-use-of-mtr_dram_width-macro.patch