From patchwork Fri Dec 22 23:52:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 182813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1394718dyi; Fri, 22 Dec 2023 15:54:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3WYYDitycVjAXB8uG1ptbRx0Br5WtEY9f+yPpirvI7PtNKvSR02q/yBfW4wXYveQs0y+Y X-Received: by 2002:a05:6808:1247:b0:3b8:b063:5d75 with SMTP id o7-20020a056808124700b003b8b0635d75mr2368853oiv.92.1703289298324; Fri, 22 Dec 2023 15:54:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703289298; cv=none; d=google.com; s=arc-20160816; b=IM9g1+cSBu6XRAcgcwY7+r6EOV/HJlkhaA9WbmJjYpObE+UOWnDcimvzCTp0D1uGxc ovag2VkvbSLgiIoXuL7J/1QHYwCb/5GDdo95T7tTLt/EUab3xbux1/sd3wZ9BfFjnV9K yVV4JKP6J93eUpxjd/8HcSSJDzzbeYmPhoPbJQMYO7iuPsJK59jQFsjUlwJQtaaphwPq Kf/QIRrn9OoJq7Xuo8awybsv1U9pjf91TJqhY2pggxUr2wkW2G1UCraobBKQpzCmmV/7 Arxs1A5xVKjZdGdCW4fsvVfcgFGO6opJHaZ2SNGLKrjKSq9V8OndYw+wfjaR1va0DUvJ SLLA== ARC-Message-Signature: i=1; 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=p1UvV1+oXB5vTYvZk+fSI26F7UJZ5keyTGHTunu+y/E=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=pk+KEWkZKDW0hMa+WYKPALA0NqY5QOmLnqPZLrpBVeWjQus4wqGB2E5R1Wzja4OC9M Gh3BtvPATrfkVHvwyrUh82wYhdkdAhQtYAkVbTWiCble+jjXZkPx5LWz89nIGr9ZUfWw VSGdCipTVzTEhBuVxGDX/paXq/w9dh2fEKz2K0tQp9cZ81ohz2Lh8sukgWvIFx0elfM1 XwYJBLJBMZKCYjpz/HqbJc1XXs0QpNumt6nZTy1k2UwSNNUDfGCo71dB+nebYHsxQLc9 gM3MAYBrKttzwUs6LDXZNMhk4GkBs15PhI7L4LEj3aOnfMIN4si9Zx5VBZq5c68Ng4zQ 4Nqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=oJCYMgt+; spf=pass (google.com: domain of linux-kernel+bounces-10135-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-10135-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id a16-20020a656410000000b005cdfd1b40dasi1076458pgv.816.2023.12.22.15.54.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 15:54:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-10135-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=oJCYMgt+; spf=pass (google.com: domain of linux-kernel+bounces-10135-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-10135-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 15B86281559 for ; Fri, 22 Dec 2023 23:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EBC464BA80; Fri, 22 Dec 2023 23:52:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="oJCYMgt+" X-Original-To: linux-kernel@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (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 DFE533BB36 for ; Fri, 22 Dec 2023 23:52:28 +0000 (UTC) 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.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703289149; x=1734825149; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7FoFTq51uBWBc/7DP/gCY8Z9wa/4rlsw9x9epfDBOIM=; b=oJCYMgt+q5OJv8QpE0UO2YCyc9fBPZB7G9qnW5CObkEk+43/RrZXKi6v YAcDE8WPV/yQl1n3l5b/pRstSQhudrFG+1+4nT2/FRyIDD+TDKiodu7JO qv3SIm0cz9iDJKOtRR6khYErX48U0mxAM7LiV5s8ELXTplVPOS47+FRzN dZ+GyqPJUOWY3+i+4DEbjw9RlumkkAmzvFzA83TQVYN/yDPtk9ILTwHQV ojcbC6CG9M7PzI1akPs4QU4y1ZE7TxBqRGMaNdnB/9UdHjcrJ7FFNhJ2a kPbOgokbEsG5lRlLezVwsqatxkCxrmtjBSOSIZTCtgtolOKViJ1irx3wf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10932"; a="3414356" X-IronPort-AV: E=Sophos;i="6.04,297,1695711600"; d="scan'208";a="3414356" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 15:52:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10932"; a="726961493" X-IronPort-AV: E=Sophos;i="6.04,297,1695711600"; d="scan'208";a="726961493" Received: from jeroenke-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.35.180]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 15:52:22 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 5570C10A4DE; Sat, 23 Dec 2023 02:52:12 +0300 (+03) 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: [PATCHv5 12/16] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Sat, 23 Dec 2023 02:52:04 +0300 Message-ID: <20231222235209.32143-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231222235209.32143-1-kirill.shutemov@linux.intel.com> References: <20231222235209.32143-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: 1786028279090876726 X-GMAIL-MSGID: 1786028279090876726 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 --- 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 3751ae69432f..23b4cfb640fc 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -1109,9 +1109,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