* [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections
@ 2020-06-25 4:50 Jon Doron
2020-06-25 4:50 ` [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ Jon Doron
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jon Doron @ 2020-06-25 4:50 UTC (permalink / raw)
To: qemu-devel; +Cc: mail, Jon Doron, rvkagan, imammedo, pbonzini, vkuznets
After doing further tests and looking at the latest HyperV ACPI DSDT.
Do minor fix to our VMBus ACPI entry.
v4:
* Removed the patch which adds _ADR definition to the VMBus
* Correct the change which moves the VMBus under the SB
v3:
Removed accidental change for the dct submodule head
v2:
Renamed irq0 to irq now that there is a single IRQ required
Jon Doron (2):
hyperv: vmbus: Remove the 2nd IRQ
acpi: i386: Move VMBus DSDT entry to SB
hw/hyperv/vmbus.c | 3 +--
hw/i386/acpi-build.c | 16 ++++++++--------
include/hw/hyperv/vmbus-bridge.h | 3 +--
3 files changed, 10 insertions(+), 12 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ
2020-06-25 4:50 [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
@ 2020-06-25 4:50 ` Jon Doron
2020-06-25 4:50 ` [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Jon Doron @ 2020-06-25 4:50 UTC (permalink / raw)
To: qemu-devel; +Cc: mail, Jon Doron, rvkagan, imammedo, pbonzini, vkuznets
It seems like Windows does not really require 2 IRQs to have a
functioning VMBus.
Signed-off-by: Jon Doron <arilou@gmail.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
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 = {
};
static Property vmbus_bridge_props[] = {
- 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()
};
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)));
crs = 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));
return dev;
diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.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;
- uint8_t irq0;
- uint8_t irq1;
+ uint8_t irq;
VMBus *bus;
} VMBusBridge;
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB
2020-06-25 4:50 [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
2020-06-25 4:50 ` [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ Jon Doron
@ 2020-06-25 4:50 ` Jon Doron
2020-07-13 8:38 ` Igor Mammedov
2020-07-13 8:40 ` [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Igor Mammedov
2020-07-13 8:44 ` Igor Mammedov
3 siblings, 1 reply; 7+ messages in thread
From: Jon Doron @ 2020-06-25 4:50 UTC (permalink / raw)
To: qemu-devel; +Cc: mail, Jon Doron, rvkagan, imammedo, pbonzini, vkuznets
Signed-off-by: Jon Doron <arilou@gmail.com>
---
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 = pc_find_fdc0();
- VMBusBridge *vmbus_bridge = vmbus_bridge_find();
bool ambiguous;
Aml *scope = aml_scope("_SB.PCI0.ISA");
@@ -1112,10 +1111,6 @@ static void build_isa_devices_aml(Aml *table)
isa_build_aml(ISA_BUS(obj), scope);
}
- if (vmbus_bridge) {
- aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
- }
-
aml_append(table, scope);
}
@@ -1660,6 +1655,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
PCIBus *bus = NULL;
TPMIf *tpm = tpm_find();
int i;
+ VMBusBridge *vmbus_bridge = vmbus_bridge_find();
dsdt = init_aml_allocator();
@@ -1702,6 +1698,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
}
}
+ if (vmbus_bridge) {
+ sb_scope = 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 {
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB
2020-06-25 4:50 ` [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron
@ 2020-07-13 8:38 ` Igor Mammedov
0 siblings, 0 replies; 7+ messages in thread
From: Igor Mammedov @ 2020-07-13 8:38 UTC (permalink / raw)
To: Jon Doron; +Cc: rvkagan, pbonzini, vkuznets, mail, qemu-devel
On Thu, 25 Jun 2020 07:50:11 +0300
Jon Doron <arilou@gmail.com> wrote:
> Signed-off-by: Jon Doron <arilou@gmail.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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 = pc_find_fdc0();
> - VMBusBridge *vmbus_bridge = vmbus_bridge_find();
> bool ambiguous;
>
> Aml *scope = aml_scope("_SB.PCI0.ISA");
> @@ -1112,10 +1111,6 @@ static void build_isa_devices_aml(Aml *table)
> isa_build_aml(ISA_BUS(obj), scope);
> }
>
> - if (vmbus_bridge) {
> - aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
> - }
> -
> aml_append(table, scope);
> }
>
> @@ -1660,6 +1655,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> PCIBus *bus = NULL;
> TPMIf *tpm = tpm_find();
> int i;
> + VMBusBridge *vmbus_bridge = vmbus_bridge_find();
>
> dsdt = init_aml_allocator();
>
> @@ -1702,6 +1698,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> }
> }
>
> + if (vmbus_bridge) {
> + sb_scope = 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 {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections
2020-06-25 4:50 [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
2020-06-25 4:50 ` [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ Jon Doron
2020-06-25 4:50 ` [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron
@ 2020-07-13 8:40 ` Igor Mammedov
2020-07-13 8:44 ` Igor Mammedov
3 siblings, 0 replies; 7+ messages in thread
From: Igor Mammedov @ 2020-07-13 8:40 UTC (permalink / raw)
To: Jon Doron; +Cc: rvkagan, pbonzini, mail, qemu-devel, vkuznets
On Thu, 25 Jun 2020 07:50:09 +0300
Jon Doron <arilou@gmail.com> wrote:
> After doing further tests and looking at the latest HyperV ACPI DSDT.
> Do minor fix to our VMBus ACPI entry.
Michael,
could you queue it for 5.1, pls?
> v4:
> * Removed the patch which adds _ADR definition to the VMBus
> * Correct the change which moves the VMBus under the SB
>
> v3:
> Removed accidental change for the dct submodule head
>
> v2:
> Renamed irq0 to irq now that there is a single IRQ required
>
> Jon Doron (2):
> hyperv: vmbus: Remove the 2nd IRQ
> acpi: i386: Move VMBus DSDT entry to SB
>
> hw/hyperv/vmbus.c | 3 +--
> hw/i386/acpi-build.c | 16 ++++++++--------
> include/hw/hyperv/vmbus-bridge.h | 3 +--
> 3 files changed, 10 insertions(+), 12 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections
2020-06-25 4:50 [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
` (2 preceding siblings ...)
2020-07-13 8:40 ` [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Igor Mammedov
@ 2020-07-13 8:44 ` Igor Mammedov
2020-07-13 15:54 ` Jon Doron
3 siblings, 1 reply; 7+ messages in thread
From: Igor Mammedov @ 2020-07-13 8:44 UTC (permalink / raw)
To: Jon Doron; +Cc: rvkagan, pbonzini, mail, qemu-devel, vkuznets
On Thu, 25 Jun 2020 07:50:09 +0300
Jon Doron <arilou@gmail.com> wrote:
> After doing further tests and looking at the latest HyperV ACPI DSDT.
> Do minor fix to our VMBus ACPI entry.
Jon,
vmbus feature needs a testcase, could you look into it please?
(see tests/qtest/bios-tables-test.c for an example.
also look into comment blob at the top for the propper process
for acpi patches/tests)
> v4:
> * Removed the patch which adds _ADR definition to the VMBus
> * Correct the change which moves the VMBus under the SB
>
> v3:
> Removed accidental change for the dct submodule head
>
> v2:
> Renamed irq0 to irq now that there is a single IRQ required
>
> Jon Doron (2):
> hyperv: vmbus: Remove the 2nd IRQ
> acpi: i386: Move VMBus DSDT entry to SB
>
> hw/hyperv/vmbus.c | 3 +--
> hw/i386/acpi-build.c | 16 ++++++++--------
> include/hw/hyperv/vmbus-bridge.h | 3 +--
> 3 files changed, 10 insertions(+), 12 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections
2020-07-13 8:44 ` Igor Mammedov
@ 2020-07-13 15:54 ` Jon Doron
0 siblings, 0 replies; 7+ messages in thread
From: Jon Doron @ 2020-07-13 15:54 UTC (permalink / raw)
To: Igor Mammedov; +Cc: rvkagan, pbonzini, Maciej S. Szmigiero, QEMU, vkuznets
[-- Attachment #1: Type: text/plain, Size: 1158 bytes --]
Sure thing I'll try to take a look at it this weekend.
Jon.
On Mon, Jul 13, 2020, 11:44 Igor Mammedov <imammedo@redhat.com> wrote:
> On Thu, 25 Jun 2020 07:50:09 +0300
> Jon Doron <arilou@gmail.com> wrote:
>
> > After doing further tests and looking at the latest HyperV ACPI DSDT.
> > Do minor fix to our VMBus ACPI entry.
>
> Jon,
> vmbus feature needs a testcase, could you look into it please?
> (see tests/qtest/bios-tables-test.c for an example.
> also look into comment blob at the top for the propper process
> for acpi patches/tests)
>
>
> > v4:
> > * Removed the patch which adds _ADR definition to the VMBus
> > * Correct the change which moves the VMBus under the SB
> >
> > v3:
> > Removed accidental change for the dct submodule head
> >
> > v2:
> > Renamed irq0 to irq now that there is a single IRQ required
> >
> > Jon Doron (2):
> > hyperv: vmbus: Remove the 2nd IRQ
> > acpi: i386: Move VMBus DSDT entry to SB
> >
> > hw/hyperv/vmbus.c | 3 +--
> > hw/i386/acpi-build.c | 16 ++++++++--------
> > include/hw/hyperv/vmbus-bridge.h | 3 +--
> > 3 files changed, 10 insertions(+), 12 deletions(-)
> >
>
>
[-- Attachment #2: Type: text/html, Size: 1744 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-07-13 15:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-25 4:50 [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
2020-06-25 4:50 ` [PATCH v4 1/2] hyperv: vmbus: Remove the 2nd IRQ Jon Doron
2020-06-25 4:50 ` [PATCH v4 2/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron
2020-07-13 8:38 ` Igor Mammedov
2020-07-13 8:40 ` [PATCH v4 0/2] hyperv: vmbus: ACPI various corrections Igor Mammedov
2020-07-13 8:44 ` Igor Mammedov
2020-07-13 15:54 ` Jon Doron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).