| Message ID | 1313063811-24683-1-git-send-email-levinsasha928@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Sasha, I've done a pull to get patch below and otherwise sync up and got an ioremap error. It is a little different from the patch I got from you previously that worked. The patch that worked changed pci.c as: - u8 bar = offset - PCI_BAR_OFFSET(0); + u8 bar = (offset - PCI_BAR_OFFSET(0)) / sizeof(u32); vs the patch below which drops the () around the numerator: - u8 bar = offset - PCI_BAR_OFFSET(0); + u8 bar = offset - PCI_BAR_OFFSET(0) / (sizeof(u32)); I've put back the () in my local copy, and that works for me. Thanks, \dae On Thu, Aug 11, 2011 at 02:56:51PM +0300, Sasha Levin wrote: > This patch makes BAR 1 16k, instead of BAR0 - which is the PIO bar. > > This fixes wrong output on lspci command and ioremap warnings during boot. > > Signed-off-by: Sasha Levin <levinsasha928@gmail.com> > --- > tools/kvm/hw/vesa.c | 2 +- > tools/kvm/pci.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/kvm/hw/vesa.c b/tools/kvm/hw/vesa.c > index 2af08df..9caa6c4 100644 > --- a/tools/kvm/hw/vesa.c > +++ b/tools/kvm/hw/vesa.c > @@ -39,6 +39,7 @@ static struct pci_device_header vesa_pci_device = { > .subsys_vendor_id = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET, > .subsys_id = PCI_SUBSYSTEM_ID_VESA, > .bar[1] = VESA_MEM_ADDR | PCI_BASE_ADDRESS_SPACE_MEMORY, > + .bar_size[1] = VESA_MEM_SIZE, > }; > > static struct framebuffer vesafb; > @@ -56,7 +57,6 @@ struct framebuffer *vesa__init(struct kvm *kvm) > vesa_pci_device.irq_line = line; > vesa_base_addr = ioport__register(IOPORT_EMPTY, &vesa_io_ops, IOPORT_SIZE, NULL); > vesa_pci_device.bar[0] = vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO; > - vesa_pci_device.bar_size[0] = VESA_MEM_SIZE; > pci__register(&vesa_pci_device, dev); > > mem = mmap(NULL, VESA_MEM_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); > diff --git a/tools/kvm/pci.c b/tools/kvm/pci.c > index fd19b73..0449aca 100644 > --- a/tools/kvm/pci.c > +++ b/tools/kvm/pci.c > @@ -95,7 +95,7 @@ static bool pci_config_data_out(struct ioport *ioport, struct kvm *kvm, u16 port > offset = start + (pci_config_address.register_number << 2); > if (offset < sizeof(struct pci_device_header)) { > void *p = pci_devices[dev_num]; > - u8 bar = offset - PCI_BAR_OFFSET(0); > + u8 bar = offset - PCI_BAR_OFFSET(0) / (sizeof(u32)); > u32 sz = PCI_IO_SIZE; > > if (bar < 6 && pci_devices[dev_num]->bar_size[bar]) > -- > 1.7.6 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tools/kvm/hw/vesa.c b/tools/kvm/hw/vesa.c index 2af08df..9caa6c4 100644 --- a/tools/kvm/hw/vesa.c +++ b/tools/kvm/hw/vesa.c @@ -39,6 +39,7 @@ static struct pci_device_header vesa_pci_device = { .subsys_vendor_id = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET, .subsys_id = PCI_SUBSYSTEM_ID_VESA, .bar[1] = VESA_MEM_ADDR | PCI_BASE_ADDRESS_SPACE_MEMORY, + .bar_size[1] = VESA_MEM_SIZE, }; static struct framebuffer vesafb; @@ -56,7 +57,6 @@ struct framebuffer *vesa__init(struct kvm *kvm) vesa_pci_device.irq_line = line; vesa_base_addr = ioport__register(IOPORT_EMPTY, &vesa_io_ops, IOPORT_SIZE, NULL); vesa_pci_device.bar[0] = vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO; - vesa_pci_device.bar_size[0] = VESA_MEM_SIZE; pci__register(&vesa_pci_device, dev); mem = mmap(NULL, VESA_MEM_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); diff --git a/tools/kvm/pci.c b/tools/kvm/pci.c index fd19b73..0449aca 100644 --- a/tools/kvm/pci.c +++ b/tools/kvm/pci.c @@ -95,7 +95,7 @@ static bool pci_config_data_out(struct ioport *ioport, struct kvm *kvm, u16 port offset = start + (pci_config_address.register_number << 2); if (offset < sizeof(struct pci_device_header)) { void *p = pci_devices[dev_num]; - u8 bar = offset - PCI_BAR_OFFSET(0); + u8 bar = offset - PCI_BAR_OFFSET(0) / (sizeof(u32)); u32 sz = PCI_IO_SIZE; if (bar < 6 && pci_devices[dev_num]->bar_size[bar])
This patch makes BAR 1 16k, instead of BAR0 - which is the PIO bar. This fixes wrong output on lspci command and ioremap warnings during boot. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- tools/kvm/hw/vesa.c | 2 +- tools/kvm/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)