Message ID | 1254737223-16129-24-git-send-email-yamahata@valinux.co.jp |
---|---|
State | Superseded |
Headers | show |
On Mon, Oct 05, 2009 at 07:07:03PM +0900, Isaku Yamahata wrote: > make pci_info_device() print out bridge's filtering value like > io base/limit, subbus and subordinate bus. > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > --- > hw/pci.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 files changed, 39 insertions(+), 0 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 2694e83..570531c 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -1032,7 +1032,46 @@ static void pci_info_device(PCIBus *bus, PCIDevice *d) > d->config[PCI_INTERRUPT_LINE]); > } > if (class == 0x0604) { > + uint64_t base; > + uint64_t limit; > + > monitor_printf(mon, " BUS %d.\n", d->config[0x19]); > + monitor_printf(mon, " secondary bus %d.\n", > + d->config[PCI_SECONDARY_BUS]); > + monitor_printf(mon, " subordinate bus %d.\n", > + d->config[PCI_SUBORDINATE_BUS]); > + > + base = > + ((uint32_t)d->config[PCI_IO_BASE] & ~PCI_IO_RANGE_TYPE_MASK) << 8; > + limit = > + ((uint32_t)d->config[PCI_IO_LIMIT] & ~PCI_IO_RANGE_TYPE_MASK) << 8; > + if (d->config[PCI_IO_BASE] & PCI_IO_RANGE_TYPE_32) { > + base |= pci_get_word(d->config + PCI_IO_BASE_UPPER16) << 16; pci_get_word returns a 16 bit integer. Isn't shifting it by 16 bit wrong? > + limit |= pci_get_word(d->config + PCI_IO_LIMIT_UPPER16) << 16; > + } > + limit |= 0xfff; > + monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]\n", > + base, limit); > + > + base = (pci_get_word(d->config + PCI_MEMORY_BASE) & > + PCI_MEMORY_RANGE_MASK) << 16; > + limit = (pci_get_word(d->config + PCI_MEMORY_LIMIT) & > + PCI_MEMORY_RANGE_MASK) << 16; > + limit |= 0xfffff; > + monitor_printf(mon, > + " memory range [0x%08"PRIx64", 0x%08"PRIx64"]\n", > + base, limit); > + base = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_BASE) & > + PCI_PREF_RANGE_MASK) << 16; > + limit = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_LIMIT) & > + PCI_PREF_RANGE_MASK) << 16; > + base |= > + (uint64_t)pci_get_long(d->config + PCI_PREF_BASE_UPPER32) << 32; > + limit |= > + (uint64_t)pci_get_long(d->config + PCI_PREF_LIMIT_UPPER32) << 32; > + limit |= 0xfffff; > + monitor_printf(mon, " prefetchable memory range " > + "[0x%08"PRIx64", 0x%08"PRIx64"]\n", base, limit); Here, for once, is a chance to add a helper routine to good effect :) > } > for(i = 0;i < PCI_NUM_REGIONS; i++) { > r = &d->io_regions[i]; > -- > 1.6.0.2
diff --git a/hw/pci.c b/hw/pci.c index 2694e83..570531c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1032,7 +1032,46 @@ static void pci_info_device(PCIBus *bus, PCIDevice *d) d->config[PCI_INTERRUPT_LINE]); } if (class == 0x0604) { + uint64_t base; + uint64_t limit; + monitor_printf(mon, " BUS %d.\n", d->config[0x19]); + monitor_printf(mon, " secondary bus %d.\n", + d->config[PCI_SECONDARY_BUS]); + monitor_printf(mon, " subordinate bus %d.\n", + d->config[PCI_SUBORDINATE_BUS]); + + base = + ((uint32_t)d->config[PCI_IO_BASE] & ~PCI_IO_RANGE_TYPE_MASK) << 8; + limit = + ((uint32_t)d->config[PCI_IO_LIMIT] & ~PCI_IO_RANGE_TYPE_MASK) << 8; + if (d->config[PCI_IO_BASE] & PCI_IO_RANGE_TYPE_32) { + base |= pci_get_word(d->config + PCI_IO_BASE_UPPER16) << 16; + limit |= pci_get_word(d->config + PCI_IO_LIMIT_UPPER16) << 16; + } + limit |= 0xfff; + monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]\n", + base, limit); + + base = (pci_get_word(d->config + PCI_MEMORY_BASE) & + PCI_MEMORY_RANGE_MASK) << 16; + limit = (pci_get_word(d->config + PCI_MEMORY_LIMIT) & + PCI_MEMORY_RANGE_MASK) << 16; + limit |= 0xfffff; + monitor_printf(mon, + " memory range [0x%08"PRIx64", 0x%08"PRIx64"]\n", + base, limit); + base = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_BASE) & + PCI_PREF_RANGE_MASK) << 16; + limit = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_LIMIT) & + PCI_PREF_RANGE_MASK) << 16; + base |= + (uint64_t)pci_get_long(d->config + PCI_PREF_BASE_UPPER32) << 32; + limit |= + (uint64_t)pci_get_long(d->config + PCI_PREF_LIMIT_UPPER32) << 32; + limit |= 0xfffff; + monitor_printf(mon, " prefetchable memory range " + "[0x%08"PRIx64", 0x%08"PRIx64"]\n", base, limit); } for(i = 0;i < PCI_NUM_REGIONS; i++) { r = &d->io_regions[i];
make pci_info_device() print out bridge's filtering value like io base/limit, subbus and subordinate bus. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/pci.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-)