From nobody Tue Feb 10 01:16:31 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=1696682479; cv=none; d=zohomail.com; s=zohoarc; b=MzGozcweKbeLEcSbMG6NUP/Q4mxBr7Rb0FLqWaxfHHmA6gRlo2y/aEsOx4+yYdcIpNHjMf7rdEGqSSA2wDl4aVW9bCoKMYV5eq33rffe8/p7Iy2fXFe0P+ZfYT0aLaFQFzF4QQ0jCWxFgM50zEkRcfdin8svqK66OmCSn8SeQuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696682479; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PR1OTO+HOAaZgG4LN7ff4+XgGlEjkB8EMde29NVCAx0=; b=lxnyAWR+B7mrr6fFZZOzxX3NbQzEQRnwRxANJPbCc5wCTPw+cy+e7iE/dTMaASPMR3WlfVQV5YrCa+mfkAeKwsFo7U0dWNcSABmoOHHqH5TfyNrc21S6W4Tav3uvH9SENSzT9Uar+tdcKqFxVTwEmPtfKBCltTn0W43+U0cHDRY= 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 1696682479283604.4865740393378; Sat, 7 Oct 2023 05:41:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qp6ap-0003oC-UU; Sat, 07 Oct 2023 08:39:39 -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 1qp6aX-000324-S0 for qemu-devel@nongnu.org; Sat, 07 Oct 2023 08:39:22 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qp6aU-0002nZ-7W for qemu-devel@nongnu.org; Sat, 07 Oct 2023 08:39:20 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9b98a699f45so512209966b.3 for ; Sat, 07 Oct 2023 05:39:17 -0700 (PDT) Received: from archlinux.. (pd95eda61.dip0.t-ipconnect.de. [217.94.218.97]) by smtp.gmail.com with ESMTPSA id e27-20020a170906045b00b009b655c43710sm4241401eja.24.2023.10.07.05.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 05:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696682356; x=1697287156; 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=PR1OTO+HOAaZgG4LN7ff4+XgGlEjkB8EMde29NVCAx0=; b=A6n+fjqXgGZOUylL7GHCI8a9tiAkX4suVE0q0en0SWQ+truMuRnkHzZI9J2CDzmRcs iYAmxXw0wmQUI/qhKD0dJzfx1g8D32OyMtML9Dof26YM14FWehjvP/XNhJUEz93Qf7RA L82Ue9IfQ2IbhI60Qbw1HFt0+C/Tsl0mOyFCwk6zac4o3ctFLO3asK2udmuxSmd7O3YH IP96SvT/LypJRvf8lv8xmVZxJXZfmmUsYQOnuB7S5AQ2f9qQM5G6ZdinaD8GXBJ2Topq Asiev+tzlVxisERc/zhUaWGWKBKycUX9rpqnkCKTiN33Xb+dfxlbEyQWcZur7prLE5ZM oA0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696682356; x=1697287156; 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=PR1OTO+HOAaZgG4LN7ff4+XgGlEjkB8EMde29NVCAx0=; b=fu9n6X/NarU7S+237RL5dy0DL2i9TLNiRQkSbRApHe6z0ZQ3SKXWSOWtcvADzOJnKv TF174zd9ZMuLDvMkxroV0d2qTExPFBmXcSPY+InnVmBpTP2ZBVJqvkdXahbL/vJU7il9 L+dFze6k7YqqdRCgsY0hwAVJsf6A2bBj44HaCEN2pSUUV7zWMbFlL4A1Rh/nSCylSGZe LwEpBUFdYyfHZv9zD6RSrx8Bn1ryNTfir1VfhWq5CvzdKFish/2lnNDYHROvrPsAKdbq QI5h8qyC72RODswE5J8BhaoCJH0BCpYLjUNAXuRg16NUQji+f6ysCs0rk0kcCXAaisAu iKQw== X-Gm-Message-State: AOJu0YyIv+w03BpSdX6Z1zF5BShgVCZpnsZ6l0e4qGm5IZnZVh8bedbe 6fmlDfTictOxoNc6GMZ0fXEZFdEQ2eM= X-Google-Smtp-Source: AGHT+IEWf3l2e4dbBSlFNmenm3auRQ675su4bstlvF4wUgIosxlTEgkhkAuucYukiLZf3q8H0QAgyw== X-Received: by 2002:a17:906:220f:b0:9ba:fb9:d334 with SMTP id s15-20020a170906220f00b009ba0fb9d334mr869675ejs.13.1696682355859; Sat, 07 Oct 2023 05:39:15 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Chuck Zmudzinski , Marcel Apfelbaum , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eduardo Habkost , Aurelien Jarno , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Richard Henderson , Bernhard Beschow Subject: [PATCH v8 20/29] hw/isa/piix: Allow for optional PIC creation in PIIX3 Date: Sat, 7 Oct 2023 14:38:28 +0200 Message-ID: <20231007123843.127151-21-shentey@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231007123843.127151-1-shentey@gmail.com> References: <20231007123843.127151-1-shentey@gmail.com> MIME-Version: 1.0 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=2a00:1450:4864:20::636; envelope-from=shentey@gmail.com; helo=mail-ej1-x636.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1696682481224100001 Content-Type: text/plain; charset="utf-8" In the PC machine, the PIC is created in board code to allow it to be virtualized with various virtualization techniques. So explicitly disable i= ts creation in the PC machine via a property which defaults to enabled. Once t= he PIIX implementations are consolidated this default will keep Malta working without further ado. Signed-off-by: Bernhard Beschow --- include/hw/southbridge/piix.h | 1 + hw/i386/pc_piix.c | 2 ++ hw/isa/piix.c | 21 +++++++++++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index dd5f7b31c0..08491693b4 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -69,6 +69,7 @@ struct PIIXState { MemoryRegion rcr_mem; =20 bool has_acpi; + bool has_pic; bool has_usb; bool smm_enabled; }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 70cffcfe4f..fa39afd891 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -268,6 +268,8 @@ static void pc_init1(MachineState *machine, object_property_set_bool(OBJECT(pci_dev), "has-acpi", x86_machine_is_acpi_enabled(x86ms), &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-pic", false, + &error_abort); qdev_prop_set_uint32(DEVICE(pci_dev), "smb_io_base", 0xb100); object_property_set_bool(OBJECT(pci_dev), "smm-enabled", x86_machine_is_smm_enabled(x86ms), diff --git a/hw/isa/piix.c b/hw/isa/piix.c index f6da334c6f..d6d9ac6473 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -106,7 +106,7 @@ static void piix4_set_irq(void *opaque, int irq_num, in= t level) } } =20 -static void piix4_request_i8259_irq(void *opaque, int irq, int level) +static void piix_request_i8259_irq(void *opaque, int irq, int level) { PIIX4State *s =3D opaque; qemu_set_irq(s->cpu_intr, level); @@ -343,6 +343,22 @@ static void pci_piix3_realize(PCIDevice *dev, Error **= errp) memory_region_add_subregion_overlap(pci_address_space_io(dev), PIIX_RCR_IOPORT, &d->rcr_mem, 1); =20 + /* PIC */ + if (d->has_pic) { + qemu_irq *i8259_out_irq =3D qemu_allocate_irqs(piix_request_i8259_= irq, d, + 1); + qemu_irq *i8259 =3D i8259_init(isa_bus, *i8259_out_irq); + size_t i; + + for (i =3D 0; i < ISA_NUM_IRQS; i++) { + d->isa_irqs_in[i] =3D i8259[i]; + } + + 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); =20 i8257_dma_init(isa_bus, 0); @@ -419,6 +435,7 @@ static void pci_piix3_init(Object *obj) static Property pci_piix3_props[] =3D { DEFINE_PROP_UINT32("smb_io_base", PIIXState, smb_io_base, 0), DEFINE_PROP_BOOL("has-acpi", PIIXState, has_acpi, true), + DEFINE_PROP_BOOL("has-pic", PIIXState, has_pic, true), DEFINE_PROP_BOOL("has-usb", PIIXState, has_usb, true), DEFINE_PROP_BOOL("smm-enabled", PIIXState, smm_enabled, false), DEFINE_PROP_END_OF_LIST(), @@ -514,7 +531,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) PIIX_RCR_IOPORT, &s->rcr_mem, 1); =20 /* initialize i8259 pic */ - i8259_out_irq =3D qemu_allocate_irqs(piix4_request_i8259_irq, s, 1); + i8259_out_irq =3D qemu_allocate_irqs(piix_request_i8259_irq, s, 1); i8259 =3D i8259_init(isa_bus, *i8259_out_irq); =20 for (i =3D 0; i < ISA_NUM_IRQS; i++) { --=20 2.42.0