From patchwork Tue Jun 10 12:56:12 2025 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: 895187 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2247778wrb; Tue, 10 Jun 2025 05:57:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgJGMp1A3Hds9VW5A/coQepNppJ/6C5dgOdPV3gKy851DAwvXVdP8FSYQLF580xiKbSeDHJQ==@linaro.org X-Google-Smtp-Source: AGHT+IFJfEh1KMjWNzoz/nMhRMnD9usNFBDN+OEO7jqIvnHCXjVxbmxpTE08oCWwXsNywQPPbedY X-Received: by 2002:a05:6214:2623:b0:6fa:ba15:e7f with SMTP id 6a1803df08f44-6fb24c4f370mr31788756d6.9.1749560259100; Tue, 10 Jun 2025 05:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560259; cv=none; d=google.com; s=arc-20240605; b=gPEF8/lUAyTmG9BVpTTXlePjjc3waY0R3FJ7guR94SQM8ItfiU8RQG1L6Lv7T7kLs8 m09kAYLo2U4/BcbHSHGZF0PmxFJDeWBls19inAcMpxGQoGPOY8CBgH2FZ5ypU8agPW3h dc8VxHcqb1FkoObwcYcNUVO3XI6BTCFAK/WsP4l7DiK7VEbQAXUcsSHP4wC066c/hERy rmc9XtnSEC8xgNDWlKI2z4g2Feoohi4sd8yljPe/W0V8fmioNbDRrIBxavMFaXh7KCnR 6z7OFH7uH9KAKimCOzGdqraYZsz7hfcQiPa34733nlK6keJ9Apws/ZhpOVXAUGz+t9Qv 4qLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; fh=5KYNaH84KuhJkbNfHAKkJotxTHueTtQQGeWlMENxW3A=; b=FIOr8r/o+EVGM7qqpRo45YqHcM2DYMyWNiaJEg/g5BuH1nuaVzJREGpjXw/4dgWCik iT/aNNYnz35xdoIjvmjrd8msq1GBYvQ5xHSxIfZnBrVlZo0aCJrq1NGeWdkYAF3ljM0j UA2zyakLMJjbvuq5Z0+/zMCkfA9VvB1ui8fbAUpyaXzl0gHed6GXSdlDR8fKPHYZxL+5 v530OH1Etv8wLHGjzDayowVAVuxUyCzQ8+emyo+FeBCJFKdLzsNxHjGv7oPW3w39Hj/I st7NwND9HpJC6ImitEEVQGRFRskwGfuwZNbPliLkFlz5VayYjpCxPCrGD1wwGcsxauCD uBdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mGF1KB+X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09b2fc2bsi100052686d6.399.2025.06.10.05.57.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mGF1KB+X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXF-0006Zh-03; Tue, 10 Jun 2025 08:57:01 -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 1uOyX8-0006YQ-R1 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:55 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyX5-0002Z8-43 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:53 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a4ef2c2ef3so4442388f8f.2 for ; Tue, 10 Jun 2025 05:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560209; x=1750165009; 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=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; b=mGF1KB+X14vYj+bUE2xesW4InYkk1PopxIZ0aD5KJr1JIBAMaoXEwQFvK8sc+bY0CU 7kt6MqHaZ7EP26iDS1pkgq2wzR8sNwxPaDRLT27Y3P/EbdNTXIqsBALdOHOlzmvGnpro SOlBviJLvZo/dpZW78Fwzn/vuYnRJ+/1wCd33gXgU4oEjCRkYEBlJFZ3d7d8kT6oGIrW 0JjHufDaHPbqim4cNoSe8TamqmpESoBTNmnEfRSR89OeBvWcYbrmmPnCo8vD40krZpGP NjSVw29aDPhDQeRGwnneksSyKRgd6QoIKagwVt8teWUV/Qqx/0ZWtiFCAdLxoV2P7iG7 lCyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560209; x=1750165009; 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=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; b=JCxRURJ6stazjHWPIIgKl/ffhzpBgAU5p6xn46Wwb5gZ3Ed/qcssfxwuszHKiMKYkz 626cjhOYoBGdzALXaOo+wnOsWsGEijz/MznVm1XtP2yogWNZ22IHfZQDj2Dee/4DjJQn G3YEC3HOeVaT2K8J8swT/kElI25ocImYc5ySwlYv/N/cYWVU/MYvriyT/2JWhyoHAdLg kVx3pUvUDDj+MHrooOY1cugUYG8rNDcJNyTrXsINkXssByimOlH9ujAfA71Xfl2DNIut ChDPOwWbwrjL+WMflbg0TSoxQTy0Tz1zWglunRU2sQ6EKAiQu/94UA4EuDtirwaSC0Uj gdNw== X-Gm-Message-State: AOJu0YyZIfIsIMH4qsze4NO0aHnlYGkr3LVN7ntCMJQZ0UmvoJzW1NF7 58+a+CuFVD0wSlP/lK6nDCAgnnM37qM7AYTF+qlUS8pqPN9ko43vq6PLwIyL21B2puvkbkVl+nb jfGLDnT8= X-Gm-Gg: ASbGnct0ZVvBhBF2n1WBgX+zeUJYHjjyB410fyTbqXFYlywtfW4dDTLk3CSg/qsany5 QbhhEm0uMXE+DVfL9l/iHYYKZVeq+4Uv/tXt/uYDaIUCtAU2nfvm2gynTLSeTM950ZeLyllW3fy TvTx0S2NUaer03kqqcko2Yf4CJiF7Oiuaa5fYGfMnLABGpq94jYk2heIfv2CkTop1D2eJuG7zlC YI6MLTugw8/8/CLEGNu+pBViOwuIFFQXksii65L7y3+kh0UvD7tn6bF8Wns9wKKZxtJlxZkcL2C JQE2DuWrbrHpI2iLbSLFCcjOqWvTE27nKkCCog+GDBzrKH7M9t6FLMWO13yTIzBhlrXwVqhnb8t vjf4LtdMt3a1R4DIE78st1XsEsFiKSztLnzHbxpGzvA== X-Received: by 2002:a5d:564d:0:b0:3a5:39e9:7997 with SMTP id ffacd0b85a97d-3a539e979e5mr8554336f8f.34.1749560208877; Tue, 10 Jun 2025 05:56:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a532435f95sm7698854f8f.60.2025.06.10.05.56.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 03/24] hw/pci-host/raven: Remove is-legacy-prep property Date: Tue, 10 Jun 2025 14:56:12 +0200 Message-ID: <20250610125633.24411-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan This was a workaround for the prep machine that was removed 5 years ago so this is no longer needed. Fixes: b2ce76a073 (hw/ppc/prep: Remove the deprecated "prep" machine and the OpenHackware BIOS) Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-ID: <0d41c18a8831bd4c8b0948eda3ef8f60f5a311f3.1746374076.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/raven.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 21f7ca65e06..b78a8f32d32 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -75,7 +75,6 @@ struct PRePPCIState { RavenPCIState pci_dev; int contiguous_map; - bool is_legacy_prep; }; #define BIOS_SIZE (1 * MiB) @@ -243,22 +242,18 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; - if (s->is_legacy_prep) { - for (i = 0; i < PCI_NUM_PINS; i++) { - sysbus_init_irq(dev, &s->pci_irqs[i]); - } - } else { - /* According to PReP specification section 6.1.6 "System Interrupt - * Assignments", all PCI interrupts are routed via IRQ 15 */ - s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); - object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, - &error_fatal); - qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); - sysbus_init_irq(dev, &s->or_irq->out_irq); + /* + * According to PReP specification section 6.1.6 "System Interrupt + * Assignments", all PCI interrupts are routed via IRQ 15 + */ + s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); + object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, + &error_fatal); + qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); + sysbus_init_irq(dev, &s->or_irq->out_irq); - for (i = 0; i < PCI_NUM_PINS; i++) { - s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); - } + for (i = 0; i < PCI_NUM_PINS; i++) { + s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); } qdev_init_gpio_in(d, raven_change_gpio, 1); @@ -426,9 +421,6 @@ static const Property raven_pcihost_properties[] = { DEFINE_PROP_UINT32("elf-machine", PREPPCIState, pci_dev.elf_machine, EM_NONE), DEFINE_PROP_STRING("bios-name", PREPPCIState, pci_dev.bios_name), - /* Temporary workaround until legacy prep machine is removed */ - DEFINE_PROP_BOOL("is-legacy-prep", PREPPCIState, is_legacy_prep, - false), }; static void raven_pcihost_class_init(ObjectClass *klass, const void *data)