From patchwork Fri Nov 8 20:11:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D9CDD64084 for ; Fri, 8 Nov 2024 20:12:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832903.1248216 (Exim 4.92) (envelope-from ) id 1t9VKv-00034O-Ju; Fri, 08 Nov 2024 20:12:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832903.1248216; Fri, 08 Nov 2024 20:12:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VKv-00033w-GE; Fri, 08 Nov 2024 20:12:05 +0000 Received: by outflank-mailman (input) for mailman id 832903; Fri, 08 Nov 2024 20:12:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VKt-0002pM-Bo for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 20:12:03 +0000 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [2a00:1450:4864:20::52a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b6397e88-9e0d-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 21:12:00 +0100 (CET) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5cece886771so4338110a12.0 for ; Fri, 08 Nov 2024 12:12:00 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cf03b5d7e6sm2334739a12.14.2024.11.08.12.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 12:11:55 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b6397e88-9e0d-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MmEiLCJoZWxvIjoibWFpbC1lZDEteDUyYS5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImI2Mzk3ZTg4LTllMGQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDk2NzIwLjI0NDUzMiwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731096719; x=1731701519; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8MMy8e2dl3W/FfU86BORT7sNQ1T6E9mw4dCgXuqbc4E=; b=WzqXc+q3NyawmmIsDQeQldVe7iVabSMcmdSQ54HRXyzFUx+dJhGEE+RAhe+uG0BQf+ V/9g/pOxdgd+VZykLwgbhx64FiZ5Q3gf61dNL9D+wL/RTU2I/x9OURYB3UrdThmn4PcV M9K7i9QGrM3Yz7RxVjbiM7SrqQeqRbKp/20KY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731096719; x=1731701519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8MMy8e2dl3W/FfU86BORT7sNQ1T6E9mw4dCgXuqbc4E=; b=ciRK04agTH8GvEI/SNta5X3uAVTkRDKzvd/ig11z5BrHZ91zPj6jmaia36SoyBz0aE uPV7It+2DMxDMU0R+N+/XaKGwoOP8UH3+rFdPnB9cTwWRslDNbugNqXX7GohaSae4D+E AEdRZUUh5KUCyQmoOwP5NanIRLbjpANN+e7h0pVx+k6TWxEKTomewl8x52AfecblaPc0 QDNIMvVSp02wLb7uM7Rpe1qzUdLAODNBLVonTV0a5KQbA/y5pYbn8G25rVv4wPOgO2cB yw/LE5TmICY4OdBs4lZ8UAoZn4eErzQdiMMCiAGfTWdHDb49VdI/ZtUBcIcNDlYDLbE5 dS6A== X-Gm-Message-State: AOJu0YxirEo4lAoc+8BYJYDI6Mrs23DoQZzUeLgT0bfb691MqNH+8PrU 3IT7nOSPNFno3rM5LzQFJzMtfK3ZAXyw5KOnrugs359ZZ7WTcvkxQPYQ5F4mFDJ2OnoZt/J3KtL 0 X-Google-Smtp-Source: AGHT+IHBTmngeNBjGTDSUpzBLDTzycAJDBAwbriOJKsg/gpCD6Nh1KlwxMASrNZyXJ6btFUQXyhsOg== X-Received: by 2002:a50:fb89:0:b0:5cf:a27:c87e with SMTP id 4fb4d7f45d1cf-5cf0a27c98dmr3327773a12.10.1731096718640; Fri, 08 Nov 2024 12:11:58 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 1/4] x86: Move mach-default/irq_vectors.h to asm/irq-vectors.h Date: Fri, 8 Nov 2024 20:11:44 +0000 Message-Id: <20241108201147.812036-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108201147.812036-1-andrew.cooper3@citrix.com> References: <20241108201147.812036-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 irq_vectors.h is included by with multiple paths. Move it to be a regular header instead. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/apic.c | 3 ++- xen/arch/x86/cpu/vpmu.c | 4 +++- xen/arch/x86/i8259.c | 2 +- .../include/asm/{mach-default/irq_vectors.h => irq-vectors.h} | 0 xen/arch/x86/io_apic.c | 2 +- xen/arch/x86/irq.c | 2 +- xen/arch/x86/msi.c | 2 +- xen/arch/x86/pv/hypercall.c | 3 ++- xen/arch/x86/pv/traps.c | 2 +- xen/arch/x86/smp.c | 2 +- xen/arch/x86/smpboot.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 2 +- 14 files changed, 17 insertions(+), 13 deletions(-) rename xen/arch/x86/include/asm/{mach-default/irq_vectors.h => irq-vectors.h} (100%) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 8f192f80b852..8e8ff4d155ff 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -26,6 +26,8 @@ #include #include #include + +#include #include #include #include @@ -38,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index a5bb1689c7d5..c28192ea2662 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -13,13 +13,15 @@ #include #include #include + +#include #include #include #include #include #include #include -#include + #include #include diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index 10ddd2b0fbbf..a14f20bdf676 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -19,9 +19,9 @@ #include #include #include +#include #include #include -#include /* * This is the 'legacy' 8259A Programmable Interrupt Controller, diff --git a/xen/arch/x86/include/asm/mach-default/irq_vectors.h b/xen/arch/x86/include/asm/irq-vectors.h similarity index 100% rename from xen/arch/x86/include/asm/mach-default/irq_vectors.h rename to xen/arch/x86/include/asm/irq-vectors.h diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 13daebc10a97..12cc4a561d14 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include #include -#include #include #include diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 6340cd6dd73d..e56bacc88d84 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -25,11 +25,11 @@ #include #include #include +#include #include #include #include -#include #include /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */ diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 68d6e25178a9..be5ef99e088f 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include #include -#include #include #include #include diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 4294e930128b..2febade44b73 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -11,9 +11,10 @@ #include #include #include + #include +#include #include -#include /* Forced inline to cause 'compat' to be evaluated at compile time. */ static void always_inline diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index ed8aa97382b7..fd1597d0bdea 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -13,10 +13,10 @@ #include #include +#include #include #include #include -#include void pv_inject_event(const struct x86_event *event) { diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index bd337e548c5a..02a6ed7593f3 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -19,13 +19,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include /* Helper functions to prepare APIC register values. */ static unsigned int prepare_ICR(unsigned int shortcut, int vector) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 42272a9844fa..568a3abe1f47 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include unsigned long __read_mostly trampoline_phys; enum ap_boot_method __read_mostly ap_boot_method = AP_BOOT_NORMAL; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a9c2c607eb08..fd8a4448e3f7 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index a99646c0cd4e..1e87652f4bcb 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -5,11 +5,11 @@ .file "x86_64/compat/entry.S" #include +#include #include #include #include #include -#include FUNC(entry_int82) ENDBR64 diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index c5c723b5f4d4..40d094d5b2ee 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -7,10 +7,10 @@ .file "x86_64/entry.S" #include +#include #include #include #include -#include /* %rsp: struct cpu_user_regs */ .macro ASSERT_CONTEXT_IS_XEN From patchwork Fri Nov 8 20:11:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54709D64085 for ; Fri, 8 Nov 2024 20:12:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832904.1248226 (Exim 4.92) (envelope-from ) id 1t9VKx-0003Jt-Q0; Fri, 08 Nov 2024 20:12:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832904.1248226; Fri, 08 Nov 2024 20:12:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VKx-0003Jj-N9; Fri, 08 Nov 2024 20:12:07 +0000 Received: by outflank-mailman (input) for mailman id 832904; Fri, 08 Nov 2024 20:12:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VKw-0002pM-FS for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 20:12:06 +0000 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [2a00:1450:4864:20::52f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b8ae5d35-9e0d-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 21:12:04 +0100 (CET) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5cacb76e924so3676047a12.0 for ; Fri, 08 Nov 2024 12:12:04 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cf03b5d7e6sm2334739a12.14.2024.11.08.12.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 12:12:00 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b8ae5d35-9e0d-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MmYiLCJoZWxvIjoibWFpbC1lZDEteDUyZi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImI4YWU1ZDM1LTllMGQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDk2NzI0LjM3MjQwNCwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731096723; x=1731701523; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=90OoYiFeZ5rMxk+cdK/xirLCI8U4EbCancSqXIxcb6s=; b=fHHlrgHOgis8Tq3by1YpR8QUm8PvqvSecKL/zDhMqj/t1yN2yD68kCEnY77y2B+AXN 45W8zjtIxwvrLiWGgt1aXfhcbyXCRWG72wfitbLqyANsg6SYkvjGsz3+BeW4T8VM8kJi TP10XK5mMb0qr7Bvlk51wJm5C5vsHB77Yd0Xc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731096723; x=1731701523; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=90OoYiFeZ5rMxk+cdK/xirLCI8U4EbCancSqXIxcb6s=; b=cWdIYwYZlt8kbezquOk44RJgNsmNovmWflj6JJlc9Rs7KK8WGR5sbgu6e+xaKM4DF+ uMog3L6wr0RMVaMjAQle3Mu4OWPjhH+1YUmZ/gzxi0kwMY2cFYSBXOf/b+jgK+KpTE6L Dhi/QjfEHpc2eEtsJJgSffe4MgNu2wI3WL6Yrlz/+eR7qTRKvmTaAiUAWVPxQYYYPByW CyHgRqmL3Mroe8+kJpLKqwsOyLsc8Efz63hrwcikdoXYIlJHaNNORZ97v4t/e++m5ti5 jstVIs4OO0wlZTd22kvRz6s8yLQMk5S/gSxW4DnrU7dqFiKmLWgJAggAEhuc+f4sIttz yIHg== X-Gm-Message-State: AOJu0Yz0qMFaLiW5lW2kM8FgqWIwrZSsZHMIjL3DE+R/qZ+B0JiEFxYa qTt/40vt7/CYAzNvwohWq4tHSqGOSxNPkOpbKy6WNJ4jOU55IsrdLeFU8nthcarkXAv+eFHDbBW u X-Google-Smtp-Source: AGHT+IFKIlWbL97/gpKNq8zVpa0Fzo1LE/X0eiolV45FBf4cIPPR1IZTZALCEkK/TS0ZU8Tz4N9xtw== X-Received: by 2002:a05:6402:3510:b0:5cf:9f6:1c01 with SMTP id 4fb4d7f45d1cf-5cf0a44744bmr3451673a12.25.1731096722763; Fri, 08 Nov 2024 12:12:02 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 2/4] x86: Move mach-default/io_ports.h to asm/io-ports.h Date: Fri, 8 Nov 2024 20:11:45 +0000 Message-Id: <20241108201147.812036-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108201147.812036-1-andrew.cooper3@citrix.com> References: <20241108201147.812036-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 intercept.c and msi.c don't even need this header. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/dom0_build.c | 2 +- xen/arch/x86/hvm/intercept.c | 1 - xen/arch/x86/i8259.c | 2 +- .../x86/include/asm/{mach-default/io_ports.h => io-ports.h} | 0 xen/arch/x86/io_apic.c | 2 +- xen/arch/x86/msi.c | 1 - xen/arch/x86/time.c | 2 +- 8 files changed, 5 insertions(+), 7 deletions(-) rename xen/arch/x86/include/asm/{mach-default/io_ports.h => io-ports.h} (100%) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 8e8ff4d155ff..bb86a1c161b3 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 8d56705a0861..72747b92475a 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -16,11 +16,11 @@ #include #include #include +#include #include #include #include #include -#include struct memsize { long nr_pages; diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 8f82b82b0723..da22c386763e 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index a14f20bdf676..5c7e21a7515c 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -19,9 +19,9 @@ #include #include #include +#include #include #include -#include /* * This is the 'legacy' 8259A Programmable Interrupt Controller, diff --git a/xen/arch/x86/include/asm/mach-default/io_ports.h b/xen/arch/x86/include/asm/io-ports.h similarity index 100% rename from xen/arch/x86/include/asm/mach-default/io_ports.h rename to xen/arch/x86/include/asm/io-ports.h diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 12cc4a561d14..d44d2c9a4173 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include #include -#include #include #include diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index be5ef99e088f..fa724911928e 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index bc9f26594103..a9aa335d7c9f 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include /* for early_time_init */ #include From patchwork Fri Nov 8 20:11:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3ADDCD64088 for ; Fri, 8 Nov 2024 20:12:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832906.1248236 (Exim 4.92) (envelope-from ) id 1t9VL3-0003eb-1x; Fri, 08 Nov 2024 20:12:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832906.1248236; Fri, 08 Nov 2024 20:12:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VL2-0003eU-V3; Fri, 08 Nov 2024 20:12:12 +0000 Received: by outflank-mailman (input) for mailman id 832906; Fri, 08 Nov 2024 20:12:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VL2-0002pM-1O for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 20:12:12 +0000 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [2a00:1450:4864:20::533]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bbf37b87-9e0d-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 21:12:09 +0100 (CET) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5cefc36c5d4so3287378a12.0 for ; Fri, 08 Nov 2024 12:12:09 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cf03b5d7e6sm2334739a12.14.2024.11.08.12.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 12:12:04 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bbf37b87-9e0d-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MzMiLCJoZWxvIjoibWFpbC1lZDEteDUzMy5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImJiZjM3Yjg3LTllMGQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDk2NzI5Ljg1NzcwNywic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731096727; x=1731701527; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XoqxbvTlH2fbgMqE+4mTh6oqAYRmOVdflDf9LezcXaw=; b=Z/avr9Pzd3nEmEDVSR6D55IMuIHZYg7x5MJb4BJGV08/4XztTUoYp/UViVt8JsnDHR eu11VTrE+3xXKNAVPI/wFJ9ZiFdKfw2BO1eUiv9ifCqs/hqHtVZEFx618L+W0Q5+aFpD mVC1qb/MNWDReyIqNyoVripc7Yj1EpxwQpxQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731096727; x=1731701527; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XoqxbvTlH2fbgMqE+4mTh6oqAYRmOVdflDf9LezcXaw=; b=TGIQFNvaGZXbd01Roo5csuknRlWzj6O2k9RBsIWAGqMnaTpzuBEIhYTi4+T+6qTI+D TA32/AyH5C4oXuqgl81SXPKWil0QWozhri/sCo4EqSGmRlSiU2+XFAOriCnlyleInaci xr5KmpPewl261Dx75XgE4DFOnqsiysV95JXUuJp2XdsDzyIKDqzk2rt+L/fgRDOa3Ikh m9W+tUtoX0uSd/zrd8n+sJxlvbfOkkoLjnmPUaMzLeHSg5aCgu9OJC0xJHjS4GcCTeSW SQN76fHfMUAYK3h19auxySLfBTX5DWBjl3wu6JsvXkKgj/tSOAB/Ahw1V7Wsucs1G+7M XZGQ== X-Gm-Message-State: AOJu0YxPU43ohsY6NgNDmyIzRXJTN23u0y6WCeGkK9LXQAscHd63S6J1 5bX13oE1h6lWyTcwrWltsR6FImH/gjyuM376L/a9i3kTasJNxZUSfGoWqWw46P8v86wW89tRf1c m X-Google-Smtp-Source: AGHT+IEK8SppKwQFFl9O9k94CcXlNkyxkvJuNdDNdoZ5iiOdVBurhwLQ+QJNCOePExKv/QxxrUdErw== X-Received: by 2002:a05:6402:234a:b0:5ce:fc32:3536 with SMTP id 4fb4d7f45d1cf-5cf0a272570mr3363501a12.0.1731096727437; Fri, 08 Nov 2024 12:12:07 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 3/4] x86: Drop mach-default/bios_ebda.h Date: Fri, 8 Nov 2024 20:11:46 +0000 Message-Id: <20241108201147.812036-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108201147.812036-1-andrew.cooper3@citrix.com> References: <20241108201147.812036-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 It has a single function, and a single user. This is unlikely to change moving forwards so fold it into mpparse.c Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/include/asm/mach-default/bios_ebda.h | 15 --------------- xen/arch/x86/mpparse.c | 9 +++++++-- 2 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 xen/arch/x86/include/asm/mach-default/bios_ebda.h diff --git a/xen/arch/x86/include/asm/mach-default/bios_ebda.h b/xen/arch/x86/include/asm/mach-default/bios_ebda.h deleted file mode 100644 index 42de6b2a5b97..000000000000 --- a/xen/arch/x86/include/asm/mach-default/bios_ebda.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _MACH_BIOS_EBDA_H -#define _MACH_BIOS_EBDA_H - -/* - * there is a real-mode segmented pointer pointing to the - * 4K EBDA area at 0x40E. - */ -static inline unsigned int get_bios_ebda(void) -{ - unsigned int address = *(unsigned short *)maddr_to_virt(0x40E); - address <<= 4; - return address; /* 0 means none */ -} - -#endif /* _MACH_BIOS_EBDA_H */ diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index b16c105b18bf..957a19d9887d 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -31,8 +31,6 @@ #include #include -#include - /* Have we found an MP table */ bool __initdata smp_found_config; @@ -734,6 +732,13 @@ static void __init efi_check_config(void) efi_unmap_mpf(); } +static unsigned int get_bios_ebda(void) +{ + unsigned int address = *(unsigned short *)maddr_to_virt(0x40E); + + return address << 4; /* 0 means none */ +} + void __init find_smp_config (void) { unsigned int address; From patchwork Fri Nov 8 20:11:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 120B9D64087 for ; Fri, 8 Nov 2024 20:12:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832907.1248246 (Exim 4.92) (envelope-from ) id 1t9VL7-00040I-BC; Fri, 08 Nov 2024 20:12:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832907.1248246; Fri, 08 Nov 2024 20:12:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VL7-000407-7p; Fri, 08 Nov 2024 20:12:17 +0000 Received: by outflank-mailman (input) for mailman id 832907; Fri, 08 Nov 2024 20:12:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9VL5-0002pM-Rj for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 20:12:15 +0000 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [2a00:1450:4864:20::22d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id be3bc89b-9e0d-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 21:12:13 +0100 (CET) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2fb51f39394so19007521fa.2 for ; Fri, 08 Nov 2024 12:12:13 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cf03b5d7e6sm2334739a12.14.2024.11.08.12.12.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 12:12:08 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: be3bc89b-9e0d-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjoyMmQiLCJoZWxvIjoibWFpbC1sajEteDIyZC5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImJlM2JjODliLTllMGQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDk2NzMzLjYwNTYzNSwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731096731; x=1731701531; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GPC86lay0Nkrz6T/SvUOsZkRaQ4nDoNQ73rWRAiZP1Q=; b=DQXDNKDQkIOJFBPJztbV95k5Oyw0OZyVgA4iJ9avddSZImgTu7hxnunVWtmJWDvVzI 5V1en2gHk0IuomW0Qj/9FXPc7r9GJh3oUClGUMZ7puhYLrjb6vDgRnk/eU0j8XF+/F/A ZS8wJwERgDOXaiYQGYFsucMvpNwEODdnHJZ74= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731096731; x=1731701531; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GPC86lay0Nkrz6T/SvUOsZkRaQ4nDoNQ73rWRAiZP1Q=; b=oZLEfnkvJjmJon1La+jXV4TUTKXZyIHJughHPfgunZfe6A1CpKM/hjkR7Ak9t51cq0 vZuo4nE99GD6fw9aZ1Hc7HWt3C1+jJORE9C/tEliAs8O3yW11Br9GVOBzjjcVb+zZ6uk WfC/UDRyFYSatYFHPzZt8oQaA77rCW/oKvx1K+rJ5eR/+C0pww10uhRkrUKJTM5QOSXI 1ObQ66qcZUcZbk49iGH38RG/JM1YvC9N0uBgDiaY8VVuxX0Iohz8+2ocj9edSL1bfDaD fDPpPgVc9PVUc2rYRwYKyK/E+G7ULggU0KgTD0jp3W1bL0RBbqxqLF0Xbq9b6H2k3qLM WNow== X-Gm-Message-State: AOJu0YzWgjsfis4fOfaiXXpAATXA/Ow4VUsFOIY96mXhx5CUiWFLeLy2 4aaUcdX1a8T9VXVVOuVJhXpo4MoBEBNS2Bni4eu7ytfj8oKOv/Y5XrU9JbOzdaXaPEhiEMnxDCt z X-Google-Smtp-Source: AGHT+IG8ArwTwcoDg/F3fTYByQlPv12EikWzpKo2ua6iZps9ZqcCDDaY8ChLzyACKMjfL1xqzWx7jQ== X-Received: by 2002:a2e:a90a:0:b0:2ef:17f7:6e1d with SMTP id 38308e7fff4ca-2ff201e74b6mr24958381fa.4.1731096731082; Fri, 08 Nov 2024 12:12:11 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 4/4] x86: Drop mach_mpspec.h Date: Fri, 8 Nov 2024 20:11:47 +0000 Message-Id: <20241108201147.812036-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108201147.812036-1-andrew.cooper3@citrix.com> References: <20241108201147.812036-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 This header is included in exactly one location. Fold it into mpspec.h With this done, mach-default/ is empty, so remove the include path. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/arch.mk | 1 - xen/arch/x86/include/asm/mach-default/mach_mpspec.h | 10 ---------- xen/arch/x86/include/asm/mpspec.h | 4 +++- 3 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 xen/arch/x86/include/asm/mach-default/mach_mpspec.h diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 8f8aeda679d8..80b4431c8906 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -3,7 +3,6 @@ export XEN_IMG_OFFSET := 0x200000 -CFLAGS += -I$(srctree)/arch/x86/include/asm/mach-default CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET) # Prevent floating-point variables from creeping into Xen. diff --git a/xen/arch/x86/include/asm/mach-default/mach_mpspec.h b/xen/arch/x86/include/asm/mach-default/mach_mpspec.h deleted file mode 100644 index 1a4e3f8c4f35..000000000000 --- a/xen/arch/x86/include/asm/mach-default/mach_mpspec.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __ASM_MACH_MPSPEC_H -#define __ASM_MACH_MPSPEC_H - -#define MAX_IRQ_SOURCES 256 - -/* Generic (i.e. installer) kernels need lots of bus entries. */ -/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ -#define MAX_MP_BUSSES 260 - -#endif /* __ASM_MACH_MPSPEC_H */ diff --git a/xen/arch/x86/include/asm/mpspec.h b/xen/arch/x86/include/asm/mpspec.h index 45e474dfd1b6..267768e7595e 100644 --- a/xen/arch/x86/include/asm/mpspec.h +++ b/xen/arch/x86/include/asm/mpspec.h @@ -3,7 +3,9 @@ #include #include -#include + +#define MAX_IRQ_SOURCES 256 +#define MAX_MP_BUSSES 260 extern unsigned char mp_bus_id_to_type[MAX_MP_BUSSES];