From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1049FFA372C for ; Fri, 8 Nov 2019 18:14:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0D3C214DB for ; Fri, 8 Nov 2019 18:14:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=dabbelt-com.20150623.gappssmtp.com header.i=@dabbelt-com.20150623.gappssmtp.com header.b="GUK3+kc/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0D3C214DB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=dabbelt.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT8ll-0003E7-0D for qemu-devel@archiver.kernel.org; Fri, 08 Nov 2019 13:14:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT8l6-0002kM-Rx for qemu-devel@nongnu.org; Fri, 08 Nov 2019 13:13:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT8l5-0002mD-DD for qemu-devel@nongnu.org; Fri, 08 Nov 2019 13:13:20 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:36711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iT8l5-0002ki-0o for qemu-devel@nongnu.org; Fri, 08 Nov 2019 13:13:19 -0500 Received: by mail-pg1-x544.google.com with SMTP id k13so4468554pgh.3 for ; Fri, 08 Nov 2019 10:13:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=4OhJ8/ssnzX1h1ox9WgBFS8OB0q7jM4PcyUwC85Hrg4=; b=GUK3+kc/vYmW25Q3MVf0Dmsc9fNJZYeEbRQX400+9mmAj8fdz82SaNHZeNaM05ZlkP Z86Lu/PBQniqj250m5/+sPu3JlqFQu9T80MGj2YrQR1QkKeooqHuUOHHFxz2wfN5xlXn 1S9bsxGJ7hxUokOWm1JMGjgxYrLfkRo1BFF+OSbVoYn87nkhxQrBMN3fFoyRFRD29PIB c3jtso0fvdiby4i4LY52w5f4Z6GvKanaq3Vhyw2B2rg6sVCZwLvMvr/6aUI/gXtMMDsY jqzvKkZp5eDEw8XZlNF8UvSXJWiXn7avipVzLtuLaT6D/TkXEnoLMfyF3d+pBnTHlpaG g0tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=4OhJ8/ssnzX1h1ox9WgBFS8OB0q7jM4PcyUwC85Hrg4=; b=iBpQIDGda01FwsYFFA53+8AukiBoXNsRmUtpMo8xwpb3zxQUe/YuDzJR5RTFEBKpV9 8DLAH36MZ46pxdO3k2XwdnJgiA/Lp26x7H2vFYx+Y3VU89UIkdFSvAiEW+M8o1lV8X7E bqCEDKegp51UzqDAod7H6vXH16AbYi+H4SQqFrkH7R0tqXqiQZe9UoiHMCMcX1WTt455 3Q1AkzNyTRvUdr8rtDa3GdwWU0bTrfa274uKwC3S70HBZbiD4FNOWF+Z7CHN0v+AfUvb mNDiFWILvkagoM+J/hI3SbidOSZXDUbbiZ0siMSnk2p9haVWO7KxJqy/scHq5fnlruYD R20w== X-Gm-Message-State: APjAAAWE11c405eZB5AhRd7qRTHUxEAxK2ToTDRkRtAOb7jAkkOzw3Y6 QR7bs4NwJJrPoMJs3l3D/8COxw== X-Google-Smtp-Source: APXvYqxb1jU7qr2xD92YPfh5ymTDFaz4H7vcjKBVV24QD+3Zc6CmQzU3/j32PPusNRdsR/tbXe6hJg== X-Received: by 2002:a62:6044:: with SMTP id u65mr13668040pfb.227.1573236797047; Fri, 08 Nov 2019 10:13:17 -0800 (PST) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id n72sm6221230pjc.4.2019.11.08.10.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 10:13:16 -0800 (PST) Date: Fri, 08 Nov 2019 10:13:16 -0800 (PST) X-Google-Original-Date: Fri, 08 Nov 2019 10:13:15 PST (-0800) Subject: Re: [PATCH] RISC-V: virt: This is a "sifive,test1" test finisher In-Reply-To: From: Palmer Dabbelt To: Peter Maydell Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-riscv@nongnu.org, palmer@sifive.com, qemu-devel@nongnu.org, Christoph Hellwig , alistair23@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 08 Nov 2019 10:04:47 PST (-0800), Peter Maydell wrote: > On Fri, 8 Nov 2019 at 17:15, Alistair Francis wrote: >> >> On Fri, Nov 8, 2019 at 9:05 AM Palmer Dabbelt wrote: >> > >> > The test finisher implements the reset command, which means it's a >> > "sifive,test1" device. This is a backwards compatible change, so it's >> > also a "sifive,test0" device. I copied the odd idiom for adding a >> > two-string compatible field from the ARM virt board. >> > >> > Fixes: 9a2551ed6f ("riscv: sifive_test: Add reset functionality") >> > Signed-off-by: Palmer Dabbelt >> > Signed-off-by: Palmer Dabbelt >> > --- >> > hw/riscv/virt.c | 5 ++++- >> > 1 file changed, 4 insertions(+), 1 deletion(-) >> > >> > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c >> > index 23f340df19..74f2dce81c 100644 >> > --- a/hw/riscv/virt.c >> > +++ b/hw/riscv/virt.c >> > @@ -359,7 +359,10 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, >> > nodename = g_strdup_printf("/test@%lx", >> > (long)memmap[VIRT_TEST].base); >> > qemu_fdt_add_subnode(fdt, nodename); >> > - qemu_fdt_setprop_string(fdt, nodename, "compatible", "sifive,test0"); >> > + { >> > + const char compat[] = "sifive,test1\0sifive,test0"; >> >> Does this really work? Why not use qemu_fdt_setprop_cells()? >> >> Alistair >> >> > + qemu_fdt_setprop(fdt, nodename, "compatible", compat, sizeof(compat)); >> > + } > > qemu_fdt_setprop_cells() is for "set this property to > contain this list of 32-bit integers" (and it does a byteswap > of each 32-bit value from host to BE). That's not what > you want for a string (or a string list, which is what > we have here). > > Cc'ing David Gibson who's our device tree expert to see if there's > a nicer way to write this. Oddly, given that it's used in the > ubiquitous 'compatible' prop, the dtc Documentation/manual.txt > doesn't say anything about properties being able to be > 'string lists', only 'strings', '32 bit numbers', 'lists of > 32-bit numbers' and 'byte sequences'. You have to dig through > the header file comments to deduce that a string list is > represented by a string with embedded NULs separating > each list item. I copied this from hw/arm/virt.c, but messed up. There they use const char compat[] = "arm,armv8-timer\0arm,armv7-timer"; qemu_fdt_setprop(vms->fdt, "/timer", "compatible", compat, sizeof(compat)); I'll send a v2, but I'd be happy to add some sort of setprop_stringlist function. Maybe we just indicate the length with two '\0's? IIRC that's how other similar-looking data structures are encoded.