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, altera: Fix peripheral warnings for Cyclone5" has been added to the 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <1521388844194182@kroah.com> Date: Sun, 18 Mar 2018 17:00:44 +0100 To: thor.thayer@linux.intel.com, alexander.levin@microsoft.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 YXRjaCB0aXRsZWQKCiAgICBFREFDLCBhbHRlcmE6IEZpeCBwZXJpcGhlcmFsIHdhcm5pbmdzIGZv ciBDeWNsb25lNQoKdG8gdGhlIDQuOS1zdGFibGUgdHJlZSB3aGljaCBjYW4gYmUgZm91bmQgYXQ6 CiAgICBodHRwOi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxpbnV4L2tlcm5lbC9naXQvc3RhYmxl L3N0YWJsZS1xdWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmlsZW5hbWUgb2YgdGhlIHBhdGNoIGlz OgogICAgIGVkYWMtYWx0ZXJhLWZpeC1wZXJpcGhlcmFsLXdhcm5pbmdzLWZvci1jeWNsb25lNS5w YXRjaAphbmQgaXQgY2FuIGJlIGZvdW5kIGluIHRoZSBxdWV1ZS00Ljkgc3ViZGlyZWN0b3J5LgoK SWYgeW91LCBvciBhbnlvbmUgZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBhZGRlZCB0byB0 aGUgc3RhYmxlIHRyZWUsCnBsZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+IGtub3cg YWJvdXQgaXQuCgoKRnJvbSBmb29AYmF6IFN1biBNYXIgMTggMTY6NTU6MzMgQ0VUIDIwMTgKRnJv bTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KRGF0ZTogV2VkLCA1 IEFwciAyMDE3IDEzOjAxOjAyIC0wNTAwClN1YmplY3Q6IEVEQUMsIGFsdGVyYTogRml4IHBlcmlw aGVyYWwgd2FybmluZ3MgZm9yIEN5Y2xvbmU1CgpGcm9tOiBUaG9yIFRoYXllciA8dGhvci50aGF5 ZXJAbGludXguaW50ZWwuY29tPgoKClsgVXBzdHJlYW0gY29tbWl0IDI1YjIyM2RkZmUyYTU1NzMw N2MwNWZlNjczZTA5ZDk0YWU5NTA4NzcgXQoKVGhlIHBlcmlwaGVyYWxzJyBSQVMgZnVuY3Rpb25h bGl0eSBvbmx5IGV4aXN0IG9uIHRoZSBBcnJpYTEwIFNvQ0ZQR0EuClRoZSBDeWNsb25lNSBpbml0 aWFsaXphdGlvbiBnZW5lcmF0ZXMgRURBQyB3YXJuaW5ncyB3aGVuIHRoZSBwZXJpcGhlcmFscwph cmVuJ3QgZm91bmQgaW4gdGhlIGRldmljZSB0cmVlLiBGaXggYnkgY2hlY2tpbmcgZm9yIEFycmlh MTAgaW4gdGhlIGluaXQKZnVuY3Rpb25zLgoKU2lnbmVkLW9mZi1ieTogVGhvciBUaGF5ZXIgPHRo b3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdl ci5rZXJuZWwub3JnPgpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMTQ5MTQxNTI2Mi01 MDE4LTEtZ2l0LXNlbmQtZW1haWwtdGhvci50aGF5ZXJAbGludXguaW50ZWwuY29tClNpZ25lZC1v ZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogU2FzaGEg TGV2aW4gPGFsZXhhbmRlci5sZXZpbkBtaWNyb3NvZnQuY29tPgpTaWduZWQtb2ZmLWJ5OiBHcmVn IEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRyaXZlcnMv ZWRhYy9hbHRlcmFfZWRhYy5jIHwgICAyMiArKysrKysrKysrKysrKysrKystLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCgoKUGF0Y2hlcyBjdXJy ZW50bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20gdGhvci50aGF5ZXJAbGlu dXguaW50ZWwuY29tIGFyZQoKcXVldWUtNC45L2VkYWMtYWx0ZXJhLWZpeC1wZXJpcGhlcmFsLXdh cm5pbmdzLWZvci1jeWNsb25lNS5wYXRjaAotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlz dDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhlIGJvZHkgb2Yg YSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8gaW5m byBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgotLS0gYS9k cml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMu YwpAQCAtMTAyMCwxMyArMTAyMCwyMyBAQCBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGlj IGludCBzb2NmcGdhX2lzX2ExMCh2b2lkKQoreworCXJldHVybiBvZl9tYWNoaW5lX2lzX2NvbXBh dGlibGUoImFsdHIsc29jZnBnYS1hcnJpYTEwIik7Cit9CisKIHN0YXRpYyBpbnQgdmFsaWRhdGVf cGFyZW50X2F2YWlsYWJsZShzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wKTsKIHN0YXRpYyBjb25zdCBz dHJ1Y3Qgb2ZfZGV2aWNlX2lkIGFsdHJfZWRhY19hMTBfZGV2aWNlX29mX21hdGNoW107CiBzdGF0 aWMgaW50IF9faW5pdCBfX21heWJlX3VudXNlZCBhbHRyX2luaXRfYTEwX2VjY19kZXZpY2VfdHlw ZShjaGFyICpjb21wYXQpCiB7CiAJaW50IGlycTsKLQlzdHJ1Y3QgZGV2aWNlX25vZGUgKmNoaWxk LCAqbnAgPSBvZl9maW5kX2NvbXBhdGlibGVfbm9kZShOVUxMLCBOVUxMLAotCQkJCQkiYWx0cixz b2NmcGdhLWExMC1lY2MtbWFuYWdlciIpOworCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2hpbGQsICpu cDsKKworCWlmICghc29jZnBnYV9pc19hMTAoKSkKKwkJcmV0dXJuIC1FTk9ERVY7CisKKwlucCA9 IG9mX2ZpbmRfY29tcGF0aWJsZV9ub2RlKE5VTEwsIE5VTEwsCisJCQkJICAgICAiYWx0cixzb2Nm cGdhLWExMC1lY2MtbWFuYWdlciIpOwogCWlmICghbnApIHsKIAkJZWRhY19wcmludGsoS0VSTl9F UlIsIEVEQUNfREVWSUNFLCAiRUNDIE1hbmFnZXIgbm90IGZvdW5kXG4iKTsKIAkJcmV0dXJuIC1F Tk9ERVY7CkBAIC0xNTQyLDggKzE1NTIsMTIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlZGFjX2Rl dmljZV9wcnZfZGF0YQogc3RhdGljIGludCBfX2luaXQgc29jZnBnYV9pbml0X3NkbW1jX2VjYyh2 b2lkKQogewogCWludCByYyA9IC1FTk9ERVY7Ci0Jc3RydWN0IGRldmljZV9ub2RlICpjaGlsZCA9 IG9mX2ZpbmRfY29tcGF0aWJsZV9ub2RlKE5VTEwsIE5VTEwsCi0JCQkJCQkiYWx0cixzb2NmcGdh LXNkbW1jLWVjYyIpOworCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2hpbGQ7CisKKwlpZiAoIXNvY2Zw Z2FfaXNfYTEwKCkpCisJCXJldHVybiAtRU5PREVWOworCisJY2hpbGQgPSBvZl9maW5kX2NvbXBh dGlibGVfbm9kZShOVUxMLCBOVUxMLCAiYWx0cixzb2NmcGdhLXNkbW1jLWVjYyIpOwogCWlmICgh Y2hpbGQpIHsKIAkJZWRhY19wcmludGsoS0VSTl9XQVJOSU5HLCBFREFDX0RFVklDRSwgIlNETU1D IG5vZGUgbm90IGZvdW5kXG4iKTsKIAkJcmV0dXJuIC1FTk9ERVY7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41886 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754520AbeCRQBi (ORCPT ); Sun, 18 Mar 2018 12:01:38 -0400 Subject: Patch "EDAC, altera: Fix peripheral warnings for Cyclone5" has been added to the 4.9-stable tree To: thor.thayer@linux.intel.com, alexander.levin@microsoft.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: , From: Date: Sun, 18 Mar 2018 17:00:44 +0100 Message-ID: <1521388844194182@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, altera: Fix peripheral warnings for Cyclone5 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-altera-fix-peripheral-warnings-for-cyclone5.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 Sun Mar 18 16:55:33 CET 2018 From: Thor Thayer Date: Wed, 5 Apr 2017 13:01:02 -0500 Subject: EDAC, altera: Fix peripheral warnings for Cyclone5 From: Thor Thayer [ Upstream commit 25b223ddfe2a557307c05fe673e09d94ae950877 ] The peripherals' RAS functionality only exist on the Arria10 SoCFPGA. The Cyclone5 initialization generates EDAC warnings when the peripherals aren't found in the device tree. Fix by checking for Arria10 in the init functions. Signed-off-by: Thor Thayer Cc: linux-edac Link: http://lkml.kernel.org/r/1491415262-5018-1-git-send-email-thor.thayer@linux.intel.com Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/altera_edac.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -1020,13 +1020,23 @@ out: return ret; } +static int socfpga_is_a10(void) +{ + return of_machine_is_compatible("altr,socfpga-arria10"); +} + static int validate_parent_available(struct device_node *np); static const struct of_device_id altr_edac_a10_device_of_match[]; static int __init __maybe_unused altr_init_a10_ecc_device_type(char *compat) { int irq; - struct device_node *child, *np = of_find_compatible_node(NULL, NULL, - "altr,socfpga-a10-ecc-manager"); + struct device_node *child, *np; + + if (!socfpga_is_a10()) + return -ENODEV; + + np = of_find_compatible_node(NULL, NULL, + "altr,socfpga-a10-ecc-manager"); if (!np) { edac_printk(KERN_ERR, EDAC_DEVICE, "ECC Manager not found\n"); return -ENODEV; @@ -1542,8 +1552,12 @@ static const struct edac_device_prv_data static int __init socfpga_init_sdmmc_ecc(void) { int rc = -ENODEV; - struct device_node *child = of_find_compatible_node(NULL, NULL, - "altr,socfpga-sdmmc-ecc"); + struct device_node *child; + + if (!socfpga_is_a10()) + return -ENODEV; + + child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc"); if (!child) { edac_printk(KERN_WARNING, EDAC_DEVICE, "SDMMC node not found\n"); return -ENODEV; Patches currently in stable-queue which might be from thor.thayer@linux.intel.com are queue-4.9/edac-altera-fix-peripheral-warnings-for-cyclone5.patch