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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 D1158C433E7 for ; Mon, 12 Oct 2020 07:29:25 +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 3D4EF20790 for ; Mon, 12 Oct 2020 07:29:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gJejyqS2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D4EF20790 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRsGq-0003RG-BJ for qemu-devel@archiver.kernel.org; Mon, 12 Oct 2020 03:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRsGC-0002tF-D7 for qemu-devel@nongnu.org; Mon, 12 Oct 2020 03:28:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRsG9-0000Rl-RB for qemu-devel@nongnu.org; Mon, 12 Oct 2020 03:28:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602487721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IG4Qe7rOOa5bjOxf+ADcqc2XZgNbgXP1LqLzHpZPwmg=; b=gJejyqS2Ieelj9Lk6f4SYh6LC+bOumPmEf0ZTul05F6VyLjyMnswgKJWvA6bv/haZHcqqb n7G0L+4gEEzPf4Wac1NcAFRsyHEYLXQK8/X56giMj8D7rOjfPpT8a5YnMN9SW3In6TCN2B jz4HRsQ476Xb5IjlYcAa+3hfrlTOOaA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-310-8NVGXCuVPNqWK5wB-RnTfg-1; Mon, 12 Oct 2020 03:28:39 -0400 X-MC-Unique: 8NVGXCuVPNqWK5wB-RnTfg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B9F218A0762; Mon, 12 Oct 2020 07:28:38 +0000 (UTC) Received: from thuth.remote.csb (ovpn-113-22.ams2.redhat.com [10.36.113.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0177C55769; Mon, 12 Oct 2020 07:28:36 +0000 (UTC) Subject: Re: [PATCH 2/4] hw/pci-host/prep: Remove legacy PReP machine temporary workaround To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20201012071906.3301481-1-f4bug@amsat.org> <20201012071906.3301481-3-f4bug@amsat.org> From: Thomas Huth Message-ID: <4822e2ff-95a1-ce6e-574d-ae980c2c8abc@redhat.com> Date: Mon, 12 Oct 2020 09:28:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20201012071906.3301481-3-f4bug@amsat.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/12 02:58:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: =?UTF-8?Q?Herv=c3=a9_Poussineau?= , qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/10/2020 09.19, Philippe Mathieu-Daudé wrote: > The legacy PReP machine has been removed in commit b2ce76a0730 > ("hw/ppc/prep: Remove the deprecated "prep" machine and the > OpenHackware BIOS"). This temporary workaround is no more > required, remove it. > > Signed-off-by: Philippe Mathieu-Daudé > --- > hw/pci-host/prep.c | 32 +++++++++++--------------------- > 1 file changed, 11 insertions(+), 21 deletions(-) > > diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c > index 80dfb67da43..064593d1e52 100644 > --- a/hw/pci-host/prep.c > +++ b/hw/pci-host/prep.c > @@ -75,7 +75,6 @@ struct PRePPCIState { > RavenPCIState pci_dev; > > int contiguous_map; > - bool is_legacy_prep; > }; > > #define BIOS_SIZE (1 * MiB) > @@ -229,24 +228,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. > + */ Since you're changing the indentation of these lines anyway, I think you could also simply squash patch 1 into this one here (just a matter of taste, though). > + 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); > @@ -403,9 +396,6 @@ static 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), > DEFINE_PROP_END_OF_LIST() > }; > > Reviewed-by: Thomas Huth