All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuanjia Liu <chuanjia.liu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: devicetree@vger.kernel.org,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Frank Wunderlich <frank-w@public-files.de>,
	linux-pci@vger.kernel.org, Ryder Lee <ryder.lee@mediatek.com>,
	Rob Herring <robh+dt@kernel.org>,
	linux-mediatek@lists.infradead.org, yong.wu@mediatek.com,
	Bjorn Helgaas <bhelgaas@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5 2/4] PCI: mediatek: Use regmap to get shared pcie-cfg base
Date: Sun, 13 Sep 2020 10:46:34 +0800	[thread overview]
Message-ID: <1599965194.7466.28.camel@mhfsdcap03> (raw)
In-Reply-To: <b627b938-2210-16d2-1682-3c25506e30f3@gmail.com>

On Thu, 2020-09-10 at 12:44 +0200, Matthias Brugger wrote:
> 
> On 10/09/2020 08:11, Chuanjia Liu wrote:
> > Use regmap to get shared pcie-cfg base and change
> > the method to get pcie irq.
> > 
> > Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> > Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
> > ---
> >   drivers/pci/controller/pcie-mediatek.c | 25 ++++++++++++++++++-------
> >   1 file changed, 18 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> > index cf4c18f0c25a..987845d19982 100644
> > --- a/drivers/pci/controller/pcie-mediatek.c
> > +++ b/drivers/pci/controller/pcie-mediatek.c
> > @@ -14,6 +14,7 @@
> >   #include <linux/irqchip/chained_irq.h>
> >   #include <linux/irqdomain.h>
> >   #include <linux/kernel.h>
> > +#include <linux/mfd/syscon.h>
> >   #include <linux/msi.h>
> >   #include <linux/module.h>
> >   #include <linux/of_address.h>
> > @@ -23,6 +24,7 @@
> >   #include <linux/phy/phy.h>
> >   #include <linux/platform_device.h>
> >   #include <linux/pm_runtime.h>
> > +#include <linux/regmap.h>
> >   #include <linux/reset.h>
> >   
> >   #include "../pci.h"
> > @@ -205,6 +207,7 @@ struct mtk_pcie_port {
> >    * struct mtk_pcie - PCIe host information
> >    * @dev: pointer to PCIe device
> >    * @base: IO mapped register base
> > + * @cfg: IO mapped register map for PCIe config
> >    * @free_ck: free-run reference clock
> >    * @mem: non-prefetchable memory resource
> >    * @ports: pointer to PCIe port information
> > @@ -213,6 +216,7 @@ struct mtk_pcie_port {
> >   struct mtk_pcie {
> >   	struct device *dev;
> >   	void __iomem *base;
> > +	struct regmap *cfg;
> >   	struct clk *free_ck;
> >   
> >   	struct list_head ports;
> > @@ -648,7 +652,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
> >   		return err;
> >   	}
> >   
> > -	port->irq = platform_get_irq(pdev, port->slot);
> > +	port->irq = platform_get_irq_byname(pdev, "pcie_irq");
> >   	if (port->irq < 0)
> >   		return port->irq;
> 
> You will need to make sure taht the driver keeps working with the old DTS 
> format. This is not the case here.
> 
Thanks for your review, I will fix it in the next version.

Regards,
Chuanjia
> Regards,
> Matthias
> 
> >   
> > @@ -674,12 +678,11 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
> >   	if (!mem)
> >   		return -EINVAL;
> >   
> > -	/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */
> > -	if (pcie->base) {
> > -		val = readl(pcie->base + PCIE_SYS_CFG_V2);
> > -		val |= PCIE_CSR_LTSSM_EN(port->slot) |
> > -		       PCIE_CSR_ASPM_L1_EN(port->slot);
> > -		writel(val, pcie->base + PCIE_SYS_CFG_V2);
> > +	/* MT7622/MT7629 platforms need to enable LTSSM and ASPM. */
> > +	if (pcie->cfg) {
> > +		val = PCIE_CSR_LTSSM_EN(port->slot) |
> > +		      PCIE_CSR_ASPM_L1_EN(port->slot);
> > +		regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val);
> >   	}
> >   
> >   	/* Assert all reset signals */
> > @@ -983,6 +986,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   	struct device *dev = pcie->dev;
> >   	struct platform_device *pdev = to_platform_device(dev);
> >   	struct resource *regs;
> > +	struct device_node *cfg_node;
> >   	int err;
> >   
> >   	/* get shared registers, which are optional */
> > @@ -995,6 +999,13 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   		}
> >   	}
> >   
> > +	cfg_node = of_parse_phandle(dev->of_node, "mediatek,pcie-cfg", 0);
> > +	if (cfg_node) {
> > +		pcie->cfg = syscon_node_to_regmap(cfg_node);
> > +		if (IS_ERR(pcie->cfg))
> > +			return PTR_ERR(pcie->cfg);
> > +	}
> > +
> >   	pcie->free_ck = devm_clk_get(dev, "free_ck");
> >   	if (IS_ERR(pcie->free_ck)) {
> >   		if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER)
> > 

