From patchwork Tue Jun 11 16:35:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Gerlach X-Patchwork-Id: 13694025 X-Patchwork-Delegate: kw@linux.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71E961CFA9; Tue, 11 Jun 2024 16:36:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718123784; cv=none; b=CE9tT0ozVEpDIaTm9HXA/r//d/nYM2fq1CXI/KcSdYa3hvlphauXNgAHIx6meAcO6q1qXmv994kpehdUh1L6fkVhEs96lY542Ewn9C2YstjHhL6Jc7a9AmdMP96g2CF5qrq0pD3N+3jzGaZ4sJd7TVohdy93/KpMbFZfNRWNxJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718123784; c=relaxed/simple; bh=lc5OBt3a0lOopI/ilgimjrd8D/Lwin6NVPSkHe2KmGg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Y8lm3/M3FERraSVEKCCVF0gQeCALkQd6xNI/smT5OeNb8phmnhtb1gPRW9k3bvnmXXtCyaI8Q+aQPOqy2DoVKa69wS49LwIhDlu0UFj4hWiHa3KoM7Yd9jh5x1pspohrwkhQYv6XndBOT263SwCutaifSIYJL3PCvQMWjw04V38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bk8L+bnY; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bk8L+bnY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718123783; x=1749659783; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lc5OBt3a0lOopI/ilgimjrd8D/Lwin6NVPSkHe2KmGg=; b=bk8L+bnYeC4RlvRxbKIuTxjWAPlzzHF27D0A9CXAzMbGX6dGoZUuv6QY QCW4nMuAra++Ny6XGgHZgOrahw1BgedGqnC7UstSIUWxIcUHs1fKdNK7G lzzO/JlgqBk+7Y/t9W5saDrr9WXOjl8QzvSH6zRqmMWHgKL2FvScI82tR cilrd0r4uRfIJ5jGKyQyA22ipOwave8fPoQZEtQgxuVetFyzvLPpVPDlN drxlY5AqLiYaU38avaoontaDLUDG+a2plQmFIykSYosvqmWVsPm3Y1L8w 0nVK2ojz1/qiib1PbQr/fahZCCHSXCdDohJVwGM1kRHj++Taz33FPdQ46 A==; X-CSE-ConnectionGUID: YbTgofCpS6uJtvwaaimG/Q== X-CSE-MsgGUID: KtrwT5ehQwyH46hK6KiapA== X-IronPort-AV: E=McAfee;i="6600,9927,11100"; a="14972714" X-IronPort-AV: E=Sophos;i="6.08,230,1712646000"; d="scan'208";a="14972714" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2024 09:36:23 -0700 X-CSE-ConnectionGUID: ggwif3ZWSKuoN2ZMghFfdA== X-CSE-MsgGUID: k0D2yHfLRGmP+DhmEufjpw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,230,1712646000"; d="scan'208";a="39959464" Received: from test2-linux-lab.an.intel.com ([10.122.105.166]) by orviesa006.jf.intel.com with ESMTP; 11 Jun 2024 09:36:21 -0700 From: matthew.gerlach@linux.intel.com To: lpieralisi@kernel.org, kw@linux.com, robh@kernel.org, bhelgaas@google.com, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, joyce.ooi@intel.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Gerlach Subject: [PATCH v6 1/2] dt-bindings: PCI: altera: Convert to YAML Date: Tue, 11 Jun 2024 11:35:24 -0500 Message-Id: <20240611163525.4156688-1-matthew.gerlach@linux.intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Matthew Gerlach Convert the device tree bindings for the Altera Root Port PCIe controller from text to YAML. Signed-off-by: Matthew Gerlach --- v6: - Fix dt_binding_check warnings by creating interrupt-controller subnode and fixing interrupt-map. - Updated filename in MAINTAINERS. v5: - add interrupt-controller #interrupt-cells to required field - don't touch original example dts v4: - reorder reg-names to match original binding - move reg and reg-names to top level with limits. v3: - Added years to copyright - Correct order in file of allOf and unevaluatedProperties - remove items: in compatible field - fix reg and reg-names constraints - replace deprecated pci-bus.yaml with pci-host-bridge.yaml - fix entries in ranges property - remove device_type from required v2: - Move allOf: to bottom of file, just like example-schema is showing - add constraint for reg and reg-names - remove unneeded device_type - drop #address-cells and #size-cells - change minItems to maxItems for interrupts: - change msi-parent to just "msi-parent: true" - cleaned up required: - make subject consistent with other commits coverting to YAML - s/overt/onvert/g --- .../devicetree/bindings/pci/altera-pcie.txt | 50 -------- .../bindings/pci/altr,pcie-root-port.yaml | 114 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 115 insertions(+), 51 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml diff --git a/Documentation/devicetree/bindings/pci/altera-pcie.txt b/Documentation/devicetree/bindings/pci/altera-pcie.txt deleted file mode 100644 index 816b244a221e..000000000000 --- a/Documentation/devicetree/bindings/pci/altera-pcie.txt +++ /dev/null @@ -1,50 +0,0 @@ -* Altera PCIe controller - -Required properties: -- compatible : should contain "altr,pcie-root-port-1.0" or "altr,pcie-root-port-2.0" -- reg: a list of physical base address and length for TXS and CRA. - For "altr,pcie-root-port-2.0", additional HIP base address and length. -- reg-names: must include the following entries: - "Txs": TX slave port region - "Cra": Control register access region - "Hip": Hard IP region (if "altr,pcie-root-port-2.0") -- interrupts: specifies the interrupt source of the parent interrupt - controller. The format of the interrupt specifier depends - on the parent interrupt controller. -- device_type: must be "pci" -- #address-cells: set to <3> -- #size-cells: set to <2> -- #interrupt-cells: set to <1> -- ranges: describes the translation of addresses for root ports and - standard PCI regions. -- interrupt-map-mask and interrupt-map: standard PCI properties to define the - mapping of the PCIe interface to interrupt numbers. - -Optional properties: -- msi-parent: Link to the hardware entity that serves as the MSI controller - for this PCIe controller. -- bus-range: PCI bus numbers covered - -Example - pcie_0: pcie@c00000000 { - compatible = "altr,pcie-root-port-1.0"; - reg = <0xc0000000 0x20000000>, - <0xff220000 0x00004000>; - reg-names = "Txs", "Cra"; - interrupt-parent = <&hps_0_arm_gic_0>; - interrupts = <0 40 4>; - interrupt-controller; - #interrupt-cells = <1>; - bus-range = <0x0 0xFF>; - device_type = "pci"; - msi-parent = <&msi_to_gic_gen_0>; - #address-cells = <3>; - #size-cells = <2>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_0 1>, - <0 0 0 2 &pcie_0 2>, - <0 0 0 3 &pcie_0 3>, - <0 0 0 4 &pcie_0 4>; - ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000 - 0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>; - }; diff --git a/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml b/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml new file mode 100644 index 000000000000..08ee04f6e004 --- /dev/null +++ b/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml @@ -0,0 +1,114 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright (C) 2015, 2019, 2024, Intel Corporation +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/altr,pcie-root-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Altera PCIe Root Port + +maintainers: + - Matthew Gerlach + +properties: + compatible: + enum: + - altr,pcie-root-port-1.0 + - altr,pcie-root-port-2.0 + + reg: + items: + - description: TX slave port region + - description: Control register access region + - description: Hard IP region + minItems: 2 + + reg-names: + items: + - const: Txs + - const: Cra + - const: Hip + minItems: 2 + + interrupts: + maxItems: 1 + + interrupt-map-mask: + items: + - const: 0 + - const: 0 + - const: 0 + - const: 7 + + interrupt-map: + maxItems: 4 + + "#interrupt-cells": + const: 1 + + interrupt-controller: + description: identifies the node as an interrupt controller + type: object + properties: + interrupt-controller: true + + "#address-cells": + const: 0 + + "#interrupt-cells": + const: 1 + + required: + - interrupt-controller + - "#address-cells" + - "#interrupt-cells" + + additionalProperties: false + + msi-parent: true + +required: + - compatible + - reg + - reg-names + - interrupts + - "#interrupt-cells" + - interrupt-controller + - interrupt-map + - interrupt-map-mask + +allOf: + - $ref: /schemas/pci/pci-host-bridge.yaml# + +unevaluatedProperties: false + +examples: + - | + #include + #include + pcie_0: pcie@c00000000 { + compatible = "altr,pcie-root-port-1.0"; + reg = <0xc0000000 0x20000000>, + <0xff220000 0x00004000>; + reg-names = "Txs", "Cra"; + interrupt-parent = <&hps_0_arm_gic_0>; + interrupts = ; + #interrupt-cells = <1>; + bus-range = <0x0 0xff>; + device_type = "pci"; + msi-parent = <&msi_to_gic_gen_0>; + #address-cells = <3>; + #size-cells = <2>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_intc 1>, + <0 0 0 2 &pcie_intc 2>, + <0 0 0 3 &pcie_intc 3>, + <0 0 0 4 &pcie_intc 4>; + ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000>, + <0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>; + pcie_intc: interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 670b8201973b..c8120cb9d340 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17142,7 +17142,7 @@ PCI DRIVER FOR ALTERA PCIE IP M: Joyce Ooi L: linux-pci@vger.kernel.org S: Supported -F: Documentation/devicetree/bindings/pci/altera-pcie.txt +F: Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml F: drivers/pci/controller/pcie-altera.c PCI DRIVER FOR APPLIEDMICRO XGENE From patchwork Tue Jun 11 16:35:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Gerlach X-Patchwork-Id: 13694026 X-Patchwork-Delegate: kw@linux.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9785938FA0; Tue, 11 Jun 2024 16:36:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718123785; cv=none; b=ixXAJAZUkZklWBBGAKn2ZAPHjEIL+N8RDXNdTa/LOUQT/Eo47AaLDELOiqNRqTFxO1bh+AMXfaBUUpdqCfla/8ivul1Rq9aUjev0RPOrEBM7A/xbXM3GcdQG2Gfpq1GauIHh0ozI7HkqIUfhrfbjBAZYIX86/W3TtwXQvpyaOvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718123785; c=relaxed/simple; bh=Br185Yo6/5F9RMGQZLgDnvgMIisyh5/Lt78nH4PPTx0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pypDZpGAzO8tV/saQAfZ8D4ktvPH889NN+69tkxbDnlUx1tDwGHsJK3Zgg9Y/ugkZ6R8cvWlgCWID1SbRxnEzSe9PWrBhc4TTC28nwxs4voo4vwAqBXrl3Ahnfo+jM/AoT9gYMgw1OQefF4at0t+Rlq3pNZUhXG3DUZR+Wzbojc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=iEcwFhol; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="iEcwFhol" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718123785; x=1749659785; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Br185Yo6/5F9RMGQZLgDnvgMIisyh5/Lt78nH4PPTx0=; b=iEcwFholf5zxy2o5jRt3qBaCJl60883B4G52pAE13rjGnTidDFWxTJ0/ aQIbvxVmCFC5r2kwbizKzFQzEzVXfDG0MuZyzYPdEBuhlfTLtyzr0ozje McwFAcpxonQIGszBEwCjGkTGqNG9RApMOKCz2uLTrOMHfE1stCZKMXlld /9qudHZh6d5Hrn0XiWuPKidxgKsZ6IXwDksQqmxwcti1+0XJOI0VJBUMj a+uJNta+zf+5gYARwIbsJI4Dj/eCUneNnJJyhc0vzMnAi//4cjgR2B+ry +X1ge6rYDVZxb3bpE3+HK1ssLrpaKi7Cmrv/0u12chLkpdDMBKcXIFngd w==; X-CSE-ConnectionGUID: zUmtaTvQRJWgFp6fdT9KOw== X-CSE-MsgGUID: 3rdMKXsRRviQDme3gS9NWw== X-IronPort-AV: E=McAfee;i="6600,9927,11100"; a="14972723" X-IronPort-AV: E=Sophos;i="6.08,230,1712646000"; d="scan'208";a="14972723" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2024 09:36:24 -0700 X-CSE-ConnectionGUID: /4QubWDsTIu0IhSnxowjIw== X-CSE-MsgGUID: G72oLDd2TbeBRHeyQp/7cQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,230,1712646000"; d="scan'208";a="39959470" Received: from test2-linux-lab.an.intel.com ([10.122.105.166]) by orviesa006.jf.intel.com with ESMTP; 11 Jun 2024 09:36:22 -0700 From: matthew.gerlach@linux.intel.com To: lpieralisi@kernel.org, kw@linux.com, robh@kernel.org, bhelgaas@google.com, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, joyce.ooi@intel.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Gerlach Subject: [PATCH v6 2/2] PCI: altera: support dt binding update Date: Tue, 11 Jun 2024 11:35:25 -0500 Message-Id: <20240611163525.4156688-2-matthew.gerlach@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611163525.4156688-1-matthew.gerlach@linux.intel.com> References: <20240611163525.4156688-1-matthew.gerlach@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Matthew Gerlach Add support for the device tree binding update. As part of converting the binding document from text to yaml, with schema validation, a device tree subnode was added to properly map legacy interrupts. Maintain backward compatibility with previous binding. Signed-off-by: Matthew Gerlach --- drivers/pci/controller/pcie-altera.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c index a9536dc4bf96..88511fa2f078 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -667,11 +667,20 @@ static void altera_pcie_isr(struct irq_desc *desc) static int altera_pcie_init_irq_domain(struct altera_pcie *pcie) { struct device *dev = &pcie->pdev->dev; - struct device_node *node = dev->of_node; + struct device_node *node, *child; /* Setup INTx */ + child = of_get_next_child(dev->of_node, NULL); + if (child) + node = child; + else + node = dev->of_node; + pcie->irq_domain = irq_domain_add_linear(node, PCI_NUM_INTX, - &intx_domain_ops, pcie); + &intx_domain_ops, pcie); + if (child) + of_node_put(child); + if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); return -ENOMEM;