From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandru Gagniuc Subject: [RFC PATCH v4 2/3] acpi: apei: Rename ghes_severity() to ghes_cper_severity() Date: Mon, 30 Apr 2018 16:33:51 -0500 Message-ID: <20180430213358.8319-2-mr.nuke.me@gmail.com> References: <20180430212836.7807-1-mr.nuke.me@gmail.com> <20180430213358.8319-1-mr.nuke.me@gmail.com> Return-path: In-Reply-To: <20180430213358.8319-1-mr.nuke.me@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: bp@alien8.de Cc: alex_gagniuc@dellteam.com, austin_bolen@dell.com, shyam_iyer@dell.com, Alexandru Gagniuc , "Rafael J. Wysocki" , Len Brown , Tony Luck , Mauro Carvalho Chehab , Robert Moore , Erik Schmauss , Tyler Baicar , Will Deacon , James Morse , Shiju Jose , "Jonathan (Zhixiong) Zhang" , Dongjiu Geng , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, devel@acpica.org List-Id: linux-acpi@vger.kernel.org ghes_severity() is a misnomer in this case, as it implies the severity of the entire GHES structure. Instead, it maps one CPER value to a monotonically increasing number. ghes_cper_severity() is clearer. Signed-off-by: Alexandru Gagniuc --- drivers/acpi/apei/ghes.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index f9b53a6f55f3..c9f1971333c1 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -271,7 +271,7 @@ static void ghes_fini(struct ghes *ghes) unmap_gen_v2(ghes); } -static inline int ghes_severity(int severity) +static inline int ghes_cper_severity(int severity) { switch (severity) { case CPER_SEV_INFORMATIONAL: @@ -388,7 +388,7 @@ static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int #ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE unsigned long pfn; int flags = -1; - int sec_sev = ghes_severity(gdata->error_severity); + int sec_sev = ghes_cper_severity(gdata->error_severity); struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); if (!(mem_err->validation_bits & CPER_MEM_VALID_PA)) @@ -468,10 +468,10 @@ static void ghes_do_proc(struct ghes *ghes, guid_t *fru_id = &NULL_UUID_LE; char *fru_text = ""; - sev = ghes_severity(estatus->error_severity); + sev = ghes_cper_severity(estatus->error_severity); apei_estatus_for_each_section(estatus, gdata) { sec_type = (guid_t *)gdata->section_type; - sec_sev = ghes_severity(gdata->error_severity); + sec_sev = ghes_cper_severity(gdata->error_severity); if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID) fru_id = (guid_t *)gdata->fru_id; @@ -512,7 +512,7 @@ static void __ghes_print_estatus(const char *pfx, char pfx_seq[64]; if (pfx == NULL) { - if (ghes_severity(estatus->error_severity) <= + if (ghes_cper_severity(estatus->error_severity) <= GHES_SEV_CORRECTED) pfx = KERN_WARNING; else @@ -534,7 +534,7 @@ static int ghes_print_estatus(const char *pfx, static DEFINE_RATELIMIT_STATE(ratelimit_uncorrected, 5*HZ, 2); struct ratelimit_state *ratelimit; - if (ghes_severity(estatus->error_severity) <= GHES_SEV_CORRECTED) + if (ghes_cper_severity(estatus->error_severity) <= GHES_SEV_CORRECTED) ratelimit = &ratelimit_corrected; else ratelimit = &ratelimit_uncorrected; @@ -705,9 +705,8 @@ static int ghes_proc(struct ghes *ghes) if (rc) goto out; - if (ghes_severity(ghes->estatus->error_severity) >= GHES_SEV_PANIC) { + if (ghes_cper_severity(ghes->estatus->error_severity) >= GHES_SEV_PANIC) __ghes_panic(ghes); - } if (!ghes_estatus_cached(ghes->estatus)) { if (ghes_print_estatus(NULL, ghes->generic, ghes->estatus)) @@ -945,7 +944,7 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs) ret = NMI_HANDLED; } - sev = ghes_severity(ghes->estatus->error_severity); + sev = ghes_cper_severity(ghes->estatus->error_severity); if (sev >= GHES_SEV_PANIC) { oops_begin(); ghes_print_queued_estatus(); -- 2.14.3 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: [RFC,v4,2/3] acpi: apei: Rename ghes_severity() to ghes_cper_severity() From: Alexandru Gagniuc Message-Id: <20180430213358.8319-2-mr.nuke.me@gmail.com> Date: Mon, 30 Apr 2018 16:33:51 -0500 To: bp@alien8.de Cc: alex_gagniuc@dellteam.com, austin_bolen@dell.com, shyam_iyer@dell.com, Alexandru Gagniuc , "Rafael J. Wysocki" , Len Brown , Tony Luck , Mauro Carvalho Chehab , Robert Moore , Erik Schmauss , Tyler Baicar , Will Deacon , James Morse , Shiju Jose , "Jonathan (Zhixiong) Zhang" , Dongjiu Geng , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, devel@acpica.org List-ID: Z2hlc19zZXZlcml0eSgpIGlzIGEgbWlzbm9tZXIgaW4gdGhpcyBjYXNlLCBhcyBpdCBpbXBsaWVz IHRoZSBzZXZlcml0eQpvZiB0aGUgZW50aXJlIEdIRVMgc3RydWN0dXJlLiBJbnN0ZWFkLCBpdCBt YXBzIG9uZSBDUEVSIHZhbHVlIHRvIGEKbW9ub3RvbmljYWxseSBpbmNyZWFzaW5nIG51bWJlci4g Z2hlc19jcGVyX3NldmVyaXR5KCkgaXMgY2xlYXJlci4KClNpZ25lZC1vZmYtYnk6IEFsZXhhbmRy dSBHYWduaXVjIDxtci5udWtlLm1lQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2FjcGkvYXBlaS9n aGVzLmMgfCAxNyArKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9u cygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvYXBlaS9naGVz LmMgYi9kcml2ZXJzL2FjcGkvYXBlaS9naGVzLmMKaW5kZXggZjliNTNhNmY1NWYzLi5jOWYxOTcx MzMzYzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYWNwaS9hcGVpL2doZXMuYworKysgYi9kcml2ZXJz L2FjcGkvYXBlaS9naGVzLmMKQEAgLTI3MSw3ICsyNzEsNyBAQCBzdGF0aWMgdm9pZCBnaGVzX2Zp bmkoc3RydWN0IGdoZXMgKmdoZXMpCiAJCXVubWFwX2dlbl92MihnaGVzKTsKIH0KIAotc3RhdGlj IGlubGluZSBpbnQgZ2hlc19zZXZlcml0eShpbnQgc2V2ZXJpdHkpCitzdGF0aWMgaW5saW5lIGlu dCBnaGVzX2NwZXJfc2V2ZXJpdHkoaW50IHNldmVyaXR5KQogewogCXN3aXRjaCAoc2V2ZXJpdHkp IHsKIAljYXNlIENQRVJfU0VWX0lORk9STUFUSU9OQUw6CkBAIC0zODgsNyArMzg4LDcgQEAgc3Rh dGljIHZvaWQgZ2hlc19oYW5kbGVfbWVtb3J5X2ZhaWx1cmUoc3RydWN0IGFjcGlfaGVzdF9nZW5l cmljX2RhdGEgKmdkYXRhLCBpbnQKICNpZmRlZiBDT05GSUdfQUNQSV9BUEVJX01FTU9SWV9GQUlM VVJFCiAJdW5zaWduZWQgbG9uZyBwZm47CiAJaW50IGZsYWdzID0gLTE7Ci0JaW50IHNlY19zZXYg PSBnaGVzX3NldmVyaXR5KGdkYXRhLT5lcnJvcl9zZXZlcml0eSk7CisJaW50IHNlY19zZXYgPSBn aGVzX2NwZXJfc2V2ZXJpdHkoZ2RhdGEtPmVycm9yX3NldmVyaXR5KTsKIAlzdHJ1Y3QgY3Blcl9z ZWNfbWVtX2VyciAqbWVtX2VyciA9IGFjcGlfaGVzdF9nZXRfcGF5bG9hZChnZGF0YSk7CiAKIAlp ZiAoIShtZW1fZXJyLT52YWxpZGF0aW9uX2JpdHMgJiBDUEVSX01FTV9WQUxJRF9QQSkpCkBAIC00 NjgsMTAgKzQ2OCwxMCBAQCBzdGF0aWMgdm9pZCBnaGVzX2RvX3Byb2Moc3RydWN0IGdoZXMgKmdo ZXMsCiAJZ3VpZF90ICpmcnVfaWQgPSAmTlVMTF9VVUlEX0xFOwogCWNoYXIgKmZydV90ZXh0ID0g IiI7CiAKLQlzZXYgPSBnaGVzX3NldmVyaXR5KGVzdGF0dXMtPmVycm9yX3NldmVyaXR5KTsKKwlz ZXYgPSBnaGVzX2NwZXJfc2V2ZXJpdHkoZXN0YXR1cy0+ZXJyb3Jfc2V2ZXJpdHkpOwogCWFwZWlf ZXN0YXR1c19mb3JfZWFjaF9zZWN0aW9uKGVzdGF0dXMsIGdkYXRhKSB7CiAJCXNlY190eXBlID0g KGd1aWRfdCAqKWdkYXRhLT5zZWN0aW9uX3R5cGU7Ci0JCXNlY19zZXYgPSBnaGVzX3NldmVyaXR5 KGdkYXRhLT5lcnJvcl9zZXZlcml0eSk7CisJCXNlY19zZXYgPSBnaGVzX2NwZXJfc2V2ZXJpdHko Z2RhdGEtPmVycm9yX3NldmVyaXR5KTsKIAkJaWYgKGdkYXRhLT52YWxpZGF0aW9uX2JpdHMgJiBD UEVSX1NFQ19WQUxJRF9GUlVfSUQpCiAJCQlmcnVfaWQgPSAoZ3VpZF90ICopZ2RhdGEtPmZydV9p ZDsKIApAQCAtNTEyLDcgKzUxMiw3IEBAIHN0YXRpYyB2b2lkIF9fZ2hlc19wcmludF9lc3RhdHVz KGNvbnN0IGNoYXIgKnBmeCwKIAljaGFyIHBmeF9zZXFbNjRdOwogCiAJaWYgKHBmeCA9PSBOVUxM KSB7Ci0JCWlmIChnaGVzX3NldmVyaXR5KGVzdGF0dXMtPmVycm9yX3NldmVyaXR5KSA8PQorCQlp ZiAoZ2hlc19jcGVyX3NldmVyaXR5KGVzdGF0dXMtPmVycm9yX3NldmVyaXR5KSA8PQogCQkgICAg R0hFU19TRVZfQ09SUkVDVEVEKQogCQkJcGZ4ID0gS0VSTl9XQVJOSU5HOwogCQllbHNlCkBAIC01 MzQsNyArNTM0LDcgQEAgc3RhdGljIGludCBnaGVzX3ByaW50X2VzdGF0dXMoY29uc3QgY2hhciAq cGZ4LAogCXN0YXRpYyBERUZJTkVfUkFURUxJTUlUX1NUQVRFKHJhdGVsaW1pdF91bmNvcnJlY3Rl ZCwgNSpIWiwgMik7CiAJc3RydWN0IHJhdGVsaW1pdF9zdGF0ZSAqcmF0ZWxpbWl0OwogCi0JaWYg KGdoZXNfc2V2ZXJpdHkoZXN0YXR1cy0+ZXJyb3Jfc2V2ZXJpdHkpIDw9IEdIRVNfU0VWX0NPUlJF Q1RFRCkKKwlpZiAoZ2hlc19jcGVyX3NldmVyaXR5KGVzdGF0dXMtPmVycm9yX3NldmVyaXR5KSA8 PSBHSEVTX1NFVl9DT1JSRUNURUQpCiAJCXJhdGVsaW1pdCA9ICZyYXRlbGltaXRfY29ycmVjdGVk OwogCWVsc2UKIAkJcmF0ZWxpbWl0ID0gJnJhdGVsaW1pdF91bmNvcnJlY3RlZDsKQEAgLTcwNSw5 ICs3MDUsOCBAQCBzdGF0aWMgaW50IGdoZXNfcHJvYyhzdHJ1Y3QgZ2hlcyAqZ2hlcykKIAlpZiAo cmMpCiAJCWdvdG8gb3V0OwogCi0JaWYgKGdoZXNfc2V2ZXJpdHkoZ2hlcy0+ZXN0YXR1cy0+ZXJy b3Jfc2V2ZXJpdHkpID49IEdIRVNfU0VWX1BBTklDKSB7CisJaWYgKGdoZXNfY3Blcl9zZXZlcml0 eShnaGVzLT5lc3RhdHVzLT5lcnJvcl9zZXZlcml0eSkgPj0gR0hFU19TRVZfUEFOSUMpCiAJCV9f Z2hlc19wYW5pYyhnaGVzKTsKLQl9CiAKIAlpZiAoIWdoZXNfZXN0YXR1c19jYWNoZWQoZ2hlcy0+ ZXN0YXR1cykpIHsKIAkJaWYgKGdoZXNfcHJpbnRfZXN0YXR1cyhOVUxMLCBnaGVzLT5nZW5lcmlj LCBnaGVzLT5lc3RhdHVzKSkKQEAgLTk0NSw3ICs5NDQsNyBAQCBzdGF0aWMgaW50IGdoZXNfbm90 aWZ5X25taSh1bnNpZ25lZCBpbnQgY21kLCBzdHJ1Y3QgcHRfcmVncyAqcmVncykKIAkJCXJldCA9 IE5NSV9IQU5ETEVEOwogCQl9CiAKLQkJc2V2ID0gZ2hlc19zZXZlcml0eShnaGVzLT5lc3RhdHVz LT5lcnJvcl9zZXZlcml0eSk7CisJCXNldiA9IGdoZXNfY3Blcl9zZXZlcml0eShnaGVzLT5lc3Rh dHVzLT5lcnJvcl9zZXZlcml0eSk7CiAJCWlmIChzZXYgPj0gR0hFU19TRVZfUEFOSUMpIHsKIAkJ CW9vcHNfYmVnaW4oKTsKIAkJCWdoZXNfcHJpbnRfcXVldWVkX2VzdGF0dXMoKTsK