mbox series

[RESEND,v3,0/2] add new UniPhier PCIe host driver

Message ID 1539667641-26024-1-git-send-email-hayashi.kunihiko@socionext.com
Headers show
Series add new UniPhier PCIe host driver | expand

Message

Kunihiko Hayashi Oct. 16, 2018, 5:27 a.m. UTC
This series adds PCIe host controller driver for Socionext UniPhier SoCs.
This controller is based on the DesignWare PCIe core. This driver
supports LD20 and PXs3 SoCs.

v2: https://www.spinics.net/lists/linux-pci/msg75930.html

About legacy IRQ, it might be necessary to share common view from
keystone driver that have been cleaned up[1].

[1] https://lore.kernel.org/patchwork/patch/989541/

Changes since v2:
- dt-bindings: remove a comment that the node name isn't important
- dt-bindings: remove "intx" interrupt
- dt-bindings: define 'legacy-interrupt-controller' node and its properties
- return an error value when link up fails
- remove devm_request_irq() and a handler for MSI IRQ
- use chained interrupt instead of devm_request_irq() for legacy IRQ
- add unipher_pcie_config_legacy_irq() to get legacy IRQ from
  'legacy-interrupt controller' node
- replace 4 statments to handle INTX with for_each_set_bit()
- remove initialization of pp->root_bus_nr
- remove indivisual interrupt enable bit definitions
- rename 'irq_domain' member to 'legacy_irq_domain' in private structure
- use pci_irqd_intx_xlate() for irq_domain_ops.xlate function

Changes since v1:
- follow capitalization conventions in the descriptions
- use C style comments except for the SPDX line

Kunihiko Hayashi (2):
  dt-bindings: PCI: Add UniPhier PCIe host controller description
  PCI: uniphier: Add UniPhier PCIe host controller support

 .../devicetree/bindings/pci/uniphier-pcie.txt      |  81 ++++
 drivers/pci/controller/dwc/Kconfig                 |   9 +
 drivers/pci/controller/dwc/Makefile                |   1 +
 drivers/pci/controller/dwc/pcie-uniphier.c         | 433 +++++++++++++++++++++
 4 files changed, 524 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt
 create mode 100644 drivers/pci/controller/dwc/pcie-uniphier.c

-- 
2.7.4

Comments

Lorenzo Pieralisi Nov. 19, 2018, 11:40 a.m. UTC | #1
On Tue, Oct 16, 2018 at 02:27:20PM +0900, Kunihiko Hayashi wrote:
> Add DT bindings for PCIe controller implemented in UniPhier SoCs when

> configured in Root Complex (host) mode. This controller is based on

> the DesignWare PCIe core.

> 

> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

> Reviewed-by: Rob Herring <robh@kernel.org>

> ---

>  .../devicetree/bindings/pci/uniphier-pcie.txt      | 81 ++++++++++++++++++++++

>  1 file changed, 81 insertions(+)

>  create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt

> 

> diff --git a/Documentation/devicetree/bindings/pci/uniphier-pcie.txt b/Documentation/devicetree/bindings/pci/uniphier-pcie.txt

> new file mode 100644

> index 0000000..46a2754

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/pci/uniphier-pcie.txt

> @@ -0,0 +1,81 @@

> +Socionext UniPhier PCIe host controller bindings

> +

> +This describes the devicetree bindings for PCIe host controller implemented

> +on Socionext UniPhier SoCs.

> +

> +UniPhier PCIe host controller is based on the Synopsys DesignWare PCI core.

> +It shares common functions with the PCIe DesignWare core driver and inherits

> +common properties defined in

> +Documentation/devicetree/bindings/pci/designware-pcie.txt.

> +

> +Required properties:

> +- compatible: Should be "socionext,uniphier-pcie".

> +- reg: Specifies offset and length of the register set for the device.

> +	According to the reg-names, appropriate register sets are required.

> +- reg-names: Must include the following entries:

> +    "dbi"    - controller configuration registers

> +    "link"   - SoC-specific glue layer registers

> +    "config" - PCIe configuration space

> +- clocks: A phandle to the clock gate for PCIe glue layer including

> +	the host controller.

> +- resets: A phandle to the reset line for PCIe glue layer including

> +	the host controller.

> +- interrupts: A list of interrupt specifiers. According to the

> +	interrupt-names, appropriate interrupts are required.

> +- interrupt-names: Must include the following entries:

> +    "dma" - DMA interrupt

> +    "msi" - MSI interrupt

> +

> +Optional properties:

> +- phys: A phandle to generic PCIe PHY. According to the phy-names, appropriate

> +	phys are required.

> +- phy-names: Must be "pcie-phy".

> +

> +Required sub-node:

> +- legacy-interrupt-controller: Specifies interrupt controller for legacy PCI

> +	interrupts.

> +

> +Required properties for legacy-interrupt-controller:

> +- interrupt-controller: identifies the node as an interrupt controller.

> +- #interrupt-cells: specifies the number of cells needed to encode an

> +	interrupt source. The value must be 1.

> +- interrupt-parent: Phandle to the parent interrupt controller.

> +- interrupts: An interrupt specifier for legacy interrupt.

> +

> +Example:

> +

> +	pcie: pcie@66000000 {

> +		compatible = "socionext,uniphier-pcie", "snps,dw-pcie";

> +		status = "disabled";

> +		reg-names = "dbi", "link", "config";

> +		reg = <0x66000000 0x1000>, <0x66010000 0x10000>,

> +		      <0x2fff0000 0x10000>;

> +		#address-cells = <3>;

> +		#size-cells = <2>;

> +		clocks = <&sys_clk 24>;

> +		resets = <&sys_rst 24>;

> +		num-lanes = <1>;

> +		num-viewport = <1>;

> +		bus-range = <0x0 0xff>;

> +		device_type = "pci";

> +		ranges =

> +		/* downstream I/O */

> +			<0x81000000 0 0x00000000  0x2ffe0000  0 0x00010000

> +		/* non-prefetchable memory */

> +			 0x82000000 0 0x00000000  0x20000000  0 0x0ffe0000>;

> +		#interrupt-cells = <1>;

> +		interrupt-names = "dma", "msi";

> +		interrupts = <0 224 4>, <0 225 4>;

> +		interrupt-map-mask = <0 0 0  7>;

> +		interrupt-map = <0 0 0  1  &pcie_intc 1>,	/* INTA */

> +				<0 0 0  2  &pcie_intc 2>,	/* INTB */

> +				<0 0 0  3  &pcie_intc 3>,	/* INTC */

> +				<0 0 0  4  &pcie_intc 4>;	/* INTD */


This is not correct and we must fix this concept for all DWC based host
bridges bindings. We are mapping INTX to inputs [0,1,2,3] of the host
bridge interrupt controllers and the binding should reflect that.

This should be the correct mapping:

		interrupt-map = <0 0 0  1  &pcie_intc 0>,	/* INTA */
				<0 0 0  2  &pcie_intc 1>,	/* INTB */
				<0 0 0  3  &pcie_intc 2>,	/* INTC */
				<0 0 0  4  &pcie_intc 3>;	/* INTD */

Lorenzo

> +

> +		pcie_intc: legacy-interrupt-controller {

> +			interrupt-controller;

> +			#interrupt-cells = <1>;

> +			interrupt-parent = <&gic>;

> +			interrupts = <0 226 4>;

> +		};

> +	};

> -- 

> 2.7.4

>