From patchwork Wed Aug 24 15:51:05 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: 599737 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3236147mae; Wed, 24 Aug 2022 08:56:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Mbd8Frq5tMixzlkMjGp4CAqa8/ap1swPapf+DYHiIrlLJyn7xfjUGVco9IJ9RabNJz3oU X-Received: by 2002:ac8:5796:0:b0:344:9321:5e2c with SMTP id v22-20020ac85796000000b0034493215e2cmr24063131qta.249.1661356585135; Wed, 24 Aug 2022 08:56:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356585; cv=none; d=google.com; s=arc-20160816; b=WiQf9iefuw4G4aBgnbNzllxnSGyOlb+/SSpRILFy1ePvjJgRgqcs/zIdOf0fG6CjT1 /+HunAmDzWfhEtLxov3UBE/KOGyMfktEbT3sQURXzPYU7BHLFKCo64OOdiwiQuD9ru/V nG2Qk4iMvTse5sU7Fq/RqjlkBYnj0ZrJAM58sLedW/zVcEmoz5rmfhaGFg9q6L8EVZRk DEhvWakEf2ir6zPImlsyG5QsNRcmDNg46veH6kToLZOy34OBlP1x5L4/B09omWnH/lCJ wKbrCtrv2N9aiAFY0wJbUYH5ZKEYLRY2YLX8ncLv4U2iJOYNLYuuUVraGt/moSBalwG/ Gt2w== 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=HR8iBeFG8r8rfNyNxc67KbDEH5iNA4eSJjr7tgdBtu4=; b=aP0mfGBeXI0ABTqG8mKSm5AMrQ2WhRiWPEkaRB6iulwtZ6nuEveffPvcrj6ipJB5Gy uKuMsJKuklo/tEeDmQqydoIG+pCdu4QxsUaoXYuVVJMlKWD0tC7nC5OsYdCCtI0H2jQ1 FwotyuD/OTcKJf/ME0BfARztfuiuSXPtNSvwmslxpwOCWIM1aJehKGF9dgf7b3BQXgSP AqFPf9ScDlkJSJWnD3ococM678bAGqcwffhSuX7IcnilSRhl57VSUwW0TSZYhvDwQ/23 NubexzraAcwzxn/uMPqo4oLtJLiU1mYXMUeaTywWrvP0ecBGjrOHKamsqPQR2wG+yTMf V8pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n2/D44lx"; 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 gc9-20020a056214230900b00496da1d2b10si5146891qvb.224.2022.08.24.08.56.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:56:25 -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="n2/D44lx"; 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]:51352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQsjw-0000M4-OL for patch@linaro.org; Wed, 24 Aug 2022 11:56:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf6-00027w-8K for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:24 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf2-0002ET-I7 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:23 -0400 Received: by mail-wr1-x431.google.com with SMTP id a4so21324222wrq.1 for ; Wed, 24 Aug 2022 08:51:19 -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; bh=HR8iBeFG8r8rfNyNxc67KbDEH5iNA4eSJjr7tgdBtu4=; b=n2/D44lxhsABR8dmGzAoQrmEfOPUeBujtraAHfAxcqIFbmCsmtlJA/YFyf3irH9gMf +/oRcppu4syzAt0aMSCiKnOYxXQEyIcdurx9mNz+7XNw1MStHX7FxkyJI5eXr6264NNQ LBCJ9j4igPDnorzzQTKda4+NRvowLb5eIo2SRRzsGXWXUe3Lypdq8ILt5M7h1YDU6fqy 1OS5aQZ8LHYCeB74PexkHGJRmvHNsM5SVapb2PzNeo8SOY3jL6MGCdoRLc158BotRuZ/ /EaufYNkruScy6Sm+S2bE6dn3ePsGOy8VGTaZIl1vmc370MPYkg9Lp0Y8jlbZC6Dn5En WgzQ== 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; bh=HR8iBeFG8r8rfNyNxc67KbDEH5iNA4eSJjr7tgdBtu4=; b=GzbxtMPj/7tdKFLSz4u0IRhNlacR0M3agM63gbyyHdDwXdsRIWU57tcxPscoxN5hhO OFDLSCffcANNHHcC7Rw2YVVqAaCdssotr52Ma4GULXTl80nHzlzdNQ7IU/nNRAKNBMZI DubV+WEr7Jm8m2Sni1c3f6HAENZ97niDdzYqFiNdkzzrGTzwxduPVp6Bd7Q71jlkqUsh cPJBEHAkKGEf72V1OSGXMBtXrXopg3BCfj8eb96zZ8uFQLrZkwHtiohXGZCTsZuhXDJH xKl6YS6td0Gxii/s03YIUejKzPSDuxQE/9flnsPHvgYTM53gMujbWdXnPcndr/x4w4TS IBIQ== X-Gm-Message-State: ACgBeo3m7HLvPB2yIAHGJ2w6mV8ketNFaYSOYZ3xqRsbZ6KyxYFT04vJ vOFjSY0qbAYWRZZ676jKpskd5A== X-Received: by 2002:a5d:6dad:0:b0:225:6dc8:e453 with SMTP id u13-20020a5d6dad000000b002256dc8e453mr3245325wrs.64.1661356278859; Wed, 24 Aug 2022 08:51:18 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:18 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 01/10] hw/arm/virt: Fix devicetree warning about the root node Date: Wed, 24 Aug 2022 16:51:05 +0100 Message-Id: <20220824155113.286730-2-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x431.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, T_SCC_BODY_TEXT_LINE=-0.01 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" dt-validate warns that the 'model' property is missing from the devicetree: /: 'model' is a required property From schema: dtschema/schemas/root-node.yaml Use the same name for model as for compatible. The devicetree 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 --- This could be an opportunity to improve the machine print by Linux, for example make it display "qemu,virt-7.2". I was concerned about breaking some automated testing that may use the stable virt-x.y machines, so I kept the same as compatible. --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9633f822f3..abcf2716bc 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 Wed Aug 24 15:51:06 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: 599732 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3234477mae; Wed, 24 Aug 2022 08:53:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR6V0742RuJWW12PvCU9gZ/JVuyFadlZ1muwFYw2BzdJeXc+524gZzYfR4GekFJibm5Cuv45 X-Received: by 2002:ac8:5ac3:0:b0:343:47b:107c with SMTP id d3-20020ac85ac3000000b00343047b107cmr24964302qtd.471.1661356390262; Wed, 24 Aug 2022 08:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356390; cv=none; d=google.com; s=arc-20160816; b=SZ81nm1g2GvydWx72lYplXUiFR6B9HbSBVo1v+eNsTneqm/GHvtGqaf2uv/nmk+2xj UoT6jBx036yBGIbTQgwvoJSjxOTfZf+2XEwxr0n7mEn3bMJyRm5r43N8wsalaxggvgsL b3UruGyiDQGIWYw+Yy4xDvMlFlNvGkDu3OBbuQcGuoNTVjPTrrEchLEhorXBWpCvjfGH N5gDbz/zLxqE66pbbj+KHDRC135xJX5WKd2lP17XpZ24copvRWMaCiyr9Vehr238vOyq NextuDM9eQdrRpm1zQMwCY3Xapp/DFaFBbUx1pggDEqCRCrTbVAiZZUDedxGxEZCKMNy JPxA== 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=/MVk+AlNPESRV7EYaPRLcDW6Y3EIh0quCranMNr0U+k=; b=rcuOZbcwbIH3XJUU1CmwxMO32mW/rrO6Vfn01ynVS9hkNXZtgI4qIXb+ryJxhQvS6y V9f0aY8FQwIzpllzD89TA1Hc0qcxXjD5vlLbxVOA086c9NXQ7lNa4ARbwXM5e6tB9sx8 /XI7lE5ZcpfGxBm+rT802WNyEbqGZrlBL4005y92n5IzghOn/ij6lzEzZlVrkHolMjtp mD+0r4qWSjWgRfG+Z27QnMkAOw7XGhHnM4Qoo7Br7MJpKHFL8kxNdFgFaJVqubTBWKNJ 7/hXN+vbXtHBictAWdZgrkoxY1iOPOGzGGjaNVQ9mHOn07vDYJ2oWmqw3RhdRYnxpJL0 eqEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SISAXUmD; 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 cb6-20020a05622a1f8600b00344e22b3ccbsi943600qtb.437.2022.08.24.08.53.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:53: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=SISAXUmD; 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]:52216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQsgn-00029U-Sb for patch@linaro.org; Wed, 24 Aug 2022 11:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf6-00027t-5O for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:24 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf3-0002Eh-Ot for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:23 -0400 Received: by mail-wr1-x42d.google.com with SMTP id bs25so21307978wrb.2 for ; Wed, 24 Aug 2022 08:51:20 -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; bh=/MVk+AlNPESRV7EYaPRLcDW6Y3EIh0quCranMNr0U+k=; b=SISAXUmDEEha4rf3ux+5+6Aj7LWGpWdc7eTG9yXHLEAycCrVN344SK4HXyw10Da1L+ nB+DurBeZF6AN900e3pW5Iu2XMkL4Yx8HZHyR5QICYpZYjTjeRMHH8xSX1pgGSv5Wq17 epTNxZgt+1pxLt/5//dlocfCJKPv6ELe4kKizibwVntaOuWGFdW8szx4uiHJpy50MULx FN6COSQOvEpH5ePzdAW92rUt+3zy458VX66T+y5qHZghrqGlI9xALHDK/yz4DOxRhoxt 8LN0oPNiiBMSganwFlZJDPyC/EHDFDydYINNh+erZuckjlhf2bk51yJRKXDd9tRS8tq/ uXIQ== 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; bh=/MVk+AlNPESRV7EYaPRLcDW6Y3EIh0quCranMNr0U+k=; b=kVbWZKErrLFGhx9Mdak8uPTvfX5bVWqc8eT6nuwDMAGZMJT939ui+PlykOZGH6Q0q9 utKvTmNUsoHK6c74a2cVE/ApjcIN/khD5gcgvJ6qzKgliwox9FsugQi9u0pwagBFROMZ 9yce4uSzcWto6r76LtZInD2qEG5x13tSCDMpLsQzpYrHQI9rVHRB/07A9otjMJoqzLjd VBECTeLAygG+wTJ38ZcDdcRI5aLDASQy3NGDw/BzgTyA9NLNvBTScPTDOZSoHlyxa2YN Df+SLUUXXa7mZB8cWE0/WHwvJhT/p7CEl5sHFgGi8DhVSBUGJyxnDTcpczNm3ng9MT0j XtlQ== X-Gm-Message-State: ACgBeo0ra7fnEWw1dAq/4zrCsF50fG1g5WupyPvAO0ziOVE+UrdL+SMZ P7wg1FnHyEsB63pDIdHcyGja8A== X-Received: by 2002:a5d:6f11:0:b0:225:735f:e9b0 with SMTP id ay17-20020a5d6f11000000b00225735fe9b0mr1609169wrb.709.1661356279563; Wed, 24 Aug 2022 08:51:19 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:19 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 02/10] hw/arm/boot: Fix devicetree warning about the PSCI node Date: Wed, 24 Aug 2022 16:51:06 +0100 Message-Id: <20220824155113.286730-3-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42d.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, T_SCC_BODY_TEXT_LINE=-0.01 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" dt-validate warns that an implementation compatible with arm,psci-1.0 shouldn't have arm,psci in their compatible string. psci: compatible: 'oneOf' conditional failed, one must be fixed: ['arm,psci-1.0', 'arm,psci-0.2', 'arm,psci'] is too long From schema: linux/Documentation/devicetree/bindings/arm/psci.yaml Signed-off-by: Jean-Philippe Brucker --- hw/arm/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index ada2717f76..527918227e 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -493,7 +493,7 @@ static void fdt_add_psci_node(void *fdt) const char comp[] = "arm,psci-0.2\0arm,psci"; qemu_fdt_setprop(fdt, "/psci", "compatible", comp, sizeof(comp)); } else { - const char comp[] = "arm,psci-1.0\0arm,psci-0.2\0arm,psci"; + const char comp[] = "arm,psci-1.0\0arm,psci-0.2"; qemu_fdt_setprop(fdt, "/psci", "compatible", comp, sizeof(comp)); } From patchwork Wed Aug 24 15:51:07 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: 599739 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3237087mae; Wed, 24 Aug 2022 08:58:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR6j3E7y5PSJTk+YOEYF8A1oqOZ4DHzVL61vq6+nTCllOMPvfNaLjJjeSH/VnCIN0F3oiLdY X-Received: by 2002:a05:620a:28d5:b0:6bb:a67b:5675 with SMTP id l21-20020a05620a28d500b006bba67b5675mr19837414qkp.741.1661356694991; Wed, 24 Aug 2022 08:58:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356694; cv=none; d=google.com; s=arc-20160816; b=A8p+Pd10yzfF5gdJcn7z0QIcVZ2rwzjQB4iNl3ylQNPNt5X/Z3BW3D6Vle3qDB8M84 es2E+AXAikFbaaKSiya+V4McwiPTquNTb3KtC9rRngBYFa1MFwQ7F/vaFofXmgvi2iey U47NdhS99+ec7WZpJ+As7XfRNU98wnpNM/tEC8lvpabM0XxNjGLOy1DEaqBrr2iX+5rp 5Y3M85QjmaT1M1t6tD7DxN7T+7tMCIIH5wpGOUGYby35CSvIMnIAoz6ENnIY80+d2UAv cwb4A1g6EWKJ9JVZ7B/6Nwx9GL1puSE9i8tVFiuHVSyOZoAWe0+6+Un4sFeNHp9S/mEF E5gg== 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=/BcQ7dSBdHiwkCbitP1xng11btp+1w28KnhMykfx8qg=; b=RYv29Bn5QxymBknrPY8IboY+0yMy8ecJtyULmzE7QB15FNUEW5GcuFd+mhZBGoMq8p ++bPMNw+JLulhqwJL2qHWJ4F9pBUfKuPE5KhcUCVrrbicODPWMMfWol2Sa4Hz6mx9kGE mI/7PU+LQuKBB3ksAo5xWgYMrr187IppDCaLMLHcLDVnWR9IboO1mfkTaaXuh+Gh7Njv M2Ggvj663QoHY7SwsiP5jMOSS4kvSMUQPQQtaoKf5FfdLo/ZbA2zZhrwO1+qxDyFxiSa d0j4T1acW8fbyLQM0fSTqnsARPcfB6wBwbPPusaz2CxXDRr213PX8VKs8fN6sV450GZx kG4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D5OzUPpE; 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 o6-20020a05620a2a0600b006b982260edfsi9607748qkp.624.2022.08.24.08.58.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:58:14 -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=D5OzUPpE; 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]:59462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQslg-0004XG-Te for patch@linaro.org; Wed, 24 Aug 2022 11:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf8-00029R-AE for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf3-0002Es-Ph for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:24 -0400 Received: by mail-wm1-x335.google.com with SMTP id c187-20020a1c35c4000000b003a30d88fe8eso1169870wma.2 for ; Wed, 24 Aug 2022 08:51:21 -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; bh=/BcQ7dSBdHiwkCbitP1xng11btp+1w28KnhMykfx8qg=; b=D5OzUPpE6+MWQr8XOufZwnuPbRmcnUTudV/M7oni2t1R4Kd60J5fxAyaZZMTJ1mDP5 55/V9NhLpID4vp/fPtuNd+W83eS1fklEorZ+NMzrCHv8OoMiD295nX6zOcteqtDbp9Fo P3MHeJwU6XVrGAhLUTwbPrvQlj3IKnwar9yQDnnqUnQtdatT9fRP4QFRaicTw6qoibMl iu/NRKP+UjWPWjczcBPSar64So4BpwihfQg3ZIstiETIDrX1VNJYdBZiS6X5d7I5vryT Lf3TGCIhaF6uemCjEl9eOV1s6cL1sq9MqJp4r2Qoq91CVC42+6SphzKkpDYlNypApgV7 6sTg== 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; bh=/BcQ7dSBdHiwkCbitP1xng11btp+1w28KnhMykfx8qg=; b=SR6tCfSlys3OZQ80IItvfJIQKTpTycxo+Gorz2b2pQ/yTYeFbn3018hLwm+taufANc ICGMvU0O7ygM2vRNLy1n28OUfRpttmK4lxfPTEyiNirNxGOPJP0hsXh574GBo9P30NzI hIIYRLRVVKF6G7bgjoMxx3CgcQBYAMZvtjKBrizxminKkDsImSvGtfJvFZbnfHJoEXZR SZTQi2ooWIzHULYLdAtH45ai4QhlFNHjqxgHiDCYyV3huGsLmU5cH9X3skjkLnsQZJvn xQx7cr/p3viL3IdXtkpGFpOrBu2AW+XVC9usZtJTX5dX6tJTihtwK9znn2Tog+UAH5Sl xPeg== X-Gm-Message-State: ACgBeo31/JAlYLUPHiL9Ii2TpGbthjG1mm/PnUct+5rfEPmzIuwLRl69 FiYi6VgWqdD4EEz6DXr1/91x7w== X-Received: by 2002:a05:600c:1551:b0:3a6:2f4d:aeca with SMTP id f17-20020a05600c155100b003a62f4daecamr5549190wmg.100.1661356280200; Wed, 24 Aug 2022 08:51:20 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:19 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 03/10] hw/arm/virt: Fix devicetree warnings about the GIC node Date: Wed, 24 Aug 2022 16:51:07 +0100 Message-Id: <20220824155113.286730-4-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x335.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, T_SCC_BODY_TEXT_LINE=-0.01 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" Fix three dt-validate warnings about the GIC node due to invalid names and missing property: intc@8000000: $nodename:0: 'intc@8000000' does not match '^interrupt-controller(@[0-9a-f,]+)*$' 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]+' 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 --- hw/arm/virt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index abcf2716bc..b6aa311d8c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -481,12 +481,13 @@ 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", "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); @@ -499,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); @@ -521,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); @@ -1651,7 +1652,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]); From patchwork Wed Aug 24 15:51:08 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: 599740 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3241868mae; Wed, 24 Aug 2022 09:04:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR4umocOT3oYWqM65j2i7ABnk8mUqgYrCBX1tRu9gNRypy+fzGV5D7OcVOywLZORvWpo5t+2 X-Received: by 2002:ac8:5986:0:b0:344:5dcb:3b6c with SMTP id e6-20020ac85986000000b003445dcb3b6cmr24357527qte.688.1661357050630; Wed, 24 Aug 2022 09:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661357050; cv=none; d=google.com; s=arc-20160816; b=drlqRyZT3LS8CpIH+Ivn4kO2Sb9qnJNX/hAcANjbQXph3NX5ncjuQLInOtUVSsU6Av 6utYb3d1+BVG2E4imu6qxJfMFa03MhtKaJC/Hz3To1JwvHafQcb602pFBQ8ReYlSODqC bPeMhQtdYxwrBR3ItiU6xKIQKNjtvgWU174TuwS9CQ1ex49+2gT8Ypa3z1YCcygLrWFK jjKiW92AFDGkoD55HAUKfWtC+/e5zdcnZnrfDMr70NKtWSZV2vZxo7wcYdSUPxqizWQl RxAVDWVqlRNbRYG99DA75c5TjxNBmRFmjGlfWniiC6Uc+T+BKyey+N0OX3DUe2XP92Fs OJKg== 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=t5fD4FpVwJ6lGJRoKb62Zn7TZwvFcPtyT/lOy3RUWs4=; b=rg/iLZDzBfu/v9F1msUSOBkHzIjtiTZ0BOd/XGZzfPMi2JwEEngsFvvddnp0L9arq5 od21xTxTBUZZhnVsWVDuyeawXukaxs//1DMQln/61PgdMP06peqbqF81iDd7WgkmDb4j WnyJ0psoMi6s8+FgijpbgS67Lh+fA5TXVs8qNsVvuwcQd8ZGWmL0B05XxggfsGgYKga6 wI4QGDnmM/UOhUzFd3Rqn7kV+a1/KdD8RbP4qHkYX9QSQPRC5OWzbSsO//PA35j5D2Sx hWsQj8BnOvVZ1Dl2mZnjxgC9gJ9iJdindwpb3Ymi2AZTD9PJVbpN65GEMkKTpVaL1poV e3KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="J/aHVmrx"; 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 q8-20020a056214194800b0047b2f67cd2esi8254398qvk.235.2022.08.24.09.04.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 09:04: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="J/aHVmrx"; 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]:34036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQsrS-0002Y4-5i for patch@linaro.org; Wed, 24 Aug 2022 12:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf8-00029O-AA for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf4-0002F3-58 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:24 -0400 Received: by mail-wr1-x434.google.com with SMTP id bs25so21308065wrb.2 for ; Wed, 24 Aug 2022 08:51:21 -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; bh=t5fD4FpVwJ6lGJRoKb62Zn7TZwvFcPtyT/lOy3RUWs4=; b=J/aHVmrxk8eAm69nBlOxz/V3aaQXBU8p9yI/cyXpdcHaeRWuaCbu+lYMj5ezY54qsY nDk67kRe5XTKMeIoT8gG6T6yclI/rCoWCGorrWixmCFWOYS1YHzkzGE01woFQv7xgGAA adlFxsKC/7u/2fqGLvw7hqH2ibh6PajKKixRtkGrJz56FvGlmHcYhf+UgzsSbzv3muBi npKLoJUXqgHiaKBcouxE2euCMYxafmR79CXX8cVN4ezKbaAOh3be7MywRhzKB7PG7o1H hXpfHy0xpMzcVhBl0XLTgfsvle898wPn7a/AoYJQ0yiFeo2jYqKssJHipN3ZeIqH19eK iU/A== 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; bh=t5fD4FpVwJ6lGJRoKb62Zn7TZwvFcPtyT/lOy3RUWs4=; b=m5j4SDwJWrKWVhME6JR0fes5DDM7xm15r+4AWmJ/uJslYfh5zsG+L5qPZWGBPZLuU8 ybdZ5325UX5tKWGXnuUlq5fXZeRgTSl+XZenXLEVOB21zok26RGBiWkx+a1q8rQFmuqr 76foN6udCD2mCTgoybqZYf9wF7BZRO7jFeB2yU+hyJkAfRECBXX1Pe7keDpff0JJidok 48KyLIYhd1vU2tc/Qcv62OhAAkyWsRiMamwewUUDn04Ha2LfpKwMaN2KSAek7JrGqEse ZFRDjtT/WjXXhbUFg7Ozw3acWeH7fzYmu7xMDglxciIjaV0rfp2iAaKBI2Ahd+3XjKfU 7JzQ== X-Gm-Message-State: ACgBeo00buPEC8tH4bmMvMbqa81gkRjRyPlJMDmnt9lNkLGpCaDPMbri 7UvNHkBu84eABDzJjj8+N63NCA== X-Received: by 2002:a5d:4882:0:b0:225:3148:9f85 with SMTP id g2-20020a5d4882000000b0022531489f85mr15612999wrq.224.1661356280850; Wed, 24 Aug 2022 08:51:20 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:20 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 04/10] hw/arm/virt: Use "msi-map" devicetree property for PCI Date: Wed, 24 Aug 2022 16:51:08 +0100 Message-Id: <20220824155113.286730-5-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x434.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, T_SCC_BODY_TEXT_LINE=-0.01 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 "msi-parent" property can be used on the PCI node when MSIs do not contain sideband data (a device ID) [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 --- 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 b6aa311d8c..ca5d213895 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 Wed Aug 24 15:51:09 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: 599741 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3246209mae; Wed, 24 Aug 2022 09:09:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Paz4IZCY+W2GId9yfnjm0vnP8qR0us68sm3dei4wJ2XCWFHnyt/MND5gjLIdLYl1qtgDu X-Received: by 2002:a05:620a:842:b0:6bb:b876:35d0 with SMTP id u2-20020a05620a084200b006bbb87635d0mr19725315qku.163.1661357393967; Wed, 24 Aug 2022 09:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661357393; cv=none; d=google.com; s=arc-20160816; b=AmOgBZDqfBz9f4WtkGxFZtNG2dIgvd+rAyCnUJYOP7OzVQWQ8c+iZf6f6I9idpAPwW OHfV9FHP1vJEmDlLNCYIHAu6v6RUUQoRv0flX48IrU7Td6aRKngLjqjImO36DkX7IAeQ 4bu0Y/QQI4xwtutwTsacvGr8WjySWDgEjfuUIcFzsj+odOjyJSUV7BP36A+i08lzTAxm fekIqZ2sutVbg5mlC7udlRKWvX308PCp4D0lrBNeNAkNdbYZz3eidf/TeHDwG9TncFfJ gUvMTG/7onR9fttTRD+oR1/xfJ9Ed7mhYLFtBF4tRrtc4yi0om/z207x7t7Q184OFXf2 ovug== 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=Wxzqdi+mz10a5dL9bQmvPnzJspb9HKfQG9mi/kFyPd0=; b=TjUknGQP12k/hORFvhQmcJe16t25t/Wa95WvHl8OIdNLm/V6QaYez0AlXWyhBAEsSf UCtytuw1KKLcLcRX7irRuMhE6hTSs871Oa0lMolDlpDwIFm70tIxO6Hys64s7rkwEBnP qtgh5fansHEmFzsfsHpFa6Nk6ipTt0lsIrZqXYjLa/Z3USkTfaAZbpjkeXqwD2Iwuwg4 ymzynJ7elcJV7JYxMoyi9+FVaSRdCDMxf849o83CxMloo5tVIi3K5q8VJEhoVoKmTcxw 7JBNFWM4Bt6yIa8g1f5UOoDet8KCvTKnfyL8AmX2mHPy5cuI0OhpL9kN7owCTok/yArW blcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oNfi3TFF; 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 v10-20020ac8728a000000b0031bf483b05bsi7425114qto.478.2022.08.24.09.09.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 09:09:53 -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=oNfi3TFF; 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]:41594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQswz-0008Sc-If for patch@linaro.org; Wed, 24 Aug 2022 12:09:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf8-00029Q-Ap for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:42598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf5-0002FP-RI for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:25 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l33-20020a05600c1d2100b003a645240a95so1092664wms.1 for ; Wed, 24 Aug 2022 08:51:22 -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; bh=Wxzqdi+mz10a5dL9bQmvPnzJspb9HKfQG9mi/kFyPd0=; b=oNfi3TFFRFzGLF0iMJJtspA0T8SSoBaGniumg6fYQcC5nU/NPFOY7ijCUNhsnADBuZ Fb62+FD/VrErLPfrU0/+Kl0v0BId2jvvFcud74GvRkCZ7UoudTCw/HXGPDUjACG03mP/ 2Vny4Rjfszh+P0OhWZoirjEFeyAbSH5nnKUV2oobiO6zZHKNNmoAwSycbeij70tp3Shl Ukb29zbWZG3gwK5qRdDDkQbID5kINZT20yVX+jG1TyfOxwEjst1YMpS2wyF13wAzgI3d pOvIjTDJ1TzoveGs13cZRNSzzW1rIfrdGmFsLA/FOUoeN+FrezqcgN4mCd6vShG/Zw5s o3CA== 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; bh=Wxzqdi+mz10a5dL9bQmvPnzJspb9HKfQG9mi/kFyPd0=; b=Qr/BskwEJJmXoPTgDun5nqTcRF2DvMJmU5yY8B9VqlZM41P/gMKNi+xhDZAynpXYhx +HsTNdnLjo8PqB8O4QP7S/W6cbGG660FNBM/2ThtASR3sCEWp14rOCd03CbgMTTjFMXR grzg5/aU3DPRF/nzFyyFjWi5CE1YX+U4t9fpQo/cQ0o3hKyUxYNbbfuEMEK9twph2/wc RGiGPIN7ZU//+o3YaRQr4Ioz2ZP6fIKfNPLhnDvWqgSQUG9BFsgPxqwz1SLwgwC2NzEd XQn41WvpF32CtbVc2M0f9yxQBi1E6Hd0CimcX3OpL/TbGLnThnk9QTZUOsmK5TUeuKW5 ALkQ== X-Gm-Message-State: ACgBeo0uwAS5BkHH7Gp6TDaEeRifvrO/JuGFEiWYa44mi2SBhHhrgkRo F5/MlgGxMCWXSWdf5YXlU0iDRw== X-Received: by 2002:a05:600c:5010:b0:3a6:804:5b08 with SMTP id n16-20020a05600c501000b003a608045b08mr5581717wmr.10.1661356281578; Wed, 24 Aug 2022 08:51:21 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:21 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 05/10] hw/arm/virt: Fix devicetree warning about the timer node Date: Wed, 24 Aug 2022 16:51:09 +0100 Message-Id: <20220824155113.286730-6-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 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 compatible property of the Arm timer should contain either "arm,armv7-timer" or "arm,armv8-timer", not both. timer: compatible: 'oneOf' conditional failed, one must be fixed: ['arm,armv8-timer', 'arm,armv7-timer'] is too long From schema: linux/Documentation/devicetree/bindings/timer/arm,arch_timer.yaml Signed-off-by: Jean-Philippe Brucker --- 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 ca5d213895..5935f32a44 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -344,7 +344,7 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms) armcpu = ARM_CPU(qemu_get_cpu(0)); if (arm_feature(&armcpu->env, ARM_FEATURE_V8)) { - const char compat[] = "arm,armv8-timer\0arm,armv7-timer"; + const char compat[] = "arm,armv8-timer"; qemu_fdt_setprop(ms->fdt, "/timer", "compatible", compat, sizeof(compat)); } else { From patchwork Wed Aug 24 15:51:10 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: 599735 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3234691mae; Wed, 24 Aug 2022 08:53:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR6POmXCqyn0SzOULX7kqRicQRLjguRf2X9rRNrit0jh+L/UM3kbmWEBjR28vQVR8st20kOJ X-Received: by 2002:a05:6214:501b:b0:496:c82e:900e with SMTP id jo27-20020a056214501b00b00496c82e900emr20815003qvb.16.1661356418264; Wed, 24 Aug 2022 08:53:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356418; cv=none; d=google.com; s=arc-20160816; b=yBtc/yayXQWt+jH0hQN1ohL1tQNa+z/VL1ho8Ao4LvB/KdZIh7wUblcCJojfN3vU+i udmf6Ge4bu2SO1cCC/XHv+iC3uVVFj7b3KzD/vtA+GY6rUOw2vQ1dTiR6LZ6zzjmEEou Nh6fJVI7SQynPWURESPBE7hD0W3s3Gm6cbpOlWFKVgtPG+anssd8k0XGRt8LQ6JHxobi xF2yChwT1ic27sznBsB/lieR23RiOgD5qnRYJZa8aPh/MkovnYh890KaAkTHHZnhj6QA E4e7IpwC/ja1gOUf5XLOW+gEmVSHwf6qXq2HQHmv9jEwZSfb+iCXdyVyMp+fuXyi8Y1U zrwQ== 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=eSq6FUdISef71pKleYGNA95iIGprMsybKKFsYohX1lI=; b=U9eep5j3QVNDR57SydSoolRIjOLGhubE7bbDoVCc9STT7xTbSvfIZXG6v8Ro7eH6it 81zAMbF9thHmEg7cs/Ult8b5k5J9Ia1+zdZgjYYg7G/ArWty9iyh+SLMXzlMOL3kU/60 KMiryXt57nLeo/Quhk6brYsnGzK3Tpm4HjTMm9SA5vM1ejVRkH7xHsFPqzqMidXYBXyV b50vmKClZXbWabdDL10AC5+lVLBpsKdffUs0xemajWcsBnXuHkZMjQgV+r/ceh8gsw/I CuJxa6X1yMnIiepnXAX9JTmLNBQcVi8dEMbjI/BzHiHkvCcl3eQU3jAf3N8mJi+p3mO5 criA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lmqkf0rn; 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 cb18-20020a05622a1f9200b00342fc73889dsi8316459qtb.285.2022.08.24.08.53.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:53:38 -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=lmqkf0rn; 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]:38484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQshF-0003qx-SQ for patch@linaro.org; Wed, 24 Aug 2022 11:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf8-00029P-8w for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:36786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf5-0002FY-Rt for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:25 -0400 Received: by mail-wr1-x433.google.com with SMTP id d16so16004925wrr.3 for ; Wed, 24 Aug 2022 08:51:23 -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; bh=eSq6FUdISef71pKleYGNA95iIGprMsybKKFsYohX1lI=; b=lmqkf0rn4nHErTSCI4YuPBvNdMr6YKs91zgxvTt5gnhpL2kwhvVy0W4oKaYv55QTfR dnik3gcHMEdcR3gPAeSfoz9migNIJvhqebSTXeV5NqTPZTZ+LRnm/IKT3B8u2Bu7t0FB 0P/MHNsickJx1IrTsAInqRlZC8QB+MGc+hJten6A3Wd9qyM1QeZnLJrssEojJsYsmOEv IvUpT2CvOHy8QpifpFb7UgNBMCur8lsBJxwMC6HeUv/SZUoCI+N+V/L2kAOBmVm3oodX Eh/IY7kC1wbj+GYXlCCqRJHYKessRci0Vk0e8+1WvwGkZsEFB41+ukMT6Fy6SDzzlnhF NY6w== 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; bh=eSq6FUdISef71pKleYGNA95iIGprMsybKKFsYohX1lI=; b=IJmHZbW6mRqR/RVS44+Ks0HSwxbdP1YIbEAe0FReam6R8GF43meHlQmF1D7e/eGwH3 8s2dG41Cd1mWlPrYnb9zFt87FrNtURL2DO+BYoEt4sKa1NRqFTTGeiBQ1zKp9MiCE4W4 9TbCZMHq7rX4+CnCiASEQyVOytjPCYDNMUGm5qZJqCHGl+Qe+x3OWrIQT4UH//lqcqW7 St3nY2sjl4UT/uJ3+Bg1yLBa1pnyASNo+Eom/mUB/rqwhIHGoaHVBsr47lmfOjOLKznd ookAAmcfRNKnbhiM3hNUB6tqv/a0YVEZfhhS6EiB3pWSow4yzWcYBE/DOy10HtkN1R/e n3ig== X-Gm-Message-State: ACgBeo12zGUmgDYarrGlbAIir2ZxuhsYLNwqsfl7+qRyhUESnNBtwwhx lEqHHDaIfNpqAncqp+ukESGhGg== X-Received: by 2002:a5d:59a8:0:b0:225:61a0:e603 with SMTP id p8-20020a5d59a8000000b0022561a0e603mr6810303wrr.469.1661356282308; Wed, 24 Aug 2022 08:51:22 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:22 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 06/10] hw/arm/virt: Fix devicetree warning about the gpio-key node Date: Wed, 24 Aug 2022 16:51:10 +0100 Message-Id: <20220824155113.286730-7-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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 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 --- 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 5935f32a44..3d460f3686 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 Wed Aug 24 15:51:11 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: 599736 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3235866mae; Wed, 24 Aug 2022 08:55:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR6MEI1jFKe65BXzYAXkMHouX+RxdEzrTjq+e0/bkzwqLonepCY06VKvApdRhjJcQ6dwljZj X-Received: by 2002:a37:c96:0:b0:6bc:15eb:351a with SMTP id 144-20020a370c96000000b006bc15eb351amr10651120qkm.473.1661356555149; Wed, 24 Aug 2022 08:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356555; cv=none; d=google.com; s=arc-20160816; b=ynPHZOnFfBq9qUR5CqUA4KdtUXDqCb84gchRDbTrAhWFxBNw/B/M7vDRFOiHKkgKgR f/v1BVajNzFsFoLu6KcDK9NddynS7klXrmfeTBVJfRROaIhYz1ri6iDXA4sHbqbCDPOe giNAcNsbFLiTh3nzIHBOe09LQNkJ9vlQ6yGAEUaYxmkyYP+cLThvIaKbZQkvlLbe0OVE 23/CatZOC1Ugc92Xy2bfz0o3GGhS3HF75TTwN48xP9mEmosWLoAw8JZ/F9IJNlPPZ9k0 F/zfUsdcFwMDpx8IJ/UuE5DtCe0lP9s8dqCumAOZK8aiiWI2YR5iuvKxEFuJUUTZRaYb MdpA== 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=JPnL1u8Q7Rp6zS6QxX1+K19gfMEh8ge2+QRHygxZ1TY=; b=MGzz0/XWg5o8eH1cNZLy6O65rcfDj/oWWfKksr7SIXM4E9BRK/XRbYTpfPCR5zTaQK 7viEwjjSkxlqv0AnamD81IcT/tzay5KL/RjfmwT8B+ZmwjrvE8D0p7jr1loi/xFCNbr4 x8Km767Rs6qJY8kcgBZ0rkFeJUGNQQLRN14wnC8h8A6qh5ep2+zMsDg2RNbm8uTgyjmM B457HfklcoQKKfT2ddgUbTsYrV+EQePcAccCaGQ+YkZ5PgWebNvXsylg22iovbLnywRn QTDPNUBkxNGGE4OgyjL0klT0gikhVdCXj+x3IBEI50ofu0cIeGruzmJCUjqfsx+3eyw0 3HpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Gungl2OH; 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 l29-20020a37f91d000000b006bb66b325bdsi7973454qkj.597.2022.08.24.08.55.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:55:55 -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=Gungl2OH; 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]:41498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQsjS-00080g-7I for patch@linaro.org; Wed, 24 Aug 2022 11:55:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsf8-00029S-B4 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf5-0002EO-RQ for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:25 -0400 Received: by mail-wm1-x333.google.com with SMTP id c187-20020a1c35c4000000b003a30d88fe8eso1169969wma.2 for ; Wed, 24 Aug 2022 08:51:23 -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; bh=JPnL1u8Q7Rp6zS6QxX1+K19gfMEh8ge2+QRHygxZ1TY=; b=Gungl2OHa1IbzzrlRsdSVhv1zdYnP+aY9VeRN3RcEf6TgFar5IVM310JwB18UhjKOn uEza8rTQv1f/eH6t9be+26vFVEogEShWlh1AykvYjwHwQ1yXB+7zm6QF1Nr1w9ptO+QU 0W3k/91YomvNSZAmCgwH/XEKiLpKad/OClTQAugkKC1Nu6IusG7Atqmr0BDNnXiDaIdf eHeVj2lCyM51zU+fUiQWOMsrBiHNJMDptb1eZuAo4AuHdkRjmGcZZ/tngPewrf6eaBE9 Rb7CRi/OnkF70G4IPOngLtVrD+Gb+sQxNRrrS76Ojdf0nU+Tkh4cAuQs3DQKmd9XJCxO MDHg== 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; bh=JPnL1u8Q7Rp6zS6QxX1+K19gfMEh8ge2+QRHygxZ1TY=; b=3nMIiGUcZ6A6H/2qwljLjPWprx2PCmWGsjypSfyXRcrRmdKbYnDzEkP5uWQIilmsTv Kvvr+CagOOyHgFQfY2Wil892WAzKtMcb2DD8Ura4z1DiMkjZskdSsXLyVjSfg88vYE4R NMMboDW7sLlgq/0fo3ottGIPijHK7y/MV5BGZ+3GmFHOsU1CDE4Nybndpaa48tJ3yYrr P4ziFYOJagijB2lm5XGM8RHLokxBEjTozQNe2QXRsCiisfyr0zENpEB4gld/kq2KUzui ax85sSP3PH1N5yd0iHvOR8+dM2lBsFqq5e2KBMu2SUl/1OrKurQSuNV1YniHb9RrMcBy ExxA== X-Gm-Message-State: ACgBeo2fxdMXurTZZ0TTUNV77Unuuk+Ssw5pcJqdWpPxQPSyCOoRoKXL H9U95szZU0tEtsrYGYlshUlmSw== X-Received: by 2002:a05:600c:3d91:b0:3a5:4132:b6a0 with SMTP id bi17-20020a05600c3d9100b003a54132b6a0mr5377180wmb.126.1661356282982; Wed, 24 Aug 2022 08:51:22 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:22 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 07/10] hw/arm/virt: Fix devicetree warnings about node names Date: Wed, 24 Aug 2022 16:51:11 +0100 Message-Id: <20220824155113.286730-8-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x333.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, T_SCC_BODY_TEXT_LINE=-0.01 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" dt-validate reports that several nodes have non-compliant names: 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 Signed-off-by: Jean-Philippe Brucker --- hw/arm/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3d460f3686..952af37935 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -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); From patchwork Wed Aug 24 15:51:12 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: 599734 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3234645mae; Wed, 24 Aug 2022 08:53:35 -0700 (PDT) X-Google-Smtp-Source: AA6agR4XFph0R5gbnoRaO7hHYiBgfHkMHMxFROMStOL4IVslpeYrtcLx9GnRmo74seTuTcUGciND X-Received: by 2002:a0c:b39d:0:b0:473:9292:d4ec with SMTP id t29-20020a0cb39d000000b004739292d4ecmr24788997qve.66.1661356415078; Wed, 24 Aug 2022 08:53:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356415; cv=none; d=google.com; s=arc-20160816; b=oWptEhaogUJiFq0PjsGhDms/rpwgQqri0C6jvW2ad/FF015El0dVEOpOLooAVSpZKZ wHr1k6VLjnTIOQ8/RjkXdHfFy1HdRy/Mjpcqv6mcxjkaLOwGu4h1YQjf8q6Ynfjm5Djo 89K6WgvsveOD/uwwZYDxK1g5wT8IbfzlRfMHcQjFvgVirVjVE4Izw9vjqrOknAPIucff 4bp77n66Ltsy0A8nZth6McoqGfxXseA0ugtM0VJRm+uE/6xAa4ZFyEPDUTf8EPKhn6em bKw7oWn4dQ6bBQDSgFM+lzQ6ZyZpKflnFLatdvzfLZeqiNd9/KXsr8WZ8sp8TV2cU+y5 TerQ== 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=Ohy3bUJKZGFkjSeZY9AWoC2jPWdXu0ag6d5K6Qn5vz0=; b=JWLhI0Jm+VR/QQBuJx4rCWQnDQUscyhTYRVODTeDuUhguYVeTv3rCYBSAD62vwNxP0 HvNPS4/qAV5S0QhJ97ca450DDfQLY9rigFjlmDefNJc5R4I3Jys5PobZ9FKcdi+rx4eu 2CX+PHtBka9gNdy/s8JDx05gV2DV5nExH3+i2iWovP4VwUMolWKTNCJvfeYUaBTqRfC5 5Hks2t48CR36F0EAu3AFdQTZGgdJeR0ZO23Fl0FOi3pqUIPio5mnebXmzES0nF4/4E4D A0dO91bxaviywyKApV7VvmTwEJ5ux2FxTBcaojVUIZFqsid09RwetvGX+dQbKcv2N5ND FFfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JM5uTKHz; 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 jk11-20020ad45d4b000000b00476716d296dsi4167048qvb.151.2022.08.24.08.53.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:53:35 -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=JM5uTKHz; 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]:38482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQshC-0003q3-N1 for patch@linaro.org; Wed, 24 Aug 2022 11:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsfN-0002KT-TV for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:41 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:41544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf7-0002GH-Ry for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:28 -0400 Received: by mail-wr1-x42b.google.com with SMTP id h24so21287895wrb.8 for ; Wed, 24 Aug 2022 08:51:24 -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; bh=Ohy3bUJKZGFkjSeZY9AWoC2jPWdXu0ag6d5K6Qn5vz0=; b=JM5uTKHzHWO6C4wlZpHJYwKCnAzZHA3+IZVXBchD6yHxEi/Gq+9DTpUnwXxSwLPg8D mVWRfk3TaBDAO2vCfFfQLJR5hW+ybGgxBmDjvnyRsyXeIVqCtNYyOcm35ZKfpur0peJY yFg45aMADf2A5u+mMSS9Duli9lrutVvfnTji6dGr8gEL1gQmfbMbiU30ZjLQLPqCi7wp rzvMl6DW33Q6cLdR+jvHN6Nkoyv3z24u6Ys+PqNKi18WYEV8zjn9DQNqT36ZfJW5cipo +KZ0qmH7VXE2d47pH4q+KuzC0bX+ENQWGWdWh1YARLBrKErO6VHGApudIzodIVCPQaeL u9bQ== 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; bh=Ohy3bUJKZGFkjSeZY9AWoC2jPWdXu0ag6d5K6Qn5vz0=; b=qw1kkXbZJT7QpIzXi5kVxEs1ihH1y3jDyQw1WCzbvTD0rdMqwb3Mq/QNjuXU8HGkDV STExstnVs1DrXAm9mjwbbNCIWsMf2kjOdd0s1Ug4JHS5di+6JzuKufVH9T/4cwnBRUk3 b6Fof0PZ5Mfpn7DFSVUERfcc65xG+lEthUmRYbKqomkQzC1WYdd/hieMf+Mo2PDypOuL 5qDNtkczYj3q9hBXaMouOZ9ogMN4vIlPXPv5pb5rZTn7M5joM8i2VWHMsn/FrFMZY3B3 h26slgQCPK9KiCqMP8xkPT7H5VWMAuEXs0BbL5vnYMMJbdphmNieC/S3UD2uaBLJDakL cVZQ== X-Gm-Message-State: ACgBeo3eDpKsk3YzOW/sDFlJa1fS1gHPqhWFIaiHnw+NGmhpUD3l4y/H vPriUlax85zE8fr0j6X75xQWxQ== X-Received: by 2002:adf:fc8b:0:b0:225:5a71:be1a with SMTP id g11-20020adffc8b000000b002255a71be1amr8173178wrr.651.1661356283710; Wed, 24 Aug 2022 08:51:23 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:23 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 08/10] hw/arm/virt: Fix devicetree warnings about the GPIO node Date: Wed, 24 Aug 2022 16:51:12 +0100 Message-Id: <20220824155113.286730-9-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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 GPIO devicetree node is missing "interrupt-controller" and "#interrupt-cells" properties: 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 952af37935..779eb5ea31 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 Wed Aug 24 15:51:13 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: 599742 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3248594mae; Wed, 24 Aug 2022 09:13:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Z/6B6tDywjluXSz5nxjGg3SRfGxT5bPIJGArtWC/G5zzC1Zlf/UfvA4lG1pDlXYkJs6ft X-Received: by 2002:ae9:e312:0:b0:6bb:b0c9:a41d with SMTP id v18-20020ae9e312000000b006bbb0c9a41dmr20720015qkf.436.1661357612107; Wed, 24 Aug 2022 09:13:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661357612; cv=none; d=google.com; s=arc-20160816; b=ca0klm8wIpJRYouuDeqmVPGAgvd1qvTeNDvRq7QA4zkOeGO9SvDUjEmLMxec/MbezA 0XyWEgkyg6H5BBdLcOzRRU4JyMuun1Iex0KfpO9Y5GzYaVtYi5E98AWMNywYjbFgMJNN b+G7qXf9RwJVgifOzHteZ4RtouNz9eCd1OuIWfCfQxcYom62lqVRnC9RAZTPk5hEagZR glSEwUK31Waswxz4PZ58lIE0ejnm+NbZSQUH2teLsoOSU3fgoVGcHuQU2NEMGXtbikgA go8F1Uo0jp7Pnm5T1OvTP3k4EXialA7ijDmU555YqE8REyssL2dAohFSKNYnPjYvMR/j otOQ== 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=/y1zm97n6IGKhSBa6qGqkTluIHtkqiOpSJE6ybC/cmQ=; b=uodD6Dycj076U9u5R/Xk0/VriktmcHei4ZN2REZQJo7Sc/MMMe24rR2ofkTSQXSfiX C8UjzbwgGl+ivBSKEaeyj2tWyd84C2IhPKzAfzySqlDUqtMjlyMyI2zZOLXgenQ9nXiC fm6z4nuSXFBT+j3Cs0dMgGx+WjQAklimu5o/pp8BjACFuhuQyjosxzHzP3iPaAwxGz1R 5/wOrl2yi+WPuu3KEFErp7H4lSnJlJ9EEsFA/ErWw12+43Ap4P46l390Xraw2nq0b613 uloWrJffwhhIDknF2PaDrHi4vUKvfd916udlmHGjNd6MtqlwO7by/CFT6DSiEQ/qpm/B Yipw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XwlW40h1; 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 s22-20020a05620a0bd600b006b97a3ec632si8819649qki.95.2022.08.24.09.13.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 09:13:32 -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=XwlW40h1; 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]:41182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQt0V-00052G-Lt for patch@linaro.org; Wed, 24 Aug 2022 12:13:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsfA-0002BD-1B for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:28 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:38679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf7-0002Eg-5s for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:27 -0400 Received: by mail-wr1-x42f.google.com with SMTP id b5so17006950wrr.5 for ; Wed, 24 Aug 2022 08:51:24 -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; bh=/y1zm97n6IGKhSBa6qGqkTluIHtkqiOpSJE6ybC/cmQ=; b=XwlW40h1EREpZkq6bDzc17N3GOMsYtv0OAPbS70wPH/7excd57FtyJRddtkf1pDhu8 phIoFoGUmX75T8ofO/nMriJKx8K1YgW0F70ec5EM1ixE5PoC7+r03CkEv6AMFSQ0pq+N bOZQAatftnREL+sp6QjSfb51wbYJa2kCPb4qI1JTGF/58357c/JFAWFNGSLOGGRu+1Af q9VCzXLigWE6aqNp0sP23osm4Po9n9rtqC3szzkkuQgJ6A/Tb873QaPDDDSwTSDgiYvM VfPippxj9mE1sQ5FKI3wRST2nejAh054NJDoS1oy/qVdz0pfVu0DDp4CvruJw4NvRN2n BwGw== 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; bh=/y1zm97n6IGKhSBa6qGqkTluIHtkqiOpSJE6ybC/cmQ=; b=SgMmj8nsG6SX82cgnVbeoVEUgrIgtjNYV+1qhP4PV0c6GkrZUXI16JTdfJx0jJu26i HaO6nA4NTzRgAXzs+0nDEJW0vkDS/HnHt7zoh6X+1uouhgwA8LcSGLKPGtzuGYbr24oL m3WKLq/zOrrke6U8DsDjRqSS9+FVKDTyan1yIDH1c4mAO8D3Sxccl9SNZGsVQzVi75fD sMLeMK/GHcQjZvv3JdnJDFx8b6a7ffg+SHuJiGoptlG77ZzO9HwWyvhEGwFrpvEiEKSr QuG60mIwuN5u10fHkR7sQOz1YC5I9CmQH+yRGPQBYWvFZfuUUryX9qShys7GopiJlpnZ B17w== X-Gm-Message-State: ACgBeo3LRd6M0RtA9sqMRx7dZ12GQm73QMBtbTxDXY7CEOOMzVQi/DwI PKTSigrpMIWVDphYvepCUDGXRBMOvu551QrX X-Received: by 2002:a05:6000:1812:b0:225:7383:d739 with SMTP id m18-20020a056000181200b002257383d739mr1654652wrh.333.1661356284426; Wed, 24 Aug 2022 08:51:24 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:24 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 09/10] hw/arm/virt: Fix devicetree warnings about the SMMU node Date: Wed, 24 Aug 2022 16:51:13 +0100 Message-Id: <20220824155113.286730-10-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-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, T_SCC_BODY_TEXT_LINE=-0.01 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" dt-validate reports three issues in the SMMU device-tree node: smmuv3@9050000: $nodename:0: 'smmuv3@9050000' does not match '^iommu@[0-9a-f]*' smmuv3@9050000: interrupt-names: 'oneOf' conditional failed, one must be fixed: ['eventq', 'priq', 'cmdq-sync', 'gerror'] is too long 'combined' was expected 'gerror' was expected 'gerror' is not one of ['cmdq-sync', 'priq'] 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 Fix them by: * changing the node name * reordering the IRQs * removing the clock properties which are not expected for the SMMU node 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 779eb5ea31..de508d5329 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1329,7 +1329,9 @@ static void create_smmu(const VirtMachineState *vms, int i; hwaddr base = vms->memmap[VIRT_SMMU].base; hwaddr size = vms->memmap[VIRT_SMMU].size; - const char irq_names[] = "eventq\0priq\0cmdq-sync\0gerror"; + uint32_t irq_type = GIC_FDT_IRQ_TYPE_SPI; + uint32_t irq_trigger = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI; + const char irq_names[] = "eventq\0gerror\0priq\0cmdq-sync"; DeviceState *dev; MachineState *ms = MACHINE(vms); @@ -1348,22 +1350,20 @@ 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); qemu_fdt_setprop_cells(ms->fdt, node, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, irq , GIC_FDT_IRQ_FLAGS_EDGE_LO_HI, - GIC_FDT_IRQ_TYPE_SPI, irq + 1, GIC_FDT_IRQ_FLAGS_EDGE_LO_HI, - GIC_FDT_IRQ_TYPE_SPI, irq + 2, GIC_FDT_IRQ_FLAGS_EDGE_LO_HI, - GIC_FDT_IRQ_TYPE_SPI, irq + 3, GIC_FDT_IRQ_FLAGS_EDGE_LO_HI); + irq_type, irq + SMMU_IRQ_EVTQ, irq_trigger, + irq_type, irq + SMMU_IRQ_GERROR, irq_trigger, + irq_type, irq + SMMU_IRQ_PRIQ, irq_trigger, + irq_type, irq + SMMU_IRQ_CMD_SYNC, irq_trigger); 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 Wed Aug 24 15:51:14 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: 599738 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3236409mae; Wed, 24 Aug 2022 08:56:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR4zlEEDHPo96S4VVVye8owOU3ltYcE179zLC9RbDjbVUudxjpMq8hliBwSpF9TseAZR9qp4 X-Received: by 2002:a05:622a:174f:b0:344:5e57:9686 with SMTP id l15-20020a05622a174f00b003445e579686mr24645644qtk.548.1661356614629; Wed, 24 Aug 2022 08:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661356614; cv=none; d=google.com; s=arc-20160816; b=0/B8CA50Byro8jt6EcrGZ1y1dAv5bgmyXRFJu14X4HuFAGwztpx5mBDVFCwhgi+rZL X8VGDQmdtE2qBXDKzGD3YvxruL1cAcRYLSVAX74j7FzGGmjFux3lbMl/rXOoYF+2YYwN w0NrldHiRmWL8iPl8X105i8Zcpr36vzcc2SXp2IVCF8PO7163WbfgWPCnof2VZ9g77Yp p/gnqkbqNGWvMevEnb5leyvFBdfSn3TXj7VEzQaPLuAB6nTVO+aWPT9+fCKSvVFuBb7W CeuzEIW/ARP0sLcdcqwzOhOJvdwtcXE1X9wNyKb3ZtU4xV20/oNdBZBTkf1MSIymi4Yi 28gQ== 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=LhPaHmCfzH5shp5YW3SkLpdM/SN0fbAn5PuvfUG/UcA=; b=w4Nd+ARrJs+X51S4DZVUa2+mK0uZLe8BLECpNKuyL41sLCn2pQadtqjyBp/Yo3T1c3 m+5C2e4Mv94Cdy0pARubus1N8R3Ii4oc42XJT+Ap0k2TYbHlGE0XTdz+bazMFfOl2ZXK 6N9zTGOmSwMkj1fd36eqMnw8T74p++uYpS+5b1fVOBBZlSVo7IeZ1v2tTkrDUNjiV9m5 rfKoqYHMToPCpo1DuFskQtlukZwKa+McYiMB1eHcIP5VwLoBr4p7XH3E49JVo8vh0h0m 9EC0++l98+9EvMc+CBVEY66WlhXCljA8AXwMXwhH3leWwedeRILwGM76jHw42L6QkIYM +uCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I00XCp7Y; 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 bz23-20020a05622a1e9700b0031f4cd28efasi8134367qtb.527.2022.08.24.08.56.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2022 08:56:54 -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=I00XCp7Y; 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]:58380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQskQ-0001ye-7B for patch@linaro.org; Wed, 24 Aug 2022 11:56:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQsfN-0002KQ-RN for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:41 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQsf7-0002Eh-RF for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:51:28 -0400 Received: by mail-wr1-x42d.google.com with SMTP id bs25so21308324wrb.2 for ; Wed, 24 Aug 2022 08:51:25 -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; bh=LhPaHmCfzH5shp5YW3SkLpdM/SN0fbAn5PuvfUG/UcA=; b=I00XCp7YFTtBahSzec2jxL03lRNw3TocDi+xJL7O3MoTnAFNtoC5PsrGQTQYRyT+Em Nc6olmD28Q+vISLeBRUPCGu5UDzttAaSUX0knNx+CKHvHKMbE81b7EIVlakEToErDWXd U9JU70lYqzfNj/OE71DrT3d/jKUE0P3xEMK0zvCy0zMUHpmGVHqmbh5tK6M2dMDwZCjn l+xmQNeAK/UDqi21jKXNNT3WtgVoOcwHlvjSgOX7DT6PKbzkg3xET5oWzqqWqRsGPgq6 39bx93EhJaN9C0cAHzQo8X6sMENp1IqXiqfYspLVu8slnAaK3OifXyVCkx7ZfccLXt0y N4bw== 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; bh=LhPaHmCfzH5shp5YW3SkLpdM/SN0fbAn5PuvfUG/UcA=; b=5Wo5PNgiD2bhis5QnUFgE/ga7qTFsTnDWWRFcS60wd/16UU/g51FnxbUAVUM3xeMTv pBLRS9j87Asq+SLKHM+zAKgxLvAZg2T8+Y/au4XdAvms2plNYPA0QSFNChDyGGfuqa1P NmXVX1Msa3xCuyxH71DeAoCcA+E1RRH5eEVDEakIzGZzjXm+KPcAmStU8SwNmMjBGuI5 CihFXe2gcVTUBxISHM1JXPGkLEndVhSNZ45ID3iH+mpK7+TjafRAK0Jhi/Uf/hXP4Wor 8wAZm2RzzTwI13yUYQmqh2ZVfgKvHU6DyevPBO4Lk+kBfGhujwyv8hneYbalSsjkN+g4 0Qzw== X-Gm-Message-State: ACgBeo3zpc+Q+PMIk7/BhA9C/QP6UHsJHJW6OKhLouqMfTcQ31D1so9P x65Es4QcSBiu03/ExPftJ7YN2A== X-Received: by 2002:adf:d1ea:0:b0:225:46e1:4fa0 with SMTP id g10-20020adfd1ea000000b0022546e14fa0mr11303465wrd.362.1661356285050; Wed, 24 Aug 2022 08:51:25 -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 q11-20020a5d61cb000000b00223b8168b15sm17236411wrv.66.2022.08.24.08.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:51:24 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, robh+dt@kernel.org, eauger@redhat.com, Jean-Philippe Brucker Subject: [PATCH 10/10] hw/arm/virt: Fix devicetree warnings about the virtio-iommu node Date: Wed, 24 Aug 2022 16:51:14 +0100 Message-Id: <20220824155113.286730-11-jean-philippe@linaro.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824155113.286730-1-jean-philippe@linaro.org> References: <20220824155113.286730-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42d.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, T_SCC_BODY_TEXT_LINE=-0.01 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" dt-validate and dtc throw a few warnings when parsing the virtio-iommu node: 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 pcie@10000000: virtio_iommu@16:compatible: ['virtio,pci-iommu'] does not contain items matching the given schema 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" The compatible property for a PCI child node should follow the rules from "PCI Bus Binding to: IEEE Std 1275-1994". It should contain the Vendor ID and Device ID (or class code). The unit-name should be "device,function". Signed-off-by: Jean-Philippe Brucker --- Note that this doesn't follow linux/Documentation/devicetree/bindings/virtio/iommu.txt, I'll update that document when converting it to yaml, hopefully this Linux cycle. The "virtio,pci-iommu" compatible string is not actually used by any driver and only QEMU implements it, so we can get rid of it. --- 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 de508d5329..08b79592eb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1374,14 +1374,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[] = "pci1af4,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",