From patchwork Tue Sep 26 15:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 144960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2020232vqu; Tue, 26 Sep 2023 09:00:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXAVqt97jaERwEc0jW9XwBYlhSGsaXBx8d5XqD3m/dE+LbyJ4nuiZug5lWx5JFDuuAGSZe X-Received: by 2002:a05:6a20:5616:b0:14d:792:aafb with SMTP id ir22-20020a056a20561600b0014d0792aafbmr10272169pzc.54.1695744016955; Tue, 26 Sep 2023 09:00:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695744016; cv=none; d=google.com; s=arc-20160816; b=xbAGu7cAnb93zEXz1CDSwwHp4vngyKMnysBe/6JGqahEjmxKVXwVuMEGoxV9l2mAic G087qxFpYTPzkkz7zS3sqlMUVPg2su4z5MqdPD4/mBUwajiPXnPFhlMYCWjAjOUlXRNN JBsxot6pyTT1+N5dvZJwItixAREXpVoiQBmMEEhHDCpLom3UrH427Okxil7dSLLRgEY0 vnH0MTfwLP87fEOcq7ZG+tLL4d34UYeuSKho7+kV8WnmBwAkwP2GxdjVk3a8qVsIF0lC RZATUGTlIs6Xxh3c5OyNmgKo9w7dRkgyw8XmGhT9tAPnYmkWvbtsRGweCGLi1a9+d7Vm /L2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SAA8Mh8dfVgMsJi1DhCvyFro7wqdYTJAXQiTsNS3ntg=; fh=LQwqGn03HtLnQs8aMTx0gzcqBhmZXmhaovWf2zNPl2Q=; b=04CqhXrQU8iUeohy3/mKL7KSTyUqofyCsrC8GRKrT5+5YTlwIMMqk4R2m0cQ8tfIvl 55PvRgqDTLaGDlwX2+gMfnRhS5igHJaA3QeS7eijtJjYxtAe3kHXygkO28qlooZh78NR bmUS5ZHQugRHxZ3d0xnBzm0p0rvkx/GVgYaCMJlLh5txE6kubz0WZB2+u51l3X9tR+Hr SfuWq2zzHekI47hE+u6AD0jHVthrhWpPoZ5OJlEfa1gNvFKo8YXPE8B/u5tJ01ip79ul d5UtGyI6LEHSgztkeoLN+gt+5FbYUpeRoGLgRhN3eaPGG4mnjkc+3+zLKjGUVWs9MTbE DSCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pQ0bxYsF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id b2-20020a170902650200b001bc92dc57bbsi11921429plk.633.2023.09.26.09.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 09:00:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pQ0bxYsF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 7BE22806AFDB; Tue, 26 Sep 2023 08:57:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbjIZP4y (ORCPT + 28 others); Tue, 26 Sep 2023 11:56:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231137AbjIZP4w (ORCPT ); Tue, 26 Sep 2023 11:56:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8691FEB; Tue, 26 Sep 2023 08:56:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBE57C433C7; Tue, 26 Sep 2023 15:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695743806; bh=sz3LleGIgkDcRxsY10cRbgEtugt9GVhiu7ELFn1C6PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pQ0bxYsFFW6f3k8Mm9YI6BmpG2prf+7jIv4S+F1z1386cIVcJob8goJ79mN/ygtGn LwBrPO/JVUlO2j/UqOLwnuLiiuNReUALoxduWfNpBG+Vutf0qrLwcNG8vPlPi089J5 IO1Pi7q35HxGeadWPmr72WV1Ws73n6gXn2qQWFHUVYiGDyDUlXRp/CiPJQG9JD8O5/ zoYNs+M/fzB/ue4ZgOpi5QCQU2NOWZXT3GqxctlK2SWJCTzPh8cxzrPoziiWg7AtX1 01nGw9jArczGNVvuYj9s3xXZjLKyxdmORBTQayk4tcv57YsVKpqLXfOQpBdBZcDVQO wq2vZyE2CDYwA== Received: (nullmailer pid 34714 invoked by uid 1000); Tue, 26 Sep 2023 15:56:43 -0000 From: Rob Herring To: Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Krzysztof Kozlowski , Conor Dooley , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Ray Jui , Scott Branden , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] dt-bindings: PCI: brcm,iproc-pcie: Fix 'msi' child node schema Date: Tue, 26 Sep 2023 10:56:09 -0500 Message-Id: <20230926155613.33904-3-robh@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230926155351.31117-1-robh@kernel.org> References: <20230926155351.31117-1-robh@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 26 Sep 2023 08:57:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778116478581451385 X-GMAIL-MSGID: 1778116478581451385 The 'msi' child node schema is missing constraints on additional properties. It turns out it is incomplete and properties for it are documented in the parent node by mistake. Move the reference to msi-controller.yaml and the custom properties to the 'msi' node. Adding 'unevaluatedProperties' ensures all the properties in the 'msi' node are documented. With the schema corrected, a minimal interrupt controller node is needed to properly decode the interrupt properties since the example has multiple interrupt parents. Signed-off-by: Rob Herring Acked-by: Conor Dooley Reviewed-by: Florian Fainelli --- .../bindings/pci/brcm,iproc-pcie.yaml | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml index 6730d68fedc7..0e07ab61a48d 100644 --- a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml @@ -12,7 +12,6 @@ maintainers: allOf: - $ref: /schemas/pci/pci-bus.yaml# - - $ref: /schemas/interrupt-controller/msi-controller.yaml# properties: compatible: @@ -63,20 +62,24 @@ properties: msi: type: object + $ref: /schemas/interrupt-controller/msi-controller.yaml# + unevaluatedProperties: false + properties: compatible: items: - const: brcm,iproc-msi - msi-parent: true + interrupts: + maxItems: 4 - msi-controller: true + brcm,pcie-msi-inten: + type: boolean + description: + Needs to be present for some older iProc platforms that require the + interrupt enable registers to be set explicitly to enable MSI - brcm,pcie-msi-inten: - type: boolean - description: > - Needs to be present for some older iProc platforms that require the - interrupt enable registers to be set explicitly to enable MSI + msi-parent: true dependencies: brcm,pcie-ob-axi-offset: ["brcm,pcie-ob"] @@ -104,6 +107,11 @@ examples: - | #include + gic: interrupt-controller { + interrupt-controller; + #interrupt-cells = <3>; + }; + pcie@18012000 { compatible = "brcm,iproc-pcie"; reg = <0x18012000 0x1000>;