From patchwork Wed Mar 24 17:54:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12161953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ED72C433DB for ; Wed, 24 Mar 2021 18:00:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F06C761A1A for ; Wed, 24 Mar 2021 18:00:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F06C761A1A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lP7o3-0007kl-TL for qemu-devel@archiver.kernel.org; Wed, 24 Mar 2021 14:00:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lP7j3-0004ZT-Cz; Wed, 24 Mar 2021 13:55:25 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lP7j1-0000Dy-Bw; Wed, 24 Mar 2021 13:55:24 -0400 Received: by mail-wm1-x32f.google.com with SMTP id w203-20020a1c49d40000b029010c706d0642so3142450wma.0; Wed, 24 Mar 2021 10:55:21 -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=Rj3JuWNOPuMUz0sG663dfaf+KEZY753LjOQ1z7hAdY97b3zrfwamLxlodbfQ6Jgg+D 8dWmjYzyVYMOK/blV9JmKsowj9nG6FrrD+4DY1Rp4AX7UtwnhlpEDgntDO8enkxHZ7/S hgdreYGNyO+hJQd+pZtiqhukHXo8arDmaejYzVqmS3Xo+IKF90pElx75XtMGl8EYeORO wWCh6HxCZkGBR2Gzk98z2wlVtqnCN3KOSsRi50Kj5boHQZt3kg0iBvDxgFkRnwWAPz7z gLPDMAjsQixdMMnX9NVULtkhyHnipUqLWCkkAG7QbV9ht2KIiMEeyIPVchMbYi3rrdwM mY1g== X-Gm-Message-State: AOAM530U5v3xw8ZuXKs2xTSknYBLxrZD1uyRrfFjhR3C0n/q78COfyQE +F673nWbxREWtbTTUzSuHpieW8de+DOtrg== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , qemu-block@nongnu.org, Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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" +#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 = PCI_DEVICE(opaque); + VIAIDEState *s = VIA_IDE(d); if (level) { d->config[0x70 + n * 8] |= 0x80; @@ -112,7 +124,7 @@ static void via_ide_set_irq(void *opaque, int n, int level) d->config[0x70 + n * 8] &= ~0x80; } - qemu_set_irq(isa_get_irq(NULL, 14 + n), level); + qemu_set_irq(s->irq[n], level); } static void via_ide_reset(DeviceState *dev) @@ -159,6 +171,7 @@ static void via_ide_reset(DeviceState *dev) static void via_ide_realize(PCIDevice *dev, Error **errp) { + VIAIDEState *s = VIA_IDE(dev); PCIIDEState *d = PCI_IDE(dev); DeviceState *ds = DEVICE(dev); uint8_t *pci_conf = dev->config; @@ -188,6 +201,7 @@ static void via_ide_realize(PCIDevice *dev, Error **errp) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + 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 = 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) } static const TypeInfo via_ide_info = { - .name = "via-ide", + .name = TYPE_VIA_IDE, .parent = TYPE_PCI_IDE, + .instance_size = sizeof(VIAIDEState), .class_init = via_ide_class_init, }; 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_bus, int slot, qemu_irq intc, I2CBus **i2c_bus) { PCIDevice *dev; + DeviceState *isa; dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true, TYPE_VT82C686B_ISA); - qdev_connect_gpio_out_named(DEVICE(dev), "intr", 0, intc); + isa = DEVICE(dev); + qdev_connect_gpio_out_named(isa, "intr", 0, intc); dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); + for (unsigned i = 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); pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");