From patchwork Wed Jan 24 12:55:53 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: 191692 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1161257dyi; Wed, 24 Jan 2024 10:05:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IERTpyMF5dqj9Oj8mG/2t57lnYUgvrkZTgVJ7jaDu1jF1khauZz1tIS1MYJ2QSJCVPM7Y6B X-Received: by 2002:a05:622a:84:b0:42a:3c46:8a88 with SMTP id o4-20020a05622a008400b0042a3c468a88mr3159725qtw.38.1706119528647; Wed, 24 Jan 2024 10:05:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706119528; cv=pass; d=google.com; s=arc-20160816; b=GzabNllMTufY+M48afNW9IODOEYmInjlAK+kwnK2Oq3a7SaLsqumvZov3a52RyCfop DZtmI10h4QVc/3/tw8kS1804QhWsjX7Rj/6rno7bVpstP4w/XmkRxop7fPSXj4oYzKuG +6PHGjLZp8sz06SX53WKhQDQL5ri5/5CMP8b0DYJP8lki5sJnY7WLxdTmAxUEgpVYGfn XMGwrqwfFudS17p5DY4eCXs9+NoCQ74HnTZbNdlfnJijhVXvQ2KxlTWV1palIbMi/C9V wfCfMreFGeR02Rk3vXz51st6Vvdic6dP43KnYAI1pQdBq8BriQ+leRMa6BGNlehTa+Cp LgSw== 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=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=xcX41xLsRugRZib5Xt/uOjPWRoWCRjuqRGcenRpouQTjp4se1Np0ksVhlmxvdR2xu0 vIjFAreuRNZjzfS3vr0xKU1UDaMdcqweyBGNOsmM1z6IgyXjbO3g0wiiPT8GdgTBcmbV 7vU5fayw/mNPOldCrGt26hy27p/wv0+GOp05hMjRb3wIIcFzgYbyyq/Jrlrt3wMWaP/+ MSdA0yBgirvQTFt0RdQzL/hWZXlNNYHktRDz/xpbDKvMYjDiKmXnHHekkI7xo9WCoD9P RplU68WyrLeOKF2a4qxfboFXUOheotUKFWYicS01adTDeHxLX7cJXyXoUyvF/BHG1wNV yIjA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HfLCulSm; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-37035-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37035-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id o16-20020a05622a139000b00429a16bf24asi10813195qtk.743.2024.01.24.10.05.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 10:05:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37035-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HfLCulSm; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-37035-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37035-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 099EE1C25D93 for ; Wed, 24 Jan 2024 12:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BD2A7E59F; Wed, 24 Jan 2024 12:57:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HfLCulSm" Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) (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 3492F7CF07 for ; Wed, 24 Jan 2024 12:57:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=134.134.136.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706101024; cv=none; b=HvLDDYe40sbCX0TIUC7pRwWVcyvoj4+Zi5KzRa/bh84nbOtIdffwHnCwGxyNEI+HR2LBgHKBBk6D1cnsNWFOQy96Z+3Z8RYDdBySkDjDWfqSKjPH7DGCFu+bCIm51TDCoREqFetUeVnA67B8LN9LxRHDkedNb+YcTGl9/PjgFJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706101024; c=relaxed/simple; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FCb9Zd8A/LEvxwAahg772FTrzaWWDOBhQWwH9fFPiyr4TlPFxscDr2IiZ4bUCTmOPI85Fu01dLrgVe6UFJ0HBioH3JiWRT4LTqkmxaDLpc4DHWe8swPUlqSTUKBsV8wVACJSQQOHOz304UsHUZEyjQ/YT6Nek+VEyuxobtT4PUU= 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=HfLCulSm; arc=none smtp.client-ip=134.134.136.31 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=1706101023; x=1737637023; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; b=HfLCulSmfy+njRM/LgmR9YOVqava4p6Qil2wlR/+W0dBTAdOJfZuI+EP AMP+B4UZwUwMGos24rRoeZ+Qv7vkeCQgxaG9P/GC7B4I1rBHdS7W+nVjP gI7vFyye4majamraQ2gyHxzHwlNVk79RoXc6eTMXHlUa5d8XAjA07zkJT gqWR+IziwBSFa6k3f83YeDjwgoNAMLLpbteAxrLL9uR+noiv7HUiZdT0X 2VSMGFAQHttfcAS3qCxXIx93JSqN8HLHfdbck4cfTgAt4V5rSIWthZUll s/EKLFNS9JNWUoO4JaGxNA9u5+VA2imKofxSIuBZTq9lnzsq/orQB5shf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="466110258" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="466110258" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2024 04:56:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="735924102" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="735924102" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 24 Jan 2024 04:56:54 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id B219CA11; Wed, 24 Jan 2024 14:56:02 +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: [PATCHv6 12/16] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Wed, 24 Jan 2024 14:55:53 +0200 Message-ID: <20240124125557.493675-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124125557.493675-1-kirill.shutemov@linux.intel.com> References: <20240124125557.493675-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: 1788995991096075312 X-GMAIL-MSGID: 1788995991096075312 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 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