From nobody Sun Feb 8 19:37:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1653912166; cv=none; d=zohomail.com; s=zohoarc; b=kX4uKpGeSgx14E2uSRzOJwbLuQviIYx6d/Zt7LxDsQkdmmzrs44daHPuuq2s7y/u6aPKoNtyyRM+y+lOYG9wCH7C55/esfqwXKGwXZHMppPXVJgdYMwFpKbC8hmj7ZsTHXZ174YvmKAXJr/JcX56C1KeaucxB8j8jLTMcjR81DY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653912166; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JHw0uvDnn6jauPFRpGFE232XofQUpO0l/XT6x5dmgwI=; b=h06ViPyac0+ZPGetNSS6DN5Wv98cCYmkCwlybvWS5lIeCMTo3A1JeKKlQ33G8S+oxeQy9Hv2K0trAsOv849TjTMXObhki1ROIOkr5crTxFePpxKpMzkpUXSBRUv1CndULyPy0Dx8HgfeODE20QHFr6sAS+rDfttofCSgrdVQUE8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653912166437275.59256744977597; Mon, 30 May 2022 05:02:46 -0700 (PDT) Received: from localhost ([::1]:53200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nve6f-0003Pl-97 for importer@patchew.org; Mon, 30 May 2022 08:02:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvdZs-0001G7-5C for qemu-devel@nongnu.org; Mon, 30 May 2022 07:28:59 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:34450) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvdZm-0001Rm-Cl for qemu-devel@nongnu.org; Mon, 30 May 2022 07:28:49 -0400 Received: by mail-pg1-x52c.google.com with SMTP id g184so9932342pgc.1 for ; Mon, 30 May 2022 04:28:46 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id b16-20020a17090aa59000b001e28e80a8d6sm5381484pjq.38.2022.05.30.04.28.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 May 2022 04:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JHw0uvDnn6jauPFRpGFE232XofQUpO0l/XT6x5dmgwI=; b=kuTJ6SF3l/EznSJEMwuzTQz6XUA8zGeVKLsba1a+yzaXm7XFi/iTvfwhOa9WTSTy/m fEFemxufu7WDCfO/nYMuyqDAaEfW1AI0iTVybM0laLZnc/81r2+zmzpm1kwbncgwcRg/ 8FWSonVkZDv4M9icqzxOzSD+GTxvwMyQ8nQ+1pz9tNPvC0NBpBsAI+ND5B2s974h8Z+O p7uvUj9ssuxmEu/xGKT0lNaWfkzb0/kUtpOBhLE3FtydzFd2J9UMT981CwxFOBnKpYMD Un6m2SL9HRBmfWt9i5A8WVkYXPFW8cNRLk/Jl5L5r05Git/vWidQlePHNE31Z8r3n4kQ DGEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JHw0uvDnn6jauPFRpGFE232XofQUpO0l/XT6x5dmgwI=; b=vmbvvkrEnOMxLwb+jeZTkAdcyXEMOwF90YQ9cHtdTeVmd34LjsOqcyh8Nm2D49qzHN T0WB5OsZos9WYfVcrjl9L7R2WtIgx3S8KsHBnBU/eg/JK0b5QQo1fwggxDkTA3SMSfsJ E8lzFeLUf2okkMJr67W/eBHjFuhhExthk8mDMiXsqj4uGA0Y3+Mo5c10hkmhUINmxEBU g+bSf01sZ7WyzNZ3B75eS8EXOk+NQr2aN2LSb3YGVjBweLRxVmfP29IErm/tE3FrFs3U IBj3Bis/+GxV0JEs3KozEc0WiPqY08yb5CT8019tMkexEhntynlla8NwSeYAul/VLevz 1Ftw== X-Gm-Message-State: AOAM532MAG7jzOaD90zJm+oLZrIG1NYDmbXLOZ8vOXfOMmolvk+vvmCh kXbWXy2yfbqCv4GMiNyAi1U= X-Google-Smtp-Source: ABdhPJxpaTy89KCRurLU8GpwXGQZj8/6GVVKAYtsMtJxn5V7FCVcJ8E48B7GilxfLw1vwIT9c33zCA== X-Received: by 2002:a05:6a00:1897:b0:518:8bc7:9a82 with SMTP id x23-20020a056a00189700b005188bc79a82mr42914339pfh.26.1653910125157; Mon, 30 May 2022 04:28:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Mark Cave-Ayland , qemu-devel@nongnu.org Cc: Richard Henderson , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Igor Mammedov , Ani Sinha , Bernhard Beschow , Eduardo Habkost , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini Subject: [PATCH v2 08/11] hw/acpi/piix4: use qdev gpio to wire up smi_irq Date: Mon, 30 May 2022 13:27:15 +0200 Message-Id: <20220530112718.26582-9-philippe.mathieu.daude@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530112718.26582-1-philippe.mathieu.daude@gmail.com> References: <20220530112718.26582-1-philippe.mathieu.daude@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pg1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1653912168259100001 From: Mark Cave-Ayland Initialize the SMI IRQ in piix4_pm_init(). The smi_irq can now be wired up directly using a qdev gpio instead of having to set the IRQ externally in piix4_pm_initfn(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220528091934.15520-10-mark.cave-ayland@ilande.co.uk> [PMD: Partially squash 20220528091934.15520-8-mark.cave-ayland@ilande.co.uk] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/piix4.c | 4 ++-- hw/i386/pc_piix.c | 3 ++- hw/isa/piix4.c | 2 +- include/hw/southbridge/piix.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index fe5ec0a723..32033bc9d7 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -502,10 +502,11 @@ static void piix4_pm_init(Object *obj) PIIX4PMState *s =3D PIIX4_PM(obj); =20 qdev_init_gpio_out(DEVICE(obj), &s->irq, 1); + qdev_init_gpio_out_named(DEVICE(obj), &s->smi_irq, "smi-irq", 1); } =20 PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq smi_irq, bool smm_enabled) + bool smm_enabled) { PCIDevice *pci_dev; DeviceState *dev; @@ -517,7 +518,6 @@ PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, u= int32_t smb_io_base, qdev_prop_set_bit(dev, "smm-enabled", smm_enabled); =20 s =3D PIIX4_PM(dev); - s->smi_irq =3D smi_irq; =20 pci_realize_and_unref(pci_dev, bus, &error_fatal); =20 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0662bf44a9..683ec39b80 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -284,9 +284,10 @@ static void pc_init1(MachineState *machine, PIIX4PMState *piix4_pm; =20 smi_irq =3D qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); - piix4_pm =3D piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100, smi= _irq, + piix4_pm =3D piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100, x86_machine_is_smm_enabled(x86ms)); qdev_connect_gpio_out(DEVICE(piix4_pm), 0, x86ms->gsi[9]); + qdev_connect_gpio_out_named(DEVICE(piix4_pm), "smi-irq", 0, smi_ir= q); pcms->smbus =3D I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"= )); /* TODO: Populate SPD eeprom data. */ smbus_eeprom_init(pcms->smbus, 8, NULL, 0); diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 0b6ea22143..775e15eb20 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -311,7 +311,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa= _bus, I2CBus **smbus) =20 pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci"); if (smbus) { - pms =3D piix4_pm_initfn(pci_bus, devfn + 3, 0x1100, NULL, 0); + pms =3D piix4_pm_initfn(pci_bus, devfn + 3, 0x1100, 0); qdev_connect_gpio_out(DEVICE(pms), 0, qdev_get_gpio_in_named(dev, "isa", 9)); *smbus =3D I2C_BUS(qdev_get_child_bus(DEVICE(pms), "i2c")); diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 105d158f78..b69e0dfb04 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -17,7 +17,7 @@ #include "hw/acpi/piix4.h" =20 PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq smi_irq, bool smm_enabled); + bool smm_enabled); =20 /* PIRQRC[A:D]: PIRQx Route Control Registers */ #define PIIX_PIRQCA 0x60 --=20 2.36.1