From nobody Sat Feb 7 05:56:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1616608522; cv=none; d=zohomail.com; s=zohoarc; b=aQAa3Z1605ePVhLWEPK3fgFtUhsJ9ypDpBtxKjRk+zCG/Wkede6AJ/3+6TNfkgqqcgdb1qJ4TibR6ARmEIYbHdK3xi7DeJvBhXxiIWTkKAFUsc/byxypqv/ghh1LehQumwnknTfAzzjCcd7DivTRKDrjTfhpzTRTsQaOX2a6JlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616608522; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gty45V+ZB78Dg7PlBqwanlnH2tyDO4CjBIrDbyz9+DY=; b=iZoeNNXsNklWj3Ic8z/yyxbSPmpVWft2jaLHTvB+x/uqbOGW5D6myTdzEVSp9KBM5jUZ7GH227g1Eh11xCErVfWmHNbr72Qx8ORa5p3I1XzkgaIzNmMRemC17acyXJrpaS5BUOkSdl/5tjxWm/BgEBX5/Wo69Y4JyCRYzZr4gT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1616608522615924.1481835499131; Wed, 24 Mar 2021 10:55:22 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so1696132wmi.3 for ; Wed, 24 Mar 2021 10:55:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id y1sm3177350wmq.29.2021.03.24.10.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 10:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gty45V+ZB78Dg7PlBqwanlnH2tyDO4CjBIrDbyz9+DY=; b=px/JkHcVjmfsbg6WT/MygKhtMz7lH8kDj3Ifzn15gvGFBAlRXEqPQ//ce1oHNVadQD pDFCEYZu0HFGpgaupaXv8CAJpEWx4IBz7PSgg0qepbOrw/Cx0HoWAB/ShsrCedvJP1n5 lwsISAI4REtTPOqZHIrQg73CCr7OydJq4HfrCAdlovyWzM0wK2DQ0cdWHxdmHn97wQxt 1Ew9a1BQ0cXErSSykNFnOtV3n1iVOymZYovyxAt/0i6n5ghajAMtt/bEkeL8qDa6yccw etuJAwA3Cl87W/7Zj/wIN4v/FVLbtQ0bWgC5+v6z/GWmsxjfLa6M+nKkYkdR9AVxVQke 74lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gty45V+ZB78Dg7PlBqwanlnH2tyDO4CjBIrDbyz9+DY=; b=iMQYM4XM7eKztMcI1Moyu9Cz+0Hk9ODXYStYcbjbgzdDnjEwBY2gUQUzcn9HW6y3Rl YTUQOk6Ri90qsm6lkm3ekLeUJ3DQKP71EKjg+73TgKcxm8gH3FDUD9P0vOpzu/waKSD1 L4TQQk10caIqdV0TykQQUs0R0aPo0l+FYkwG9zoMMgXkY+mBM5WjDrRFH6OutUARbn0F JE8xNkSl48jQQ0Ccz6f14Qmke/Uk36/dk/kRmvi3hZc6k6GVQnoGyJBG9h0zkp7FTiWu Fza83oRKnNmkNhd9js0VDLfB77b9AEfWyBZsSg1Uv3NNMWAzzmqM8fHEe5JMSMv6cFsn Y2cQ== X-Gm-Message-State: AOAM530YjANBnbpHZkNpF+PB2ldGWvqVQ+qa5hI0Plp1qcOOlLIKUxKK tBBHRh+u3kknkKSwQJGi1Rg= X-Google-Smtp-Source: ABdhPJw5C+kzADZkeIQF/WYqWU8Ft04/A3obfumYTD1X1vog4zYqbv/sqGUDNoItdrICrZKJKbvnEg== X-Received: by 2002:a7b:c346:: with SMTP id l6mr4142171wmj.34.1616608520822; Wed, 24 Mar 2021 10:55:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Jiaxun Yang , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Aleksandar Rikalo , Huacai Chen , Aurelien Jarno Subject: [PATCH 5/6] hw/ide/via: Connect IDE function output IRQs to the ISA function input Date: Wed, 24 Mar 2021 18:54:37 +0100 Message-Id: <20210324175438.680310-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210324175438.680310-1-f4bug@amsat.org> References: <20210324175438.680310-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To avoid abusing isa_get_irq(NULL) using a hidden ISA bridge under the hood, let the IDE function expose 2 output IRQs, and connect them to the ISA function inputs when creating the south bridge chipset model in vt82c686b_southbridge_init. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/ide/via.c | 19 +++++++++++++++++-- hw/mips/fuloong2e.c | 9 ++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 6c667a92130..7887bf181e6 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -33,6 +33,17 @@ #include "hw/ide/pci.h" #include "trace.h" =20 +#define TYPE_VIA_IDE "via-ide" +OBJECT_DECLARE_SIMPLE_TYPE(VIAIDEState, VIA_IDE) + +struct VIAIDEState { + /* */ + PCIIDEState parent_obj; + /* */ + + qemu_irq irq[2]; +}; + static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) { @@ -105,6 +116,7 @@ static void bmdma_setup_bar(PCIIDEState *d) static void via_ide_set_irq(void *opaque, int n, int level) { PCIDevice *d =3D PCI_DEVICE(opaque); + VIAIDEState *s =3D VIA_IDE(d); =20 if (level) { d->config[0x70 + n * 8] |=3D 0x80; @@ -112,7 +124,7 @@ static void via_ide_set_irq(void *opaque, int n, int le= vel) d->config[0x70 + n * 8] &=3D ~0x80; } =20 - qemu_set_irq(isa_get_irq(NULL, 14 + n), level); + qemu_set_irq(s->irq[n], level); } =20 static void via_ide_reset(DeviceState *dev) @@ -159,6 +171,7 @@ static void via_ide_reset(DeviceState *dev) =20 static void via_ide_realize(PCIDevice *dev, Error **errp) { + VIAIDEState *s =3D VIA_IDE(dev); PCIIDEState *d =3D PCI_IDE(dev); DeviceState *ds =3D DEVICE(dev); uint8_t *pci_conf =3D dev->config; @@ -188,6 +201,7 @@ static void via_ide_realize(PCIDevice *dev, Error **err= p) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 + qdev_init_gpio_out_named(ds, s->irq, "ide-irq", ARRAY_SIZE(s->irq)); qdev_init_gpio_in(ds, via_ide_set_irq, ARRAY_SIZE(d->bus)); for (i =3D 0; i < ARRAY_SIZE(d->bus); i++) { ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, MAX_IDE_DEVS); @@ -227,8 +241,9 @@ static void via_ide_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo via_ide_info =3D { - .name =3D "via-ide", + .name =3D TYPE_VIA_IDE, .parent =3D TYPE_PCI_IDE, + .instance_size =3D sizeof(VIAIDEState), .class_init =3D via_ide_class_init, }; =20 diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 931385c760f..f1c5db13b78 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -203,12 +203,19 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bu= s, int slot, qemu_irq intc, I2CBus **i2c_bus) { PCIDevice *dev; + DeviceState *isa; =20 dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), t= rue, TYPE_VT82C686B_ISA); - qdev_connect_gpio_out_named(DEVICE(dev), "intr", 0, intc); + isa =3D DEVICE(dev); + qdev_connect_gpio_out_named(isa, "intr", 0, intc); =20 dev =3D pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); + for (unsigned i =3D 0; i < 2; i++) { + qdev_connect_gpio_out_named(DEVICE(dev), "ide-irq", i, + qdev_get_gpio_in_named(isa, + "isa-irq", 14 += i)); + } pci_ide_create_devs(dev); =20 pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); --=20 2.26.2