From patchwork Tue Nov 21 18:04:23 2023 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: 167872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp816998vqb; Tue, 21 Nov 2023 10:06:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDEtklU3pZ+/ei2gBqKn/xQWh3S+8DX0oKeQNvaAnVLqu/569erNo7zlyQ0wMcFbzypYnV X-Received: by 2002:a05:6a20:3d0f:b0:152:4615:cb9d with SMTP id y15-20020a056a203d0f00b001524615cb9dmr5414389pzi.12.1700589996085; Tue, 21 Nov 2023 10:06:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700589996; cv=none; d=google.com; s=arc-20160816; b=a74qFAF3gOlcK2DPnlXxLVp/p5r8LP9U1gE0QBbo8cxGxbWFgTmraf2fzqjddx3ZIY ghH2vU22UNTqVvpsK8uFbP5PxbsBwaWnbMmBpT1dUOmaNAOVIgI06Mpz5xwkhF61r9LT J3JBFugm8GMnMFtUBGm+SB1gEr6U940jWE6rCi8QqlG2FGpjGkN5caFwigmP8BNEMaqU xDkE1ESkkGClq3WqIo8+apJSVxcWHpcoLV4n5I6S7uwFJs0qkBwU9QgDjSElkVvtE7tV k4gJBk3ua9Aah5GKK5OL0tO6h7djZrVGyg0fvBSV67C/7yjZd0CYVARQ577nzUDxTCVo yROg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=A/LxqX571fefzJvxDQtYiOwLG0wY6p4kB4B/l95UJkw=; fh=gCSvAiCjQla6KyNrs/5W209EqaDOm25cn5ANqCL/YRw=; b=g3LsByNRW7d1FAzrZdDw6FuFaKApT7gW+vAPpfZ/jDUPGcaCtLTE9aJtI71+Luezvc 3K6PatKpyVsVZthgr+lBJvgiWsJk+l0eDGM/WPCwJY4Zmhv9Hca617jopgZQRlKoubBK MFFurtAZDLVvTk+sodflC5l9oyDpzEm1eoJX9eI2uOKp0hcF13/peo7Psa7dWTUb8cKf KuyyoJHcpjP67qph/295sECKG5wV6M/pjBoabfluL/gLFrU1KPqD4LYOoWlIV11hMfki HFCk57GHQosjykfOZGbBHQI35NpPsUZrZn67c01hEhnAnBxC8AYIDkmojkVQsEJ5wFKf lx7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=qZzaJbPw; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 9-20020a630b09000000b005ad11a5ac8fsi11072534pgl.323.2023.11.21.10.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 10:06:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=qZzaJbPw; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id BF24080B1318; Tue, 21 Nov 2023 10:06:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234459AbjKUSFS (ORCPT + 99 others); Tue, 21 Nov 2023 13:05:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234325AbjKUSEu (ORCPT ); Tue, 21 Nov 2023 13:04:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0DB7172E; Tue, 21 Nov 2023 10:04:25 -0800 (PST) Date: Tue, 21 Nov 2023 18:04:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1700589864; 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=A/LxqX571fefzJvxDQtYiOwLG0wY6p4kB4B/l95UJkw=; b=qZzaJbPwkZiKq+Eiqyz9naVTX8WEkcw5sWLmu0+mXZmx8YbF6zCdKxo+AxyejHSh+JvQFr u71eOpgtrlQ6mVafzSNrz7ctoxb0GP2BvEf86egPD5m9Y6V5pOnLonhRsfoRk9c8o5wbBM 2SSbipmBm66qfrgAnWnD/zZfW22TZNuA+59XbhEvUQaxRJcWj0uSgD8pT97FIXNvFwjjTR 6hk3xpuYeQyXuVN7JgvQeHN8EgauEYgIFwMTP+kheKFSDynwbvQhOjcZ6xXVSS2hJCJi/j 1O8gjHwlFn+WD+XV7hN2RA7fDBCNqtiEqIdhyltO//ciieFakd6WGweYRf9ibg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1700589864; 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=A/LxqX571fefzJvxDQtYiOwLG0wY6p4kB4B/l95UJkw=; b=IWTvOBJcOvruNwk4b4kfE5hOGf+MYW5eabLK+bDsEtFmvZdLEgvjSVHARAqxS0+XYBBCus x0tQDdRg1kayKMCA== From: "tip-bot2 for Andrew Cooper" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic: Drop enum apic_delivery_modes Cc: Andrew Cooper , Thomas Gleixner , "Borislav Petkov (AMD)" , Steve Wahl , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com> References: <20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com> MIME-Version: 1.0 Message-ID: <170058986344.398.13944817922448407011.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 10:06:30 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781455253176623968 X-GMAIL-MSGID: 1783197855894003248 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 855da7cdf974f3902397e5bf9423c7442bdfd75f Gitweb: https://git.kernel.org/tip/855da7cdf974f3902397e5bf9423c7442bdfd75f Author: Andrew Cooper AuthorDate: Thu, 02 Nov 2023 12:26:20 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 21 Nov 2023 17:05:06 +01:00 x86/apic: Drop enum apic_delivery_modes The type is not used any more. Replace the constants with plain defines so they can live outside of an __ASSEMBLY__ block, allowing for more cleanup in subsequent changes. Signed-off-by: Andrew Cooper Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Steve Wahl Link: https://lore.kernel.org/r/20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com --- arch/x86/include/asm/apicdef.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 4b125e5..ddcbf00 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -20,6 +20,13 @@ */ #define IO_APIC_SLOT_SIZE 1024 +#define APIC_DELIVERY_MODE_FIXED 0 +#define APIC_DELIVERY_MODE_LOWESTPRIO 1 +#define APIC_DELIVERY_MODE_SMI 2 +#define APIC_DELIVERY_MODE_NMI 4 +#define APIC_DELIVERY_MODE_INIT 5 +#define APIC_DELIVERY_MODE_EXTINT 7 + #define APIC_ID 0x20 #define APIC_LVR 0x30 @@ -430,14 +437,5 @@ struct local_apic { #define BAD_APICID 0xFFFFu #endif -enum apic_delivery_modes { - APIC_DELIVERY_MODE_FIXED = 0, - APIC_DELIVERY_MODE_LOWESTPRIO = 1, - APIC_DELIVERY_MODE_SMI = 2, - APIC_DELIVERY_MODE_NMI = 4, - APIC_DELIVERY_MODE_INIT = 5, - APIC_DELIVERY_MODE_EXTINT = 7, -}; - #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_APICDEF_H */