| Message ID | 1254737223-16129-12-git-send-email-yamahata@valinux.co.jp |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Oct 05, 2009 at 07:06:51PM +0900, Isaku Yamahata wrote: > This patch is preliminary for 64bit bar. > For 64bit bar support, change pcibus_t which represents > pci bus addr/size from uint32_t to uint64_t. > And also change FMT_pcibus for printf. > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > --- > hw/pci.c | 6 +++++- > hw/pci.h | 4 ++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 8d6e8ea..21565f5 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -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 { This change does not seem to be related to either pcibus_t or FMT_PCIBUS. > diff --git a/hw/pci.h b/hw/pci.h > index 359fce1..cbf80c0 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -71,8 +71,8 @@ extern target_phys_addr_t pci_mem_base; > #define PCI_DEVICE_ID_VIRTIO_BALLOON 0x1002 > #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 > > -typedef uint32_t pcibus_t; > -#define FMT_PCIBUS PRIx32 > +typedef uint64_t pcibus_t; > +#define FMT_PCIBUS PRIx64 > > typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, > uint32_t address, uint32_t data, int len); > -- > 1.6.0.2
diff --git a/hw/pci.c b/hw/pci.c index 8d6e8ea..21565f5 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -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 { diff --git a/hw/pci.h b/hw/pci.h index 359fce1..cbf80c0 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -71,8 +71,8 @@ extern target_phys_addr_t pci_mem_base; #define PCI_DEVICE_ID_VIRTIO_BALLOON 0x1002 #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 -typedef uint32_t pcibus_t; -#define FMT_PCIBUS PRIx32 +typedef uint64_t pcibus_t; +#define FMT_PCIBUS PRIx64 typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, uint32_t address, uint32_t data, int len);
This patch is preliminary for 64bit bar. For 64bit bar support, change pcibus_t which represents pci bus addr/size from uint32_t to uint64_t. And also change FMT_pcibus for printf. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/pci.c | 6 +++++- hw/pci.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-)