From patchwork Tue Jan 30 18:36:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 194266 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1421358dyb; Tue, 30 Jan 2024 10:37:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqKjySEKuaRz+RFm66ltw9Klq8YQrN3WbFNl4qgHIoEv6xM+fMxKqbo3qccpbKRDfGl1Ez X-Received: by 2002:a17:906:f281:b0:a31:616c:7a7 with SMTP id gu1-20020a170906f28100b00a31616c07a7mr7143805ejb.16.1706639857510; Tue, 30 Jan 2024 10:37:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706639857; cv=pass; d=google.com; s=arc-20160816; b=dlN5zmOrSpItvO4PdgFcXYn6Jcf+GMgwC55b2A1AY1FeMjFTtbOeSYK1r3zUKtgoKc 4RJVzQVdC6kk5EpYSQd8eQKDDdSC/RrnSDBTPhRuoBXSUxL0tWeJv6Leajk1t/tFupKC Dw721mO4MjBK6o88XAVONMkiR3FH5lUCBf23uAGiVTao2WsOChLeZmKUAsnGDjeSJZof xFM3bjcdkp8j+6FgAZZLK0lTHOF2QWzuvcyW7X6hS7ZWU2W1YjKyU+yaPM7zdgUP0Xif 1p/SGloyilNYWv6OAmLAbORhyNbJpmFgEo5+1784yECpFjjBcT2dKuCZQzQPOVjIiYca m5yQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=toA+ptjEM+2DWWvx60arfsDl7c0WFLQQBhrY2zAl8TE=; fh=Zae8cKprCakNRQPqjfyetrGrVHocMNyGPJxWktRt3nA=; b=iHHs3kdI0iMBnrZwFX4ECAYrmfHTL4nnv9tyqkGW9JUHs0blKMS26q2tgD62Es/n3t Ep/VtVS8+IOqwMErxx2AAa2g04JV3uvhBLvxQBOVy7X+fRZ0hJ/2kcW4ZKQiRHUKvpCg q438sbAblQpQjHEnR5QserDJo0XKCFQZFKXnVpe39jjvB8XnqbKr+uqCyU0CWFsRmWnE NhXIkytd+EgutLxIrpNmRMRfwGQnm6P3Z1u743F1Sdt+Q+Tk4omDNeEKCPXTMHMNQG6n zbKu+KMrpjcNureSSwRgE4X9p7SqLQ8ozlkqnd6wtoi1WKiyrOfPEuGO1JKM4zndV2Q0 0AhQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=w8BJrVhp; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-45123-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45123-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ay6-20020a170906d28600b00a363c47a20csi474720ejb.595.2024.01.30.10.37.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 10:37:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45123-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=w8BJrVhp; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-45123-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45123-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 F12C41F21954 for ; Tue, 30 Jan 2024 18:37:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C3B48762FA; Tue, 30 Jan 2024 18:36:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="w8BJrVhp"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="52+WYad/" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 5435778B42; Tue, 30 Jan 2024 18:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706639797; cv=none; b=oztshq6t1IacSs7/h5uasPRFAjLhDdmstLSia1+esKiE5HiE2ePOY5QWUEls+6TmIFhfimDVtjQc3zRiDTDmfo1ryy/QhRfCcRxixvweocAu9oc/DNM6KW0QmvHjCvpoe3O0X9WsgYxMA3qW2tgbcDyCTcelkJdYlaxT73FoHxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706639797; c=relaxed/simple; bh=NiNBvrR40otFTHJ097OMe57DnR7feDP4DZbaBZfGXaI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=U3GndbQC2JdA+OvmEn18Ywp+GIoT6cwVV25UT8K5avFbkDOQ/lWmaQRuVolAmmJQKRCLix3B5VjDS8Tde8rwaGrSi7YMrFk24thInk8yuaeDk1eGqsTFOsR7vk3w8xNScDQoqdCU8uknpfV8Fv7H/Tm8FTveppakoaSYg5NeeYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=w8BJrVhp; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=52+WYad/; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Tue, 30 Jan 2024 18:36:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706639793; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toA+ptjEM+2DWWvx60arfsDl7c0WFLQQBhrY2zAl8TE=; b=w8BJrVhp0sa2DflwlV5BorJcSBrONChZhwM6CjhxryeenBq6cvHyQZWwuZnRIW+tMo50zO duktHWhgyuRTzS9kPS0gmhq1oqSXufefuKDYvyv+sm1yZKI3PtJBbCFzMdcg3eBh2PQ6EC TO/xF2Fffi98bBU435wqIwaoAL+iDHiO0HrZDsuKCF6f5As86/0DIbJvOZh6wPL/l3DXeG uueoI2qH/6kDrKqm3hkpYfcrGD4rCtm0UWGVifG0+1/v6hDzG4KCq5tOxQMry40r4Wz8O8 tSa075VEJ520xdtDVT/OAnkf2rUDVGoAOKDdFPKTX+df1I/s3uyAZqzOGn6JWg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706639793; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toA+ptjEM+2DWWvx60arfsDl7c0WFLQQBhrY2zAl8TE=; b=52+WYad/8TR4cya2buyJY0onwyGV25IpH344TXtIf3wPldyWf5MVTHdZOYASVUuUMJZetz Djr7EDUks9DBiMCw== From: "tip-bot2 for Thomas Zimmermann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/build] x86/setup: Move UAPI setup structures into setup_data.h Cc: Ard Biesheuvel , Thomas Zimmermann , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240112095000.8952-2-tzimmermann@suse.de> References: <20240112095000.8952-2-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170663979304.398.5831265739764610531.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789541595230427119 X-GMAIL-MSGID: 1789541595230427119 The following commit has been merged into the x86/build branch of tip: Commit-ID: efd7def00406ac57400501cdc76d0d95d4691927 Gitweb: https://git.kernel.org/tip/efd7def00406ac57400501cdc76d0d95d4691927 Author: Thomas Zimmermann AuthorDate: Fri, 12 Jan 2024 10:44:36 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 30 Jan 2024 15:17:06 +01:00 x86/setup: Move UAPI setup structures into setup_data.h The type definition of struct pci_setup_rom in requires struct setup_data from . Many drivers include , but do not use boot parameters. Changes to bootparam.h or its included header files could easily trigger a large, unnecessary rebuild of the kernel. Moving struct setup_data and related code into its own header file avoids including in . Instead include the new header and remove the include statement for x86_init.h, which is unnecessary but pulls in bootparams.h. Suggested-by: Ard Biesheuvel Signed-off-by: Thomas Zimmermann Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20240112095000.8952-2-tzimmermann@suse.de --- arch/x86/include/asm/pci.h | 2 +- arch/x86/include/uapi/asm/bootparam.h | 72 +---------------------- arch/x86/include/uapi/asm/setup_data.h | 83 +++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 72 deletions(-) create mode 100644 arch/x86/include/uapi/asm/setup_data.h diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index b40c462..f6100df 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include struct pci_sysdata { int domain; /* PCI domain */ diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 01d19fc..4a38e79 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -2,21 +2,7 @@ #ifndef _ASM_X86_BOOTPARAM_H #define _ASM_X86_BOOTPARAM_H -/* setup_data/setup_indirect types */ -#define SETUP_NONE 0 -#define SETUP_E820_EXT 1 -#define SETUP_DTB 2 -#define SETUP_PCI 3 -#define SETUP_EFI 4 -#define SETUP_APPLE_PROPERTIES 5 -#define SETUP_JAILHOUSE 6 -#define SETUP_CC_BLOB 7 -#define SETUP_IMA 8 -#define SETUP_RNG_SEED 9 -#define SETUP_ENUM_MAX SETUP_RNG_SEED - -#define SETUP_INDIRECT (1<<31) -#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT) +#include /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF @@ -48,22 +34,6 @@ #include #include