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 definition of NRECMEMB register" has been added to the 3.18-stable tree From: Greg Kroah-Hartman Message-Id: <1513283539169164@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 YXRjaCB0aXRsZWQKCiAgICBFREFDLCBpNTAwMCwgaTU0MDA6IEZpeCBkZWZpbml0aW9uIG9mIE5S RUNNRU1CIHJlZ2lzdGVyCgp0byB0aGUgMy4xOC1zdGFibGUgdHJlZSB3aGljaCBjYW4gYmUgZm91 bmQgYXQ6CiAgICBodHRwOi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxpbnV4L2tlcm5lbC9naXQv c3RhYmxlL3N0YWJsZS1xdWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmlsZW5hbWUgb2YgdGhlIHBh dGNoIGlzOgogICAgIGVkYWMtaTUwMDAtaTU0MDAtZml4LWRlZmluaXRpb24tb2YtbnJlY21lbWIt cmVnaXN0ZXIucGF0Y2gKYW5kIGl0IGNhbiBiZSBmb3VuZCBpbiB0aGUgcXVldWUtMy4xOCBzdWJk aXJlY3RvcnkuCgpJZiB5b3UsIG9yIGFueW9uZSBlbHNlLCBmZWVscyBpdCBzaG91bGQgbm90IGJl IGFkZGVkIHRvIHRoZSBzdGFibGUgdHJlZSwKcGxlYXNlIGxldCA8c3RhYmxlQHZnZXIua2VybmVs Lm9yZz4ga25vdyBhYm91dCBpdC4KCgpGcm9tIGZvb0BiYXogVGh1IERlYyAxNCAyMTozMDo0NyBD RVQgMjAxNwpGcm9tOiBKw6lyw6lteSBMZWZhdXJlIDxqZXJlbXkubGVmYXVyZUBsc2UuZXBpdGEu ZnI+CkRhdGU6IFdlZCwgMjggSnVuIDIwMTcgMjA6NTc6MjkgLTA0MDAKU3ViamVjdDogRURBQywg aTUwMDAsIGk1NDAwOiBGaXggZGVmaW5pdGlvbiBvZiBOUkVDTUVNQiByZWdpc3RlcgoKRnJvbTog SsOpcsOpbXkgTGVmYXVyZSA8amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZyPgoKClsgVXBzdHJl YW0gY29tbWl0IGE4YzgyNjE0MjU2NDlkYTU4YmRmMDgyMjE1NzBlNTMzNWFkMzNhMzEgXQoKSW4g dGhlIGk1MDAwIGFuZCBpNTQwMCBkcml2ZXJzLCB0aGUgTlJFQ01FTUIgcmVnaXN0ZXIgaXMgZGVm aW5lZCBhcyBhCjE2LWJpdCB2YWx1ZSwgd2hpY2ggcmVzdWx0cyBpbiB3cm9uZyBzaGlmdHMgaW4g dGhlIGNvZGUsIGFzIHJlcG9ydGVkIGJ5CnNwYXJzZS4KCkluIHRoZSBkYXRhc2hlZXRzIChbMV0s IHNlY3Rpb24gMy45LjIyLjIwIGFuZCBbMl0sIHNlY3Rpb24gMy45LjIyLjIxKSwKdGhpcyByZWdp c3RlciBpcyBhIDMyLWJpdCByZWdpc3Rlci4gQSB1MzIgdmFsdWUgZm9yIHRoZSByZWdpc3RlciBm aXhlcwp0aGUgd3Jvbmcgc2hpZnRzIHdhcm5pbmdzIGFuZCBtYXRjaGVzIHRoZSBkYXRhc2hlZXQu CgpBbHNvIGZpeCB0aGUgbWFzayB0byBhY2Nlc3MgdG8gdGhlIENBUyBiaXRzIFsyNzoxNl0gaW4g dGhlIGk1MDAwIGRyaXZlci4KClsxXTogaHR0cHM6Ly93d3cuaW50ZWwuY29tL2NvbnRlbnQvZGFt L2RvYy9kYXRhc2hlZXQvNTAwMHAtNTAwMHYtNTAwMHotY2hpcHNldC1tZW1vcnktY29udHJvbGxl ci1odWItZGF0YXNoZWV0LnBkZgpbMl06IGh0dHBzOi8vd3d3LmludGVsLnNlL2NvbnRlbnQvZGFt L2RvYy9kYXRhc2hlZXQvNTQwMC1jaGlwc2V0LW1lbW9yeS1jb250cm9sbGVyLWh1Yi1kYXRhc2hl ZXQucGRmCgpTaWduZWQtb2ZmLWJ5OiBKw4PCqXLDg8KpbXkgTGVmYXVyZSA8amVyZW15LmxlZmF1 cmVAbHNlLmVwaXRhLmZyPgpDYzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5v cmc+Ckxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE3MDYyOTAwNTcyOS44NDc4LTEt amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZyClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtv diA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZp bkB2ZXJpem9uLmNvbT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hA bGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL2VkYWMvaTUwMDBfZWRhYy5jIHwgICAg NiArKystLS0KIGRyaXZlcnMvZWRhYy9pNTQwMF9lZGFjLmMgfCAgICA0ICsrLS0KIDIgZmlsZXMg Y2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKCgpQYXRjaGVzIGN1cnJl bnRseSBpbiBzdGFibGUtcXVldWUgd2hpY2ggbWlnaHQgYmUgZnJvbSBqZXJlbXkubGVmYXVyZUBs c2UuZXBpdGEuZnIgYXJlCgpxdWV1ZS0zLjE4L2VkYWMtaTUwMDAtaTU0MDAtZml4LWRlZmluaXRp b24tb2YtbnJlY21lbWItcmVnaXN0ZXIucGF0Y2gKcXVldWUtMy4xOC9lZGFjLWk1MDAwLWk1NDAw LWZpeC11c2Utb2YtbXRyX2RyYW1fd2lkdGgtbWFjcm8ucGF0Y2gKLS0KVG8gdW5zdWJzY3JpYmUg ZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWVkYWMiIGlu CnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUg bWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8u aHRtbAoKLS0tIGEvZHJpdmVycy9lZGFjL2k1MDAwX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMv aTUwMDBfZWRhYy5jCkBAIC0yMjcsNyArMjI3LDcgQEAKICNkZWZpbmUJCQlOUkVDX1JEV1IoeCkJ CSgoKHgpPj4xMSkgJiAxKQogI2RlZmluZQkJCU5SRUNfUkFOSyh4KQkJKCgoeCk+PjgpICYgMHg3 KQogI2RlZmluZQkJTlJFQ01FTUIJCTB4QzAKLSNkZWZpbmUJCQlOUkVDX0NBUyh4KQkJKCgoeCk+ PjE2KSAmIDB4RkZGRkZGKQorI2RlZmluZQkJCU5SRUNfQ0FTKHgpCQkoKCh4KT4+MTYpICYgMHhG RkYpCiAjZGVmaW5lCQkJTlJFQ19SQVMoeCkJCSgoeCkgJiAweDdGRkYpCiAjZGVmaW5lCQlOUkVD RkdMT0cJCTB4QzQKICNkZWZpbmUJCU5SRUVFQ0ZCREEJCTB4QzgKQEAgLTM3MSw3ICszNzEsNyBA QCBzdHJ1Y3QgaTUwMDBfZXJyb3JfaW5mbyB7CiAJLyogVGhlc2UgcmVnaXN0ZXJzIGFyZSBpbnB1 dCBPTkxZIGlmIHRoZXJlIHdhcyBhCiAJICogTm9uLVJlY292ZXJhYmxlIEVycm9yICovCiAJdTE2 IG5yZWNtZW1hOwkJLyogTm9uLVJlY292ZXJhYmxlIE1lbSBsb2cgQSAqLwotCXUxNiBucmVjbWVt YjsJCS8qIE5vbi1SZWNvdmVyYWJsZSBNZW0gbG9nIEIgKi8KKwl1MzIgbnJlY21lbWI7CQkvKiBO b24tUmVjb3ZlcmFibGUgTWVtIGxvZyBCICovCiAKIH07CiAKQEAgLTQwNyw3ICs0MDcsNyBAQCBz dGF0aWMgdm9pZCBpNTAwMF9nZXRfZXJyb3JfaW5mbyhzdHJ1Y3QKIAkJCQlORVJSX0ZBVF9GQkQs ICZpbmZvLT5uZXJyX2ZhdF9mYmQpOwogCQlwY2lfcmVhZF9jb25maWdfd29yZChwdnQtPmJyYW5j aG1hcF93ZXJyb3JzLAogCQkJCU5SRUNNRU1BLCAmaW5mby0+bnJlY21lbWEpOwotCQlwY2lfcmVh ZF9jb25maWdfd29yZChwdnQtPmJyYW5jaG1hcF93ZXJyb3JzLAorCQlwY2lfcmVhZF9jb25maWdf ZHdvcmQocHZ0LT5icmFuY2htYXBfd2Vycm9ycywKIAkJCQlOUkVDTUVNQiwgJmluZm8tPm5yZWNt ZW1iKTsKIAogCQkvKiBDbGVhciB0aGUgZXJyb3IgYml0cywgYnkgd3JpdGluZyB0aGVtIGJhY2sg Ki8KLS0tIGEvZHJpdmVycy9lZGFjL2k1NDAwX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvaTU0 MDBfZWRhYy5jCkBAIC0zNjgsNyArMzY4LDcgQEAgc3RydWN0IGk1NDAwX2Vycm9yX2luZm8gewog CiAJLyogVGhlc2UgcmVnaXN0ZXJzIGFyZSBpbnB1dCBPTkxZIGlmIHRoZXJlIHdhcyBhIE5vbi1S ZWMgRXJyb3IgKi8KIAl1MTYgbnJlY21lbWE7CQkvKiBOb24tUmVjb3ZlcmFibGUgTWVtIGxvZyBB ICovCi0JdTE2IG5yZWNtZW1iOwkJLyogTm9uLVJlY292ZXJhYmxlIE1lbSBsb2cgQiAqLworCXUz MiBucmVjbWVtYjsJCS8qIE5vbi1SZWNvdmVyYWJsZSBNZW0gbG9nIEIgKi8KIAogfTsKIApAQCAt NDU4LDcgKzQ1OCw3IEBAIHN0YXRpYyB2b2lkIGk1NDAwX2dldF9lcnJvcl9pbmZvKHN0cnVjdAog CQkJCU5FUlJfRkFUX0ZCRCwgJmluZm8tPm5lcnJfZmF0X2ZiZCk7CiAJCXBjaV9yZWFkX2NvbmZp Z193b3JkKHB2dC0+YnJhbmNobWFwX3dlcnJvcnMsCiAJCQkJTlJFQ01FTUEsICZpbmZvLT5ucmVj bWVtYSk7Ci0JCXBjaV9yZWFkX2NvbmZpZ193b3JkKHB2dC0+YnJhbmNobWFwX3dlcnJvcnMsCisJ CXBjaV9yZWFkX2NvbmZpZ19kd29yZChwdnQtPmJyYW5jaG1hcF93ZXJyb3JzLAogCQkJCU5SRUNN RU1CLCAmaW5mby0+bnJlY21lbWIpOwogCiAJCS8qIENsZWFyIHRoZSBlcnJvciBiaXRzLCBieSB3 cml0aW5nIHRoZW0gYmFjayAqLwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47476 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753052AbdLNUcm (ORCPT ); Thu, 14 Dec 2017 15:32:42 -0500 Subject: Patch "EDAC, i5000, i5400: Fix definition of NRECMEMB register" 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: <1513283539169164@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 definition of NRECMEMB register 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-definition-of-nrecmemb-register.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, 28 Jun 2017 20:57:29 -0400 Subject: EDAC, i5000, i5400: Fix definition of NRECMEMB register From: J�r�my Lefaure [ Upstream commit a8c8261425649da58bdf08221570e5335ad33a31 ] In the i5000 and i5400 drivers, the NRECMEMB register is defined as a 16-bit value, which results in wrong shifts in the code, as reported by sparse. In the datasheets ([1], section 3.9.22.20 and [2], section 3.9.22.21), this register is a 32-bit register. A u32 value for the register fixes the wrong shifts warnings and matches the datasheet. Also fix the mask to access to the CAS bits [27:16] in the i5000 driver. [1]: https://www.intel.com/content/dam/doc/datasheet/5000p-5000v-5000z-chipset-memory-controller-hub-datasheet.pdf [2]: https://www.intel.se/content/dam/doc/datasheet/5400-chipset-memory-controller-hub-datasheet.pdf Signed-off-by: Jérémy Lefaure Cc: linux-edac Link: http://lkml.kernel.org/r/20170629005729.8478-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 | 6 +++--- drivers/edac/i5400_edac.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -227,7 +227,7 @@ #define NREC_RDWR(x) (((x)>>11) & 1) #define NREC_RANK(x) (((x)>>8) & 0x7) #define NRECMEMB 0xC0 -#define NREC_CAS(x) (((x)>>16) & 0xFFFFFF) +#define NREC_CAS(x) (((x)>>16) & 0xFFF) #define NREC_RAS(x) ((x) & 0x7FFF) #define NRECFGLOG 0xC4 #define NREEECFBDA 0xC8 @@ -371,7 +371,7 @@ struct i5000_error_info { /* These registers are input ONLY if there was a * Non-Recoverable Error */ u16 nrecmema; /* Non-Recoverable Mem log A */ - u16 nrecmemb; /* Non-Recoverable Mem log B */ + u32 nrecmemb; /* Non-Recoverable Mem log B */ }; @@ -407,7 +407,7 @@ static void i5000_get_error_info(struct NERR_FAT_FBD, &info->nerr_fat_fbd); pci_read_config_word(pvt->branchmap_werrors, NRECMEMA, &info->nrecmema); - pci_read_config_word(pvt->branchmap_werrors, + pci_read_config_dword(pvt->branchmap_werrors, NRECMEMB, &info->nrecmemb); /* Clear the error bits, by writing them back */ --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c @@ -368,7 +368,7 @@ struct i5400_error_info { /* These registers are input ONLY if there was a Non-Rec Error */ u16 nrecmema; /* Non-Recoverable Mem log A */ - u16 nrecmemb; /* Non-Recoverable Mem log B */ + u32 nrecmemb; /* Non-Recoverable Mem log B */ }; @@ -458,7 +458,7 @@ static void i5400_get_error_info(struct NERR_FAT_FBD, &info->nerr_fat_fbd); pci_read_config_word(pvt->branchmap_werrors, NRECMEMA, &info->nrecmema); - pci_read_config_word(pvt->branchmap_werrors, + pci_read_config_dword(pvt->branchmap_werrors, NRECMEMB, &info->nrecmemb); /* Clear the error bits, by writing them back */ 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