From patchwork Wed Oct 2 15:17:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Barnes X-Patchwork-Id: 13819968 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 8DDD8CF6D38 for ; Wed, 2 Oct 2024 15:25:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.808873.1220911 (Exim 4.92) (envelope-from ) id 1sw1EK-0004Si-Lk; Wed, 02 Oct 2024 15:25:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 808873.1220911; Wed, 02 Oct 2024 15:25:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sw1EK-0004Sb-It; Wed, 02 Oct 2024 15:25:32 +0000 Received: by outflank-mailman (input) for mailman id 808873; Wed, 02 Oct 2024 15:25:30 +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 1sw1EI-0004SG-S5 for xen-devel@lists.xenproject.org; Wed, 02 Oct 2024 15:25:30 +0000 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [2a00:1450:4864:20::234]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ea40ae1-80d2-11ef-a0ba-8be0dac302b0; Wed, 02 Oct 2024 17:25:29 +0200 (CEST) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2fad100dd9fso48256851fa.3 for ; Wed, 02 Oct 2024 08:25:29 -0700 (PDT) Received: from mbarnes-x-u.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c277726asm894554866b.10.2024.10.02.08.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 08:25:28 -0700 (PDT) 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: 8ea40ae1-80d2-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1727882729; x=1728487529; 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=z7tveJz4AVmA+fvVj1KascSk3DY+D3COltbd+Dsh+Zo=; b=GoOVP8249iQA8uIStLR6G8fM5N0xPSLdo1MoveZ8SfwxQmHaE53tSfOi2y7UJ6AD6z pYlgaoLUeaZGIVsT6/mId4pE0ZTddESAjj9YvZTn5EQuG75HuUs3bFbtAwwTEOFd/F6S scFdI2J4wPJAkijEVNZKu09NQDZEE6eDh+w8c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727882729; x=1728487529; 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=z7tveJz4AVmA+fvVj1KascSk3DY+D3COltbd+Dsh+Zo=; b=gbt+4suOuvHqS2Nma3YUmFkivGHYG0u9FgSWQKzw3UBUlv4IF3itE+ivcgBafRj2U4 hsFspOLUuwFpSQsAd9/Nlat6t0G9jDK8udsdtNKVfo9jlFxzUNOAStfNSgBgklBvk5Wf M9JOETO/6o90lD7NDu0UuQU8wSfebGOVv518xIfqxdsXEhUVecY/ecp5eXciZ+AxKcsp uw6lgfKjLHoHYa5j6Tx64P/O1XdyjYT1q6qYPlKeWW4voorobJ4w4pZlmLArYwnKo+IB fUUtHoPfjEGcc0U5MLczR1rQAE/F10tORZ3ZFDcBrldAzzVe5C7l2zjMrlfrW/UVo+GJ pflg== X-Gm-Message-State: AOJu0YxZ/Z/rv4buYb7Ny/AYpM4gJwVEWtw+5h81XpFAfhR5c/VhBjMP 2a7AD9pWzz0GPtyPYDt0CNbBx6Zd/pGYSlNy595zgeUb6NNXV3Ui0AE0mYX9s8rlnvpXA2NruMG O X-Google-Smtp-Source: AGHT+IGTpHhHRSgEIQmCiEeM79gYhCjEjG+ivRv33A60tPr8Q2Unt7QLjiqqC0VIdKkesSVHQDT5kw== X-Received: by 2002:a05:651c:210b:b0:2fa:d75b:2ef5 with SMTP id 38308e7fff4ca-2fae10a64camr28637231fa.32.1727882728770; Wed, 02 Oct 2024 08:25:28 -0700 (PDT) From: Matthew Barnes To: xen-devel@lists.xenproject.org Cc: Matthew Barnes , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 1/3] x86/APIC: Switch flat driver to use phys dst for ext ints Date: Wed, 2 Oct 2024 16:17:24 +0100 Message-Id: <8c6d1fee5261169a9bbc62ed1bafd2c32406fb4c.1727880621.git.matthew.barnes@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Resolves: https://gitlab.com/xen-project/xen/-/issues/194 Signed-off-by: Matthew Barnes --- xen/arch/x86/include/asm/genapic.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h index a694371c6d16..d29bccc39b4b 100644 --- a/xen/arch/x86/include/asm/genapic.h +++ b/xen/arch/x86/include/asm/genapic.h @@ -45,21 +45,21 @@ void cf_check send_IPI_self_legacy(uint8_t vector); void cf_check init_apic_ldr_flat(void); unsigned int cf_check cpu_mask_to_apicid_flat(const cpumask_t *cpumask); +const cpumask_t *cf_check vector_allocation_cpumask_phys(int cpu); void cf_check send_IPI_mask_flat(const cpumask_t *cpumask, int vector); const cpumask_t *cf_check vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ - .int_delivery_mode = dest_LowestPrio, \ - .int_dest_mode = 1 /* logical delivery */, \ + .int_delivery_mode = dest_Fixed, \ + .int_dest_mode = 0 /* physical delivery */, \ .init_apic_ldr = init_apic_ldr_flat, \ - .vector_allocation_cpumask = vector_allocation_cpumask_flat, \ - .cpu_mask_to_apicid = cpu_mask_to_apicid_flat, \ + .vector_allocation_cpumask = vector_allocation_cpumask_phys, \ + .cpu_mask_to_apicid = cpu_mask_to_apicid_phys, \ .send_IPI_mask = send_IPI_mask_flat, \ .send_IPI_self = send_IPI_self_legacy void cf_check init_apic_ldr_phys(void); unsigned int cf_check cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void cf_check send_IPI_mask_phys(const cpumask_t *mask, int vector); -const cpumask_t *cf_check vector_allocation_cpumask_phys(int cpu); #define GENAPIC_PHYS \ .int_delivery_mode = dest_Fixed, \ .int_dest_mode = 0 /* physical delivery */, \ From patchwork Wed Oct 2 15:17:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Barnes X-Patchwork-Id: 13819969 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 A7239CF6D3B for ; Wed, 2 Oct 2024 15:25:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.808875.1220923 (Exim 4.92) (envelope-from ) id 1sw1EL-0004au-8w; Wed, 02 Oct 2024 15:25:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 808875.1220923; Wed, 02 Oct 2024 15:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sw1EL-0004Z5-1e; Wed, 02 Oct 2024 15:25:33 +0000 Received: by outflank-mailman (input) for mailman id 808875; Wed, 02 Oct 2024 15:25:31 +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 1sw1EJ-0004SG-GU for xen-devel@lists.xenproject.org; Wed, 02 Oct 2024 15:25:31 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ee4fa98-80d2-11ef-a0ba-8be0dac302b0; Wed, 02 Oct 2024 17:25:30 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a8d3cde1103so938887566b.2 for ; Wed, 02 Oct 2024 08:25:30 -0700 (PDT) Received: from mbarnes-x-u.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c277726asm894554866b.10.2024.10.02.08.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 08:25:29 -0700 (PDT) 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: 8ee4fa98-80d2-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1727882729; x=1728487529; 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=ftVpwFrv3Tr8Qw6HD3kvpMxXyPv+rWBj3ohY8visQ1w=; b=QggERJCgFg8Dev4d9Nc6ZWTYN8DO1fqG2JFIWphCoaBwpXWD2Ws3+F1fgExZwgnYWj hg0QcsrKdcGE1msIY8EQk9ISo+I2ckzltQMNRJNhjuzHQ4Hqb+nQXXrS83wbHEYJLgPz 6TK1mE39azLROGLX4sHZnj2F/vhAQbtHNnb+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727882729; x=1728487529; 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=ftVpwFrv3Tr8Qw6HD3kvpMxXyPv+rWBj3ohY8visQ1w=; b=q+nOnSt2rqaaiDC791uuCCY9QA5y5bS2DkQ3OzOGw51CG5nGyaynDFSxZ8t26+hREa XVfSEdfAHYKoWCsZkY47FiwBOw3U+FpmnoEzZbP/H5nzu4tQiqiHc0fjn2gn7RLYszPq C0CrB51WAO77wJ1tQBv52oFxsRT8tREV1XeKtJ8arzGmeKMX8sjJzS+1qaKELVE7GPvc NWmT5iZE7+b5ZnqyEOZZ2OG4xkX9AISJOoBk5bJNFa40t/FqI7pdxfVb2Pe02iDFLmsg yiD2miCg2ayE43Y/6A4CU7cPj3LNwEdtPDRLbR++TNw9XwcQJ9kDB7BHaxb9y5Ew4/EL 9Yaw== X-Gm-Message-State: AOJu0YyCItxbbCEAgpcFWlTvtQcRDsfFCUlkdGAKB0TwUOKM/zjfMqzZ Al0unUX6KwhBbGlq3pYLUnbDIDUe9d4S8VHB9AmJHNaEYMOluI2yR/X/Ez13l3pGwH3mjXwy/dp O X-Google-Smtp-Source: AGHT+IFcJ6SivyjVc79Wr7urQz7+iHwEd2Xh8Ovp8EG6CvbeoDPUS6f5sl5feOgPr0mdny2zdjTWow== X-Received: by 2002:a17:907:3f86:b0:a98:f1b3:83d5 with SMTP id a640c23a62f3a-a98f8206930mr331064266b.2.1727882729222; Wed, 02 Oct 2024 08:25:29 -0700 (PDT) From: Matthew Barnes To: xen-devel@lists.xenproject.org Cc: Matthew Barnes , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 2/3] x86/APIC: Remove unnecessary logical flat functions Date: Wed, 2 Oct 2024 16:17:25 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Now that GENAPIC_FLAT uses physical destination for external interrupts, these functions implementing logical flat for external interrupts are no longer used. No functional change. Signed-off-by: Matthew Barnes --- xen/arch/x86/genapic/delivery.c | 10 ---------- xen/arch/x86/include/asm/genapic.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/xen/arch/x86/genapic/delivery.c b/xen/arch/x86/genapic/delivery.c index d1f99bf6834a..3def78f380d3 100644 --- a/xen/arch/x86/genapic/delivery.c +++ b/xen/arch/x86/genapic/delivery.c @@ -19,16 +19,6 @@ void cf_check init_apic_ldr_flat(void) apic_write(APIC_LDR, val); } -const cpumask_t *cf_check vector_allocation_cpumask_flat(int cpu) -{ - return &cpu_online_map; -} - -unsigned int cf_check cpu_mask_to_apicid_flat(const cpumask_t *cpumask) -{ - return cpumask_bits(cpumask)[0]&0xFF; -} - /* * PHYSICAL DELIVERY MODE (unicast to physical APIC IDs). */ diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h index d29bccc39b4b..91fdeaca47b3 100644 --- a/xen/arch/x86/include/asm/genapic.h +++ b/xen/arch/x86/include/asm/genapic.h @@ -44,10 +44,8 @@ extern const struct genapic apic_bigsmp; void cf_check send_IPI_self_legacy(uint8_t vector); void cf_check init_apic_ldr_flat(void); -unsigned int cf_check cpu_mask_to_apicid_flat(const cpumask_t *cpumask); const cpumask_t *cf_check vector_allocation_cpumask_phys(int cpu); void cf_check send_IPI_mask_flat(const cpumask_t *cpumask, int vector); -const cpumask_t *cf_check vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ .int_delivery_mode = dest_Fixed, \ .int_dest_mode = 0 /* physical delivery */, \ From patchwork Wed Oct 2 15:17:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Barnes X-Patchwork-Id: 13819966 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 61502CF6D39 for ; Wed, 2 Oct 2024 15:25:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.808876.1220929 (Exim 4.92) (envelope-from ) id 1sw1EL-0004hF-I2; Wed, 02 Oct 2024 15:25:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 808876.1220929; Wed, 02 Oct 2024 15:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sw1EL-0004fi-A7; Wed, 02 Oct 2024 15:25:33 +0000 Received: by outflank-mailman (input) for mailman id 808876; Wed, 02 Oct 2024 15:25:32 +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 1sw1EK-0004SG-Go for xen-devel@lists.xenproject.org; Wed, 02 Oct 2024 15:25:32 +0000 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [2a00:1450:4864:20::634]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8f2d3ef2-80d2-11ef-a0ba-8be0dac302b0; Wed, 02 Oct 2024 17:25:30 +0200 (CEST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a8a789c4fc5so176875366b.0 for ; Wed, 02 Oct 2024 08:25:30 -0700 (PDT) Received: from mbarnes-x-u.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c277726asm894554866b.10.2024.10.02.08.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 08:25:29 -0700 (PDT) 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: 8f2d3ef2-80d2-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1727882730; x=1728487530; 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=AoQRiycGbrcRIfQe1rR1oSXPiTIGCUmJQ2PUwiSd4cc=; b=BpbwG7lnG3jUtXaxF22qbFgjXEzvA4jUyO57fKsE4o52TsZjOyvcTkJ3hBl65wWRym o+AK1YuUI1u4192miGJcwu7m7glcmHkQ5xb6vjbpVECd+p3rLIF5/BOOykRZF2KcvCUN iIseLyj2/4C+SyUHP8gXdQMsYiIv/iU3P1rSQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727882730; x=1728487530; 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=AoQRiycGbrcRIfQe1rR1oSXPiTIGCUmJQ2PUwiSd4cc=; b=dH7lTOkkCxRC+OOs6PYf+SWYdtYcgp9SdhklEQaH9pfcTHzmMmy3oxOemtNBGG0aGV d1C/0Fv9bH4e9DfEhqfPIWYkXaZ/Gc73zTPA8URl02x8vcUvTPfMTW+Awven7jNipntt 9pnz2PSMae2IkX19w39KN9SPqIKAeuxpL6wBwaV3lT3uIjfcGvFwnBOYPSeJqvxbNLlR 2lUzkMnzLra7ATah8tDWYn0YxOpqVIuWlBa66H4wKRzoJnfoJouAO+rrVW2usm3h1ZFA aPF094rEvc85vSw5OPPzLyrd8B+MAVYQqxaiKBKDDHEaPLv3RCY0L6yu0GMDzlMX4Jsa k60w== X-Gm-Message-State: AOJu0Yybp4Iavzm7Z3nL062NdU7WIXl7ki288dD8mbE6dBZjsw23x6+W WRPsRCxGQvHSaj0VCVRvVAeMs9r/Ndj1v1ecy5LF2HAjEY9yvVBMHzMkVuuw4s4XBh9eyMYSHz4 7 X-Google-Smtp-Source: AGHT+IGnyWJ2DJZlijMwNWhhfiN2aSGJwUSG7Zu+RTkUqbqT8HhbbkpU/+XMfJltf1qO3GBjT+6XZQ== X-Received: by 2002:a17:906:c52:b0:a98:c4b7:7971 with SMTP id a640c23a62f3a-a98c4b787b9mr561548166b.32.1727882729807; Wed, 02 Oct 2024 08:25:29 -0700 (PDT) From: Matthew Barnes To: xen-devel@lists.xenproject.org Cc: Matthew Barnes , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 3/3] x86/APIC: Refactor GENAPIC_FLAT -> GENAPIC_MIXED Date: Wed, 2 Oct 2024 16:17:26 +0100 Message-Id: <4db841d51630263204dad2bec571462c031e30c9.1727880621.git.matthew.barnes@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The macro name is changed to somewhat mirror x2apic driver code, as logical flat is no longer used for external interrupts for this mode. No functional change. Signed-off-by: Matthew Barnes --- xen/arch/x86/genapic/default.c | 2 +- xen/arch/x86/include/asm/genapic.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c index a968836a1878..3f0d57ea5e25 100644 --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -16,5 +16,5 @@ /* should be called last. */ const struct genapic __initconst_cf_clobber apic_default = { APIC_INIT("default", NULL), - GENAPIC_FLAT + GENAPIC_MIXED }; diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h index 91fdeaca47b3..fcb3eb04db7b 100644 --- a/xen/arch/x86/include/asm/genapic.h +++ b/xen/arch/x86/include/asm/genapic.h @@ -46,7 +46,7 @@ void cf_check send_IPI_self_legacy(uint8_t vector); void cf_check init_apic_ldr_flat(void); const cpumask_t *cf_check vector_allocation_cpumask_phys(int cpu); void cf_check send_IPI_mask_flat(const cpumask_t *cpumask, int vector); -#define GENAPIC_FLAT \ +#define GENAPIC_MIXED \ .int_delivery_mode = dest_Fixed, \ .int_dest_mode = 0 /* physical delivery */, \ .init_apic_ldr = init_apic_ldr_flat, \