Message ID | 1254514577-11896-11-git-send-email-yamahata@valinux.co.jp |
---|---|
State | Superseded |
Headers | show |
On Sat, Oct 03, 2009 at 05:16:02AM +0900, Isaku Yamahata wrote: > This patch is preliminary for 64bit BAR. > Later pcibus_t will be changed from uint32_t to uint64_t. > Introduce FMT_pcibus for printf format for pcibus_t. > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> I think that macros should be all-uppercase. > --- > hw/e1000.c | 6 ++++-- > hw/eepro100.c | 6 ++++-- > hw/pci.c | 17 +++++++++++------ > hw/pci.h | 1 + > hw/pcnet.c | 5 +++-- > hw/wdt_i6300esb.c | 3 ++- > 6 files changed, 25 insertions(+), 13 deletions(-) > > diff --git a/hw/e1000.c b/hw/e1000.c > index c07eb42..cb88f7a 100644 > --- a/hw/e1000.c > +++ b/hw/e1000.c > @@ -145,7 +145,8 @@ static void > ioport_map(PCIDevice *pci_dev, int region_num, pcibus_t addr, > pcibus_t size, int type) > { > - DBGOUT(IO, "e1000_ioport_map addr=0x%04x size=0x%08x\n", addr, size); > + DBGOUT(IO, "e1000_ioport_map addr=0x%04"FMT_pcibus" size=0x%08"FMT_pcibus"\n", > + addr, size); > } > > static void > @@ -1040,7 +1041,8 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, > }; > > > - DBGOUT(MMIO, "e1000_mmio_map addr=0x%08x 0x%08x\n", addr, size); > + DBGOUT(MMIO, "e1000_mmio_map addr=0x%08"FMT_pcibus" 0x%08"FMT_pcibus"\n", > + addr, size); > > cpu_register_physical_memory(addr, PNPMMIO_SIZE, d->mmio_index); > qemu_register_coalesced_mmio(addr, excluded_regs[0]); > diff --git a/hw/eepro100.c b/hw/eepro100.c > index 1a1a0da..e54b129 100644 > --- a/hw/eepro100.c > +++ b/hw/eepro100.c > @@ -1378,7 +1378,8 @@ static void pci_map(PCIDevice * pci_dev, int region_num, > { > EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); > > - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", > + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_pcibus", " > + "size=0x%08"FMT_pcibus", type=%d\n", > region_num, addr, size, type)); > > assert(region_num == 1); > @@ -1457,7 +1458,8 @@ static void pci_mmio_map(PCIDevice * pci_dev, int region_num, > { > EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); > > - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", > + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_pcibus", " > + "size=0x%08"FMT_pcibus", type=%d\n", > region_num, addr, size, type)); > > if (region_num == 0) { > diff --git a/hw/pci.c b/hw/pci.c > index 674daba..510fad2 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -408,7 +408,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, > > if (size & (size-1)) { > fprintf(stderr, "ERROR: PCI region size must be pow2 " > - "type=0x%x, size=0x%x\n", type, size); > + "type=0x%x, size=0x%"FMT_pcibus"\n", type, size); > exit(1); > } > > @@ -427,7 +427,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, > addr = 0x10 + region_num * 4; > } > pci_set_long(pci_dev->config + addr, type); > - pci_set_long(pci_dev->wmask + addr, wmask); > + pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); > pci_set_long(pci_dev->cmask + addr, 0xffffffff); > } > > @@ -473,7 +473,11 @@ static void pci_update_mappings(PCIDevice *d) > mappings, we handle specific values as invalid > mappings. */ > if (last_addr <= new_addr || new_addr == 0 || > - last_addr == PCI_BAR_UNMAPPED) { > + last_addr == PCI_BAR_UNMAPPED || > + > + /* keep old behaviour > + * without this, PC ide doesn't work well. */ > + last_addr >= UINT32_MAX) { > new_addr = PCI_BAR_UNMAPPED; > } > } else { > @@ -729,10 +733,10 @@ static void pci_info_device(PCIDevice *d) > if (r->size != 0) { > monitor_printf(mon, " BAR%d: ", i); > if (r->type & PCI_ADDRESS_SPACE_IO) { > - monitor_printf(mon, "I/O at 0x%04x [0x%04x].\n", > + monitor_printf(mon, "I/O at 0x%04"FMT_pcibus" [0x%04"FMT_pcibus"].\n", > r->addr, r->addr + r->size - 1); > } else { > - monitor_printf(mon, "32 bit memory at 0x%08x [0x%08x].\n", > + monitor_printf(mon, "32 bit memory at 0x%08"FMT_pcibus" [0x%08"FMT_pcibus"].\n", > r->addr, r->addr + r->size - 1); > } > } > @@ -1047,7 +1051,8 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) > r = &d->io_regions[i]; > if (!r->size) > continue; > - monitor_printf(mon, "%*sbar %d: %s at 0x%x [0x%x]\n", indent, "", > + monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_pcibus" [0x%"FMT_pcibus"]\n", > + indent, "", > i, r->type & PCI_ADDRESS_SPACE_IO ? "i/o" : "mem", > r->addr, r->addr + r->size - 1); > } > diff --git a/hw/pci.h b/hw/pci.h > index 8e46aba..d75b3b3 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -72,6 +72,7 @@ extern target_phys_addr_t pci_mem_base; > #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 > > typedef uint32_t pcibus_t; > +#define FMT_pcibus PRIx32 > > typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, > uint32_t address, uint32_t data, int len); > diff --git a/hw/pcnet.c b/hw/pcnet.c > index 2789574..0af9a9f 100644 > --- a/hw/pcnet.c > +++ b/hw/pcnet.c > @@ -1766,7 +1766,8 @@ static void pcnet_ioport_map(PCIDevice *pci_dev, int region_num, > PCNetState *d = &DO_UPCAST(PCIPCNetState, pci_dev, pci_dev)->state; > > #ifdef PCNET_DEBUG_IO > - printf("pcnet_ioport_map addr=0x%04x size=0x%04x\n", addr, size); > + printf("pcnet_ioport_map addr=0x%04"FMT_pcibus" size=0x%04"FMT_pcibus"\n", > + addr, size); > #endif > > register_ioport_write(addr, 16, 1, pcnet_aprom_writeb, d); > @@ -1994,7 +1995,7 @@ static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num, > PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); > > #ifdef PCNET_DEBUG_IO > - printf("pcnet_mmio_map addr=0x%08x 0x%08x\n", addr, size); > + printf("pcnet_mmio_map addr=0x%08"FMT_pcibus" 0x%08"FMT_pcibus"\n", addr, size); > #endif > > cpu_register_physical_memory(addr, PCNET_PNPMMIO_SIZE, d->state.mmio_index); > diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c > index d3ab3c8..93e657b 100644 > --- a/hw/wdt_i6300esb.c > +++ b/hw/wdt_i6300esb.c > @@ -362,7 +362,8 @@ static void i6300esb_map(PCIDevice *dev, int region_num, > I6300State *d = DO_UPCAST(I6300State, dev, dev); > int io_mem; > > - i6300esb_debug("addr = %x, size = %x, type = %d\n", addr, size, type); > + i6300esb_debug("addr = %"FMT_pcibus", size = %"FMT_pcibus", type = %d\n", > + addr, size, type); > > io_mem = cpu_register_io_memory(mem_read, mem_write, d); > cpu_register_physical_memory (addr, 0x10, io_mem); > -- > 1.6.0.2 > >
diff --git a/hw/e1000.c b/hw/e1000.c index c07eb42..cb88f7a 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -145,7 +145,8 @@ static void ioport_map(PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { - DBGOUT(IO, "e1000_ioport_map addr=0x%04x size=0x%08x\n", addr, size); + DBGOUT(IO, "e1000_ioport_map addr=0x%04"FMT_pcibus" size=0x%08"FMT_pcibus"\n", + addr, size); } static void @@ -1040,7 +1041,8 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, }; - DBGOUT(MMIO, "e1000_mmio_map addr=0x%08x 0x%08x\n", addr, size); + DBGOUT(MMIO, "e1000_mmio_map addr=0x%08"FMT_pcibus" 0x%08"FMT_pcibus"\n", + addr, size); cpu_register_physical_memory(addr, PNPMMIO_SIZE, d->mmio_index); qemu_register_coalesced_mmio(addr, excluded_regs[0]); diff --git a/hw/eepro100.c b/hw/eepro100.c index 1a1a0da..e54b129 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1378,7 +1378,8 @@ static void pci_map(PCIDevice * pci_dev, int region_num, { EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_pcibus", " + "size=0x%08"FMT_pcibus", type=%d\n", region_num, addr, size, type)); assert(region_num == 1); @@ -1457,7 +1458,8 @@ static void pci_mmio_map(PCIDevice * pci_dev, int region_num, { EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_pcibus", " + "size=0x%08"FMT_pcibus", type=%d\n", region_num, addr, size, type)); if (region_num == 0) { diff --git a/hw/pci.c b/hw/pci.c index 674daba..510fad2 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -408,7 +408,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, if (size & (size-1)) { fprintf(stderr, "ERROR: PCI region size must be pow2 " - "type=0x%x, size=0x%x\n", type, size); + "type=0x%x, size=0x%"FMT_pcibus"\n", type, size); exit(1); } @@ -427,7 +427,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, addr = 0x10 + region_num * 4; } pci_set_long(pci_dev->config + addr, type); - pci_set_long(pci_dev->wmask + addr, wmask); + pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); pci_set_long(pci_dev->cmask + addr, 0xffffffff); } @@ -473,7 +473,11 @@ static void pci_update_mappings(PCIDevice *d) mappings, we handle specific values as invalid mappings. */ if (last_addr <= new_addr || new_addr == 0 || - last_addr == PCI_BAR_UNMAPPED) { + last_addr == PCI_BAR_UNMAPPED || + + /* keep old behaviour + * without this, PC ide doesn't work well. */ + last_addr >= UINT32_MAX) { new_addr = PCI_BAR_UNMAPPED; } } else { @@ -729,10 +733,10 @@ static void pci_info_device(PCIDevice *d) if (r->size != 0) { monitor_printf(mon, " BAR%d: ", i); if (r->type & PCI_ADDRESS_SPACE_IO) { - monitor_printf(mon, "I/O at 0x%04x [0x%04x].\n", + monitor_printf(mon, "I/O at 0x%04"FMT_pcibus" [0x%04"FMT_pcibus"].\n", r->addr, r->addr + r->size - 1); } else { - monitor_printf(mon, "32 bit memory at 0x%08x [0x%08x].\n", + monitor_printf(mon, "32 bit memory at 0x%08"FMT_pcibus" [0x%08"FMT_pcibus"].\n", r->addr, r->addr + r->size - 1); } } @@ -1047,7 +1051,8 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) r = &d->io_regions[i]; if (!r->size) continue; - monitor_printf(mon, "%*sbar %d: %s at 0x%x [0x%x]\n", indent, "", + monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_pcibus" [0x%"FMT_pcibus"]\n", + indent, "", i, r->type & PCI_ADDRESS_SPACE_IO ? "i/o" : "mem", r->addr, r->addr + r->size - 1); } diff --git a/hw/pci.h b/hw/pci.h index 8e46aba..d75b3b3 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -72,6 +72,7 @@ extern target_phys_addr_t pci_mem_base; #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 typedef uint32_t pcibus_t; +#define FMT_pcibus PRIx32 typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, uint32_t address, uint32_t data, int len); diff --git a/hw/pcnet.c b/hw/pcnet.c index 2789574..0af9a9f 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1766,7 +1766,8 @@ static void pcnet_ioport_map(PCIDevice *pci_dev, int region_num, PCNetState *d = &DO_UPCAST(PCIPCNetState, pci_dev, pci_dev)->state; #ifdef PCNET_DEBUG_IO - printf("pcnet_ioport_map addr=0x%04x size=0x%04x\n", addr, size); + printf("pcnet_ioport_map addr=0x%04"FMT_pcibus" size=0x%04"FMT_pcibus"\n", + addr, size); #endif register_ioport_write(addr, 16, 1, pcnet_aprom_writeb, d); @@ -1994,7 +1995,7 @@ static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num, PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); #ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_map addr=0x%08x 0x%08x\n", addr, size); + printf("pcnet_mmio_map addr=0x%08"FMT_pcibus" 0x%08"FMT_pcibus"\n", addr, size); #endif cpu_register_physical_memory(addr, PCNET_PNPMMIO_SIZE, d->state.mmio_index); diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c index d3ab3c8..93e657b 100644 --- a/hw/wdt_i6300esb.c +++ b/hw/wdt_i6300esb.c @@ -362,7 +362,8 @@ static void i6300esb_map(PCIDevice *dev, int region_num, I6300State *d = DO_UPCAST(I6300State, dev, dev); int io_mem; - i6300esb_debug("addr = %x, size = %x, type = %d\n", addr, size, type); + i6300esb_debug("addr = %"FMT_pcibus", size = %"FMT_pcibus", type = %d\n", + addr, size, type); io_mem = cpu_register_io_memory(mem_read, mem_write, d); cpu_register_physical_memory (addr, 0x10, io_mem);
This patch is preliminary for 64bit BAR. Later pcibus_t will be changed from uint32_t to uint64_t. Introduce FMT_pcibus for printf format for pcibus_t. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/e1000.c | 6 ++++-- hw/eepro100.c | 6 ++++-- hw/pci.c | 17 +++++++++++------ hw/pci.h | 1 + hw/pcnet.c | 5 +++-- hw/wdt_i6300esb.c | 3 ++- 6 files changed, 25 insertions(+), 13 deletions(-)