_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

WARNING: multiple messages have this Message-ID (diff)
From: Chuanjia Liu <chuanjia.liu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Rob Herring <robh+dt@kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	<devicetree@vger.kernel.org>, Ryder Lee <ryder.lee@mediatek.com>,
	Frank Wunderlich <frank-w@public-files.de>,
	<linux-pci@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
	<linux-arm-kernel@lists.infradead.org>, <yong.wu@mediatek.com>
Subject: Re: [PATCH v5 2/4] PCI: mediatek: Use regmap to get shared pcie-cfg base
Date: Sun, 13 Sep 2020 10:46:34 +0800	[thread overview]
Message-ID: <1599965194.7466.28.camel@mhfsdcap03> (raw)
In-Reply-To: <b627b938-2210-16d2-1682-3c25506e30f3@gmail.com>

On Thu, 2020-09-10 at 12:44 +0200, Matthias Brugger wrote:
> 
> On 10/09/2020 08:11, Chuanjia Liu wrote:
> > Use regmap to get shared pcie-cfg base and change
> > the method to get pcie irq.
> > 
> > Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> > Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
> > ---
> >   drivers/pci/controller/pcie-mediatek.c | 25 ++++++++++++++++++-------
> >   1 file changed, 18 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> > index cf4c18f0c25a..987845d19982 100644
> > --- a/drivers/pci/controller/pcie-mediatek.c
> > +++ b/drivers/pci/controller/pcie-mediatek.c
> > @@ -14,6 +14,7 @@
> >   #include <linux/irqchip/chained_irq.h>
> >   #include <linux/irqdomain.h>
> >   #include <linux/kernel.h>
> > +#include <linux/mfd/syscon.h>
> >   #include <linux/msi.h>
> >   #include <linux/module.h>
> >   #include <linux/of_address.h>
> > @@ -23,6 +24,7 @@
> >   #include <linux/phy/phy.h>
> >   #include <linux/platform_device.h>
> >   #include <linux/pm_runtime.h>
> > +#include <linux/regmap.h>
> >   #include <linux/reset.h>
> >   
> >   #include "../pci.h"
> > @@ -205,6 +207,7 @@ struct mtk_pcie_port {
> >    * struct mtk_pcie - PCIe host information
> >    * @dev: pointer to PCIe device
> >    * @base: IO mapped register base
> > + * @cfg: IO mapped register map for PCIe config
> >    * @free_ck: free-run reference clock
> >    * @mem: non-prefetchable memory resource
> >    * @ports: pointer to PCIe port information
> > @@ -213,6 +216,7 @@ struct mtk_pcie_port {
> >   struct mtk_pcie {
> >   	struct device *dev;
> >   	void __iomem *base;
> > +	struct regmap *cfg;
> >   	struct clk *free_ck;
> >   
> >   	struct list_head ports;
> > @@ -648,7 +652,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
> >   		return err;
> >   	}
> >   
> > -	port->irq = platform_get_irq(pdev, port->slot);
> > +	port->irq = platform_get_irq_byname(pdev, "pcie_irq");
> >   	if (port->irq < 0)
> >   		return port->irq;
> 
> You will need to make sure taht the driver keeps working with the old DTS 
> format. This is not the case here.
> 
Thanks for your review, I will fix it in the next version.

Regards,
Chuanjia
> Regards,
> Matthias
> 
> >   
> > @@ -674,12 +678,11 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
> >   	if (!mem)
> >   		return -EINVAL;
> >   
> > -	/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */
> > -	if (pcie->base) {
> > -		val = readl(pcie->base + PCIE_SYS_CFG_V2);
> > -		val |= PCIE_CSR_LTSSM_EN(port->slot) |
> > -		       PCIE_CSR_ASPM_L1_EN(port->slot);
> > -		writel(val, pcie->base + PCIE_SYS_CFG_V2);
> > +	/* MT7622/MT7629 platforms need to enable LTSSM and ASPM. */
> > +	if (pcie->cfg) {
> > +		val = PCIE_CSR_LTSSM_EN(port->slot) |
> > +		      PCIE_CSR_ASPM_L1_EN(port->slot);
> > +		regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val);
> >   	}
> >   
> >   	/* Assert all reset signals */
> > @@ -983,6 +986,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   	struct device *dev = pcie->dev;
> >   	struct platform_device *pdev = to_platform_device(dev);
> >   	struct resource *regs;
> > +	struct device_node *cfg_node;
> >   	int err;
> >   
> >   	/* get shared registers, which are optional */
> > @@ -995,6 +999,13 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   		}
> >   	}
> >   
> > +	cfg_node = of_parse_phandle(dev->of_node, "mediatek,pcie-cfg", 0);
> > +	if (cfg_node) {
> > +		pcie->cfg = syscon_node_to_regmap(cfg_node);
> > +		if (IS_ERR(pcie->cfg))
> > +			return PTR_ERR(pcie->cfg);
> > +	}
> > +
> >   	pcie->free_ck = devm_clk_get(dev, "free_ck");
> >   	if (IS_ERR(pcie->free_ck)) {
> >   		if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER)
> > 


