* [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators
@ 2012-11-27 13:00 Will Deacon
2012-11-28 17:57 ` Matt Evans
0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2012-11-27 13:00 UTC (permalink / raw)
To: kvm; +Cc: penberg, Will Deacon, Matt Evans
Commit 8d35d32d0148 ("kvm tools: add generic device registration
mechanism") introduced a tree-based device lookup-by-bus mechanism as
well as iterators to enumerate the devices on a particular bus.
Whilst both x86 and ppc were converted by the original patch, the spapr
pci changes were incomplete, so include the required changes here.
Compile-tested only on ppc64 970mp. Note that I had to hack the Makefile
in order to build guest_init.o with a toolchain defaulting to ppc:
$(GUEST_INIT): guest/init.c
$(E) " LINK " $@
- $(Q) $(CC) -static guest/init.c -o $@
- $(Q) $(LD) -r -b binary -o guest/guest_init.o $(GUEST_INIT)
+ $(Q) $(CC) -m64 -static guest/init.c -o $@
+ $(Q) $(LD) -m elf64ppc -r -b binary -o guest/guest_init.o $(GUEST_INIT)
$(DEPS):
Cc: Matt Evans <matt@ozlabs.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
tools/kvm/powerpc/spapr_pci.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/powerpc/spapr_pci.c b/tools/kvm/powerpc/spapr_pci.c
index 5f4016c..ed4b9ab 100644
--- a/tools/kvm/powerpc/spapr_pci.c
+++ b/tools/kvm/powerpc/spapr_pci.c
@@ -15,6 +15,7 @@
#include "spapr.h"
#include "spapr_pci.h"
+#include "kvm/devices.h"
#include "kvm/fdt.h"
#include "kvm/util.h"
#include "kvm/pci.h"
@@ -248,6 +249,7 @@ int spapr_populate_pci_devices(struct kvm *kvm,
void *fdt)
{
int bus_off, node_off = 0, devid, fn, i, n, devices;
+ struct device_header *dev_hdr;
char nodename[256];
struct {
uint32_t hi;
@@ -301,14 +303,15 @@ int spapr_populate_pci_devices(struct kvm *kvm,
/* Populate PCI devices and allocate IRQs */
devices = 0;
-
- for (devid = 0; devid < KVM_MAX_DEVICES; devid++) {
+ dev_hdr = device__first_dev(DEVICE_BUS_PCI);
+ while (dev_hdr) {
uint32_t *irqmap = interrupt_map[devices];
- struct pci_device_header *hdr = pci__find_dev(devid);
+ struct pci_device_header *hdr = dev_hdr->data;
if (!hdr)
continue;
+ devid = dev_hdr->dev_num;
fn = 0; /* kvmtool doesn't yet do multifunction devices */
sprintf(nodename, "pci@%u,%u", devid, fn);
@@ -413,6 +416,7 @@ int spapr_populate_pci_devices(struct kvm *kvm,
/* We don't set ibm,dma-window property as we don't have an IOMMU. */
++devices;
+ dev_hdr = device__next_dev(dev_hdr);
}
/* Write interrupt map */
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators
2012-11-27 13:00 [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators Will Deacon
@ 2012-11-28 17:57 ` Matt Evans
2012-11-30 8:35 ` Pekka Enberg
0 siblings, 1 reply; 3+ messages in thread
From: Matt Evans @ 2012-11-28 17:57 UTC (permalink / raw)
To: Will Deacon; +Cc: kvm, penberg
Hi Will,
On 2012-11-27 13:00, Will Deacon wrote:
> Commit 8d35d32d0148 ("kvm tools: add generic device registration
> mechanism") introduced a tree-based device lookup-by-bus mechanism as
> well as iterators to enumerate the devices on a particular bus.
>
> Whilst both x86 and ppc were converted by the original patch, the
> spapr
> pci changes were incomplete, so include the required changes here.
>
> Compile-tested only on ppc64 970mp. Note that I had to hack the
> Makefile
> in order to build guest_init.o with a toolchain defaulting to ppc:
>
> $(GUEST_INIT): guest/init.c
> $(E) " LINK " $@
> - $(Q) $(CC) -static guest/init.c -o $@
> - $(Q) $(LD) -r -b binary -o guest/guest_init.o $(GUEST_INIT)
> + $(Q) $(CC) -m64 -static guest/init.c -o $@
> + $(Q) $(LD) -m elf64ppc -r -b binary -o guest/guest_init.o
> $(GUEST_INIT)
>
> $(DEPS):
>
> Cc: Matt Evans <matt@ozlabs.org>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
I lack PPC
But this patch appears too good
To be left aside
Acked-by: Matt Evans <matt@ozlabs.org>
Cheers,
Matt
> ---
> tools/kvm/powerpc/spapr_pci.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/tools/kvm/powerpc/spapr_pci.c
> b/tools/kvm/powerpc/spapr_pci.c
> index 5f4016c..ed4b9ab 100644
> --- a/tools/kvm/powerpc/spapr_pci.c
> +++ b/tools/kvm/powerpc/spapr_pci.c
> @@ -15,6 +15,7 @@
>
> #include "spapr.h"
> #include "spapr_pci.h"
> +#include "kvm/devices.h"
> #include "kvm/fdt.h"
> #include "kvm/util.h"
> #include "kvm/pci.h"
> @@ -248,6 +249,7 @@ int spapr_populate_pci_devices(struct kvm *kvm,
> void *fdt)
> {
> int bus_off, node_off = 0, devid, fn, i, n, devices;
> + struct device_header *dev_hdr;
> char nodename[256];
> struct {
> uint32_t hi;
> @@ -301,14 +303,15 @@ int spapr_populate_pci_devices(struct kvm *kvm,
>
> /* Populate PCI devices and allocate IRQs */
> devices = 0;
> -
> - for (devid = 0; devid < KVM_MAX_DEVICES; devid++) {
> + dev_hdr = device__first_dev(DEVICE_BUS_PCI);
> + while (dev_hdr) {
> uint32_t *irqmap = interrupt_map[devices];
> - struct pci_device_header *hdr = pci__find_dev(devid);
> + struct pci_device_header *hdr = dev_hdr->data;
>
> if (!hdr)
> continue;
>
> + devid = dev_hdr->dev_num;
> fn = 0; /* kvmtool doesn't yet do multifunction devices */
>
> sprintf(nodename, "pci@%u,%u", devid, fn);
> @@ -413,6 +416,7 @@ int spapr_populate_pci_devices(struct kvm *kvm,
> /* We don't set ibm,dma-window property as we don't have an IOMMU.
> */
>
> ++devices;
> + dev_hdr = device__next_dev(dev_hdr);
> }
>
> /* Write interrupt map */
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators
2012-11-28 17:57 ` Matt Evans
@ 2012-11-30 8:35 ` Pekka Enberg
0 siblings, 0 replies; 3+ messages in thread
From: Pekka Enberg @ 2012-11-30 8:35 UTC (permalink / raw)
To: Matt Evans; +Cc: Will Deacon, kvm
On Wed, 28 Nov 2012, Matt Evans wrote:
> On 2012-11-27 13:00, Will Deacon wrote:
> > Commit 8d35d32d0148 ("kvm tools: add generic device registration
> > mechanism") introduced a tree-based device lookup-by-bus mechanism as
> > well as iterators to enumerate the devices on a particular bus.
> >
> > Whilst both x86 and ppc were converted by the original patch, the spapr
> > pci changes were incomplete, so include the required changes here.
> >
> > Compile-tested only on ppc64 970mp. Note that I had to hack the Makefile
> > in order to build guest_init.o with a toolchain defaulting to ppc:
> >
> > $(GUEST_INIT): guest/init.c
> > $(E) " LINK " $@
> > - $(Q) $(CC) -static guest/init.c -o $@
> > - $(Q) $(LD) -r -b binary -o guest/guest_init.o $(GUEST_INIT)
> > + $(Q) $(CC) -m64 -static guest/init.c -o $@
> > + $(Q) $(LD) -m elf64ppc -r -b binary -o guest/guest_init.o
> > $(GUEST_INIT)
> >
> > $(DEPS):
> >
> > Cc: Matt Evans <matt@ozlabs.org>
> > Signed-off-by: Will Deacon <will.deacon@arm.com>
>
> I lack PPC
> But this patch appears too good
> To be left aside
>
> Acked-by: Matt Evans <matt@ozlabs.org>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-30 8:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-27 13:00 [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators Will Deacon
2012-11-28 17:57 ` Matt Evans
2012-11-30 8:35 ` Pekka Enberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox