PCI: dwc: Rework and cleanup designware driver
Subsystems (3)
cover PCI: dwc: Rework and cleanup designware driver
This series reworks designware driver in preparation for adding endpoint mode support to designware driver.
This series was previously sent as part of endpoint support series
https://lkml.org/lkml/2017/1/13/562
Validate pci host only in pci-dra7xx. Any help in validating other platforms would be highly appreciated.
This series is created after cherrypicking the following patch and then applying pci/host-designware.
commit a782b5f986c3fa1cfa7f2b57941200c6a5809242
Author: Murali Karicheri <[email protected]> Date: Wed Jan 4 14:32:30 2017 -0500
PCI: designware: Check for iATU unroll only on platforms that use ATU
The patches has been pushed togit://git.ti.com/linux-phy/linux-phy.git dwc-rework
Kishon Vijay Abraham I (10):
PCI: dwc: designware: Move the register defines to designware header
file
PCI: dwc: *all*: Add platform_set_drvdata
PCI: dwc: *all*: Rename cfg_read/cfg_write to read/write
PCI: dwc: designware: Get device pointer at the start of
dw_pcie_host_init
PCI: dwc: *all*: Split *struct pcie_port* into host only and core
structures
PCI: dwc: designware: Parse *num-lanes* property in dw_pcie_setup_rc
PCI: dwc: designware: Fix style errors in pcie-designware.c
PCI: dwc: Split pcie-designware.c into host and core files
PCI: dwc: Create a new config symbol to enable pci dwc host
PCI: dwc: Remove dependency of designware to CONFIG_PCI
drivers/Makefile | 3 + drivers/pci/Makefile | 3 - drivers/pci/dwc/Kconfig | 39 +- drivers/pci/dwc/Makefile | 1 + drivers/pci/dwc/pci-dra7xx.c | 91 ++-- drivers/pci/dwc/pci-exynos.c | 81 ++-- drivers/pci/dwc/pci-imx6.c | 131 ++--- drivers/pci/dwc/pci-keystone-dw.c | 87 ++-- drivers/pci/dwc/pci-keystone.c | 56 ++- drivers/pci/dwc/pci-keystone.h | 4 +- drivers/pci/dwc/pci-layerscape.c | 93 ++-- drivers/pci/dwc/pcie-armada8k.c | 87 ++-- drivers/pci/dwc/pcie-artpec6.c | 50 +- drivers/pci/dwc/pcie-designware-host.c | 635 ++++++++++++++++++++++++ drivers/pci/dwc/pcie-designware-plat.c | 29 +- drivers/pci/dwc/pcie-designware.c | 823 +++----------------------------- drivers/pci/dwc/pcie-designware.h | 170 +++++-- drivers/pci/dwc/pcie-hisi.c | 57 ++- drivers/pci/dwc/pcie-qcom.c | 72 ++- drivers/pci/dwc/pcie-spear13xx.c | 85 ++-- 20 files changed, 1434 insertions(+), 1163 deletions(-) create mode 100644 drivers/pci/dwc/pcie-designware-host.c
Signature · 1 line
1.7.9.5
PATCH 1/10 PCI: dwc: designware: Move the register defines to designware header file
No functional change. Move the register defines and other macros from pcie-designware.c to pcie-designware.h. This is in preparation to split the pcie-designware.c file into designware core file and host specific file.
While at that also fix a checkpatch warning.
--- drivers/pci/dwc/pcie-designware.c | 70 ------------------------------------ drivers/pci/dwc/pcie-designware.h | 71 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 70 deletions(-)
drivers/pci/dwc/pcie-designware.c +0 -70
@@ -25,76 +25,6 @@#include "pcie-designware.h" -/* Parameters for the waiting for link up routine */ -#define LINK_WAIT_MAX_RETRIES 10 -#define LINK_WAIT_USLEEP_MIN 90000 -#define LINK_WAIT_USLEEP_MAX 100000 - -/* Parameters for the waiting for iATU enabled routine */ -#define LINK_WAIT_MAX_IATU_RETRIES 5 -#define LINK_WAIT_IATU_MIN 9000 -#define LINK_WAIT_IATU_MAX 10000 - -/* Synopsys-specific PCIe configuration registers */ -#define PCIE_PORT_LINK_CONTROL 0x710 -#define PORT_LINK_MODE_MASK (0x3f << 16) -#define PORT_LINK_MODE_1_LANES (0x1 << 16) -#define PORT_LINK_MODE_2_LANES (0x3 << 16) -#define PORT_LINK_MODE_4_LANES (0x7 << 16) -#define PORT_LINK_MODE_8_LANES (0xf << 16) - -#define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C -#define PORT_LOGIC_SPEED_CHANGE (0x1 << 17) -#define PORT_LOGIC_LINK_WIDTH_MASK (0x1f << 8) -#define PORT_LOGIC_LINK_WIDTH_1_LANES (0x1 << 8) -#define PORT_LOGIC_LINK_WIDTH_2_LANES (0x2 << 8) -#define PORT_LOGIC_LINK_WIDTH_4_LANES (0x4 << 8) -#define PORT_LOGIC_LINK_WIDTH_8_LANES (0x8 << 8) - -#define PCIE_MSI_ADDR_LO 0x820 -#define PCIE_MSI_ADDR_HI 0x824 -#define PCIE_MSI_INTR0_ENABLE 0x828 -#define PCIE_MSI_INTR0_MASK 0x82C -#define PCIE_MSI_INTR0_STATUS 0x830 - -#define PCIE_ATU_VIEWPORT 0x900 -#define PCIE_ATU_REGION_INBOUND (0x1 << 31) -#define PCIE_ATU_REGION_OUTBOUND (0x0 << 31) -#define PCIE_ATU_REGION_INDEX2 (0x2 << 0) -#define PCIE_ATU_REGION_INDEX1 (0x1 << 0) -#define PCIE_ATU_REGION_INDEX0 (0x0 << 0) -#define PCIE_ATU_CR1 0x904 -#define PCIE_ATU_TYPE_MEM (0x0 << 0) -#define PCIE_ATU_TYPE_IO (0x2 << 0) -#define PCIE_ATU_TYPE_CFG0 (0x4 << 0) -#define PCIE_ATU_TYPE_CFG1 (0x5 << 0) -#define PCIE_ATU_CR2 0x908 -#define PCIE_ATU_ENABLE (0x1 << 31) -#define PCIE_ATU_BAR_MODE_ENABLE (0x1 << 30) -#define PCIE_ATU_LOWER_BASE 0x90C -#define PCIE_ATU_UPPER_BASE 0x910 -#define PCIE_ATU_LIMIT 0x914 -#define PCIE_ATU_LOWER_TARGET 0x918 -#define PCIE_ATU_BUS (x) (((x) & 0xff) << 24) -#define PCIE_ATU_DEV (x) (((x) & 0x1f) << 19) -#define PCIE_ATU_FUNC (x) (((x) & 0x7) << 16) -#define PCIE_ATU_UPPER_TARGET 0x91C - -/* -* iATU Unroll-specific register definitions -* From 4.80 core version the address translation will be made by unroll -*/ -#define PCIE_ATU_UNR_REGION_CTRL1 0x00 -#define PCIE_ATU_UNR_REGION_CTRL2 0x04 -#define PCIE_ATU_UNR_LOWER_BASE 0x08 -#define PCIE_ATU_UNR_UPPER_BASE 0x0C -#define PCIE_ATU_UNR_LIMIT 0x10 -#define PCIE_ATU_UNR_LOWER_TARGET 0x14 -#define PCIE_ATU_UNR_UPPER_TARGET 0x18 - -/* Register address builder */ -#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (region) ((0x3 << 20) | (region << 9)) -/* PCIe Port Logic registers */ #define PLR_OFFSET 0x700#define PCIE_PHY_DEBUG_R1 (PLR_OFFSET + 0x2c)
drivers/pci/dwc/pcie-designware.h +71 -0
77 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Re: [PATCH 01/10] PCI: dwc: designware: Move the register defines to designware header file
Quoted 10 lines · Kishon Vijay Abraham I
No functional change. Move the register defines and other macros from
pcie-designware.ctopcie-designware.h. This is in preparation to split thepcie-designware.cfile into designware core file and host specific file.While at that also fix a checkpatch warning.
Reviewed-by Joao Pinto <[email protected]>Signed-off-by Kishon Vijay Abraham I <[email protected]>
Best regards,
Jingoo Han
Quoted 175 lines
--- drivers/pci/dwc/pcie-designware.c | 70 -------------------------------- ---- drivers/pci/dwc/pcie-designware.h | 71 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 70 deletions(-)drivers/pci/dwc/pcie- renamed from drivers/pci/dwc/pcie-designware.c +0
-0
designware.c
index af8f6e9..d0e4904 100644drivers/pci/dwc/pcie-designware.c +0
-70@@ -25,76 +25,6 @@#include "pcie-designware.h" -/* Parameters for the waiting for link up routine */ -#define LINK_WAIT_MAX_RETRIES 10 -#define LINK_WAIT_USLEEP_MIN 90000 -#define LINK_WAIT_USLEEP_MAX 100000 - -/* Parameters for the waiting for iATU enabled routine */ -#define LINK_WAIT_MAX_IATU_RETRIES 5 -#define LINK_WAIT_IATU_MIN 9000 -#define LINK_WAIT_IATU_MAX 10000 - -/* Synopsys-specific PCIe configuration registers */ -#define PCIE_PORT_LINK_CONTROL 0x710 -#define PORT_LINK_MODE_MASK (0x3f << 16) -#define PORT_LINK_MODE_1_LANES (0x1 << 16) -#define PORT_LINK_MODE_2_LANES (0x3 << 16) -#define PORT_LINK_MODE_4_LANES (0x7 << 16) -#define PORT_LINK_MODE_8_LANES (0xf << 16) - -#define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C -#define PORT_LOGIC_SPEED_CHANGE (0x1 << 17) -#define PORT_LOGIC_LINK_WIDTH_MASK (0x1f << 8) -#define PORT_LOGIC_LINK_WIDTH_1_LANES (0x1 << 8) -#define PORT_LOGIC_LINK_WIDTH_2_LANES (0x2 << 8) -#define PORT_LOGIC_LINK_WIDTH_4_LANES (0x4 << 8) -#define PORT_LOGIC_LINK_WIDTH_8_LANES (0x8 << 8) - -#define PCIE_MSI_ADDR_LO 0x820 -#define PCIE_MSI_ADDR_HI 0x824 -#define PCIE_MSI_INTR0_ENABLE 0x828 -#define PCIE_MSI_INTR0_MASK 0x82C -#define PCIE_MSI_INTR0_STATUS 0x830 - -#define PCIE_ATU_VIEWPORT 0x900 -#define PCIE_ATU_REGION_INBOUND (0x1 << 31) -#define PCIE_ATU_REGION_OUTBOUND (0x0 << 31) -#define PCIE_ATU_REGION_INDEX2 (0x2 << 0) -#define PCIE_ATU_REGION_INDEX1 (0x1 << 0) -#define PCIE_ATU_REGION_INDEX0 (0x0 << 0) -#define PCIE_ATU_CR1 0x904 -#define PCIE_ATU_TYPE_MEM (0x0 << 0) -#define PCIE_ATU_TYPE_IO (0x2 << 0) -#define PCIE_ATU_TYPE_CFG0 (0x4 << 0) -#define PCIE_ATU_TYPE_CFG1 (0x5 << 0) -#define PCIE_ATU_CR2 0x908 -#define PCIE_ATU_ENABLE (0x1 << 31) -#define PCIE_ATU_BAR_MODE_ENABLE (0x1 << 30) -#define PCIE_ATU_LOWER_BASE 0x90C -#define PCIE_ATU_UPPER_BASE 0x910 -#define PCIE_ATU_LIMIT 0x914 -#define PCIE_ATU_LOWER_TARGET 0x918 -#define PCIE_ATU_BUS (x) (((x) & 0xff) << 24) -#define PCIE_ATU_DEV (x) (((x) & 0x1f) << 19) -#define PCIE_ATU_FUNC (x) (((x) & 0x7) << 16) -#define PCIE_ATU_UPPER_TARGET 0x91C - -/* -* iATU Unroll-specific register definitions -* From 4.80 core version the address translation will be made by unroll -*/ -#define PCIE_ATU_UNR_REGION_CTRL1 0x00 -#define PCIE_ATU_UNR_REGION_CTRL2 0x04 -#define PCIE_ATU_UNR_LOWER_BASE 0x08 -#define PCIE_ATU_UNR_UPPER_BASE 0x0C -#define PCIE_ATU_UNR_LIMIT 0x10 -#define PCIE_ATU_UNR_LOWER_TARGET 0x14 -#define PCIE_ATU_UNR_UPPER_TARGET 0x18 - -/* Register address builder */ -#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (region) ((0x3 << 20) | (region << 9)) -/* PCIe Port Logic registers */ #define PLR_OFFSET 0x700#define
PCIE_PHY_DEBUG_R1(PLR_OFFSET+0x2c)drivers/pci/dwc/pcie- renamed from drivers/pci/dwc/pcie-designware.h +0
-0
designware.h
index a567ea2..b5226d4 100644drivers/pci/dwc/pcie-designware.h +71
-1@@ -14,6 +14,77 @@#ifndef _PCIE_DESIGNWARE_H#define _PCIE_DESIGNWARE_H +/* Parameters for the waiting for link up routine */ +#define LINK_WAIT_MAX_RETRIES 10 +#define LINK_WAIT_USLEEP_MIN 90000 +#define LINK_WAIT_USLEEP_MAX 100000 + +/* Parameters for the waiting for iATU enabled routine */ +#define LINK_WAIT_MAX_IATU_RETRIES 5 +#define LINK_WAIT_IATU_MIN 9000 +#define LINK_WAIT_IATU_MAX 10000 + +/* Synopsys-specific PCIe configuration registers */ +#define PCIE_PORT_LINK_CONTROL 0x710 +#define PORT_LINK_MODE_MASK (0x3f << 16) +#define PORT_LINK_MODE_1_LANES (0x1 << 16) +#define PORT_LINK_MODE_2_LANES (0x3 << 16) +#define PORT_LINK_MODE_4_LANES (0x7 << 16) +#define PORT_LINK_MODE_8_LANES (0xf << 16) + +#define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C +#define PORT_LOGIC_SPEED_CHANGE (0x1 << 17) +#define PORT_LOGIC_LINK_WIDTH_MASK (0x1f << 8) +#define PORT_LOGIC_LINK_WIDTH_1_LANES (0x1 << 8) +#define PORT_LOGIC_LINK_WIDTH_2_LANES (0x2 << 8) +#define PORT_LOGIC_LINK_WIDTH_4_LANES (0x4 << 8) +#define PORT_LOGIC_LINK_WIDTH_8_LANES (0x8 << 8) + +#define PCIE_MSI_ADDR_LO 0x820 +#define PCIE_MSI_ADDR_HI 0x824 +#define PCIE_MSI_INTR0_ENABLE 0x828 +#define PCIE_MSI_INTR0_MASK 0x82C +#define PCIE_MSI_INTR0_STATUS 0x830 + +#define PCIE_ATU_VIEWPORT 0x900 +#define PCIE_ATU_REGION_INBOUND (0x1 << 31) +#define PCIE_ATU_REGION_OUTBOUND (0x0 << 31) +#define PCIE_ATU_REGION_INDEX2 (0x2 << 0) +#define PCIE_ATU_REGION_INDEX1 (0x1 << 0) +#define PCIE_ATU_REGION_INDEX0 (0x0 << 0) +#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_TYPE_MEM (0x0 << 0) +#define PCIE_ATU_TYPE_IO (0x2 << 0) +#define PCIE_ATU_TYPE_CFG0 (0x4 << 0) +#define PCIE_ATU_TYPE_CFG1 (0x5 << 0) +#define PCIE_ATU_CR2 0x908 +#define PCIE_ATU_ENABLE (0x1 << 31) +#define PCIE_ATU_BAR_MODE_ENABLE (0x1 << 30) +#define PCIE_ATU_LOWER_BASE 0x90C +#define PCIE_ATU_UPPER_BASE 0x910 +#define PCIE_ATU_LIMIT 0x914 +#define PCIE_ATU_LOWER_TARGET 0x918 +#define PCIE_ATU_BUS (x) (((x) & 0xff) << 24) +#define PCIE_ATU_DEV (x) (((x) & 0x1f) << 19) +#define PCIE_ATU_FUNC (x) (((x) & 0x7) << 16) +#define PCIE_ATU_UPPER_TARGET 0x91C + +/* +* iATU Unroll-specific register definitions +* From 4.80 core version the address translation will be made by unroll +*/ +#define PCIE_ATU_UNR_REGION_CTRL1 0x00 +#define PCIE_ATU_UNR_REGION_CTRL2 0x04 +#define PCIE_ATU_UNR_LOWER_BASE 0x08 +#define PCIE_ATU_UNR_UPPER_BASE 0x0C +#define PCIE_ATU_UNR_LIMIT 0x10 +#define PCIE_ATU_UNR_LOWER_TARGET 0x14 +#define PCIE_ATU_UNR_UPPER_TARGET 0x18 + +/* Register address builder */ +#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (region) \ + ((0x3 << 20) | ((region) << 9)) +/* * Maximum number of MSI IRQs can be 256 per controller. But keep * it 32 as of now. Probably we will never need more than 32. If needed, -- 1.7.9.5
PATCH 2/10 PCI: dwc: *all*: Add platform_set_drvdata
In reply to Kishon Vijay Abraham IAdd platform_set_drvdata in all designware based drivers to store the private data structure of the driver so that dev_set_drvdata can be used to get back private data structure in add_pcie_port/host_init. This is in preparation for splitting struct pcie_port into core and host only structures. After the split pcie_port will not be part of the driver's private data structure and *container_of* used now to get the private data pointer cannot be used.
--- drivers/pci/dwc/pci-dra7xx.c | 3 ++- drivers/pci/dwc/pci-exynos.c | 3 ++- drivers/pci/dwc/pci-imx6.c | 3 ++- drivers/pci/dwc/pci-keystone.c | 2 ++ drivers/pci/dwc/pci-layerscape.c | 2 ++ drivers/pci/dwc/pcie-armada8k.c | 2 ++ drivers/pci/dwc/pcie-artpec6.c | 2 ++ drivers/pci/dwc/pcie-designware-plat.c | 2 ++ drivers/pci/dwc/pcie-hisi.c | 2 ++ drivers/pci/dwc/pcie-qcom.c | 2 ++ drivers/pci/dwc/pcie-spear13xx.c | 3 ++- 11 files changed, 22 insertions(+), 4 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +2 -1
@@ -433,6 +433,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)return ret; } +platform_set_drvdata (pdev, dra7xx); +pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev);if (ret <0 ) {
@@ -459,7 +461,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)if (ret <0 ) goto err_gpio; -platform_set_drvdata (pdev, dra7xx);return 0 ; err_gpio:
drivers/pci/dwc/pci-exynos.c +2 -1
@@ -583,11 +583,12 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) goto fail_bus_clk; } +platform_set_drvdata (pdev, exynos_pcie); + ret =exynos_add_pcie_port (exynos_pcie, pdev);if (ret <0 ) goto fail_bus_clk; -platform_set_drvdata (pdev, exynos_pcie);return 0 ; fail_bus_clk:
drivers/pci/dwc/pci-imx6.c +2 -1
@@ -719,11 +719,12 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)if (ret) imx6_pcie->link_gen =1 ; +platform_set_drvdata (pdev, imx6_pcie); + ret =imx6_add_pcie_port (imx6_pcie, pdev);if (ret <0 )return ret; -platform_set_drvdata (pdev, imx6_pcie);return 0 ; }
drivers/pci/dwc/pci-keystone.c +2 -0
@@ -422,6 +422,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev)if (ret)return ret; +platform_set_drvdata (pdev, ks_pcie); + ret =ks_add_pcie_port (ks_pcie, pdev);if (ret <0 ) goto fail_clk;
drivers/pci/dwc/pci-layerscape.c +2 -0
@@ -268,6 +268,8 @@ static int __init ls_pcie_probe(struct platform_device *pdev)if (!ls_pcie_is_bridge (pcie))return -ENODEV ; +platform_set_drvdata (pdev, pcie); + ret =ls_add_pcie_port (pcie);if (ret <0 )return ret;
drivers/pci/dwc/pcie-armada8k.c +2 -0
@@ -226,6 +226,8 @@ static int armada8k_pcie_probe(struct platform_device *pdev) goto fail; } +platform_set_drvdata (pdev, pcie); + ret =armada8k_add_pcie_port (pcie, pdev);if (ret) goto fail;
drivers/pci/dwc/pcie-artpec6.c +2 -0
@@ -261,6 +261,8 @@ static int artpec6_pcie_probe(struct platform_device *pdev)if (IS_ERR (artpec6_pcie->regmap))return PTR_ERR (artpec6_pcie->regmap); +platform_set_drvdata (pdev, artpec6_pcie); + ret =artpec6_add_pcie_port (artpec6_pcie, pdev);if (ret <0 )return ret;
drivers/pci/dwc/pcie-designware-plat.c +2 -0
@@ -104,6 +104,8 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)if (IS_ERR (pp->dbi_base))return PTR_ERR (pp->dbi_base); +platform_set_drvdata (pdev, dw_plat_pcie); + ret =dw_plat_add_pcie_port (pp, pdev);if (ret <0 )return ret;
drivers/pci/dwc/pcie-hisi.c +2 -0
@@ -287,6 +287,8 @@ static int hisi_pcie_probe(struct platform_device *pdev)if (IS_ERR (pp->dbi_base))return PTR_ERR (pp->dbi_base); +platform_set_drvdata (pdev, hisi_pcie); + ret =hisi_add_pcie_port (hisi_pcie, pdev);if (ret)return ret;
drivers/pci/dwc/pcie-qcom.c +2 -0
@@ -716,6 +716,8 @@ static int qcom_pcie_probe(struct platform_device *pdev)if (ret)return ret; +platform_set_drvdata (pdev, pcie); + ret =dw_pcie_host_init (pp);if (ret) {dev_err (dev,"cannot initialize host\n" );
drivers/pci/dwc/pcie-spear13xx.c +2 -1
@@ -270,11 +270,12 @@ static int spear13xx_pcie_probe(struct platform_device *pdev)if (of_property_read_bool (np,"st,pcie-is-gen1" )) spear13xx_pcie->is_gen1 = true; +platform_set_drvdata (pdev, spear13xx_pcie); + ret =spear13xx_add_pcie_port (spear13xx_pcie, pdev);if (ret <0 ) goto fail_clk; -platform_set_drvdata (pdev, spear13xx_pcie);return 0 ; fail_clk:
Signature · 1 line
1.7.9.5
PATCH 3/10 PCI: dwc: *all*: Rename cfg_read/cfg_write to read/write
In reply to Kishon Vijay Abraham INo functional change. dw_pcie_cfg_read/dw_pcie_cfg_write doesn't do anything specific to access configuration space. It can be just renamed to dw_pcie_read/dw_pcie_write and used to read/write data to dbi space.
--- drivers/pci/dwc/pci-dra7xx.c | 16 ++++++++-------- drivers/pci/dwc/pci-exynos.c | 4 ++-- drivers/pci/dwc/pci-keystone-dw.c | 4 ++-- drivers/pci/dwc/pcie-designware.c | 12 ++++++------ drivers/pci/dwc/pcie-designware.h | 4 ++-- drivers/pci/dwc/pcie-qcom.c | 2 +- drivers/pci/dwc/pcie-spear13xx.c | 24 ++++++++++++------------ 7 files changed, 33 insertions(+), 33 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +8 -8
@@ -109,22 +109,22 @@ static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx) }if (dra7xx->link_gen ==1 ) { -dw_pcie_cfg_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , -4 , ®); +dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , +4 , ®);if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_cfg_write (pp->dbi_base + exp_cap_off + -PCI_EXP_LNKCAP ,4 , reg); +dw_pcie_write (pp->dbi_base + exp_cap_off + +PCI_EXP_LNKCAP ,4 , reg); } -dw_pcie_cfg_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , -2 , ®); +dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , +2 , ®);if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_cfg_write (pp->dbi_base + exp_cap_off + -PCI_EXP_LNKCTL2 ,2 , reg); +dw_pcie_write (pp->dbi_base + exp_cap_off + +PCI_EXP_LNKCTL2 ,2 , reg); } }
drivers/pci/dwc/pci-exynos.c +2 -2
@@ -429,7 +429,7 @@ static int exynos_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,int ret;exynos_pcie_sideband_dbi_r_mode (exynos_pcie, true); - ret =dw_pcie_cfg_read (pp->dbi_base + where, size, val); + ret =dw_pcie_read (pp->dbi_base + where, size, val);exynos_pcie_sideband_dbi_r_mode (exynos_pcie, false);return ret; }
@@ -441,7 +441,7 @@ static int exynos_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,int ret;exynos_pcie_sideband_dbi_w_mode (exynos_pcie, true); - ret =dw_pcie_cfg_write (pp->dbi_base + where, size, val); + ret =dw_pcie_write (pp->dbi_base + where, size, val);exynos_pcie_sideband_dbi_w_mode (exynos_pcie, false);return ret; }
drivers/pci/dwc/pci-keystone-dw.c +2 -2
@@ -444,7 +444,7 @@ int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, addr =ks_pcie_cfg_setup (ks_pcie, bus_num, devfn); -return dw_pcie_cfg_read (addr + where, size, val); +return dw_pcie_read (addr + where, size, val); } int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
@@ -456,7 +456,7 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, addr =ks_pcie_cfg_setup (ks_pcie, bus_num, devfn); -return dw_pcie_cfg_write (addr + where, size, val); +return dw_pcie_write (addr + where, size, val); }/**
drivers/pci/dwc/pcie-designware.c +6 -6
@@ -33,7 +33,7 @@static struct pci_ops dw_pcie_ops; -int dw_pcie_cfg_read (void __iomem *addr,int size,u32 *val) +int dw_pcie_read (void __iomem *addr,int size,u32 *val) {if ((uintptr_t )addr & (size -1 )) { *val =0 ;
@@ -54,7 +54,7 @@ int dw_pcie_cfg_read(void __iomem *addr, int size, u32 *val)return PCIBIOS_SUCCESSFUL ; } -int dw_pcie_cfg_write (void __iomem *addr,int size,u32 val) +int dw_pcie_write (void __iomem *addr,int size,u32 val) {if ((uintptr_t )addr & (size -1 ))return PCIBIOS_BAD_REGISTER_NUMBER ;
@@ -108,7 +108,7 @@ static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,if (pp->ops->rd_own_conf)return pp->ops->rd_own_conf (pp, where, size, val); -return dw_pcie_cfg_read (pp->dbi_base + where, size, val); +return dw_pcie_read (pp->dbi_base + where, size, val); } static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,
@@ -117,7 +117,7 @@ static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,if (pp->ops->wr_own_conf)return pp->ops->wr_own_conf (pp, where, size, val); -return dw_pcie_cfg_write (pp->dbi_base + where, size, val); +return dw_pcie_write (pp->dbi_base + where, size, val); } static void dw_pcie_prog_outbound_atu(struct pcie_port *pp, int index,
@@ -635,7 +635,7 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,dw_pcie_prog_outbound_atu (pp,PCIE_ATU_REGION_INDEX1 , type, cpu_addr, busdev, cfg_size); - ret =dw_pcie_cfg_read (va_cfg_base + where, size, val); + ret =dw_pcie_read (va_cfg_base + where, size, val);if (pp->num_viewport <=2 ) dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, PCIE_ATU_TYPE_IO, pp->io_base,
@@ -673,7 +673,7 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,dw_pcie_prog_outbound_atu (pp,PCIE_ATU_REGION_INDEX1 , type, cpu_addr, busdev, cfg_size); - ret =dw_pcie_cfg_write (va_cfg_base + where, size, val); + ret =dw_pcie_write (va_cfg_base + where, size, val);if (pp->num_viewport <=2 ) dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, PCIE_ATU_TYPE_IO, pp->io_base,
drivers/pci/dwc/pcie-designware.h +2 -2
@@ -145,8 +145,8 @@ struct pcie_host_ops {u32 dw_pcie_readl_rc (struct pcie_port *pp,u32 reg);void dw_pcie_writel_rc (struct pcie_port *pp,u32 reg,u32 val); -int dw_pcie_cfg_read (void __iomem *addr,int size,u32 *val); -int dw_pcie_cfg_write (void __iomem *addr,int size,u32 val); +int dw_pcie_read (void __iomem *addr,int size,u32 *val); +int dw_pcie_write (void __iomem *addr,int size,u32 val);irqreturn_t dw_handle_msi_irq (struct pcie_port *pp);void dw_pcie_msi_init (struct pcie_port *pp);int dw_pcie_wait_for_link (struct pcie_port *pp);
drivers/pci/dwc/pcie-qcom.c +1 -1
@@ -621,7 +621,7 @@ static int qcom_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,return PCIBIOS_SUCCESSFUL ; } -return dw_pcie_cfg_read (pp->dbi_base + where, size, val); +return dw_pcie_read (pp->dbi_base + where, size, val); }static struct pcie_host_ops qcom_pcie_dw_ops = {
drivers/pci/dwc/pcie-spear13xx.c +12 -12
@@ -91,34 +91,34 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)* default value in capability register is 512 bytes. So force * it to 128 here. */ -dw_pcie_cfg_read (pp->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , &val); +dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , &val); val &= ~PCI_EXP_DEVCTL_READRQ ; -dw_pcie_cfg_write (pp->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , val); +dw_pcie_write (pp->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , val); -dw_pcie_cfg_write (pp->dbi_base +PCI_VENDOR_ID ,2 ,0x104A ); -dw_pcie_cfg_write (pp->dbi_base +PCI_DEVICE_ID ,2 ,0xCD80 ); +dw_pcie_write (pp->dbi_base +PCI_VENDOR_ID ,2 ,0x104A ); +dw_pcie_write (pp->dbi_base +PCI_DEVICE_ID ,2 ,0xCD80 );/* * if is_gen1 is set then handle it, so that some buggy card * also works */ if (spear13xx_pcie->is_gen1) { -dw_pcie_cfg_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , -4 , &val); +dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , +4 , &val);if ((val &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); val |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_cfg_write (pp->dbi_base + exp_cap_off + -PCI_EXP_LNKCAP ,4 , val); +dw_pcie_write (pp->dbi_base + exp_cap_off + +PCI_EXP_LNKCAP ,4 , val); } -dw_pcie_cfg_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , -2 , &val); +dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , +2 , &val);if ((val &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); val |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_cfg_write (pp->dbi_base + exp_cap_off + -PCI_EXP_LNKCTL2 ,2 , val); +dw_pcie_write (pp->dbi_base + exp_cap_off + +PCI_EXP_LNKCTL2 ,2 , val); } }
Signature · 1 line
1.7.9.5
PATCH 4/10 PCI: dwc: designware: Get device pointer at the start of dw_pcie_host_init
In reply to Kishon Vijay Abraham INo functional change. Get device pointer at the beginning of dw_pcie_host_init instead of getting it all over dw_pcie_host_init. This is in preparation for splitting struct pcie_port into host and core structures (Once split pcie_port will not have device pointer).
--- drivers/pci/dwc/pcie-designware.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/pci/dwc/pcie-designware.c +17 -16
@@ -446,8 +446,9 @@ static u8 dw_pcie_iatu_unroll_enabled(struct pcie_port *pp)int dw_pcie_host_init (struct pcie_port *pp) { -struct device_node *np = pp->dev->of_node; -struct platform_device *pdev =to_platform_device (pp->dev); +struct device *dev = pp->dev; +struct device_node *np = dev->of_node; +struct platform_device *pdev =to_platform_device (dev);struct pci_bus *bus, *child;struct resource *cfg_res;int i, ret;
@@ -461,14 +462,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base = cfg_res->start; pp->cfg1_base = cfg_res->start + pp->cfg0_size; }else if (!pp->va_cfg0_base) { -dev_err (pp->dev,"missing *config* reg space\n" ); +dev_err (dev,"missing *config* reg space\n" ); } ret =of_pci_get_host_bridge_resources (np,0 ,0xff , &res, &pp->io_base);if (ret)return ret; - ret =devm_request_pci_bus_resources (&pdev->dev, &res); + ret =devm_request_pci_bus_resources (dev, &res);if (ret) goto error;
@@ -478,7 +479,7 @@ int dw_pcie_host_init(struct pcie_port *pp)case IORESOURCE_IO : ret =pci_remap_iospace (win->res, pp->io_base);if (ret) { -dev_warn (pp->dev,"error %d: failed to map resource %pR\n" , +dev_warn (dev,"error %d: failed to map resource %pR\n" , ret, win->res);resource_list_destroy_entry (win); }else {
@@ -508,10 +509,10 @@ int dw_pcie_host_init(struct pcie_port *pp) }if (!pp->dbi_base) { - pp->dbi_base =devm_ioremap (pp->dev, pp->cfg->start, + pp->dbi_base =devm_ioremap (dev, pp->cfg->start,resource_size (pp->cfg));if (!pp->dbi_base) { -dev_err (pp->dev,"error with ioremap\n" ); +dev_err (dev,"error with ioremap\n" ); ret = -ENOMEM ; goto error; }
@@ -520,20 +521,20 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->mem_base = pp->mem->start;if (!pp->va_cfg0_base) { - pp->va_cfg0_base =devm_ioremap (pp->dev, pp->cfg0_base, + pp->va_cfg0_base =devm_ioremap (dev, pp->cfg0_base, pp->cfg0_size);if (!pp->va_cfg0_base) { -dev_err (pp->dev,"error with ioremap in function\n" ); +dev_err (dev,"error with ioremap in function\n" ); ret = -ENOMEM ; goto error; } }if (!pp->va_cfg1_base) { - pp->va_cfg1_base =devm_ioremap (pp->dev, pp->cfg1_base, + pp->va_cfg1_base =devm_ioremap (dev, pp->cfg1_base, pp->cfg1_size);if (!pp->va_cfg1_base) { -dev_err (pp->dev,"error with ioremap\n" ); +dev_err (dev,"error with ioremap\n" ); ret = -ENOMEM ; goto error; }
@@ -549,11 +550,11 @@ int dw_pcie_host_init(struct pcie_port *pp)if (IS_ENABLED (CONFIG_PCI_MSI )) {if (!pp->ops->msi_host_init) { - pp->irq_domain =irq_domain_add_linear (pp->dev->of_node, + pp->irq_domain =irq_domain_add_linear (dev->of_node,MAX_MSI_IRQS , &msi_domain_ops, &dw_pcie_msi_chip);if (!pp->irq_domain) { -dev_err (pp->dev,"irq domain init failed\n" ); +dev_err (dev,"irq domain init failed\n" ); ret = -ENXIO ; goto error; }
@@ -572,12 +573,12 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->root_bus_nr = pp->busn->start;if (IS_ENABLED (CONFIG_PCI_MSI )) { - bus =pci_scan_root_bus_msi (pp->dev, pp->root_bus_nr, + bus =pci_scan_root_bus_msi (dev, pp->root_bus_nr, &dw_pcie_ops, pp, &res, &dw_pcie_msi_chip); - dw_pcie_msi_chip.dev = pp->dev; + dw_pcie_msi_chip.dev = dev; }else - bus =pci_scan_root_bus (pp->dev, pp->root_bus_nr, &dw_pcie_ops, + bus =pci_scan_root_bus (dev, pp->root_bus_nr, &dw_pcie_ops, pp, &res);if (!bus) { ret = -ENOMEM ;
Signature · 1 line
1.7.9.5
PATCH 5/10 PCI: dwc: *all*: Split *struct pcie_port* into host only and core structures
In reply to Kishon Vijay Abraham IKeep only the host specific members in *struct pcie_port* and move the common members (i.e common to both host and endpoint) to *struct dw_pcie*. This is in preparation for adding endpoint mode support to designware driver.
While at that also fix checkpatch warnings.
--- drivers/pci/dwc/pci-dra7xx.c | 80 ++++++++----- drivers/pci/dwc/pci-exynos.c | 78 +++++++----- drivers/pci/dwc/pci-imx6.c | 128 ++++++++++---------- drivers/pci/dwc/pci-keystone-dw.c | 83 +++++++------ drivers/pci/dwc/pci-keystone.c | 54 +++++---- drivers/pci/dwc/pci-keystone.h | 4 +- drivers/pci/dwc/pci-layerscape.c | 91 +++++++++----- drivers/pci/dwc/pcie-armada8k.c | 85 +++++++------ drivers/pci/dwc/pcie-artpec6.c | 48 ++++---- drivers/pci/dwc/pcie-designware-plat.c | 27 +++-- drivers/pci/dwc/pcie-designware.c | 203 +++++++++++++++++--------------- drivers/pci/dwc/pcie-designware.h | 67 ++++++----- drivers/pci/dwc/pcie-hisi.c | 55 +++++---- drivers/pci/dwc/pcie-qcom.c | 70 +++++++---- drivers/pci/dwc/pcie-spear13xx.c | 74 +++++++----- 15 files changed, 666 insertions(+), 481 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +48 -32
@@ -67,7 +67,7 @@#define EXP_CAP_ID_OFFSET 0x70struct dra7xx_pcie { -struct pcie_port pp; +struct dw_pcie *pci;void __iomem *base;/* DT ti_conf */ int phy_count;/* DT phy-names count */ struct phy **phy;
@@ -75,7 +75,7 @@ struct dra7xx_pcie {struct irq_domain *irq_domain; }; -#define to_dra7xx_pcie (x) container_of((x), struct dra7xx_pcie, pp) +#define to_dra7xx_pcie (x) dev_get_drvdata((x)->dev)static inline u32 dra7xx_pcie_readl (struct dra7xx_pcie *pcie,u32 offset) {
@@ -88,9 +88,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset,writel (value, pcie->base + offset); } -static int dra7xx_pcie_link_up (struct pcie_port *pp) +static int dra7xx_pcie_link_up (struct dw_pcie *pci) { -struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pp); +struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci);u32 reg =dra7xx_pcie_readl (dra7xx,PCIECTRL_DRA7XX_CONF_PHY_CS );return !!(reg &LINK_UP );
@@ -98,32 +98,32 @@ static int dra7xx_pcie_link_up(struct pcie_port *pp)static int dra7xx_pcie_establish_link (struct dra7xx_pcie *dra7xx) { -struct pcie_port *pp = &dra7xx->pp; -struct device *dev = pp->dev; +struct dw_pcie *pci = dra7xx->pci; +struct device *dev = pci->dev;u32 reg;u32 exp_cap_off =EXP_CAP_ID_OFFSET ; -if (dw_pcie_link_up (pp)) { +if (dw_pcie_link_up (pci)) {dev_err (dev,"link is already up\n" );return 0 ; }if (dra7xx->link_gen ==1 ) { -dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , +dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCAP ,4 , ®);if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pp->dbi_base + exp_cap_off + +dw_pcie_write (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCAP ,4 , reg); } -dw_pcie_read (pp->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , +dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 ,2 , ®);if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pp->dbi_base + exp_cap_off + +dw_pcie_write (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 ,2 , reg); } }
@@ -132,7 +132,7 @@ static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx) reg |=LTSSM_EN ;dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_DEVICE_CMD , reg); -return dw_pcie_wait_for_link (pp); +return dw_pcie_wait_for_link (pci); }static void dra7xx_pcie_enable_interrupts (struct dra7xx_pcie *dra7xx)
@@ -149,7 +149,8 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx)static void dra7xx_pcie_host_init (struct pcie_port *pp) { -struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pp); +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci); pp->io_base &=DRA7XX_CPU_TO_BUS_ADDR ; pp->mem_base &=DRA7XX_CPU_TO_BUS_ADDR ;
@@ -163,8 +164,7 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp)dra7xx_pcie_enable_interrupts (dra7xx); } -static struct pcie_host_ops dra7xx_pcie_host_ops = { - .link_up = dra7xx_pcie_link_up, +static struct dw_pcie_host_ops dra7xx_pcie_host_ops = { .host_init = dra7xx_pcie_host_init, };
@@ -183,8 +183,9 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq,static int dra7xx_pcie_init_irq_domain (struct pcie_port *pp) { -struct device *dev = pp->dev; -struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pp); +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct device *dev = pci->dev; +struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci);struct device_node *node = dev->of_node;struct device_node *pcie_intc_node =of_get_next_child (node,NULL );
@@ -206,7 +207,8 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)static irqreturn_t dra7xx_pcie_msi_irq_handler (int irq,void *arg) {struct dra7xx_pcie *dra7xx = arg; -struct pcie_port *pp = &dra7xx->pp; +struct dw_pcie *pci = dra7xx->pci; +struct pcie_port *pp = &pci->pp;u32 reg; reg =dra7xx_pcie_readl (dra7xx,PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI );
@@ -233,7 +235,8 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)static irqreturn_t dra7xx_pcie_irq_handler (int irq,void *arg) {struct dra7xx_pcie *dra7xx = arg; -struct device *dev = dra7xx->pp.dev; +struct dw_pcie *pci = dra7xx->pci; +struct device *dev = pci->dev;u32 reg; reg =dra7xx_pcie_readl (dra7xx,PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN );
@@ -288,8 +291,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, struct platform_device *pdev) {int ret; -struct pcie_port *pp = &dra7xx->pp; -struct device *dev = pp->dev; +struct dw_pcie *pci = dra7xx->pci; +struct pcie_port *pp = &pci->pp; +struct device *dev = pci->dev;struct resource *res; pp->irq =platform_get_irq (pdev,1 );
@@ -311,8 +315,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,return ret; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"rc_dbics" ); - pp->dbi_base =devm_ioremap (dev, res->start,resource_size (res)); -if (!pp->dbi_base) + pci->dbi_base =devm_ioremap (dev, res->start,resource_size (res)); +if (!pci->dbi_base)return -ENOMEM ; ret =dw_pcie_host_init (pp);
@@ -324,6 +328,10 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,return 0 ; } +static const struct dw_pcie_ops dw_pcie_ops = { + .link_up = dra7xx_pcie_link_up, +}; +static void dra7xx_pcie_disable_phy (struct dra7xx_pcie *dra7xx) {int phy_count = dra7xx->phy_count;
@@ -373,8 +381,9 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)struct phy **phy;void __iomem *base;struct resource *res; -struct dra7xx_pcie *dra7xx; +struct dw_pcie *pci;struct pcie_port *pp; +struct dra7xx_pcie *dra7xx;struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;char name[10 ];
@@ -384,8 +393,14 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)if (!dra7xx)return -ENOMEM ; - pp = &dra7xx->pp; - pp->dev = dev; + pci =devm_kzalloc (dev,sizeof (*pci),GFP_KERNEL ); +if (!pci) +return -ENOMEM ; + + pci->dev = dev; + pci->ops = &dw_pcie_ops; + + pp = &pci->pp; pp->ops = &dra7xx_pcie_host_ops; irq =platform_get_irq (pdev,0 );
@@ -425,6 +440,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) dra7xx->base = base; dra7xx->phy = phy; + dra7xx->pci = pci; dra7xx->phy_count = phy_count; ret =dra7xx_pcie_enable_phy (dra7xx);
@@ -477,13 +493,13 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)static int dra7xx_pcie_suspend (struct device *dev) {struct dra7xx_pcie *dra7xx =dev_get_drvdata (dev); -struct pcie_port *pp = &dra7xx->pp; +struct dw_pcie *pci = dra7xx->pci;u32 val;/* clear MSE */ - val =dw_pcie_readl_rc (pp,PCI_COMMAND ); + val =dw_pcie_readl_dbi (pci,PCI_COMMAND ); val &= ~PCI_COMMAND_MEMORY ; -dw_pcie_writel_rc (pp,PCI_COMMAND , val); +dw_pcie_writel_dbi (pci,PCI_COMMAND , val);return 0 ; }
@@ -491,13 +507,13 @@ static int dra7xx_pcie_suspend(struct device *dev)static int dra7xx_pcie_resume (struct device *dev) {struct dra7xx_pcie *dra7xx =dev_get_drvdata (dev); -struct pcie_port *pp = &dra7xx->pp; +struct dw_pcie *pci = dra7xx->pci;u32 val;/* set MSE */ - val =dw_pcie_readl_rc (pp,PCI_COMMAND ); + val =dw_pcie_readl_dbi (pci,PCI_COMMAND ); val |=PCI_COMMAND_MEMORY ; -dw_pcie_writel_rc (pp,PCI_COMMAND , val); +dw_pcie_writel_dbi (pci,PCI_COMMAND , val);return 0 ; }
drivers/pci/dwc/pci-exynos.c +46 -32
193 lines not on this page · raw message
drivers/pci/dwc/pci-imx6.c +69 -59
364 lines not on this page · raw message
drivers/pci/dwc/pci-keystone-dw.c +50 -33
234 lines not on this page · raw message
drivers/pci/dwc/pci-keystone.c +32 -22
146 lines not on this page · raw message
drivers/pci/dwc/pci-keystone.h +2 -2
@@ -17,7 +17,7 @@#define MAX_LEGACY_HOST_IRQS 4struct keystone_pcie { -struct pcie_port pp;/* pp.dbi_base is DT 0th res */ +struct dw_pcie *pci;struct clk *clk;/* PCI Device ID */ u32 device_id;
@@ -54,10 +54,10 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,int ks_dw_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val);void ks_dw_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie); -int ks_dw_pcie_link_up (struct pcie_port *pp);void ks_dw_pcie_initiate_link_train (struct keystone_pcie *ks_pcie);void ks_dw_pcie_msi_set_irq (struct pcie_port *pp,int irq);void ks_dw_pcie_msi_clear_irq (struct pcie_port *pp,int irq);void ks_dw_pcie_v3_65_scan_bus (struct pcie_port *pp);int ks_dw_pcie_msi_host_init (struct pcie_port *pp,struct msi_controller *chip); +int ks_dw_pcie_link_up (struct dw_pcie *pci);
drivers/pci/dwc/pci-layerscape.c +59 -32
221 lines not on this page · raw message
drivers/pci/dwc/pcie-armada8k.c +47 -38
189 lines not on this page · raw message
drivers/pci/dwc/pcie-artpec6.c +28 -20
120 lines not on this page · raw message
drivers/pci/dwc/pcie-designware-plat.c +16 -11
@@ -25,7 +25,7 @@#include "pcie-designware.h" struct dw_plat_pcie { -struct pcie_port pp;/* pp.dbi_base is DT 0th resource */ +struct dw_pcie *pci; };static irqreturn_t dw_plat_pcie_msi_irq_handler (int irq,void *arg)
@@ -37,21 +37,23 @@ static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg)static void dw_plat_pcie_host_init (struct pcie_port *pp) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +dw_pcie_setup_rc (pp); -dw_pcie_wait_for_link (pp); +dw_pcie_wait_for_link (pci);if (IS_ENABLED (CONFIG_PCI_MSI ))dw_pcie_msi_init (pp); } -static struct pcie_host_ops dw_plat_pcie_host_ops = { +static struct dw_pcie_host_ops dw_plat_pcie_host_ops = { .host_init = dw_plat_pcie_host_init, };static int dw_plat_add_pcie_port (struct pcie_port *pp,struct platform_device *pdev) { -struct device *dev = pp->dev; +struct device *dev = &pdev->dev;int ret; pp->irq =platform_get_irq (pdev,1 );
@@ -88,7 +90,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct dw_plat_pcie *dw_plat_pcie; -struct pcie_port *pp; +struct dw_pcie *pci;struct resource *res;/* Resource from DT */ int ret;
@@ -96,17 +98,20 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)if (!dw_plat_pcie)return -ENOMEM ; - pp = &dw_plat_pcie->pp; - pp->dev = dev; + pci =devm_kzalloc (dev,sizeof (*pci),GFP_KERNEL ); +if (!pci) +return -ENOMEM ; + + pci->dev = dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - pp->dbi_base =devm_ioremap_resource (dev, res); -if (IS_ERR (pp->dbi_base)) -return PTR_ERR (pp->dbi_base); + pci->dbi_base =devm_ioremap_resource (dev, res); +if (IS_ERR (pci->dbi_base)) +return PTR_ERR (pci->dbi_base);platform_set_drvdata (pdev, dw_plat_pcie); - ret =dw_plat_add_pcie_port (pp, pdev); + ret =dw_plat_add_pcie_port (&pci->pp, pdev);if (ret <0 )return ret;
drivers/pci/dwc/pcie-designware.c +108 -95
405 lines not on this page · raw message
drivers/pci/dwc/pcie-designware.h +40 -27
94 lines not on this page · raw message
drivers/pci/dwc/pcie-hisi.c +33 -22
136 lines not on this page · raw message
drivers/pci/dwc/pcie-qcom.c +45 -25
193 lines not on this page · raw message
drivers/pci/dwc/pcie-spear13xx.c +43 -31
186 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 6/10 PCI: dwc: designware: Parse *num-lanes* property in dw_pcie_setup_rc
In reply to Kishon Vijay Abraham I*num-lanes* dt property is parsed in dw_pcie_host_init. However *num-lanes* property is applicable to both root complex mode and endpoint mode. As a first step, move the parsing of this property outside dw_pcie_host_init. This is in preparation for splitting pcie-designware.c to pcie-designware.c and pcie-designware-host.c
--- drivers/pci/dwc/pcie-designware.c | 18 +++++++++++------- drivers/pci/dwc/pcie-designware.h | 1 - 2 files changed, 11 insertions(+), 8 deletions(-)
drivers/pci/dwc/pcie-designware.c +11 -7
@@ -548,10 +548,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } } - ret =of_property_read_u32 (np,"num-lanes" , &pci->lanes); -if (ret) - pci->lanes =0 ; - ret =of_property_read_u32 (np,"num-viewport" , &pci->num_viewport);if (ret) pci->num_viewport =2 ;
@@ -748,13 +744,21 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn,void dw_pcie_setup_rc (struct pcie_port *pp) { +int ret; +u32 lanes;u32 val;struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct device *dev = pci->dev; +struct device_node *np = dev->of_node; + + ret =of_property_read_u32 (np,"num-lanes" , &lanes); +if (ret) + lanes =0 ;/* set the number of lanes */ val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_MODE_MASK ; -switch (pci->lanes) { +switch (lanes) {case 1 : val |=PORT_LINK_MODE_1_LANES ;break ;
@@ -768,7 +772,7 @@ void dw_pcie_setup_rc(struct pcie_port *pp) val |=PORT_LINK_MODE_8_LANES ;break ;default : -dev_err (pci->dev,"num-lanes %u: invalid value\n" , pci->lanes); +dev_err (pci->dev,"num-lanes %u: invalid value\n" , lanes);return ; }dw_pcie_writel_dbi (pci,PCIE_PORT_LINK_CONTROL , val);
@@ -776,7 +780,7 @@ void dw_pcie_setup_rc(struct pcie_port *pp)/* set link width speed control register */ val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); val &= ~PORT_LOGIC_LINK_WIDTH_MASK ; -switch (pci->lanes) { +switch (lanes) {case 1 : val |=PORT_LOGIC_LINK_WIDTH_1_LANES ;break ;
drivers/pci/dwc/pcie-designware.h +0 -1
@@ -147,7 +147,6 @@ struct dw_pcie_ops {struct dw_pcie {struct device *dev;void __iomem *dbi_base; -u32 lanes;u32 num_viewport;u8 iatu_unroll_enabled;struct pcie_port pp;
Signature · 1 line
1.7.9.5
PATCH 7/10 PCI: dwc: designware: Fix style errors in pcie-designware.c
In reply to Kishon Vijay Abraham INo functional change. Fix all checkpatch warnings and check errors in pcie-designware.c
--- drivers/pci/dwc/pcie-designware.c | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/pci/dwc/pcie-designware.c +21 -21
@@ -40,13 +40,13 @@ int dw_pcie_read(void __iomem *addr, int size, u32 *val)return PCIBIOS_BAD_REGISTER_NUMBER ; } -if (size ==4 ) +if (size ==4 ) { *val =readl (addr); -else if (size ==2 ) + }else if (size ==2 ) { *val =readw (addr); -else if (size ==1 ) + }else if (size ==1 ) { *val =readb (addr); -else { + }else { *val =0 ;return PCIBIOS_BAD_REGISTER_NUMBER ; }
@@ -200,16 +200,15 @@ irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)for (i =0 ; i <MAX_MSI_CTRLS ; i++) {dw_pcie_rd_own_conf (pp,PCIE_MSI_INTR0_STATUS + i *12 ,4 , - (u32 *)&val); + (u32 *)&val);if (val) { ret =IRQ_HANDLED ; pos =0 ;while ((pos =find_next_bit (&val,32 , pos)) !=32 ) { irq =irq_find_mapping (pp->irq_domain, - i *32 + pos); -dw_pcie_wr_own_conf (pp, -PCIE_MSI_INTR0_STATUS + i *12 , -4 ,1 << pos); + i *32 + pos); +dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_STATUS + + i *12 ,4 ,1 << pos);generic_handle_irq (irq); pos++; }
@@ -275,8 +274,9 @@ static void dw_pcie_msi_set_irq(struct pcie_port *pp, int irq)static int assign_irq (int no_irqs,struct msi_desc *desc,int *pos) {int irq, pos0, i; -struct pcie_port *pp = (struct pcie_port *)msi_desc_to_pci_sysdata (desc); +struct pcie_port *pp; + pp = (struct pcie_port *)msi_desc_to_pci_sysdata (desc); pos0 =bitmap_find_free_region (pp->msi_irq_in_use,MAX_MSI_IRQS ,order_base_2 (no_irqs));if (pos0 <0 )
@@ -338,7 +338,7 @@ static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos) }static int dw_msi_setup_irq (struct msi_controller *chip,struct pci_dev *pdev, -struct msi_desc *desc) +struct msi_desc *desc) {int irq, pos;struct pcie_port *pp = pdev->bus->sysdata;
@@ -386,7 +386,7 @@ static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq) {struct irq_data *data =irq_get_irq_data (irq);struct msi_desc *msi =irq_data_get_msi_desc (data); -struct pcie_port *pp = (struct pcie_port *)msi_desc_to_pci_sysdata (msi); +struct pcie_port *pp = (struct pcie_port *)msi_desc_to_pci_sysdata (msi);clear_irq_range (pp, irq,1 , data->hwirq); }
@@ -428,7 +428,7 @@ int dw_pcie_link_up(struct dw_pcie *pci) }static int dw_pcie_msi_map (struct irq_domain *domain,unsigned int irq, -irq_hw_number_t hwirq) +irq_hw_number_t hwirq) {irq_set_chip_and_handler (irq, &dw_msi_irq_chip, handle_simple_irq);irq_set_chip_data (irq, domain->host_data);
@@ -465,8 +465,8 @@ int dw_pcie_host_init(struct pcie_port *pp) cfg_res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"config" );if (cfg_res) { - pp->cfg0_size =resource_size (cfg_res)/2 ; - pp->cfg1_size =resource_size (cfg_res)/2 ; + pp->cfg0_size =resource_size (cfg_res) /2 ; + pp->cfg1_size =resource_size (cfg_res) /2 ; pp->cfg0_base = cfg_res->start; pp->cfg1_base = cfg_res->start + pp->cfg0_size; }else if (!pp->va_cfg0_base) {
@@ -505,8 +505,8 @@ int dw_pcie_host_init(struct pcie_port *pp)break ;case 0 : pp->cfg = win->res; - pp->cfg0_size =resource_size (pp->cfg)/2 ; - pp->cfg1_size =resource_size (pp->cfg)/2 ; + pp->cfg0_size =resource_size (pp->cfg) /2 ; + pp->cfg1_size =resource_size (pp->cfg) /2 ; pp->cfg0_base = pp->cfg->start; pp->cfg1_base = pp->cfg->start + pp->cfg0_size;break ;
@@ -612,7 +612,7 @@ int dw_pcie_host_init(struct pcie_port *pp) }static int dw_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, -u32 devfn,int where,int size,u32 *val) +u32 devfn,int where,int size,u32 *val) {int ret, type;u32 busdev, cfg_size;
@@ -651,7 +651,7 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, }static int dw_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, -u32 devfn,int where,int size,u32 val) +u32 devfn,int where,int size,u32 val) {int ret, type;u32 busdev, cfg_size;
@@ -708,7 +708,7 @@ static int dw_pcie_valid_device(struct pcie_port *pp, struct pci_bus *bus, }static int dw_pcie_rd_conf (struct pci_bus *bus,u32 devfn,int where, -int size,u32 *val) +int size,u32 *val) {struct pcie_port *pp = bus->sysdata;
@@ -724,7 +724,7 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, }static int dw_pcie_wr_conf (struct pci_bus *bus,u32 devfn, -int where,int size,u32 val) +int where,int size,u32 val) {struct pcie_port *pp = bus->sysdata;
Signature · 1 line
1.7.9.5
PATCH 8/10 PCI: dwc: Split pcie-designware.c into host and core files
In reply to Kishon Vijay Abraham ISplit pcie-designware.c into pcie-designware-host.c that contains the host specific parts of the driver and pcie-designware.c that contains the parts used by both host driver and endpoint driver.
--- drivers/pci/dwc/Makefile | 2 +- drivers/pci/dwc/pcie-designware-host.c | 635 ++++++++++++++++++++++++++++++++ drivers/pci/dwc/pcie-designware.c | 629 +------------------------------ drivers/pci/dwc/pcie-designware.h | 8 + 4 files changed, 650 insertions(+), 624 deletions(-) create mode 100644 drivers/pci/dwc/pcie-designware-host.c
drivers/pci/dwc/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-$(CONFIG_PCIE_DW) += pcie-designware.o +obj-$(CONFIG_PCIE_DW) += pcie-designware.o pcie-designware-host.o obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
drivers/pci/dwc/pcie-designware-host.c new file +635 -0
635 lines not on this page · raw message
drivers/pci/dwc/pcie-designware.c +6 -623
667 lines not on this page · raw message
drivers/pci/dwc/pcie-designware.h +8 -0
@@ -14,6 +14,10 @@#ifndef _PCIE_DESIGNWARE_H#define _PCIE_DESIGNWARE_H +#include <linux/irq.h> +#include <linux/msi.h> +#include <linux/pci.h> +/* Parameters for the waiting for link up routine */ #define LINK_WAIT_MAX_RETRIES 10#define LINK_WAIT_USLEEP_MIN 90000
@@ -166,4 +170,8 @@ struct dw_pcie {void dw_pcie_writel_dbi (struct dw_pcie *pci,u32 reg,u32 val);int dw_pcie_link_up (struct dw_pcie *pci);int dw_pcie_wait_for_link (struct dw_pcie *pci); +void dw_pcie_prog_outbound_atu (struct dw_pcie *pci,int index, +int type,u64 cpu_addr,u64 pci_addr, +u32 size); +void dw_pcie_setup (struct dw_pcie *pci);#endif /* _PCIE_DESIGNWARE_H */
Signature · 1 line
1.7.9.5
PATCH 9/10 PCI: dwc: Create a new config symbol to enable pci dwc host
In reply to Kishon Vijay Abraham INow that pci designware host has a separate file, create a new config symbol to select the host only driver. This will enable to independently select host support and endpoint suppor (when it's added).
--- drivers/pci/dwc/Kconfig | 26 +++++++++++++++----------- drivers/pci/dwc/Makefile | 3 ++- drivers/pci/dwc/pcie-designware.h | 29 +++++++++++++++++++++++++---- 3 files changed, 42 insertions(+), 16 deletions(-)
drivers/pci/dwc/Kconfig +15 -11
@@ -3,13 +3,17 @@ menu "DesignWare PCI Core Support" config PCIE_DW bool + +config PCIE_DW_HOST + bool depends on PCI_MSI_IRQ_DOMAIN + select PCIE_DW config PCI_DRA7XX bool "TI DRA7xx PCIe controller" depends on OF && HAS_IOMEM && TI_PIPE3 depends on PCI_MSI_IRQ_DOMAIN - select PCIE_DW + select PCIE_DW_HOST help Enables support for the PCIe controller in the DRA7xx SoC. There are two instances of PCIe controller in DRA7xx. This controller can
@@ -18,7 +22,7 @@ config PCI_DRA7XX config PCIE_DW_PLAT bool "Platform bus based DesignWare PCIe Controller" depends on PCI_MSI_IRQ_DOMAIN - select PCIE_DW + select PCIE_DW_HOST ---help--- This selects the DesignWare PCIe controller support. Select this if you have a PCIe controller on Platform bus.
@@ -32,21 +36,21 @@ config PCI_EXYNOS depends on SOC_EXYNOS5440 depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST config PCI_IMX6 bool "Freescale i.MX6 PCIe controller" depends on SOC_IMX6Q depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST config PCIE_SPEAR13XX bool "STMicroelectronics SPEAr PCIe controller" depends on ARCH_SPEAR13XX depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here if you want PCIe support on SPEAr13XX SoCs.
@@ -55,7 +59,7 @@ config PCI_KEYSTONE depends on ARCH_KEYSTONE depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here if you want to enable PCI controller support on Keystone SoCs. The PCI controller on Keystone is based on Designware hardware
@@ -67,7 +71,7 @@ config PCI_LAYERSCAPE depends on OF && (ARM || ARCH_LAYERSCAPE) depends on PCI_MSI_IRQ_DOMAIN select MFD_SYSCON - select PCIE_DW + select PCIE_DW_HOST help Say Y here if you want PCIe controller support on Layerscape SoCs.
@@ -76,7 +80,7 @@ config PCI_HISI bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here if you want PCIe controller support on HiSilicon Hip05 and Hip06 SoCs
@@ -86,7 +90,7 @@ config PCIE_QCOM depends on ARCH_QCOM && OF depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here to enable PCIe controller support on Qualcomm SoCs. The PCIe controller uses the Designware core plus Qualcomm-specific
@@ -97,7 +101,7 @@ config PCIE_ARMADA_8K depends on ARCH_MVEBU depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here if you want to enable PCIe controller support on Armada-8K SoCs. The PCIe controller on Armada-8K is based on
@@ -109,7 +113,7 @@ config PCIE_ARTPEC6 depends on MACH_ARTPEC6 depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS - select PCIE_DW + select PCIE_DW_HOST help Say Y here to enable PCIe controller support on Axis ARTPEC-6 SoCs. This PCIe controller uses the DesignWare core.
drivers/pci/dwc/Makefile +2 -1
@@ -1,4 +1,5 @@ -obj-$(CONFIG_PCIE_DW) += pcie-designware.o pcie-designware-host.o +obj-$(CONFIG_PCIE_DW) += pcie-designware.o +obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
drivers/pci/dwc/pcie-designware.h +25 -4
@@ -161,10 +161,6 @@ struct dw_pcie {int dw_pcie_read (void __iomem *addr,int size,u32 *val);int dw_pcie_write (void __iomem *addr,int size,u32 val); -irqreturn_t dw_handle_msi_irq (struct pcie_port *pp); -void dw_pcie_msi_init (struct pcie_port *pp); -void dw_pcie_setup_rc (struct pcie_port *pp); -int dw_pcie_host_init (struct pcie_port *pp);u32 dw_pcie_readl_dbi (struct dw_pcie *pci,u32 reg);void dw_pcie_writel_dbi (struct dw_pcie *pci,u32 reg,u32 val);
@@ -174,4 +170,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type, u64 cpu_addr, u64 pci_addr, u32 size);void dw_pcie_setup (struct dw_pcie *pci); + +#ifdef CONFIG_PCIE_DW_HOST +irqreturn_t dw_handle_msi_irq (struct pcie_port *pp); +void dw_pcie_msi_init (struct pcie_port *pp); +void dw_pcie_setup_rc (struct pcie_port *pp); +int dw_pcie_host_init (struct pcie_port *pp); +#else +static inline irqreturn_t dw_handle_msi_irq (struct pcie_port *pp) +{ +return IRQ_NONE ; +} + +static inline void dw_pcie_msi_init (struct pcie_port *pp) +{ +} + +static inline void dw_pcie_setup_rc (struct pcie_port *pp) +{ +} + +static inline int dw_pcie_host_init (struct pcie_port *pp) +{ +return 0 ; +} +#endif #endif /* _PCIE_DESIGNWARE_H */
Signature · 1 line
1.7.9.5
PATCH 10/10 PCI: dwc: Remove dependency of designware to CONFIG_PCI
In reply to Kishon Vijay Abraham ICONFIG_PCI is used to enable the host mode PCI. In preparation for adding endpoint mode support to designware driver, remove the dependency of designware to CONFIG_PCI and make only the host specific part depend on CONFIG_PCI.
--- drivers/Makefile | 3 +++ drivers/pci/Makefile | 3 --- drivers/pci/dwc/Kconfig | 13 ++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/Makefile +3 -0
@@ -15,6 +15,9 @@ obj-$(CONFIG_PINCTRL) += pinctrl/ obj-$(CONFIG_GPIOLIB) += gpio/ obj-y += pwm/ obj-$(CONFIG_PCI) += pci/ +# PCI dwc controller drivers +obj-y += pci/dwc/ + obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_RAPIDIO) += rapidio/ obj-y += video/
drivers/pci/Makefile +0 -3
@@ -66,8 +66,5 @@ obj-$(CONFIG_OF) += of.o ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG -# PCI dwc controller drivers -obj-y += dwc/ - # PCI host controller drivers obj-y += host/
drivers/pci/dwc/Kconfig +12 -1
@@ -1,16 +1,17 @@ menu "DesignWare PCI Core Support" - depends on PCI config PCIE_DW bool config PCIE_DW_HOST bool + depends on PCI depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW config PCI_DRA7XX bool "TI DRA7xx PCIe controller" + depends on PCI depends on OF && HAS_IOMEM && TI_PIPE3 depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST
@@ -21,6 +22,7 @@ config PCI_DRA7XX config PCIE_DW_PLAT bool "Platform bus based DesignWare PCIe Controller" + depends on PCI depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST ---help---
@@ -33,6 +35,7 @@ config PCIE_DW_PLAT config PCI_EXYNOS bool "Samsung Exynos PCIe controller" + depends on PCI depends on SOC_EXYNOS5440 depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -40,6 +43,7 @@ config PCI_EXYNOS config PCI_IMX6 bool "Freescale i.MX6 PCIe controller" + depends on PCI depends on SOC_IMX6Q depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -47,6 +51,7 @@ config PCI_IMX6 config PCIE_SPEAR13XX bool "STMicroelectronics SPEAr PCIe controller" + depends on PCI depends on ARCH_SPEAR13XX depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -56,6 +61,7 @@ config PCIE_SPEAR13XX config PCI_KEYSTONE bool "TI Keystone PCIe controller" + depends on PCI depends on ARCH_KEYSTONE depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -68,6 +74,7 @@ config PCI_KEYSTONE config PCI_LAYERSCAPE bool "Freescale Layerscape PCIe controller" + depends on PCI depends on OF && (ARM || ARCH_LAYERSCAPE) depends on PCI_MSI_IRQ_DOMAIN select MFD_SYSCON
@@ -78,6 +85,7 @@ config PCI_LAYERSCAPE config PCI_HISI depends on OF && ARM64 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" + depends on PCI depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST
@@ -87,6 +95,7 @@ config PCI_HISI config PCIE_QCOM bool "Qualcomm PCIe controller" + depends on PCI depends on ARCH_QCOM && OF depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -98,6 +107,7 @@ config PCIE_QCOM config PCIE_ARMADA_8K bool "Marvell Armada-8K PCIe controller" + depends on PCI depends on ARCH_MVEBU depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
@@ -110,6 +120,7 @@ config PCIE_ARMADA_8K config PCIE_ARTPEC6 bool "Axis ARTPEC-6 PCIe controller" + depends on PCI depends on MACH_ARTPEC6 depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS
Signature · 1 line
1.7.9.5
Quoted 50 lines · Kishon Vijay Abraham I
This series reworks designware driver in preparation for adding endpoint mode support to designware driver.
This series was previously sent as part of endpoint support series
https://lkml.org/lkml/2017/1/13/562Validate pci host only in pci-dra7xx. Any help in validating other platforms would be highly appreciated.
This series is created after cherrypicking the following patch and then applying pci/host-designware.
commit
a782b5f986c3fa1cfa7f2b57941200c6a5809242Author: Murali Karicheri <[email protected]> Date: Wed Jan 4 14:32:30 2017 -0500PCI: designware: Check for iATU unroll only on platforms that use ATU
The patches has been pushed to
git://git.ti.com/linux-phy/linux-phy.gitdwc-reworkKishon Vijay Abraham I (10):
PCI: dwc: designware: Move the register defines to designware header
file
PCI: dwc: *all*: Addplatform_set_drvdata
PCI: dwc: *all*: Rename cfg_read/cfg_write to read/write
PCI: dwc: designware: Get device pointer at the start of
dw_pcie_host_init
PCI: dwc: *all*: Split *struct pcie_port* into host only and core
structures
PCI: dwc: designware: Parse *num-lanes* property indw_pcie_setup_rc
PCI: dwc: designware: Fix style errors inpcie-designware.c
PCI: dwc: Splitpcie-designware.cinto host and core files
PCI: dwc: Create a new config symbol to enable pci dwc host
PCI: dwc: Remove dependency of designware toCONFIG_PCIdrivers/Makefile | 3 + drivers/pci/Makefile | 3 - drivers/pci/dwc/Kconfig | 39 +- drivers/pci/dwc/Makefile | 1 + drivers/pci/dwc/pci-dra7xx.c | 91 ++-- drivers/pci/dwc/pci-exynos.c | 81 ++-- drivers/pci/dwc/pci-imx6.c | 131 ++--- drivers/pci/dwc/pci-keystone-dw.c | 87 ++-- drivers/pci/dwc/pci-keystone.c | 56 ++- drivers/pci/dwc/pci-keystone.h | 4 +- drivers/pci/dwc/pci-layerscape.c | 93 ++-- drivers/pci/dwc/pcie-armada8k.c | 87 ++-- drivers/pci/dwc/pcie-artpec6.c | 50 +- drivers/pci/dwc/pcie-designware-host.c | 635 ++++++++++++++++++++++++
Quoted 8 lines
drivers/pci/dwc/pcie-designware-plat.c | 29 +- drivers/pci/dwc/pcie-designware.c | 823 +++----------------------------- drivers/pci/dwc/pcie-designware.h | 170 +++++-- drivers/pci/dwc/pcie-hisi.c | 57 ++- drivers/pci/dwc/pcie-qcom.c | 72 ++- drivers/pci/dwc/pcie-spear13xx.c | 85 ++-- 20 files changed, 1434 insertions(+), 1163 deletions(-) create mode 100644 drivers/pci/dwc/pcie-designware-host.c
I applied these to pci/host-designware with the intent of merging them for v4.11. They're not in -next yet; I'll merge them into -next after the autobuilder completes.
Bjorn