From patchwork Fri Jun 22 04:47:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10481271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 176C160230 for ; Fri, 22 Jun 2018 04:50:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 069DF2899C for ; Fri, 22 Jun 2018 04:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED3A128E0D; Fri, 22 Jun 2018 04:50:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 654522899C for ; Fri, 22 Jun 2018 04:50:31 +0000 (UTC) Received: from localhost ([::1]:59281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWE1m-0000PK-LJ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Jun 2018 00:50:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWDzY-0007Mj-Tp for qemu-devel@nongnu.org; Fri, 22 Jun 2018 00:48:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWDzX-0004rB-Ts for qemu-devel@nongnu.org; Fri, 22 Jun 2018 00:48:12 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:43345) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fWDzS-0004ZJ-OL; Fri, 22 Jun 2018 00:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YrBNYi/895vP3watcFQSY/JqKrRDe0fU405OXLCoTOA=; b=eSwS8JgKZITwtBNWmmH+X0762C uVKkRFqrsjFq1YUVU4J6Kg2IZ/LiM2t0a4PvR9L3AD7wtep1T42OQkbU4sE9BPDye+lpTh9WYv4ph lt/Q/e6jjHseyBdf/sf4XQFaac1meEBBPKL00WbaC9bP+WOw9rZilaJ1Q20bJ3DfCgFINACCZk2m3 BykBN93L5nKFXA2uFuSEbU9gCNklO0LchABOrV8r3kTEzvYtN1P6nKMU+6nijuIiGuHw1t/5GCz3a Ll3VOM1xaCB3xcIDMyrvGoxTzeSnD2UcVKAkwIH/uCfQDOMuoqnIhtKU/lY7DTwe1x0KMhtLC96A5 +0bdmaxQ==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:39450 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.89) (envelope-from ) id 1fWDzF-006AOf-1v; Fri, 22 Jun 2018 04:47:55 +0000 From: Guenter Roeck To: David Gibson , Alexander Graf Date: Thu, 21 Jun 2018 21:47:51 -0700 Message-Id: <1529642871-14214-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - nongnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 208.91.199.152 Subject: [Qemu-devel] [PATCH] ppc: Fix sam460ex devicetree when booting the Linux kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Guenter Roeck Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP sam4660ex (or at least this emulation) does not support the "ibm,cpm" power management. As a result, Linux crashes when trying to access it. Remove its devicetree node. Also, if/when we boot the Linux kernel directly, u-boot will not fix up serial frequencies in the devicetree file, and serial port initialization will fail. Add plausible frequency values to the first serial port to be able to use it. Disable the second serial port since it is not available on the board. Also set valid values for the other clock nodes otherwise set by u-boot. Signed-off-by: Guenter Roeck --- hw/ppc/sam460ex.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index bdc53d2..045a255 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -308,6 +308,24 @@ static int sam460ex_load_device_tree(hwaddr addr, qemu_fdt_setprop_cell(fdt, "/cpus/cpu@0", "timebase-frequency", tb_freq); + /* Remove cpm node (not emulated) */ + qemu_fdt_nop_node(fdt, "/cpm"); + /* set serial port clock and speed */ + qemu_fdt_setprop_cell(fdt, "/plb/opb/serial@ef600300", "clock-frequency", + 50000000); + qemu_fdt_setprop_cell(fdt, "/plb/opb/serial@ef600300", "current-speed", + 38400); + /* disable second serial port */ + qemu_fdt_setprop_string(fdt, "/plb/opb/serial@ef600400", "status", + "disabled"); + /* some more clocks */ + qemu_fdt_setprop_cell(fdt, "/plb", "clock-frequency", + 50000000); + qemu_fdt_setprop_cell(fdt, "/plb/opb", "clock-frequency", + 50000000); + qemu_fdt_setprop_cell(fdt, "/plb/opb/ebc", "clock-frequency", + 50000000); + rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); g_free(fdt); ret = fdt_size;