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: [2/2] EDAC, altera: Use global Stratix10 SMC defines From: thor.thayer@linux.intel.com Message-Id: <1553870639-23895-2-git-send-email-thor.thayer@linux.intel.com> Date: Fri, 29 Mar 2019 09:43:59 -0500 To: bp@alien8.de, mchehab@kernel.org, james.morse@arm.com, atull@kernel.org, richard.gong@intel.com, gregkh@linuxfoundation.org Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Thor Thayer List-ID: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KClVzZSB0aGUg Z2xvYmFsIFN0cmF0aXgxMCBTTUMgZGVmaW5lcyBpbnN0ZWFkIG9mIHRoZSBsb2NhbApTMTAgU01D IGRlZmluZXMuCgpSZXZpZXdlZC1ieTogUmljaGFyZCBHb25nIDxyaWNoYXJkLmdvbmdAaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBUaG9yIFRoYXllciA8dGhvci50aGF5ZXJAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5jIHwgIDEgKwogZHJpdmVycy9lZGFj L2FsdGVyYV9lZGFjLmggfCA4MyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA4MyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYyBiL2RyaXZlcnMvZWRh Yy9hbHRlcmFfZWRhYy5jCmluZGV4IDc2MTE5OTE3NWM3Ni4uODgxNmY3NGEyMmI0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2VkYWMvYWx0ZXJhX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvYWx0ZXJh X2VkYWMuYwpAQCAtOSw2ICs5LDcgQEAKICNpbmNsdWRlIDxsaW51eC9jdHlwZS5oPgogI2luY2x1 ZGUgPGxpbnV4L2RlbGF5Lmg+CiAjaW5jbHVkZSA8bGludXgvZWRhYy5oPgorI2luY2x1ZGUgPGxp bnV4L2Zpcm13YXJlL2ludGVsL3N0cmF0aXgxMC1zbWMuaD4KICNpbmNsdWRlIDxsaW51eC9nZW5h bGxvYy5oPgogI2luY2x1ZGUgPGxpbnV4L2ludGVycnVwdC5oPgogI2luY2x1ZGUgPGxpbnV4L2ly cWNoaXAvY2hhaW5lZF9pcnEuaD4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy9hbHRlcmFfZWRh Yy5oIGIvZHJpdmVycy9lZGFjL2FsdGVyYV9lZGFjLmgKaW5kZXggMTUzMmVjOWMzNTEwLi41NTY1 NGNjNGJjZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5oCisrKyBiL2Ry aXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5oCkBAIC0zNzIsODcgKzM3Miw0IEBAIHN0cnVjdCBhbHRy X2FycmlhMTBfZWRhYyB7CiAJc3RydWN0IG5vdGlmaWVyX2Jsb2NrCXBhbmljX25vdGlmaWVyOwog fTsKIAotLyoKLSAqIEZ1bmN0aW9ucyBzcGVjaWZpZWQgYnkgQVJNIFNNQyBDYWxsaW5nIGNvbnZl bnRpb246Ci0gKgotICogRkFTVCBjYWxsIGV4ZWN1dGVzIGF0b21pYyBvcGVyYXRpb25zLCByZXR1 cm5zIHdoZW4gdGhlIHJlcXVlc3RlZCBvcGVyYXRpb24KLSAqIGhhcyBjb21wbGV0ZWQuCi0gKiBT VEQgY2FsbCBzdGFydHMgYSBvcGVyYXRpb24gd2hpY2ggY2FuIGJlIHByZWVtcHRlZCBieSBhIG5v bi1zZWN1cmUKLSAqIGludGVycnVwdC4gVGhlIGNhbGwgY2FuIHJldHVybiBiZWZvcmUgdGhlIHJl cXVlc3RlZCBvcGVyYXRpb24gaGFzCi0gKiBjb21wbGV0ZWQuCi0gKgotICogYTAuLmE3IGlzIHVz ZWQgYXMgcmVnaXN0ZXIgbmFtZXMgaW4gdGhlIGRlc2NyaXB0aW9ucyBiZWxvdywgb24gYXJtMzIK LSAqIHRoYXQgdHJhbnNsYXRlcyB0byByMC4ucjcgYW5kIG9uIGFybTY0IHRvIHcwLi53Ny4KLSAq LwotCi0jZGVmaW5lIElOVEVMX1NJUF9TTUNfU1REX0NBTExfVkFMKGZ1bmNfbnVtKSBcCi0JQVJN X1NNQ0NDX0NBTExfVkFMKEFSTV9TTUNDQ19TVERfQ0FMTCwgQVJNX1NNQ0NDX1NNQ182NCwgXAot CUFSTV9TTUNDQ19PV05FUl9TSVAsIChmdW5jX251bSkpCi0KLSNkZWZpbmUgSU5URUxfU0lQX1NN Q19GQVNUX0NBTExfVkFMKGZ1bmNfbnVtKSBcCi0JQVJNX1NNQ0NDX0NBTExfVkFMKEFSTV9TTUND Q19GQVNUX0NBTEwsIEFSTV9TTUNDQ19TTUNfNjQsIFwKLQlBUk1fU01DQ0NfT1dORVJfU0lQLCAo ZnVuY19udW0pKQotCi0jZGVmaW5lIElOVEVMX1NJUF9TTUNfUkVUVVJOX1VOS05PV05fRlVOQ1RJ T04JCTB4RkZGRkZGRkYKLSNkZWZpbmUgSU5URUxfU0lQX1NNQ19TVEFUVVNfT0sJCQkJMHgwCi0j ZGVmaW5lIElOVEVMX1NJUF9TTUNfUkVHX0VSUk9SCQkJCTB4NQotCi0vKgotICogUmVxdWVzdCBJ TlRFTF9TSVBfU01DX1JFR19SRUFECi0gKgotICogUmVhZCBhIHByb3RlY3RlZCByZWdpc3RlciB1 c2luZyBTTUNDQwotICoKLSAqIENhbGwgcmVnaXN0ZXIgdXNhZ2U6Ci0gKiBhMDogSU5URUxfU0lQ X1NNQ19SRUdfUkVBRC4KLSAqIGExOiByZWdpc3RlciBhZGRyZXNzLgotICogYTItNzogbm90IHVz ZWQuCi0gKgotICogUmV0dXJuIHN0YXR1czoKLSAqIGEwOiBJTlRFTF9TSVBfU01DX1NUQVRVU19P SywgSU5URUxfU0lQX1NNQ19SRUdfRVJST1IsIG9yCi0gKiAgICAgSU5URUxfU0lQX1NNQ19SRVRV Uk5fVU5LTk9XTl9GVU5DVElPTgotICogYTE6IFZhbHVlIGluIHRoZSByZWdpc3RlcgotICogYTIt Mzogbm90IHVzZWQuCi0gKi8KLSNkZWZpbmUgSU5URUxfU0lQX1NNQ19GVU5DSURfUkVHX1JFQUQg NwotI2RlZmluZSBJTlRFTF9TSVBfU01DX1JFR19SRUFEIFwKLQlJTlRFTF9TSVBfU01DX0ZBU1Rf Q0FMTF9WQUwoSU5URUxfU0lQX1NNQ19GVU5DSURfUkVHX1JFQUQpCi0KLS8qCi0gKiBSZXF1ZXN0 IElOVEVMX1NJUF9TTUNfUkVHX1dSSVRFCi0gKgotICogV3JpdGUgYSBwcm90ZWN0ZWQgcmVnaXN0 ZXIgdXNpbmcgU01DQ0MKLSAqCi0gKiBDYWxsIHJlZ2lzdGVyIHVzYWdlOgotICogYTA6IElOVEVM X1NJUF9TTUNfUkVHX1dSSVRFLgotICogYTE6IHJlZ2lzdGVyIGFkZHJlc3MKLSAqIGEyOiB2YWx1 ZSB0byBwcm9ncmFtIGludG8gcmVnaXN0ZXIuCi0gKiBhMy03OiBub3QgdXNlZC4KLSAqCi0gKiBS ZXR1cm4gc3RhdHVzOgotICogYTA6IElOVEVMX1NJUF9TTUNfU1RBVFVTX09LLCBJTlRFTF9TSVBf U01DX1JFR19FUlJPUiwgb3IKLSAqICAgICBJTlRFTF9TSVBfU01DX1JFVFVSTl9VTktOT1dOX0ZV TkNUSU9OCi0gKiBhMS0zOiBub3QgdXNlZC4KLSAqLwotI2RlZmluZSBJTlRFTF9TSVBfU01DX0ZV TkNJRF9SRUdfV1JJVEUgOAotI2RlZmluZSBJTlRFTF9TSVBfU01DX1JFR19XUklURSBcCi0JSU5U RUxfU0lQX1NNQ19GQVNUX0NBTExfVkFMKElOVEVMX1NJUF9TTUNfRlVOQ0lEX1JFR19XUklURSkK LQotLyoKLSAqIFJlcXVlc3QgSU5URUxfU0lQX1NNQ19FQ0NfREJFCi0gKgotICogU3luYyBjYWxs IHVzZWQgYnkgc2VydmljZSBkcml2ZXIgYXQgRUwxIGFsZXJ0IEVMMyB0aGF0IGEgRG91YmxlIEJp dAotICogRUNDIGVycm9yIGhhcyBvY2N1cnJlZC4KLSAqCi0gKiBDYWxsIHJlZ2lzdGVyIHVzYWdl OgotICogYTAgSU5URUxfU0lQX1NNQ19FQ0NfREJFCi0gKiBhMSBTeXNNYW5hZ2VyIERvdWJsZSBC aXQgRXJyb3IgdmFsdWUKLSAqIGEyLTcgbm90IHVzZWQKLSAqCi0gKiBSZXR1cm4gc3RhdHVzCi0g KiBhMCBJTlRFTF9TSVBfU01DX1NUQVRVU19PSwotICovCi0jZGVmaW5lIElOVEVMX1NJUF9TTUNf RlVOQ0lEX0VDQ19EQkUgMTMKLSNkZWZpbmUgSU5URUxfU0lQX1NNQ19FQ0NfREJFIFwKLQlJTlRF TF9TSVBfU01DX0ZBU1RfQ0FMTF9WQUwoSU5URUxfU0lQX1NNQ19GVU5DSURfRUNDX0RCRSkKLQog I2VuZGlmCS8qICNpZm5kZWYgX0FMVEVSQV9FREFDX0ggKi8K 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,USER_AGENT_GIT autolearn=ham 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 272F6C10F05 for ; Fri, 29 Mar 2019 14:41:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3E342183F for ; Fri, 29 Mar 2019 14:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729532AbfC2Olg (ORCPT ); Fri, 29 Mar 2019 10:41:36 -0400 Received: from mga03.intel.com ([134.134.136.65]:50079 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729317AbfC2Olf (ORCPT ); Fri, 29 Mar 2019 10:41:35 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2019 07:41:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,284,1549958400"; d="scan'208";a="138352097" Received: from tthayer-hp-z620.an.intel.com ([10.122.105.146]) by orsmga003.jf.intel.com with ESMTP; 29 Mar 2019 07:41:34 -0700 From: thor.thayer@linux.intel.com To: bp@alien8.de, mchehab@kernel.org, james.morse@arm.com, atull@kernel.org, richard.gong@intel.com, gregkh@linuxfoundation.org Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Thor Thayer Subject: [PATCH 2/2] EDAC, altera: Use global Stratix10 SMC defines Date: Fri, 29 Mar 2019 09:43:59 -0500 Message-Id: <1553870639-23895-2-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553870639-23895-1-git-send-email-thor.thayer@linux.intel.com> References: <1553870639-23895-1-git-send-email-thor.thayer@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thor Thayer Use the global Stratix10 SMC defines instead of the local S10 SMC defines. Reviewed-by: Richard Gong Signed-off-by: Thor Thayer --- drivers/edac/altera_edac.c | 1 + drivers/edac/altera_edac.h | 83 ---------------------------------------------- 2 files changed, 1 insertion(+), 83 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 761199175c76..8816f74a22b4 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h index 1532ec9c3510..55654cc4bcdf 100644 --- a/drivers/edac/altera_edac.h +++ b/drivers/edac/altera_edac.h @@ -372,87 +372,4 @@ struct altr_arria10_edac { struct notifier_block panic_notifier; }; -/* - * Functions specified by ARM SMC Calling convention: - * - * FAST call executes atomic operations, returns when the requested operation - * has completed. - * STD call starts a operation which can be preempted by a non-secure - * interrupt. The call can return before the requested operation has - * completed. - * - * a0..a7 is used as register names in the descriptions below, on arm32 - * that translates to r0..r7 and on arm64 to w0..w7. - */ - -#define INTEL_SIP_SMC_STD_CALL_VAL(func_num) \ - ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, \ - ARM_SMCCC_OWNER_SIP, (func_num)) - -#define INTEL_SIP_SMC_FAST_CALL_VAL(func_num) \ - ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, \ - ARM_SMCCC_OWNER_SIP, (func_num)) - -#define INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION 0xFFFFFFFF -#define INTEL_SIP_SMC_STATUS_OK 0x0 -#define INTEL_SIP_SMC_REG_ERROR 0x5 - -/* - * Request INTEL_SIP_SMC_REG_READ - * - * Read a protected register using SMCCC - * - * Call register usage: - * a0: INTEL_SIP_SMC_REG_READ. - * a1: register address. - * a2-7: not used. - * - * Return status: - * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_REG_ERROR, or - * INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION - * a1: Value in the register - * a2-3: not used. - */ -#define INTEL_SIP_SMC_FUNCID_REG_READ 7 -#define INTEL_SIP_SMC_REG_READ \ - INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_READ) - -/* - * Request INTEL_SIP_SMC_REG_WRITE - * - * Write a protected register using SMCCC - * - * Call register usage: - * a0: INTEL_SIP_SMC_REG_WRITE. - * a1: register address - * a2: value to program into register. - * a3-7: not used. - * - * Return status: - * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_REG_ERROR, or - * INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION - * a1-3: not used. - */ -#define INTEL_SIP_SMC_FUNCID_REG_WRITE 8 -#define INTEL_SIP_SMC_REG_WRITE \ - INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_WRITE) - -/* - * Request INTEL_SIP_SMC_ECC_DBE - * - * Sync call used by service driver at EL1 alert EL3 that a Double Bit - * ECC error has occurred. - * - * Call register usage: - * a0 INTEL_SIP_SMC_ECC_DBE - * a1 SysManager Double Bit Error value - * a2-7 not used - * - * Return status - * a0 INTEL_SIP_SMC_STATUS_OK - */ -#define INTEL_SIP_SMC_FUNCID_ECC_DBE 13 -#define INTEL_SIP_SMC_ECC_DBE \ - INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_ECC_DBE) - #endif /* #ifndef _ALTERA_EDAC_H */ -- 2.7.4