Commit c84649ca authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

acpi: remove acpi_gpe_blk 



With gpe being switched to memory api this is no longer needed.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b65b93f2

hw/acpi.c

+0 −7
Original line number Diff line number Diff line
@@ -493,11 +493,6 @@ void acpi_gpe_init(ACPIREGS *ar, uint8_t len) 
    ar->gpe.en = g_malloc0(len / 2);

}



void acpi_gpe_blk(ACPIREGS *ar, uint32_t blk)

{

    ar->gpe.blk = blk;

}



void acpi_gpe_reset(ACPIREGS *ar)

{

    memset(ar->gpe.sts, 0, ar->gpe.len / 2);
@@ -523,7 +518,6 @@ void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val) 
{

    uint8_t *cur;



    addr -= ar->gpe.blk;

    cur = acpi_gpe_ioport_get_ptr(ar, addr);

    if (addr < ar->gpe.len / 2) {

        /* GPE_STS */
@@ -541,7 +535,6 @@ uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr) 
    uint8_t *cur;

    uint32_t val;



    addr -= ar->gpe.blk;

    cur = acpi_gpe_ioport_get_ptr(ar, addr);

    val = 0;

    if (cur != NULL) {

hw/acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ struct ACPIPM1CNT { 
};



struct ACPIGPE {

    uint32_t blk;

    uint8_t len;



    uint8_t *sts;
@@ -150,7 +149,6 @@ void acpi_pm1_cnt_reset(ACPIREGS *ar); 


/* GPE0 */

void acpi_gpe_init(ACPIREGS *ar, uint8_t len);

void acpi_gpe_blk(ACPIREGS *ar, uint32_t blk);

void acpi_gpe_reset(ACPIREGS *ar);



void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val);

hw/acpi_ich9.c

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3) 
    acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io);



    acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);

    acpi_gpe_blk(&pm->acpi_regs, 0);

    memory_region_init_io(&pm->io_gpe, &ich9_gpe_ops, pm, "apci-gpe0",

                          ICH9_PMIO_GPE0_LEN);

    memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);

hw/acpi_piix4.c

+0 −1
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) 
    memory_region_init_io(&s->io_gpe, &piix4_gpe_ops, s, "apci-gpe0",

                          GPE_LEN);

    memory_region_add_subregion(get_system_io(), GPE_BASE, &s->io_gpe);

    acpi_gpe_blk(&s->ar, 0);



    register_ioport_read(PCI_UP_BASE, 4, 4, pci_up_read, s);

    register_ioport_read(PCI_DOWN_BASE, 4, 4, pci_down_read, s);