Commit fba72476 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

ich9: add smm_enabled field and arguments 



Q35's ACPI device is hard-coding SMM availability to KVM.  Place the
logic where the board is created instead, so that it will be possible
to override it.

Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 61e66c62

hw/acpi/ich9.c

+3 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void pm_reset(void *opaque) 
    acpi_pm_tmr_reset(&pm->acpi_regs);

    acpi_gpe_reset(&pm->acpi_regs);



    if (kvm_enabled()) {

    if (!pm->smm_enabled) {

        /* Mark SMM as already inited to prevent SMM from running. KVM does not

         * support SMM mode. */

        pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN;
@@ -209,7 +209,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque) 
    acpi_pm1_evt_power_down(&pm->acpi_regs);

}



void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,

void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, bool smm_enabled,

                  qemu_irq sci_irq)

{

    memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
@@ -231,6 +231,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, 
                          "acpi-smi", 8);

    memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);



    pm->smm_enabled = smm_enabled;

    pm->irq = sci_irq;

    qemu_register_reset(pm_reset, pm);

    pm->powerdown_notifier.notify = pm_powerdown_req;

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static void pc_q35_init(MachineState *machine) 
                         (pc_machine->vmport != ON_OFF_AUTO_ON), 0xff0104);



    /* connect pm stuff to lpc */

    ich9_lpc_pm_init(lpc);

    ich9_lpc_pm_init(lpc, !kvm_enabled());



    /* ahci and SATA device, for q35 1 ahci controller is built-in */

    ahci = pci_create_simple_multifunction(host_bus,

hw/isa/lpc_ich9.c

+4 −2
Original line number Diff line number Diff line
@@ -357,11 +357,13 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) 
    }

}



void ich9_lpc_pm_init(PCIDevice *lpc_pci)

void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled)

{

    ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci);

    qemu_irq sci_irq;



    ich9_pm_init(lpc_pci, &lpc->pm, qemu_allocate_irq(ich9_set_sci, lpc, 0));

    sci_irq = qemu_allocate_irq(ich9_set_sci, lpc, 0);

    ich9_pm_init(lpc_pci, &lpc->pm, smm_enabled, sci_irq);

    ich9_lpc_reset(&lpc->d.qdev);

}

include/hw/acpi/ich9.h

+2 −1
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ typedef struct ICH9LPCPMRegs { 
    uint8_t disable_s3;

    uint8_t disable_s4;

    uint8_t s4_val;

    uint8_t smm_enabled;

} ICH9LPCPMRegs;



void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,

                  qemu_irq sci_irq);

                  bool smm_enabled, qemu_irq sci_irq);

void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);

extern const VMStateDescription vmstate_ich9_pm;

include/hw/i386/ich9.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
void ich9_lpc_set_irq(void *opaque, int irq_num, int level);

int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);

PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);

void ich9_lpc_pm_init(PCIDevice *pci_lpc);

void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled);

I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);



#define ICH9_CC_SIZE                            (16 * 1024)     /* 16KB */