From nobody Tue Oct 28 12:16:30 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515380996996171.27704736688588; Sun, 7 Jan 2018 19:09:56 -0800 (PST) Received: from localhost ([::1]:60293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNoy-0001uY-3l for importer@patchew.org; Sun, 07 Jan 2018 22:09:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNSn-00078c-K8 for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNSm-0002gh-Jq for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:01 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:35537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNSm-0002gT-Dd for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:00 -0500 Received: by mail-qk0-x243.google.com with SMTP id w184so4359121qka.2 for ; Sun, 07 Jan 2018 18:47:00 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.46.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:46:59 -0800 (PST) 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=R9hCFeNlG3nHUXwQYsh5pac9rVBEjIdVIAPvmOJC+lU=; b=vQuPvif9Dj1TllKprfbleZLeBssTw7/0qaa2OMMKBMhv68DGZHuKNR3CaImZL3wjiC WQ29/ySnIrkyeVB/C3HkadnRJnV/p7wdCj6sF2DnCsCE29WB8lEbJNkW+exKOx5qoN9t mT2ks3o16mLsyECUSHSlP1NyCWkLOuk0OpgeefvaVTPXf/xlpvtl6GvJw9pcG/53iVRz tItKT+D7tGXFFVmh8tOatjKx62z2ov3+X2OLxP+Cb65rzv8T0YGvE11UU//zAlw4wBPj b2pSDxWPKPrxz0GjmWMkAU5KVmombura6OhQW8sr46wiroWt7y3H6kfKjQFJBFqJpshh m5yQ== 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=R9hCFeNlG3nHUXwQYsh5pac9rVBEjIdVIAPvmOJC+lU=; b=TwmYshZUzYGAIr6LDjDrMWkiAGz5B2Q9hsaie39KeSiqWE+amjbcTZwG5z0VTSRBl1 7i1Otmn68F2MzzNP3D4eB3TDU7DrAdup6pdcpv1n6/bzPCN3ze+KUvWNaoqILdkUy0/8 GrCm9vxwzTAOHMCfwU/p0agMun4Jd8yrdj5B1R4o2hFiwhYr59/bBH5YXbSM0GTmfIaE qmMu6huOAta6+t2OcnjHQSXdoNOq3baPRWa+iL10cVgK+rg+VRX2DmccvW4N1CC9R3cN Lhbcxvyo3sMxprKbuAMe5TyRFadX2MBkNja8ZywHkO/2wL47Gak8FzcSwOhBxX9mDXcN d1DA== X-Gm-Message-State: AKwxytf5dej6b6L0jKn/SLQSt26m1R5crVurHSZ1tE4fQ08llX7Fv5QN +P+f5IsmsOkUsfYALnUXtbw= X-Google-Smtp-Source: ACJfBos29puPJiG3MDp7Y11ekue1IF6e4z3ChmL4Dqyuz//mDrrWNG4tWLTVcYG593ZDYJ/MTQdqAg== X-Received: by 10.55.204.18 with SMTP id r18mr14082153qki.212.1515379619853; Sun, 07 Jan 2018 18:46:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum Date: Sun, 7 Jan 2018 23:45:44 -0300 Message-Id: <20180108024558.17983-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org> References: <20180108024558.17983-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 15/29] piix4: add a i8259 interrupt controller as specified in datasheet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Yongbok Kim , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 From: Herv=C3=A9 Poussineau Add ISA irqs as piix4 gpio in, and CPU interrupt request as piix4 gpio out. Remove i8259 instanciated in malta board, to not have it twice. We can also remove the now unused piix4_init() function. Signed-off-by: Herv=C3=A9 Poussineau [PMD: rebased] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/pc.h | 1 - hw/isa/piix4.c | 38 ++++++++++++++++++++++++++++---------- hw/mips/mips_malta.c | 28 ++++++++++++---------------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 103c7a9916..d2b67e44a7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -274,7 +274,6 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, PCIBus *find_i440fx(void); /* piix4.c */ extern PCIDevice *piix4_dev; -int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); =20 /* pc_sysfw.c */ void pc_system_firmware_init(MemoryRegion *rom_memory, diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 13f4eaa2dd..c19aa5a74f 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -34,6 +34,8 @@ PCIDevice *piix4_dev; =20 typedef struct PIIX4State { PCIDevice dev; + qemu_irq cpu_intr; + qemu_irq *isa; =20 /* Reset Control Register */ MemoryRegion rcr_mem; @@ -92,6 +94,18 @@ static const VMStateDescription vmstate_piix4 =3D { } }; =20 +static void piix4_request_i8259_irq(void *opaque, int irq, int level) +{ + PIIX4State *s =3D opaque; + qemu_set_irq(s->cpu_intr, level); +} + +static void piix4_set_i8259_irq(void *opaque, int irq, int level) +{ + PIIX4State *s =3D opaque; + qemu_set_irq(s->isa[irq], level); +} + static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned int len) { @@ -124,27 +138,31 @@ static void piix4_realize(PCIDevice *pci_dev, Error *= *errp) { DeviceState *dev =3D DEVICE(pci_dev); PIIX4State *s =3D DO_UPCAST(PIIX4State, dev, pci_dev); + ISABus *isa_bus; + qemu_irq *i8259_out_irq; =20 - if (!isa_bus_new(dev, pci_address_space(pci_dev), - pci_address_space_io(pci_dev), errp)) { + isa_bus =3D isa_bus_new(dev, pci_address_space(pci_dev), + pci_address_space_io(pci_dev), errp); + if (!isa_bus) { return; } =20 + qdev_init_gpio_in_named(dev, piix4_set_i8259_irq, "isa", ISA_NUM_IRQS); + qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1); + memory_region_init_io(&s->rcr_mem, OBJECT(dev), &piix4_rcr_ops, s, "reset-control", 1); memory_region_add_subregion_overlap(pci_address_space_io(pci_dev), 0xc= f9, &s->rcr_mem, 1); =20 - piix4_dev =3D pci_dev; -} + /* initialize i8259 pic */ + i8259_out_irq =3D qemu_allocate_irqs(piix4_request_i8259_irq, s, 1); + s->isa =3D i8259_init(isa_bus, *i8259_out_irq); =20 -int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn) -{ - PCIDevice *d; + /* initialize ISA irqs */ + isa_bus_irqs(isa_bus, s->isa); =20 - d =3D pci_create_simple_multifunction(bus, devfn, true, "PIIX4"); - *isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); - return d->devfn; + piix4_dev =3D pci_dev; } =20 static void piix4_class_init(ObjectClass *klass, void *data) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index bfa79c374d..d31e144b70 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -96,7 +96,7 @@ typedef struct { SysBusDevice parent_obj; =20 MIPSCPSState *cps; - qemu_irq *i8259; + qemu_irq i8259[16]; } MaltaState; =20 static ISADevice *pit; @@ -1008,8 +1008,8 @@ void mips_malta_init(MachineState *machine) int64_t kernel_entry, bootloader_run_addr; PCIBus *pci_bus; ISABus *isa_bus; - qemu_irq *isa_irq; qemu_irq cbus_irq, i8259_irq; + PCIDevice *pci; int piix4_devfn; I2CBus *smbus; int i; @@ -1185,28 +1185,24 @@ void mips_malta_init(MachineState *machine) /* Board ID =3D 0x420 (Malta Board with CoreLV) */ stl_p(memory_region_get_ram_ptr(bios_copy) + 0x10, 0x00000420); =20 - /* - * We have a circular dependency problem: pci_bus depends on isa_irq, - * isa_irq is provided by i8259, i8259 depends on ISA, ISA depends - * on piix4, and piix4 depends on pci_bus. To stop the cycle we have - * qemu_irq_proxy() adds an extra bit of indirection, allowing us - * to resolve the isa_irq -> i8259 dependency after i8259 is initializ= ed. - */ - isa_irq =3D qemu_irq_proxy(&s->i8259, 16); - /* Northbridge */ - pci_bus =3D gt64120_register(isa_irq); + pci_bus =3D gt64120_register(s->i8259); =20 /* Southbridge */ ide_drive_get(hd, ARRAY_SIZE(hd)); =20 - piix4_devfn =3D piix4_init(pci_bus, &isa_bus, 80); + pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, "PIIX4"); + dev =3D DEVICE(pci); + isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + piix4_devfn =3D pci->devfn; =20 /* Interrupt controller */ - /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ - s->i8259 =3D i8259_init(isa_bus, i8259_irq); + qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq); + for (i =3D 0; i < 16; i++) { + s->i8259[i] =3D qdev_get_gpio_in_named(dev, "isa", i); + } =20 - isa_bus_irqs(isa_bus, s->i8259); pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus =3D piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, --=20 2.15.1