From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v2 4/5] ACPI / extlog: Switch to use new generic UUID API Date: Wed, 31 May 2017 22:41:51 +0300 Message-ID: <20170531194152.65927-5-andriy.shevchenko@linux.intel.com> References: <20170531194152.65927-1-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170531194152.65927-1-andriy.shevchenko@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Christoph Hellwig , linux-kernel@vger.kernel.org, "Rafael J . Wysocki " , linux-acpi@vger.kernel.org, Dan Williams , Mika Westerberg , Borislav Petkov , intel-gfx@lists.freedesktop.org Cc: Andy Shevchenko List-Id: linux-acpi@vger.kernel.org VGhlcmUgYXJlIG5ldyB0eXBlcyBhbmQgaGVscGVycyB0aGF0IGFyZSBzdXBwb3NlZCB0byBiZSB1 c2VkIGluIG5ldyBjb2RlLgoKQXMgYSBwcmVwYXJhdGlvbiB0byBnZXQgcmlkIG9mIGxlZ2FjeSB0 eXBlcyBhbmQgQVBJIGZ1bmN0aW9ucyBkbwp0aGUgY29udmVyc2lvbiBoZXJlLgoKQ2M6IEJvcmlz bGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogQW5keSBTaGV2Y2hlbmtvIDxh bmRyaXkuc2hldmNoZW5rb0BsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9hY3BpL2FjcGlf ZXh0bG9nLmMgfCAyMCArKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvYWNwaS9h Y3BpX2V4dGxvZy5jIGIvZHJpdmVycy9hY3BpL2FjcGlfZXh0bG9nLmMKaW5kZXggNTAyZWE0ZGMy MDgwLi42YjEwMWQ1OTVjY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYWNwaS9hY3BpX2V4dGxvZy5j CisrKyBiL2RyaXZlcnMvYWNwaS9hY3BpX2V4dGxvZy5jCkBAIC0xNDEsOSArMTQxLDkgQEAgc3Rh dGljIGludCBleHRsb2dfcHJpbnQoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYiwgdW5zaWduZWQg bG9uZyB2YWwsCiAJaW50CWNwdSA9IG1jZS0+ZXh0Y3B1OwogCXN0cnVjdCBhY3BpX2hlc3RfZ2Vu ZXJpY19zdGF0dXMgKmVzdGF0dXMsICp0bXA7CiAJc3RydWN0IGFjcGlfaGVzdF9nZW5lcmljX2Rh dGEgKmdkYXRhOwotCWNvbnN0IHV1aWRfbGUgKmZydV9pZCA9ICZOVUxMX1VVSURfTEU7CisJY29u c3QgZ3VpZF90ICpmcnVfaWQgPSAmZ3VpZF9udWxsOwogCWNoYXIgKmZydV90ZXh0ID0gIiI7Ci0J dXVpZF9sZSAqc2VjX3R5cGU7CisJZ3VpZF90ICpzZWNfdHlwZTsKIAlzdGF0aWMgdTMyIGVycl9z ZXE7CiAKIAllc3RhdHVzID0gZXh0bG9nX2Vsb2dfZW50cnlfY2hlY2soY3B1LCBiYW5rKTsKQEAg LTE2NSwxMSArMTY1LDExIEBAIHN0YXRpYyBpbnQgZXh0bG9nX3ByaW50KHN0cnVjdCBub3RpZmll cl9ibG9jayAqbmIsIHVuc2lnbmVkIGxvbmcgdmFsLAogCWVycl9zZXErKzsKIAlnZGF0YSA9IChz dHJ1Y3QgYWNwaV9oZXN0X2dlbmVyaWNfZGF0YSAqKSh0bXAgKyAxKTsKIAlpZiAoZ2RhdGEtPnZh bGlkYXRpb25fYml0cyAmIENQRVJfU0VDX1ZBTElEX0ZSVV9JRCkKLQkJZnJ1X2lkID0gKHV1aWRf bGUgKilnZGF0YS0+ZnJ1X2lkOworCQlmcnVfaWQgPSAoZ3VpZF90ICopZ2RhdGEtPmZydV9pZDsK IAlpZiAoZ2RhdGEtPnZhbGlkYXRpb25fYml0cyAmIENQRVJfU0VDX1ZBTElEX0ZSVV9URVhUKQog CQlmcnVfdGV4dCA9IGdkYXRhLT5mcnVfdGV4dDsKLQlzZWNfdHlwZSA9ICh1dWlkX2xlICopZ2Rh dGEtPnNlY3Rpb25fdHlwZTsKLQlpZiAoIXV1aWRfbGVfY21wKCpzZWNfdHlwZSwgQ1BFUl9TRUNf UExBVEZPUk1fTUVNKSkgeworCXNlY190eXBlID0gKGd1aWRfdCAqKWdkYXRhLT5zZWN0aW9uX3R5 cGU7CisJaWYgKCFndWlkX2VxdWFsKHNlY190eXBlLCAmQ1BFUl9TRUNfUExBVEZPUk1fTUVNKSkg ewogCQlzdHJ1Y3QgY3Blcl9zZWNfbWVtX2VyciAqbWVtID0gKHZvaWQgKikoZ2RhdGEgKyAxKTsK IAkJaWYgKGdkYXRhLT5lcnJvcl9kYXRhX2xlbmd0aCA+PSBzaXplb2YoKm1lbSkpCiAJCQl0cmFj ZV9leHRsb2dfbWVtX2V2ZW50KG1lbSwgZXJyX3NlcSwgZnJ1X2lkLCBmcnVfdGV4dCwKQEAgLTE4 MiwxNyArMTgyLDE3IEBAIHN0YXRpYyBpbnQgZXh0bG9nX3ByaW50KHN0cnVjdCBub3RpZmllcl9i bG9jayAqbmIsIHVuc2lnbmVkIGxvbmcgdmFsLAogCiBzdGF0aWMgYm9vbCBfX2luaXQgZXh0bG9n X2dldF9sMWFkZHIodm9pZCkKIHsKLQl1OCB1dWlkWzE2XTsKKwlndWlkX3QgZ3VpZDsKIAlhY3Bp X2hhbmRsZSBoYW5kbGU7CiAJdW5pb24gYWNwaV9vYmplY3QgKm9iajsKIAotCWFjcGlfc3RyX3Rv X3V1aWQoZXh0bG9nX2RzbV91dWlkLCB1dWlkKTsKLQorCWlmIChndWlkX3BhcnNlKGV4dGxvZ19k c21fdXVpZCwgJmd1aWQpKQorCQlyZXR1cm4gZmFsc2U7CiAJaWYgKEFDUElfRkFJTFVSRShhY3Bp X2dldF9oYW5kbGUoTlVMTCwgIlxcX1NCIiwgJmhhbmRsZSkpKQogCQlyZXR1cm4gZmFsc2U7Ci0J aWYgKCFhY3BpX2NoZWNrX2RzbShoYW5kbGUsIHV1aWQsIEVYVExPR19EU01fUkVWLCAxIDw8IEVY VExPR19GTl9BRERSKSkKKwlpZiAoIWFjcGlfY2hlY2tfZHNtKGhhbmRsZSwgZ3VpZC5iLCBFWFRM T0dfRFNNX1JFViwgMSA8PCBFWFRMT0dfRk5fQUREUikpCiAJCXJldHVybiBmYWxzZTsKLQlvYmog PSBhY3BpX2V2YWx1YXRlX2RzbV90eXBlZChoYW5kbGUsIHV1aWQsIEVYVExPR19EU01fUkVWLAor CW9iaiA9IGFjcGlfZXZhbHVhdGVfZHNtX3R5cGVkKGhhbmRsZSwgZ3VpZC5iLCBFWFRMT0dfRFNN X1JFViwKIAkJCQkgICAgICBFWFRMT0dfRk5fQUREUiwgTlVMTCwgQUNQSV9UWVBFX0lOVEVHRVIp OwogCWlmICghb2JqKSB7CiAJCXJldHVybiBmYWxzZTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbdEaTnC (ORCPT ); Wed, 31 May 2017 15:43:02 -0400 Received: from mga04.intel.com ([192.55.52.120]:10978 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbdEaTmr (ORCPT ); Wed, 31 May 2017 15:42:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,275,1493708400"; d="scan'208";a="863253518" From: Andy Shevchenko To: Christoph Hellwig , linux-kernel@vger.kernel.org, "Rafael J . Wysocki " , linux-acpi@vger.kernel.org, Dan Williams , Mika Westerberg , Borislav Petkov , intel-gfx@lists.freedesktop.org Cc: Andy Shevchenko Subject: [PATCH v2 4/5] ACPI / extlog: Switch to use new generic UUID API Date: Wed, 31 May 2017 22:41:51 +0300 Message-Id: <20170531194152.65927-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170531194152.65927-1-andriy.shevchenko@linux.intel.com> References: <20170531194152.65927-1-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are new types and helpers that are supposed to be used in new code. As a preparation to get rid of legacy types and API functions do the conversion here. Cc: Borislav Petkov Signed-off-by: Andy Shevchenko --- drivers/acpi/acpi_extlog.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index 502ea4dc2080..6b101d595ccc 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c @@ -141,9 +141,9 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, int cpu = mce->extcpu; struct acpi_hest_generic_status *estatus, *tmp; struct acpi_hest_generic_data *gdata; - const uuid_le *fru_id = &NULL_UUID_LE; + const guid_t *fru_id = &guid_null; char *fru_text = ""; - uuid_le *sec_type; + guid_t *sec_type; static u32 err_seq; estatus = extlog_elog_entry_check(cpu, bank); @@ -165,11 +165,11 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, err_seq++; gdata = (struct acpi_hest_generic_data *)(tmp + 1); if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID) - fru_id = (uuid_le *)gdata->fru_id; + fru_id = (guid_t *)gdata->fru_id; if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) fru_text = gdata->fru_text; - sec_type = (uuid_le *)gdata->section_type; - if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) { + sec_type = (guid_t *)gdata->section_type; + if (!guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { struct cper_sec_mem_err *mem = (void *)(gdata + 1); if (gdata->error_data_length >= sizeof(*mem)) trace_extlog_mem_event(mem, err_seq, fru_id, fru_text, @@ -182,17 +182,17 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, static bool __init extlog_get_l1addr(void) { - u8 uuid[16]; + guid_t guid; acpi_handle handle; union acpi_object *obj; - acpi_str_to_uuid(extlog_dsm_uuid, uuid); - + if (guid_parse(extlog_dsm_uuid, &guid)) + return false; if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) return false; - if (!acpi_check_dsm(handle, uuid, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR)) + if (!acpi_check_dsm(handle, guid.b, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR)) return false; - obj = acpi_evaluate_dsm_typed(handle, uuid, EXTLOG_DSM_REV, + obj = acpi_evaluate_dsm_typed(handle, guid.b, EXTLOG_DSM_REV, EXTLOG_FN_ADDR, NULL, ACPI_TYPE_INTEGER); if (!obj) { return false; -- 2.11.0