From patchwork Tue Sep 27 10:03:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609598 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp249160pvb; Tue, 27 Sep 2022 03:23:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4zLKTCCiGBRdmpNTowe1BmJhftS6a5aD865yQUI3plk20ZcnibEinA2fWS28294p7fIcVs X-Received: by 2002:a05:620a:1192:b0:6ce:634f:b294 with SMTP id b18-20020a05620a119200b006ce634fb294mr17307631qkk.65.1664274198864; Tue, 27 Sep 2022 03:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664274198; cv=none; d=google.com; s=arc-20160816; b=D2ho6ufR8I04SWt1opBgZcPZXkXm3kblixq07GTKfu8vjWoj0Ub87oJc5u7nIo9gG+ LLjGYZIPQIHBM3mviBam0N78Z6u+eD1b0j9RNmFkOHtaF8thc+xqpVr2fQ/W5W5Wos1H qnV5CMzY1ftosW9IsPAuI7lkbl3czbvrOEv/eNMQTH9GP3rSZlEoFY/EqH9c38HCAg6W naZN11/7GuQMXSN0ndlwNUEek/ebZWXaPRTvh7FrzXI1AfYEd0bdnotl0N4Ga2aoAHa7 pTSR+zB7nQKayfIG21Q6yKR+EyeKsHLakllR6quAoqCZGDrPgJ+X3g1ii4cl2I9JsUhp UdXw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GLFHpYK2uYHTqgCRso0xwWMXytcOMYQaJsHAn18FQd4=; b=aldrnxq5dcGehY+LYDTqPzP/78KlkpkfhloifilXCXvvKG54RFsjhpUeH2P2RndJ+6 L6QDq+ml00LkIfkW6Pd5GlEg4eVpwXdRljw+hrwbfKzaSYgqVkf9eqih+rGCHf7WAunY eRTCYkdlh/FTq72dkZGYJVQ1kbMKvzKVNKTTbNtRZnkKPyKRpwd46oe8R6buDtytQy3q AQQT2cZoUFoYLhjkTyYdVKQ4wzKgejFDUuZ4I25DNpelYMHvLJDDcgZwLpMffSIrOlJI 2ozsDPxO4DjieaPEVY1D9Wgh0zCbI1tCAe215RMJEXdzNbzSozZsmDPUwv+UYC+HJupO NFAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OncPQMB6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d9-20020a05620a240900b006ce550324ecsi644295qkn.701.2022.09.27.03.23.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:23:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OncPQMB6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7kE-0004pl-BH for patch@linaro.org; Tue, 27 Sep 2022 06:23:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7aI-0001HZ-Id for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:13:02 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:41777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a4-0002U8-Qz for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:13:01 -0400 Received: by mail-wr1-x436.google.com with SMTP id t14so14196426wrx.8 for ; Tue, 27 Sep 2022 03:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=GLFHpYK2uYHTqgCRso0xwWMXytcOMYQaJsHAn18FQd4=; b=OncPQMB6JLaNtutPOIjDeYSrTZWMRK2iGPsHrUJccw92MsoSYCgtgU2ZzDcqkryLn1 LimZXN/bYy+9uSRacYYrw+2H8KsW3gPZ79mjHS0rf6Wl5QRgDNQmDTkSppOnFERAeR1a cFDUsfmvBbxon9i+hxlVFuaK30aNo3ZpvrDZq8IcNSq1jobQA4K6g1pxN49iLZOijGf3 5ijiC5jqBXMdZP9DnPl5ylFxB0Z9Sk5qF40MTzekgySmi6JRETJGvbGouyTeDILf6IRY aNCsKoPc99KgMtGpA10MoOfmeTJilNY7C1i7viwEPCvdAW64zQilpusxpcjfewdwBLVv c+Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=GLFHpYK2uYHTqgCRso0xwWMXytcOMYQaJsHAn18FQd4=; b=zT9a0AKYw9sVxGcupNXU1Uw65wr1p6Bkbu4w1HhZfoJWBY1XNyHK+1o2a1ykBx1gkF fQPTF0dduxV2VSawLKgCI1ElZfQgXXW6Jb5IPiEjDDCRv6Fdh2X2OebeCJwIclhbB7vH XCr71JstptP/DwuhLkcQcDOsUjRSSVXGYIQv8djd8mimrOqXx2EkBoK7GmKLhvh/PD+5 SASiFVr61DVOlKEzFq4XOi10QjidQ2eMDRO/zyhyaMbSkH5jv06ezpjvSMN+/s9vWjKw HqqdN9fq9R1zHgJE+MQLVtPLT0HpV87pccLNhHJiqj3b3t+ZN+wH8bfpzQMx08iSsIXH foBA== X-Gm-Message-State: ACrzQf2PA7Vpv4srU6OyGgQ49sT0B7og2apIjQngxlGEpJrNO7F0U+eG 27JU8XfyhCLKT9qWYvIQ2ricVw== X-Received: by 2002:a5d:4bc3:0:b0:22a:4b7a:6f60 with SMTP id l3-20020a5d4bc3000000b0022a4b7a6f60mr16082160wrt.549.1664273566760; Tue, 27 Sep 2022 03:12:46 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:46 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 1/8] hw/arm/virt: Fix devicetree warning about the root node Date: Tue, 27 Sep 2022 11:03:42 +0100 Message-Id: <20220927100347.176606-2-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The devicetree specification requires a 'model' property in the root node. Fix the corresponding dt-validate warning: /: 'model' is a required property From schema: dtschema/schemas/root-node.yaml Use the same name for model as for compatible. The specification recommends that 'compatible' follows the format 'manufacturer,model' and 'model' follows the format 'manufacturer,model-number'. Since our 'compatible' doesn't observe this, 'model' doesn't really need to either. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Peter Maydell Reviewed-by: Eric Auger --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1a6480fd2a..83ab1a37fb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -252,6 +252,7 @@ static void create_fdt(VirtMachineState *vms) qemu_fdt_setprop_string(fdt, "/", "compatible", "linux,dummy-virt"); qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2); + qemu_fdt_setprop_string(fdt, "/", "model", "linux,dummy-virt"); /* /chosen must exist for load_dtb to fill in necessary properties later */ qemu_fdt_add_subnode(fdt, "/chosen"); From patchwork Tue Sep 27 10:03:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609600 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp252544pvb; Tue, 27 Sep 2022 03:31:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5EgUOlOcX2Kufinifos7FRVM/udXQ0c3f0hJaylnZ90Orp43NcHXW/n5cE5emn2/Oty/jH X-Received: by 2002:a05:622a:144c:b0:35c:c05d:2889 with SMTP id v12-20020a05622a144c00b0035cc05d2889mr21271840qtx.610.1664274706470; Tue, 27 Sep 2022 03:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664274706; cv=none; d=google.com; s=arc-20160816; b=xprswqelthKonDNXlzjhMcLUp/SU6LUVUYlWb8EF28cHZa7Y9s0oapwKodeZEPCcKA d+76CXwcBheoTIh+PSpml0/AvreWZfwpn9DNMHdCDH5VqG/3+juSw2CzGMb9RhXITOCg PqE9uiU7EXmJIhmCueeBeL0Z38lvxgQY0E17lX5g2sYp0KfR/qOu0Xc1SzZnhS8MkDlz zJflebMjUC28WiwIOaMScEi/yf9z3prZNl4uI+6yc2XZTSQwy3/PB9O2S3ViQTkcotn0 zILYETHL2SMw+n2BU9MbVYK+iBMN1at6HT/O6wA2/qWRb23IjwxXMwVLL9En8Kgo3isW N1aA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/+qe3hdCuMJ02ODpgrestqrO1u1hGDsXWeqMcbLXyck=; b=viELMMKclL+kWVIqM9SfuWxBgTvoCidA4uuKQxDszAt6wVYGL3BObDjhSatRwlW4+x jSTEL3GRgIkT68a93TfetjSmPwcTxUkdZ6L8fOnRbnwdHXoBGw8KBwwZquo/s3ge8VCF gByIV9SmZYGGyooN4IUd+3w0iAKeiit+d8bGy+Ft4tsgI543jJb+HDJ967X0aEccheE1 0EX6MJCrPfq6coxZVLisiObgT756dbueabOMjCmVsN63+q9xlzVKHtRtfpgnHDemsiJx SWVN68ovVNS/rUjYrai7hK8HQ/bu6HDe/Hk368FS23pr68p4sQhfwDo3D+Dh9d1RNAgB XYaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AiW/GIg/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gw12-20020a0562140f0c00b004ad83270b8asi834396qvb.13.2022.09.27.03.31.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:31:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AiW/GIg/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7sQ-0000ND-2E for patch@linaro.org; Tue, 27 Sep 2022 06:31:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7a8-0000sh-2i for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a4-0002Ue-Rm for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:51 -0400 Received: by mail-wr1-x42e.google.com with SMTP id x18so14203628wrm.7 for ; Tue, 27 Sep 2022 03:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=/+qe3hdCuMJ02ODpgrestqrO1u1hGDsXWeqMcbLXyck=; b=AiW/GIg/GjwEaAnZ2TVBmgpWRD6IsAUThqA4QnpWfreS2ukL5SPvVq9XQhOTpWa5AB xbg/PUPoO+Kgzmh94pJnh6/A37RFS/cf8cTvSDXvDtdMbeQfW7+It8GGHy+/CeQ+Bfwd Hp7oCE5nNNc1dstkW71I9LqikPzpQyhGmdqOQs0+PeHp6LOqMWdOWXehQftvPx9cGH5H C2ytjHnoN+m6S8q5GNJYCjUkjeRdCGKJiN1EYwTd+m8klEGvUvpp6NCPM96cuJjKI43S gS+mL6KPo4Zkl0hzJE4vMbOPMu27PUDRm1THBvUszhlUFY0KT9Ph1rrOyz2x06HNTyRX dQVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=/+qe3hdCuMJ02ODpgrestqrO1u1hGDsXWeqMcbLXyck=; b=KFSEjElw/XoFlJlLQ9gcEJQp/HvRa3VpizAaVEbULizg/UF/Jjcuxf/GbWS4/j7IO/ R3jahnQeScZxtsfwBonid4tg54YhY6kFqZ/3RQ2EO/qQERm4rOWyPVZAk5GtjFIqueFx WZE7utXLbCWt+EJgArZ7mY+Jr8mhFvmJ1GcxnRiO5KW6Ey2plb5h9idQY0ga0HxgLAZf IMi23sTcEx9j5EWgpz5KlaMdYDa9oAEXEUAV6Ne8Er4dngPIqRQaNwhXs5b3tG/HLKHi Z1O7+XVgZqJOadFu+HUeDbdciAh6YAqooslru1I49U48dhL22JcdOAm4yLsGNXuHB5w9 EmnA== X-Gm-Message-State: ACrzQf0WKpdm+wUibeBJ0FIbeKZIrP37tTIZADw4p8FKWcm72K+Wez8a Tlsri6pgluH2xPQ3ejZQ9fxaYw== X-Received: by 2002:a5d:64c4:0:b0:228:e143:ddb8 with SMTP id f4-20020a5d64c4000000b00228e143ddb8mr15707074wri.148.1664273567527; Tue, 27 Sep 2022 03:12:47 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:47 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 2/8] hw/arm/virt: Fix devicetree warning about the GIC node Date: Tue, 27 Sep 2022 11:03:43 +0100 Message-Id: <20220927100347.176606-3-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The GICv3 bindings requires a #msi-cells property for the ITS node. Fix the corresponding dt-validate warning: interrupt-controller@8000000: msi-controller@8080000: '#msi-cells' is a required property From schema: linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml Signed-off-by: Jean-Philippe Brucker Reviewed-by: Peter Maydell Reviewed-by: Eric Auger --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 83ab1a37fb..ed6f1ac41e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -487,6 +487,7 @@ static void fdt_add_its_gic_node(VirtMachineState *vms) qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "arm,gic-v3-its"); qemu_fdt_setprop(ms->fdt, nodename, "msi-controller", NULL, 0); + qemu_fdt_setprop_cell(ms->fdt, nodename, "#msi-cells", 1); qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, vms->memmap[VIRT_GIC_ITS].base, 2, vms->memmap[VIRT_GIC_ITS].size); From patchwork Tue Sep 27 10:03:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609599 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp249351pvb; Tue, 27 Sep 2022 03:23:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7A2OE2bKKHHjMxhY+yK+gRCorArrnZMW/f6hX72N0s7tdkO+8i/3UzhauVMgLNZvaLmG0l X-Received: by 2002:a05:622a:1482:b0:35b:afa9:d8a3 with SMTP id t2-20020a05622a148200b0035bafa9d8a3mr21953191qtx.621.1664274226365; Tue, 27 Sep 2022 03:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664274226; cv=none; d=google.com; s=arc-20160816; b=tV+szWyZKkFD4ov0qHOvt9JgzTu1+C3jz4xnr6uZ/R4gpsq/cAPTq6885sqObeGFAh cGYksRucjwX70pVh4ofeIbJVV0rg7z0kj2qgSbU+Wep4XW0QhGUxNgFRkXMYIaYsOHIg /FttXpjm0jKRdciJq1f9L8XmdRtNjsdcvnc00NtR9mdWBthZhG8UJ1UV92JCtLijpAh2 visjyqeM9KWP1h9IPnZoWhEiGaEy4tcNCxF36tm+yXL/2+TapxqItP1p9581wXIDTVgO tM3Y4035oiYSXFcpTsW14hPX+OdVFYQ7kcdLJjgyg+Vd+wIK/yZzpREfnz4L2hEN+Jwk 8xDA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7iySBt4V5mw6rx6WYGB/cETVun6K55iadG8h/0ICVCI=; b=jTVl2zr535edZLD66Zz9XFC6FbsYWdO4b2diu74aPrY4vZSTkztfeQGga1RMtSvK6u kdSCv8GnlXKk3nU2K+SV5Ntk8lNAnTJ5yM3MypwNmr5XL7XidWyKn6R9FuRykgmJf3ep A6YXmIVdaYMGn0RmOIQeVwdO/5gZMfopgT8MPA0HxYtzIIR+vslNaMizQAh/13Qddsaw ukNtTIvBsSdHL5eZnkHI/UYxE9+W/xRQW+PwWoDfU4ZuwgAhVJ9Plg2vZuOQM9vD5UbT znaAAc2HQ41wX31eb2tcjzT5PuiTz/+T0VuUZTHm+tWjYGpw78cVSbGrnJcA0rO5J2wC z5Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wYN8Dn3/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g20-20020a05620a109400b006b92c9be3a5si445553qkk.638.2022.09.27.03.23.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:23:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wYN8Dn3/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7kf-0005u5-Up for patch@linaro.org; Tue, 27 Sep 2022 06:23:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7a8-0000tJ-Ll for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:43823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a5-0002V6-Iu for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:52 -0400 Received: by mail-wm1-x331.google.com with SMTP id r3-20020a05600c35c300b003b4b5f6c6bdso5150901wmq.2 for ; Tue, 27 Sep 2022 03:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=7iySBt4V5mw6rx6WYGB/cETVun6K55iadG8h/0ICVCI=; b=wYN8Dn3/POyFtgTlE+N7TwzRTylZ3vqDUce0hUQ2JyvICPMXJcg0O1QUokSDbifWwF k4pBmVZWraV4SYeWcd6Tm5fJTv28Dv5//Spvc2A+S+cd4ZUKfJqcjqEDeueVE7Q8/qLI waD8MuC/ifn0S3r9vKDmaQfrQPJZnwMo3A5IXidNH05yXthKpwPkQctLiNkdZGY2W/l8 pSZFO2ftMfOKnaBzquylAwM/Vofnelrou6NNb3wnEfc34d7LdPiZbNFmoc8o53R7xUYM XYCmR7D6o6QL6Do8W44S6TUmpQgsI1k8Sym4TGd9T3yG1eO2ENabxupceNm99KavsITl IZ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=7iySBt4V5mw6rx6WYGB/cETVun6K55iadG8h/0ICVCI=; b=biFA9V0C8E+yg9DBn50NqDu8hABaNzTv5nxHiCvcbll6i+/dlg+sJQjXfMqQkmxUGO m9KzHf6VWsVdqPD6F6okr34jpHz417D5dsLxXtkCieLdKSmvWqfsAEHMGCCM2jd5/Lht Ig7RtD746dvDyy+99l7XV1LOKqWEsZQzUfbc9Txe8jpksF/4VFNzj7TMAwWUwiXEoT7Z TxL30yn9F5OcO2DS3awIr6Gk7kwH2V7y5xvm2a1a7Ycl+AdGhnQfIMJLv0U+79t3VCzW URRcyU1+zDiYG5hJ7VACKmUt3U/dYaU+spYJDaY5bdfjm4oexqH7JRPrWJ6Ck4t403Oy n89A== X-Gm-Message-State: ACrzQf3GUXcTsMdzoFSZtV/HA8f71Z8T3mvwnwPskPkzwguMLT7tYTRy 3VhksdhQ4pljazHUmowbgnaM2rIBJh2EeQ== X-Received: by 2002:a7b:c398:0:b0:3b4:9308:ffee with SMTP id s24-20020a7bc398000000b003b49308ffeemr2045144wmj.51.1664273568239; Tue, 27 Sep 2022 03:12:48 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:47 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 3/8] hw/arm/virt: Use "msi-map" devicetree property for PCI Date: Tue, 27 Sep 2022 11:03:44 +0100 Message-Id: <20220927100347.176606-4-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The "msi-parent" property can be used on the PCI node when MSIs do not contain sideband data (device IDs) [1]. In QEMU, MSI transactions contain the requester ID, so the PCI node should use the "msi-map" property instead of "msi-parent". In our case the property describes an identity map between requester ID and sideband data. This fixes a warning when passing the DTB generated by QEMU to dtc, following a recent change to the GICv3 node: Warning (msi_parent_property): /pcie@10000000:msi-parent: property size (4) too small for cell size 1 [1] linux/Documentation/devicetree/bindings/pci/pci-msi.txt Signed-off-by: Jean-Philippe Brucker Reviewed-by: Peter Maydell Reviewed-by: Eric Auger --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ed6f1ac41e..8605f5058a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1489,8 +1489,8 @@ static void create_pcie(VirtMachineState *vms) qemu_fdt_setprop(ms->fdt, nodename, "dma-coherent", NULL, 0); if (vms->msi_phandle) { - qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-parent", - vms->msi_phandle); + qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map", + 0, vms->msi_phandle, 0, 0x10000); } qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", From patchwork Tue Sep 27 10:03:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609601 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp255039pvb; Tue, 27 Sep 2022 03:38:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4jAmJR9ZUt6VjAYq3hMHYyUdEGWkJghXSxWhYTBUxUz5xHs5P+BZyVcDDaoqtYFvVIwGwf X-Received: by 2002:a05:6214:1c87:b0:4af:8d8d:f319 with SMTP id ib7-20020a0562141c8700b004af8d8df319mr1372749qvb.11.1664275092168; Tue, 27 Sep 2022 03:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664275092; cv=none; d=google.com; s=arc-20160816; b=MYnPlDIY5J/SAxJZXjvF9wSvn4H7BXOEktvJe9pBHF1qHdFSnvEfwhOx0JdrldZdap ldPZZlJTprciAGBd7/Pfc4YYZ1/H/nDBYr3ynj/X8vUiGFtj2RhuMaZfRHQwqFyFi7gZ g2M5tSiLGsXxG4hMH+FuKu267txhb1tC7/MlN3UV3cKezAh0aXz5+5fCX17/OO3SdPJ0 7+4QVbzgRuOjpQAcUx0VuIRSE2OmTxje58WBCO0K55W4bWa5wYLqvMOFO2SWni31ofCT EowAxARtsQ9CjT8tutpaM4+oYg98oIt1tcq3Dc3ybe4lv1ClML+NXHxSvgwp2Gt+jdKG P7zQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mdbZvGlemRTML0U9/q6dutguZkYkpzqfdzZefPdbkXA=; b=GaBM0PszpWYLl/Q0dIiOLBP9sChg+L/aGvBAnr64mLTuYvD1wK2G6aqnuI4sQHzUQD A1XzdBtMb3krSjknDh7qJ6IvVnWN4oXQeLonTYa1SeC/6REnKI0H0U4mI5fsFKSztL6u 5BznQkzBHg2RZVCS+mRtbwAKIwFYoQjlWz9n45EmkQrBvVEcnkmj637Av8amipew+cUv GlYjYRiLmSqkfjB1OrOAKYVjvv2SrRfnFdYOfXrJsU6LLqNO3MAnjFszGeUCclDrckoe LzXxkPmb9ZinNTaT3OxJl6TDRAd3hSpkX8MhGabxqgNEmAPUWVfe1J7fZOoNq3HFjqsc KWvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CmPqP9vb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id br19-20020a05620a461300b006bc65379d9fsi640186qkb.144.2022.09.27.03.38.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:38:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CmPqP9vb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7yb-0004vZ-FF for patch@linaro.org; Tue, 27 Sep 2022 06:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7a9-0000tM-FQ for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a7-0002VZ-OP for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: by mail-wr1-x42f.google.com with SMTP id bk15so6461238wrb.13 for ; Tue, 27 Sep 2022 03:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=mdbZvGlemRTML0U9/q6dutguZkYkpzqfdzZefPdbkXA=; b=CmPqP9vbY+PGpz+U22K2Ul/camvnXkDS+a1pak+dmDNnSZBe+WyD047bdwQ51PDnGe eCuJOyQtIzS75Si8r+aP3krDTDBBeeBUT27Hvn4b9s80qDalbkZroeov5WUW6kfXzEpn YVYAL1xThHWODyay4szCmdncz/qjPMCI27CJBBuZWxbIk8KZBh4xk0m0uB+5wDYQ3bBp FVFjGBwtSkGrryTjPRNrMMgshjbHH8h30YKFOTbyEgPaKkeDjzi+22C4sfIypz+OVAQX fMRPLR/HwghA2y30kzPT23L72d6MRBQ8p147loX8/5AuUCyIo3Kif5qCRU7AOc2wWBo6 LQ0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=mdbZvGlemRTML0U9/q6dutguZkYkpzqfdzZefPdbkXA=; b=0ksajEp3R8JXHXYtubsH429bFa02Bd56tZz1SvU/MaMCi1NYpiSD/q7EU1G+Vm7yKe VEigN9HN2UqCf8BmZvpsuGio1rQqgtXGGLZzfVF5Djuygx8NBpllaTW+wSsY5CJcUkEW VENOze3DmvMz7UIeVuKaVyUMatrcIQi1elXF+m3sQn1sXJwa9GOAU1hO/DeGjfEW+rZf XmnpgBki6f7WfBadYczZqUeEflN878BVnyMrpHKh+Dt63omtwWnUscuifB3tA2Xp9yjA uSv7fxrqLpbcyvQYTxMtVuCF/J+TSNRfa/LF47jSQjfICr0uJb4h470qpOScuz8ma7+S ZUwg== X-Gm-Message-State: ACrzQf2LGf76eTtEnZ+vihmBUuuI5ST1KIG6g8PWQSZRujP8i6FoMUvU flPQxpMqSQmMdBU2c2hjVLcjDA== X-Received: by 2002:a5d:49ca:0:b0:22c:bc93:a9b6 with SMTP id t10-20020a5d49ca000000b0022cbc93a9b6mr1643313wrs.10.1664273568980; Tue, 27 Sep 2022 03:12:48 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:48 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 4/8] hw/arm/virt: Fix devicetree warning about the gpio-key node Date: Tue, 27 Sep 2022 11:03:45 +0100 Message-Id: <20220927100347.176606-5-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The node name of the gpio-key devicetree node should be "key-poweroff": gpio-keys: 'poweroff' does not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)-[a-z0-9-]+|[a-z0-9-]+-(button|event|key|switch))$', 'pinctrl-[0-9]+' From schema: linux/Documentation/devicetree/bindings/input/gpio-keys.yaml Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger --- hw/arm/virt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8605f5058a..6805c57530 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -932,12 +932,12 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, qemu_fdt_add_subnode(fdt, "/gpio-keys"); qemu_fdt_setprop_string(fdt, "/gpio-keys", "compatible", "gpio-keys"); - qemu_fdt_add_subnode(fdt, "/gpio-keys/poweroff"); - qemu_fdt_setprop_string(fdt, "/gpio-keys/poweroff", + qemu_fdt_add_subnode(fdt, "/gpio-keys/key-poweroff"); + qemu_fdt_setprop_string(fdt, "/gpio-keys/key-poweroff", "label", "GPIO Key Poweroff"); - qemu_fdt_setprop_cell(fdt, "/gpio-keys/poweroff", "linux,code", + qemu_fdt_setprop_cell(fdt, "/gpio-keys/key-poweroff", "linux,code", KEY_POWER); - qemu_fdt_setprop_cells(fdt, "/gpio-keys/poweroff", + qemu_fdt_setprop_cells(fdt, "/gpio-keys/key-poweroff", "gpios", phandle, 3, 0); } From patchwork Tue Sep 27 10:03:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609593 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp245338pvb; Tue, 27 Sep 2022 03:13:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7wGV096x+YNAGzfzYBrf3p0z7S+3FIwHOHQ79noM4XcSjDsZuU6qATe+8qw9OU1szL1FWd X-Received: by 2002:a37:6493:0:b0:6cb:d930:8b69 with SMTP id y141-20020a376493000000b006cbd9308b69mr16737978qkb.246.1664273638235; Tue, 27 Sep 2022 03:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664273638; cv=none; d=google.com; s=arc-20160816; b=ro2UZJanjWxbWJBDBtznRYoGclBpgW5HpVkmDYkYFeWP0VjQL+T045AurY1w3WXTxB qq8I7YVJ9d5qu4Rlh46SLLSxkzyDJ85rg+GgHykQ1Z6VCTLKj3wx7FwSk35Wan86Nog0 ht/f2VamGvKeC8xaofMkRxfTPjIp0fpDnbhe8tfJTLarp50foM9+v0R3dh1YZvRY6KNz 4iOEkllTOhhY1FtCM86ysQa2yvau2AqDhni1C9rr8y0t23FwgNGq0lWC4pzelHOxm+5q 94xIJQQqQ9Q19Czqk1F8xB2A6SnThLcj76K33OO6HW1E6Wq2vLahNf7aAhDsSFF9SwSz Ck5A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CJWWWX0j3DH7dA8Y5VomwvEKcqa9vhwQUJYhBUYvd+Q=; b=EXvmW4HWI/VfF+Xeox2MH1L0fALj+fFDTnHiYiG3TAQRxGPxMcq0Q6bLZfCPQ2Usz9 fXZopCBYh18ueZFo9NhGMoDaYgwbbtAKSSRH2SurRd8Ljtosg2T4rIviGQOTwkZZ9iEO Jhsa8jhj0DpBiDqeGA3RKWytimc7D39QH5LkHe2xsduelONCASIUBE9mo3vhbO6fDiKt lNPOT4KwuUFyoYrdMyLg8dSWUoD8BYuZGB5gnjirz1cj4GQZtqgoLVW2tuGt9pgXu3iV MRlzZdDP3atF+n6aeFBOQ6CZkVgVZ32uB4wKQ58kljqG+9T42kCSM0ZuaXqvHm+roQMH Nezg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qK7WkBHm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u4-20020a05622a010400b0035d4325673fsi527966qtw.118.2022.09.27.03.13.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:13:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qK7WkBHm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7bB-0000yl-Pg for patch@linaro.org; Tue, 27 Sep 2022 06:13:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7a9-0000tK-DX for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:56062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a7-0002Vx-OF for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: by mail-wm1-x334.google.com with SMTP id t4so6195490wmj.5 for ; Tue, 27 Sep 2022 03:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=CJWWWX0j3DH7dA8Y5VomwvEKcqa9vhwQUJYhBUYvd+Q=; b=qK7WkBHmP6cpQ/O20B4lKQ+1uHK48TTvNpaNGwmYAwHy/fphYsI5MqF+PX7ijXMvbN 2RtCjUCr9z3zCVrNdWEB6uUjOMHtbePqrfwWlRhudYGlfb2o25eiC9U/DVNBd0fOv2J+ CHTN2n1Bi1wI600nagm4WQPU7kzsLymTxfjhzb0pmh4HtOXmkiFE2Q8o0lVs+LANMvyw ZdAPY+MrK1GtnKoK483tb4rnrS4zlzQTmjwzMNjm70HV6atzhcyl2JfxUN86nAvUH8kk 4GOJN3AU/kI6acxCunk0rYklFhhCsF1+EDBxocZtdX+4Yqt9+IYI1bBf3W36Zhv13inJ yOig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=CJWWWX0j3DH7dA8Y5VomwvEKcqa9vhwQUJYhBUYvd+Q=; b=DxYKz2s74cg5vJi6LPheVWTLs8xNrtD64Zsxv8HrbosinjzsqiOcpd7AoGCDBIzIgr hUqfr6PNuxDaL8vYxg1RQQIa8x/sk9geKylQ/KBJ+5IBXJZdhL94yv1r3pJ1zht0i9TZ I7dK1gQCH3Thb+eqwsQLUgl6Fy7xi2Q/LQHw1PeuAxOc00kAmXTnS2qe4xJfrzhNnMaE QetB4CfnOSPaGho6ow/VN9el13NxADjtJS/PliNfhAA7wlk9HeR/26TUFaw1D6WO6SyG F1BUVWKYewiMhKLkPb4X9P1ut8piTGQom6Rp7wFQIm1OJv2n9PD5efMCuQEV9pTAMoVw 0m1A== X-Gm-Message-State: ACrzQf2/yD0yPIJmNPWdvwXdkH44nrl4NJiarkWWsjddr53pPq/3WDHv PRuO2yL8qrDU56NKiIcB1hjaIA== X-Received: by 2002:a1c:7c03:0:b0:3b4:7647:ccd8 with SMTP id x3-20020a1c7c03000000b003b47647ccd8mr2053064wmc.10.1664273569674; Tue, 27 Sep 2022 03:12:49 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:49 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 5/8] hw/arm/virt: Fix devicetree warnings about the GPIO node Date: Tue, 27 Sep 2022 11:03:46 +0100 Message-Id: <20220927100347.176606-6-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" Since the pl061 device can be used as interrupt controller, its node should contain "interrupt-controller" and "#interrupt-cells" properties. Fix the corresponding dt-validate warnings: pl061@9030000: 'interrupt-controller' is a required property From schema: linux/Documentation/devicetree/bindings/gpio/pl061-gpio.yaml pl061@9030000: '#interrupt-cells' is a required property From schema: linux/Documentation/devicetree/bindings/gpio/pl061-gpio.yaml Signed-off-by: Jean-Philippe Brucker --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6805c57530..10ce66c722 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1012,6 +1012,8 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio, qemu_fdt_setprop_cell(ms->fdt, nodename, "clocks", vms->clock_phandle); qemu_fdt_setprop_string(ms->fdt, nodename, "clock-names", "apb_pclk"); qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", phandle); + qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 2); + qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0); if (gpio != VIRT_GPIO) { /* Mark as not usable by the normal world */ From patchwork Tue Sep 27 10:03:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609597 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp247464pvb; Tue, 27 Sep 2022 03:19:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7wI85tVPCP+LtGgxqzcQiMxgRDaFmjMcPC7uxagHPIgahXfHFFacjEcykelK/EUILChsIk X-Received: by 2002:ac8:5f4f:0:b0:35d:19e0:a440 with SMTP id y15-20020ac85f4f000000b0035d19e0a440mr20077541qta.627.1664273950118; Tue, 27 Sep 2022 03:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664273950; cv=none; d=google.com; s=arc-20160816; b=XqdKXcC2mWaSzKHzqnML0L2DMUKoVr3jHx062DyNpfVRacCD2nCc5lQMoGa7819e97 ZOpTXRJOUm5xCQUvec2PhdQJ6pxXciEGPw1VhE7IuJFscwqwtBohtJfue2bWFLk2aHoW DMT+q46HyiTLFK1QVTC/hiQJG7hfXOJv8UpmojO1xN01KVnV0wXa4LgrtVsqpogzB+Vo c2zegiJlA5y9fAKdYxD4mCdR8YWvnZBdbBKHw2cytvA5QEIlmFYS5MMXRs1dYoVxNhfl XG5D/tuIQrl2fhPAlPnrqPVYKrDlHSjiBQp0XQgJJvqK9p1jOeNTDsWmgPutKFFhjrSz oSDQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8lc9+EAsDsNcRbit+l0khQ7LVOAu2tt4CiBZ5zrclyM=; b=HD9ZA1Wi5GBCnbw2mInxKeWZNu+pf4d91g/PKpkU8y9lbwpgQVDM7vt5AzKelgFlCZ WKTmW8agn/Ex1g4P8G1/uYOCEg1Rohb8cHeNyE7VR9aLDIT5bhhzPgUHHmzdm/KK8onz MuDL6fmPmHfhMh0nvGG0q+sQqp+1wE0dpIsLQtOMaOTUF2LFTzGdJbiN0q22hOrO9Bdl zfUHTowZgt1mLScoBN//chXjUowSHBPeLUQUozjDagGqkwnmGMsGnjMgVeoBr0hphwtk ZJMNBd7TfJ4K678crF6hDmKd4gg0SgoAgabvmXk3+g1WNtB+CcUH5ozYO1D9SH9QTUNE UlPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tbjugk8K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j18-20020a05620a411200b006ce3f2f5cb7si654166qko.482.2022.09.27.03.19.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:19:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tbjugk8K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7gD-0008W7-Mn for patch@linaro.org; Tue, 27 Sep 2022 06:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7a9-0000u6-S9 for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a7-0002WR-Oi for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:53 -0400 Received: by mail-wm1-x332.google.com with SMTP id iv17so6196423wmb.4 for ; Tue, 27 Sep 2022 03:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=8lc9+EAsDsNcRbit+l0khQ7LVOAu2tt4CiBZ5zrclyM=; b=Tbjugk8KSpIctutBfMXYi8TFdBbmuK4d0Wy0OQ32PaIag0RYgzNWHrZoH2YKlDCe0k A08ImKt/m5jtrFWg30h303n3mp93Z+MwAmxDc2OLK2HMiqizCe3seiIfYLwyj6KiAVfM a0CfJPLKlMjI63277JLybveeLAn5DcSEPLz0kzO1rihLe7c4Bm+PC1f6e9eLaw9rTp0F Tuc/4dK3xnYy4UZmPzi2p6hK1mBkeh0AcBma7Emnbh7zOhi434s3A22kbIfAkTLOe35b VzVNplNsfPe685ou5fecAyY/BwA13lJ2yjR3jh6shfQSLspDe8xGm7eTMsjt+vBBKYaJ 7ilA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8lc9+EAsDsNcRbit+l0khQ7LVOAu2tt4CiBZ5zrclyM=; b=Vhvb0V3hEahgmxyFEYZCd8Uu4KZwEOoTaMEXRFWZN2y85e+06fk5zY8hjSSmpJTXUj 6n0uRK8bZES1ri3/Raf8b43SuQkrSwQObfj1bRwZX9kLGrXX8pz85LWbgPczOoD+FWf7 R5aSC769ZeOQ2fVkSj9X1TzgQwP/4T26LUckJwqmeo52pclHCE8ZSvqbtikHpfpvxv46 mBY7T5G3ypF7FlLXqLvIKN6XS32CTA6TS6S5l+hz/zs67+/Xgi7SCFZ/FCbFcfd+Hckg YApo2QkTwynZ3RQ/bF0oU5pgmVfgLPPS/rjLXylrMMlneaX4sEljN3+BSwRcqyMpxRr2 SUsA== X-Gm-Message-State: ACrzQf0G511pkcQlx6fHNV7sjSm3VnzCiQpkzLo1AuID0+Mp/hQceqok 6Ug5yztAwh1zrwbi1iCNtJBefw== X-Received: by 2002:a05:600c:4f8e:b0:3b4:ab30:9af4 with SMTP id n14-20020a05600c4f8e00b003b4ab309af4mr2040707wmq.84.1664273570348; Tue, 27 Sep 2022 03:12:50 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:50 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 6/8] hw/arm/virt: Fix devicetree warning about the SMMU node Date: Tue, 27 Sep 2022 11:03:47 +0100 Message-Id: <20220927100347.176606-7-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The SMMUv3 node isn't expected to have clock properties. Fix the corresponding dt-validate warning: smmuv3@9050000: 'clock-names', 'clocks' do not match any of the regexes: 'pinctrl-[0-9]+' From schema: linux/Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml Signed-off-by: Jean-Philippe Brucker Reviewed-by: Peter Maydell Reviewed-by: Eric Auger --- hw/arm/virt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 10ce66c722..2de16f6324 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1362,8 +1362,6 @@ static void create_smmu(const VirtMachineState *vms, qemu_fdt_setprop(ms->fdt, node, "interrupt-names", irq_names, sizeof(irq_names)); - qemu_fdt_setprop_cell(ms->fdt, node, "clocks", vms->clock_phandle); - qemu_fdt_setprop_string(ms->fdt, node, "clock-names", "apb_pclk"); qemu_fdt_setprop(ms->fdt, node, "dma-coherent", NULL, 0); qemu_fdt_setprop_cell(ms->fdt, node, "#iommu-cells", 1); From patchwork Tue Sep 27 10:03:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609595 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp245472pvb; Tue, 27 Sep 2022 03:14:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LcO/dlWE+GnUz7qH5loyrM3my3kJl/QQNrkAtRWVKhEdgK8R7e/sKjBguMfpCCXdbEKxC X-Received: by 2002:a37:a15:0:b0:6cb:e349:99a9 with SMTP id 21-20020a370a15000000b006cbe34999a9mr16692832qkk.675.1664273653368; Tue, 27 Sep 2022 03:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664273653; cv=none; d=google.com; s=arc-20160816; b=CejnqBh68suQbPx97LYdYHQCmB1LGj98DmmJajgGSY2NLMP8Irpeu8Iq3VserdUvPt M/6+v36PuGzFi5bopFOKuNVIOrM5L1I04sXaM8+Si9G2FTSuQ5cqUV8hk733p+b1ISGL 6WGj8qQPmOIgCXL6tbCcOJldVLiE4HtkPsGy+exTt8bKguAxSERModRtYgp2FRWzlMgw puG4z0FfcjoiqCUHdl0JvIaUdFpcQ6HlZLKMDa+RFB6uHdnpjmPS/prGsjm3VNlQWSXV 4asDgRvafSXAktcU91wnaMXjMQQgGvLQzmZoQY3SiL3tH+41oCnsBbuB/1y2YVbyfsBp acNA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gCpSGaH9k9PWhr0Z9u8fR2+dVNRNKa0vVi8uRr2Kuvg=; b=UvC73y2buLE3pFENJ4vNnJH5T6QMxYXtyZW4ejqkTBI6a2wxmEbRqliFT3IevtRIqj fSp4PaL7DH2v0W9u/a/4DeTbAd4eczKxlkEcD9/Ar65BDjzj6ZccbcrLI4fmE16DKa0I eao6OxOCbv8XHEWlyvStK+YG4d/s/ttKb32fnnxdjw3oTKNJlqkXJGwqtJp24x8IzdAi up30a+suiz5SrZRN0OJm6vwE7y6LwIG8Oc9b0L+UNd1Ub/uQ7YKMLm7YjQ5cRohGEkpr tprJHb+/nQLqb55yuuCAz5835hdohXEbzgQQWBgWpoVX5r1BKfqXxCCegK2xXIjjkDui RZZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Psu97blz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bl23-20020a05620a1a9700b006bbe7dedb57si467237qkb.439.2022.09.27.03.14.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Psu97blz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7bP-0001t8-TR for patch@linaro.org; Tue, 27 Sep 2022 06:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7aB-0000wC-R9 for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:55 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40583) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a8-0002Wi-JZ for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:55 -0400 Received: by mail-wr1-x429.google.com with SMTP id x18so14203881wrm.7 for ; Tue, 27 Sep 2022 03:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=gCpSGaH9k9PWhr0Z9u8fR2+dVNRNKa0vVi8uRr2Kuvg=; b=Psu97blzdsnye9goX9eqqYWBeEpeId+OBpZCTlEAIV73WaOzcKpUHfrXZ4rZEoFyE2 EWlWHVNrR8fQAK75vFldmJlYYhkP8OnLvJNSShB2YfLelX0MHjcxe5SXF+whVEjnmbUG bRzlFh9TB7lZvlE5jsotXr0+K2IbUW8oj533VcqPPQeLKdcANaBj5uWRNwZG34JfQsui ikLcJzKBcgw34gAfgqiwMiHrSlcusOjqiZ1UIvnQ98W/zJ8pg1uEr8kub5hMk29YuPtb tXQk+KxNTOvaYBEJw4ilE1BY6vYOW6EjP/YzgWAMJXIGz8KMmQiSw/FOCvlMbjC4u3Wc lOFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=gCpSGaH9k9PWhr0Z9u8fR2+dVNRNKa0vVi8uRr2Kuvg=; b=mjfODUJ1pymaAhvl7IXCVJ5kjMmk3PvGPpZXpNwhQaSdhAPG+6bi+4M3pjacsbz9AJ 5zjC0vf0wC40GLy2yRWzgJSvtE3Efq+95JsDCJI8Kqs0pYU5SfQzP6W7AP3VpqD0vL8z QPSi27ogYtmoFskOdecp0EUPZ4vBOXxsxeFsagq5gL7M2zfftjmr35gDVq7WwWQetmzg V5FDBFsGqWr+clKaFG/6pVxnDt3D81d893Y+djFI9GmyFYy5ZQOw+HzsNluNJNNwbj1l ruKS23ixERRptn9SgjqfupqqqYKxdAbrVA8NkhrN6sta/RdjH2b0ZyL0oXVJs94SMjc4 C7BQ== X-Gm-Message-State: ACrzQf3JTQfo7F2pbYuJp94VntGAZjkcUT+S5/EkafDFaRu4QllsxFzJ g7Ro6uXFkFPKCrNLFXd7HFNEug== X-Received: by 2002:a05:6000:15c5:b0:22a:49c2:4c58 with SMTP id y5-20020a05600015c500b0022a49c24c58mr15991749wry.362.1664273571139; Tue, 27 Sep 2022 03:12:51 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:50 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 7/8] hw/arm/virt: Fix devicetree warnings about the virtio-iommu node Date: Tue, 27 Sep 2022 11:03:48 +0100 Message-Id: <20220927100347.176606-8-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The "PCI Bus Binding to: IEEE Std 1275-1994" defines the compatible string for a PCIe bus or endpoint as "pci," or similar. Since the initial binding for PCI virtio-iommu didn't follow this rule, it was modified to accept both strings and ensure backward compatibility. Also, the unit-name for the node should be "device,function". Fix corresponding dt-validate and dtc warnings: pcie@10000000: virtio_iommu@16:compatible: ['virtio,pci-iommu'] does not contain items matching the given schema pcie@10000000: Unevaluated properties are not allowed (... 'virtio_iommu@16' were unexpected) From schema: linux/Documentation/devicetree/bindings/pci/host-generic-pci.yaml virtio_iommu@16: compatible: 'oneOf' conditional failed, one must be fixed: ['virtio,pci-iommu'] is too short 'pci1af4,1057' was expected From schema: dtschema/schemas/pci/pci-bus.yaml Warning (pci_device_reg): /pcie@10000000/virtio_iommu@16: PCI unit address format error, expected "2,0" Signed-off-by: Jean-Philippe Brucker --- hw/arm/virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 2de16f6324..5e16d54bbb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1372,14 +1372,15 @@ static void create_smmu(const VirtMachineState *vms, static void create_virtio_iommu_dt_bindings(VirtMachineState *vms) { - const char compat[] = "virtio,pci-iommu"; + const char compat[] = "virtio,pci-iommu\0pci1af4,1057"; uint16_t bdf = vms->virtio_iommu_bdf; MachineState *ms = MACHINE(vms); char *node; vms->iommu_phandle = qemu_fdt_alloc_phandle(ms->fdt); - node = g_strdup_printf("%s/virtio_iommu@%d", vms->pciehb_nodename, bdf); + node = g_strdup_printf("%s/virtio_iommu@%x,%x", vms->pciehb_nodename, + PCI_SLOT(bdf), PCI_FUNC(bdf)); qemu_fdt_add_subnode(ms->fdt, node); qemu_fdt_setprop(ms->fdt, node, "compatible", compat, sizeof(compat)); qemu_fdt_setprop_sized_cells(ms->fdt, node, "reg", From patchwork Tue Sep 27 10:03:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 609596 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp247422pvb; Tue, 27 Sep 2022 03:19:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/nFQrPUigFwVPj/z0QFUId52CM39MQBL7cpSFK6rEKba1kuinA+9/HhsJz1TPa0x4hsOM X-Received: by 2002:a05:622a:15d4:b0:35c:dda3:7bc5 with SMTP id d20-20020a05622a15d400b0035cdda37bc5mr21762239qty.676.1664273941258; Tue, 27 Sep 2022 03:19:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664273941; cv=none; d=google.com; s=arc-20160816; b=UGCPevroYjH61ai1gT1W8MEiYIousrA/vwsfmJitWowwxm9uL6OEBPw4l01Ppu/7HL 0wKhzPRB47O+vBpnHmrbQ3I01EsobbrMk1mk/p/JQnhoCNRq1Vmcqnb+h2aJ955zxRJT dHzZGmLdFlNn/6V4Vot/UnJlCqIwOKgg9JE+v8P0ScYS6sljEMRrC52Y06NuZjccIKSx YjVZOiDcKzLwlKsI72ujG17Dx39bFBfuMxgO9zPaqLmrGfjATX4hxL65mZJ+I3j/QmFt wgBdFALLV1GsfMPsciVwykBdWvg2ndnD9h0zxDwFmc/qPZ0R9QtVyLO0VU6CAe3K2UWG n5OQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l/uG4uTbqpFsuZ8etvP0cLENEL6FoiOD5ehdUdm22Dk=; b=f/FGo4hrWhaNCrTgWuy6+ln+YWT9GnHcKFcoDE/HRH2W5kvRyzqSNwN71TBM8gc8ta DvzdKEh2xtRk5fa6jEiuu/iHWyc+wgp/KCe5z3uuA4QUxtQ32q9OYufUQz82SfIrbDit 9LlOGh1PKTrjNMJ0NWYLPlA/hF6QZ8X6bflU3f8kFJiOlk6R+gK9Nngh8VIsMDjsUxZF cKHz7on6Q7s9gYimxTVBfKVAIyotGPXzMRZVmxcv4Rb6wbiG/CmEV7wCW+06OvK9ix1A 574shIqkd+pEyvDNbYHokFQbpK8Mb/rWkZmwIzCACHx6nif5SnYKBV2m0YblBgc/1qwv PThQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SzmT04nj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p11-20020ad45f4b000000b004ad137e6124si652806qvg.481.2022.09.27.03.19.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Sep 2022 03:19:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SzmT04nj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1od7g4-0007xZ-Qv for patch@linaro.org; Tue, 27 Sep 2022 06:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1od7aC-0000xn-6H for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:56 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:53916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1od7a9-0002X9-EW for qemu-devel@nongnu.org; Tue, 27 Sep 2022 06:12:55 -0400 Received: by mail-wm1-x336.google.com with SMTP id e18so6199051wmq.3 for ; Tue, 27 Sep 2022 03:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=l/uG4uTbqpFsuZ8etvP0cLENEL6FoiOD5ehdUdm22Dk=; b=SzmT04njVq7na/dk2EWJyqyPPOZsiwAhLTcaf7lj94wYpC4/igomIrYEzwm2CwyxX4 RrVw44Be3+rqja/PyfjAIsn7gnlxyy+4EFJxHgwpjRz44aTSRc1wXA4TGSG9KKLKrOGD lcj+mdJlSt2FoC40aMjHKqj0RaDMnUOm3YCuYoEbYNcTGkiuV2cyUa47NSH+MUerYXUi uZVCOmyr0mMe9Sv1n5VgYDU+Dfr4OkY4crVDsGSBO6dXROuwe66KNQK+DE0Vw9Gjksfc pvTrsP/HUxT3J6awcwywpf6ChHRrkZenEa7WcT1ljxH2EvM3ea5PJ+iMLzihaJ0nbyz5 A6+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=l/uG4uTbqpFsuZ8etvP0cLENEL6FoiOD5ehdUdm22Dk=; b=Em4Pyff1JpPjqaVuLA/VvAY1dOXIROkfHqmqqH76OUDKsEKiKFgJbB2heeiYRNfRmX HpbUudimfxrA6cLg1J6BKOCOeFRw63yhX0GIC656PNTN8UcyAm0UaE5Ur00sDVxD9VZg DURKlIULAfz6sUis0JLP1vDKk54jS9XbgzdyU/T2IaBwAFfWxBcLIj2/H/0Oaednxp2C zSm4XocXgbHJNm1cFMW379n5XmygqSOQn+1sQrgZ5C09FCTJ7MnPaStBvaTrnqr2dYeE mh+BUjF/RC68CcrlYycuHTo2aqTUsKIs+zsXh1wAL9e+NNrkVKoVPtHNU4nanBERjod6 lZrA== X-Gm-Message-State: ACrzQf3Ed4ny6O3u+CoUGw1q2tbmMUWKbDUYV62f/qD/8xxtK8aeDH5L SAeFThqgGFZHetmGfOfOr4NnBQ== X-Received: by 2002:a05:600c:4fce:b0:3b4:935f:b952 with SMTP id o14-20020a05600c4fce00b003b4935fb952mr1975172wmq.197.1664273571857; Tue, 27 Sep 2022 03:12:51 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b00223b8168b15sm1398387wrk.66.2022.09.27.03.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 03:12:51 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, Jean-Philippe Brucker Subject: [PATCH v2 8/8] hw/arm/virt: Fix devicetree warnings about node names Date: Tue, 27 Sep 2022 11:03:49 +0100 Message-Id: <20220927100347.176606-9-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220927100347.176606-1-jean-philippe@linaro.org> References: <20220927100347.176606-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" The devicetree specification requires that nodes use a generic name where appropriate. Fix the corresponding dt-validate warnings: pl061@9030000: $nodename:0: 'pl061@9030000' does not match '^gpio@[0-9a-f]+$' From schema: linux/Documentation/devicetree/bindings/gpio/pl061-gpio.yaml pl031@9010000: $nodename:0: 'pl031@9010000' does not match '^rtc(@.*|-[0-9a-f])*$' From schema: linux/Documentation/devicetree/bindings/rtc/arm,pl031.yaml pl011@9000000: $nodename:0: 'pl011@9000000' does not match '^serial(@.*)?$' From schema: linux/Documentation/devicetree/bindings/serial/pl011.yaml intc@8000000: $nodename:0: 'intc@8000000' does not match '^interrupt-controller(@[0-9a-f,]+)*$' From schema: linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml intc@8000000: 'its@8080000' does not match any of the regexes: '^(msi-controller|gic-its|interrupt-controller)@[0-9a-f]+$', '^gic-its@', '^interrupt-controller@[0-9a-f]+$', 'pinctrl-[0-9]+' From schema: linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml smmuv3@9050000: $nodename:0: 'smmuv3@9050000' does not match '^iommu@[0-9a-f]*' From schema: linux/Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml Signed-off-by: Jean-Philippe Brucker --- hw/arm/virt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 5e16d54bbb..c1e384e06f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -481,7 +481,7 @@ static void fdt_add_its_gic_node(VirtMachineState *vms) MachineState *ms = MACHINE(vms); vms->msi_phandle = qemu_fdt_alloc_phandle(ms->fdt); - nodename = g_strdup_printf("/intc/its@%" PRIx64, + nodename = g_strdup_printf("/interrupt-controller/msi-controller@%" PRIx64, vms->memmap[VIRT_GIC_ITS].base); qemu_fdt_add_subnode(ms->fdt, nodename); qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", @@ -500,7 +500,7 @@ static void fdt_add_v2m_gic_node(VirtMachineState *vms) MachineState *ms = MACHINE(vms); char *nodename; - nodename = g_strdup_printf("/intc/v2m@%" PRIx64, + nodename = g_strdup_printf("/interrupt-controller/v2m@%" PRIx64, vms->memmap[VIRT_GIC_V2M].base); vms->msi_phandle = qemu_fdt_alloc_phandle(ms->fdt); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -522,7 +522,7 @@ static void fdt_add_gic_node(VirtMachineState *vms) vms->gic_phandle = qemu_fdt_alloc_phandle(ms->fdt); qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", vms->gic_phandle); - nodename = g_strdup_printf("/intc@%" PRIx64, + nodename = g_strdup_printf("/interrupt-controller@%" PRIx64, vms->memmap[VIRT_GIC_DIST].base); qemu_fdt_add_subnode(ms->fdt, nodename); qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3); @@ -857,7 +857,7 @@ static void create_uart(const VirtMachineState *vms, int uart, sysbus_mmio_get_region(s, 0)); sysbus_connect_irq(s, 0, qdev_get_gpio_in(vms->gic, irq)); - nodename = g_strdup_printf("/pl011@%" PRIx64, base); + nodename = g_strdup_printf("/serial@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); /* Note that we can't use setprop_string because of the embedded NUL */ qemu_fdt_setprop(ms->fdt, nodename, "compatible", @@ -897,7 +897,7 @@ static void create_rtc(const VirtMachineState *vms) sysbus_create_simple("pl031", base, qdev_get_gpio_in(vms->gic, irq)); - nodename = g_strdup_printf("/pl031@%" PRIx64, base); + nodename = g_strdup_printf("/rtc@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); qemu_fdt_setprop(ms->fdt, nodename, "compatible", compat, sizeof(compat)); qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", @@ -999,7 +999,7 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio, sysbus_connect_irq(s, 0, qdev_get_gpio_in(vms->gic, irq)); uint32_t phandle = qemu_fdt_alloc_phandle(ms->fdt); - nodename = g_strdup_printf("/pl061@%" PRIx64, base); + nodename = g_strdup_printf("/gpio@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base, 2, size); @@ -1348,7 +1348,7 @@ static void create_smmu(const VirtMachineState *vms, qdev_get_gpio_in(vms->gic, irq + i)); } - node = g_strdup_printf("/smmuv3@%" PRIx64, base); + node = g_strdup_printf("/iommu@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, node); qemu_fdt_setprop(ms->fdt, node, "compatible", compat, sizeof(compat)); qemu_fdt_setprop_sized_cells(ms->fdt, node, "reg", 2, base, 2, size); @@ -1653,7 +1653,7 @@ void virt_machine_done(Notifier *notifier, void *data) * while qemu takes charge of the qom stuff. */ if (info->dtb_filename == NULL) { - platform_bus_add_all_fdt_nodes(ms->fdt, "/intc", + platform_bus_add_all_fdt_nodes(ms->fdt, "/interrupt-controller", vms->memmap[VIRT_PLATFORM_BUS].base, vms->memmap[VIRT_PLATFORM_BUS].size, vms->irqmap[VIRT_PLATFORM_BUS]);