From patchwork Wed Nov 15 12:00:42 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: 165315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2486633vqg; Wed, 15 Nov 2023 04:03:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkgI1caW2S/ygLseRq9jeBZwtGDVBPeBin5xARobzcR9LPykxe5m/Nff9WpBPGYgLvt1k9 X-Received: by 2002:a17:902:c403:b0:1cc:1490:e7bf with SMTP id k3-20020a170902c40300b001cc1490e7bfmr7258694plk.30.1700049803079; Wed, 15 Nov 2023 04:03:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700049803; cv=none; d=google.com; s=arc-20160816; b=H4V85QzUkovYxca0ZcGSAx2zEyZd9Q/pgSRbc51D7WfpR1IbqMo5ELNDzDYg2DoP2d xJj4xwtgG0+SNy7IbJW4bw4BZ53p8uxgVV3dSWRBFxbXPpIUvtO9XZ7AjU/I0PJKBAbG qgoyX2YSkYpKt0uuzzFrOfmwcPXEe4nM1Oi0rCmMtV5AL2oIzp8GAGOvL1GJ60ijydZp fWFRlAWN2yPcCeFTNDw6mRFUo7diF/PxVVZLasUVfJwcSnMt97r1FMLlnGV33F+MeQ6M IZZ6C2c74vtFdQPCp0ZjcO/SZqf5j32zI7B7nR7Th/FlRZ2Kr9aTB/3sW5xf98mLJcHm Mhwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jK8tL2dJndkpGmuVftMuushnGeaBuKSnOT/uI2yepis=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=aVMnspbeWSo6b8IFZqj0pb8HaSltLeD8fNMmSWq6zORlYfvUESSxXQoRQEB0wJbg8s 2IjQGaUT9MLjsxdfe6HndQnbzOIBYO3PK0V5qBfwVvP+/2CGDc7w73ITsPHH7eBBgXEe /t6YT1lnZ083eJW/tgHB6J5fOfiCc/ztJOkkkUs/H0AswTbNuXl4bbT2NrBJD5c79kir nWXdTGXX1i4so2tXvpjXzWcXogHEckqql1S9TyWPD4tdl+y2qorfCma8UtK6HEfj+GKt JPNZ/OrfR4m5o+qgaCqax3rCT+IWBkLzmTRC/DuPysk2i6KhvFRUWABDp9850RK+p+4V 2CDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=g5oI7ww2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id g7-20020a170902740700b001cc5306e870si9737659pll.542.2023.11.15.04.03.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 04:03:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=g5oI7ww2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A4CCE815D7D0; Wed, 15 Nov 2023 04:02:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343638AbjKOMCD (ORCPT + 28 others); Wed, 15 Nov 2023 07:02:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343728AbjKOMBc (ORCPT ); Wed, 15 Nov 2023 07:01:32 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CB9712C for ; Wed, 15 Nov 2023 04:01:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700049689; x=1731585689; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hDA/+p+nxM87pJNv9Ukdh1cz+IjWMOLujDQdnMnWdrA=; b=g5oI7ww2SRFSXmQtUlYHMZX2jw0uwcon0525L99KtED5uWAbrTlh7tC3 ptxgZjS2j+QYqGE9jhnOBFiAHl8wE9m/kZuv0KVDb7Hu1JqYAs/YMefaP Bk4JHmYVT/UOV3qP5yc5pW6FsHETxAIOon6oOLWNXsgvRY8tJ1dlyrpdp 9jjCpZeLjbn73GheUsSHtHsvOx9sfSiJBsK+7o3wH+RlkPuKAmOGIlQnK Zoe8tCFwiSp2/Gg9ywAn88a4223uA3nxUTQJqC91nh2z90FAyJ6ENUtv+ Fj2ZtD8NS1YofoVIpJFQWcEqxoTUvBHF6sRLrP8Q3Mufjp9OH8ZwmbqTj g==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="394780486" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="394780486" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 04:01:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="13160259" Received: from mituomis-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.44.135]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 04:01:22 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id B537610A325; Wed, 15 Nov 2023 15:01: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: [PATCHv3 12/14] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Wed, 15 Nov 2023 15:00:42 +0300 Message-ID: <20231115120044.8034-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115120044.8034-1-kirill.shutemov@linux.intel.com> References: <20231115120044.8034-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 15 Nov 2023 04:02:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782631421992509242 X-GMAIL-MSGID: 1782631421992509242 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 f7e33cea1be5..386adbb03094 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -74,7 +74,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