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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 6397EC433E0 for ; Sun, 14 Jun 2020 14:23:57 +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 2A6C020714 for ; Sun, 14 Jun 2020 14:23:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A6C020714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eik.bme.hu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkTYC-0002VD-DN for qemu-devel@archiver.kernel.org; Sun, 14 Jun 2020 10:23:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkTXS-0001jR-Rc; Sun, 14 Jun 2020 10:23:10 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:41845) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkTXR-00047e-0a; Sun, 14 Jun 2020 10:23:10 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 9857974633E; Sun, 14 Jun 2020 16:23:02 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 180D6746331; Sun, 14 Jun 2020 16:23:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 14FDA746307; Sun, 14 Jun 2020 16:23:02 +0200 (CEST) Date: Sun, 14 Jun 2020 16:23:02 +0200 (CEST) From: BALATON Zoltan To: Mark Cave-Ayland Subject: Re: [PATCH v2 5/5] mac_oldworld: Map macio to expected address at reset In-Reply-To: <470996b7-26a5-2f3b-25c1-5812a4cf4f12@ilande.co.uk> Message-ID: References: <470996b7-26a5-2f3b-25c1-5812a4cf4f12@ilande.co.uk> User-Agent: Alpine 2.22 (BSF 395 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/14 10:03:41 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Howard Spoelstra , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sun, 14 Jun 2020, Mark Cave-Ayland wrote: > On 13/06/2020 14:36, BALATON Zoltan wrote: > >> Add a reset function that maps macio to the address expected by the >> firmware of the board at startup. >> >> Signed-off-by: BALATON Zoltan >> --- >> hw/ppc/mac.h | 12 ++++++++++++ >> hw/ppc/mac_oldworld.c | 17 +++++++++++++++-- >> 2 files changed, 27 insertions(+), 2 deletions(-) >> >> diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h >> index 6af87d1fa0..35a5f21163 100644 >> --- a/hw/ppc/mac.h >> +++ b/hw/ppc/mac.h >> @@ -57,6 +57,18 @@ >> #define OLDWORLD_IDE1_IRQ 0xe >> #define OLDWORLD_IDE1_DMA_IRQ 0x3 >> >> +/* g3beige machine */ >> +#define TYPE_HEATHROW_MACHINE MACHINE_TYPE_NAME("g3beige") >> +#define HEATHROW_MACHINE(obj) OBJECT_CHECK(HeathrowMachineState, (obj), \ >> + TYPE_HEATHROW_MACHINE) >> + >> +typedef struct HeathrowMachineState { >> + /*< private >*/ >> + MachineState parent; >> + >> + PCIDevice *macio_pci; >> +} HeathrowMachineState; >> + >> /* New World IRQs */ >> #define NEWWORLD_CUDA_IRQ 0x19 >> #define NEWWORLD_PMU_IRQ 0x19 >> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c >> index 9138752ccb..fa9527410d 100644 >> --- a/hw/ppc/mac_oldworld.c >> +++ b/hw/ppc/mac_oldworld.c >> @@ -73,6 +73,15 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr) >> return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; >> } >> >> +static void ppc_heathrow_reset(MachineState *machine) >> +{ >> + HeathrowMachineState *m = HEATHROW_MACHINE(machine); >> + >> + qemu_devices_reset(); >> + pci_default_write_config(m->macio_pci, PCI_COMMAND, PCI_COMMAND_MEMORY, 2); >> + pci_default_write_config(m->macio_pci, PCI_BASE_ADDRESS_0, 0xf3000000, 4); >> +} >> + >> static void ppc_heathrow_cpu_reset(void *opaque) >> { >> PowerPCCPU *cpu = opaque; >> @@ -91,6 +100,7 @@ const MemoryRegionOps machine_id_reg_ops = { >> >> static void ppc_heathrow_init(MachineState *machine) >> { >> + HeathrowMachineState *hm = HEATHROW_MACHINE(machine); >> ram_addr_t ram_size = machine->ram_size; >> const char *kernel_filename = machine->kernel_filename; >> const char *kernel_cmdline = machine->kernel_cmdline; >> @@ -298,7 +308,8 @@ static void ppc_heathrow_init(MachineState *machine) >> ide_drive_get(hd, ARRAY_SIZE(hd)); >> >> /* MacIO */ >> - macio = OLDWORLD_MACIO(pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO)); >> + hm->macio_pci = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO); >> + macio = OLDWORLD_MACIO(hm->macio_pci); >> dev = DEVICE(macio); >> qdev_prop_set_uint64(dev, "frequency", tbfreq); >> object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic", >> @@ -450,6 +461,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data) >> >> mc->desc = "Heathrow based PowerMAC"; >> mc->init = ppc_heathrow_init; >> + mc->reset = ppc_heathrow_reset; >> mc->block_default_type = IF_IDE; >> mc->max_cpus = MAX_CPUS; >> #ifndef TARGET_PPC64 >> @@ -466,9 +478,10 @@ static void heathrow_class_init(ObjectClass *oc, void *data) >> } >> >> static const TypeInfo ppc_heathrow_machine_info = { >> - .name = MACHINE_TYPE_NAME("g3beige"), >> + .name = TYPE_HEATHROW_MACHINE, >> .parent = TYPE_MACHINE, >> .class_init = heathrow_class_init, >> + .instance_size = sizeof(HeathrowMachineState), >> .interfaces = (InterfaceInfo[]) { >> { TYPE_FW_PATH_PROVIDER }, >> { } > > This doesn't feel right to me - either the PROM should be configuring the BARs as it > requires before trying to use the macio device, or the macio device has a fixed > mapping. Possibly the latter could be true given that things are so early in the boot > process? It looks suspicious but unless there's something in the ROM before it starts accessig macio @ 0xf3000000 that I've missed I don't know how it would get there. I haven't check all the disassembly but logging PCI accesses that shows grackle config regs and unassigned mem writes did not show any signs of the ROM mapping it there so unless this should be done by a reg somewhere we implement but don't do the mapping it should be there from the beginning. > Are there any hints in the macio "reg" and "address" properties suggesting that this > might be the case? I haven't got a device tree that I know coming from a real machine, the ones I've found show macio mapped to 0xf3000000 but that's after OF started, don't know how it got there from a device tree. Regards, BALATON Zoltan