From nobody Tue May 7 12:39:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1593060700; cv=none; d=zohomail.com; s=zohoarc; b=VOSstPBjUEF+ImHKRkB0tGi9bLit/gcn7dTUf3STmCnPSGIVX7VkGH1dDo6l+eQZO/ehPvLs8J6LS5otJKWpq/C4IaaqQQi9NCeskEwEfeOMOskc5Mn/nlL7bYcZKvOsLc79RTa8y2Yjc36whYXrx2ydOac2VBJ86/t8KdxVMpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593060700; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CJfSXCaF+nr/YHgiK31SJsbCa7LaSj7U7PCE0AopqEY=; b=C7GWI7ocaT5lso62rjDOpwOY41iZE0B24p3SsUYvL20uzgNj11UL3Diudb2lRcy9m3y8NfCVxPNhXXc9aLUkAuFK/VUCKVCk7tq4/OyE/PGpprVvmO8WPPYZfJeA5QzdtBDCyQxQ2GyP2rGHme1Hd4i1r11O5n2Q8/1MI7J6Nww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593060700498656.3261138231007; Wed, 24 Jun 2020 21:51:40 -0700 (PDT) Received: from localhost ([::1]:37618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joJrP-0008RF-5q for importer@patchew.org; Thu, 25 Jun 2020 00:51:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joJqG-0007YR-DG for qemu-devel@nongnu.org; Thu, 25 Jun 2020 00:50:28 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:33888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joJqE-0006gA-Ov for qemu-devel@nongnu.org; Thu, 25 Jun 2020 00:50:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id u26so5834570wmn.1 for ; Wed, 24 Jun 2020 21:50:26 -0700 (PDT) Received: from jondnuc.lan (IGLD-84-229-155-64.inter.net.il. [84.229.155.64]) by smtp.gmail.com with ESMTPSA id x7sm30684787wrr.72.2020.06.24.21.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 21:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CJfSXCaF+nr/YHgiK31SJsbCa7LaSj7U7PCE0AopqEY=; b=rmolLcq0bQec9EhAOY1M8jOQ7pIkMGH6Vq5hnuIAobJ11dIcxkG8prku1l7gWtXzYc Wf7s+vfu7zhVYQQgs15MRD8gPhYt8el6ZrffSgVX6M129rkkp6+rRpcd/jDrfGZLMs3q QogW3zo1NplLvyt3vEKyWck1Lhe4G+eYCTCObLqvIfqj3lG0R41IR+M1+H5XBGiEGlwS 8yNhAPe+fOHYB4KMw1W3GuJoCe3ifGe0AHjYN0MrBY36Jq7vQumwLrh5JojJTYV7ak3m MsvMlkqcFM4bX6CK4HZc2J5CghhZ6yRY8g6qxuQ4+aYDwtNUOACN4ats/z9tNqLL0hgD Wh4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CJfSXCaF+nr/YHgiK31SJsbCa7LaSj7U7PCE0AopqEY=; b=HDzbK7eKADu+QpLmtqcd7OstHog+vdEa/IlfV3zeAPLCGygcDJhNLLGG5CrojlcT85 Y5DXbcLpdJQrTuf0iB8umvC9XozfvujUvUvyrn/DeDYJuWW9d4zVEZpb+AJWJiDHzp3L R/eKpawARxeTJYX6gGPTAlIcNqc3AI6OhOw+wfVQkRc11n2b9E97Hsj9CMkpKElIn8Sp vAfGIdmZ8XYQLflLFsl7I3vCddlvEqZwcVuYwywlvCFnXyR76ASa5aDkoEv6QtAqHHRm 0F2ZUoPZhqtWppx6TXLnEyo33mDXG3OU3SKGwxZN8hECxXH3u3LM9TerBpDaHYy4q1EZ GlWw== X-Gm-Message-State: AOAM531SxY6seYUE2wcmx28H+I+4yGHkrvbvBeffKuHX5+BPhS+6DUqU +Fx85XJBwyWsDihq3PN+W70U+sLd X-Google-Smtp-Source: ABdhPJxefrrguF+VyYUosSZG0gHnYEHxg8c9K2ihG7vMM6VdTxzdoI7icjEQWJObJ5h2I1HTlM5Zkw== X-Received: by 2002:a1c:1dc7:: with SMTP id d190mr1255480wmd.36.1593060624827; Wed, 24 Jun 2020 21:50:24 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ Date: Thu, 25 Jun 2020 07:50:10 +0300 Message-Id: <20200625045011.1075314-2-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200625045011.1075314-1-arilou@gmail.com> References: <20200625045011.1075314-1-arilou@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=arilou@gmail.com; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mail@maciej.szmigiero.name, Jon Doron , rvkagan@yandex-team.ru, imammedo@redhat.com, pbonzini@redhat.com, vkuznets@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It seems like Windows does not really require 2 IRQs to have a functioning VMBus. Signed-off-by: Jon Doron Reviewed-by: Igor Mammedov --- hw/hyperv/vmbus.c | 3 +-- hw/i386/acpi-build.c | 4 +--- include/hw/hyperv/vmbus-bridge.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index f371240176..a8bcb41026 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2741,8 +2741,7 @@ static const VMStateDescription vmstate_vmbus_bridge = =3D { }; =20 static Property vmbus_bridge_props[] =3D { - DEFINE_PROP_UINT8("irq0", VMBusBridge, irq0, 7), - DEFINE_PROP_UINT8("irq1", VMBusBridge, irq1, 13), + DEFINE_PROP_UINT8("irq", VMBusBridge, irq, 7), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 900f786d08..91af0d2d0d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1082,9 +1082,7 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus= _bridge) aml_append(dev, aml_name_decl("_PS3", aml_int(0x0))); =20 crs =3D aml_resource_template(); - aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq0)); - /* FIXME: newer HyperV gets by with only one IRQ */ - aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq1)); + aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq)); aml_append(dev, aml_name_decl("_CRS", crs)); =20 return dev; diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bri= dge.h index c0a06d832c..33f93de64d 100644 --- a/include/hw/hyperv/vmbus-bridge.h +++ b/include/hw/hyperv/vmbus-bridge.h @@ -19,8 +19,7 @@ typedef struct VMBus VMBus; typedef struct VMBusBridge { SysBusDevice parent_obj; =20 - uint8_t irq0; - uint8_t irq1; + uint8_t irq; =20 VMBus *bus; } VMBusBridge; --=20 2.24.1 From nobody Tue May 7 12:39:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1593060760; cv=none; d=zohomail.com; s=zohoarc; b=NIVTiKCdfkYFnfsaNO1hzrN80RzrQ+DbwLx9zWeQEYgDRBZPj+DERX+e+r2BaB0B15oyL1MyfP2Mkrmi9cctRv67SQ5/wGUckLUBGX7wOY4g5Upzpa2D28V/m0xDkZeS11ROQLjrDxFEPIXni4OIHkZkYbpGreG1csCyYGyoQuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593060760; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g8HMQblKKnZs8OYwRQvjxqP8f1bg48Qg99bUSl1PbJE=; b=QRBH45Js2JOS+3YfJe1QKTgMx/ippNstxgAo9cmnovgg+6sfoAcyvO2p/hQ8mY1rBLQ0tZAx8RBWty4J8nrAvQcAWR1PEWFrSsvIYDM+fSDp1tBn3HFBMYcCVLYhtuuVyIbrxKIEyppy20ob8YVybsErhWhuZ4W1lFvbHdf8iko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593060760352822.2329353395372; Wed, 24 Jun 2020 21:52:40 -0700 (PDT) Received: from localhost ([::1]:40780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joJsL-0001M1-Gr for importer@patchew.org; Thu, 25 Jun 2020 00:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joJqH-0007ZI-3k for qemu-devel@nongnu.org; Thu, 25 Jun 2020 00:50:29 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:33344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joJqF-0006hU-LG for qemu-devel@nongnu.org; Thu, 25 Jun 2020 00:50:28 -0400 Received: by mail-wm1-x341.google.com with SMTP id a6so5828763wmm.0 for ; Wed, 24 Jun 2020 21:50:27 -0700 (PDT) Received: from jondnuc.lan (IGLD-84-229-155-64.inter.net.il. [84.229.155.64]) by smtp.gmail.com with ESMTPSA id x7sm30684787wrr.72.2020.06.24.21.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 21:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g8HMQblKKnZs8OYwRQvjxqP8f1bg48Qg99bUSl1PbJE=; b=V9KIFLkOjUcQ9NhRnB5pbTE30S0Hm7XZxPbXMSVZA3byK08aZcecfUmNi0mblucStD l7E6OAjrL1jWKm4hVqUsFMFoI+iemuDpsoufadccIj7gEsej47iOH5W9jAJV0b9URiYk GoO2xedyvuf/czc1fnL7H/9xG6et3Mq7lF7sDQKvMeWHdn6nmmibYuqDAqKcOUj0UqH1 n0Sh72oJZ/5IAnR1ZuvplxLE5mjEyiLehzxNqZvlfj59IfhF5xDd47sb/TJ5koRuP7S3 vYrcRasq1iwtJSL/yx/MHe22nJ9oexQura6u+R2QjCP/7HDBglLwUG//SKddT0JXacUD 6bJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g8HMQblKKnZs8OYwRQvjxqP8f1bg48Qg99bUSl1PbJE=; b=UcUd6fBcnxLLN8n71me+oiO6l8iokpczsvNqDxYJ9XEpL7N0fMSsAcpVmj5BehkLoy Qp5xAA9uEkZotlFR+EWJH8LHns21hLBZS1BTUoW4CA8es6+QzixZiHjLTSwoZpLA00La 5yk/riwg1eY7vtcMaIzuXR5eA0BMF5R+GkR1cQJU8so4axlrtOpSgUc0GZv4PmG1j3en qvUYwjv3l8uHrPZm1xI6YAVtU7SJjODoS67IjtqmqLyVPZtCva0gDd3Ajstvp47WT8y3 iV8I6TQRKDTtg4TLWCFO9z3vS4197MW2UEz2TAyZ1zfn4bv2auIaDN6eR5yXnarvE0pY HFFA== X-Gm-Message-State: AOAM531jvlZegqlzYy6V9JponfTJCitBk+RpM7Y99/vgOpQDtTg2atgM A46E2TXLGN8SdCNFPPYRc4cblL17 X-Google-Smtp-Source: ABdhPJyMzYl5i/cF9Wc9D6WZNdi3xfNd3cz1cBrCRXLmKcebKVvRseXw+resR/4XixzTqKQ0aoa/qQ== X-Received: by 2002:a7b:c381:: with SMTP id s1mr1285445wmj.25.1593060626169; Wed, 24 Jun 2020 21:50:26 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB Date: Thu, 25 Jun 2020 07:50:11 +0300 Message-Id: <20200625045011.1075314-3-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200625045011.1075314-1-arilou@gmail.com> References: <20200625045011.1075314-1-arilou@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=arilou@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mail@maciej.szmigiero.name, Jon Doron , rvkagan@yandex-team.ru, imammedo@redhat.com, pbonzini@redhat.com, vkuznets@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jon Doron Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 91af0d2d0d..1f938a53b2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1091,7 +1091,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus= _bridge) static void build_isa_devices_aml(Aml *table) { ISADevice *fdc =3D pc_find_fdc0(); - VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); bool ambiguous; =20 Aml *scope =3D aml_scope("_SB.PCI0.ISA"); @@ -1112,10 +1111,6 @@ static void build_isa_devices_aml(Aml *table) isa_build_aml(ISA_BUS(obj), scope); } =20 - if (vmbus_bridge) { - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); - } - aml_append(table, scope); } =20 @@ -1660,6 +1655,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCIBus *bus =3D NULL; TPMIf *tpm =3D tpm_find(); int i; + VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); =20 dsdt =3D init_aml_allocator(); =20 @@ -1702,6 +1698,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, } } =20 + if (vmbus_bridge) { + sb_scope =3D aml_scope("_SB"); + aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge)); + aml_append(dsdt, sb_scope); + } + if (pcmc->legacy_cpu_hotplug) { build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); } else { --=20 2.24.1