From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 D24BDC433E0 for ; Tue, 29 Dec 2020 14:10:15 +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 15B59207BD for ; Tue, 29 Dec 2020 14:10:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15B59207BD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kuFhV-0007xJ-SN for qemu-devel@archiver.kernel.org; Tue, 29 Dec 2020 09:10:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuFfP-00076F-TB; Tue, 29 Dec 2020 09:08:05 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49700 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuFfN-000827-Lh; Tue, 29 Dec 2020 09:08:03 -0500 Received: from host86-148-34-1.range86-148.btcentralplus.com ([86.148.34.1] helo=[192.168.1.65]) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kuFfG-0006xU-QB; Tue, 29 Dec 2020 14:07:59 +0000 To: David Gibson References: <20201219104229.1964-1-mark.cave-ayland@ilande.co.uk> <20201219104229.1964-3-mark.cave-ayland@ilande.co.uk> <20201228070734.GD6952@yekko.fritz.box> From: Mark Cave-Ayland Message-ID: <77755607-6e1e-cb85-4201-ed042c876101@ilande.co.uk> Date: Tue, 29 Dec 2020 14:07:49 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20201228070734.GD6952@yekko.fritz.box> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 86.148.34.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH 2/7] mac_oldworld: move initialisation of grackle before heathrow X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-1.07, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 28/12/2020 07:07, David Gibson wrote: > On Sat, Dec 19, 2020 at 10:42:24AM +0000, Mark Cave-Ayland wrote: >> Signed-off-by: Mark Cave-Ayland > > Looks correct, but it could really do with a rationale in the commit message. It's just changing the order of initialisation since as the plan is to move the PIC to the macio device, the PCI bus needs to exist before the macio device is initiated and also before wiring up to the PIC. I'll come up with something along those lines for a v2. >> --- >> hw/ppc/mac_oldworld.c | 30 +++++++++++++++--------------- >> 1 file changed, 15 insertions(+), 15 deletions(-) >> >> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c >> index 2ead34bdf1..e58e0525fe 100644 >> --- a/hw/ppc/mac_oldworld.c >> +++ b/hw/ppc/mac_oldworld.c >> @@ -227,6 +227,21 @@ static void ppc_heathrow_init(MachineState *machine) >> } >> } >> >> + /* Grackle PCI host bridge */ >> + dev = qdev_new(TYPE_GRACKLE_PCI_HOST_BRIDGE); >> + qdev_prop_set_uint32(dev, "ofw-addr", 0x80000000); >> + s = SYS_BUS_DEVICE(dev); >> + sysbus_realize_and_unref(s, &error_fatal); >> + >> + sysbus_mmio_map(s, 0, GRACKLE_BASE); >> + sysbus_mmio_map(s, 1, GRACKLE_BASE + 0x200000); >> + /* PCI hole */ >> + memory_region_add_subregion(get_system_memory(), 0x80000000ULL, >> + sysbus_mmio_get_region(s, 2)); >> + /* Register 2 MB of ISA IO space */ >> + memory_region_add_subregion(get_system_memory(), 0xfe000000, >> + sysbus_mmio_get_region(s, 3)); >> + >> /* XXX: we register only 1 output pin for heathrow PIC */ >> pic_dev = qdev_new(TYPE_HEATHROW); >> sysbus_realize_and_unref(SYS_BUS_DEVICE(pic_dev), &error_fatal); >> @@ -251,21 +266,6 @@ static void ppc_heathrow_init(MachineState *machine) >> tbfreq = TBFREQ; >> } >> >> - /* Grackle PCI host bridge */ >> - dev = qdev_new(TYPE_GRACKLE_PCI_HOST_BRIDGE); >> - qdev_prop_set_uint32(dev, "ofw-addr", 0x80000000); >> - s = SYS_BUS_DEVICE(dev); >> - sysbus_realize_and_unref(s, &error_fatal); >> - >> - sysbus_mmio_map(s, 0, GRACKLE_BASE); >> - sysbus_mmio_map(s, 1, GRACKLE_BASE + 0x200000); >> - /* PCI hole */ >> - memory_region_add_subregion(get_system_memory(), 0x80000000ULL, >> - sysbus_mmio_get_region(s, 2)); >> - /* Register 2 MB of ISA IO space */ >> - memory_region_add_subregion(get_system_memory(), 0xfe000000, >> - sysbus_mmio_get_region(s, 3)); >> - >> for (i = 0; i < 4; i++) { >> qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x15 + i)); >> } ATB, Mark.