[PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[Song Xiaowei]

From: songxiaowei <songxiaowei@hisilicon.com>

Hisilicon PCIe Driver shares the common functions fo PCIe dw-host

The poweron functions is developed on hi3660 SoC, while Others Functions
are common for Kirin series SoCs.

Lowpower(L1ss and SR), hotplug and MSI feature are not supported
currently.

Cc: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Song Xiaowei <songxiaowei@hisilicon.com>
---
 drivers/pci/dwc/Kconfig      |  11 ++
 drivers/pci/dwc/Makefile     |   1 +
 drivers/pci/dwc/pcie-kirin.c | 443 +++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/dwc/pcie-kirin.h |  79 ++++++++
 4 files changed, 534 insertions(+)
 create mode 100644 drivers/pci/dwc/pcie-kirin.c
 create mode 100644 drivers/pci/dwc/pcie-kirin.h

diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index d2d2ba5b8a68..25f5ec33ce0c 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -130,4 +130,15 @@ config PCIE_ARTPEC6
 	  Say Y here to enable PCIe controller support on Axis ARTPEC-6
 	  SoCs.  This PCIe controller uses the DesignWare core.
 
+config PCIE_KIRIN
+	depends on OF && ARM64
+	bool "HiSilicon Kirin series SoCs PCIe controllers"
+	depends on PCI
+	depends on PCI_MSI_IRQ_DOMAIN
+	select PCIEPORTBUS
+	select PCIE_DW_HOST
+	help
+	  Say Y here if you want PCIe controller support on HiSilicon Kirin series SoCs
+	  kirin960 SoCs
+
 endmenu
diff --git a/drivers/pci/dwc/Makefile b/drivers/pci/dwc/Makefile
index a2df13c28798..4bd69bacd4ab 100644
--- a/drivers/pci/dwc/Makefile
+++ b/drivers/pci/dwc/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
 obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
 obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
 obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
+obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
diff --git a/drivers/pci/dwc/pcie-kirin.c b/drivers/pci/dwc/pcie-kirin.c
new file mode 100644
index 000000000000..5298407cf10a
--- /dev/null
+++ b/drivers/pci/dwc/pcie-kirin.c
@@ -0,0 +1,443 @@
+/*
+ * PCIe host controller driver for Kirin Phone SoCs
+ *
+ * Copyright (C) 2015 Hilisicon Electronics Co., Ltd.
+ *		http://www.huawei.com
+ *
+ * Author: Xiaowei Song <songxiaowei@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "pcie-kirin.h"
+
+static inline void kirin_apb_ctrl_writel(struct kirin_pcie *kirin_pcie,
+						u32 val, u32 reg)
+{
+	writel(val, kirin_pcie->apb_base + reg);
+}
+
+static inline u32 kirin_apb_ctrl_readl(struct kirin_pcie *kirin_pcie,
+						u32 reg)
+{
+	return readl(kirin_pcie->apb_base + reg);
+}
+
+/*Registers in PCIePHY*/
+static inline void kirin_apb_phy_writel(struct kirin_pcie *kirin_pcie,
+						u32 val, u32 reg)
+{
+	writel(val, kirin_pcie->phy_base + reg);
+}
+
+static inline u32 kirin_apb_phy_readl(struct kirin_pcie *kirin_pcie,
+						u32 reg)
+{
+	return readl(kirin_pcie->phy_base + reg);
+}
+
+static int32_t kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,
+				  struct platform_device *pdev)
+{
+	kirin_pcie->phy_ref_clk = devm_clk_get(&pdev->dev, "pcie_phy_ref");
+	if (IS_ERR(kirin_pcie->phy_ref_clk))
+		return PTR_ERR(kirin_pcie->phy_ref_clk);
+
+	kirin_pcie->pcie_aux_clk = devm_clk_get(&pdev->dev, "pcie_aux");
+	if (IS_ERR(kirin_pcie->pcie_aux_clk))
+		return PTR_ERR(kirin_pcie->pcie_aux_clk);
+
+	kirin_pcie->apb_phy_clk = devm_clk_get(&pdev->dev, "pcie_apb_phy");
+	if (IS_ERR(kirin_pcie->apb_phy_clk))
+		return PTR_ERR(kirin_pcie->apb_phy_clk);
+
+	kirin_pcie->apb_sys_clk = devm_clk_get(&pdev->dev, "pcie_apb_sys");
+	if (IS_ERR(kirin_pcie->apb_sys_clk))
+		return PTR_ERR(kirin_pcie->apb_sys_clk);
+
+	kirin_pcie->pcie_aclk = devm_clk_get(&pdev->dev, "pcie_aclk");
+	if (IS_ERR(kirin_pcie->pcie_aclk))
+		return PTR_ERR(kirin_pcie->pcie_aclk);
+
+	return 0;
+}
+
+static int32_t kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,
+				       struct platform_device *pdev)
+{
+	struct resource *apb;
+	struct resource *phy;
+	struct resource *dbi;
+
+	apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb");
+	kirin_pcie->apb_base = devm_ioremap_resource(&pdev->dev, apb);
+	if (IS_ERR(kirin_pcie->apb_base))
+		return PTR_ERR(kirin_pcie->apb_base);
+
+	phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
+	kirin_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy);
+	if (IS_ERR(kirin_pcie->phy_base))
+		return PTR_ERR(kirin_pcie->phy_base);
+
+	dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
+	kirin_pcie->pci->dbi_base = devm_ioremap_resource(&pdev->dev, dbi);
+	if (IS_ERR(kirin_pcie->pci->dbi_base))
+		return PTR_ERR(kirin_pcie->pci->dbi_base);
+
+	kirin_pcie->crgctrl =
+		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-crgctrl");
+	if (IS_ERR(kirin_pcie->crgctrl))
+		return PTR_ERR(kirin_pcie->crgctrl);
+
+	kirin_pcie->sysctrl =
+		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-sctrl");
+	if (IS_ERR(kirin_pcie->sysctrl))
+		return PTR_ERR(kirin_pcie->sysctrl);
+
+	return 0;
+}
+
+static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie)
+{
+	u32 reg_val;
+	u32 pipe_clk_stable = 0x1 << 19;
+	u32 time = 10;
+
+	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
+	reg_val &= ~(0x1 << 8);
+	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
+
+	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x0);
+	reg_val &= ~(0x1 << 22);
+	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x0);
+	udelay(10);
+
+	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
+	reg_val &= ~(0x1 << 16);
+	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
+
+	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
+	while (reg_val & pipe_clk_stable) {
+		udelay(100);
+		if (time == 0) {
+			dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
+			return -EINVAL;
+		}
+		time--;
+		reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
+	}
+
+	return 0;
+}
+
+static void kirin_pcie_oe_enable(struct kirin_pcie *kirin_pcie)
+{
+	u32 val;
+
+	regmap_read(kirin_pcie->sysctrl, 0x1a4, &val);
+	val |= 0xF0F400;
+	val &= ~(0x3 << 28);
+	regmap_write(kirin_pcie->sysctrl, 0x1a4, val);
+}
+
+static int kirin_pcie_clk_ctrl(struct kirin_pcie *kirin_pcie, bool enable)
+{
+	int ret = 0;
+
+	if (!enable)
+		goto close_clk;
+
+	ret = clk_set_rate(kirin_pcie->phy_ref_clk, REF_CLK_FREQ);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(kirin_pcie->phy_ref_clk);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(kirin_pcie->apb_sys_clk);
+	if (ret)
+		goto apb_sys_fail;
+
+	ret = clk_prepare_enable(kirin_pcie->apb_phy_clk);
+	if (ret)
+		goto apb_phy_fail;
+
+	ret = clk_prepare_enable(kirin_pcie->pcie_aclk);
+	if (ret)
+		goto aclk_fail;
+
+	ret = clk_prepare_enable(kirin_pcie->pcie_aux_clk);
+	if (ret)
+		goto aux_clk_fail;
+
+	return 0;
+close_clk:
+	clk_disable_unprepare(kirin_pcie->pcie_aux_clk);
+aux_clk_fail:
+	clk_disable_unprepare(kirin_pcie->pcie_aclk);
+aclk_fail:
+	clk_disable_unprepare(kirin_pcie->apb_phy_clk);
+apb_phy_fail:
+	clk_disable_unprepare(kirin_pcie->apb_sys_clk);
+apb_sys_fail:
+	clk_disable_unprepare(kirin_pcie->phy_ref_clk);
+	return ret;
+}
+
+static int kirin_pcie_power_on(struct kirin_pcie *kirin_pcie)
+{
+	int ret;
+
+	/*Power supply for Host*/
+	regmap_write(kirin_pcie->sysctrl, 0x60, 0x10);
+	udelay(100);
+	kirin_pcie_oe_enable(kirin_pcie);
+
+	ret = kirin_pcie_clk_ctrl(kirin_pcie, true);
+	if (ret)
+		return ret;
+
+	/*deasset PCIeCtrl&PCIePHY*/
+	regmap_write(kirin_pcie->sysctrl, 0x44, 0x30);
+	regmap_write(kirin_pcie->crgctrl, 0x88, 0x8c000000);
+	regmap_write(kirin_pcie->sysctrl, 0x190, 0x184000);
+
+	ret = kirin_pcie_phy_init(kirin_pcie);
+	if (ret)
+		goto close_clk;
+
+	/*perst assert Endpoint*/
+	if (!gpio_request(kirin_pcie->gpio_id_reset, "pcie_perst")) {
+		usleep_range(REF_2_PERST_MIN, REF_2_PERST_MAX);
+		ret = gpio_direction_output(kirin_pcie->gpio_id_reset, 1);
+		if (ret)
+			goto close_clk;
+		usleep_range(PERST_2_ACCESS_MIN, PERST_2_ACCESS_MAX);
+
+		return 0;
+	}
+
+close_clk:
+	kirin_pcie_clk_ctrl(kirin_pcie, false);
+	return -1;
+}
+
+static void kirin_pcie_sideband_dbi_w_mode(struct kirin_pcie *kirin_pcie,
+					bool on)
+{
+	u32 val;
+
+	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL0_ADDR);
+	if (on)
+		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
+	else
+		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
+
+	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL0_ADDR);
+}
+
+static void kirin_pcie_sideband_dbi_r_mode(struct kirin_pcie *kirin_pcie,
+					bool on)
+{
+	u32 val;
+
+	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL1_ADDR);
+	if (on)
+		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
+	else
+		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
+
+	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL1_ADDR);
+}
+
+static int kirin_pcie_rd_own_conf(struct pcie_port *pp,
+				  int where, int size, u32 *val)
+{
+	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+	int ret;
+
+	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
+	ret = dw_pcie_read(pci->dbi_base + where, size, val);
+	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
+
+	return ret;
+}
+
+static int kirin_pcie_wr_own_conf(struct pcie_port *pp,
+				  int where, int size, u32 val)
+{
+	int ret;
+	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+
+	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
+	ret = dw_pcie_write(pci->dbi_base + where, size, val);
+	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false);
+
+	return ret;
+}
+
+static u32 kirin_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base,
+				u32 reg, size_t size)
+{
+	u32 ret;
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+
+	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
+	dw_pcie_read(base + reg, size, &ret);
+	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
+
+	return ret;
+}
+
+static void kirin_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,
+				u32 reg, size_t size, u32 val)
+{
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+
+	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
+	dw_pcie_write(base + reg, size, val);
+	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false);
+}
+
+static int kirin_pcie_link_up(struct dw_pcie *pci)
+{
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+	u32 val = kirin_apb_ctrl_readl(kirin_pcie, PCIE_ELBI_RDLH_LINKUP);
+
+	if ((val & PCIE_LINKUP_ENABLE) == PCIE_LINKUP_ENABLE)
+		return 1;
+
+	return 0;
+}
+
+static int kirin_pcie_establish_link(struct pcie_port *pp)
+{
+	int count = 0;
+
+	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
+
+	if (kirin_pcie_link_up(pci))
+		return 0;
+
+	dw_pcie_setup_rc(pp);
+
+	/* assert LTSSM enable */
+	kirin_apb_ctrl_writel(kirin_pcie, PCIE_LTSSM_ENABLE_BIT,
+			 PCIE_APP_LTSSM_ENABLE);
+
+	/* check if the link is up or not */
+	while (!kirin_pcie_link_up(pci)) {
+		usleep_range(LINK_WAIT_MIN, LINK_WAIT_MAX);
+		count++;
+		if (count == 1000) {
+			dev_err(pci->dev, "Link Fail\n");
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+static void kirin_pcie_host_init(struct pcie_port *pp)
+{
+	kirin_pcie_establish_link(pp);
+}
+
+static struct dw_pcie_ops kirin_dw_pcie_ops = {
+	.read_dbi = kirin_pcie_read_dbi,
+	.write_dbi = kirin_pcie_write_dbi,
+	.link_up = kirin_pcie_link_up,
+};
+
+static struct dw_pcie_host_ops kirin_pcie_host_ops = {
+	.rd_own_conf = kirin_pcie_rd_own_conf,
+	.wr_own_conf = kirin_pcie_wr_own_conf,
+	.host_init = kirin_pcie_host_init,
+};
+
+static int __init kirin_add_pcie_port(struct dw_pcie *pci,
+				      struct platform_device *pdev)
+{
+	int ret;
+
+	pci->pp.ops = &kirin_pcie_host_ops;
+
+	ret = dw_pcie_host_init(&pci->pp);
+
+	return ret;
+}
+
+static int kirin_pcie_probe(struct platform_device *pdev)
+{
+	struct kirin_pcie *kirin_pcie;
+	struct dw_pcie *pci;
+	struct device *dev = &pdev->dev;
+	int ret;
+
+	if (!pdev->dev.of_node) {
+		dev_err(&pdev->dev, "NULL node\n");
+		return -EINVAL;
+	}
+
+	kirin_pcie = devm_kzalloc(&pdev->dev,
+					sizeof(struct kirin_pcie), GFP_KERNEL);
+	if (!kirin_pcie)
+		return -ENOMEM;
+
+	pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
+	if (!pci)
+		return -ENOMEM;
+
+	pci->dev = dev;
+	pci->ops = &kirin_dw_pcie_ops;
+	kirin_pcie->pci = pci;
+
+	ret = kirin_pcie_get_clk(kirin_pcie, pdev);
+	if (ret != 0)
+		return -ENODEV;
+
+	ret = kirin_pcie_get_resource(kirin_pcie, pdev);
+	if (ret != 0)
+		return -ENODEV;
+
+	kirin_pcie->gpio_id_reset = of_get_named_gpio(pdev->dev.of_node,
+			"reset-gpio", 0);
+	if (kirin_pcie->gpio_id_reset < 0)
+		return -ENODEV;
+
+	ret = kirin_pcie_power_on(kirin_pcie);
+	if (ret)
+		return ret;
+
+	platform_set_drvdata(pdev, kirin_pcie);
+
+	ret = kirin_add_pcie_port(pci, pdev);
+	if (ret)
+		return ret;
+
+	dev_dbg(&pdev->dev, "probe Done\n");
+	return 0;
+}
+
+static const struct of_device_id kirin_pcie_match[] = {
+	{ .compatible = "hisilicon,kirin-pcie" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, kirin_pcie_match);
+
+struct platform_driver kirin_pcie_driver = {
+	.probe			= kirin_pcie_probe,
+	.driver			= {
+		.name			= "Kirin-pcie",
+		.owner			= THIS_MODULE,
+		.of_match_table = kirin_pcie_match,
+	},
+};
+
+module_platform_driver(kirin_pcie_driver);
diff --git a/drivers/pci/dwc/pcie-kirin.h b/drivers/pci/dwc/pcie-kirin.h
new file mode 100644
index 000000000000..ad9a3b427298
--- /dev/null
+++ b/drivers/pci/dwc/pcie-kirin.h
@@ -0,0 +1,79 @@
+/*
+ * PCIe host controller driver for Kirin 960 SoCs
+ *
+ * Copyright (C) 2015 Huawei Electronics Co., Ltd.
+ *		http://www.huawei.com
+ *
+ * Author: Xiaowei Song <songxiaowei@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _PCIE_KIRIN_H
+#define _PCIE_KIRIN_H
+
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <asm/compiler.h>
+#include <linux/compiler.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/irqdomain.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
+#include <linux/pci.h>
+#include <linux/of_pci.h>
+#include <linux/platform_device.h>
+#include <linux/resource.h>
+#include <linux/types.h>
+#include <linux/msi.h>
+#include <linux/of_address.h>
+#include <linux/pci_regs.h>
+
+#include "pcie-designware.h"
+
+#define to_kirin_pcie(x) dev_get_drvdata((x)->dev)
+
+#define REF_CLK_FREQ 100000000
+
+/* PCIe ELBI registers */
+#define SOC_PCIECTRL_CTRL0_ADDR 0x000
+#define SOC_PCIECTRL_CTRL1_ADDR 0x004
+#define SOC_PCIEPHY_CTRL2_ADDR 0x008
+#define SOC_PCIEPHY_CTRL3_ADDR 0x00c
+#define PCIE_ELBI_SLV_DBI_ENABLE	(0x1 << 21)
+
+#define PCIE_APP_LTSSM_ENABLE		0x01c
+#define PCIE_ELBI_RDLH_LINKUP		0x400
+#define PCIE_LINKUP_ENABLE		(0x8020)
+#define PCIE_LTSSM_ENABLE_BIT	  (0x1 << 11)
+
+#define REF_2_PERST_MIN		(20000)
+#define REF_2_PERST_MAX		(25000)
+#define PERST_2_ACCESS_MIN	(10000)
+#define PERST_2_ACCESS_MAX	(12000)
+#define LINK_WAIT_MIN	(900)
+#define LINK_WAIT_MAX		(1000)
+
+
+struct kirin_pcie {
+	void __iomem		*apb_base;
+	void __iomem		*phy_base;
+	struct regmap *crgctrl;
+	struct regmap *sysctrl;
+	struct clk			*apb_sys_clk;
+	struct clk			*apb_phy_clk;
+	struct clk			*phy_ref_clk;
+	struct clk			*pcie_aclk;
+	struct clk			*pcie_aux_clk;
+	int                 gpio_id_reset;
+	struct dw_pcie		*pci;
+};
+
+#endif
+
-- 
2.11.GIT

[PATCH 2/2] defconfig: PCI: Enable Kirin PCIe defconfig

[Song Xiaowei]

Cc: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Song Xiaowei <songxiaowei@hisilicon.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7c48028ec64a..d56d8f1062ab 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -71,6 +71,7 @@ CONFIG_PCI_XGENE=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_KIRIN=y
 CONFIG_PCIE_ARMADA_8K=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_SCHED_MC=y
-- 
2.11.GIT

Re: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[Niklas Cassel]

Hello Song

On 05/12/2017 03:51 AM, Song Xiaowei wrote:
> From: songxiaowei <songxiaowei@hisilicon.com>
> 
> Hisilicon PCIe Driver shares the common functions fo PCIe dw-host
> 
> The poweron functions is developed on hi3660 SoC, while Others Functions
> are common for Kirin series SoCs.
> 
> Lowpower(L1ss and SR), hotplug and MSI feature are not supported
> currently.
> 
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Signed-off-by: Song Xiaowei <songxiaowei@hisilicon.com>
> ---
>  drivers/pci/dwc/Kconfig      |  11 ++
>  drivers/pci/dwc/Makefile     |   1 +
>  drivers/pci/dwc/pcie-kirin.c | 443 +++++++++++++++++++++++++++++++++++++++++++
>  drivers/pci/dwc/pcie-kirin.h |  79 ++++++++
>  4 files changed, 534 insertions(+)
>  create mode 100644 drivers/pci/dwc/pcie-kirin.c
>  create mode 100644 drivers/pci/dwc/pcie-kirin.h
> 
> diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
> index d2d2ba5b8a68..25f5ec33ce0c 100644
> --- a/drivers/pci/dwc/Kconfig
> +++ b/drivers/pci/dwc/Kconfig
> @@ -130,4 +130,15 @@ config PCIE_ARTPEC6
>  	  Say Y here to enable PCIe controller support on Axis ARTPEC-6
>  	  SoCs.  This PCIe controller uses the DesignWare core.
>  
> +config PCIE_KIRIN
> +	depends on OF && ARM64
> +	bool "HiSilicon Kirin series SoCs PCIe controllers"
> +	depends on PCI
> +	depends on PCI_MSI_IRQ_DOMAIN

do you need to depend on PCI_MSI_IRQ_DOMAIN if your driver
does not support MSI?

> +	select PCIEPORTBUS
> +	select PCIE_DW_HOST
> +	help
> +	  Say Y here if you want PCIe controller support on HiSilicon Kirin series SoCs
> +	  kirin960 SoCs
> +
>  endmenu
> diff --git a/drivers/pci/dwc/Makefile b/drivers/pci/dwc/Makefile
> index a2df13c28798..4bd69bacd4ab 100644
> --- a/drivers/pci/dwc/Makefile
> +++ b/drivers/pci/dwc/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
>  obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
>  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
>  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
> +obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
>  
>  # The following drivers are for devices that use the generic ACPI
>  # pci_root.c driver but don't support standard ECAM config access.
> diff --git a/drivers/pci/dwc/pcie-kirin.c b/drivers/pci/dwc/pcie-kirin.c
> new file mode 100644
> index 000000000000..5298407cf10a
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.c
> @@ -0,0 +1,443 @@
> +/*
> + * PCIe host controller driver for Kirin Phone SoCs
> + *
> + * Copyright (C) 2015 Hilisicon Electronics Co., Ltd.
> + *		http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include "pcie-kirin.h"
> +
> +static inline void kirin_apb_ctrl_writel(struct kirin_pcie *kirin_pcie,
> +						u32 val, u32 reg)
> +{
> +	writel(val, kirin_pcie->apb_base + reg);
> +}
> +
> +static inline u32 kirin_apb_ctrl_readl(struct kirin_pcie *kirin_pcie,
> +						u32 reg)
> +{
> +	return readl(kirin_pcie->apb_base + reg);
> +}
> +
> +/*Registers in PCIePHY*/
> +static inline void kirin_apb_phy_writel(struct kirin_pcie *kirin_pcie,
> +						u32 val, u32 reg)
> +{
> +	writel(val, kirin_pcie->phy_base + reg);
> +}
> +
> +static inline u32 kirin_apb_phy_readl(struct kirin_pcie *kirin_pcie,
> +						u32 reg)
> +{
> +	return readl(kirin_pcie->phy_base + reg);
> +}
> +
> +static int32_t kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,
> +				  struct platform_device *pdev)
> +{
> +	kirin_pcie->phy_ref_clk = devm_clk_get(&pdev->dev, "pcie_phy_ref");
> +	if (IS_ERR(kirin_pcie->phy_ref_clk))
> +		return PTR_ERR(kirin_pcie->phy_ref_clk);
> +
> +	kirin_pcie->pcie_aux_clk = devm_clk_get(&pdev->dev, "pcie_aux");
> +	if (IS_ERR(kirin_pcie->pcie_aux_clk))
> +		return PTR_ERR(kirin_pcie->pcie_aux_clk);
> +
> +	kirin_pcie->apb_phy_clk = devm_clk_get(&pdev->dev, "pcie_apb_phy");
> +	if (IS_ERR(kirin_pcie->apb_phy_clk))
> +		return PTR_ERR(kirin_pcie->apb_phy_clk);
> +
> +	kirin_pcie->apb_sys_clk = devm_clk_get(&pdev->dev, "pcie_apb_sys");
> +	if (IS_ERR(kirin_pcie->apb_sys_clk))
> +		return PTR_ERR(kirin_pcie->apb_sys_clk);
> +
> +	kirin_pcie->pcie_aclk = devm_clk_get(&pdev->dev, "pcie_aclk");
> +	if (IS_ERR(kirin_pcie->pcie_aclk))
> +		return PTR_ERR(kirin_pcie->pcie_aclk);
> +
> +	return 0;
> +}
> +
> +static int32_t kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,
> +				       struct platform_device *pdev)
> +{
> +	struct resource *apb;
> +	struct resource *phy;
> +	struct resource *dbi;
> +
> +	apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb");
> +	kirin_pcie->apb_base = devm_ioremap_resource(&pdev->dev, apb);
> +	if (IS_ERR(kirin_pcie->apb_base))
> +		return PTR_ERR(kirin_pcie->apb_base);
> +
> +	phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
> +	kirin_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy);
> +	if (IS_ERR(kirin_pcie->phy_base))
> +		return PTR_ERR(kirin_pcie->phy_base);
> +
> +	dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
> +	kirin_pcie->pci->dbi_base = devm_ioremap_resource(&pdev->dev, dbi);
> +	if (IS_ERR(kirin_pcie->pci->dbi_base))
> +		return PTR_ERR(kirin_pcie->pci->dbi_base);
> +
> +	kirin_pcie->crgctrl =
> +		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-crgctrl");
> +	if (IS_ERR(kirin_pcie->crgctrl))
> +		return PTR_ERR(kirin_pcie->crgctrl);
> +
> +	kirin_pcie->sysctrl =
> +		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-sctrl");
> +	if (IS_ERR(kirin_pcie->sysctrl))
> +		return PTR_ERR(kirin_pcie->sysctrl);
> +
> +	return 0;
> +}
> +
> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie)
> +{
> +	u32 reg_val;
> +	u32 pipe_clk_stable = 0x1 << 19;
> +	u32 time = 10;
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
> +	reg_val &= ~(0x1 << 8);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x0);
> +	reg_val &= ~(0x1 << 22);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x0);
> +	udelay(10);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
> +	reg_val &= ~(0x1 << 16);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +	while (reg_val & pipe_clk_stable) {
> +		udelay(100);
> +		if (time == 0) {
> +			dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
> +			return -EINVAL;
> +		}
> +		time--;
> +		reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +	}

