diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-06-23 16:15:32 +0900 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-07-11 20:01:00 +0300 |
| commit | 7c7b829e469d9ababc0a34ab2a033db965c57a50 (patch) | |
| tree | a5444032f1bccde12d4da5e486eab6a745dbefb3 | |
| parent | fecb93c45c749a4c994d8d12bdee17ce2012de9e (diff) | |
pci_bridge: make pci bridge aware of pci multi function bit.
make pci bridge aware of pci multi function property and let pci generic
code to set the bit.
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/apb_pci.c | 4 | ||||
| -rw-r--r-- | hw/dec_pci.c | 2 | ||||
| -rw-r--r-- | hw/pci.c | 5 | ||||
| -rw-r--r-- | hw/pci.h | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 69a774d98b..fd11459980 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -350,13 +350,13 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, pci_create_simple(d->bus, 0, "pbm"); /* APB secondary busses */ - *bus2 = pci_bridge_init(d->bus, PCI_DEVFN(1, 0), + *bus2 = pci_bridge_init(d->bus, PCI_DEVFN(1, 0), true, PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq, "Advanced PCI Bus secondary bridge 1"); apb_pci_bridge_init(*bus2); - *bus3 = pci_bridge_init(d->bus, PCI_DEVFN(1, 1), + *bus3 = pci_bridge_init(d->bus, PCI_DEVFN(1, 1), true, PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq, "Advanced PCI Bus secondary bridge 2"); diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 83ce4cd44f..ee49d5adf0 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -55,7 +55,7 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) dev = qdev_create(NULL, "dec-21154"); qdev_init_nofail(dev); - ret = pci_bridge_init(parent_bus, devfn, + ret = pci_bridge_init(parent_bus, devfn, false, PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21154, dec_map_irq, "DEC 21154 PCI-PCI bridge"); @@ -1580,13 +1580,14 @@ static int pci_bridge_exitfn(PCIDevice *pci_dev) return 0; } -PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, +PCIBus *pci_bridge_init(PCIBus *bus, int devfn, bool multifunction, + uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name) { PCIDevice *dev; PCIBridge *s; - dev = pci_create(bus, devfn, "pci-bridge"); + dev = pci_create_multifunction(bus, devfn, multifunction, "pci-bridge"); qdev_prop_set_uint32(&dev->qdev, "vendorid", vid); qdev_prop_set_uint32(&dev->qdev, "deviceid", did); qdev_init_nofail(&dev->qdev); @@ -233,7 +233,8 @@ int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp, void do_pci_info_print(Monitor *mon, const QObject *data); void do_pci_info(Monitor *mon, QObject **ret_data); -PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, +PCIBus *pci_bridge_init(PCIBus *bus, int devfn, bool multifunction, + uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name); PCIDevice *pci_bridge_get_device(PCIBus *bus); |