From patchwork Thu May 1 18:36:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886364 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464438wrq; Thu, 1 May 2025 11:41:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLaQniljlXpSRpX7uabrgcWdYrSFufSRg3euT1/e/e/zBkIxjeW3PwpLZ3BNWXmbJ378Mdhg==@linaro.org X-Google-Smtp-Source: AGHT+IGZaoyWkEFi9xH0mfnn/GmKbNjKis2jcRsY96tPuBqiZkylgS2yX/NRjroyohyBq1VOQ6rO X-Received: by 2002:ad4:5bc9:0:b0:6f4:5dbd:2761 with SMTP id 6a1803df08f44-6f5157f3aaamr3913496d6.32.1746124863985; Thu, 01 May 2025 11:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124863; cv=none; d=google.com; s=arc-20240605; b=JUZ2kLbCkRAUIKXXUbjJN0+BMwLTGEc1S7TEdW9UCaUF4gAjsiKPxrw7MtEwT96eUt rmqwqYF5biW9h///nZeiVSdsRIFfssaipvz8z/Eb2aQGFdcnJphX3jL0sBJ3Uc9qiRMB NuV360NK4RhRUjkvxtppLXKDCGKxIqBpVUsTbE689HvclFHh6F2pmdgN1/Tvvb0xztzy 2yn8UGZYXEPOISKvzDKVy8B9/4aSmlLfnRrlxKJvRytXYaRA3UCiZ8gT/L07i7gTSjE+ +tm5YliuQsuYNfSyq33b/HZaX00v7BZvzWeCFeLqhNU4RuTuPpSCs2tQeZo1p+osCIr6 SYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=czM8a9COB78h77IWp++MO11TvseO+jxIgqX0veyfDMGXiRCD2L16NBHJSQXQJIaEFE um1OlI0onAR4iz3W12cL7nQ3QVzQsdZ8Ku0fp1HhOndWBiXivkALUfulWInCENEY6/Jz 0P3ns5H8DTD/A6YIa4MVnrEdY26qwm0t9qakPOILfysxAc3awmC/bD9SezwZB4YDW0ll 7ugVT1KcHjexXpSp9+B13ofUntMD2zU6le6f3HI+4vcw7p6GP+I7v5OCgAjH3rNqXWS6 Gq0E0GNOi8n7k83wcIGssJo2gc77fA4icXurBpIyo9nUQ+cCK5+dniIhsGEgL96vJ5TL kzkg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u+E130Cv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2448089si117801985a.555.2025.05.01.11.41.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:41:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u+E130Cv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpH-0003aw-Iv; Thu, 01 May 2025 14:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAYng-00028j-ME for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:25 -0400 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYne-0008IW-N1 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:24 -0400 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3d46ef71b6cso12280375ab.3 for ; Thu, 01 May 2025 11:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124701; x=1746729501; darn=nongnu.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=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=u+E130CvTa2buvbr6Z0GgwjxlAu2d2tHI/wP6ELU0gpT2VAi1GoVKVX+bkQezysorn lpIIu6GgfyJoiwDF8amKoqASH72Mq1Fa8YsuphLK+BPG8uUDfVNotVVclNyaLyNO+3ye OL3PriK61/juatXKX0KeUhcoaRaICp31VyaQj2GUuSZKojxN5ryD/IDcBkipBkWujQLz UpUX4TIAT3uHXJq4UQ8ua7HpZBxyUt7+Q3TXeMjcgDUzeGH+p5mapnUMJ48LERRHEUX5 j/IEKUKZGwL722/srH08yO16dZJlZUO7XgVIsiO1VZo014jAaB5mKdDkfc6ChQ/8wsYy /u+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124701; x=1746729501; 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=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=VkECxNS5kKmO1y2C6I4FaZVvaQ2Th04p4EzErTpQ4Ymkt3IpPX/aVGG7MNiNIAja5O EzL4J5virQP15uwmtPmu3vv/vFaQrzWLtcyYV31hAW31jKQ363fLlqRMCs8D+YMGrlTB kE2F5T79RIcTbmepktPGoBrmAKeDHWHhPRCgG8AUqcG17JGSEwPtyCUMIAvmRpDm17PN DrFNmaFdMf9ASZ8Ygw6Y85o6VAOg6zo3LcIlVI1dJhVtuRP9L3zCMedkMN2ohP0rFsHX ryJh1P7BvdsSt7J6ouI0z6Mj2f3KrXxOsC/jCnokrUVB2ZyNHTStUxpF1gc/r2hzBJ9Z i21A== X-Gm-Message-State: AOJu0Yyj4avJnzrHII5YHAaRgzNoyHT3Il6gzGCvWOozLWuZIHkXodaE bTb+KVpQgEbQRcvGXh3poGxH+8vihfhvXgFSwOFvnTwPcwMPNZnbbzKUWDDFNB/bNZMFWdMc/af 3 X-Gm-Gg: ASbGncuvBkce+3bdZy+DVpw/+LHCSRLQ68AMQyq94zmzjG2AgaJoACkUHI+vds1fX0F 8OzM6vbr3ivFBCFvKmPkiItpE6ZKsMaNH2/QnkkjuDH1KXB6JfMjeT7vDGky05fYXssESNYNQ59 piwRyBJrYuX0JD2pnylitjrrx0ET1nHjaa6VCz83foDR+u6dtB4Wd9zKAbRu9UZKbhbSxGYI6Jf phCvnq1FKOBgg4DfJQYOviwYhntDLJwtALdkchk9NcESnOezsVh4o/uCaQpFMVu4scksh0Zih6u qHeDk4zdLRzFJfaGv92aAeLmY7R1l1bSVGJp46wocdxQgZXVDuTTEJWH+6OpnXI1XMRzZMqUmLx 7Lkzk6OcJujTV3RJu5bHjWhfjrofd/ME= X-Received: by 2002:a92:d84e:0:b0:3d4:70ab:f96f with SMTP id e9e14a558f8ab-3d9701fc1f1mr38617615ab.8.1746124701176; Thu, 01 May 2025 11:38:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f6cce5sm2532555ab.59.2025.05.01.11.38.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 12/16] hw/i386/intel_iommu: Remove IntelIOMMUState::buggy_eim field Date: Thu, 1 May 2025 20:36:24 +0200 Message-ID: <20250501183628.87479-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12a; envelope-from=philmd@linaro.org; helo=mail-il1-x12a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The IntelIOMMUState::buggy_eim boolean was only set in the hw_compat_2_7[] array, via the 'x-buggy-eim=true' property. We removed all machines using that array, lets remove that property, simplifying vtd_decide_config(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index e95477e8554..29304329d05 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -303,7 +303,6 @@ struct IntelIOMMUState { uint32_t intr_size; /* Number of IR table entries */ bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ - bool buggy_eim; /* Force buggy EIM unless eim=off */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ bool dma_drain; /* Whether DMA r/w draining enabled */ bool dma_translation; /* Whether DMA translation supported */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5f8ed1243d1..c980cecb4ee 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3823,7 +3823,6 @@ static const Property vtd_properties[] = { DEFINE_PROP_UINT32("version", IntelIOMMUState, version, 0), DEFINE_PROP_ON_OFF_AUTO("eim", IntelIOMMUState, intr_eim, ON_OFF_AUTO_AUTO), - DEFINE_PROP_BOOL("x-buggy-eim", IntelIOMMUState, buggy_eim, false), DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits, VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), @@ -4731,11 +4730,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (s->intr_eim == ON_OFF_AUTO_AUTO) { - s->intr_eim = (kvm_irqchip_in_kernel() || s->buggy_eim) + s->intr_eim = kvm_irqchip_in_kernel() && x86_iommu_ir_supported(x86_iommu) ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } - if (s->intr_eim == ON_OFF_AUTO_ON && !s->buggy_eim) { + if (s->intr_eim == ON_OFF_AUTO_ON) { if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { error_setg(errp, "eim=on requires support on the KVM side" "(X2APIC_API, first shipped in v4.7)");