From patchwork Mon Feb 12 10:44:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 199847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2460473dyd; Mon, 12 Feb 2024 06:26:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEcxZQSmSpXv9yfFqZdyE1Zd6/MZ6MNT89Temnv4jgCElS3yBw6xfZe8GcdHXKq8Klf3pB X-Received: by 2002:a17:906:4919:b0:a3c:8300:f4e3 with SMTP id b25-20020a170906491900b00a3c8300f4e3mr2953710ejq.11.1707747978625; Mon, 12 Feb 2024 06:26:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707747978; cv=pass; d=google.com; s=arc-20160816; b=R2P94v3NOJw43QMDAr6lcEAmieKQT2g+cntEKcrO3nwbcyavY6qZvIMwnb+uSh49h1 0ekZQBDO4I5KCFioUTxQ1z6FFAqgxlF0YFXeGVFb/MwVr6+3LqvpC+QTePlmkSIy12vi szs4OdyJFNa5H1RlBi7zpdJVC1hkTKxFEzRpej46dNoMWI36B3uR9KNZwUf1Fw6iD9uA fM0qH4IkVf0YN+tTaVwNc5IszgKvxUGNmTXCIwTyfTQPCJAPWUKqyNII1rbZxT0q5oRg 5dnpCFXoHIf9eoNMbYuL/gmQCspNKelEuJr0wIy5O+zdCRkT+nV9Zolv820KXoqbecXq 55Cw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fABvBnrgE/PLl1NAhjF5Rw+aQz9r1T2Knjys8UFYPbY=; fh=qah/dMzqd9u/7NyezSf6FBwhiFF2g1KeuVjpmksiXVM=; b=S6UkMvdErjmDowQe/1rfx1S4B0E3luaPrOG36qSjR+A2Jj16DhtqVodgfjuiWFO0tK a4TALOIFRmsBC5sVlpm6iM4h2TWiniPrE2/97t2tZzn+wYrSeHCCBhP9nFpCo9qo3rPF Elgpx/sPXukRHYOBOp2NAPLO4cywxBxWddJMBEWXF5YHISY3qS1z5ZPreCVKVRPd0con RzhlDt2x8mrDZYma2QYBl8K6fPKZJqbs3AvqG/TsPiDtJWbC6CYzzhOqEs7qEr7HEpYA eDifAaBTkfEZgAMuXlwGhzBmjpA+1ivCRR8MHoLG+CfZtS/OAhBWZTjtKn6PdrOs9XEx zQHQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DeN7SviZ; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-61359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61359-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCVUy0mZlpJB9Ot0TqAYeGcEcoTpnDCE4ylFQkxqZRPS1rUIDzluSrTH0npv4ZIIIC5r5jLJYbhzJUXeiBr21FIm1O4dpQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id lf22-20020a170906ae5600b00a3c10f092dasi230366ejb.437.2024.02.12.06.26.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 06:26:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DeN7SviZ; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-61359-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61359-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8872C1F26491 for ; Mon, 12 Feb 2024 10:49:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 303093CF68; Mon, 12 Feb 2024 10:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="DeN7SviZ" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 530FF3B7AC for ; Mon, 12 Feb 2024 10:45:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734711; cv=none; b=jgylgaFGJhnv7sSs0AreWsmG4MI0FqR8pLt9EhcOVbrdPBF75Tieng2TFXZiDz48pxv4RbkoFSYZag0wYl1cQmB/aO6dOYHwmtyntMixIrNImEKiiOj1+u89oWIWLZDZFHryHaOAzQeeLAn3qZIq0exd6ZHNKv8ZQBxYbgYzWgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734711; c=relaxed/simple; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=abzYJ0bun/+E+AGzIc5NDZAVD5tMhrimDTW+zxwYAtCvSzitU1PAHAs69xMSlzXOVmTjKUxNwqmZKLXc8e9CQhp9wad4Yulhl2agwqEiwJ11orfVgodG+041GMfGp21Hdo+AYC6a4ggAP7lmgamYLB38FSgsAIGmJS9BC1mWGPI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=DeN7SviZ; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707734709; x=1739270709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; b=DeN7SviZTPHjNGdXrj5nUEMz/AJGS19RyOJooTMo595qwycG8LL9Rjti ANBPLWJHrSRvzLGgqJeq7xvAFmtr3YR1CN3Wo5QNzMCdbau8GIrPKs90+ eCe7wkqaEhdN1E+r+UQgwzvURqpdm+sYN8IvQJQgGOOjGX2UfsD1SgPg6 yHvkYNNEHPzkUz2HfroPupmL0dP5PHtykDlA3Kx09I0AZUMUt3fKnjxFo TbIKfk+AO1EUPiNzJQqbsUzOJUq4MGriyyHXtz21ebP5DMdSiudLTfyJ/ fpM+cHGTDcDBWkSIdUCcsPHYQVa1CB2N1cjRyRXkJOxzk+0dOjb6B39Qy A==; X-IronPort-AV: E=McAfee;i="6600,9927,10981"; a="1585100" X-IronPort-AV: E=Sophos;i="6.05,263,1701158400"; d="scan'208";a="1585100" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 02:45:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10981"; a="935035608" X-IronPort-AV: E=Sophos;i="6.05,262,1701158400"; d="scan'208";a="935035608" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 12 Feb 2024 02:45:00 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 8994A682; Mon, 12 Feb 2024 12:44:53 +0200 (EET) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , "Kalra, Ashish" , Sean Christopherson , "Huang, Kai" , Baoquan He , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv7 12/16] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Mon, 12 Feb 2024 12:44:44 +0200 Message-ID: <20240212104448.2589568-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104448.2589568-1-kirill.shutemov@linux.intel.com> References: <20240212104448.2589568-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790703544106825572 X-GMAIL-MSGID: 1790703544106825572 To prepare for the addition of support for MADT wakeup structure version 1, it is necessary to provide more appropriate names for the fields in the structure. The field 'mailbox_version' renamed as 'version'. This field signifies the version of the structure and the related protocols, rather than the version of the mailbox. This field has not been utilized in the code thus far. The field 'base_address' renamed as 'mailbox_address' to clarify the kind of address it represents. In version 1, the structure includes the reset vector address. Clear and distinct naming helps to prevent any confusion. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kai Huang Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Thomas Gleixner --- arch/x86/kernel/acpi/madt_wakeup.c | 2 +- include/acpi/actbl2.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index d222be8d7a07..004801b9b151 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -75,7 +75,7 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, acpi_table_print_madt_entry(&header->common); - acpi_mp_wake_mailbox_paddr = mp_wake->base_address; + acpi_mp_wake_mailbox_paddr = mp_wake->mailbox_address; cpu_hotplug_disable_offlining(); diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 9775384d61c6..e1a395af7591 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -1117,9 +1117,9 @@ struct acpi_madt_generic_translator { struct acpi_madt_multiproc_wakeup { struct acpi_subtable_header header; - u16 mailbox_version; + u16 version; u32 reserved; /* reserved - must be zero */ - u64 base_address; + u64 mailbox_address; }; #define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032