 b734ed9de1
			
		
	
	
		b734ed9de1
		
	
	
	
	
		
			
			- new stats in virtio balloon - virtio eventfd rework for boot speedup - vhost memory rework for boot speedup - fixes and cleanups all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJagxKDAAoJECgfDbjSjVRp5qAH/3gmgBaIzL3KRHd5i0RZifJv PvyAVYgZd7h0+/1r9GM7guHKyEPZ08JtbHSm/HuDV4BD/Vf3/8joy8roExIfde2A 6k8fd6ANVQmE3t5zUxNXi9qiG4pO4xDIu4cMAbixzgN9x5ttlcfTw7fTT0e0VJxJ 8SN02/uCPPR/DY4/cpjah+slSyv6rBKT1v1ONy7djyRTYHi6h3Meoh05YfEALkwA goxTKBZHi0L1IZ3HP/ZpXJDohQ5n2P09DX0fQgb8PgmW6WIWB/Qpi5pD53LZpMCV n9waTF0U0ahneFd2FHo22QMMrwWvQyrjv+w5uXVr+qmHb/OyH2tUt7PgGF9+QKA= =78s5 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio,vhost,pci,pc: features, fixes and cleanups - new stats in virtio balloon - virtio eventfd rework for boot speedup - vhost memory rework for boot speedup - fixes and cleanups all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Tue 13 Feb 2018 16:29:55 GMT # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: (22 commits) virtio-balloon: include statistics of disk/file caches acpi-test: update FADT lpc: drop pcie host dependency tests: acpi: fix FADT not being compared to reference table hw/pci-bridge: fix pcie root port's IO hints capability libvhost-user: Support across-memory-boundary access libvhost-user: Fix resource leak virtio-balloon: unref the memory region before continuing pci: removed the is_express field since a uniform interface was inserted virtio-blk: enable multiple vectors when using multiple I/O queues pci/bus: let it has higher migration priority pci-bridge/i82801b11: clear bridge registers on platform reset vhost: Move log_dirty check vhost: Merge and delete unused callbacks vhost: Clean out old vhost_set_memory and friends vhost: Regenerate region list from changed sections list vhost: Merge sections added to temporary list vhost: Simplify ring verification checks vhost: Build temporary section list and deref after commit virtio: improve virtio devices initialization time ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			129 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			129 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * ioh3420.c
 | |
|  * Intel X58 north bridge IOH
 | |
|  * PCI Express root port device id 3420
 | |
|  *
 | |
|  * Copyright (c) 2010 Isaku Yamahata <yamahata at valinux co jp>
 | |
|  *                    VA Linux Systems Japan K.K.
 | |
|  *
 | |
|  * 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 "qemu/osdep.h"
 | |
| #include "hw/pci/pci_ids.h"
 | |
| #include "hw/pci/msi.h"
 | |
| #include "hw/pci/pcie.h"
 | |
| #include "ioh3420.h"
 | |
| 
 | |
| #define PCI_DEVICE_ID_IOH_EPORT         0x3420  /* D0:F0 express mode */
 | |
| #define PCI_DEVICE_ID_IOH_REV           0x2
 | |
| #define IOH_EP_SSVID_OFFSET             0x40
 | |
| #define IOH_EP_SSVID_SVID               PCI_VENDOR_ID_INTEL
 | |
| #define IOH_EP_SSVID_SSID               0
 | |
| #define IOH_EP_MSI_OFFSET               0x60
 | |
| #define IOH_EP_MSI_SUPPORTED_FLAGS      PCI_MSI_FLAGS_MASKBIT
 | |
| #define IOH_EP_MSI_NR_VECTOR            2
 | |
| #define IOH_EP_EXP_OFFSET               0x90
 | |
| #define IOH_EP_AER_OFFSET               0x100
 | |
| 
 | |
| /*
 | |
|  * If two MSI vector are allocated, Advanced Error Interrupt Message Number
 | |
|  * is 1. otherwise 0.
 | |
|  * 17.12.5.10 RPERRSTS,  32:27 bit Advanced Error Interrupt Message Number.
 | |
|  */
 | |
| static uint8_t ioh3420_aer_vector(const PCIDevice *d)
 | |
| {
 | |
|     switch (msi_nr_vectors_allocated(d)) {
 | |
|     case 1:
 | |
|         return 0;
 | |
|     case 2:
 | |
|         return 1;
 | |
|     case 4:
 | |
|     case 8:
 | |
|     case 16:
 | |
|     case 32:
 | |
|     default:
 | |
|         break;
 | |
|     }
 | |
|     abort();
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int ioh3420_interrupts_init(PCIDevice *d, Error **errp)
 | |
| {
 | |
|     int rc;
 | |
| 
 | |
|     rc = msi_init(d, IOH_EP_MSI_OFFSET, IOH_EP_MSI_NR_VECTOR,
 | |
|                   IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_64BIT,
 | |
|                   IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_MASKBIT,
 | |
|                   errp);
 | |
|     if (rc < 0) {
 | |
|         assert(rc == -ENOTSUP);
 | |
|     }
 | |
| 
 | |
|     return rc;
 | |
| }
 | |
| 
 | |
| static void ioh3420_interrupts_uninit(PCIDevice *d)
 | |
| {
 | |
|     msi_uninit(d);
 | |
| }
 | |
| 
 | |
| static const VMStateDescription vmstate_ioh3420 = {
 | |
|     .name = "ioh-3240-express-root-port",
 | |
|     .priority = MIG_PRI_PCI_BUS,
 | |
|     .version_id = 1,
 | |
|     .minimum_version_id = 1,
 | |
|     .post_load = pcie_cap_slot_post_load,
 | |
|     .fields = (VMStateField[]) {
 | |
|         VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot),
 | |
|         VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log,
 | |
|                        PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog),
 | |
|         VMSTATE_END_OF_LIST()
 | |
|     }
 | |
| };
 | |
| 
 | |
| static void ioh3420_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
|     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 | |
|     PCIERootPortClass *rpc = PCIE_ROOT_PORT_CLASS(klass);
 | |
| 
 | |
|     k->vendor_id = PCI_VENDOR_ID_INTEL;
 | |
|     k->device_id = PCI_DEVICE_ID_IOH_EPORT;
 | |
|     k->revision = PCI_DEVICE_ID_IOH_REV;
 | |
|     dc->desc = "Intel IOH device id 3420 PCIE Root Port";
 | |
|     dc->vmsd = &vmstate_ioh3420;
 | |
|     rpc->aer_vector = ioh3420_aer_vector;
 | |
|     rpc->interrupts_init = ioh3420_interrupts_init;
 | |
|     rpc->interrupts_uninit = ioh3420_interrupts_uninit;
 | |
|     rpc->exp_offset = IOH_EP_EXP_OFFSET;
 | |
|     rpc->aer_offset = IOH_EP_AER_OFFSET;
 | |
|     rpc->ssvid_offset = IOH_EP_SSVID_OFFSET;
 | |
|     rpc->ssid = IOH_EP_SSVID_SSID;
 | |
| }
 | |
| 
 | |
| static const TypeInfo ioh3420_info = {
 | |
|     .name          = "ioh3420",
 | |
|     .parent        = TYPE_PCIE_ROOT_PORT,
 | |
|     .class_init    = ioh3420_class_init,
 | |
| };
 | |
| 
 | |
| static void ioh3420_register_types(void)
 | |
| {
 | |
|     type_register_static(&ioh3420_info);
 | |
| }
 | |
| 
 | |
| type_init(ioh3420_register_types)
 |