Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1373309

Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc()

From Jisheng Zhang <jszhang@marvell.com>
Newsgroups linux.kernel
Subject Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc()
Date 2016-04-07 13:50 +0200
Message-ID <rlgBJ-3br-31@gated-at.bofh.it> (permalink)
References (1 earlier) <rkX62-5pE-23@gated-at.bofh.it> <rl8b7-5tm-3@gated-at.bofh.it> <rldub-10J-23@gated-at.bofh.it> <rldDR-15J-15@gated-at.bofh.it> <rlf2W-2cW-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

On Thu, 7 Apr 2016 10:06:45 +0000 Gabriele Paoloni wrote:

> Hi Jisheng
> 
..
> > >  
> > > >
> > > > Is it acceptable that pcie-hisi adds a call to dw_pcie_setup_rc()  
> > in  
> > > > hisi_add_pcie_port()?  
> > >
> > > I don't think so...that would try to overwrite what is already set by
> > > the bootloader; so it is wrong in principle and maybe it can lead to
> > > undefined behaviours...  
> > 
> > make sense! This commit is intend to re-setup the rc when waken from
> > s2ram (in
> > s2ram state, the host lost power)
> > 
> > I have no good solution but to introduce one function e.g
> > dw_pcie_setup_rc_after_linkup(), then move related code from
> > dw_pcie_host_init
> > to it, then let my host driver resume hook to call.
> > 
> > Hi Pratyush, Jingoo and Bjorn etc.
> > 
> > any suggestions are appreciated!  
> 
> What about:
> 
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index a4cccd3..e461f5d 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -434,7 +434,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	struct platform_device *pdev = to_platform_device(pp->dev);
>  	struct pci_bus *bus, *child;
>  	struct resource *cfg_res;
> -	u32 val;
>  	int i, ret;
>  	LIST_HEAD(res);
>  	struct resource_entry *win;
> @@ -544,25 +543,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	if (pp->ops->host_init)
>  		pp->ops->host_init(pp);
>  
> -	/*
> -	 * If the platform provides ->rd_other_conf, it means the platform
> -	 * uses its own address translation component rather than ATU, so
> -	 * we should not program the ATU here.
> -	 */
> -	if (!pp->ops->rd_other_conf)
> -		dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1,
> -					  PCIE_ATU_TYPE_MEM, pp->mem_base,
> -					  pp->mem_bus_addr, pp->mem_size);
> -
> -	dw_pcie_wr_own_conf(pp, PCI_BASE_ADDRESS_0, 4, 0);
> -
> -	/* program correct class for RC */
> -	dw_pcie_wr_own_conf(pp, PCI_CLASS_DEVICE, 2, PCI_CLASS_BRIDGE_PCI);
> -
> -	dw_pcie_rd_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, &val);
> -	val |= PORT_LOGIC_SPEED_CHANGE;
> -	dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val);

If we introduced one global function, is it better to keep the RC registers
program sequence not changed at all? And ask each pcie dw users to call this
new function in its resume hook if necessary. Either is fine, and can provide
what I want, let's wait maintainers' comments.

Something like:


diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index a4cccd3..53c6176 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -434,7 +434,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
 	struct platform_device *pdev = to_platform_device(pp->dev);
 	struct pci_bus *bus, *child;
 	struct resource *cfg_res;
-	u32 val;
 	int i, ret;
 	LIST_HEAD(res);
 	struct resource_entry *win;
@@ -544,24 +543,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
 	if (pp->ops->host_init)
 		pp->ops->host_init(pp);
 