WARNING: multiple messages have this Message-ID (diff)
From: Chuanjia Liu <chuanjia.liu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: devicetree@vger.kernel.org,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Frank Wunderlich <frank-w@public-files.de>,
	linux-pci@vger.kernel.org, Ryder Lee <ryder.lee@mediatek.com>,
	Rob Herring <robh+dt@kernel.org>,
	linux-mediatek@lists.infradead.org, yong.wu@mediatek.com,
	Bjorn Helgaas <bhelgaas@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5 2/4] PCI: mediatek: Use regmap to get shared pcie-cfg base
Date: Sun, 13 Sep 2020 10:46:34 +0800	[thread overview]
Message-ID: <1599965194.7466.28.camel@mhfsdcap03> (raw)
In-Reply-To: <b627b938-2210-16d2-1682-3c25506e30f3@gmail.com>

On Thu, 2020-09-10 at 12:44 +0200, Matthias Brugger wrote:
> 
> On 10/09/2020 08:11, Chuanjia Liu wrote:
> > Use regmap to get shared pcie-cfg base and change
> > the method to get pcie irq.
> > 
> > Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> > Signed-off-by: Chuanjia Liu <chuanjia.liu@mediatek.com>
> > ---
> >   drivers/pci/controller/pcie-mediatek.c | 25 ++++++++++++++++++-------
> >   1 file changed, 18 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> > index cf4c18f0c25a..987845d19982 100644
> > --- a/drivers/pci/controller/pcie-mediatek.c
> > +++ b/drivers/pci/controller/pcie-mediatek.c
> > @@ -14,6 +14,7 @@
> >   #include <linux/irqchip/chained_irq.h>
> >   #include <linux/irqdomain.h>
> >   #include <linux/kernel.h>
> > +#include <linux/mfd/syscon.h>
> >   #include <linux/msi.h>
> >   #include <linux/module.h>
> >   #include <linux/of_address.h>
> > @@ -23,6 +24,7 @@
> >   #include <linux/phy/phy.h>
> >   #include <linux/platform_device.h>
> >   #include <linux/pm_runtime.h>
> > +#include <linux/regmap.h>
> >   #include <linux/reset.h>
> >   
> >   #include "../pci.h"
> > @@ -205,6 +207,7 @@ struct mtk_pcie_port {
> >    * struct mtk_pcie - PCIe host information
> >    * @dev: pointer to PCIe device
> >    * @base: IO mapped register base
> > + * @cfg: IO mapped register map for PCIe config
> >    * @free_ck: free-run reference clock
> >    * @mem: non-prefetchable memory resource
> >    * @ports: pointer to PCIe port information
> > @@ -213,6 +216,7 @@ struct mtk_pcie_port {
> >   struct mtk_pcie {
> >   	struct device *dev;
> >   	void __iomem *base;
> > +	struct regmap *cfg;
> >   	struct clk *free_ck;
> >   
> >   	struct list_head ports;
> > @@ -648,7 +652,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
> >   		return err;
> >   	}
> >   
> > -	port->irq = platform_get_irq(pdev, port->slot);
> > +	port->irq = platform_get_irq_byname(pdev, "pcie_irq");
> >   	if (port->irq < 0)
> >   		return port->irq;
> 
> You will need to make sure taht the driver keeps working with the old DTS 
> format. This is not the case here.
> 
Thanks for your review, I will fix it in the next version.

Regards,
Chuanjia
> Regards,
> Matthias
> 
> >   
> > @@ -674,12 +678,11 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
> >   	if (!mem)
> >   		return -EINVAL;
> >   
> > -	/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */
> > -	if (pcie->base) {
> > -		val = readl(pcie->base + PCIE_SYS_CFG_V2);
> > -		val |= PCIE_CSR_LTSSM_EN(port->slot) |
> > -		       PCIE_CSR_ASPM_L1_EN(port->slot);
> > -		writel(val, pcie->base + PCIE_SYS_CFG_V2);
> > +	/* MT7622/MT7629 platforms need to enable LTSSM and ASPM. */
> > +	if (pcie->cfg) {
> > +		val = PCIE_CSR_LTSSM_EN(port->slot) |
> > +		      PCIE_CSR_ASPM_L1_EN(port->slot);
> > +		regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val);
> >   	}
> >   
> >   	/* Assert all reset signals */
> > @@ -983,6 +986,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   	struct device *dev = pcie->dev;
> >   	struct platform_device *pdev = to_platform_device(dev);
> >   	struct resource *regs;
> > +	struct device_node *cfg_node;
> >   	int err;
> >   
> >   	/* get shared registers, which are optional */
> > @@ -995,6 +999,13 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
> >   		}
> >   	}
> >   
> > +	cfg_node = of_parse_phandle(dev->of_node, "mediatek,pcie-cfg", 0);
> > +	if (cfg_node) {
> > +		pcie->cfg = syscon_node_to_regmap(cfg_node);
> > +		if (IS_ERR(pcie->cfg))
> > +			return PTR_ERR(pcie->cfg);
> > +	}
> > +
> >   	pcie->free_ck = devm_clk_get(dev, "free_ck");
> >   	if (IS_ERR(pcie->free_ck)) {
> >   		if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER)
> > 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2020-09-13  2:49 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-10  6:11 [PATCH v5 0/4] Spilt PCIe node to comply with hardware design Chuanjia Liu
2020-09-10  6:11 ` Chuanjia Liu
2020-09-10  6:11 ` Chuanjia Liu
2020-09-10  6:11 ` [PATCH v5 1/4] dt-bindings: pci: mediatek: Modified the Device tree bindings Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-11 22:47   ` Rob Herring
2020-09-11 22:47     ` Rob Herring
2020-09-11 22:47     ` Rob Herring
2020-09-13  2:50     ` Chuanjia Liu
2020-09-13  2:50       ` Chuanjia Liu
2020-09-13  2:50       ` Chuanjia Liu
2020-09-11 22:50   ` Rob Herring
2020-09-11 22:50     ` Rob Herring
2020-09-11 22:50     ` Rob Herring
2020-09-13  2:54     ` Chuanjia Liu
2020-09-13  2:54       ` Chuanjia Liu
2020-09-13  2:54       ` Chuanjia Liu
2020-09-10  6:11 ` [PATCH v5 2/4] PCI: mediatek: Use regmap to get shared pcie-cfg base Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10 10:44   ` Matthias Brugger
2020-09-10 10:44     ` Matthias Brugger
2020-09-10 10:44     ` Matthias Brugger
2020-09-13  2:46     ` Chuanjia Liu [this message]
2020-09-13  2:46       ` Chuanjia Liu
2020-09-13  2:46       ` Chuanjia Liu
2020-09-10  6:11 ` [PATCH v5 3/4] arm64: dts: mediatek: Split PCIe node for MT2712 and MT7622 Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10  6:11 ` [PATCH v5 4/4] ARM: dts: mediatek: Modified MT7629 PCIe node Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu
2020-09-10  6:11   ` Chuanjia Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1599965194.7466.28.camel@mhfsdcap03 \
    --to=chuanjia.liu@mediatek.com \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frank-w@public-files.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=matthias.bgg@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=ryder.lee@mediatek.com \
    --cc=yong.wu@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.