From patchwork Thu Jul 13 17:18:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 702366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76755C04A6A for ; Thu, 13 Jul 2023 17:19:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbjGMRTA (ORCPT ); Thu, 13 Jul 2023 13:19:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231248AbjGMRS6 (ORCPT ); Thu, 13 Jul 2023 13:18:58 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C57142702; Thu, 13 Jul 2023 10:18:57 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-214-236.ewe-ip-backbone.de [91.248.214.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id D23416607051; Thu, 13 Jul 2023 18:18:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689268736; bh=bc85sZgJmqbMYBSSacmbXFns3V+trIRyk2/1Vj+fsN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eS13e/3I+4EiX6D/jk/B0UqYKATC8zEeGcDcp8gQPF7x1f39BLT5XbP6Gn1OLbtu9 zY97zaizsHMlKWHGJVuL0U0W0A1zdBwTXSg9c5gQPxWpEUXPdA+pTuSmHzs5V3+nn0 MmqZBQ2wFogzXXC9ic0PTgRinKHQoDz27mIK2pRDqliRlxaS/B6Ya5QVxvWwSX01j4 Ne1DC13zcazjNE28St2yTTEjB7SQe+eCbBJ4ZjyfhikPaMgqvjNWjg2Fi14VUYONDy Rk7kbmgAO4qO2GAsDZfipcc3KLUHoMZrl/g9TVv+tbJzHmIeiGUmgunFep6UeBgcb3 Go+fgrkxORJPw== Received: by jupiter.universe (Postfix, from userid 1000) id C9E78480085; Thu, 13 Jul 2023 19:18:53 +0200 (CEST) From: Sebastian Reichel To: linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, Serge Semin Cc: Jingoo Han , Gustavo Pimentel , Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Shawn Lin , Simon Xue , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCH v2 1/3] dt-bindings: PCI: dwc: rockchip: Fix interrupt-names issue Date: Thu, 13 Jul 2023 19:18:49 +0200 Message-Id: <20230713171851.73052-2-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713171851.73052-1-sebastian.reichel@collabora.com> References: <20230713171851.73052-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The RK356x (and RK3588) have 5 ganged interrupts. For example the "legacy" interrupt combines "inta/intb/intc/intd" with a register providing the details. Currently the binding is not specifying these interrupts resulting in a bunch of errors for all rk356x boards using PCIe. Fix this by specifying the interrupts and add them to the example to prevent regressions. Signed-off-by: Sebastian Reichel --- .../bindings/pci/rockchip-dw-pcie.yaml | 18 +++++ .../devicetree/bindings/pci/snps,dw-pcie.yaml | 76 ++++++++++++++++++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml index a4f61ced5e88..aad53c7d8485 100644 --- a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml @@ -60,6 +60,17 @@ properties: - const: aux - const: pipe + interrupts: + maxItems: 5 + + interrupt-names: + items: + - const: sys + - const: pmc + - const: msg + - const: legacy + - const: err + msi-map: true num-lanes: true @@ -108,6 +119,7 @@ unevaluatedProperties: false examples: - | + #include bus { #address-cells = <2>; @@ -127,6 +139,12 @@ examples: "aclk_dbi", "pclk", "aux"; device_type = "pci"; + interrupts = , + , + , + , + ; + interrupt-names = "sys", "pmc", "msg", "legacy", "err"; linux,pci-domain = <2>; max-link-speed = <2>; msi-map = <0x2000 &its 0x2000 0x1000>; diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml index 1a83f0f65f19..973bf8f2730d 100644 --- a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml @@ -193,9 +193,83 @@ properties: oneOf: - description: See native "app" IRQ for details enum: [ intr ] + - description: + Combined legacy interrupt, which is used to signal the following + interrupts + * inta + * intb + * intc + * intd + const: legacy + - description: + Combined system interrupt, which is used to signal the following + interrupts + * phy_link_up + * dll_link_up + * link_req_rst_not + * hp_pme + * hp + * hp_msi + * link_auto_bw + * link_auto_bw_msi + * bw_mgt + * bw_mgt_msi + * edma_wr + * edma_rd + * dpa_sub_upd + * rbar_update + * link_eq_req + * ep_elbi_app + const: sys + - description: + Combined PM interrupt, which is used to signal the following + interrupts + * linkst_in_l1sub + * linkst_in_l1 + * linkst_in_l2 + * linkst_in_l0s + * linkst_out_l1sub + * linkst_out_l1 + * linkst_out_l2 + * linkst_out_l0s + * pm_dstate_update + const: pmc + - description: + Combined message interrupt, which is used to signal the following + interrupts + * ven_msg + * unlock_msg + * ltr_msg + * cfg_pme + * cfg_pme_msi + * pm_pme + * pm_to_ack + * pm_turnoff + * obff_idle + * obff_obff + * obff_cpu_active + const: msg + - description: + Combined error interrupt, which is used to signal the following + interrupts + * aer_rc_err + * aer_rc_err_msi + * rx_cpl_timeout + * tx_cpl_timeout + * cor_err_sent + * nf_err_sent + * f_err_sent + * cor_err_rx + * nf_err_rx + * f_err_rx + * radm_qoverflow + const: err + allOf: - contains: - const: msi + enum: + - msi + - msg additionalProperties: true