-	/*
-	 * If the platform provides ->rd_other_conf, it means the platform
-	 * uses its own address translation component rather than ATU, so
-	 * we should not program the ATU here.
-	 */
-	if (!pp->ops->rd_other_conf)
-		dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1,
-					  PCIE_ATU_TYPE_MEM, pp->mem_base,
-					  pp->mem_bus_addr, pp->mem_size);
-
-	dw_pcie_wr_own_conf(pp, PCI_BASE_ADDRESS_0, 4, 0);
-
-	/* program correct class for RC */
-	dw_pcie_wr_own_conf(pp, PCI_CLASS_DEVICE, 2, PCI_CLASS_BRIDGE_PCI);
-
-	dw_pcie_rd_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, &val);
-	val |= PORT_LOGIC_SPEED_CHANGE;
-	dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val);
+	dw_pcie_setup_rc_after_linkup(pp);
 
 	pp->root_bus_nr = pp->busn->start;
 	if (IS_ENABLED(CONFIG_PCI_MSI)) {
@@ -725,6 +707,30 @@ static struct pci_ops dw_pcie_ops = {
 	.write = dw_pcie_wr_conf,
 };
 
+void dw_pcie_setup_rc_after_linkup(struct pcie_port *pp)
+{
+	u32 val;
+
+	/*
+	 * If the platform provides ->rd_other_conf, it means the platform
+	 * uses its own address translation component rather than ATU, so
+	 * we should not program the ATU here.
+	 */
+	if (!pp->ops->rd_other_conf)
+		dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1,
+					  PCIE_ATU_TYPE_MEM, pp->mem_base,
+					  pp->mem_bus_addr, pp->mem_size);
+
+	dw_pcie_wr_own_conf(pp, PCI_BASE_ADDRESS_0, 4, 0);
+
+	/* program correct class for RC */
+	dw_pcie_wr_own_conf(pp, PCI_CLASS_DEVICE, 2, PCI_CLASS_BRIDGE_PCI);
+
+	dw_pcie_rd_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, &val);
+	val |= PORT_LOGIC_SPEED_CHANGE;
+	dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val);
+}
+
 void dw_pcie_setup_rc(struct pcie_port *pp)
 {
 	u32 val;
diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h
index f437f9b..f7746bf 100644
--- a/drivers/pci/host/pcie-designware.h
+++ b/drivers/pci/host/pcie-designware.h
@@ -85,5 +85,6 @@ int dw_pcie_wait_for_link(struct pcie_port *pp);
 int dw_pcie_link_up(struct pcie_port *pp);
 void dw_pcie_setup_rc(struct pcie_port *pp);
 int dw_pcie_host_init(struct pcie_port *pp);
+void dw_pcie_setup_rc_after_linkup(struct pcie_port *pp);
 
 #endif /* _PCIE_DESIGNWARE_H */

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-06 17:00 +0200
  Re: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Jisheng Zhang <jszhang@marvell.com> - 2016-04-07 04:50 +0200
    RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-07 10:30 +0200
      Re: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Jisheng Zhang <jszhang@marvell.com> - 2016-04-07 10:40 +0200
        RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-07 12:10 +0200
          Re: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Jisheng Zhang <jszhang@marvell.com> - 2016-04-07 13:50 +0200
          Re: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Bjorn Helgaas <helgaas@kernel.org> - 2016-04-07 16:10 +0200
            RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-08 15:40 +0200
              Re: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Bjorn Helgaas <helgaas@kernel.org> - 2016-04-08 18:10 +0200
                RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-12 11:50 +0200
                Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc() "Jingoo Han" <jingoohan1@gmail.com> - 2016-04-13 08:00 +0200
                RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-13 10:00 +0200
                Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc() "Jingoo Han" <jingoohan1@gmail.com> - 2016-04-14 14:00 +0200
                Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc() Pratyush Anand <pratyush.anand@gmail.com> - 2016-04-14 15:10 +0200
                RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-14 15:20 +0200
  Re: [PATCH v2] PCI: designware: move remaining rc setup code to dw_pcie_setup_rc() Pratyush Anand <pratyush.anand@gmail.com> - 2016-04-07 09:00 +0200
    RE: [PATCH v2] PCI: designware: move remaining rc setup code to  dw_pcie_setup_rc() Gabriele Paoloni <gabriele.paoloni@huawei.com> - 2016-04-07 10:20 +0200

csiph-web