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: [3/4] EDAC, altera: Add Stratix10 SDMMC support From: thor.thayer@linux.intel.com Message-Id: <1556030197-24534-4-git-send-email-thor.thayer@linux.intel.com> Date: Tue, 23 Apr 2019 09:36:36 -0500 To: bp@alien8.de, mchehab@kernel.org, james.morse@arm.com, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KCkFkZGl0aW9u IG9mIFNETU1DIEVEQUMgZm9yIFN0cmF0aXgxMCB3aGljaCBoYXMgSVJRCmRpZmZlcmVuY2VzIGZy b20gQXJyaWExMC4gVXBkYXRlIGNvbW1lbnQgYWNjb3JkaW5nbHkuCgpTaWduZWQtb2ZmLWJ5OiBU aG9yIFRoYXllciA8dGhvci50aGF5ZXJAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZWRh Yy9hbHRlcmFfZWRhYy5jIHwgMTYgKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDE1 IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMv YWx0ZXJhX2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5jCmluZGV4IGI3YmM4ZjAy MGRmOC4uYzJlNjkzZTM0ZDQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMu YworKysgYi9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYwpAQCAtMTU4Myw4ICsxNTgzLDEyIEBA IHN0YXRpYyBpbnQgYWx0cl9wb3J0Yl9zZXR1cChzdHJ1Y3QgYWx0cl9lZGFjX2RldmljZV9kZXYg KmRldmljZSkKIAlkY2ktPm1vZF9uYW1lID0gZWNjX25hbWU7CiAJZGNpLT5kZXZfbmFtZSA9IGVj Y19uYW1lOwogCi0JLyogVXBkYXRlIHRoZSBJUlFzIGZvciBQb3J0QiAqLworCS8qIFVwZGF0ZSB0 aGUgUG9ydEIgSVJRcyAtIEExMCBoYXMgNCwgUzEwIGhhcyAyLCBJbmRleCBhY2NvcmRpbmdseSAq LworI2lmZGVmIENPTkZJR19BUkNIX1NUUkFUSVgxMAorCWFsdGRldi0+c2JfaXJxID0gaXJxX29m X3BhcnNlX2FuZF9tYXAobnAsIDEpOworI2Vsc2UKIAlhbHRkZXYtPnNiX2lycSA9IGlycV9vZl9w YXJzZV9hbmRfbWFwKG5wLCAyKTsKKyNlbmRpZgogCWlmICghYWx0ZGV2LT5zYl9pcnEpIHsKIAkJ ZWRhY19wcmludGsoS0VSTl9FUlIsIEVEQUNfREVWSUNFLCAiRXJyb3IgUG9ydEIgU0JJUlEgYWxs b2NcbiIpOwogCQlyYyA9IC1FTk9ERVY7CkBAIC0xNTk5LDYgKzE2MDMsMTUgQEAgc3RhdGljIGlu dCBhbHRyX3BvcnRiX3NldHVwKHN0cnVjdCBhbHRyX2VkYWNfZGV2aWNlX2RldiAqZGV2aWNlKQog CQlnb3RvIGVycl9yZWxlYXNlX2dyb3VwXzE7CiAJfQogCisjaWZkZWYgQ09ORklHX0FSQ0hfU1RS QVRJWDEwCisJLyogVXNlIElSUSB0byBkZXRlcm1pbmUgU0Vycm9yIG9yaWdpbiBpbnN0ZWFkIG9m IGFzc2lnbmluZyBJUlEgKi8KKwlyYyA9IG9mX3Byb3BlcnR5X3JlYWRfdTMyX2luZGV4KG5wLCAi aW50ZXJydXB0cyIsIDEsICZhbHRkZXYtPmRiX2lycSk7CisJaWYgKHJjKSB7CisJCWVkYWNfcHJp bnRrKEtFUk5fRVJSLCBFREFDX0RFVklDRSwKKwkJCSAgICAiRXJyb3IgUG9ydEIgREJJUlEgYWxs b2NcbiIpOworCQlnb3RvIGVycl9yZWxlYXNlX2dyb3VwXzE7CisJfQorI2Vsc2UKIAlhbHRkZXYt PmRiX2lycSA9IGlycV9vZl9wYXJzZV9hbmRfbWFwKG5wLCAzKTsKIAlpZiAoIWFsdGRldi0+ZGJf aXJxKSB7CiAJCWVkYWNfcHJpbnRrKEtFUk5fRVJSLCBFREFDX0RFVklDRSwgIkVycm9yIFBvcnRC IERCSVJRIGFsbG9jXG4iKTsKQEAgLTE2MTMsNiArMTYyNiw3IEBAIHN0YXRpYyBpbnQgYWx0cl9w b3J0Yl9zZXR1cChzdHJ1Y3QgYWx0cl9lZGFjX2RldmljZV9kZXYgKmRldmljZSkKIAkJZWRhY19w cmludGsoS0VSTl9FUlIsIEVEQUNfREVWSUNFLCAiUG9ydEIgREJFUlIgSVJRIGVycm9yXG4iKTsK IAkJZ290byBlcnJfcmVsZWFzZV9ncm91cF8xOwogCX0KKyNlbmRpZgogCiAJcmMgPSBlZGFjX2Rl dmljZV9hZGRfZGV2aWNlKGRjaSk7CiAJaWYgKHJjKSB7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D503C282DD for ; Tue, 23 Apr 2019 14:34:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29977217D9 for ; Tue, 23 Apr 2019 14:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728123AbfDWOeW (ORCPT ); Tue, 23 Apr 2019 10:34:22 -0400 Received: from mga11.intel.com ([192.55.52.93]:54833 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbfDWOeQ (ORCPT ); Tue, 23 Apr 2019 10:34:16 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP; 23 Apr 2019 07:34:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,386,1549958400"; d="scan'208";a="136653911" Received: from tthayer-hp-z620.an.intel.com ([10.122.105.146]) by orsmga008.jf.intel.com with ESMTP; 23 Apr 2019 07:34:15 -0700 From: thor.thayer@linux.intel.com To: bp@alien8.de, mchehab@kernel.org, james.morse@arm.com, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] EDAC, altera: Add Stratix10 SDMMC support Date: Tue, 23 Apr 2019 09:36:36 -0500 Message-Id: <1556030197-24534-4-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556030197-24534-1-git-send-email-thor.thayer@linux.intel.com> References: <1556030197-24534-1-git-send-email-thor.thayer@linux.intel.com> Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190423143636.5BAgdaiuHHat1nnLFzSofk19aYQHSNjdLi2PxdeUA7U@z> From: Thor Thayer Addition of SDMMC EDAC for Stratix10 which has IRQ differences from Arria10. Update comment accordingly. Signed-off-by: Thor Thayer --- drivers/edac/altera_edac.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index b7bc8f020df8..c2e693e34d43 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -1583,8 +1583,12 @@ static int altr_portb_setup(struct altr_edac_device_dev *device) dci->mod_name = ecc_name; dci->dev_name = ecc_name; - /* Update the IRQs for PortB */ + /* Update the PortB IRQs - A10 has 4, S10 has 2, Index accordingly */ +#ifdef CONFIG_ARCH_STRATIX10 + altdev->sb_irq = irq_of_parse_and_map(np, 1); +#else altdev->sb_irq = irq_of_parse_and_map(np, 2); +#endif if (!altdev->sb_irq) { edac_printk(KERN_ERR, EDAC_DEVICE, "Error PortB SBIRQ alloc\n"); rc = -ENODEV; @@ -1599,6 +1603,15 @@ static int altr_portb_setup(struct altr_edac_device_dev *device) goto err_release_group_1; } +#ifdef CONFIG_ARCH_STRATIX10 + /* Use IRQ to determine SError origin instead of assigning IRQ */ + rc = of_property_read_u32_index(np, "interrupts", 1, &altdev->db_irq); + if (rc) { + edac_printk(KERN_ERR, EDAC_DEVICE, + "Error PortB DBIRQ alloc\n"); + goto err_release_group_1; + } +#else altdev->db_irq = irq_of_parse_and_map(np, 3); if (!altdev->db_irq) { edac_printk(KERN_ERR, EDAC_DEVICE, "Error PortB DBIRQ alloc\n"); @@ -1613,6 +1626,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device) edac_printk(KERN_ERR, EDAC_DEVICE, "PortB DBERR IRQ error\n"); goto err_release_group_1; } +#endif rc = edac_device_add_device(dci); if (rc) { -- 2.7.4