From patchwork Mon Nov 19 23:46:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 10689629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5759213BB for ; Mon, 19 Nov 2018 23:47:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 463232A3F0 for ; Mon, 19 Nov 2018 23:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A6C12A569; Mon, 19 Nov 2018 23:47:37 +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.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 E5BD02A3F0 for ; Mon, 19 Nov 2018 23:47:36 +0000 (UTC) Received: from localhost ([::1]:59510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOtGR-0004vF-Rf for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Nov 2018 18:47:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOtFX-0004Xy-1D for qemu-devel@nongnu.org; Mon, 19 Nov 2018 18:46:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOtFW-0008I8-AJ for qemu-devel@nongnu.org; Mon, 19 Nov 2018 18:46:39 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:46551) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gOtFQ-0008EZ-BK; Mon, 19 Nov 2018 18:46:32 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 32c1430c; Mon, 19 Nov 2018 23:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=mime-version :from:date:message-id:subject:to:content-type; s=mail; bh=GZac3l 9h+dj0S0shsvm4g+9RmM0=; b=ed8404z8egGemhBhRXm1vTAZ2EwhXoKpaTuEE1 R/Eerqa3cqBz0ZhYwc8m3FKV63KzXcwo7cqf1pP3xx8ACyG7HaK7IlCmRz/N63aw UbGLiNjt+YnqBFhbr2CoQhoVIkYGGkaUEz+xah57N2v0lFUZy/Xw8mr+sbVFZcH2 myPnWEsiAlnCmIJlbYeRhjO/+mK0HOrNMQsNDTm3RZxuV/feIlOw++njsztqJ/r+ m/yf41b9LqGEMAJTnYuiFbNIG73CAjRTwT5D5LTK4V84hS4+E7LxuKq5W/mbJoaS 0DesOv4uN1BJXbqmHji9EFw24BCTf7thrdsT1oAjFZHCawKw== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 6b8631dd (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 19 Nov 2018 23:40:27 +0000 (UTC) Received: by mail-oi1-f174.google.com with SMTP id v6so76402oif.2; Mon, 19 Nov 2018 15:46:30 -0800 (PST) X-Gm-Message-State: AGRZ1gKmg8t5UNUQprIXhXmWFEfuxYtSpERDy4M01OA8um2BZYuKqivP rWUc0kLqGRCIIuHUwIQesydA9UTcGYmq9+6f1o0= X-Google-Smtp-Source: AJdET5c5rSmq1+fQ8JmXz+4zU8Tq0H4/6H6iafPoTR6v/crNC917lW0kDJaeqeWSYY+5zlvPaYhCTtNAkPJMzYVTBqA= X-Received: by 2002:aca:c650:: with SMTP id w77mr7660249oif.122.1542671189797; Mon, 19 Nov 2018 15:46:29 -0800 (PST) MIME-Version: 1.0 From: "Jason A. Donenfeld" Date: Tue, 20 Nov 2018 00:46:18 +0100 X-Gmail-Original-Message-ID: Message-ID: To: QEMU Developers , qemu-arm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 192.95.5.64 Subject: [Qemu-devel] more serial ports on arm? 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hey guys, I sort of lost track of the discussion, but what ever happened to adding an extra serial port to the arm virt machine? I'm still carrying around the attached patch to run build.wireguard.com and I'd of course like to see a real solution upstream. Jason diff -ru qemu-3.0.0/hw/arm/virt.c qemu-3.0.0-modified/hw/arm/virt.c --- qemu-3.0.0/hw/arm/virt.c 2018-08-14 21:10:34.000000000 +0200 +++ qemu-3.0.0-modified/hw/arm/virt.c 2018-09-14 11:48:31.914772294 +0200 @@ -672,13 +672,7 @@ qemu_fdt_setprop(vms->fdt, nodename, "clock-names", clocknames, sizeof(clocknames)); - if (uart == VIRT_UART) { - qemu_fdt_setprop_string(vms->fdt, "/chosen", "stdout-path", nodename); - } else { - /* Mark as not usable by the normal world */ - qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled"); - qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay"); - } + qemu_fdt_setprop_string(vms->fdt, "/chosen", "stdout-path", nodename); g_free(nodename); } @@ -1497,11 +1491,11 @@ fdt_add_pmu_nodes(vms); + create_uart(vms, pic, VIRT_SECURE_UART, sysmem, serial_hd(1)); create_uart(vms, pic, VIRT_UART, sysmem, serial_hd(0)); if (vms->secure) { create_secure_ram(vms, secure_sysmem); - create_uart(vms, pic, VIRT_SECURE_UART, secure_sysmem, serial_hd(1)); } vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);