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: 412418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F41D01400DE for ; Thu, 20 Nov 2014 01:31:25 +1100 (AEDT) Received: from localhost ([::1]:58744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr6Hz-0005Jx-Nf for incoming@patchwork.ozlabs.org; Wed, 19 Nov 2014 09:31:23 -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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=/vB979wpadpAv+aeHU3V0C4Q4crOMykZOMWP57Dp+Xo=; b=jV4s6KeMBfdtKyF6sFo1RHWFkfkvcjmMlrk9xZlNvi8zWAQk9UWog/Mym/C3r8fl10 2HuGWB+2KeUtbnQRH/6vK/d4ZvJigD44YI6XgbtQqP7of2lqoHM45pJbciDj913xuH2w ZGmSgEdhgaGa6cMbbDXugkDsaxsMYe0QXjtLjmqlNp7af5VE1rJsLNHQJEmJ2fcMfnj6 mXqg4d1GyphtKTOSod/23qMFFD4x7gaO7G1dKu4rvYrR84DoDVrVgel36RZ8sMd1iHDf Fslsgm/5dyATmRVqiB7GgYOIdUAbf8diwGA1eZJPqUsFxWycj2IIxMe20e3/ZZ6xJkVi oKWA== X-Gm-Message-State: ALoCoQl87rL9/SeVIDUV8822fQ5Q9vFDPFvaNnLVKr+Q15VABdm2J/zq2KFKIFe/cq4ha0ANCO0D 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 Content-Disposition: inline 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }