 b094f2e015
			
		
	
	
		b094f2e015
		
	
	
	
	
		
			
			The split IRQ chip mode via KVM_CAP_SPLIT_IRQCHIP was introduced with commit 15eafc2e60 but was broken for q35. This patch makes kernel_irqchip=split functional for q35. Signed-off-by: Rita Sinha <rita.sinha89@gmail.com> Message-Id: <1457378525-16455-1-git-send-email-rita.sinha89@gmail.com> Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
			
				
	
	
		
			318 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			318 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Q35 chipset based pc system emulator
 | |
|  *
 | |
|  * Copyright (c) 2003-2004 Fabrice Bellard
 | |
|  * Copyright (c) 2009, 2010
 | |
|  *               Isaku Yamahata <yamahata at valinux co jp>
 | |
|  *               VA Linux Systems Japan K.K.
 | |
|  * Copyright (C) 2012 Jason Baron <jbaron@redhat.com>
 | |
|  *
 | |
|  * This is based on pc.c, but heavily modified.
 | |
|  *
 | |
|  * Permission is hereby granted, free of charge, to any person obtaining a copy
 | |
|  * of this software and associated documentation files (the "Software"), to deal
 | |
|  * in the Software without restriction, including without limitation the rights
 | |
|  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | |
|  * copies of the Software, and to permit persons to whom the Software is
 | |
|  * furnished to do so, subject to the following conditions:
 | |
|  *
 | |
|  * The above copyright notice and this permission notice shall be included in
 | |
|  * all copies or substantial portions of the Software.
 | |
|  *
 | |
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | |
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | |
|  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 | |
|  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | |
|  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | |
|  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 | |
|  * THE SOFTWARE.
 | |
|  */
 | |
| #include "qemu/osdep.h"
 | |
| #include "hw/hw.h"
 | |
| #include "hw/loader.h"
 | |
| #include "sysemu/arch_init.h"
 | |
| #include "hw/i2c/smbus.h"
 | |
| #include "hw/boards.h"
 | |
| #include "hw/timer/mc146818rtc.h"
 | |
| #include "hw/xen/xen.h"
 | |
| #include "sysemu/kvm.h"
 | |
| #include "hw/kvm/clock.h"
 | |
| #include "hw/pci-host/q35.h"
 | |
| #include "exec/address-spaces.h"
 | |
| #include "hw/i386/pc.h"
 | |
| #include "hw/i386/ich9.h"
 | |
| #include "hw/smbios/smbios.h"
 | |
| #include "hw/ide/pci.h"
 | |
| #include "hw/ide/ahci.h"
 | |
| #include "hw/usb.h"
 | |
| #include "qemu/error-report.h"
 | |
| #include "migration/migration.h"
 | |
| 
 | |
| /* ICH9 AHCI has 6 ports */
 | |
| #define MAX_SATA_PORTS     6
 | |
| 
 | |
| /* PC hardware initialisation */
 | |
| static void pc_q35_init(MachineState *machine)
 | |
| {
 | |
|     PCMachineState *pcms = PC_MACHINE(machine);
 | |
|     PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
 | |
|     Q35PCIHost *q35_host;
 | |
|     PCIHostState *phb;
 | |
|     PCIBus *host_bus;
 | |
|     PCIDevice *lpc;
 | |
|     BusState *idebus[MAX_SATA_PORTS];
 | |
|     ISADevice *rtc_state;
 | |
|     MemoryRegion *system_io = get_system_io();
 | |
|     MemoryRegion *pci_memory;
 | |
|     MemoryRegion *rom_memory;
 | |
|     MemoryRegion *ram_memory;
 | |
|     GSIState *gsi_state;
 | |
|     ISABus *isa_bus;
 | |
|     qemu_irq *gsi;
 | |
|     qemu_irq *i8259;
 | |
|     int i;
 | |
|     ICH9LPCState *ich9_lpc;
 | |
|     PCIDevice *ahci;
 | |
|     ram_addr_t lowmem;
 | |
|     DriveInfo *hd[MAX_SATA_PORTS];
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(machine);
 | |
| 
 | |
|     /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory
 | |
|      * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
 | |
|      * also known as MMCFG).
 | |
|      * If it doesn't, we need to split it in chunks below and above 4G.
 | |
|      * In any case, try to make sure that guest addresses aligned at
 | |
|      * 1G boundaries get mapped to host addresses aligned at 1G boundaries.
 | |
|      */
 | |
|     if (machine->ram_size >= 0xb0000000) {
 | |
|         lowmem = 0x80000000;
 | |
|     } else {
 | |
|         lowmem = 0xb0000000;
 | |
|     }
 | |
| 
 | |
|     /* Handle the machine opt max-ram-below-4g.  It is basically doing
 | |
|      * min(qemu limit, user limit).
 | |
|      */
 | |
