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,3/5] EDAC, altera: Skip DB IRQ for Stratix10 From: thor.thayer@linux.intel.com Message-Id: <1551288445-22335-4-git-send-email-thor.thayer@linux.intel.com> Date: Wed, 27 Feb 2019 11:27:23 -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: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KClN0cmF0aXgx MCBEb3VibGUgQml0IGVycm9ycyBhcmUgY29uZmlndXJlZCBhcyBTRXJyb3JzCnNvIHNraXAgdGhl IERvdWJsZSBCaXQgSVJRIGluaXRpYWxpemF0aW9uIGlmIFN0cmF0aXgxMC4KClNpbmNlIGFsbCB0 aGUgRUNDIHBlcmlwaGVyYWxzIGFyZSBoYW5kbGVkIGluIHRoaXMgcm91dGluZSwKdGhlIG1hY2hp bmUgY29tcGF0aWJsZSBkZXZpY2UgdHJlZSB0ZXN0IGlzIHVzZWQgaGVyZQppbnN0ZWFkIG9mIG11 bHRpcGxlIEVDQyBibG9jayBkZXZpY2UgdHJlZSBjb21wYXRpYmxlCnRlc3RzLgoKU2lnbmVkLW9m Zi1ieTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KLS0tCnYyIE5v IGNoYW5nZS4gQWRkIGV4cGxhbmF0aW9uIGZvciBtYWNoaW5lIGNvbXBhdGlibGUgdGVzdAogICBp biBjb21taXQgZGVzY3JpcHRpb24uCi0tLQogZHJpdmVycy9lZGFjL2FsdGVyYV9lZGFjLmMgfCAz MSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5z ZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL2Fs dGVyYV9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYwppbmRleCAzMTI3ZTkyN2Jj ZWMuLmE5MjI1OWQ4YWZkYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2FsdGVyYV9lZGFjLmMK KysrIGIvZHJpdmVycy9lZGFjL2FsdGVyYV9lZGFjLmMKQEAgLTE5MjcsMjAgKzE5MjcsMjUgQEAg c3RhdGljIGludCBhbHRyX2VkYWNfYTEwX2RldmljZV9hZGQoc3RydWN0IGFsdHJfYXJyaWExMF9l ZGFjICplZGFjLAogCQlnb3RvIGVycl9yZWxlYXNlX2dyb3VwMTsKIAl9CiAKLQlhbHRkZXYtPmRi X2lycSA9IGlycV9vZl9wYXJzZV9hbmRfbWFwKG5wLCAxKTsKLQlpZiAoIWFsdGRldi0+ZGJfaXJx KSB7Ci0JCWVkYWNfcHJpbnRrKEtFUk5fRVJSLCBFREFDX0RFVklDRSwgIkVycm9yIGFsbG9jYXRp bmcgREJJUlFcbiIpOwotCQlyYyA9IC1FTk9ERVY7Ci0JCWdvdG8gZXJyX3JlbGVhc2VfZ3JvdXAx OwotCX0KLQlyYyA9IGRldm1fcmVxdWVzdF9pcnEoZWRhYy0+ZGV2LCBhbHRkZXYtPmRiX2lycSwg cHJ2LT5lY2NfaXJxX2hhbmRsZXIsCi0JCQkgICAgICBJUlFGX09ORVNIT1QgfCBJUlFGX1RSSUdH RVJfSElHSCwKLQkJCSAgICAgIGVjY19uYW1lLCBhbHRkZXYpOwotCWlmIChyYykgewotCQllZGFj X3ByaW50ayhLRVJOX0VSUiwgRURBQ19ERVZJQ0UsICJObyBEQkVSUiBJUlEgcmVzb3VyY2VcbiIp OwotCQlnb3RvIGVycl9yZWxlYXNlX2dyb3VwMTsKKwkvKiBBcnJpYTEwIGhhcyBkb3VibGUgYml0 IGVycm9yIElSUXMuIFN0cmF0aXgxMCB1c2VzIFNFcnJvcnMgKi8KKwlpZiAoc29jZnBnYV9pc19h MTAoKSkgeworCQlhbHRkZXYtPmRiX2lycSA9IGlycV9vZl9wYXJzZV9hbmRfbWFwKG5wLCAxKTsK KwkJaWYgKCFhbHRkZXYtPmRiX2lycSkgeworCQkJZWRhY19wcmludGsoS0VSTl9FUlIsIEVEQUNf REVWSUNFLAorCQkJCSAgICAiRXJyb3IgYWxsb2NhdGluZyBEQklSUVxuIik7CisJCQlyYyA9IC1F Tk9ERVY7CisJCQlnb3RvIGVycl9yZWxlYXNlX2dyb3VwMTsKKwkJfQorCQlyYyA9IGRldm1fcmVx dWVzdF9pcnEoZWRhYy0+ZGV2LCBhbHRkZXYtPmRiX2lycSwKKwkJCQkgICAgICBwcnYtPmVjY19p cnFfaGFuZGxlciwKKwkJCQkgICAgICBJUlFGX09ORVNIT1QgfCBJUlFGX1RSSUdHRVJfSElHSCwK KwkJCQkgICAgICBlY2NfbmFtZSwgYWx0ZGV2KTsKKwkJaWYgKHJjKSB7CisJCQllZGFjX3ByaW50 ayhLRVJOX0VSUiwgRURBQ19ERVZJQ0UsCisJCQkJICAgICJObyBEQkVSUiBJUlEgcmVzb3VyY2Vc biIpOworCQkJZ290byBlcnJfcmVsZWFzZV9ncm91cDE7CisJCX0KIAl9Ci0KIAlyYyA9IGVkYWNf ZGV2aWNlX2FkZF9kZXZpY2UoZGNpKTsKIAlpZiAocmMpIHsKIAkJZGV2X2VycihlZGFjLT5kZXYs ICJlZGFjX2RldmljZV9hZGRfZGV2aWNlIGZhaWxlZFxuIik7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: thor.thayer@linux.intel.com Subject: [PATCHv2 3/5] EDAC, altera: Skip DB IRQ for Stratix10 Date: Wed, 27 Feb 2019 11:27:23 -0600 Message-ID: <1551288445-22335-4-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 Stratix10 Double Bit errors are configured as SErrors so skip the Double Bit IRQ initialization if Stratix10. Since all the ECC peripherals are handled in this routine, the machine compatible device tree test is used here instead of multiple ECC block device tree compatible tests. Signed-off-by: Thor Thayer --- v2 No change. Add explanation for machine compatible test in commit description. --- drivers/edac/altera_edac.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 3127e927bcec..a92259d8afdc 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -1927,20 +1927,25 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac, goto err_release_group1; } - altdev->db_irq = irq_of_parse_and_map(np, 1); - if (!altdev->db_irq) { - edac_printk(KERN_ERR, EDAC_DEVICE, "Error allocating DBIRQ\n"); - rc = -ENODEV; - goto err_release_group1; - } - rc = devm_request_irq(edac->dev, altdev->db_irq, prv->ecc_irq_handler, - IRQF_ONESHOT | IRQF_TRIGGER_HIGH, - ecc_name, altdev); - if (rc) { - edac_printk(KERN_ERR, EDAC_DEVICE, "No DBERR IRQ resource\n"); - goto err_release_group1; + /* Arria10 has double bit error IRQs. Stratix10 uses SErrors */ + if (socfpga_is_a10()) { + altdev->db_irq = irq_of_parse_and_map(np, 1); + if (!altdev->db_irq) { + edac_printk(KERN_ERR, EDAC_DEVICE, + "Error allocating DBIRQ\n"); + rc = -ENODEV; + goto err_release_group1; + } + rc = devm_request_irq(edac->dev, altdev->db_irq, + prv->ecc_irq_handler, + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, + ecc_name, altdev); + if (rc) { + edac_printk(KERN_ERR, EDAC_DEVICE, + "No DBERR IRQ resource\n"); + goto err_release_group1; + } } - rc = edac_device_add_device(dci); if (rc) { dev_err(edac->dev, "edac_device_add_device failed\n"); -- 2.7.4