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 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <151308200312476@kroah.com> Date: Tue, 12 Dec 2017 13:33:23 +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 RUNNRU1CIHJlZ2lzdGVyCgp0byB0aGUgNC45LXN0YWJsZSB0cmVlIHdoaWNoIGNhbiBiZSBmb3Vu ZCBhdDoKICAgIGh0dHA6Ly93d3cua2VybmVsLm9yZy9naXQvP3A9bGludXgva2VybmVsL2dpdC9z dGFibGUvc3RhYmxlLXF1ZXVlLmdpdDthPXN1bW1hcnkKClRoZSBmaWxlbmFtZSBvZiB0aGUgcGF0 Y2ggaXM6CiAgICAgZWRhYy1pNTAwMC1pNTQwMC1maXgtZGVmaW5pdGlvbi1vZi1ucmVjbWVtYi1y ZWdpc3Rlci5wYXRjaAphbmQgaXQgY2FuIGJlIGZvdW5kIGluIHRoZSBxdWV1ZS00Ljkgc3ViZGly ZWN0b3J5LgoKSWYgeW91LCBvciBhbnlvbmUgZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBh ZGRlZCB0byB0aGUgc3RhYmxlIHRyZWUsCnBsZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5v cmc+IGtub3cgYWJvdXQgaXQuCgoKRnJvbSBmb29AYmF6IFR1ZSBEZWMgMTIgMTM6MjY6MTcgQ0VU IDIwMTcKRnJvbTogSsOpcsOpbXkgTGVmYXVyZSA8amVyZW15LmxlZmF1cmVAbHNlLmVwaXRhLmZy PgpEYXRlOiBXZWQsIDI4IEp1biAyMDE3IDIwOjU3OjI5IC0wNDAwClN1YmplY3Q6IEVEQUMsIGk1 MDAwLCBpNTQwMDogRml4IGRlZmluaXRpb24gb2YgTlJFQ01FTUIgcmVnaXN0ZXIKCkZyb206IErD qXLDqW15IExlZmF1cmUgPGplcmVteS5sZWZhdXJlQGxzZS5lcGl0YS5mcj4KCgpbIFVwc3RyZWFt IGNvbW1pdCBhOGM4MjYxNDI1NjQ5ZGE1OGJkZjA4MjIxNTcwZTUzMzVhZDMzYTMxIF0KCkluIHRo ZSBpNTAwMCBhbmQgaTU0MDAgZHJpdmVycywgdGhlIE5SRUNNRU1CIHJlZ2lzdGVyIGlzIGRlZmlu ZWQgYXMgYQoxNi1iaXQgdmFsdWUsIHdoaWNoIHJlc3VsdHMgaW4gd3Jvbmcgc2hpZnRzIGluIHRo ZSBjb2RlLCBhcyByZXBvcnRlZCBieQpzcGFyc2UuCgpJbiB0aGUgZGF0YXNoZWV0cyAoWzFdLCBz ZWN0aW9uIDMuOS4yMi4yMCBhbmQgWzJdLCBzZWN0aW9uIDMuOS4yMi4yMSksCnRoaXMgcmVnaXN0 ZXIgaXMgYSAzMi1iaXQgcmVnaXN0ZXIuIEEgdTMyIHZhbHVlIGZvciB0aGUgcmVnaXN0ZXIgZml4 ZXMKdGhlIHdyb25nIHNoaWZ0cyB3YXJuaW5ncyBhbmQgbWF0Y2hlcyB0aGUgZGF0YXNoZWV0LgoK QWxzbyBmaXggdGhlIG1hc2sgdG8gYWNjZXNzIHRvIHRoZSBDQVMgYml0cyBbMjc6MTZdIGluIHRo ZSBpNTAwMCBkcml2ZXIuCgpbMV06IGh0dHBzOi8vd3d3LmludGVsLmNvbS9jb250ZW50L2RhbS9k b2MvZGF0YXNoZWV0LzUwMDBwLTUwMDB2LTUwMDB6LWNoaXBzZXQtbWVtb3J5LWNvbnRyb2xsZXIt aHViLWRhdGFzaGVldC5wZGYKWzJdOiBodHRwczovL3d3dy5pbnRlbC5zZS9jb250ZW50L2RhbS9k b2MvZGF0YXNoZWV0LzU0MDAtY2hpcHNldC1tZW1vcnktY29udHJvbGxlci1odWItZGF0YXNoZWV0 LnBkZgoKU2lnbmVkLW9mZi1ieTogSsODwqlyw4PCqW15IExlZmF1cmUgPGplcmVteS5sZWZhdXJl QGxzZS5lcGl0YS5mcj4KQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdlci5rZXJuZWwub3Jn PgpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxNzA2MjkwMDU3MjkuODQ3OC0xLWpl cmVteS5sZWZhdXJlQGxzZS5lcGl0YS5mcgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3Yg PGJwQHN1c2UuZGU+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxhbGV4YW5kZXIubGV2aW5A dmVyaXpvbi5jb20+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxp bnV4Zm91bmRhdGlvbi5vcmc+Ci0tLQogZHJpdmVycy9lZGFjL2k1MDAwX2VkYWMuYyB8ICAgIDYg KysrLS0tCiBkcml2ZXJzL2VkYWMvaTU0MDBfZWRhYy5jIHwgICAgNCArKy0tCiAyIGZpbGVzIGNo YW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCgoKUGF0Y2hlcyBjdXJyZW50 bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20gamVyZW15LmxlZmF1cmVAbHNl LmVwaXRhLmZyIGFyZQoKcXVldWUtNC45L2VkYWMtaTUwMDAtaTU0MDAtZml4LWRlZmluaXRpb24t b2YtbnJlY21lbWItcmVnaXN0ZXIucGF0Y2gKcXVldWUtNC45L2VkYWMtaTUwMDAtaTU0MDAtZml4 LXVzZS1vZi1tdHJfZHJhbV93aWR0aC1tYWNyby5wYXRjaAotLQpUbyB1bnN1YnNjcmliZSBmcm9t IHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhl IGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpv cmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1s CgotLS0gYS9kcml2ZXJzL2VkYWMvaTUwMDBfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pNTAw MF9lZGFjLmMKQEAgLTIyNyw3ICsyMjcsNyBAQAogI2RlZmluZQkJCU5SRUNfUkRXUih4KQkJKCgo eCk+PjExKSAmIDEpCiAjZGVmaW5lCQkJTlJFQ19SQU5LKHgpCQkoKCh4KT4+OCkgJiAweDcpCiAj ZGVmaW5lCQlOUkVDTUVNQgkJMHhDMAotI2RlZmluZQkJCU5SRUNfQ0FTKHgpCQkoKCh4KT4+MTYp ICYgMHhGRkZGRkYpCisjZGVmaW5lCQkJTlJFQ19DQVMoeCkJCSgoKHgpPj4xNikgJiAweEZGRikK ICNkZWZpbmUJCQlOUkVDX1JBUyh4KQkJKCh4KSAmIDB4N0ZGRikKICNkZWZpbmUJCU5SRUNGR0xP RwkJMHhDNAogI2RlZmluZQkJTlJFRUVDRkJEQQkJMHhDOApAQCAtMzcxLDcgKzM3MSw3IEBAIHN0 cnVjdCBpNTAwMF9lcnJvcl9pbmZvIHsKIAkvKiBUaGVzZSByZWdpc3RlcnMgYXJlIGlucHV0IE9O TFkgaWYgdGhlcmUgd2FzIGEKIAkgKiBOb24tUmVjb3ZlcmFibGUgRXJyb3IgKi8KIAl1MTYgbnJl Y21lbWE7CQkvKiBOb24tUmVjb3ZlcmFibGUgTWVtIGxvZyBBICovCi0JdTE2IG5yZWNtZW1iOwkJ LyogTm9uLVJlY292ZXJhYmxlIE1lbSBsb2cgQiAqLworCXUzMiBucmVjbWVtYjsJCS8qIE5vbi1S ZWNvdmVyYWJsZSBNZW0gbG9nIEIgKi8KIAogfTsKIApAQCAtNDA3LDcgKzQwNyw3IEBAIHN0YXRp YyB2b2lkIGk1MDAwX2dldF9lcnJvcl9pbmZvKHN0cnVjdAogCQkJCU5FUlJfRkFUX0ZCRCwgJmlu Zm8tPm5lcnJfZmF0X2ZiZCk7CiAJCXBjaV9yZWFkX2NvbmZpZ193b3JkKHB2dC0+YnJhbmNobWFw X3dlcnJvcnMsCiAJCQkJTlJFQ01FTUEsICZpbmZvLT5ucmVjbWVtYSk7Ci0JCXBjaV9yZWFkX2Nv bmZpZ193b3JkKHB2dC0+YnJhbmNobWFwX3dlcnJvcnMsCisJCXBjaV9yZWFkX2NvbmZpZ19kd29y ZChwdnQtPmJyYW5jaG1hcF93ZXJyb3JzLAogCQkJCU5SRUNNRU1CLCAmaW5mby0+bnJlY21lbWIp OwogCiAJCS8qIENsZWFyIHRoZSBlcnJvciBiaXRzLCBieSB3cml0aW5nIHRoZW0gYmFjayAqLwot LS0gYS9kcml2ZXJzL2VkYWMvaTU0MDBfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pNTQwMF9l ZGFjLmMKQEAgLTM2OCw3ICszNjgsNyBAQCBzdHJ1Y3QgaTU0MDBfZXJyb3JfaW5mbyB7CiAKIAkv KiBUaGVzZSByZWdpc3RlcnMgYXJlIGlucHV0IE9OTFkgaWYgdGhlcmUgd2FzIGEgTm9uLVJlYyBF cnJvciAqLwogCXUxNiBucmVjbWVtYTsJCS8qIE5vbi1SZWNvdmVyYWJsZSBNZW0gbG9nIEEgKi8K LQl1MTYgbnJlY21lbWI7CQkvKiBOb24tUmVjb3ZlcmFibGUgTWVtIGxvZyBCICovCisJdTMyIG5y ZWNtZW1iOwkJLyogTm9uLVJlY292ZXJhYmxlIE1lbSBsb2cgQiAqLwogCiB9OwogCkBAIC00NTgs NyArNDU4LDcgQEAgc3RhdGljIHZvaWQgaTU0MDBfZ2V0X2Vycm9yX2luZm8oc3RydWN0CiAJCQkJ TkVSUl9GQVRfRkJELCAmaW5mby0+bmVycl9mYXRfZmJkKTsKIAkJcGNpX3JlYWRfY29uZmlnX3dv cmQocHZ0LT5icmFuY2htYXBfd2Vycm9ycywKIAkJCQlOUkVDTUVNQSwgJmluZm8tPm5yZWNtZW1h KTsKLQkJcGNpX3JlYWRfY29uZmlnX3dvcmQocHZ0LT5icmFuY2htYXBfd2Vycm9ycywKKwkJcGNp X3JlYWRfY29uZmlnX2R3b3JkKHB2dC0+YnJhbmNobWFwX3dlcnJvcnMsCiAJCQkJTlJFQ01FTUIs ICZpbmZvLT5ucmVjbWVtYik7CiAKIAkJLyogQ2xlYXIgdGhlIGVycm9yIGJpdHMsIGJ5IHdyaXRp bmcgdGhlbSBiYWNrICovCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57012 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688AbdLLMeM (ORCPT ); Tue, 12 Dec 2017 07:34:12 -0500 Subject: Patch "EDAC, i5000, i5400: Fix definition of NRECMEMB register" 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:23 +0100 Message-ID: <151308200312476@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 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-definition-of-nrecmemb-register.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, 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-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