|     if (lowmem > pcms->max_ram_below_4g) {
 | |
|         lowmem = pcms->max_ram_below_4g;
 | |
|         if (machine->ram_size - lowmem > lowmem &&
 | |
|             lowmem & ((1ULL << 30) - 1)) {
 | |
|             error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64
 | |
|                          ") not a multiple of 1G; possible bad performance.",
 | |
|                          pcms->max_ram_below_4g);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (machine->ram_size >= lowmem) {
 | |
|         pcms->above_4g_mem_size = machine->ram_size - lowmem;
 | |
|         pcms->below_4g_mem_size = lowmem;
 | |
|     } else {
 | |
|         pcms->above_4g_mem_size = 0;
 | |
|         pcms->below_4g_mem_size = machine->ram_size;
 | |
|     }
 | |
| 
 | |
|     if (xen_enabled()) {
 | |
|         xen_hvm_init(pcms, &ram_memory);
 | |
|     }
 | |
| 
 | |
|     pc_cpus_init(pcms);
 | |
| 
 | |
|     kvmclock_create();
 | |
| 
 | |
|     /* pci enabled */
 | |
|     if (pcmc->pci_enabled) {
 | |
|         pci_memory = g_new(MemoryRegion, 1);
 | |
|         memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
 | |
|         rom_memory = pci_memory;
 | |
|     } else {
 | |
|         pci_memory = NULL;
 | |
|         rom_memory = get_system_memory();
 | |
|     }
 | |
| 
 | |
|     pc_guest_info_init(pcms);
 | |
| 
 | |
|     if (pcmc->smbios_defaults) {
 | |
|         /* These values are guest ABI, do not change */
 | |
|         smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
 | |
|                             mc->name, pcmc->smbios_legacy_mode,
 | |
|                             pcmc->smbios_uuid_encoded,
 | |
|                             SMBIOS_ENTRY_POINT_21);
 | |
|     }
 | |
| 
 | |
|     /* allocate ram and load rom/bios */
 | |
|     if (!xen_enabled()) {
 | |
|         pc_memory_init(pcms, get_system_memory(),
 | |
|                        rom_memory, &ram_memory);
 | |
|     }
 | |
| 
 | |
|     /* irq lines */
 | |
|     gsi_state = g_malloc0(sizeof(*gsi_state));
 | |
|     if (kvm_ioapic_in_kernel()) {
 | |
|         kvm_pc_setup_irq_routing(pcmc->pci_enabled);
 | |
|         gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
 | |
|                                  GSI_NUM_PINS);
 | |
|     } else {
 | |
|         gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
 | |
|     }
 | |
| 
 | |
|     /* create pci host bus */
 | |
|     q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
 | |
| 
 | |
|     object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL);
 | |
|     q35_host->mch.ram_memory = ram_memory;
 | |
|     q35_host->mch.pci_address_space = pci_memory;
 | |
|     q35_host->mch.system_memory = get_system_memory();
 | |
|     q35_host->mch.address_space_io = system_io;
 | |
|     q35_host->mch.below_4g_mem_size = pcms->below_4g_mem_size;
 | |
|     q35_host->mch.above_4g_mem_size = pcms->above_4g_mem_size;
 | |
|     /* pci */
 | |
|     qdev_init_nofail(DEVICE(q35_host));
 | |
|     phb = PCI_HOST_BRIDGE(q35_host);
 | |
|     host_bus = phb->bus;
 | |
|     pcms->bus = phb->bus;
 | |
|     /* create ISA bus */
 | |
|     lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
 | |
|                                           ICH9_LPC_FUNC), true,
 | |
|                                           TYPE_ICH9_LPC_DEVICE);
 | |
| 
 | |
|     object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
 | |
|                              TYPE_HOTPLUG_HANDLER,
 | |
|                              (Object **)&pcms->acpi_dev,
 | |
|                              object_property_allow_set_link,
 | |
|                              OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
 | |
|     object_property_set_link(OBJECT(machine), OBJECT(lpc),
 | |
|                              PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
 | |
| 
 | |
|     ich9_lpc = ICH9_LPC_DEVICE(lpc);
 | |
|     ich9_lpc->pic = gsi;
 | |
|     ich9_lpc->ioapic = gsi_state->ioapic_irq;
 | |
|     pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
 | |
|                  ICH9_LPC_NB_PIRQS);
 | |
|     pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
 | |
|     isa_bus = ich9_lpc->isa_bus;
 | |
| 
 | |
|     /*end early*/
 | |
|     isa_bus_irqs(isa_bus, gsi);
 | |
| 
 | |
|     if (kvm_pic_in_kernel()) {
 | |
|         i8259 = kvm_i8259_init(isa_bus);
 | |
|     } else if (xen_enabled()) {
 | |
|         i8259 = xen_interrupt_controller_init();
 | |
|     } else {
 | |
|         i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < ISA_NUM_IRQS; i++) {
 | |
|         gsi_state->i8259_irq[i] = i8259[i];
 | |
|     }
 | |