magic numbers here, replace with #defines with describing names.

> +
> +	return 0;
> +}
> +
> +static void kirin_pcie_oe_enable(struct kirin_pcie *kirin_pcie)
> +{
> +	u32 val;
> +
> +	regmap_read(kirin_pcie->sysctrl, 0x1a4, &val);
> +	val |= 0xF0F400;
> +	val &= ~(0x3 << 28);
> +	regmap_write(kirin_pcie->sysctrl, 0x1a4, val);

magic numbers here, replace with #defines with describing names.

> +}
> +
> +static int kirin_pcie_clk_ctrl(struct kirin_pcie *kirin_pcie, bool enable)
> +{
> +	int ret = 0;
> +
> +	if (!enable)
> +		goto close_clk;
> +
> +	ret = clk_set_rate(kirin_pcie->phy_ref_clk, REF_CLK_FREQ);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(kirin_pcie->phy_ref_clk);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(kirin_pcie->apb_sys_clk);
> +	if (ret)
> +		goto apb_sys_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->apb_phy_clk);
> +	if (ret)
> +		goto apb_phy_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->pcie_aclk);
> +	if (ret)
> +		goto aclk_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->pcie_aux_clk);
> +	if (ret)
> +		goto aux_clk_fail;
> +
> +	return 0;
> +close_clk:
> +	clk_disable_unprepare(kirin_pcie->pcie_aux_clk);
> +aux_clk_fail:
> +	clk_disable_unprepare(kirin_pcie->pcie_aclk);
> +aclk_fail:
> +	clk_disable_unprepare(kirin_pcie->apb_phy_clk);
> +apb_phy_fail:
> +	clk_disable_unprepare(kirin_pcie->apb_sys_clk);
> +apb_sys_fail:
> +	clk_disable_unprepare(kirin_pcie->phy_ref_clk);
> +	return ret;
> +}
> +
> +static int kirin_pcie_power_on(struct kirin_pcie *kirin_pcie)
> +{
> +	int ret;
> +
> +	/*Power supply for Host*/
> +	regmap_write(kirin_pcie->sysctrl, 0x60, 0x10);
> +	udelay(100);
> +	kirin_pcie_oe_enable(kirin_pcie);
> +
> +	ret = kirin_pcie_clk_ctrl(kirin_pcie, true);
> +	if (ret)
> +		return ret;
> +
> +	/*deasset PCIeCtrl&PCIePHY*/
> +	regmap_write(kirin_pcie->sysctrl, 0x44, 0x30);
> +	regmap_write(kirin_pcie->crgctrl, 0x88, 0x8c000000);
> +	regmap_write(kirin_pcie->sysctrl, 0x190, 0x184000);

magic numbers here, replace with #defines with describing names.

> +
> +	ret = kirin_pcie_phy_init(kirin_pcie);
> +	if (ret)
> +		goto close_clk;
> +
> +	/*perst assert Endpoint*/
> +	if (!gpio_request(kirin_pcie->gpio_id_reset, "pcie_perst")) {
> +		usleep_range(REF_2_PERST_MIN, REF_2_PERST_MAX);
> +		ret = gpio_direction_output(kirin_pcie->gpio_id_reset, 1);
> +		if (ret)
> +			goto close_clk;
> +		usleep_range(PERST_2_ACCESS_MIN, PERST_2_ACCESS_MAX);
> +
> +		return 0;
> +	}
> +
> +close_clk:
> +	kirin_pcie_clk_ctrl(kirin_pcie, false);
> +	return -1;

return a proper error code.

> +}
> +
> +static void kirin_pcie_sideband_dbi_w_mode(struct kirin_pcie *kirin_pcie,
> +					bool on)
> +{
> +	u32 val;
> +
> +	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL0_ADDR);
> +	if (on)
> +		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
> +	else
> +		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
> +
> +	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL0_ADDR);
> +}
> +
> +static void kirin_pcie_sideband_dbi_r_mode(struct kirin_pcie *kirin_pcie,
> +					bool on)
> +{
> +	u32 val;
> +
> +	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL1_ADDR);
> +	if (on)
> +		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
> +	else
> +		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
> +
> +	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL1_ADDR);
> +}
> +
> +static int kirin_pcie_rd_own_conf(struct pcie_port *pp,
> +				  int where, int size, u32 *val)
> +{
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +	int ret;
> +
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
> +	ret = dw_pcie_read(pci->dbi_base + where, size, val);
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static int kirin_pcie_wr_own_conf(struct pcie_port *pp,
> +				  int where, int size, u32 val)
> +{
> +	int ret;
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
> +	ret = dw_pcie_write(pci->dbi_base + where, size, val);
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static u32 kirin_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base,
> +				u32 reg, size_t size)
> +{
> +	u32 ret;
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
> +	dw_pcie_read(base + reg, size, &ret);
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static void kirin_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,
> +				u32 reg, size_t size, u32 val)
> +{
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
> +	dw_pcie_write(base + reg, size, val);
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false);
> +}
> +
> +static int kirin_pcie_link_up(struct dw_pcie *pci)
> +{
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +	u32 val = kirin_apb_ctrl_readl(kirin_pcie, PCIE_ELBI_RDLH_LINKUP);
> +
> +	if ((val & PCIE_LINKUP_ENABLE) == PCIE_LINKUP_ENABLE)
> +		return 1;
> +
> +	return 0;
> +}
> +
> +static int kirin_pcie_establish_link(struct pcie_port *pp)
> +{
> +	int count = 0;
> +
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	if (kirin_pcie_link_up(pci))
> +		return 0;
> +
> +	dw_pcie_setup_rc(pp);
> +
> +	/* assert LTSSM enable */
> +	kirin_apb_ctrl_writel(kirin_pcie, PCIE_LTSSM_ENABLE_BIT,
> +			 PCIE_APP_LTSSM_ENABLE);
> +
> +	/* check if the link is up or not */
> +	while (!kirin_pcie_link_up(pci)) {
> +		usleep_range(LINK_WAIT_MIN, LINK_WAIT_MAX);
> +		count++;
> +		if (count == 1000) {
> +			dev_err(pci->dev, "Link Fail\n");
> +			return -EINVAL;
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +static void kirin_pcie_host_init(struct pcie_port *pp)
> +{
> +	kirin_pcie_establish_link(pp);
> +}
> +
> +static struct dw_pcie_ops kirin_dw_pcie_ops = {
> +	.read_dbi = kirin_pcie_read_dbi,
> +	.write_dbi = kirin_pcie_write_dbi,
> +	.link_up = kirin_pcie_link_up,
> +};
> +
> +static struct dw_pcie_host_ops kirin_pcie_host_ops = {
> +	.rd_own_conf = kirin_pcie_rd_own_conf,
> +	.wr_own_conf = kirin_pcie_wr_own_conf,
> +	.host_init = kirin_pcie_host_init,
> +};
> +
> +static int __init kirin_add_pcie_port(struct dw_pcie *pci,
> +				      struct platform_device *pdev)
> +{
> +	int ret;
> +
> +	pci->pp.ops = &kirin_pcie_host_ops;
> +
> +	ret = dw_pcie_host_init(&pci->pp);
> +
> +	return ret;
> +}
> +
> +static int kirin_pcie_probe(struct platform_device *pdev)
> +{
> +	struct kirin_pcie *kirin_pcie;
> +	struct dw_pcie *pci;
> +	struct device *dev = &pdev->dev;
> +	int ret;
> +
> +	if (!pdev->dev.of_node) {
> +		dev_err(&pdev->dev, "NULL node\n");
> +		return -EINVAL;
> +	}
> +
> +	kirin_pcie = devm_kzalloc(&pdev->dev,
> +					sizeof(struct kirin_pcie), GFP_KERNEL);
> +	if (!kirin_pcie)
> +		return -ENOMEM;
> +
> +	pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
> +	if (!pci)
> +		return -ENOMEM;
> +
> +	pci->dev = dev;
> +	pci->ops = &kirin_dw_pcie_ops;
> +	kirin_pcie->pci = pci;
> +
> +	ret = kirin_pcie_get_clk(kirin_pcie, pdev);
> +	if (ret != 0)
> +		return -ENODEV;
> +
> +	ret = kirin_pcie_get_resource(kirin_pcie, pdev);
> +	if (ret != 0)
> +		return -ENODEV;

if (ret != 0) can be replaced with if (ret)

> +
> +	kirin_pcie->gpio_id_reset = of_get_named_gpio(pdev->dev.of_node,
> +			"reset-gpio", 0);
> +	if (kirin_pcie->gpio_id_reset < 0)
> +		return -ENODEV;
> +
> +	ret = kirin_pcie_power_on(kirin_pcie);
> +	if (ret)
> +		return ret;
> +
> +	platform_set_drvdata(pdev, kirin_pcie);
> +
> +	ret = kirin_add_pcie_port(pci, pdev);
> +	if (ret)
> +		return ret;
> +
> +	dev_dbg(&pdev->dev, "probe Done\n");

this is your only dev_dbg.
is it really needed?
booting with kernel command line options debug initcall_debug=1
will show you if your drivers was probed or not.

> +	return 0;
> +}
> +
> +static const struct of_device_id kirin_pcie_match[] = {
> +	{ .compatible = "hisilicon,kirin-pcie" },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, kirin_pcie_match);
> +
> +struct platform_driver kirin_pcie_driver = {
> +	.probe			= kirin_pcie_probe,
> +	.driver			= {
> +		.name			= "Kirin-pcie",
> +		.owner			= THIS_MODULE,

owner shouldn't be needed since it populated by the core.

> +		.of_match_table = kirin_pcie_match,

since your module can only be built as built-in
(bool rather than tristate in Kconfig)
and since you don't provide a .remove callback,
you should probably add

.suppress_bind_attrs = true,

> +	},
> +};
> +
> +module_platform_driver(kirin_pcie_driver);

since your module can only be built as built-in
(bool rather than tristate in Kconfig)
this should probably be replaced with
builtin_platform_driver

> diff --git a/drivers/pci/dwc/pcie-kirin.h b/drivers/pci/dwc/pcie-kirin.h
> new file mode 100644
> index 000000000000..ad9a3b427298
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.h
> @@ -0,0 +1,79 @@
> +/*
> + * PCIe host controller driver for Kirin 960 SoCs
> + *
> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
> + *		http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef _PCIE_KIRIN_H
> +#define _PCIE_KIRIN_H
> +
> +#include <linux/mfd/syscon.h>
> +#include <linux/regmap.h>
> +#include <asm/compiler.h>
> +#include <linux/compiler.h>
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/gpio.h>
> +#include <linux/err.h>
> +#include <linux/interrupt.h>
> +#include <linux/irqdomain.h>
> +#include <linux/module.h>

since your module can only be built as built-in
(bool rather than tristate in Kconfig)
you should probably not include module.h

> +#include <linux/of_gpio.h>
> +#include <linux/pci.h>
> +#include <linux/of_pci.h>
> +#include <linux/platform_device.h>
> +#include <linux/resource.h>
> +#include <linux/types.h>
> +#include <linux/msi.h>

is this header needed if you don't support msi?

> +#include <linux/of_address.h>
> +#include <linux/pci_regs.h>
> +
> +#include "pcie-designware.h"
> +
> +#define to_kirin_pcie(x) dev_get_drvdata((x)->dev)
> +
> +#define REF_CLK_FREQ 100000000
> +
> +/* PCIe ELBI registers */
> +#define SOC_PCIECTRL_CTRL0_ADDR 0x000
> +#define SOC_PCIECTRL_CTRL1_ADDR 0x004
> +#define SOC_PCIEPHY_CTRL2_ADDR 0x008
> +#define SOC_PCIEPHY_CTRL3_ADDR 0x00c
> +#define PCIE_ELBI_SLV_DBI_ENABLE	(0x1 << 21)
> +
> +#define PCIE_APP_LTSSM_ENABLE		0x01c
> +#define PCIE_ELBI_RDLH_LINKUP		0x400
> +#define PCIE_LINKUP_ENABLE		(0x8020)
> +#define PCIE_LTSSM_ENABLE_BIT	  (0x1 << 11)
> +
> +#define REF_2_PERST_MIN		(20000)
> +#define REF_2_PERST_MAX		(25000)
> +#define PERST_2_ACCESS_MIN	(10000)
> +#define PERST_2_ACCESS_MAX	(12000)
> +#define LINK_WAIT_MIN	(900)
> +#define LINK_WAIT_MAX		(1000)
> +
> +
> +struct kirin_pcie {
> +	void __iomem		*apb_base;
> +	void __iomem		*phy_base;
> +	struct regmap *crgctrl;
> +	struct regmap *sysctrl;
> +	struct clk			*apb_sys_clk;
> +	struct clk			*apb_phy_clk;
> +	struct clk			*phy_ref_clk;
> +	struct clk			*pcie_aclk;
> +	struct clk			*pcie_aux_clk;
> +	int                 gpio_id_reset;
> +	struct dw_pcie		*pci;
> +};
> +
> +#endif
> +
> 

since this .h file is really small, it might be better to just
remove it and move the code to the .c file.



Best regards,
Niklas

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

Hi Niklas,

Thanks a lot for your time to review my patch.

I'll modify according to your comments and update the patch.

Best regards,
Song

-----邮件原件-----
发件人: Niklas Cassel [mailto:niklas.cassel@axis.com] 
发送时间: 2017年5月12日 16:08
收件人: songxiaowei; bhelgaas@google.com; kishon@ti.com; jingoohan1@gmail.com; arnd@arndb.de; tn@semihalf.com; keith.busch@intel.com; dhdang@apm.com; liudongdong (C)
抄送: Chenfeng (puck); guodong.xu@linaro.org; Wangbinghui; Suzhuangluan; linux-kernel@vger.kernel.org; linux-pci@vger.kernel.org
主题: Re: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

Hello Song

On 05/12/2017 03:51 AM, Song Xiaowei wrote:
> From: songxiaowei <songxiaowei@hisilicon.com>
> 
> Hisilicon PCIe Driver shares the common functions fo PCIe dw-host
> 
> The poweron functions is developed on hi3660 SoC, while Others 
> Functions are common for Kirin series SoCs.
> 
> Lowpower(L1ss and SR), hotplug and MSI feature are not supported 
> currently.
> 
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Signed-off-by: Song Xiaowei <songxiaowei@hisilicon.com>
> ---
>  drivers/pci/dwc/Kconfig      |  11 ++
>  drivers/pci/dwc/Makefile     |   1 +
>  drivers/pci/dwc/pcie-kirin.c | 443 
> +++++++++++++++++++++++++++++++++++++++++++
>  drivers/pci/dwc/pcie-kirin.h |  79 ++++++++
>  4 files changed, 534 insertions(+)
>  create mode 100644 drivers/pci/dwc/pcie-kirin.c  create mode 100644 
> drivers/pci/dwc/pcie-kirin.h
> 
> diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig index 
> d2d2ba5b8a68..25f5ec33ce0c 100644
> --- a/drivers/pci/dwc/Kconfig
> +++ b/drivers/pci/dwc/Kconfig
> @@ -130,4 +130,15 @@ config PCIE_ARTPEC6
>  	  Say Y here to enable PCIe controller support on Axis ARTPEC-6
>  	  SoCs.  This PCIe controller uses the DesignWare core.
>  
> +config PCIE_KIRIN
> +	depends on OF && ARM64
> +	bool "HiSilicon Kirin series SoCs PCIe controllers"
> +	depends on PCI
> +	depends on PCI_MSI_IRQ_DOMAIN

do you need to depend on PCI_MSI_IRQ_DOMAIN if your driver does not support MSI?

> +	select PCIEPORTBUS
> +	select PCIE_DW_HOST
> +	help
> +	  Say Y here if you want PCIe controller support on HiSilicon Kirin series SoCs
> +	  kirin960 SoCs
> +
>  endmenu
> diff --git a/drivers/pci/dwc/Makefile b/drivers/pci/dwc/Makefile index 
> a2df13c28798..4bd69bacd4ab 100644
> --- a/drivers/pci/dwc/Makefile
> +++ b/drivers/pci/dwc/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
>  obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
>  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
>  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
> +obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
>  
>  # The following drivers are for devices that use the generic ACPI  # 
> pci_root.c driver but don't support standard ECAM config access.
> diff --git a/drivers/pci/dwc/pcie-kirin.c 
> b/drivers/pci/dwc/pcie-kirin.c new file mode 100644 index 
> 000000000000..5298407cf10a
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.c
> @@ -0,0 +1,443 @@
> +/*
> + * PCIe host controller driver for Kirin Phone SoCs
> + *
> + * Copyright (C) 2015 Hilisicon Electronics Co., Ltd.
> + *		http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or 
> +modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include "pcie-kirin.h"
> +
> +static inline void kirin_apb_ctrl_writel(struct kirin_pcie *kirin_pcie,
> +						u32 val, u32 reg)
> +{
> +	writel(val, kirin_pcie->apb_base + reg); }
> +
> +static inline u32 kirin_apb_ctrl_readl(struct kirin_pcie *kirin_pcie,
> +						u32 reg)
> +{
> +	return readl(kirin_pcie->apb_base + reg); }
> +
> +/*Registers in PCIePHY*/
> +static inline void kirin_apb_phy_writel(struct kirin_pcie *kirin_pcie,
> +						u32 val, u32 reg)
> +{
> +	writel(val, kirin_pcie->phy_base + reg); }
> +
> +static inline u32 kirin_apb_phy_readl(struct kirin_pcie *kirin_pcie,
> +						u32 reg)
> +{
> +	return readl(kirin_pcie->phy_base + reg); }
> +
> +static int32_t kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,
> +				  struct platform_device *pdev)
> +{
> +	kirin_pcie->phy_ref_clk = devm_clk_get(&pdev->dev, "pcie_phy_ref");
> +	if (IS_ERR(kirin_pcie->phy_ref_clk))
> +		return PTR_ERR(kirin_pcie->phy_ref_clk);
> +
> +	kirin_pcie->pcie_aux_clk = devm_clk_get(&pdev->dev, "pcie_aux");
> +	if (IS_ERR(kirin_pcie->pcie_aux_clk))
> +		return PTR_ERR(kirin_pcie->pcie_aux_clk);
> +
> +	kirin_pcie->apb_phy_clk = devm_clk_get(&pdev->dev, "pcie_apb_phy");
> +	if (IS_ERR(kirin_pcie->apb_phy_clk))
> +		return PTR_ERR(kirin_pcie->apb_phy_clk);
> +
> +	kirin_pcie->apb_sys_clk = devm_clk_get(&pdev->dev, "pcie_apb_sys");
> +	if (IS_ERR(kirin_pcie->apb_sys_clk))
> +		return PTR_ERR(kirin_pcie->apb_sys_clk);
> +
> +	kirin_pcie->pcie_aclk = devm_clk_get(&pdev->dev, "pcie_aclk");
> +	if (IS_ERR(kirin_pcie->pcie_aclk))
> +		return PTR_ERR(kirin_pcie->pcie_aclk);
> +
> +	return 0;
> +}
> +
> +static int32_t kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,
> +				       struct platform_device *pdev) {
> +	struct resource *apb;
> +	struct resource *phy;
> +	struct resource *dbi;
> +
> +	apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb");
> +	kirin_pcie->apb_base = devm_ioremap_resource(&pdev->dev, apb);
> +	if (IS_ERR(kirin_pcie->apb_base))
> +		return PTR_ERR(kirin_pcie->apb_base);
> +
> +	phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
> +	kirin_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy);
> +	if (IS_ERR(kirin_pcie->phy_base))
> +		return PTR_ERR(kirin_pcie->phy_base);
> +
> +	dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
> +	kirin_pcie->pci->dbi_base = devm_ioremap_resource(&pdev->dev, dbi);
> +	if (IS_ERR(kirin_pcie->pci->dbi_base))
> +		return PTR_ERR(kirin_pcie->pci->dbi_base);
> +
> +	kirin_pcie->crgctrl =
> +		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-crgctrl");
> +	if (IS_ERR(kirin_pcie->crgctrl))
> +		return PTR_ERR(kirin_pcie->crgctrl);
> +
> +	kirin_pcie->sysctrl =
> +		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-sctrl");
> +	if (IS_ERR(kirin_pcie->sysctrl))
> +		return PTR_ERR(kirin_pcie->sysctrl);
> +
> +	return 0;
> +}
> +
> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
> +	u32 reg_val;
> +	u32 pipe_clk_stable = 0x1 << 19;
> +	u32 time = 10;
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
> +	reg_val &= ~(0x1 << 8);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x0);
> +	reg_val &= ~(0x1 << 22);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x0);
> +	udelay(10);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x4);
> +	reg_val &= ~(0x1 << 16);
> +	kirin_apb_phy_writel(kirin_pcie, reg_val, 0x4);
> +
> +	reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +	while (reg_val & pipe_clk_stable) {
> +		udelay(100);
> +		if (time == 0) {
> +			dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
> +			return -EINVAL;
> +		}
> +		time--;
> +		reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +	}

