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: [PATCHv2,5/5] EDAC, altera: Remove Stratix10 Machine compatible check From: thor.thayer@linux.intel.com Message-Id: <1551288445-22335-6-git-send-email-thor.thayer@linux.intel.com> Date: Wed, 27 Feb 2019 11:27:25 -0600 To: bp@alien8.de, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, mchehab@kernel.org Cc: thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KClJlcGxhY2Ug dGhlIFN0cmF0aXgxMCBNYWNoaW5lIGNvbXBhdGlibGUgY2hlY2sgd2l0aApzcGVjaWZpYyBFQ0Mg YmxvY2sgY29tcGF0aWJsZSB0ZXN0cy4KClNpZ25lZC1vZmYtYnk6IFRob3IgVGhheWVyIDx0aG9y LnRoYXllckBsaW51eC5pbnRlbC5jb20+Ci0tLQp2MiBOZXcgcGF0Y2gKLS0tCiBkcml2ZXJzL2Vk YWMvYWx0ZXJhX2VkYWMuYyB8IDE4ICsrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDUgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9l ZGFjL2FsdGVyYV9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYwppbmRleCBhOTIy NTlkOGFmZGMuLjNmZjIyMmEwYzg1MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2FsdGVyYV9l ZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2FsdGVyYV9lZGFjLmMKQEAgLTEwMTMsMTEgKzEwMTMs NiBAQCBzdGF0aWMgaW50IHNvY2ZwZ2FfaXNfYTEwKHZvaWQpCiAJcmV0dXJuIG9mX21hY2hpbmVf aXNfY29tcGF0aWJsZSgiYWx0cixzb2NmcGdhLWFycmlhMTAiKTsKIH0KIAotc3RhdGljIGludCBz b2NmcGdhX2lzX3MxMCh2b2lkKQotewotCXJldHVybiBvZl9tYWNoaW5lX2lzX2NvbXBhdGlibGUo ImFsdHIsc29jZnBnYS1zdHJhdGl4MTAiKTsKLX0KLQogc3RhdGljIF9faW5pdCBpbnQgX19tYXli ZV91bnVzZWQKIGFsdHJfaW5pdF9hMTBfZWNjX2Jsb2NrKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAs IHUzMiBpcnFfbWFzaywKIAkJCXUzMiBlY2NfY3RybF9lbl9tYXNrLCBib29sIGR1YWxfcG9ydCkK QEAgLTExMjIsMTMgKzExMTcsMTQgQEAgc3RhdGljIGludCBfX2luaXQgX19tYXliZV91bnVzZWQg YWx0cl9pbml0X2ExMF9lY2NfZGV2aWNlX3R5cGUoY2hhciAqY29tcGF0KQogCWludCBpcnE7CiAJ c3RydWN0IGRldmljZV9ub2RlICpjaGlsZCwgKm5wOwogCi0JaWYgKCFzb2NmcGdhX2lzX2ExMCgp ICYmICFzb2NmcGdhX2lzX3MxMCgpKQotCQlyZXR1cm4gLUVOT0RFVjsKLQogCW5wID0gb2ZfZmlu ZF9jb21wYXRpYmxlX25vZGUoTlVMTCwgTlVMTCwKIAkJCQkgICAgICJhbHRyLHNvY2ZwZ2EtYTEw LWVjYy1tYW5hZ2VyIik7CiAJaWYgKCFucCkgewotCQllZGFjX3ByaW50ayhLRVJOX0VSUiwgRURB Q19ERVZJQ0UsICJFQ0MgTWFuYWdlciBub3QgZm91bmRcbiIpOworCQkvKiBFcnJvciBvbmx5IHZh bGlkIGZvciBBcnJpYTEwIGFuZCBTdHJhdGl4MTAgKi8KKwkJaWYgKCFvZl9maW5kX2NvbXBhdGli bGVfbm9kZShOVUxMLCBOVUxMLAorCQkJCQkgICAgICJhbHRyLHNvY2ZwZ2EtZWNjLW1hbmFnZXIi KSkKKwkJCWVkYWNfcHJpbnRrKEtFUk5fRVJSLCBFREFDX0RFVklDRSwKKwkJCQkgICAgIkVDQyBN YW5hZ2VyIG5vdCBmb3VuZFxuIik7CiAJCXJldHVybiAtRU5PREVWOwogCX0KIApAQCAtMTY0NCwx MiArMTY0MCw4IEBAIHN0YXRpYyBpbnQgX19pbml0IHNvY2ZwZ2FfaW5pdF9zZG1tY19lY2Modm9p ZCkKIAlpbnQgcmMgPSAtRU5PREVWOwogCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2hpbGQ7CiAKLQlp ZiAoIXNvY2ZwZ2FfaXNfYTEwKCkgJiYgIXNvY2ZwZ2FfaXNfczEwKCkpCi0JCXJldHVybiAtRU5P REVWOwotCiAJY2hpbGQgPSBvZl9maW5kX2NvbXBhdGlibGVfbm9kZShOVUxMLCBOVUxMLCAiYWx0 cixzb2NmcGdhLXNkbW1jLWVjYyIpOwogCWlmICghY2hpbGQpIHsKLQkJZWRhY19wcmludGsoS0VS Tl9XQVJOSU5HLCBFREFDX0RFVklDRSwgIlNETU1DIG5vZGUgbm90IGZvdW5kXG4iKTsKIAkJcmV0 dXJuIC1FTk9ERVY7CiAJfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: thor.thayer@linux.intel.com Subject: [PATCHv2 5/5] EDAC, altera: Remove Stratix10 Machine compatible check Date: Wed, 27 Feb 2019 11:27:25 -0600 Message-ID: <1551288445-22335-6-git-send-email-thor.thayer@linux.intel.com> References: <1551288445-22335-1-git-send-email-thor.thayer@linux.intel.com> Return-path: In-Reply-To: <1551288445-22335-1-git-send-email-thor.thayer@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: bp@alien8.de, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, mchehab@kernel.org Cc: thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org From: Thor Thayer Replace the Stratix10 Machine compatible check with specific ECC block compatible tests. Signed-off-by: Thor Thayer --- v2 New patch --- drivers/edac/altera_edac.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index a92259d8afdc..3ff222a0c852 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -1013,11 +1013,6 @@ static int socfpga_is_a10(void) return of_machine_is_compatible("altr,socfpga-arria10"); } -static int socfpga_is_s10(void) -{ - return of_machine_is_compatible("altr,socfpga-stratix10"); -} - static __init int __maybe_unused altr_init_a10_ecc_block(struct device_node *np, u32 irq_mask, u32 ecc_ctrl_en_mask, bool dual_port) @@ -1122,13 +1117,14 @@ static int __init __maybe_unused altr_init_a10_ecc_device_type(char *compat) int irq; struct device_node *child, *np; - if (!socfpga_is_a10() && !socfpga_is_s10()) - 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"); + /* Error only valid for Arria10 and Stratix10 */ + if (!of_find_compatible_node(NULL, NULL, + "altr,socfpga-ecc-manager")) + edac_printk(KERN_ERR, EDAC_DEVICE, + "ECC Manager not found\n"); return -ENODEV; } @@ -1644,12 +1640,8 @@ static int __init socfpga_init_sdmmc_ecc(void) int rc = -ENODEV; struct device_node *child; - if (!socfpga_is_a10() && !socfpga_is_s10()) - 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; } -- 2.7.4