|     if (pcmc->pci_enabled) {
 | |
|         ioapic_init_gsi(gsi_state, "q35");
 | |
|     }
 | |
| 
 | |
|     pc_register_ferr_irq(gsi[13]);
 | |
| 
 | |
|     assert(pcms->vmport != ON_OFF_AUTO__MAX);
 | |
|     if (pcms->vmport == ON_OFF_AUTO_AUTO) {
 | |
|         pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
 | |
|     }
 | |
| 
 | |
|     /* init basic PC hardware */
 | |
|     pc_basic_device_init(isa_bus, gsi, &rtc_state, !mc->no_floppy,
 | |
|                          (pcms->vmport != ON_OFF_AUTO_ON), 0xff0104);
 | |
| 
 | |
|     /* connect pm stuff to lpc */
 | |
|     ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));
 | |
| 
 | |
|     /* ahci and SATA device, for q35 1 ahci controller is built-in */
 | |
|     ahci = pci_create_simple_multifunction(host_bus,
 | |
|                                            PCI_DEVFN(ICH9_SATA1_DEV,
 | |
|                                                      ICH9_SATA1_FUNC),
 | |
|                                            true, "ich9-ahci");
 | |
|     idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
 | |
|     idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
 | |
|     g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
 | |
|     ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
 | |
|     ahci_ide_create_devs(ahci, hd);
 | |
| 
 | |
|     if (usb_enabled()) {
 | |
|         /* Should we create 6 UHCI according to ich9 spec? */
 | |
|         ehci_create_ich9_with_companions(host_bus, 0x1d);
 | |
|     }
 | |
| 
 | |
|     /* TODO: Populate SPD eeprom data.  */
 | |
|     smbus_eeprom_init(ich9_smb_init(host_bus,
 | |
|                                     PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC),
 | |
|                                     0xb100),
 | |
|                       8, NULL, 0);
 | |
| 
 | |
|     pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
 | |
| 
 | |
|     /* the rest devices to which pci devfn is automatically assigned */
 | |
|     pc_vga_init(isa_bus, host_bus);
 | |
|     pc_nic_init(isa_bus, host_bus);
 | |
|     if (pcmc->pci_enabled) {
 | |
|         pc_pci_device_init(host_bus);
 | |
|     }
 | |
| 
 | |
|     if (pcms->acpi_nvdimm_state.is_enabled) {
 | |
|         nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
 | |
|                                pcms->fw_cfg, OBJECT(pcms));
 | |
|     }
 | |
| }
 | |
| 
 | |
| #define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
 | |
|     static void pc_init_##suffix(MachineState *machine) \
 | |
|     { \
 | |
|         void (*compat)(MachineState *m) = (compatfn); \
 | |
|         if (compat) { \
 | |
|             compat(machine); \
 | |
|         } \
 | |
|         pc_q35_init(machine); \
 | |
|     } \
 | |
|     DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
 | |
| 
 | |
| 
 | |
| static void pc_q35_machine_options(MachineClass *m)
 | |
| {
 | |
|     m->family = "pc_q35";
 | |
|     m->desc = "Standard PC (Q35 + ICH9, 2009)";
 | |
|     m->hot_add_cpu = pc_hot_add_cpu;
 | |
|     m->units_per_default_bus = 1;
 | |
|     m->default_machine_opts = "firmware=bios-256k.bin";
 | |
|     m->default_display = "std";
 | |
|     m->no_floppy = 1;
 | |
| }
 | |
| 
 | |
| static void pc_q35_2_6_machine_options(MachineClass *m)
 | |
| {
 | |
|     pc_q35_machine_options(m);
 | |
|     m->alias = "q35";
 | |
| }
 | |
| 
 | |
| DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
 | |
|                    pc_q35_2_6_machine_options);
 | |
| 
 | |
| static void pc_q35_2_5_machine_options(MachineClass *m)
 | |
| {
 | |
|     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
 | |
|     pc_q35_2_6_machine_options(m);
 | |
|     m->alias = NULL;
 | |
|     pcmc->save_tsc_khz = false;
 | |
|     SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
 | |
| }
 | |
| 
 | |
| DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
 | |
|                    pc_q35_2_5_machine_options);
 | |
| 
 | |
| static void pc_q35_2_4_machine_options(MachineClass *m)
 | |
| {
 | |
|     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
 | |
|     pc_q35_2_5_machine_options(m);
 | |
|     m->hw_version = "2.4.0";
 | |
|     pcmc->broken_reserved_end = true;
 | |
|     SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
 | |
| }
 | |
| 
 | |
| DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
 | |
|                    pc_q35_2_4_machine_options);
 |