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: 151527 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3315674ljp; Mon, 19 Nov 2018 15:48:19 -0800 (PST) X-Google-Smtp-Source: AJdET5d/202EZ0SVZZxwtyLQDwZB6E9b9BvovBeEKtlbx9AT5i6iUqYkN/Os/j+A7LFZ2mZVC+sP X-Received: by 2002:a25:ac8e:: with SMTP id x14-v6mr23691505ybi.141.1542671299397; Mon, 19 Nov 2018 15:48:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542671299; cv=none; d=google.com; s=arc-20160816; b=LkjVRnhkUygEzKo0nDKlmXMTwWCVVKM3zSsyHsl+anCJhicgQWfZQR3Keq0IX/8Vfb ytgvGXOJogjXIE0NWr1uUMbXV+CfFoHYZDQX6FFujq4HEhhC4LEwCDqfQDr89uDzlj3X QfvF0N4NyN2hEp8FF6NDeZRiv7qesbCIUMS67TR3UH+ij/PsUYs0yJai2C/um9nQ8TAe xPSmL6OD5VS8RIzt70Lt2KGdkzZLuezC+LSy19tCTerdhy8JIL2kyy1LvE+MTffvZyFy 9OFkmMLrvQron4gA2ClwDsrCDu8fe6Towoz36UZ6sFWaWbii0pmmg2M6wL+ynQq0UQ83 rXgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:to:message-id:date:from :mime-version:dkim-signature; bh=WacBpSXTGVag3R7QfmsDHOY3Ltxakzua/Yf8xfkVs+E=; b=iJs9OlZ3EqrpR/6iTEHSsyCRZz9gu4BdmhOmoHtxB+pwGTHWyl3KyT6v3UUIMJxBn8 v41zfyPVvndqfjH3IwIGdX4imCFH7Y5vx8dk80QNrX7+KaeyAVDvW+5bt/NQD/CIQtC4 V8GRh2I2TyeOaTq5wK5XQzwKrTOBP9ksKX0UVR2JCb87FS9CXIeWzAHnrP25Jm/rwxLZ zP+n3tVylWwZy/9RjQ5jGU09+cz2KLVrAj81jqC3XqdC+r1arnb7pj3OsuPkyFzQrcVV k2mXZwVyrSyKGOCAyigXkbHwiTQSre0QLjF0RtHg6DTeHIyG6wJEoplUgl3FdgykWkIf pXpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@zx2c4.com header.s=mail header.b=ed8404z8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h206-v6si19833386ybh.198.2018.11.19.15.48.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Nov 2018 15:48:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@zx2c4.com header.s=mail header.b=ed8404z8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: from localhost ([::1]:59510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOtH8-0004vF-Sp for patch@linaro.org; Mon, 19 Nov 2018 18:48:18 -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-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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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);