magic numbers here, replace with #defines with describing names.

> +
> +	return 0;
> +}
> +
> +static void kirin_pcie_oe_enable(struct kirin_pcie *kirin_pcie) {
> +	u32 val;
> +
> +	regmap_read(kirin_pcie->sysctrl, 0x1a4, &val);
> +	val |= 0xF0F400;
> +	val &= ~(0x3 << 28);
> +	regmap_write(kirin_pcie->sysctrl, 0x1a4, val);

magic numbers here, replace with #defines with describing names.

> +}
> +
> +static int kirin_pcie_clk_ctrl(struct kirin_pcie *kirin_pcie, bool 
> +enable) {
> +	int ret = 0;
> +
> +	if (!enable)
> +		goto close_clk;
> +
> +	ret = clk_set_rate(kirin_pcie->phy_ref_clk, REF_CLK_FREQ);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(kirin_pcie->phy_ref_clk);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(kirin_pcie->apb_sys_clk);
> +	if (ret)
> +		goto apb_sys_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->apb_phy_clk);
> +	if (ret)
> +		goto apb_phy_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->pcie_aclk);
> +	if (ret)
> +		goto aclk_fail;
> +
> +	ret = clk_prepare_enable(kirin_pcie->pcie_aux_clk);
> +	if (ret)
> +		goto aux_clk_fail;
> +
> +	return 0;
> +close_clk:
> +	clk_disable_unprepare(kirin_pcie->pcie_aux_clk);
> +aux_clk_fail:
> +	clk_disable_unprepare(kirin_pcie->pcie_aclk);
> +aclk_fail:
> +	clk_disable_unprepare(kirin_pcie->apb_phy_clk);
> +apb_phy_fail:
> +	clk_disable_unprepare(kirin_pcie->apb_sys_clk);
> +apb_sys_fail:
> +	clk_disable_unprepare(kirin_pcie->phy_ref_clk);
> +	return ret;
> +}
> +
> +static int kirin_pcie_power_on(struct kirin_pcie *kirin_pcie) {
> +	int ret;
> +
> +	/*Power supply for Host*/
> +	regmap_write(kirin_pcie->sysctrl, 0x60, 0x10);
> +	udelay(100);
> +	kirin_pcie_oe_enable(kirin_pcie);
> +
> +	ret = kirin_pcie_clk_ctrl(kirin_pcie, true);
> +	if (ret)
> +		return ret;
> +
> +	/*deasset PCIeCtrl&PCIePHY*/
> +	regmap_write(kirin_pcie->sysctrl, 0x44, 0x30);
> +	regmap_write(kirin_pcie->crgctrl, 0x88, 0x8c000000);
> +	regmap_write(kirin_pcie->sysctrl, 0x190, 0x184000);

magic numbers here, replace with #defines with describing names.

> +
> +	ret = kirin_pcie_phy_init(kirin_pcie);
> +	if (ret)
> +		goto close_clk;
> +
> +	/*perst assert Endpoint*/
> +	if (!gpio_request(kirin_pcie->gpio_id_reset, "pcie_perst")) {
> +		usleep_range(REF_2_PERST_MIN, REF_2_PERST_MAX);
> +		ret = gpio_direction_output(kirin_pcie->gpio_id_reset, 1);
> +		if (ret)
> +			goto close_clk;
> +		usleep_range(PERST_2_ACCESS_MIN, PERST_2_ACCESS_MAX);
> +
> +		return 0;
> +	}
> +
> +close_clk:
> +	kirin_pcie_clk_ctrl(kirin_pcie, false);
> +	return -1;

return a proper error code.

> +}
> +
> +static void kirin_pcie_sideband_dbi_w_mode(struct kirin_pcie *kirin_pcie,
> +					bool on)
> +{
> +	u32 val;
> +
> +	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL0_ADDR);
> +	if (on)
> +		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
> +	else
> +		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
> +
> +	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL0_ADDR); }
> +
> +static void kirin_pcie_sideband_dbi_r_mode(struct kirin_pcie *kirin_pcie,
> +					bool on)
> +{
> +	u32 val;
> +
> +	val = kirin_apb_ctrl_readl(kirin_pcie, SOC_PCIECTRL_CTRL1_ADDR);
> +	if (on)
> +		val = val | PCIE_ELBI_SLV_DBI_ENABLE;
> +	else
> +		val = val & ~PCIE_ELBI_SLV_DBI_ENABLE;
> +
> +	kirin_apb_ctrl_writel(kirin_pcie, val, SOC_PCIECTRL_CTRL1_ADDR); }
> +
> +static int kirin_pcie_rd_own_conf(struct pcie_port *pp,
> +				  int where, int size, u32 *val)
> +{
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +	int ret;
> +
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
> +	ret = dw_pcie_read(pci->dbi_base + where, size, val);
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static int kirin_pcie_wr_own_conf(struct pcie_port *pp,
> +				  int where, int size, u32 val)
> +{
> +	int ret;
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
> +	ret = dw_pcie_write(pci->dbi_base + where, size, val);
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static u32 kirin_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base,
> +				u32 reg, size_t size)
> +{
> +	u32 ret;
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, true);
> +	dw_pcie_read(base + reg, size, &ret);
> +	kirin_pcie_sideband_dbi_r_mode(kirin_pcie, false);
> +
> +	return ret;
> +}
> +
> +static void kirin_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,
> +				u32 reg, size_t size, u32 val)
> +{
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, true);
> +	dw_pcie_write(base + reg, size, val);
> +	kirin_pcie_sideband_dbi_w_mode(kirin_pcie, false); }
> +
> +static int kirin_pcie_link_up(struct dw_pcie *pci) {
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +	u32 val = kirin_apb_ctrl_readl(kirin_pcie, PCIE_ELBI_RDLH_LINKUP);
> +
> +	if ((val & PCIE_LINKUP_ENABLE) == PCIE_LINKUP_ENABLE)
> +		return 1;
> +
> +	return 0;
> +}
> +
> +static int kirin_pcie_establish_link(struct pcie_port *pp) {
> +	int count = 0;
> +
> +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
> +	struct kirin_pcie *kirin_pcie = to_kirin_pcie(pci);
> +
> +	if (kirin_pcie_link_up(pci))
> +		return 0;
> +
> +	dw_pcie_setup_rc(pp);
> +
> +	/* assert LTSSM enable */
> +	kirin_apb_ctrl_writel(kirin_pcie, PCIE_LTSSM_ENABLE_BIT,
> +			 PCIE_APP_LTSSM_ENABLE);
> +
> +	/* check if the link is up or not */
> +	while (!kirin_pcie_link_up(pci)) {
> +		usleep_range(LINK_WAIT_MIN, LINK_WAIT_MAX);
> +		count++;
> +		if (count == 1000) {
> +			dev_err(pci->dev, "Link Fail\n");
> +			return -EINVAL;
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +static void kirin_pcie_host_init(struct pcie_port *pp) {
> +	kirin_pcie_establish_link(pp);
> +}
> +
> +static struct dw_pcie_ops kirin_dw_pcie_ops = {
> +	.read_dbi = kirin_pcie_read_dbi,
> +	.write_dbi = kirin_pcie_write_dbi,
> +	.link_up = kirin_pcie_link_up,
> +};
> +
> +static struct dw_pcie_host_ops kirin_pcie_host_ops = {
> +	.rd_own_conf = kirin_pcie_rd_own_conf,
> +	.wr_own_conf = kirin_pcie_wr_own_conf,
> +	.host_init = kirin_pcie_host_init,
> +};
> +
> +static int __init kirin_add_pcie_port(struct dw_pcie *pci,
> +				      struct platform_device *pdev) {
> +	int ret;
> +
> +	pci->pp.ops = &kirin_pcie_host_ops;
> +
> +	ret = dw_pcie_host_init(&pci->pp);
> +
> +	return ret;
> +}
> +
> +static int kirin_pcie_probe(struct platform_device *pdev) {
> +	struct kirin_pcie *kirin_pcie;
> +	struct dw_pcie *pci;
> +	struct device *dev = &pdev->dev;
> +	int ret;
> +
> +	if (!pdev->dev.of_node) {
> +		dev_err(&pdev->dev, "NULL node\n");
> +		return -EINVAL;
> +	}
> +
> +	kirin_pcie = devm_kzalloc(&pdev->dev,
> +					sizeof(struct kirin_pcie), GFP_KERNEL);
> +	if (!kirin_pcie)
> +		return -ENOMEM;
> +
> +	pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
> +	if (!pci)
> +		return -ENOMEM;
> +
> +	pci->dev = dev;
> +	pci->ops = &kirin_dw_pcie_ops;
> +	kirin_pcie->pci = pci;
> +
> +	ret = kirin_pcie_get_clk(kirin_pcie, pdev);
> +	if (ret != 0)
> +		return -ENODEV;
> +
> +	ret = kirin_pcie_get_resource(kirin_pcie, pdev);
> +	if (ret != 0)
> +		return -ENODEV;

if (ret != 0) can be replaced with if (ret)

> +
> +	kirin_pcie->gpio_id_reset = of_get_named_gpio(pdev->dev.of_node,
> +			"reset-gpio", 0);
> +	if (kirin_pcie->gpio_id_reset < 0)
> +		return -ENODEV;
> +
> +	ret = kirin_pcie_power_on(kirin_pcie);
> +	if (ret)
> +		return ret;
> +
> +	platform_set_drvdata(pdev, kirin_pcie);
> +
> +	ret = kirin_add_pcie_port(pci, pdev);
> +	if (ret)
> +		return ret;
> +
> +	dev_dbg(&pdev->dev, "probe Done\n");

this is your only dev_dbg.
is it really needed?
booting with kernel command line options debug initcall_debug=1 will show you if your drivers was probed or not.

> +	return 0;
> +}
> +
> +static const struct of_device_id kirin_pcie_match[] = {
> +	{ .compatible = "hisilicon,kirin-pcie" },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, kirin_pcie_match);
> +
> +struct platform_driver kirin_pcie_driver = {
> +	.probe			= kirin_pcie_probe,
> +	.driver			= {
> +		.name			= "Kirin-pcie",
> +		.owner			= THIS_MODULE,

owner shouldn't be needed since it populated by the core.

> +		.of_match_table = kirin_pcie_match,

since your module can only be built as built-in (bool rather than tristate in Kconfig) and since you don't provide a .remove callback, you should probably add

.suppress_bind_attrs = true,

> +	},
> +};
> +
> +module_platform_driver(kirin_pcie_driver);

since your module can only be built as built-in (bool rather than tristate in Kconfig) this should probably be replaced with builtin_platform_driver

> diff --git a/drivers/pci/dwc/pcie-kirin.h 
> b/drivers/pci/dwc/pcie-kirin.h new file mode 100644 index 
> 000000000000..ad9a3b427298
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.h
> @@ -0,0 +1,79 @@
> +/*
> + * PCIe host controller driver for Kirin 960 SoCs
> + *
> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
> + *		http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or 
> +modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef _PCIE_KIRIN_H
> +#define _PCIE_KIRIN_H
> +
> +#include <linux/mfd/syscon.h>
> +#include <linux/regmap.h>
> +#include <asm/compiler.h>
> +#include <linux/compiler.h>
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/gpio.h>
> +#include <linux/err.h>
> +#include <linux/interrupt.h>
> +#include <linux/irqdomain.h>
> +#include <linux/module.h>

since your module can only be built as built-in (bool rather than tristate in Kconfig) you should probably not include module.h

> +#include <linux/of_gpio.h>
> +#include <linux/pci.h>
> +#include <linux/of_pci.h>
> +#include <linux/platform_device.h>
> +#include <linux/resource.h>
> +#include <linux/types.h>
> +#include <linux/msi.h>

is this header needed if you don't support msi?

> +#include <linux/of_address.h>
> +#include <linux/pci_regs.h>
> +
> +#include "pcie-designware.h"
> +
> +#define to_kirin_pcie(x) dev_get_drvdata((x)->dev)
> +
> +#define REF_CLK_FREQ 100000000
> +
> +/* PCIe ELBI registers */
> +#define SOC_PCIECTRL_CTRL0_ADDR 0x000 #define SOC_PCIECTRL_CTRL1_ADDR 
> +0x004 #define SOC_PCIEPHY_CTRL2_ADDR 0x008 #define 
> +SOC_PCIEPHY_CTRL3_ADDR 0x00c
> +#define PCIE_ELBI_SLV_DBI_ENABLE	(0x1 << 21)
> +
> +#define PCIE_APP_LTSSM_ENABLE		0x01c
> +#define PCIE_ELBI_RDLH_LINKUP		0x400
> +#define PCIE_LINKUP_ENABLE		(0x8020)
> +#define PCIE_LTSSM_ENABLE_BIT	  (0x1 << 11)
> +
> +#define REF_2_PERST_MIN		(20000)
> +#define REF_2_PERST_MAX		(25000)
> +#define PERST_2_ACCESS_MIN	(10000)
> +#define PERST_2_ACCESS_MAX	(12000)
> +#define LINK_WAIT_MIN	(900)
> +#define LINK_WAIT_MAX		(1000)
> +
> +
> +struct kirin_pcie {
> +	void __iomem		*apb_base;
> +	void __iomem		*phy_base;
> +	struct regmap *crgctrl;
> +	struct regmap *sysctrl;
> +	struct clk			*apb_sys_clk;
> +	struct clk			*apb_phy_clk;
> +	struct clk			*phy_ref_clk;
> +	struct clk			*pcie_aclk;
> +	struct clk			*pcie_aux_clk;
> +	int                 gpio_id_reset;
> +	struct dw_pcie		*pci;
> +};
> +
> +#endif
> +
> 

since this .h file is really small, it might be better to just remove it and move the code to the .c file.



Best regards,
Niklas

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

SGkgTmlrbGFzLA0KDQpUaGFua3MgYSBsb3QgZm9yIHlvdXIgdGltZSB0byByZXZpZXcgbXkgcGF0
Y2guDQoNCkknbGwgbW9kaWZ5IGFjY29yZGluZyB0byB5b3VyIGNvbW1lbnRzIGFuZCB1cGRhdGUg
dGhlIHBhdGNoLg0KDQpCZXN0IHJlZ2FyZHMsDQpTb25nDQoNCi0tLS0t6YKu5Lu25Y6f5Lu2LS0t
LS0NCuWPkeS7tuS6ujogTmlrbGFzIENhc3NlbCBbbWFpbHRvOm5pa2xhcy5jYXNzZWxAYXhpcy5j
b21dIA0K5Y+R6YCB5pe26Ze0OiAyMDE35bm0NeaciDEy5pelIDE2OjA4DQrmlLbku7bkuro6IHNv
bmd4aWFvd2VpOyBiaGVsZ2Fhc0Bnb29nbGUuY29tOyBraXNob25AdGkuY29tOyBqaW5nb29oYW4x
QGdtYWlsLmNvbTsgYXJuZEBhcm5kYi5kZTsgdG5Ac2VtaWhhbGYuY29tOyBrZWl0aC5idXNjaEBp
bnRlbC5jb207IGRoZGFuZ0BhcG0uY29tOyBsaXVkb25nZG9uZyAoQykNCuaKhOmAgTogQ2hlbmZl
bmcgKHB1Y2spOyBndW9kb25nLnh1QGxpbmFyby5vcmc7IFdhbmdiaW5naHVpOyBTdXpodWFuZ2x1
YW47IGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc7IGxpbnV4LXBjaUB2Z2VyLmtlcm5lbC5v
cmcNCuS4u+mimDogUmU6IFtQQVRDSCAxLzJdIFBDSTogZHdjOiBraXJpbjogYWRkIFBDSWUgRHJp
dmVyIGZvciBIaVNpbGljb24gS2lyaW4gU29DDQoNCkhlbGxvIFNvbmcNCg0KT24gMDUvMTIvMjAx
NyAwMzo1MSBBTSwgU29uZyBYaWFvd2VpIHdyb3RlOg0KPiBGcm9tOiBzb25neGlhb3dlaSA8c29u
Z3hpYW93ZWlAaGlzaWxpY29uLmNvbT4NCj4gDQo+IEhpc2lsaWNvbiBQQ0llIERyaXZlciBzaGFy
ZXMgdGhlIGNvbW1vbiBmdW5jdGlvbnMgZm8gUENJZSBkdy1ob3N0DQo+IA0KPiBUaGUgcG93ZXJv
biBmdW5jdGlvbnMgaXMgZGV2ZWxvcGVkIG9uIGhpMzY2MCBTb0MsIHdoaWxlIE90aGVycyANCj4g
RnVuY3Rpb25zIGFyZSBjb21tb24gZm9yIEtpcmluIHNlcmllcyBTb0NzLg0KPiANCj4gTG93cG93
ZXIoTDFzcyBhbmQgU1IpLCBob3RwbHVnIGFuZCBNU0kgZmVhdHVyZSBhcmUgbm90IHN1cHBvcnRl
ZCANCj4gY3VycmVudGx5Lg0KPiANCj4gQ2M6IEd1b2RvbmcgWHUgPGd1b2RvbmcueHVAbGluYXJv
Lm9yZz4NCj4gU2lnbmVkLW9mZi1ieTogU29uZyBYaWFvd2VpIDxzb25neGlhb3dlaUBoaXNpbGlj
b24uY29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvcGNpL2R3Yy9LY29uZmlnICAgICAgfCAgMTEgKysN
Cj4gIGRyaXZlcnMvcGNpL2R3Yy9NYWtlZmlsZSAgICAgfCAgIDEgKw0KPiAgZHJpdmVycy9wY2kv
ZHdjL3BjaWUta2lyaW4uYyB8IDQ0MyANCj4gKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKysrKw0KPiAgZHJpdmVycy9wY2kvZHdjL3BjaWUta2lyaW4uaCB8ICA3OSArKysr
KysrKw0KPiAgNCBmaWxlcyBjaGFuZ2VkLCA1MzQgaW5zZXJ0aW9ucygrKQ0KPiAgY3JlYXRlIG1v
ZGUgMTAwNjQ0IGRyaXZlcnMvcGNpL2R3Yy9wY2llLWtpcmluLmMgIGNyZWF0ZSBtb2RlIDEwMDY0
NCANCj4gZHJpdmVycy9wY2kvZHdjL3BjaWUta2lyaW4uaA0KPiANCj4gZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvcGNpL2R3Yy9LY29uZmlnIGIvZHJpdmVycy9wY2kvZHdjL0tjb25maWcgaW5kZXggDQo+
IGQyZDJiYTViOGE2OC4uMjVmNWVjMzNjZTBjIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL3BjaS9k
d2MvS2NvbmZpZw0KPiArKysgYi9kcml2ZXJzL3BjaS9kd2MvS2NvbmZpZw0KPiBAQCAtMTMwLDQg
KzEzMCwxNSBAQCBjb25maWcgUENJRV9BUlRQRUM2DQo+ICAJICBTYXkgWSBoZXJlIHRvIGVuYWJs
ZSBQQ0llIGNvbnRyb2xsZXIgc3VwcG9ydCBvbiBBeGlzIEFSVFBFQy02DQo+ICAJICBTb0NzLiAg
VGhpcyBQQ0llIGNvbnRyb2xsZXIgdXNlcyB0aGUgRGVzaWduV2FyZSBjb3JlLg0KPiAgDQo+ICtj
b25maWcgUENJRV9LSVJJTg0KPiArCWRlcGVuZHMgb24gT0YgJiYgQVJNNjQNCj4gKwlib29sICJI
aVNpbGljb24gS2lyaW4gc2VyaWVzIFNvQ3MgUENJZSBjb250cm9sbGVycyINCj4gKwlkZXBlbmRz
IG9uIFBDSQ0KPiArCWRlcGVuZHMgb24gUENJX01TSV9JUlFfRE9NQUlODQoNCmRvIHlvdSBuZWVk
IHRvIGRlcGVuZCBvbiBQQ0lfTVNJX0lSUV9ET01BSU4gaWYgeW91ciBkcml2ZXIgZG9lcyBub3Qg
c3VwcG9ydCBNU0k/DQoNCj4gKwlzZWxlY3QgUENJRVBPUlRCVVMNCj4gKwlzZWxlY3QgUENJRV9E
V19IT1NUDQo+ICsJaGVscA0KPiArCSAgU2F5IFkgaGVyZSBpZiB5b3Ugd2FudCBQQ0llIGNvbnRy
b2xsZXIgc3VwcG9ydCBvbiBIaVNpbGljb24gS2lyaW4gc2VyaWVzIFNvQ3MNCj4gKwkgIGtpcmlu
OTYwIFNvQ3MNCj4gKw0KPiAgZW5kbWVudQ0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvZHdj
L01ha2VmaWxlIGIvZHJpdmVycy9wY2kvZHdjL01ha2VmaWxlIGluZGV4IA0KPiBhMmRmMTNjMjg3
OTguLjRiZDY5YmFjZDRhYiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9wY2kvZHdjL01ha2VmaWxl
DQo+ICsrKyBiL2RyaXZlcnMvcGNpL2R3Yy9NYWtlZmlsZQ0KPiBAQCAtMTAsNiArMTAsNyBAQCBv
YmotJChDT05GSUdfUENJX0xBWUVSU0NBUEUpICs9IHBjaS1sYXllcnNjYXBlLm8NCj4gIG9iai0k
KENPTkZJR19QQ0lFX1FDT00pICs9IHBjaWUtcWNvbS5vDQo+ICBvYmotJChDT05GSUdfUENJRV9B
Uk1BREFfOEspICs9IHBjaWUtYXJtYWRhOGsubw0KPiAgb2JqLSQoQ09ORklHX1BDSUVfQVJUUEVD
NikgKz0gcGNpZS1hcnRwZWM2Lm8NCj4gK29iai0kKENPTkZJR19QQ0lFX0tJUklOKSArPSBwY2ll
LWtpcmluLm8NCj4gIA0KPiAgIyBUaGUgZm9sbG93aW5nIGRyaXZlcnMgYXJlIGZvciBkZXZpY2Vz
IHRoYXQgdXNlIHRoZSBnZW5lcmljIEFDUEkgICMgDQo+IHBjaV9yb290LmMgZHJpdmVyIGJ1dCBk
b24ndCBzdXBwb3J0IHN0YW5kYXJkIEVDQU0gY29uZmlnIGFjY2Vzcy4NCj4gZGlmZiAtLWdpdCBh
L2RyaXZlcnMvcGNpL2R3Yy9wY2llLWtpcmluLmMgDQo+IGIvZHJpdmVycy9wY2kvZHdjL3BjaWUt
a2lyaW4uYyBuZXcgZmlsZSBtb2RlIDEwMDY0NCBpbmRleCANCj4gMDAwMDAwMDAwMDAwLi41Mjk4
NDA3Y2YxMGENCj4gLS0tIC9kZXYvbnVsbA0KPiArKysgYi9kcml2ZXJzL3BjaS9kd2MvcGNpZS1r
aXJpbi5jDQo+IEBAIC0wLDAgKzEsNDQzIEBADQo+ICsvKg0KPiArICogUENJZSBob3N0IGNvbnRy
b2xsZXIgZHJpdmVyIGZvciBLaXJpbiBQaG9uZSBTb0NzDQo+ICsgKg0KPiArICogQ29weXJpZ2h0
IChDKSAyMDE1IEhpbGlzaWNvbiBFbGVjdHJvbmljcyBDby4sIEx0ZC4NCj4gKyAqCQlodHRwOi8v
d3d3Lmh1YXdlaS5jb20NCj4gKyAqDQo+ICsgKiBBdXRob3I6IFhpYW93ZWkgU29uZyA8c29uZ3hp
YW93ZWlAaHVhd2VpLmNvbT4NCj4gKyAqDQo+ICsgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0
d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIA0KPiArbW9kaWZ5DQo+ICsgKiBp
dCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHZlcnNp
b24gMiBhcw0KPiArICogcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24u
DQo+ICsgKi8NCj4gKw0KPiArI2luY2x1ZGUgInBjaWUta2lyaW4uaCINCj4gKw0KPiArc3RhdGlj
IGlubGluZSB2b2lkIGtpcmluX2FwYl9jdHJsX3dyaXRlbChzdHJ1Y3Qga2lyaW5fcGNpZSAqa2ly
aW5fcGNpZSwNCj4gKwkJCQkJCXUzMiB2YWwsIHUzMiByZWcpDQo+ICt7DQo+ICsJd3JpdGVsKHZh
bCwga2lyaW5fcGNpZS0+YXBiX2Jhc2UgKyByZWcpOyB9DQo+ICsNCj4gK3N0YXRpYyBpbmxpbmUg
dTMyIGtpcmluX2FwYl9jdHJsX3JlYWRsKHN0cnVjdCBraXJpbl9wY2llICpraXJpbl9wY2llLA0K
PiArCQkJCQkJdTMyIHJlZykNCj4gK3sNCj4gKwlyZXR1cm4gcmVhZGwoa2lyaW5fcGNpZS0+YXBi
X2Jhc2UgKyByZWcpOyB9DQo+ICsNCj4gKy8qUmVnaXN0ZXJzIGluIFBDSWVQSFkqLw0KPiArc3Rh
dGljIGlubGluZSB2b2lkIGtpcmluX2FwYl9waHlfd3JpdGVsKHN0cnVjdCBraXJpbl9wY2llICpr
aXJpbl9wY2llLA0KPiArCQkJCQkJdTMyIHZhbCwgdTMyIHJlZykNCj4gK3sNCj4gKwl3cml0ZWwo
dmFsLCBraXJpbl9wY2llLT5waHlfYmFzZSArIHJlZyk7IH0NCj4gKw0KPiArc3RhdGljIGlubGlu
ZSB1MzIga2lyaW5fYXBiX3BoeV9yZWFkbChzdHJ1Y3Qga2lyaW5fcGNpZSAqa2lyaW5fcGNpZSwN
Cj4gKwkJCQkJCXUzMiByZWcpDQo+ICt7DQo+ICsJcmV0dXJuIHJlYWRsKGtpcmluX3BjaWUtPnBo
eV9iYXNlICsgcmVnKTsgfQ0KPiArDQo+ICtzdGF0aWMgaW50MzJfdCBraXJpbl9wY2llX2dldF9j
bGsoc3RydWN0IGtpcmluX3BjaWUgKmtpcmluX3BjaWUsDQo+ICsJCQkJICBzdHJ1Y3QgcGxhdGZv
cm1fZGV2aWNlICpwZGV2KQ0KPiArew0KPiArCWtpcmluX3BjaWUtPnBoeV9yZWZfY2xrID0gZGV2
bV9jbGtfZ2V0KCZwZGV2LT5kZXYsICJwY2llX3BoeV9yZWYiKTsNCj4gKwlpZiAoSVNfRVJSKGtp
cmluX3BjaWUtPnBoeV9yZWZfY2xrKSkNCj4gKwkJcmV0dXJuIFBUUl9FUlIoa2lyaW5fcGNpZS0+
cGh5X3JlZl9jbGspOw0KPiArDQo+ICsJa2lyaW5fcGNpZS0+cGNpZV9hdXhfY2xrID0gZGV2bV9j
bGtfZ2V0KCZwZGV2LT5kZXYsICJwY2llX2F1eCIpOw0KPiArCWlmIChJU19FUlIoa2lyaW5fcGNp
ZS0+cGNpZV9hdXhfY2xrKSkNCj4gKwkJcmV0dXJuIFBUUl9FUlIoa2lyaW5fcGNpZS0+cGNpZV9h
dXhfY2xrKTsNCj4gKw0KPiArCWtpcmluX3BjaWUtPmFwYl9waHlfY2xrID0gZGV2bV9jbGtfZ2V0
KCZwZGV2LT5kZXYsICJwY2llX2FwYl9waHkiKTsNCj4gKwlpZiAoSVNfRVJSKGtpcmluX3BjaWUt
PmFwYl9waHlfY2xrKSkNCj4gKwkJcmV0dXJuIFBUUl9FUlIoa2lyaW5fcGNpZS0+YXBiX3BoeV9j
bGspOw0KPiArDQo+ICsJa2lyaW5fcGNpZS0+YXBiX3N5c19jbGsgPSBkZXZtX2Nsa19nZXQoJnBk
ZXYtPmRldiwgInBjaWVfYXBiX3N5cyIpOw0KPiArCWlmIChJU19FUlIoa2lyaW5fcGNpZS0+YXBi
X3N5c19jbGspKQ0KPiArCQlyZXR1cm4gUFRSX0VSUihraXJpbl9wY2llLT5hcGJfc3lzX2Nsayk7
DQo+ICsNCj4gKwlraXJpbl9wY2llLT5wY2llX2FjbGsgPSBkZXZtX2Nsa19nZXQoJnBkZXYtPmRl
diwgInBjaWVfYWNsayIpOw0KPiArCWlmIChJU19FUlIoa2lyaW5fcGNpZS0+cGNpZV9hY2xrKSkN
Cj4gKwkJcmV0dXJuIFBUUl9FUlIoa2lyaW5fcGNpZS0+cGNpZV9hY2xrKTsNCj4gKw0KPiArCXJl
dHVybiAwOw0KPiArfQ0KPiArDQo+ICtzdGF0aWMgaW50MzJfdCBraXJpbl9wY2llX2dldF9yZXNv
dXJjZShzdHJ1Y3Qga2lyaW5fcGNpZSAqa2lyaW5fcGNpZSwNCj4gKwkJCQkgICAgICAgc3RydWN0
IHBsYXRmb3JtX2RldmljZSAqcGRldikgew0KPiArCXN0cnVjdCByZXNvdXJjZSAqYXBiOw0KPiAr
CXN0cnVjdCByZXNvdXJjZSAqcGh5Ow0KPiArCXN0cnVjdCByZXNvdXJjZSAqZGJpOw0KPiArDQo+
ICsJYXBiID0gcGxhdGZvcm1fZ2V0X3Jlc291cmNlX2J5bmFtZShwZGV2LCBJT1JFU09VUkNFX01F
TSwgImFwYiIpOw0KPiArCWtpcmluX3BjaWUtPmFwYl9iYXNlID0gZGV2bV9pb3JlbWFwX3Jlc291
cmNlKCZwZGV2LT5kZXYsIGFwYik7DQo+ICsJaWYgKElTX0VSUihraXJpbl9wY2llLT5hcGJfYmFz
ZSkpDQo+ICsJCXJldHVybiBQVFJfRVJSKGtpcmluX3BjaWUtPmFwYl9iYXNlKTsNCj4gKw0KPiAr
CXBoeSA9IHBsYXRmb3JtX2dldF9yZXNvdXJjZV9ieW5hbWUocGRldiwgSU9SRVNPVVJDRV9NRU0s
ICJwaHkiKTsNCj4gKwlraXJpbl9wY2llLT5waHlfYmFzZSA9IGRldm1faW9yZW1hcF9yZXNvdXJj
ZSgmcGRldi0+ZGV2LCBwaHkpOw0KPiArCWlmIChJU19FUlIoa2lyaW5fcGNpZS0+cGh5X2Jhc2Up
KQ0KPiArCQlyZXR1cm4gUFRSX0VSUihraXJpbl9wY2llLT5waHlfYmFzZSk7DQo+ICsNCj4gKwlk
YmkgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2VfYnluYW1lKHBkZXYsIElPUkVTT1VSQ0VfTUVNLCAi
ZGJpIik7DQo+ICsJa2lyaW5fcGNpZS0+cGNpLT5kYmlfYmFzZSA9IGRldm1faW9yZW1hcF9yZXNv
dXJjZSgmcGRldi0+ZGV2LCBkYmkpOw0KPiArCWlmIChJU19FUlIoa2lyaW5fcGNpZS0+cGNpLT5k
YmlfYmFzZSkpDQo+ICsJCXJldHVybiBQVFJfRVJSKGtpcmluX3BjaWUtPnBjaS0+ZGJpX2Jhc2Up
Ow0KPiArDQo+ICsJa2lyaW5fcGNpZS0+Y3JnY3RybCA9DQo+ICsJCXN5c2Nvbl9yZWdtYXBfbG9v
a3VwX2J5X2NvbXBhdGlibGUoImhpc2lsaWNvbixoaTM2NjAtY3JnY3RybCIpOw0KPiArCWlmIChJ
U19FUlIoa2lyaW5fcGNpZS0+Y3JnY3RybCkpDQo+ICsJCXJldHVybiBQVFJfRVJSKGtpcmluX3Bj
aWUtPmNyZ2N0cmwpOw0KPiArDQo+ICsJa2lyaW5fcGNpZS0+c3lzY3RybCA9DQo+ICsJCXN5c2Nv
bl9yZWdtYXBfbG9va3VwX2J5X2NvbXBhdGlibGUoImhpc2lsaWNvbixoaTM2NjAtc2N0cmwiKTsN
Cj4gKwlpZiAoSVNfRVJSKGtpcmluX3BjaWUtPnN5c2N0cmwpKQ0KPiArCQlyZXR1cm4gUFRSX0VS
UihraXJpbl9wY2llLT5zeXNjdHJsKTsNCj4gKw0KPiArCXJldHVybiAwOw0KPiArfQ0KPiArDQo+
ICtzdGF0aWMgaW50IGtpcmluX3BjaWVfcGh5X2luaXQoc3RydWN0IGtpcmluX3BjaWUgKmtpcmlu
X3BjaWUpIHsNCj4gKwl1MzIgcmVnX3ZhbDsNCj4gKwl1MzIgcGlwZV9jbGtfc3RhYmxlID0gMHgx
IDw8IDE5Ow0KPiArCXUzMiB0aW1lID0gMTA7DQo+ICsNCj4gKwlyZWdfdmFsID0ga2lyaW5fYXBi
X3BoeV9yZWFkbChraXJpbl9wY2llLCAweDQpOw0KPiArCXJlZ192YWwgJj0gfigweDEgPDwgOCk7
DQo+ICsJa2lyaW5fYXBiX3BoeV93cml0ZWwoa2lyaW5fcGNpZSwgcmVnX3ZhbCwgMHg0KTsNCj4g
Kw0KPiArCXJlZ192YWwgPSBraXJpbl9hcGJfcGh5X3JlYWRsKGtpcmluX3BjaWUsIDB4MCk7DQo+
ICsJcmVnX3ZhbCAmPSB+KDB4MSA8PCAyMik7DQo+ICsJa2lyaW5fYXBiX3BoeV93cml0ZWwoa2ly
aW5fcGNpZSwgcmVnX3ZhbCwgMHgwKTsNCj4gKwl1ZGVsYXkoMTApOw0KPiArDQo+ICsJcmVnX3Zh
bCA9IGtpcmluX2FwYl9waHlfcmVhZGwoa2lyaW5fcGNpZSwgMHg0KTsNCj4gKwlyZWdfdmFsICY9
IH4oMHgxIDw8IDE2KTsNCj4gKwlraXJpbl9hcGJfcGh5X3dyaXRlbChraXJpbl9wY2llLCByZWdf
dmFsLCAweDQpOw0KPiArDQo+ICsJcmVnX3ZhbCA9IGtpcmluX2FwYl9waHlfcmVhZGwoa2lyaW5f
cGNpZSwgMHg0MDApOw0KPiArCXdoaWxlIChyZWdfdmFsICYgcGlwZV9jbGtfc3RhYmxlKSB7DQo+
ICsJCXVkZWxheSgxMDApOw0KPiArCQlpZiAodGltZSA9PSAwKSB7DQo+ICsJCQlkZXZfZXJyKGtp
cmluX3BjaWUtPnBjaS0+ZGV2LCAiUElQRSBjbGsgaXMgbm90IHN0YWJsZVxuIik7DQo+ICsJCQly
ZXR1cm4gLUVJTlZBTDsNCj4gKwkJfQ0KPiArCQl0aW1lLS07DQo+ICsJCXJlZ192YWwgPSBraXJp
bl9hcGJfcGh5X3JlYWRsKGtpcmluX3BjaWUsIDB4NDAwKTsNCj4gKwl9DQoNCm1hZ2ljIG51bWJl
cnMgaGVyZSwgcmVwbGFjZSB3aXRoICNkZWZpbmVzIHdpdGggZGVzY3JpYmluZyBuYW1lcy4NCg0K
PiArDQo+ICsJcmV0dXJuIDA7DQo+ICt9DQo+ICsNCj4gK3N0YXRpYyB2b2lkIGtpcmluX3BjaWVf
b2VfZW5hYmxlKHN0cnVjdCBraXJpbl9wY2llICpraXJpbl9wY2llKSB7DQo+ICsJdTMyIHZhbDsN
Cj4gKw0KPiArCXJlZ21hcF9yZWFkKGtpcmluX3BjaWUtPnN5c2N0cmwsIDB4MWE0LCAmdmFsKTsN
Cj4gKwl2YWwgfD0gMHhGMEY0MDA7DQo+ICsJdmFsICY9IH4oMHgzIDw8IDI4KTsNCj4gKwlyZWdt
YXBfd3JpdGUoa2lyaW5fcGNpZS0+c3lzY3RybCwgMHgxYTQsIHZhbCk7DQoNCm1hZ2ljIG51bWJl
cnMgaGVyZSwgcmVwbGFjZSB3aXRoICNkZWZpbmVzIHdpdGggZGVzY3JpYmluZyBuYW1lcy4NCg0K
PiArfQ0KPiArDQo+ICtzdGF0aWMgaW50IGtpcmluX3BjaWVfY2xrX2N0cmwoc3RydWN0IGtpcmlu
X3BjaWUgKmtpcmluX3BjaWUsIGJvb2wgDQo+ICtlbmFibGUpIHsNCj4gKwlpbnQgcmV0ID0gMDsN
Cj4gKw0KPiArCWlmICghZW5hYmxlKQ0KPiArCQlnb3RvIGNsb3NlX2NsazsNCj4gKw0KPiArCXJl
dCA9IGNsa19zZXRfcmF0ZShraXJpbl9wY2llLT5waHlfcmVmX2NsaywgUkVGX0NMS19GUkVRKTsN
Cj4gKwlpZiAocmV0KQ0KPiArCQlyZXR1cm4gcmV0Ow0KPiArDQo+ICsJcmV0ID0gY2xrX3ByZXBh
cmVfZW5hYmxlKGtpcmluX3BjaWUtPnBoeV9yZWZfY2xrKTsNCj4gKwlpZiAocmV0KQ0KPiArCQly
ZXR1cm4gcmV0Ow0KPiArDQo+ICsJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKGtpcmluX3BjaWUt
PmFwYl9zeXNfY2xrKTsNCj4gKwlpZiAocmV0KQ0KPiArCQlnb3RvIGFwYl9zeXNfZmFpbDsNCj4g
Kw0KPiArCXJldCA9IGNsa19wcmVwYXJlX2VuYWJsZShraXJpbl9wY2llLT5hcGJfcGh5X2Nsayk7
DQo+ICsJaWYgKHJldCkNCj4gKwkJZ290byBhcGJfcGh5X2ZhaWw7DQo+ICsNCj4gKwlyZXQgPSBj
bGtfcHJlcGFyZV9lbmFibGUoa2lyaW5fcGNpZS0+cGNpZV9hY2xrKTsNCj4gKwlpZiAocmV0KQ0K
PiArCQlnb3RvIGFjbGtfZmFpbDsNCj4gKw0KPiArCXJldCA9IGNsa19wcmVwYXJlX2VuYWJsZShr
aXJpbl9wY2llLT5wY2llX2F1eF9jbGspOw0KPiArCWlmIChyZXQpDQo+ICsJCWdvdG8gYXV4X2Ns
a19mYWlsOw0KPiArDQo+ICsJcmV0dXJuIDA7DQo+ICtjbG9zZV9jbGs6DQo+ICsJY2xrX2Rpc2Fi
bGVfdW5wcmVwYXJlKGtpcmluX3BjaWUtPnBjaWVfYXV4X2Nsayk7DQo+ICthdXhfY2xrX2ZhaWw6
DQo+ICsJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGtpcmluX3BjaWUtPnBjaWVfYWNsayk7DQo+ICth
Y2xrX2ZhaWw6DQo+ICsJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGtpcmluX3BjaWUtPmFwYl9waHlf
Y2xrKTsNCj4gK2FwYl9waHlfZmFpbDoNCj4gKwljbGtfZGlzYWJsZV91bnByZXBhcmUoa2lyaW5f
cGNpZS0+YXBiX3N5c19jbGspOw0KPiArYXBiX3N5c19mYWlsOg0KPiArCWNsa19kaXNhYmxlX3Vu
cHJlcGFyZShraXJpbl9wY2llLT5waHlfcmVmX2Nsayk7DQo+ICsJcmV0dXJuIHJldDsNCj4gK30N
Cj4gKw0KPiArc3RhdGljIGludCBraXJpbl9wY2llX3Bvd2VyX29uKHN0cnVjdCBraXJpbl9wY2ll
ICpraXJpbl9wY2llKSB7DQo+ICsJaW50IHJldDsNCj4gKw0KPiArCS8qUG93ZXIgc3VwcGx5IGZv
ciBIb3N0Ki8NCj4gKwlyZWdtYXBfd3JpdGUoa2lyaW5fcGNpZS0+c3lzY3RybCwgMHg2MCwgMHgx
MCk7DQo+ICsJdWRlbGF5KDEwMCk7DQo+ICsJa2lyaW5fcGNpZV9vZV9lbmFibGUoa2lyaW5fcGNp
ZSk7DQo+ICsNCj4gKwlyZXQgPSBraXJpbl9wY2llX2Nsa19jdHJsKGtpcmluX3BjaWUsIHRydWUp
Ow0KPiArCWlmIChyZXQpDQo+ICsJCXJldHVybiByZXQ7DQo+ICsNCj4gKwkvKmRlYXNzZXQgUENJ
ZUN0cmwmUENJZVBIWSovDQo+ICsJcmVnbWFwX3dyaXRlKGtpcmluX3BjaWUtPnN5c2N0cmwsIDB4
NDQsIDB4MzApOw0KPiArCXJlZ21hcF93cml0ZShraXJpbl9wY2llLT5jcmdjdHJsLCAweDg4LCAw
eDhjMDAwMDAwKTsNCj4gKwlyZWdtYXBfd3JpdGUoa2lyaW5fcGNpZS0+c3lzY3RybCwgMHgxOTAs
IDB4MTg0MDAwKTsNCg0KbWFnaWMgbnVtYmVycyBoZXJlLCByZXBsYWNlIHdpdGggI2RlZmluZXMg
d2l0aCBkZXNjcmliaW5nIG5hbWVzLg0KDQo+ICsNCj4gKwlyZXQgPSBraXJpbl9wY2llX3BoeV9p
bml0KGtpcmluX3BjaWUpOw0KPiArCWlmIChyZXQpDQo+ICsJCWdvdG8gY2xvc2VfY2xrOw0KPiAr
DQo+ICsJLypwZXJzdCBhc3NlcnQgRW5kcG9pbnQqLw0KPiArCWlmICghZ3Bpb19yZXF1ZXN0KGtp
cmluX3BjaWUtPmdwaW9faWRfcmVzZXQsICJwY2llX3BlcnN0IikpIHsNCj4gKwkJdXNsZWVwX3Jh
bmdlKFJFRl8yX1BFUlNUX01JTiwgUkVGXzJfUEVSU1RfTUFYKTsNCj4gKwkJcmV0ID0gZ3Bpb19k
aXJlY3Rpb25fb3V0cHV0KGtpcmluX3BjaWUtPmdwaW9faWRfcmVzZXQsIDEpOw0KPiArCQlpZiAo
cmV0KQ0KPiArCQkJZ290byBjbG9zZV9jbGs7DQo+ICsJCXVzbGVlcF9yYW5nZShQRVJTVF8yX0FD
Q0VTU19NSU4sIFBFUlNUXzJfQUNDRVNTX01BWCk7DQo+ICsNCj4gKwkJcmV0dXJuIDA7DQo+ICsJ
fQ0KPiArDQo+ICtjbG9zZV9jbGs6DQo+ICsJa2lyaW5fcGNpZV9jbGtfY3RybChraXJpbl9wY2ll
LCBmYWxzZSk7DQo+ICsJcmV0dXJuIC0xOw0KDQpyZXR1cm4gYSBwcm9wZXIgZXJyb3IgY29kZS4N
Cg0KPiArfQ0KPiArDQo+ICtzdGF0aWMgdm9pZCBraXJpbl9wY2llX3NpZGViYW5kX2RiaV93X21v
ZGUoc3RydWN0IGtpcmluX3BjaWUgKmtpcmluX3BjaWUsDQo+ICsJCQkJCWJvb2wgb24pDQo+ICt7
DQo+ICsJdTMyIHZhbDsNCj4gKw0KPiArCXZhbCA9IGtpcmluX2FwYl9jdHJsX3JlYWRsKGtpcmlu
X3BjaWUsIFNPQ19QQ0lFQ1RSTF9DVFJMMF9BRERSKTsNCj4gKwlpZiAob24pDQo+ICsJCXZhbCA9
IHZhbCB8IFBDSUVfRUxCSV9TTFZfREJJX0VOQUJMRTsNCj4gKwllbHNlDQo+ICsJCXZhbCA9IHZh
bCAmIH5QQ0lFX0VMQklfU0xWX0RCSV9FTkFCTEU7DQo+ICsNCj4gKwlraXJpbl9hcGJfY3RybF93
cml0ZWwoa2lyaW5fcGNpZSwgdmFsLCBTT0NfUENJRUNUUkxfQ1RSTDBfQUREUik7IH0NCj4gKw0K
PiArc3RhdGljIHZvaWQga2lyaW5fcGNpZV9zaWRlYmFuZF9kYmlfcl9tb2RlKHN0cnVjdCBraXJp
bl9wY2llICpraXJpbl9wY2llLA0KPiArCQkJCQlib29sIG9uKQ0KPiArew0KPiArCXUzMiB2YWw7
DQo+ICsNCj4gKwl2YWwgPSBraXJpbl9hcGJfY3RybF9yZWFkbChraXJpbl9wY2llLCBTT0NfUENJ
RUNUUkxfQ1RSTDFfQUREUik7DQo+ICsJaWYgKG9uKQ0KPiArCQl2YWwgPSB2YWwgfCBQQ0lFX0VM
QklfU0xWX0RCSV9FTkFCTEU7DQo+ICsJZWxzZQ0KPiArCQl2YWwgPSB2YWwgJiB+UENJRV9FTEJJ
X1NMVl9EQklfRU5BQkxFOw0KPiArDQo+ICsJa2lyaW5fYXBiX2N0cmxfd3JpdGVsKGtpcmluX3Bj
aWUsIHZhbCwgU09DX1BDSUVDVFJMX0NUUkwxX0FERFIpOyB9DQo+ICsNCj4gK3N0YXRpYyBpbnQg
a2lyaW5fcGNpZV9yZF9vd25fY29uZihzdHJ1Y3QgcGNpZV9wb3J0ICpwcCwNCj4gKwkJCQkgIGlu
dCB3aGVyZSwgaW50IHNpemUsIHUzMiAqdmFsKQ0KPiArew0KPiArCXN0cnVjdCBkd19wY2llICpw
Y2kgPSB0b19kd19wY2llX2Zyb21fcHAocHApOw0KPiArCXN0cnVjdCBraXJpbl9wY2llICpraXJp
bl9wY2llID0gdG9fa2lyaW5fcGNpZShwY2kpOw0KPiArCWludCByZXQ7DQo+ICsNCj4gKwlraXJp
bl9wY2llX3NpZGViYW5kX2RiaV9yX21vZGUoa2lyaW5fcGNpZSwgdHJ1ZSk7DQo+ICsJcmV0ID0g
ZHdfcGNpZV9yZWFkKHBjaS0+ZGJpX2Jhc2UgKyB3aGVyZSwgc2l6ZSwgdmFsKTsNCj4gKwlraXJp
bl9wY2llX3NpZGViYW5kX2RiaV9yX21vZGUoa2lyaW5fcGNpZSwgZmFsc2UpOw0KPiArDQo+ICsJ
cmV0dXJuIHJldDsNCj4gK30NCj4gKw0KPiArc3RhdGljIGludCBraXJpbl9wY2llX3dyX293bl9j
b25mKHN0cnVjdCBwY2llX3BvcnQgKnBwLA0KPiArCQkJCSAgaW50IHdoZXJlLCBpbnQgc2l6ZSwg
dTMyIHZhbCkNCj4gK3sNCj4gKwlpbnQgcmV0Ow0KPiArCXN0cnVjdCBkd19wY2llICpwY2kgPSB0
b19kd19wY2llX2Zyb21fcHAocHApOw0KPiArCXN0cnVjdCBraXJpbl9wY2llICpraXJpbl9wY2ll
ID0gdG9fa2lyaW5fcGNpZShwY2kpOw0KPiArDQo+ICsJa2lyaW5fcGNpZV9zaWRlYmFuZF9kYmlf
d19tb2RlKGtpcmluX3BjaWUsIHRydWUpOw0KPiArCXJldCA9IGR3X3BjaWVfd3JpdGUocGNpLT5k
YmlfYmFzZSArIHdoZXJlLCBzaXplLCB2YWwpOw0KPiArCWtpcmluX3BjaWVfc2lkZWJhbmRfZGJp
X3dfbW9kZShraXJpbl9wY2llLCBmYWxzZSk7DQo+ICsNCj4gKwlyZXR1cm4gcmV0Ow0KPiArfQ0K
PiArDQo+ICtzdGF0aWMgdTMyIGtpcmluX3BjaWVfcmVhZF9kYmkoc3RydWN0IGR3X3BjaWUgKnBj
aSwgdm9pZCBfX2lvbWVtICpiYXNlLA0KPiArCQkJCXUzMiByZWcsIHNpemVfdCBzaXplKQ0KPiAr
ew0KPiArCXUzMiByZXQ7DQo+ICsJc3RydWN0IGtpcmluX3BjaWUgKmtpcmluX3BjaWUgPSB0b19r
aXJpbl9wY2llKHBjaSk7DQo+ICsNCj4gKwlraXJpbl9wY2llX3NpZGViYW5kX2RiaV9yX21vZGUo
a2lyaW5fcGNpZSwgdHJ1ZSk7DQo+ICsJZHdfcGNpZV9yZWFkKGJhc2UgKyByZWcsIHNpemUsICZy
ZXQpOw0KPiArCWtpcmluX3BjaWVfc2lkZWJhbmRfZGJpX3JfbW9kZShraXJpbl9wY2llLCBmYWxz
ZSk7DQo+ICsNCj4gKwlyZXR1cm4gcmV0Ow0KPiArfQ0KPiArDQo+ICtzdGF0aWMgdm9pZCBraXJp
bl9wY2llX3dyaXRlX2RiaShzdHJ1Y3QgZHdfcGNpZSAqcGNpLCB2b2lkIF9faW9tZW0gKmJhc2Us
DQo+ICsJCQkJdTMyIHJlZywgc2l6ZV90IHNpemUsIHUzMiB2YWwpDQo+ICt7DQo+ICsJc3RydWN0
IGtpcmluX3BjaWUgKmtpcmluX3BjaWUgPSB0b19raXJpbl9wY2llKHBjaSk7DQo+ICsNCj4gKwlr
aXJpbl9wY2llX3NpZGViYW5kX2RiaV93X21vZGUoa2lyaW5fcGNpZSwgdHJ1ZSk7DQo+ICsJZHdf
cGNpZV93cml0ZShiYXNlICsgcmVnLCBzaXplLCB2YWwpOw0KPiArCWtpcmluX3BjaWVfc2lkZWJh
bmRfZGJpX3dfbW9kZShraXJpbl9wY2llLCBmYWxzZSk7IH0NCj4gKw0KPiArc3RhdGljIGludCBr
aXJpbl9wY2llX2xpbmtfdXAoc3RydWN0IGR3X3BjaWUgKnBjaSkgew0KPiArCXN0cnVjdCBraXJp
bl9wY2llICpraXJpbl9wY2llID0gdG9fa2lyaW5fcGNpZShwY2kpOw0KPiArCXUzMiB2YWwgPSBr
aXJpbl9hcGJfY3RybF9yZWFkbChraXJpbl9wY2llLCBQQ0lFX0VMQklfUkRMSF9MSU5LVVApOw0K
PiArDQo+ICsJaWYgKCh2YWwgJiBQQ0lFX0xJTktVUF9FTkFCTEUpID09IFBDSUVfTElOS1VQX0VO
QUJMRSkNCj4gKwkJcmV0dXJuIDE7DQo+ICsNCj4gKwlyZXR1cm4gMDsNCj4gK30NCj4gKw0KPiAr
c3RhdGljIGludCBraXJpbl9wY2llX2VzdGFibGlzaF9saW5rKHN0cnVjdCBwY2llX3BvcnQgKnBw
KSB7DQo+ICsJaW50IGNvdW50ID0gMDsNCj4gKw0KPiArCXN0cnVjdCBkd19wY2llICpwY2kgPSB0
b19kd19wY2llX2Zyb21fcHAocHApOw0KPiArCXN0cnVjdCBraXJpbl9wY2llICpraXJpbl9wY2ll
ID0gdG9fa2lyaW5fcGNpZShwY2kpOw0KPiArDQo+ICsJaWYgKGtpcmluX3BjaWVfbGlua191cChw
Y2kpKQ0KPiArCQlyZXR1cm4gMDsNCj4gKw0KPiArCWR3X3BjaWVfc2V0dXBfcmMocHApOw0KPiAr
DQo+ICsJLyogYXNzZXJ0IExUU1NNIGVuYWJsZSAqLw0KPiArCWtpcmluX2FwYl9jdHJsX3dyaXRl
bChraXJpbl9wY2llLCBQQ0lFX0xUU1NNX0VOQUJMRV9CSVQsDQo+ICsJCQkgUENJRV9BUFBfTFRT
U01fRU5BQkxFKTsNCj4gKw0KPiArCS8qIGNoZWNrIGlmIHRoZSBsaW5rIGlzIHVwIG9yIG5vdCAq
Lw0KPiArCXdoaWxlICgha2lyaW5fcGNpZV9saW5rX3VwKHBjaSkpIHsNCj4gKwkJdXNsZWVwX3Jh
bmdlKExJTktfV0FJVF9NSU4sIExJTktfV0FJVF9NQVgpOw0KPiArCQljb3VudCsrOw0KPiArCQlp
ZiAoY291bnQgPT0gMTAwMCkgew0KPiArCQkJZGV2X2VycihwY2ktPmRldiwgIkxpbmsgRmFpbFxu
Iik7DQo+ICsJCQlyZXR1cm4gLUVJTlZBTDsNCj4gKwkJfQ0KPiArCX0NCj4gKw0KPiArCXJldHVy
biAwOw0KPiArfQ0KPiArDQo+ICtzdGF0aWMgdm9pZCBraXJpbl9wY2llX2hvc3RfaW5pdChzdHJ1
Y3QgcGNpZV9wb3J0ICpwcCkgew0KPiArCWtpcmluX3BjaWVfZXN0YWJsaXNoX2xpbmsocHApOw0K
PiArfQ0KPiArDQo+ICtzdGF0aWMgc3RydWN0IGR3X3BjaWVfb3BzIGtpcmluX2R3X3BjaWVfb3Bz
ID0gew0KPiArCS5yZWFkX2RiaSA9IGtpcmluX3BjaWVfcmVhZF9kYmksDQo+ICsJLndyaXRlX2Ri
aSA9IGtpcmluX3BjaWVfd3JpdGVfZGJpLA0KPiArCS5saW5rX3VwID0ga2lyaW5fcGNpZV9saW5r
X3VwLA0KPiArfTsNCj4gKw0KPiArc3RhdGljIHN0cnVjdCBkd19wY2llX2hvc3Rfb3BzIGtpcmlu
X3BjaWVfaG9zdF9vcHMgPSB7DQo+ICsJLnJkX293bl9jb25mID0ga2lyaW5fcGNpZV9yZF9vd25f
Y29uZiwNCj4gKwkud3Jfb3duX2NvbmYgPSBraXJpbl9wY2llX3dyX293bl9jb25mLA0KPiArCS5o
b3N0X2luaXQgPSBraXJpbl9wY2llX2hvc3RfaW5pdCwNCj4gK307DQo+ICsNCj4gK3N0YXRpYyBp
bnQgX19pbml0IGtpcmluX2FkZF9wY2llX3BvcnQoc3RydWN0IGR3X3BjaWUgKnBjaSwNCj4gKwkJ
CQkgICAgICBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KSB7DQo+ICsJaW50IHJldDsNCj4g
Kw0KPiArCXBjaS0+cHAub3BzID0gJmtpcmluX3BjaWVfaG9zdF9vcHM7DQo+ICsNCj4gKwlyZXQg
PSBkd19wY2llX2hvc3RfaW5pdCgmcGNpLT5wcCk7DQo+ICsNCj4gKwlyZXR1cm4gcmV0Ow0KPiAr
fQ0KPiArDQo+ICtzdGF0aWMgaW50IGtpcmluX3BjaWVfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rl
dmljZSAqcGRldikgew0KPiArCXN0cnVjdCBraXJpbl9wY2llICpraXJpbl9wY2llOw0KPiArCXN0
cnVjdCBkd19wY2llICpwY2k7DQo+ICsJc3RydWN0IGRldmljZSAqZGV2ID0gJnBkZXYtPmRldjsN
Cj4gKwlpbnQgcmV0Ow0KPiArDQo+ICsJaWYgKCFwZGV2LT5kZXYub2Zfbm9kZSkgew0KPiArCQlk
ZXZfZXJyKCZwZGV2LT5kZXYsICJOVUxMIG5vZGVcbiIpOw0KPiArCQlyZXR1cm4gLUVJTlZBTDsN
Cj4gKwl9DQo+ICsNCj4gKwlraXJpbl9wY2llID0gZGV2bV9remFsbG9jKCZwZGV2LT5kZXYsDQo+
ICsJCQkJCXNpemVvZihzdHJ1Y3Qga2lyaW5fcGNpZSksIEdGUF9LRVJORUwpOw0KPiArCWlmICgh
a2lyaW5fcGNpZSkNCj4gKwkJcmV0dXJuIC1FTk9NRU07DQo+ICsNCj4gKwlwY2kgPSBkZXZtX2t6
YWxsb2MoZGV2LCBzaXplb2YoKnBjaSksIEdGUF9LRVJORUwpOw0KPiArCWlmICghcGNpKQ0KPiAr
CQlyZXR1cm4gLUVOT01FTTsNCj4gKw0KPiArCXBjaS0+ZGV2ID0gZGV2Ow0KPiArCXBjaS0+b3Bz
ID0gJmtpcmluX2R3X3BjaWVfb3BzOw0KPiArCWtpcmluX3BjaWUtPnBjaSA9IHBjaTsNCj4gKw0K
PiArCXJldCA9IGtpcmluX3BjaWVfZ2V0X2NsayhraXJpbl9wY2llLCBwZGV2KTsNCj4gKwlpZiAo
cmV0ICE9IDApDQo+ICsJCXJldHVybiAtRU5PREVWOw0KPiArDQo+ICsJcmV0ID0ga2lyaW5fcGNp
ZV9nZXRfcmVzb3VyY2Uoa2lyaW5fcGNpZSwgcGRldik7DQo+ICsJaWYgKHJldCAhPSAwKQ0KPiAr
CQlyZXR1cm4gLUVOT0RFVjsNCg0KaWYgKHJldCAhPSAwKSBjYW4gYmUgcmVwbGFjZWQgd2l0aCBp
ZiAocmV0KQ0KDQo+ICsNCj4gKwlraXJpbl9wY2llLT5ncGlvX2lkX3Jlc2V0ID0gb2ZfZ2V0X25h
bWVkX2dwaW8ocGRldi0+ZGV2Lm9mX25vZGUsDQo+ICsJCQkicmVzZXQtZ3BpbyIsIDApOw0KPiAr
CWlmIChraXJpbl9wY2llLT5ncGlvX2lkX3Jlc2V0IDwgMCkNCj4gKwkJcmV0dXJuIC1FTk9ERVY7
DQo+ICsNCj4gKwlyZXQgPSBraXJpbl9wY2llX3Bvd2VyX29uKGtpcmluX3BjaWUpOw0KPiArCWlm
IChyZXQpDQo+ICsJCXJldHVybiByZXQ7DQo+ICsNCj4gKwlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShw
ZGV2LCBraXJpbl9wY2llKTsNCj4gKw0KPiArCXJldCA9IGtpcmluX2FkZF9wY2llX3BvcnQocGNp
LCBwZGV2KTsNCj4gKwlpZiAocmV0KQ0KPiArCQlyZXR1cm4gcmV0Ow0KPiArDQo+ICsJZGV2X2Ri
ZygmcGRldi0+ZGV2LCAicHJvYmUgRG9uZVxuIik7DQoNCnRoaXMgaXMgeW91ciBvbmx5IGRldl9k
YmcuDQppcyBpdCByZWFsbHkgbmVlZGVkPw0KYm9vdGluZyB3aXRoIGtlcm5lbCBjb21tYW5kIGxp
bmUgb3B0aW9ucyBkZWJ1ZyBpbml0Y2FsbF9kZWJ1Zz0xIHdpbGwgc2hvdyB5b3UgaWYgeW91ciBk
cml2ZXJzIHdhcyBwcm9iZWQgb3Igbm90Lg0KDQo+ICsJcmV0dXJuIDA7DQo+ICt9DQo+ICsNCj4g
K3N0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIGtpcmluX3BjaWVfbWF0Y2hbXSA9IHsN
Cj4gKwl7IC5jb21wYXRpYmxlID0gImhpc2lsaWNvbixraXJpbi1wY2llIiB9LA0KPiArCXt9LA0K
PiArfTsNCj4gK01PRFVMRV9ERVZJQ0VfVEFCTEUob2YsIGtpcmluX3BjaWVfbWF0Y2gpOw0KPiAr
DQo+ICtzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIGtpcmluX3BjaWVfZHJpdmVyID0gew0KPiArCS5w
cm9iZQkJCT0ga2lyaW5fcGNpZV9wcm9iZSwNCj4gKwkuZHJpdmVyCQkJPSB7DQo+ICsJCS5uYW1l
CQkJPSAiS2lyaW4tcGNpZSIsDQo+ICsJCS5vd25lcgkJCT0gVEhJU19NT0RVTEUsDQoNCm93bmVy
IHNob3VsZG4ndCBiZSBuZWVkZWQgc2luY2UgaXQgcG9wdWxhdGVkIGJ5IHRoZSBjb3JlLg0KDQo+
ICsJCS5vZl9tYXRjaF90YWJsZSA9IGtpcmluX3BjaWVfbWF0Y2gsDQoNCnNpbmNlIHlvdXIgbW9k
dWxlIGNhbiBvbmx5IGJlIGJ1aWx0IGFzIGJ1aWx0LWluIChib29sIHJhdGhlciB0aGFuIHRyaXN0
YXRlIGluIEtjb25maWcpIGFuZCBzaW5jZSB5b3UgZG9uJ3QgcHJvdmlkZSBhIC5yZW1vdmUgY2Fs
bGJhY2ssIHlvdSBzaG91bGQgcHJvYmFibHkgYWRkDQoNCi5zdXBwcmVzc19iaW5kX2F0dHJzID0g
dHJ1ZSwNCg0KPiArCX0sDQo+ICt9Ow0KPiArDQo+ICttb2R1bGVfcGxhdGZvcm1fZHJpdmVyKGtp
cmluX3BjaWVfZHJpdmVyKTsNCg0Kc2luY2UgeW91ciBtb2R1bGUgY2FuIG9ubHkgYmUgYnVpbHQg
YXMgYnVpbHQtaW4gKGJvb2wgcmF0aGVyIHRoYW4gdHJpc3RhdGUgaW4gS2NvbmZpZykgdGhpcyBz
aG91bGQgcHJvYmFibHkgYmUgcmVwbGFjZWQgd2l0aCBidWlsdGluX3BsYXRmb3JtX2RyaXZlcg0K
DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9kd2MvcGNpZS1raXJpbi5oIA0KPiBiL2RyaXZl
cnMvcGNpL2R3Yy9wY2llLWtpcmluLmggbmV3IGZpbGUgbW9kZSAxMDA2NDQgaW5kZXggDQo+IDAw
MDAwMDAwMDAwMC4uYWQ5YTNiNDI3Mjk4DQo+IC0tLSAvZGV2L251bGwNCj4gKysrIGIvZHJpdmVy
cy9wY2kvZHdjL3BjaWUta2lyaW4uaA0KPiBAQCAtMCwwICsxLDc5IEBADQo+ICsvKg0KPiArICog
UENJZSBob3N0IGNvbnRyb2xsZXIgZHJpdmVyIGZvciBLaXJpbiA5NjAgU29Dcw0KPiArICoNCj4g
KyAqIENvcHlyaWdodCAoQykgMjAxNSBIdWF3ZWkgRWxlY3Ryb25pY3MgQ28uLCBMdGQuDQo+ICsg
KgkJaHR0cDovL3d3dy5odWF3ZWkuY29tDQo+ICsgKg0KPiArICogQXV0aG9yOiBYaWFvd2VpIFNv
bmcgPHNvbmd4aWFvd2VpQGh1YXdlaS5jb20+DQo+ICsgKg0KPiArICogVGhpcyBwcm9ncmFtIGlz
IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciANCj4gK21vZGlm
eQ0KPiArICogaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj
ZW5zZSB2ZXJzaW9uIDIgYXMNCj4gKyAqIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBG
b3VuZGF0aW9uLg0KPiArICovDQo+ICsNCj4gKyNpZm5kZWYgX1BDSUVfS0lSSU5fSA0KPiArI2Rl
ZmluZSBfUENJRV9LSVJJTl9IDQo+ICsNCj4gKyNpbmNsdWRlIDxsaW51eC9tZmQvc3lzY29uLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvcmVnbWFwLmg+DQo+ICsjaW5jbHVkZSA8YXNtL2NvbXBpbGVy
Lmg+DQo+ICsjaW5jbHVkZSA8bGludXgvY29tcGlsZXIuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9j
bGsuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9kZWxheS5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L2dw
aW8uaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9lcnIuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9pbnRl
cnJ1cHQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9pcnFkb21haW4uaD4NCj4gKyNpbmNsdWRlIDxs
aW51eC9tb2R1bGUuaD4NCg0Kc2luY2UgeW91ciBtb2R1bGUgY2FuIG9ubHkgYmUgYnVpbHQgYXMg
YnVpbHQtaW4gKGJvb2wgcmF0aGVyIHRoYW4gdHJpc3RhdGUgaW4gS2NvbmZpZykgeW91IHNob3Vs
ZCBwcm9iYWJseSBub3QgaW5jbHVkZSBtb2R1bGUuaA0KDQo+ICsjaW5jbHVkZSA8bGludXgvb2Zf
Z3Bpby5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L3BjaS5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L29m
X3BjaS5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0KPiArI2luY2x1
ZGUgPGxpbnV4L3Jlc291cmNlLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4NCj4gKyNp
bmNsdWRlIDxsaW51eC9tc2kuaD4NCg0KaXMgdGhpcyBoZWFkZXIgbmVlZGVkIGlmIHlvdSBkb24n
dCBzdXBwb3J0IG1zaT8NCg0KPiArI2luY2x1ZGUgPGxpbnV4L29mX2FkZHJlc3MuaD4NCj4gKyNp
bmNsdWRlIDxsaW51eC9wY2lfcmVncy5oPg0KPiArDQo+ICsjaW5jbHVkZSAicGNpZS1kZXNpZ253
YXJlLmgiDQo+ICsNCj4gKyNkZWZpbmUgdG9fa2lyaW5fcGNpZSh4KSBkZXZfZ2V0X2RydmRhdGEo
KHgpLT5kZXYpDQo+ICsNCj4gKyNkZWZpbmUgUkVGX0NMS19GUkVRIDEwMDAwMDAwMA0KPiArDQo+
ICsvKiBQQ0llIEVMQkkgcmVnaXN0ZXJzICovDQo+ICsjZGVmaW5lIFNPQ19QQ0lFQ1RSTF9DVFJM
MF9BRERSIDB4MDAwICNkZWZpbmUgU09DX1BDSUVDVFJMX0NUUkwxX0FERFIgDQo+ICsweDAwNCAj
ZGVmaW5lIFNPQ19QQ0lFUEhZX0NUUkwyX0FERFIgMHgwMDggI2RlZmluZSANCj4gK1NPQ19QQ0lF
UEhZX0NUUkwzX0FERFIgMHgwMGMNCj4gKyNkZWZpbmUgUENJRV9FTEJJX1NMVl9EQklfRU5BQkxF
CSgweDEgPDwgMjEpDQo+ICsNCj4gKyNkZWZpbmUgUENJRV9BUFBfTFRTU01fRU5BQkxFCQkweDAx
Yw0KPiArI2RlZmluZSBQQ0lFX0VMQklfUkRMSF9MSU5LVVAJCTB4NDAwDQo+ICsjZGVmaW5lIFBD
SUVfTElOS1VQX0VOQUJMRQkJKDB4ODAyMCkNCj4gKyNkZWZpbmUgUENJRV9MVFNTTV9FTkFCTEVf
QklUCSAgKDB4MSA8PCAxMSkNCj4gKw0KPiArI2RlZmluZSBSRUZfMl9QRVJTVF9NSU4JCSgyMDAw
MCkNCj4gKyNkZWZpbmUgUkVGXzJfUEVSU1RfTUFYCQkoMjUwMDApDQo+ICsjZGVmaW5lIFBFUlNU
XzJfQUNDRVNTX01JTgkoMTAwMDApDQo+ICsjZGVmaW5lIFBFUlNUXzJfQUNDRVNTX01BWAkoMTIw
MDApDQo+ICsjZGVmaW5lIExJTktfV0FJVF9NSU4JKDkwMCkNCj4gKyNkZWZpbmUgTElOS19XQUlU
X01BWAkJKDEwMDApDQo+ICsNCj4gKw0KPiArc3RydWN0IGtpcmluX3BjaWUgew0KPiArCXZvaWQg
X19pb21lbQkJKmFwYl9iYXNlOw0KPiArCXZvaWQgX19pb21lbQkJKnBoeV9iYXNlOw0KPiArCXN0
cnVjdCByZWdtYXAgKmNyZ2N0cmw7DQo+ICsJc3RydWN0IHJlZ21hcCAqc3lzY3RybDsNCj4gKwlz
dHJ1Y3QgY2xrCQkJKmFwYl9zeXNfY2xrOw0KPiArCXN0cnVjdCBjbGsJCQkqYXBiX3BoeV9jbGs7
DQo+ICsJc3RydWN0IGNsawkJCSpwaHlfcmVmX2NsazsNCj4gKwlzdHJ1Y3QgY2xrCQkJKnBjaWVf
YWNsazsNCj4gKwlzdHJ1Y3QgY2xrCQkJKnBjaWVfYXV4X2NsazsNCj4gKwlpbnQgICAgICAgICAg
ICAgICAgIGdwaW9faWRfcmVzZXQ7DQo+ICsJc3RydWN0IGR3X3BjaWUJCSpwY2k7DQo+ICt9Ow0K
PiArDQo+ICsjZW5kaWYNCj4gKw0KPiANCg0Kc2luY2UgdGhpcyAuaCBmaWxlIGlzIHJlYWxseSBz
bWFsbCwgaXQgbWlnaHQgYmUgYmV0dGVyIHRvIGp1c3QgcmVtb3ZlIGl0IGFuZCBtb3ZlIHRoZSBj
b2RlIHRvIHRoZSAuYyBmaWxlLg0KDQoNCg0KQmVzdCByZWdhcmRzLA0KTmlrbGFzDQo=

Re: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[Arnd Bergmann]

On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
> From: songxiaowei <songxiaowei@hisilicon.com>

Looks good overall, just a few details:

Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
instead of "songxiaowei") that you use for sending the emails.

> +
> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie)
> +{
...
> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       while (reg_val & pipe_clk_stable) {
> +               udelay(100);
> +               if (time == 0) {
> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
> +                       return -EINVAL;
> +               }
> +               time--;
> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       }

If this is not called with interrupts disabled, please use a
sleeping function (e.g. msleep(1)) as the delay and compare
against ktime_before() to see how much total time has expired
when waiting for a timeout, instead of using a counter.

> diff --git a/drivers/pci/dwc/pcie-kirin.h b/drivers/pci/dwc/pcie-kirin.h
> new file mode 100644
> index 000000000000..ad9a3b427298
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.h
> @@ -0,0 +1,79 @@
> +/*
> + * PCIe host controller driver for Kirin 960 SoCs
> + *
> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
> + *             http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>

The header is only used in one .c file, so just remove it and
add the contents to that file.

    Arnd

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

Hi Arnd,


On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
> From: songxiaowei <songxiaowei@hisilicon.com>

Looks good overall, just a few details:

Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
instead of "songxiaowei") that you use for sending the emails.

[Xiaowei Song]  I'll fix this issue and update the patch.

> +
> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
...
> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       while (reg_val & pipe_clk_stable) {
> +               udelay(100);
> +               if (time == 0) {
> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
> +                       return -EINVAL;
> +               }
> +               time--;
> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       }

If this is not called with interrupts disabled, please use a sleeping function (e.g. msleep(1)) as the delay and compare against ktime_before() to see how much total time has expired when waiting for a timeout, instead of using a counter.

[Xiaowei Song] This issue was fixed in the patch sent at 2017-5-15, and I'll send it again.

> diff --git a/drivers/pci/dwc/pcie-kirin.h 
> b/drivers/pci/dwc/pcie-kirin.h new file mode 100644 index 
> 000000000000..ad9a3b427298
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.h
> @@ -0,0 +1,79 @@
> +/*
> + * PCIe host controller driver for Kirin 960 SoCs
> + *
> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
> + *             http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>

The header is only used in one .c file, so just remove it and add the contents to that file.

[songxiaowei] In new patch the header file was deleted,


Thanks a lot.

Best regard,
Xiaowei.

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

SGkgQXJuZCwNCg0KDQpPbiBGcmksIE1heSAxMiwgMjAxNyBhdCAzOjUxIEFNLCBTb25nIFhpYW93
ZWkgPHNvbmd4aWFvd2VpQGhpc2lsaWNvbi5jb20+IHdyb3RlOg0KPiBGcm9tOiBzb25neGlhb3dl
aSA8c29uZ3hpYW93ZWlAaGlzaWxpY29uLmNvbT4NCg0KTG9va3MgZ29vZCBvdmVyYWxsLCBqdXN0
IGEgZmV3IGRldGFpbHM6DQoNClBsZWFzZSBmaXggeW91ciB+Ly5naXRjb25maWcgdG8gY29udGFp
biB0aGUgc2FtZSByZWFsIG5hbWUgKCJTb25nIFhpYW93ZWkiDQppbnN0ZWFkIG9mICJzb25neGlh
b3dlaSIpIHRoYXQgeW91IHVzZSBmb3Igc2VuZGluZyB0aGUgZW1haWxzLg0KDQpbWGlhb3dlaSBT
b25nXSAgSSdsbCBmaXggdGhpcyBpc3N1ZSBhbmQgdXBkYXRlIHRoZSBwYXRjaC4NCg0KPiArDQo+
ICtzdGF0aWMgaW50IGtpcmluX3BjaWVfcGh5X2luaXQoc3RydWN0IGtpcmluX3BjaWUgKmtpcmlu
X3BjaWUpIHsNCi4uLg0KPiArICAgICAgIHJlZ192YWwgPSBraXJpbl9hcGJfcGh5X3JlYWRsKGtp
cmluX3BjaWUsIDB4NDAwKTsNCj4gKyAgICAgICB3aGlsZSAocmVnX3ZhbCAmIHBpcGVfY2xrX3N0
YWJsZSkgew0KPiArICAgICAgICAgICAgICAgdWRlbGF5KDEwMCk7DQo+ICsgICAgICAgICAgICAg
ICBpZiAodGltZSA9PSAwKSB7DQo+ICsgICAgICAgICAgICAgICAgICAgICAgIGRldl9lcnIoa2ly
aW5fcGNpZS0+cGNpLT5kZXYsICJQSVBFIGNsayBpcyBub3Qgc3RhYmxlXG4iKTsNCj4gKyAgICAg
ICAgICAgICAgICAgICAgICAgcmV0dXJuIC1FSU5WQUw7DQo+ICsgICAgICAgICAgICAgICB9DQo+
ICsgICAgICAgICAgICAgICB0aW1lLS07DQo+ICsgICAgICAgICAgICAgICByZWdfdmFsID0ga2ly
aW5fYXBiX3BoeV9yZWFkbChraXJpbl9wY2llLCAweDQwMCk7DQo+ICsgICAgICAgfQ0KDQpJZiB0
aGlzIGlzIG5vdCBjYWxsZWQgd2l0aCBpbnRlcnJ1cHRzIGRpc2FibGVkLCBwbGVhc2UgdXNlIGEg
c2xlZXBpbmcgZnVuY3Rpb24gKGUuZy4gbXNsZWVwKDEpKSBhcyB0aGUgZGVsYXkgYW5kIGNvbXBh
cmUgYWdhaW5zdCBrdGltZV9iZWZvcmUoKSB0byBzZWUgaG93IG11Y2ggdG90YWwgdGltZSBoYXMg
ZXhwaXJlZCB3aGVuIHdhaXRpbmcgZm9yIGEgdGltZW91dCwgaW5zdGVhZCBvZiB1c2luZyBhIGNv
dW50ZXIuDQoNCltYaWFvd2VpIFNvbmddIFRoaXMgaXNzdWUgd2FzIGZpeGVkIGluIHRoZSBwYXRj
aCBzZW50IGF0IDIwMTctNS0xNSwgYW5kIEknbGwgc2VuZCBpdCBhZ2Fpbi4NCg0KPiBkaWZmIC0t
Z2l0IGEvZHJpdmVycy9wY2kvZHdjL3BjaWUta2lyaW4uaCANCj4gYi9kcml2ZXJzL3BjaS9kd2Mv
cGNpZS1raXJpbi5oIG5ldyBmaWxlIG1vZGUgMTAwNjQ0IGluZGV4IA0KPiAwMDAwMDAwMDAwMDAu
LmFkOWEzYjQyNzI5OA0KPiAtLS0gL2Rldi9udWxsDQo+ICsrKyBiL2RyaXZlcnMvcGNpL2R3Yy9w
Y2llLWtpcmluLmgNCj4gQEAgLTAsMCArMSw3OSBAQA0KPiArLyoNCj4gKyAqIFBDSWUgaG9zdCBj
b250cm9sbGVyIGRyaXZlciBmb3IgS2lyaW4gOTYwIFNvQ3MNCj4gKyAqDQo+ICsgKiBDb3B5cmln
aHQgKEMpIDIwMTUgSHVhd2VpIEVsZWN0cm9uaWNzIENvLiwgTHRkLg0KPiArICogICAgICAgICAg
ICAgaHR0cDovL3d3dy5odWF3ZWkuY29tDQo+ICsgKg0KPiArICogQXV0aG9yOiBYaWFvd2VpIFNv
bmcgPHNvbmd4aWFvd2VpQGh1YXdlaS5jb20+DQoNClRoZSBoZWFkZXIgaXMgb25seSB1c2VkIGlu
IG9uZSAuYyBmaWxlLCBzbyBqdXN0IHJlbW92ZSBpdCBhbmQgYWRkIHRoZSBjb250ZW50cyB0byB0
aGF0IGZpbGUuDQoNCltzb25neGlhb3dlaV0gSW4gbmV3IHBhdGNoIHRoZSBoZWFkZXIgZmlsZSB3
YXMgZGVsZXRlZCwNCg0KDQpUaGFua3MgYSBsb3QuDQoNCkJlc3QgcmVnYXJkLA0KWGlhb3dlaS4N
Cg==

Re: 答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[Guodong Xu]

On Thu, May 18, 2017 at 9:50 AM, songxiaowei <songxiaowei@hisilicon.com> wrote:
> Hi Arnd,
>
>
> On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
>> From: songxiaowei <songxiaowei@hisilicon.com>
>
> Looks good overall, just a few details:
>
> Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
> instead of "songxiaowei") that you use for sending the emails.
>
> [Xiaowei Song]  I'll fix this issue and update the patch.
>
>> +
>> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
> ...
>> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>> +       while (reg_val & pipe_clk_stable) {
>> +               udelay(100);
>> +               if (time == 0) {
>> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
>> +                       return -EINVAL;
>> +               }
>> +               time--;
>> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>> +       }
>
> If this is not called with interrupts disabled, please use a sleeping function (e.g. msleep(1)) as the delay and compare against ktime_before() to see how much total time has expired when waiting for a timeout, instead of using a counter.
>
> [Xiaowei Song] This issue was fixed in the patch sent at 2017-5-15, and I'll send it again.

Xiaowei,

Please make sure you add [PATCH v..] version information when you
making future updates. Eg.

$ git format-patch --subject-prefix="PATCH v3"

-Guodong


>
>> diff --git a/drivers/pci/dwc/pcie-kirin.h
>> b/drivers/pci/dwc/pcie-kirin.h new file mode 100644 index
>> 000000000000..ad9a3b427298
>> --- /dev/null
>> +++ b/drivers/pci/dwc/pcie-kirin.h
>> @@ -0,0 +1,79 @@
>> +/*
>> + * PCIe host controller driver for Kirin 960 SoCs
>> + *
>> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
>> + *             http://www.huawei.com
>> + *
>> + * Author: Xiaowei Song <songxiaowei@huawei.com>
>
> The header is only used in one .c file, so just remove it and add the contents to that file.
>
> [songxiaowei] In new patch the header file was deleted,
>
>
> Thanks a lot.
>
> Best regard,
> Xiaowei.

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

-----邮件原件-----
发件人: arndbergmann@gmail.com [mailto:arndbergmann@gmail.com] 代表 Arnd Bergmann
发送时间: 2017年5月18日 4:29
收件人: songxiaowei
抄送: Bjorn Helgaas; Kishon; Jingoo Han; Tomasz Nowicki; Keith Busch; niklas.cassel@axis.com; Duc Dang; liudongdong (C); Chenfeng (puck); Guodong Xu; Wangbinghui; Suzhuangluan; Linux Kernel Mailing List; linux-pci
主题: Re: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
> From: songxiaowei <songxiaowei@hisilicon.com>

Looks good overall, just a few details:

Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
instead of "songxiaowei") that you use for sending the emails.

> +
> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
...
> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       while (reg_val & pipe_clk_stable) {
> +               udelay(100);
> +               if (time == 0) {
> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
> +                       return -EINVAL;
> +               }
> +               time--;
> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
> +       }

If this is not called with interrupts disabled, please use a sleeping function (e.g. msleep(1)) as the delay and compare against ktime_before() to see how much total time has expired when waiting for a timeout, instead of using a counter.

Since the time of pipe clk stable is from 450us to 520us, I think function usleep_range is better.
The patches is going to be updated.
-Xiaowei. 

> diff --git a/drivers/pci/dwc/pcie-kirin.h 
> b/drivers/pci/dwc/pcie-kirin.h new file mode 100644 index 
> 000000000000..ad9a3b427298
> --- /dev/null
> +++ b/drivers/pci/dwc/pcie-kirin.h
> @@ -0,0 +1,79 @@
> +/*
> + * PCIe host controller driver for Kirin 960 SoCs
> + *
> + * Copyright (C) 2015 Huawei Electronics Co., Ltd.
> + *             http://www.huawei.com
> + *
> + * Author: Xiaowei Song <songxiaowei@huawei.com>

The header is only used in one .c file, so just remove it and add the contents to that file.

    Arnd

答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

DQoNCi0tLS0t6YKu5Lu25Y6f5Lu2LS0tLS0NCuWPkeS7tuS6ujogYXJuZGJlcmdtYW5uQGdtYWls
LmNvbSBbbWFpbHRvOmFybmRiZXJnbWFubkBnbWFpbC5jb21dIOS7o+ihqCBBcm5kIEJlcmdtYW5u
DQrlj5HpgIHml7bpl7Q6IDIwMTflubQ15pyIMTjml6UgNDoyOQ0K5pS25Lu25Lq6OiBzb25neGlh
b3dlaQ0K5oqE6YCBOiBCam9ybiBIZWxnYWFzOyBLaXNob247IEppbmdvbyBIYW47IFRvbWFzeiBO
b3dpY2tpOyBLZWl0aCBCdXNjaDsgbmlrbGFzLmNhc3NlbEBheGlzLmNvbTsgRHVjIERhbmc7IGxp
dWRvbmdkb25nIChDKTsgQ2hlbmZlbmcgKHB1Y2spOyBHdW9kb25nIFh1OyBXYW5nYmluZ2h1aTsg
U3V6aHVhbmdsdWFuOyBMaW51eCBLZXJuZWwgTWFpbGluZyBMaXN0OyBsaW51eC1wY2kNCuS4u+mi
mDogUmU6IFtQQVRDSCAxLzJdIFBDSTogZHdjOiBraXJpbjogYWRkIFBDSWUgRHJpdmVyIGZvciBI
aVNpbGljb24gS2lyaW4gU29DDQoNCk9uIEZyaSwgTWF5IDEyLCAyMDE3IGF0IDM6NTEgQU0sIFNv
bmcgWGlhb3dlaSA8c29uZ3hpYW93ZWlAaGlzaWxpY29uLmNvbT4gd3JvdGU6DQo+IEZyb206IHNv
bmd4aWFvd2VpIDxzb25neGlhb3dlaUBoaXNpbGljb24uY29tPg0KDQpMb29rcyBnb29kIG92ZXJh
bGwsIGp1c3QgYSBmZXcgZGV0YWlsczoNCg0KUGxlYXNlIGZpeCB5b3VyIH4vLmdpdGNvbmZpZyB0
byBjb250YWluIHRoZSBzYW1lIHJlYWwgbmFtZSAoIlNvbmcgWGlhb3dlaSINCmluc3RlYWQgb2Yg
InNvbmd4aWFvd2VpIikgdGhhdCB5b3UgdXNlIGZvciBzZW5kaW5nIHRoZSBlbWFpbHMuDQoNCj4g
Kw0KPiArc3RhdGljIGludCBraXJpbl9wY2llX3BoeV9pbml0KHN0cnVjdCBraXJpbl9wY2llICpr
aXJpbl9wY2llKSB7DQouLi4NCj4gKyAgICAgICByZWdfdmFsID0ga2lyaW5fYXBiX3BoeV9yZWFk
bChraXJpbl9wY2llLCAweDQwMCk7DQo+ICsgICAgICAgd2hpbGUgKHJlZ192YWwgJiBwaXBlX2Ns
a19zdGFibGUpIHsNCj4gKyAgICAgICAgICAgICAgIHVkZWxheSgxMDApOw0KPiArICAgICAgICAg
ICAgICAgaWYgKHRpbWUgPT0gMCkgew0KPiArICAgICAgICAgICAgICAgICAgICAgICBkZXZfZXJy
KGtpcmluX3BjaWUtPnBjaS0+ZGV2LCAiUElQRSBjbGsgaXMgbm90IHN0YWJsZVxuIik7DQo+ICsg
ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiAtRUlOVkFMOw0KPiArICAgICAgICAgICAgICAg
fQ0KPiArICAgICAgICAgICAgICAgdGltZS0tOw0KPiArICAgICAgICAgICAgICAgcmVnX3ZhbCA9
IGtpcmluX2FwYl9waHlfcmVhZGwoa2lyaW5fcGNpZSwgMHg0MDApOw0KPiArICAgICAgIH0NCg0K
SWYgdGhpcyBpcyBub3QgY2FsbGVkIHdpdGggaW50ZXJydXB0cyBkaXNhYmxlZCwgcGxlYXNlIHVz
ZSBhIHNsZWVwaW5nIGZ1bmN0aW9uIChlLmcuIG1zbGVlcCgxKSkgYXMgdGhlIGRlbGF5IGFuZCBj
b21wYXJlIGFnYWluc3Qga3RpbWVfYmVmb3JlKCkgdG8gc2VlIGhvdyBtdWNoIHRvdGFsIHRpbWUg
aGFzIGV4cGlyZWQgd2hlbiB3YWl0aW5nIGZvciBhIHRpbWVvdXQsIGluc3RlYWQgb2YgdXNpbmcg
YSBjb3VudGVyLg0KDQpTaW5jZSB0aGUgdGltZSBvZiBwaXBlIGNsayBzdGFibGUgaXMgZnJvbSA0
NTB1cyB0byA1MjB1cywgSSB0aGluayBmdW5jdGlvbiB1c2xlZXBfcmFuZ2UgaXMgYmV0dGVyLg0K
VGhlIHBhdGNoZXMgaXMgZ29pbmcgdG8gYmUgdXBkYXRlZC4NCi1YaWFvd2VpLiANCg0KPiBkaWZm
IC0tZ2l0IGEvZHJpdmVycy9wY2kvZHdjL3BjaWUta2lyaW4uaCANCj4gYi9kcml2ZXJzL3BjaS9k
d2MvcGNpZS1raXJpbi5oIG5ldyBmaWxlIG1vZGUgMTAwNjQ0IGluZGV4IA0KPiAwMDAwMDAwMDAw
MDAuLmFkOWEzYjQyNzI5OA0KPiAtLS0gL2Rldi9udWxsDQo+ICsrKyBiL2RyaXZlcnMvcGNpL2R3
Yy9wY2llLWtpcmluLmgNCj4gQEAgLTAsMCArMSw3OSBAQA0KPiArLyoNCj4gKyAqIFBDSWUgaG9z
dCBjb250cm9sbGVyIGRyaXZlciBmb3IgS2lyaW4gOTYwIFNvQ3MNCj4gKyAqDQo+ICsgKiBDb3B5
cmlnaHQgKEMpIDIwMTUgSHVhd2VpIEVsZWN0cm9uaWNzIENvLiwgTHRkLg0KPiArICogICAgICAg
ICAgICAgaHR0cDovL3d3dy5odWF3ZWkuY29tDQo+ICsgKg0KPiArICogQXV0aG9yOiBYaWFvd2Vp
IFNvbmcgPHNvbmd4aWFvd2VpQGh1YXdlaS5jb20+DQoNClRoZSBoZWFkZXIgaXMgb25seSB1c2Vk
IGluIG9uZSAuYyBmaWxlLCBzbyBqdXN0IHJlbW92ZSBpdCBhbmQgYWRkIHRoZSBjb250ZW50cyB0
byB0aGF0IGZpbGUuDQoNCiAgICBBcm5kDQo=

Re: 答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[Niklas Cassel]

On 05/18/2017 08:23 AM, Guodong Xu wrote:
> On Thu, May 18, 2017 at 9:50 AM, songxiaowei <songxiaowei@hisilicon.com> wrote:
>> Hi Arnd,
>>
>>
>> On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
>>> From: songxiaowei <songxiaowei@hisilicon.com>
>>
>> Looks good overall, just a few details:
>>
>> Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
>> instead of "songxiaowei") that you use for sending the emails.
>>
>> [Xiaowei Song]  I'll fix this issue and update the patch.
>>
>>> +
>>> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
>> ...
>>> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>>> +       while (reg_val & pipe_clk_stable) {
>>> +               udelay(100);
>>> +               if (time == 0) {
>>> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
>>> +                       return -EINVAL;
>>> +               }
>>> +               time--;
>>> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>>> +       }
>>
>> If this is not called with interrupts disabled, please use a sleeping function (e.g. msleep(1)) as the delay and compare against ktime_before() to see how much total time has expired when waiting for a timeout, instead of using a counter.
>>
>> [Xiaowei Song] This issue was fixed in the patch sent at 2017-5-15, and I'll send it again.
> 
> Xiaowei,
> 
> Please make sure you add [PATCH v..] version information when you
> making future updates. Eg.
> 
> $ git format-patch --subject-prefix="PATCH v3"

I actually prefer

git format-patch -v 3

that way you don't accidentally get something
other than "PATCH".



Another very, very minor remark.
It's usually a good idea to have a comma after
each initializer, that way you don't have to
change multiple lines when adding/removing something.

+struct platform_driver kirin_pcie_driver = {
+	.probe			= kirin_pcie_probe,
+	.driver			= {
+		.name			= "Kirin-pcie",
+		.of_match_table = kirin_pcie_match,
+		.suppress_bind_attrs = true
+	},
+};


Best regards,
Niklas

答复: 答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

-----邮件原件-----
发件人: Niklas Cassel [mailto:niklas.cassel@axis.com] 
发送时间: 2017年5月18日 16:57
收件人: Guodong Xu; songxiaowei
抄送: Arnd Bergmann; Bjorn Helgaas; Kishon; Jingoo Han; Tomasz Nowicki; Keith Busch; Duc Dang; liudongdong (C); Chenfeng (puck); Wangbinghui; Suzhuangluan; Linux Kernel Mailing List; linux-pci
主题: Re: 答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC



On 05/18/2017 08:23 AM, Guodong Xu wrote:
> On Thu, May 18, 2017 at 9:50 AM, songxiaowei <songxiaowei@hisilicon.com> wrote:
>> Hi Arnd,
>>
>>
>> On Fri, May 12, 2017 at 3:51 AM, Song Xiaowei <songxiaowei@hisilicon.com> wrote:
>>> From: songxiaowei <songxiaowei@hisilicon.com>
>>
>> Looks good overall, just a few details:
>>
>> Please fix your ~/.gitconfig to contain the same real name ("Song Xiaowei"
>> instead of "songxiaowei") that you use for sending the emails.
>>
>> [Xiaowei Song]  I'll fix this issue and update the patch.
>>
>>> +
>>> +static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie) {
>> ...
>>> +       reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>>> +       while (reg_val & pipe_clk_stable) {
>>> +               udelay(100);
>>> +               if (time == 0) {
>>> +                       dev_err(kirin_pcie->pci->dev, "PIPE clk is not stable\n");
>>> +                       return -EINVAL;
>>> +               }
>>> +               time--;
>>> +               reg_val = kirin_apb_phy_readl(kirin_pcie, 0x400);
>>> +       }
>>
>> If this is not called with interrupts disabled, please use a sleeping function (e.g. msleep(1)) as the delay and compare against ktime_before() to see how much total time has expired when waiting for a timeout, instead of using a counter.
>>
>> [Xiaowei Song] This issue was fixed in the patch sent at 2017-5-15, and I'll send it again.
> 
> Xiaowei,
> 
> Please make sure you add [PATCH v..] version information when you 
> making future updates. Eg.
> 
> $ git format-patch --subject-prefix="PATCH v3"

I actually prefer

git format-patch -v 3

that way you don't accidentally get something other than "PATCH".



Another very, very minor remark.
It's usually a good idea to have a comma after each initializer, that way you don't have to change multiple lines when adding/removing something.

[songxiaowei] I should fix this point immediately, Thank you a lot.

+struct platform_driver kirin_pcie_driver = {
+	.probe			= kirin_pcie_probe,
+	.driver			= {
+		.name			= "Kirin-pcie",
+		.of_match_table = kirin_pcie_match,
+		.suppress_bind_attrs = true
+	},
+};


Best regards,
Xiaowei

答复: 答复: [PATCH 1/2] PCI: dwc: kirin: add PCIe Driver for HiSilicon Kirin SoC

[songxiaowei]

DQoNCi0tLS0t6YKu5Lu25Y6f5Lu2LS0tLS0NCuWPkeS7tuS6ujogTmlrbGFzIENhc3NlbCBbbWFp
bHRvOm5pa2xhcy5jYXNzZWxAYXhpcy5jb21dIA0K5Y+R6YCB5pe26Ze0OiAyMDE35bm0NeaciDE4
5pelIDE2OjU3DQrmlLbku7bkuro6IEd1b2RvbmcgWHU7IHNvbmd4aWFvd2VpDQrmioTpgIE6IEFy
bmQgQmVyZ21hbm47IEJqb3JuIEhlbGdhYXM7IEtpc2hvbjsgSmluZ29vIEhhbjsgVG9tYXN6IE5v
d2lja2k7IEtlaXRoIEJ1c2NoOyBEdWMgRGFuZzsgbGl1ZG9uZ2RvbmcgKEMpOyBDaGVuZmVuZyAo
cHVjayk7IFdhbmdiaW5naHVpOyBTdXpodWFuZ2x1YW47IExpbnV4IEtlcm5lbCBNYWlsaW5nIExp
c3Q7IGxpbnV4LXBjaQ0K5Li76aKYOiBSZTog562U5aSNOiBbUEFUQ0ggMS8yXSBQQ0k6IGR3Yzog
a2lyaW46IGFkZCBQQ0llIERyaXZlciBmb3IgSGlTaWxpY29uIEtpcmluIFNvQw0KDQoNCg0KT24g
MDUvMTgvMjAxNyAwODoyMyBBTSwgR3VvZG9uZyBYdSB3cm90ZToNCj4gT24gVGh1LCBNYXkgMTgs
IDIwMTcgYXQgOTo1MCBBTSwgc29uZ3hpYW93ZWkgPHNvbmd4aWFvd2VpQGhpc2lsaWNvbi5jb20+
IHdyb3RlOg0KPj4gSGkgQXJuZCwNCj4+DQo+Pg0KPj4gT24gRnJpLCBNYXkgMTIsIDIwMTcgYXQg
Mzo1MSBBTSwgU29uZyBYaWFvd2VpIDxzb25neGlhb3dlaUBoaXNpbGljb24uY29tPiB3cm90ZToN
Cj4+PiBGcm9tOiBzb25neGlhb3dlaSA8c29uZ3hpYW93ZWlAaGlzaWxpY29uLmNvbT4NCj4+DQo+
PiBMb29rcyBnb29kIG92ZXJhbGwsIGp1c3QgYSBmZXcgZGV0YWlsczoNCj4+DQo+PiBQbGVhc2Ug
Zml4IHlvdXIgfi8uZ2l0Y29uZmlnIHRvIGNvbnRhaW4gdGhlIHNhbWUgcmVhbCBuYW1lICgiU29u
ZyBYaWFvd2VpIg0KPj4gaW5zdGVhZCBvZiAic29uZ3hpYW93ZWkiKSB0aGF0IHlvdSB1c2UgZm9y
IHNlbmRpbmcgdGhlIGVtYWlscy4NCj4+DQo+PiBbWGlhb3dlaSBTb25nXSAgSSdsbCBmaXggdGhp
cyBpc3N1ZSBhbmQgdXBkYXRlIHRoZSBwYXRjaC4NCj4+DQo+Pj4gKw0KPj4+ICtzdGF0aWMgaW50
IGtpcmluX3BjaWVfcGh5X2luaXQoc3RydWN0IGtpcmluX3BjaWUgKmtpcmluX3BjaWUpIHsNCj4+
IC4uLg0KPj4+ICsgICAgICAgcmVnX3ZhbCA9IGtpcmluX2FwYl9waHlfcmVhZGwoa2lyaW5fcGNp
ZSwgMHg0MDApOw0KPj4+ICsgICAgICAgd2hpbGUgKHJlZ192YWwgJiBwaXBlX2Nsa19zdGFibGUp
IHsNCj4+PiArICAgICAgICAgICAgICAgdWRlbGF5KDEwMCk7DQo+Pj4gKyAgICAgICAgICAgICAg
IGlmICh0aW1lID09IDApIHsNCj4+PiArICAgICAgICAgICAgICAgICAgICAgICBkZXZfZXJyKGtp
cmluX3BjaWUtPnBjaS0+ZGV2LCAiUElQRSBjbGsgaXMgbm90IHN0YWJsZVxuIik7DQo+Pj4gKyAg
ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIC1FSU5WQUw7DQo+Pj4gKyAgICAgICAgICAgICAg
IH0NCj4+PiArICAgICAgICAgICAgICAgdGltZS0tOw0KPj4+ICsgICAgICAgICAgICAgICByZWdf
dmFsID0ga2lyaW5fYXBiX3BoeV9yZWFkbChraXJpbl9wY2llLCAweDQwMCk7DQo+Pj4gKyAgICAg
ICB9DQo+Pg0KPj4gSWYgdGhpcyBpcyBub3QgY2FsbGVkIHdpdGggaW50ZXJydXB0cyBkaXNhYmxl
ZCwgcGxlYXNlIHVzZSBhIHNsZWVwaW5nIGZ1bmN0aW9uIChlLmcuIG1zbGVlcCgxKSkgYXMgdGhl
IGRlbGF5IGFuZCBjb21wYXJlIGFnYWluc3Qga3RpbWVfYmVmb3JlKCkgdG8gc2VlIGhvdyBtdWNo
IHRvdGFsIHRpbWUgaGFzIGV4cGlyZWQgd2hlbiB3YWl0aW5nIGZvciBhIHRpbWVvdXQsIGluc3Rl
YWQgb2YgdXNpbmcgYSBjb3VudGVyLg0KPj4NCj4+IFtYaWFvd2VpIFNvbmddIFRoaXMgaXNzdWUg
d2FzIGZpeGVkIGluIHRoZSBwYXRjaCBzZW50IGF0IDIwMTctNS0xNSwgYW5kIEknbGwgc2VuZCBp
dCBhZ2Fpbi4NCj4gDQo+IFhpYW93ZWksDQo+IA0KPiBQbGVhc2UgbWFrZSBzdXJlIHlvdSBhZGQg
W1BBVENIIHYuLl0gdmVyc2lvbiBpbmZvcm1hdGlvbiB3aGVuIHlvdSANCj4gbWFraW5nIGZ1dHVy
ZSB1cGRhdGVzLiBFZy4NCj4gDQo+ICQgZ2l0IGZvcm1hdC1wYXRjaCAtLXN1YmplY3QtcHJlZml4
PSJQQVRDSCB2MyINCg0KSSBhY3R1YWxseSBwcmVmZXINCg0KZ2l0IGZvcm1hdC1wYXRjaCAtdiAz
DQoNCnRoYXQgd2F5IHlvdSBkb24ndCBhY2NpZGVudGFsbHkgZ2V0IHNvbWV0aGluZyBvdGhlciB0
aGFuICJQQVRDSCIuDQoNCg0KDQpBbm90aGVyIHZlcnksIHZlcnkgbWlub3IgcmVtYXJrLg0KSXQn
cyB1c3VhbGx5IGEgZ29vZCBpZGVhIHRvIGhhdmUgYSBjb21tYSBhZnRlciBlYWNoIGluaXRpYWxp
emVyLCB0aGF0IHdheSB5b3UgZG9uJ3QgaGF2ZSB0byBjaGFuZ2UgbXVsdGlwbGUgbGluZXMgd2hl
biBhZGRpbmcvcmVtb3Zpbmcgc29tZXRoaW5nLg0KDQpbc29uZ3hpYW93ZWldIEkgc2hvdWxkIGZp
eCB0aGlzIHBvaW50IGltbWVkaWF0ZWx5LCBUaGFuayB5b3UgYSBsb3QuDQoNCitzdHJ1Y3QgcGxh
dGZvcm1fZHJpdmVyIGtpcmluX3BjaWVfZHJpdmVyID0gew0KKwkucHJvYmUJCQk9IGtpcmluX3Bj
aWVfcHJvYmUsDQorCS5kcml2ZXIJCQk9IHsNCisJCS5uYW1lCQkJPSAiS2lyaW4tcGNpZSIsDQor
CQkub2ZfbWF0Y2hfdGFibGUgPSBraXJpbl9wY2llX21hdGNoLA0KKwkJLnN1cHByZXNzX2JpbmRf
YXR0cnMgPSB0cnVlDQorCX0sDQorfTsNCg0KDQpCZXN0IHJlZ2FyZHMsDQpYaWFvd2VpDQo=