From patchwork Tue Feb 27 18:16:12 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: 207398 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2922457dyb; Tue, 27 Feb 2024 11:36:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWm7a4KztESRxOTeJS2A3/NN03WEc7oF2xxwJ47K5GECStTrmarDFYl9iTDpn0KxEG5t5/X4G6ed201+B39qve/+CmMhA== X-Google-Smtp-Source: AGHT+IG5i4oODfLKPpM5lHiev8TOk7XOa4ap57ZtMPGueLz9gNnfLy1qxBJuVmIfZE1AhQa3wC0n X-Received: by 2002:a92:cf4d:0:b0:365:13c0:1bc3 with SMTP id c13-20020a92cf4d000000b0036513c01bc3mr11158297ilr.20.1709062573761; Tue, 27 Feb 2024 11:36:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709062573; cv=pass; d=google.com; s=arc-20160816; b=acFsoLjA7StqksgbcEzof7pFlnsXSLV39V1w1AGCmhiApeUKZT9+bj/7xgOXxwQj8X wivSt9v7SJLx7IUeDk7PHV2kawCSiwd1QAcc6YGwfBgozvVqQDqZjuHU1egrF3e/7wdg YzndFAbJ+OiM5pispzRKzaM2pIEPTh/UoAeKzutRB0OLskkfxM1gWYDNk0DuCTBM4yzh qa/wixU8z2AbREoCBHYDH+veWG3QxawDVtONsr1F+6pl4sqQrBB025/L3yUCR53OT11T Xl4FPQbBaEwe8ES5sNAMVj3UoBmy+GYwkLI0N2NR8D4fLJkWH78AKT/RjoMTq3arzrwO e/kA== 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=AVEV88nKNoIGRoN6jLJGETp6IpieD91egrPIJi3P70nG0vJ66d0urH+a9jvbzmCE+D yZvjP1hn9xqdai1ANIshHdvgITFG7xzzdwxcImcnltyIOADFzDBBtr1+hpTVAfhoavbn 9RZ8dUVY6Il4eV0H8aksFR3GIfZg42o8FDB4O8QNLO61MHwPB6wKk10VQfyN7vcKaT9V 1q6ZZ5YF0+p782IPX5Y+sykjYtJGpWow8fpp+zhxeN3JV8C0rpFb/kaGmwSApLF4g5Ca DG9VU40uCQL29veLKS6lyvESGltC67sje2RVDhWBfkCK/AKzPl/uX+LxHY2W/aYHGkPS Tl5Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BZH7q81e; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-83818-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-83818-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 66-20020a630045000000b005dc846e12adsi5882985pga.655.2024.02.27.11.36.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 11:36:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-83818-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=BZH7q81e; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-83818-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-83818-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 5154A28EC2F for ; Tue, 27 Feb 2024 18:19:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 39A2F14AD23; Tue, 27 Feb 2024 18:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BZH7q81e" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 C2DD514C58D for ; Tue, 27 Feb 2024 18:17:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709057824; cv=none; b=aMPzvRc4NxR4PHPOSr/T09UJEGAGsdzRhtb68egYQV7bVvsvEtIZ2z0BOKSEs73LeMqeelhkHmo30h4GsDaIZEGct1XobKbJpIpuwcypEnScZfbrglQUKvu3gG6dkVvlwiBIPV78DQJD1g4hisZeFQ+vTedBPsWglObRQ58nZ0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709057824; c=relaxed/simple; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aHO6YiAdT+Z7mFWMNWdgJS2nvJvsH09Y1xe38wybLRFoEPM2978MXZOwm7ZoSjmQHpmWlmeZgidv7E52NgWI+K+WtDnoyDzTWm6AU8itSEntxgvj6SRylNkUIF2AOgnIEHMo4fBzAH5WTghNObTUs4CWq3KUZSfdKPqZMP0fZ4E= 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=BZH7q81e; arc=none smtp.client-ip=192.198.163.8 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=1709057823; x=1740593823; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z3vEItFOpb/ayuVNTPFqaC8pjBMvLFGfG4ld+bFARLw=; b=BZH7q81eedKj1aD1Vz0Rp78ESIY+Fgk28xF1SHRMS+pIwApQV3ots0a2 MTJUW+6uBwUAVmYMeyRCv+6Wes8zfNLOEFRmbRJ8hl3s3xGKfQxTdU70L kgRkBEjMg2hvnOj43p6Tgx/vmkkHIxScdY5joCmg9o4BiXk3BAV2kA0JB MmcWtkbWLUNQVdNoh15Ul9xRrMkEv/MWDbUg1qjmvAI1+7+KVj3F1CAW+ 02bjnNTMvOgFXE49OX4VouCgNzYIf8saUbMGfWJphbb9c9TDoFdLkUN5j TXefKV0lcbjp5ZUom2uPJTdosVMR9NG1JpJ14R7YJJfPEXB0cJ/eb5wAW w==; X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="20966148" X-IronPort-AV: E=Sophos;i="6.06,188,1705392000"; d="scan'208";a="20966148" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 10:16:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="937032736" X-IronPort-AV: E=Sophos;i="6.06,188,1705392000"; d="scan'208";a="937032736" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 27 Feb 2024 10:16:26 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id D5470A0D; Tue, 27 Feb 2024 20:16:19 +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: [PATCHv8 12/16] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Tue, 27 Feb 2024 20:16:12 +0200 Message-ID: <20240227181616.3032032-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240227181616.3032032-1-kirill.shutemov@linux.intel.com> References: <20240227181616.3032032-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: 1792081997169822382 X-GMAIL-MSGID: 1792081997169822382 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