From patchwork Thu Jul 4 20:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13724260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3DCA9C30653 for ; Thu, 4 Jul 2024 21:00:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPTY3-0003AU-PW; Thu, 04 Jul 2024 16:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPTXy-00036A-Gs; Thu, 04 Jul 2024 16:59:18 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPTXw-0000nT-Vy; Thu, 04 Jul 2024 16:59:18 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-58c947a6692so1347909a12.0; Thu, 04 Jul 2024 13:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720126754; x=1720731554; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ljcer9zvdVKMvDgAjw0WDcSBwhOat54Z1xUNuYnsdSE=; b=E3Q9a20KHi4xECeEcBX/wKoT6nrsH/bQg3ZUAl7Vy5mqsYeN6DO7H9fKWKrKYHvcVT U7RMdfQfGrWO46fIFFhBwtNbZVMggfOs4TAN4dOJGl3aXW3FLybrKzUK4E30xx9zD4CZ xuWsgaJXWxZDUC3E0g5KbzJurvPiUud1unRP4v5ad2g63UIEh0LxnGVnDswMP4VYZY6n W57GL1NkXx/5rtjvxHwPEFQcjH9uYTJcg3/UsnsYt/br34poRjMQSFAaGu0zH57zGz79 q/tLGVygWekTFjUPjkWio5jhBgSIK3AAm6yq4qu4P2OdEe99+6mgzJSee4On58DGeQvO pXPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720126754; x=1720731554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ljcer9zvdVKMvDgAjw0WDcSBwhOat54Z1xUNuYnsdSE=; b=tzq43aSQgYwMBaVUmGQoh7cLDx9ksTtWxRsZ5C1brY/LU9NNOS9e14zYCk0sKC03RW 3Iy9f59YX9BfMjqXuEXyUljq4J/yFpTv2QnyNN0iyCM0WDEHL47n8MDalhTCs2YMH+ZQ 2GGiMbYm0SXOUiB1QKCXn6W/E0lAw16gto6tb/gW9opRt9x0VnhS/dHGdDDXvzMDTFEd 91o8H/OEqXKCxNgF97Yy1tlXBWXLKK1yZ+z4p3gkQRI6ynTqZ8MydiT95GijC7JmUpaS LIPynF6NBnH0sZjzmRR3qacQTF/1CKqe8TVj3pCT7pvdLOCW6ndb9M4XtifUHQJINGWN kBtA== X-Forwarded-Encrypted: i=1; AJvYcCUDl4Dp4ZXQ4lQ9b53wA69y/wx80277P+nQKPBT+JAM4rfkxghOh9nfsVMmZfyqvoSqqGgjRGbsjFcb5BXs5C41ZBF3 X-Gm-Message-State: AOJu0Yww79drjc5/mLXoorqaoxHOURxuSRY/DXkzYHoP1RzbOETXm4I+ OCSRzk/BL7KnLPpKjFipg0qMMDJgBGTz+PQBOxhAIISRg0ucBMJQxHolPQ== X-Google-Smtp-Source: AGHT+IH4owux7zm2dmqCwga00syW870P08hZPTPVzBpBzcJIFyh643XzCTtN+VYQITtjxYCq3C8z2Q== X-Received: by 2002:a17:906:31c1:b0:a75:115a:25d0 with SMTP id a640c23a62f3a-a77ba70a896mr155201966b.50.1720126754445; Thu, 04 Jul 2024 13:59:14 -0700 (PDT) Received: from archlinux.. (dynamic-077-188-087-180.77.188.pool.telefonica.de. [77.188.87.180]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7400456582sm526153866b.153.2024.07.04.13.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 13:59:13 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Herv=C3=A9_Poussineau?= , Marcel Apfelbaum , Peter Maydell , Aurelien Jarno , Jiaxun Yang , qemu-ppc@nongnu.org, Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , BALATON Zoltan , Huacai Chen , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH 1/3] hw/isa/vt82c686: Turn "intr" irq into a named gpio Date: Thu, 4 Jul 2024 22:58:52 +0200 Message-ID: <20240704205854.18537-2-shentey@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240704205854.18537-1-shentey@gmail.com> References: <20240704205854.18537-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=shentey@gmail.com; helo=mail-ed1-x532.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Makes the code more comprehensible, matches the datasheet and the piix4 device model. Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé --- hw/isa/vt82c686.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/ppc/amigaone.c | 4 ++-- hw/ppc/pegasos2.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 8582ac0322..505b44c4e6 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -719,7 +719,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp) ISABus *isa_bus; int i; - qdev_init_gpio_out(dev, &s->cpu_intr, 1); + qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1); qdev_init_gpio_in_named(dev, via_isa_pirq, "pirq", PCI_NUM_PINS); isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d), diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index a45aac368c..6e4303ba47 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -299,7 +299,7 @@ static void mips_fuloong2e_init(MachineState *machine) object_resolve_path_component(OBJECT(pci_dev), "rtc"), "date"); - qdev_connect_gpio_out(DEVICE(pci_dev), 0, env->irq[5]); + qdev_connect_gpio_out_named(DEVICE(pci_dev), "intr", 0, env->irq[5]); dev = DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide")); pci_ide_create_devs(PCI_DEVICE(dev)); diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index ddfa09457a..9dcc486c1a 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -153,8 +153,8 @@ static void amigaone_init(MachineState *machine) object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(via, "rtc"), "date"); - qdev_connect_gpio_out(DEVICE(via), 0, - qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT)); + qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, + qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT)); for (i = 0; i < PCI_NUM_PINS; i++) { qdev_connect_gpio_out(dev, i, qdev_get_gpio_in_named(DEVICE(via), "pirq", i)); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index c1bd8dfa21..9b0a6b70ab 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -195,8 +195,8 @@ static void pegasos2_init(MachineState *machine) object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(via, "rtc"), "date"); - qdev_connect_gpio_out(DEVICE(via), 0, - qdev_get_gpio_in_named(pm->mv, "gpp", 31)); + qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, + qdev_get_gpio_in_named(pm->mv, "gpp", 31)); dev = PCI_DEVICE(object_resolve_path_component(via, "ide")); pci_ide_create_devs(dev); From patchwork Thu Jul 4 20:58:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13724261 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3FBD8C3814E for ; Thu, 4 Jul 2024 21:00:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPTY5-0003BI-BC; Thu, 04 Jul 2024 16:59:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPTY0-00038a-MQ; Thu, 04 Jul 2024 16:59:21 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPTXy-0000nk-Uc; Thu, 04 Jul 2024 16:59:20 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a77b4387302so127184566b.1; Thu, 04 Jul 2024 13:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720126756; x=1720731556; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oWtJCgARShGh4Hv3ul6ITFwgpH0VxBhfZ7ANN/LEg44=; b=iqhnb+fiDPLkBBrxz2hK4frUoR684LcWHUrioIqDR6Z+UCeppTEyVewj8WEVIwqLee rFjL42hHJJa1HVUsXlhErCpSftsIgmT1feeUYHFoH7TcL6F7tVwOGEBDp4Xd86WCLV4o lwXj272kyjqbq74S5AhXoIpDKI048fEOpbHs0wAHdyqJFV67dJhq/kBCEvvEOLACujho kVP6sdgIgNweoj/Rg3Atgu3FQn4mERIYWHl5hISl7UblZQB7hWypXk3IDyMU0Vdhgte3 Kl1NbmiOIsmYE99EPiiTpvER3D6mN+EV4tjl7EyctFsD4v5a08MqZaYvy/f8DIPAa/WW YZ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720126756; x=1720731556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oWtJCgARShGh4Hv3ul6ITFwgpH0VxBhfZ7ANN/LEg44=; b=ZtSN4KsCAJNgqSyWhiiAzIBr8h4gidOipBC60t1UvJ1rIekz2WIa0MYfF3/3FobvuG fh/5dN2DWT36eougSVw9NhU2+JuDLZwXS+C1Kh/wYgshIDzbcvT6M8uRie+G/hEPKu9/ uGI9H0oz7rkQdB7My4WA6bKi45ESZj8YhWCftv8GlKM4CtuXifOVyusFcNohi2/An5ak dGfamOpvFgMcgrT5gw4zdrzKcAV0B33YuhGsWbj9tOHykb8M91U1IkXzvDO7zefblum+ 6+MO/397B4qr6NtbUvXJPuPzQcgk4VHU+TKvlgCUexoroTdPmz/f/Na+AEcG5ChTE8rM 2mKQ== X-Forwarded-Encrypted: i=1; AJvYcCWFASauvKmafwHDW809WmO00G/KhIXcmRYUdUQwhIAf6Sfb+74inadMuNyugIrjL1wLEorbE8gl4TuVh5jRy8MohNo9 X-Gm-Message-State: AOJu0YyETQ+Ae8VgeskGg7HFE3fGjXqHWW1ZH2B/tnNq5HAxIZEzE8SI ntq02+QJwQGC9SN1UXliZtEazbcr+SMBoOd3OTSVCob4Qen0ARgcKnigbA== X-Google-Smtp-Source: AGHT+IEe+em4smMM6Uqg6zq6iNFvUwHYfqckmsWbkAP/ZX2TFe1Nc8PHNMVA6jnLSEumIr0GAmsK+A== X-Received: by 2002:a17:906:f0d1:b0:a72:8296:ca40 with SMTP id a640c23a62f3a-a77ba46f820mr184343566b.18.1720126755653; Thu, 04 Jul 2024 13:59:15 -0700 (PDT) Received: from archlinux.. (dynamic-077-188-087-180.77.188.pool.telefonica.de. [77.188.87.180]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7400456582sm526153866b.153.2024.07.04.13.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 13:59:15 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Herv=C3=A9_Poussineau?= , Marcel Apfelbaum , Peter Maydell , Aurelien Jarno , Jiaxun Yang , qemu-ppc@nongnu.org, Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , BALATON Zoltan , Huacai Chen , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH 2/3] hw/isa/vt82c686: Resolve intermediate IRQ forwarder Date: Thu, 4 Jul 2024 22:58:53 +0200 Message-ID: <20240704205854.18537-3-shentey@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240704205854.18537-1-shentey@gmail.com> References: <20240704205854.18537-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-x62c.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When @cpu_intr is populated before vt82xx's realize(), it can be directly passed to i8259_init(), avoiding the need for the intermediate via_isa_request_i8259_irq() handler. The result is less code and runtime overhead, and a fixed memory leak caused by qemu_allocate_irqs(). Inspired-by: Philippe Mathieu-Daudé Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 12 ++---------- hw/mips/fuloong2e.c | 2 +- hw/ppc/amigaone.c | 8 ++++---- hw/ppc/pegasos2.c | 4 ++-- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 505b44c4e6..ca02ad4c20 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -624,6 +624,7 @@ static void via_isa_init(Object *obj) object_initialize_child(obj, "uhci2", &s->uhci[1], TYPE_VT82C686B_USB_UHCI); object_initialize_child(obj, "ac97", &s->ac97, TYPE_VIA_AC97); object_initialize_child(obj, "mc97", &s->mc97, TYPE_VIA_MC97); + qdev_init_gpio_out_named(DEVICE(obj), &s->cpu_intr, "intr", 1); } static const TypeInfo via_isa_info = { @@ -704,24 +705,15 @@ static void via_isa_pirq(void *opaque, int pin, int level) via_isa_set_irq(opaque, pin, level); } -static void via_isa_request_i8259_irq(void *opaque, int irq, int level) -{ - ViaISAState *s = opaque; - qemu_set_irq(s->cpu_intr, level); -} - static void via_isa_realize(PCIDevice *d, Error **errp) { ViaISAState *s = VIA_ISA(d); DeviceState *dev = DEVICE(d); PCIBus *pci_bus = pci_get_bus(d); - qemu_irq *isa_irq; ISABus *isa_bus; int i; - qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1); qdev_init_gpio_in_named(dev, via_isa_pirq, "pirq", PCI_NUM_PINS); - isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d), errp); @@ -729,7 +721,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp) return; } - s->isa_irqs_in = i8259_init(isa_bus, *isa_irq); + s->isa_irqs_in = i8259_init(isa_bus, s->cpu_intr); isa_bus_register_input_irqs(isa_bus, s->isa_irqs_in); i8254_pit_init(isa_bus, 0x40, 0, NULL); i8257_dma_init(OBJECT(d), isa_bus, 0); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 6e4303ba47..e6487c34d8 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -286,6 +286,7 @@ static void mips_fuloong2e_init(MachineState *machine) /* South bridge -> IP5 */ pci_dev = pci_new_multifunction(PCI_DEVFN(FULOONG2E_VIA_SLOT, 0), TYPE_VT82C686B_ISA); + qdev_connect_gpio_out_named(DEVICE(pci_dev), "intr", 0, env->irq[5]); /* Set properties on individual devices before realizing the south bridge */ if (machine->audiodev) { @@ -299,7 +300,6 @@ static void mips_fuloong2e_init(MachineState *machine) object_resolve_path_component(OBJECT(pci_dev), "rtc"), "date"); - qdev_connect_gpio_out_named(DEVICE(pci_dev), "intr", 0, env->irq[5]); dev = DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide")); pci_ide_create_devs(PCI_DEVICE(dev)); diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 9dcc486c1a..2110875f56 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -148,13 +148,13 @@ static void amigaone_init(MachineState *machine) pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci.0")); /* VIA VT82c686B South Bridge (multifunction PCI device) */ - via = OBJECT(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(7, 0), - TYPE_VT82C686B_ISA)); + via = OBJECT(pci_new_multifunction(PCI_DEVFN(7, 0), TYPE_VT82C686B_ISA)); + qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, + qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT)); + pci_realize_and_unref(PCI_DEVICE(via), pci_bus, &error_abort); object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(via, "rtc"), "date"); - qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, - qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT)); for (i = 0; i < PCI_NUM_PINS; i++) { qdev_connect_gpio_out(dev, i, qdev_get_gpio_in_named(DEVICE(via), "pirq", i)); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 9b0a6b70ab..54e60082ce 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -181,6 +181,8 @@ static void pegasos2_init(MachineState *machine) /* VIA VT8231 South Bridge (multifunction PCI device) */ via = OBJECT(pci_new_multifunction(PCI_DEVFN(12, 0), TYPE_VT8231_ISA)); + qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, + qdev_get_gpio_in_named(pm->mv, "gpp", 31)); /* Set properties on individual devices before realizing the south bridge */ if (machine->audiodev) { @@ -195,8 +197,6 @@ static void pegasos2_init(MachineState *machine) object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(via, "rtc"), "date"); - qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, - qdev_get_gpio_in_named(pm->mv, "gpp", 31)); dev = PCI_DEVICE(object_resolve_path_component(via, "ide")); pci_ide_create_devs(dev); From patchwork Thu Jul 4 20:58:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13724263 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3473FC30653 for ; Thu, 4 Jul 2024 21:00:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPTY5-0003BJ-BV; Thu, 04 Jul 2024 16:59:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPTY1-00039Z-PS; Thu, 04 Jul 2024 16:59:21 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPTY0-0000o4-58; Thu, 04 Jul 2024 16:59:21 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a77b51631adso111483066b.3; Thu, 04 Jul 2024 13:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720126758; x=1720731558; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1w/eX2oNbEsnlwhGjCo1wYurYBqtnWpvreS8acswyfA=; b=KuysVReyHLL3zEUeueXUQ+GD9VQu7qYqOEJvkCmnYej39Sx1E05OgEHNK0Kl71I3qD 0VNgI4JF/RH75zHvy42osT94S6nAgbDCo4tLopszFXC23tuJwKXqUopoHoMzRLlzwRtt G7j61dL8aRNZFes57wmCAmcG4SFjQUb5hnIYMkgb2rVNshxow9q62JAccNpQHk7a3fvw IHKz69QOnr4jmqmeWHxmjFDNUsN+NSnheM7HezfboOwCjy9nBlULQWvsEo8AnVpNXocv lLRrpeiZjE4bD/yBMeV+1uPQtw5a+zjXBAEaZJOPtJGQ/JYrBhkFOvYZgZ01io/W5nLH gHzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720126758; x=1720731558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1w/eX2oNbEsnlwhGjCo1wYurYBqtnWpvreS8acswyfA=; b=iYUEwWRsG9kELxamI8W9Q3lFstEnpL2E7RCHbrGQWmU/2kzacBNRUHJKKRMjqVGaVW g4zsg0lvCJIPfJVLlgR26Kgj7s9VObVyEl8MyWb00AQ4355HyNlVC6xcZoyFLrLWZiWH B+ywxeK5HTTNr21NGz1Q83k+bng1Mpjqq6rUERf94UqOwqvYYAo73fHg4UTrRysJxBM4 +JlKgn1t6K41Zb2kebfY/FYzrSWyD06tenbjeJX/nEcvoSVYwxu5vLYVCxId60OAljNb OF0z7N1eeKHhvL6dgSncA04oagwAOmTeYrnuElz1GFKu+jxTmmokAPnHH78FDyzQzxnE 1OaA== X-Forwarded-Encrypted: i=1; AJvYcCXNTnK2tJfObhhd9nBPK6uiKNLMJgu+nHIUNcD4mdVf1D4X8Q1WWy8H3I6jFBP0+iT5dkkJFsEjYVVtMkLYJpX7EVrp X-Gm-Message-State: AOJu0Yz5u/ddCV9+1woOWNQMcREA/llGQ4GGE2G82poUW8xGI45msgMI QzZcN/U+tlCjn6CpM8r48zZWJRxcQuU/lNNCWsgTWdZ+El/ybi9WM+oc7Q== X-Google-Smtp-Source: AGHT+IEIA/cUvUMeS9h1q277YSoEDw1tbuUH2VwVfw/0l7um7wk/ZvhqX9m1JZafxhCRhqE3hRw1iQ== X-Received: by 2002:a17:907:3342:b0:a72:840d:9ef3 with SMTP id a640c23a62f3a-a77ba711881mr171572166b.48.1720126757653; Thu, 04 Jul 2024 13:59:17 -0700 (PDT) Received: from archlinux.. (dynamic-077-188-087-180.77.188.pool.telefonica.de. [77.188.87.180]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7400456582sm526153866b.153.2024.07.04.13.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 13:59:16 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Herv=C3=A9_Poussineau?= , Marcel Apfelbaum , Peter Maydell , Aurelien Jarno , Jiaxun Yang , qemu-ppc@nongnu.org, Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , BALATON Zoltan , Huacai Chen , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH 3/3] hw/isa/piix: Resolve intermediate IRQ forwarder Date: Thu, 4 Jul 2024 22:58:54 +0200 Message-ID: <20240704205854.18537-4-shentey@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240704205854.18537-1-shentey@gmail.com> References: <20240704205854.18537-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When @cpu_intr is populated before pixx4's realize(), it can be directly passed to i8259_init(), avoiding the need for the intermediate piix_request_i8259_irq() handler. The result is less code and runtime overhead, and a fixed memory leak caused by qemu_allocate_irqs(). Inspired-by: Philippe Mathieu-Daudé Signed-off-by: Bernhard Beschow --- hw/isa/piix.c | 13 ++----------- hw/mips/malta.c | 4 +--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 2d30711b17..e070628f25 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -81,12 +81,6 @@ static void piix_set_pci_irq(void *opaque, int pirq, int level) piix_set_pci_irq_level(s, pirq, level); } -static void piix_request_i8259_irq(void *opaque, int irq, int level) -{ - PIIXState *s = opaque; - qemu_set_irq(s->cpu_intr, level); -} - static PCIINTxRoute piix_route_intx_pin_to_irq(void *opaque, int pin) { PCIDevice *pci_dev = opaque; @@ -315,9 +309,7 @@ static void pci_piix_realize(PCIDevice *dev, const char *uhci_type, /* PIC */ if (d->has_pic) { - qemu_irq *i8259_out_irq = qemu_allocate_irqs(piix_request_i8259_irq, d, - 1); - qemu_irq *i8259 = i8259_init(isa_bus, *i8259_out_irq); + qemu_irq *i8259 = i8259_init(isa_bus, d->cpu_intr); size_t i; for (i = 0; i < ISA_NUM_IRQS; i++) { @@ -325,8 +317,6 @@ static void pci_piix_realize(PCIDevice *dev, const char *uhci_type, } g_free(i8259); - - qdev_init_gpio_out_named(DEVICE(dev), &d->cpu_intr, "intr", 1); } isa_bus_register_input_irqs(isa_bus, d->isa_irqs_in); @@ -402,6 +392,7 @@ static void pci_piix_init(Object *obj) { PIIXState *d = PIIX_PCI_DEVICE(obj); + qdev_init_gpio_out_named(DEVICE(obj), &d->cpu_intr, "intr", 1); qdev_init_gpio_out_named(DEVICE(obj), d->isa_irqs_in, "isa-irqs", ISA_NUM_IRQS); diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 664a2ae0a9..50823bd5fb 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1238,15 +1238,13 @@ void mips_malta_init(MachineState *machine) /* Southbridge */ piix4 = pci_new_multifunction(PIIX4_PCI_DEVFN, TYPE_PIIX4_PCI_DEVICE); qdev_prop_set_uint32(DEVICE(piix4), "smb_io_base", 0x1100); + qdev_connect_gpio_out_named(DEVICE(piix4), "intr", 0, i8259_irq); pci_realize_and_unref(piix4, pci_bus, &error_fatal); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0")); dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "ide")); pci_ide_create_devs(PCI_DEVICE(dev)); - /* Interrupt controller */ - qdev_connect_gpio_out_named(DEVICE(piix4), "intr", 0, i8259_irq); - /* generate SPD EEPROM data */ dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "pm")); smbus = I2C_BUS(qdev_get_child_bus(dev, "i2c"));