* [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections
@ 2020-07-15 8:43 Jon Doron
2020-07-15 8:43 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Jon Doron @ 2020-07-15 8:43 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.
v5:
* Rebased on latest master
* Added a patch to fix 32bit compliation on VMBus
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):
acpi: i386: Move VMBus DSDT entry to SB
hw: hyperv: vmbus: Fix 32bit compilation
hw/hyperv/vmbus.c | 3 ++-
hw/i386/acpi-build.c | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB 2020-07-15 8:43 [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Jon Doron @ 2020-07-15 8:43 ` Jon Doron 2020-07-15 13:51 ` Igor Mammedov 2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron 2020-09-12 6:26 ` [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Paolo Bonzini 2 siblings, 1 reply; 11+ messages in thread From: Jon Doron @ 2020-07-15 8:43 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 b7bcbbbb2a..7708a27f70 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -975,7 +975,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) static void build_isa_devices_aml(Aml *table) { - VMBusBridge *vmbus_bridge = vmbus_bridge_find(); bool ambiguous; Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); Aml *scope; @@ -986,10 +985,6 @@ static void build_isa_devices_aml(Aml *table) build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); isa_build_aml(ISA_BUS(obj), scope); - if (vmbus_bridge) { - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); - } - aml_append(table, scope); } @@ -1485,6 +1480,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(); @@ -1526,6 +1522,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] 11+ messages in thread
* Re: [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB 2020-07-15 8:43 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron @ 2020-07-15 13:51 ` Igor Mammedov 0 siblings, 0 replies; 11+ messages in thread From: Igor Mammedov @ 2020-07-15 13:51 UTC (permalink / raw) To: Jon Doron; +Cc: rvkagan, pbonzini, vkuznets, mail, qemu-devel On Wed, 15 Jul 2020 11:43:25 +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 b7bcbbbb2a..7708a27f70 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -975,7 +975,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) > > static void build_isa_devices_aml(Aml *table) > { > - VMBusBridge *vmbus_bridge = vmbus_bridge_find(); > bool ambiguous; > Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); > Aml *scope; > @@ -986,10 +985,6 @@ static void build_isa_devices_aml(Aml *table) > build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); > isa_build_aml(ISA_BUS(obj), scope); > > - if (vmbus_bridge) { > - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); > - } > - > aml_append(table, scope); > } > > @@ -1485,6 +1480,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(); > > @@ -1526,6 +1522,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] 11+ messages in thread
* [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-07-15 8:43 [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Jon Doron 2020-07-15 8:43 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron @ 2020-07-15 8:43 ` Jon Doron 2020-07-25 12:16 ` Aleksandar Markovic 2020-09-06 10:14 ` Philippe Mathieu-Daudé 2020-09-12 6:26 ` [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Paolo Bonzini 2 siblings, 2 replies; 11+ messages in thread From: Jon Doron @ 2020-07-15 8:43 UTC (permalink / raw) To: qemu-devel; +Cc: mail, Jon Doron, rvkagan, imammedo, pbonzini, vkuznets Signed-off-by: Jon Doron <arilou@gmail.com> --- hw/hyperv/vmbus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 34392e892a..c28bb4201b 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) } } - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page); + p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | + off_in_page); if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { memcpy(p, buf, cplen); } else { -- 2.24.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron @ 2020-07-25 12:16 ` Aleksandar Markovic 2020-07-29 14:15 ` Igor Mammedov 2020-09-06 10:14 ` Philippe Mathieu-Daudé 1 sibling, 1 reply; 11+ messages in thread From: Aleksandar Markovic @ 2020-07-25 12:16 UTC (permalink / raw) To: Jon Doron; +Cc: mail, qemu-devel, rvkagan, pbonzini, imammedo, vkuznets [-- Attachment #1: Type: text/plain, Size: 1001 bytes --] On Wednesday, July 15, 2020, Jon Doron <arilou@gmail.com> wrote: > Signed-off-by: Jon Doron <arilou@gmail.com> > --- > hw/hyperv/vmbus.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c > index 34392e892a..c28bb4201b 100644 > --- a/hw/hyperv/vmbus.c > +++ b/hw/hyperv/vmbus.c > @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void > *buf, uint32_t len) > } > } > > - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | > off_in_page); > + p = (void *)(uintptr_t)(((uintptr_t)iter->map & > TARGET_PAGE_MASK) | > + off_in_page); > if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { > memcpy(p, buf, cplen); > } else { > -- > 2.24.1 > > > Tested-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> It looks to me this patch should definitely be selected for 5.1.? [-- Attachment #2: Type: text/html, Size: 2089 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-07-25 12:16 ` Aleksandar Markovic @ 2020-07-29 14:15 ` Igor Mammedov 0 siblings, 0 replies; 11+ messages in thread From: Igor Mammedov @ 2020-07-29 14:15 UTC (permalink / raw) To: Aleksandar Markovic Cc: mail, Jon Doron, mst, qemu-devel, rvkagan, pbonzini, vkuznets On Sat, 25 Jul 2020 14:16:08 +0200 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> wrote: > On Wednesday, July 15, 2020, Jon Doron <arilou@gmail.com> wrote: Michael, could you merge it via your tree please? > > > Signed-off-by: Jon Doron <arilou@gmail.com> > > --- > > hw/hyperv/vmbus.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c > > index 34392e892a..c28bb4201b 100644 > > --- a/hw/hyperv/vmbus.c > > +++ b/hw/hyperv/vmbus.c > > @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void > > *buf, uint32_t len) > > } > > } > > > > - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | > > off_in_page); > > + p = (void *)(uintptr_t)(((uintptr_t)iter->map & > > TARGET_PAGE_MASK) | > > + off_in_page); > > if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { > > memcpy(p, buf, cplen); > > } else { > > -- > > 2.24.1 > > > > > > > Tested-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> > Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> > > It looks to me this patch should definitely be selected for 5.1.? ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron 2020-07-25 12:16 ` Aleksandar Markovic @ 2020-09-06 10:14 ` Philippe Mathieu-Daudé 2020-09-09 13:56 ` Laurent Vivier 1 sibling, 1 reply; 11+ messages in thread From: Philippe Mathieu-Daudé @ 2020-09-06 10:14 UTC (permalink / raw) To: Jon Doron, qemu-devel Cc: mail, QEMU Trivial, Richard Henderson, rvkagan, pbonzini, imammedo, vkuznets Cc'ing qemu-trivial@ Can we add the commit description Richard wrote? --- Fix 32-bit build error for vmbus: hw/hyperv/vmbus.c: In function ‘gpadl_iter_io’: hw/hyperv/vmbus.c:383:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 383 | p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page); | ^ cc1: all warnings being treated as errors Fixes: 0d71f7082d7 ("vmbus: vmbus implementation") --- On 7/15/20 10:43 AM, Jon Doron wrote: > Signed-off-by: Jon Doron <arilou@gmail.com> > --- > hw/hyperv/vmbus.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c > index 34392e892a..c28bb4201b 100644 > --- a/hw/hyperv/vmbus.c > +++ b/hw/hyperv/vmbus.c > @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) > } > } > > - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page); > + p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | > + off_in_page); > if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { > memcpy(p, buf, cplen); > } else { > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-09-06 10:14 ` Philippe Mathieu-Daudé @ 2020-09-09 13:56 ` Laurent Vivier 2020-09-09 16:18 ` Richard Henderson 0 siblings, 1 reply; 11+ messages in thread From: Laurent Vivier @ 2020-09-09 13:56 UTC (permalink / raw) To: Philippe Mathieu-Daudé, Jon Doron, qemu-devel Cc: mail, QEMU Trivial, Richard Henderson, rvkagan, pbonzini, imammedo, vkuznets Le 06/09/2020 à 12:14, Philippe Mathieu-Daudé a écrit : > Cc'ing qemu-trivial@ > > Can we add the commit description Richard wrote? I have no message from Richard regarding this patch. Thanks, Laurent > > --- > Fix 32-bit build error for vmbus: > > hw/hyperv/vmbus.c: In function ‘gpadl_iter_io’: > hw/hyperv/vmbus.c:383:13: error: cast to pointer from integer of > different size [-Werror=int-to-pointer-cast] > 383 | p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | > off_in_page); > | ^ > cc1: all warnings being treated as errors > > Fixes: 0d71f7082d7 ("vmbus: vmbus implementation") > --- > > On 7/15/20 10:43 AM, Jon Doron wrote: >> Signed-off-by: Jon Doron <arilou@gmail.com> >> --- >> hw/hyperv/vmbus.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c >> index 34392e892a..c28bb4201b 100644 >> --- a/hw/hyperv/vmbus.c >> +++ b/hw/hyperv/vmbus.c >> @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) >> } >> } >> >> - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page); >> + p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | >> + off_in_page); >> if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { >> memcpy(p, buf, cplen); >> } else { >> > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-09-09 13:56 ` Laurent Vivier @ 2020-09-09 16:18 ` Richard Henderson 2020-09-09 16:30 ` Laurent Vivier 0 siblings, 1 reply; 11+ messages in thread From: Richard Henderson @ 2020-09-09 16:18 UTC (permalink / raw) To: Laurent Vivier, Philippe Mathieu-Daudé, Jon Doron, qemu-devel Cc: mail, QEMU Trivial, rvkagan, pbonzini, imammedo, vkuznets On 9/9/20 6:56 AM, Laurent Vivier wrote: > Le 06/09/2020 à 12:14, Philippe Mathieu-Daudé a écrit : >> Cc'ing qemu-trivial@ >> >> Can we add the commit description Richard wrote? > > I have no message from Richard regarding this patch. https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg02283.html Different thread, same problem. r~ ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation 2020-09-09 16:18 ` Richard Henderson @ 2020-09-09 16:30 ` Laurent Vivier 0 siblings, 0 replies; 11+ messages in thread From: Laurent Vivier @ 2020-09-09 16:30 UTC (permalink / raw) To: Richard Henderson, Philippe Mathieu-Daudé, Jon Doron, qemu-devel Cc: mail, QEMU Trivial, rvkagan, pbonzini, imammedo, vkuznets Le 09/09/2020 à 18:18, Richard Henderson a écrit : > On 9/9/20 6:56 AM, Laurent Vivier wrote: >> Le 06/09/2020 à 12:14, Philippe Mathieu-Daudé a écrit : >>> Cc'ing qemu-trivial@ >>> >>> Can we add the commit description Richard wrote? >> >> I have no message from Richard regarding this patch. > > https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg02283.html > > Different thread, same problem. Thank you. Applied to my trivial-patches branch. Thanks, Laurent ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections 2020-07-15 8:43 [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Jon Doron 2020-07-15 8:43 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron 2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron @ 2020-09-12 6:26 ` Paolo Bonzini 2 siblings, 0 replies; 11+ messages in thread From: Paolo Bonzini @ 2020-09-12 6:26 UTC (permalink / raw) To: Jon Doron, qemu-devel; +Cc: rvkagan, imammedo, vkuznets, mail On 15/07/20 10:43, Jon Doron wrote: > After doing further tests and looking at the latest HyperV ACPI DSDT. > Do minor fix to our VMBus ACPI entry. > > v5: > * Rebased on latest master > * Added a patch to fix 32bit compliation on VMBus > > 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): > acpi: i386: Move VMBus DSDT entry to SB > hw: hyperv: vmbus: Fix 32bit compilation > > hw/hyperv/vmbus.c | 3 ++- > hw/i386/acpi-build.c | 12 +++++++----- > 2 files changed, 9 insertions(+), 6 deletions(-) > Queued, thanks. Paolo ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-09-12 6:28 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-15 8:43 [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Jon Doron 2020-07-15 8:43 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Jon Doron 2020-07-15 13:51 ` Igor Mammedov 2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron 2020-07-25 12:16 ` Aleksandar Markovic 2020-07-29 14:15 ` Igor Mammedov 2020-09-06 10:14 ` Philippe Mathieu-Daudé 2020-09-09 13:56 ` Laurent Vivier 2020-09-09 16:18 ` Richard Henderson 2020-09-09 16:30 ` Laurent Vivier 2020-09-12 6:26 ` [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Paolo Bonzini
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).