From patchwork Wed Nov 19 11:08:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 41172 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F32EF20CBB for ; Wed, 19 Nov 2014 14:31:47 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf487812lbi.6 for ; Wed, 19 Nov 2014 06:31:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id :mime-version:user-agent:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-disposition; bh=/vB979wpadpAv+aeHU3V0C4Q4crOMykZOMWP57Dp+Xo=; b=CIsx0GHELkch/dR/s55mZMS1glgfAaHMavq9TSQRTDYwjrEe7/LLa1TYXDtxwNx0MJ 2JOvapsbiez1vv5VFycoe7B49qX9T9sQgdwKgQiMrHxKjyXZW7+/REfgLww2nV8ka2ry Tu62BCZHh+uy4r8qPnd2Zjxx85XcYwBeFqyDg4az90XzfrGmukIFDA2MKsDl94bBPJbU b/C20l55T9LG/9zHsD2zWGqUJy+D1TmlULGPEyviK3aSyFms/y6lxwsxoVpxyr9FO8yR uqV2qXihkPrBIoPb5NvTULmWd4nDv/E0qHh8HWT+B2BQt9fh+K2wpRiJf5NGh1zD9b6s nV1A== X-Gm-Message-State: ALoCoQmc/Pz69dzEYZk7Tn+KBzWBQtnvCuDGe7QWP9xhchpcCDkmg8NLxwsPp9nNt8WXQv+ONf8p X-Received: by 10.112.146.104 with SMTP id tb8mr62560lbb.22.1416407506877; Wed, 19 Nov 2014 06:31:46 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.232 with SMTP id m8ls688545laa.45.gmail; Wed, 19 Nov 2014 06:31:46 -0800 (PST) X-Received: by 10.112.135.229 with SMTP id pv5mr5671560lbb.52.1416407506444; Wed, 19 Nov 2014 06:31:46 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id ke10si1991993lbc.41.2014.11.19.06.31.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 06:31:46 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so648196lbj.9 for ; Wed, 19 Nov 2014 06:31:46 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr5617106laa.56.1416407506307; Wed, 19 Nov 2014 06:31:46 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp91505lbc; Wed, 19 Nov 2014 06:31:45 -0800 (PST) X-Received: by 10.170.207.141 with SMTP id y135mr41650073yke.28.1416407504860; Wed, 19 Nov 2014 06:31:44 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l7si2075656qae.24.2014.11.19.06.31.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 06:31:44 -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; Received: from localhost ([::1]:58744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr6IK-0005Jx-46 for patch@linaro.org; Wed, 19 Nov 2014 09:31:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr382-0002Tg-Cq for qemu-devel@nongnu.org; Wed, 19 Nov 2014 06:08:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr37x-000691-Fd for qemu-devel@nongnu.org; Wed, 19 Nov 2014 06:08:54 -0500 Received: from mail-wg0-f48.google.com ([74.125.82.48]:47761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr37x-00068X-9P for qemu-devel@nongnu.org; Wed, 19 Nov 2014 06:08:49 -0500 Received: by mail-wg0-f48.google.com with SMTP id y19so505570wgg.21 for ; Wed, 19 Nov 2014 03:08:48 -0800 (PST) X-Received: by 10.180.102.100 with SMTP id fn4mr4548146wib.36.1416395328412; Wed, 19 Nov 2014 03:08:48 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by mx.google.com with ESMTPSA id bf6sm1826554wjb.13.2014.11.19.03.08.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 03:08:47 -0800 (PST) Date: Wed, 19 Nov 2014 11:08:45 +0000 From: Leif Lindholm To: qemu-devel@nongnu.org Message-ID: <20141119110845.GG22224@bivouac.eciton.net> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.48 X-Mailman-Approved-At: Wed, 19 Nov 2014 09:29:34 -0500 Cc: peter.maydell@linaro.org, ard.biesheuvel@linaro.org Subject: [Qemu-devel] hw/arm/virt: linux,stdout-path -> stdout-path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline As of Linux 3.15, the generic "stdout-path" property described by ePAPR 1.1 is supported by the upstream kernel: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/of/base.c?id=676e1b2fcd9dbb47a59baac13d089621d22c68b8 ARM virt still sets the legacy linux,stdout-path. Given that this step was added to ARM virt ~ 3 months after 3.15 was released, could we simply replace it (patch below)? Failing that, could we set both for now? / Leif >From 25a51745c6243ff279684a3990c8c6aad25ed7b5 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 19 Nov 2014 11:02:42 +0000 Subject: [RFC] hw/arm/virt: set stdout-path instead of linux,stdout-path ePAPR 1.1 defines the stdout-path property, making the os-specific linux,stdout-path property redundant. Change the DT setup for ARM virt to use the generic property - supported by Linux since 3.15. Signed-off-by: Leif Lindholm --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 78f618d..314e55b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -389,7 +389,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) qemu_fdt_setprop(vbi->fdt, nodename, "clock-names", clocknames, sizeof(clocknames)); - qemu_fdt_setprop_string(vbi->fdt, "/chosen", "linux,stdout-path", nodename); + qemu_fdt_setprop_string(vbi->fdt, "/chosen", "stdout-path", nodename); g_free(nodename); }