diff options
| -rw-r--r-- | hw/apb_pci.c | 2 | ||||
| -rw-r--r-- | hw/dec_pci.c | 2 | ||||
| -rw-r--r-- | hw/pci.c | 15 | ||||
| -rw-r--r-- | hw/pci.h | 8 |
4 files changed, 16 insertions, 11 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 6dd529f57f..69a774d98b 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -434,7 +434,7 @@ static PCIDeviceInfo pbm_pci_host_info = { .qdev.name = "pbm", .qdev.size = sizeof(PCIDevice), .init = pbm_pci_host_init, - .header_type = PCI_HEADER_TYPE_BRIDGE, + .is_bridge = 1, }; static SysBusDeviceInfo pbm_host_info = { diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 024c67ce70..83ce4cd44f 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -90,7 +90,7 @@ static PCIDeviceInfo dec_21154_pci_host_info = { .qdev.name = "dec-21154", .qdev.size = sizeof(PCIDevice), .init = dec_21154_pci_host_init, - .header_type = PCI_HEADER_TYPE_BRIDGE, + .is_bridge = 1, }; static void dec_register_devices(void) @@ -605,7 +605,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn, PCIConfigReadFunc *config_read, PCIConfigWriteFunc *config_write, - uint8_t header_type) + bool is_bridge) { if (devfn < 0) { for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices); @@ -627,13 +627,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, pci_dev->irq_state = 0; pci_config_alloc(pci_dev); - header_type &= ~PCI_HEADER_TYPE_MULTI_FUNCTION; - if (header_type == PCI_HEADER_TYPE_NORMAL) { + if (!is_bridge) { pci_set_default_subsystem_id(pci_dev); } pci_init_cmask(pci_dev); pci_init_wmask(pci_dev); - if (header_type == PCI_HEADER_TYPE_BRIDGE) { + if (is_bridge) { pci_init_wmask_bridge(pci_dev); } @@ -1563,7 +1562,9 @@ static int pci_bridge_initfn(PCIDevice *dev) pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK); pci_config_set_class(dev->config, PCI_CLASS_BRIDGE_PCI); - dev->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_BRIDGE; + dev->config[PCI_HEADER_TYPE] = + (dev->config[PCI_HEADER_TYPE] & PCI_HEADER_TYPE_MULTI_FUNCTION) | + PCI_HEADER_TYPE_BRIDGE; pci_set_word(dev->config + PCI_SEC_STATUS, PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK); return 0; @@ -1614,7 +1615,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) devfn = pci_dev->devfn; pci_dev = do_pci_register_device(pci_dev, bus, base->name, devfn, info->config_read, info->config_write, - info->header_type); + info->is_bridge); if (pci_dev == NULL) return -1; rc = info->init(pci_dev); @@ -1890,7 +1891,7 @@ static PCIDeviceInfo bridge_info = { .init = pci_bridge_initfn, .exit = pci_bridge_exitfn, .config_write = pci_bridge_write_config, - .header_type = PCI_HEADER_TYPE_BRIDGE, + .is_bridge = 1, .qdev.props = (Property[]) { DEFINE_PROP_HEX32("vendorid", PCIBridge, vid, 0), DEFINE_PROP_HEX32("deviceid", PCIBridge, did, 0), @@ -325,8 +325,12 @@ typedef struct { PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; - /* pci config header type */ - uint8_t header_type; + /* + * pci-to-pci bridge or normal device. + * This doesn't mean pci host switch. + * When card bus bridge is supported, this would be enhanced. + */ + int is_bridge; /* pcie stuff */ int is_express; /* is this device pci express? */ |