8e9a8681dd
This further optimizes MSIX handling in virtio-pci. Also included is pci cleanup by Paolo, and pci device assignment fix by Alex. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQ7ZaiAAoJECgfDbjSjVRpFhcIAJkY4VQ3i7TLnLsnEDOR+FrP 66YLEDwCSiKZ/UW7WERGN3p3tm0hAXLhPoHFqMGRPPV9pdcXI+Eb8v+u0IHVlt+7 DsQ9TIemZkpSMuUJjQbu/RF8k9JV8+X7M6CKnWahq68p0UD/vDX+OgCiGKO/l/zY tENJhwD6M1MMzbxyzd4nCnkf3CPrHFvpPt2VAqQnkCw3wLAtR34SucBjr/dXcjuT arPiV8dNmXHTosdKvcodAWA+0YLLE7Bhz0nLK6eTt5L/UsfdbRN8q9Xdhd5nJjji DjKBJBfwdG5n3r96g7dlb/XdHuQjbFBq3uLmc8H2OdWOrk5PyqeoUA5fdBQxkb8= =vKSI -----END PGP SIGNATURE----- Merge remote-tracking branch 'mst/tags/for_anthony' into staging pci,virtio This further optimizes MSIX handling in virtio-pci. Also included is pci cleanup by Paolo, and pci device assignment fix by Alex. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> * mst/tags/for_anthony: pci-assign: Enable MSIX on device to match guest pci: use constants for devices under the 1B36 device ID, document them ivshmem: use symbolic constant for PCI ID, add to pci-ids.txt virtio-9p: use symbolic constant, add to pci-ids.txt reorganize pci-ids.txt docs: move pci-ids.txt to docs/specs/ vhost: backend masking support vhost: set started flag while start is in progress virtio-net: set/clear vhost_started in reverse order virtio: backend virtqueue notifier masking virtio-pci: cache msix messages kvm: add stub for update msi route msix: add api to access msix message virtio: don't waste irqfds on control vqs
168 lines
5.1 KiB
C
168 lines
5.1 KiB
C
/*
|
|
* Standard PCI Bridge Device
|
|
*
|
|
* Copyright (c) 2011 Red Hat Inc. Author: Michael S. Tsirkin <mst@redhat.com>
|
|
*
|
|
* http://www.pcisig.com/specifications/conventional/pci_to_pci_bridge_architecture/
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "pci/pci_bridge.h"
|
|
#include "pci/pci_ids.h"
|
|
#include "pci/msi.h"
|
|
#include "pci/shpc.h"
|
|
#include "pci/slotid_cap.h"
|
|
#include "exec/memory.h"
|
|
#include "pci/pci_bus.h"
|
|
|
|
struct PCIBridgeDev {
|
|
PCIBridge bridge;
|
|
MemoryRegion bar;
|
|
uint8_t chassis_nr;
|
|
#define PCI_BRIDGE_DEV_F_MSI_REQ 0
|
|
uint32_t flags;
|
|
};
|
|
typedef struct PCIBridgeDev PCIBridgeDev;
|
|
|
|
/* Mapping mandated by PCI-to-PCI Bridge architecture specification,
|
|
* revision 1.2 */
|
|
/* Table 9-1: Interrupt Binding for Devices Behind a Bridge */
|
|
static int pci_bridge_dev_map_irq_fn(PCIDevice *dev, int irq_num)
|
|
{
|
|
return (irq_num + PCI_SLOT(dev->devfn)) % PCI_NUM_PINS;
|
|
}
|
|
|
|
static int pci_bridge_dev_initfn(PCIDevice *dev)
|
|
{
|
|
PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
|
|
PCIBridgeDev *bridge_dev = DO_UPCAST(PCIBridgeDev, bridge, br);
|
|
int err;
|
|
|
|
pci_bridge_map_irq(br, NULL, pci_bridge_dev_map_irq_fn);
|
|
err = pci_bridge_initfn(dev);
|
|
if (err) {
|
|
goto bridge_error;
|
|
}
|
|
memory_region_init(&bridge_dev->bar, "shpc-bar", shpc_bar_size(dev));
|
|
err = shpc_init(dev, &br->sec_bus, &bridge_dev->bar, 0);
|
|
if (err) {
|
|
goto shpc_error;
|
|
}
|
|
err = slotid_cap_init(dev, 0, bridge_dev->chassis_nr, 0);
|
|
if (err) {
|
|
goto slotid_error;
|
|
}
|
|
if ((bridge_dev->flags & (1 << PCI_BRIDGE_DEV_F_MSI_REQ)) &&
|
|
msi_supported) {
|
|
err = msi_init(dev, 0, 1, true, true);
|
|
if (err < 0) {
|
|
goto msi_error;
|
|
}
|
|
}
|
|
/* TODO: spec recommends using 64 bit prefetcheable BAR.
|
|
* Check whether that works well. */
|
|
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY |
|
|
PCI_BASE_ADDRESS_MEM_TYPE_64, &bridge_dev->bar);
|
|
dev->config[PCI_INTERRUPT_PIN] = 0x1;
|
|
return 0;
|
|
msi_error:
|
|
slotid_cap_cleanup(dev);
|
|
slotid_error:
|
|
shpc_cleanup(dev, &bridge_dev->bar);
|
|
shpc_error:
|
|
memory_region_destroy(&bridge_dev->bar);
|
|
pci_bridge_exitfn(dev);
|
|
bridge_error:
|
|
return err;
|
|
}
|
|
|
|
static void pci_bridge_dev_exitfn(PCIDevice *dev)
|
|
{
|
|
PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
|
|
PCIBridgeDev *bridge_dev = DO_UPCAST(PCIBridgeDev, bridge, br);
|
|
if (msi_present(dev)) {
|
|
msi_uninit(dev);
|
|
}
|
|
slotid_cap_cleanup(dev);
|
|
shpc_cleanup(dev, &bridge_dev->bar);
|
|
memory_region_destroy(&bridge_dev->bar);
|
|
pci_bridge_exitfn(dev);
|
|
}
|
|
|
|
static void pci_bridge_dev_write_config(PCIDevice *d,
|
|
uint32_t address, uint32_t val, int len)
|
|
{
|
|
pci_bridge_write_config(d, address, val, len);
|
|
if (msi_present(d)) {
|
|
msi_write_config(d, address, val, len);
|
|
}
|
|
shpc_cap_write_config(d, address, val, len);
|
|
}
|
|
|
|
static void qdev_pci_bridge_dev_reset(DeviceState *qdev)
|
|
{
|
|
PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev);
|
|
|
|
pci_bridge_reset(qdev);
|
|
shpc_reset(dev);
|
|
}
|
|
|
|
static Property pci_bridge_dev_properties[] = {
|
|
/* Note: 0 is not a legal chassis number. */
|
|
DEFINE_PROP_UINT8("chassis_nr", PCIBridgeDev, chassis_nr, 0),
|
|
DEFINE_PROP_BIT("msi", PCIBridgeDev, flags, PCI_BRIDGE_DEV_F_MSI_REQ, true),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static const VMStateDescription pci_bridge_dev_vmstate = {
|
|
.name = "pci_bridge",
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_PCI_DEVICE(bridge.dev, PCIBridgeDev),
|
|
SHPC_VMSTATE(bridge.dev.shpc, PCIBridgeDev),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static void pci_bridge_dev_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
k->init = pci_bridge_dev_initfn;
|
|
k->exit = pci_bridge_dev_exitfn;
|
|
k->config_write = pci_bridge_dev_write_config;
|
|
k->vendor_id = PCI_VENDOR_ID_REDHAT;
|
|
k->device_id = PCI_DEVICE_ID_REDHAT_BRIDGE;
|
|
k->class_id = PCI_CLASS_BRIDGE_PCI;
|
|
k->is_bridge = 1,
|
|
dc->desc = "Standard PCI Bridge";
|
|
dc->reset = qdev_pci_bridge_dev_reset;
|
|
dc->props = pci_bridge_dev_properties;
|
|
dc->vmsd = &pci_bridge_dev_vmstate;
|
|
}
|
|
|
|
static const TypeInfo pci_bridge_dev_info = {
|
|
.name = "pci-bridge",
|
|
.parent = TYPE_PCI_DEVICE,
|
|
.instance_size = sizeof(PCIBridgeDev),
|
|
.class_init = pci_bridge_dev_class_init,
|
|
};
|
|
|
|
static void pci_bridge_dev_register(void)
|
|
{
|
|
type_register_static(&pci_bridge_dev_info);
|
|
}
|
|
|
|
type_init(pci_bridge_dev_register);
|