| Message ID | 1412069804-17162-5-git-send-email-r65037@freescale.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Am Dienstag, den 30.09.2014, 17:36 +0800 schrieb Richard Zhu: > - move "program correct class for RC" from dw_pcie_host_init() > to dw_pcie_setup_rc(). since this is RC setup, it's > better to contained in dw_pcie_setup_rc function. > Then, RC can be re-setup really by dw_pcie_setup_rc(). > - add one re-store msi data function. Because that > pcie controller maybe powered off during system suspend, > and the msi data configuration would be lost. > this functions can be used to restore the msi data > during the resume callback. > > Signed-off-by: Richard Zhu <r65037@freescale.com> NACK. I asked you to split this patch and move it before the imx6 pcie changes in the series in order to not break compilation within the series. > --- > drivers/pci/host/pcie-designware.c | 15 ++++++++++++--- > drivers/pci/host/pcie-designware.h | 1 + > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 538bbf3..ae1e6c5 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -194,6 +194,13 @@ void dw_pcie_msi_init(struct pcie_port *pp) > dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); > } > > +void dw_pcie_msi_cfg_restore(struct pcie_port *pp) > +{ > + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_LO, 4, > + virt_to_phys((void *)pp->msi_data)); > + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); > +} > + > static int find_valid_pos0(struct pcie_port *pp, int msgvec, int pos, int *pos0) > { > int flag = 1; > @@ -570,9 +577,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > 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); > @@ -917,6 +921,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp) > val = memlimit | membase; > dw_pcie_writel_rc(pp, val, PCI_MEMORY_BASE); > > + /* program correct class for RC */ > + dw_pcie_readl_rc(pp, PCI_CLASS_REVISION, &val); > + val |= PCI_CLASS_BRIDGE_PCI << 16; > + dw_pcie_writel_rc(pp, val, PCI_CLASS_REVISION); > + > /* setup command register */ > dw_pcie_readl_rc(pp, PCI_COMMAND, &val); > val &= 0xffff0000; > diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h > index a476e60..bb75715 100644 > --- a/drivers/pci/host/pcie-designware.h > +++ b/drivers/pci/host/pcie-designware.h > @@ -83,6 +83,7 @@ int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val); > int dw_pcie_cfg_write(void __iomem *addr, int where, int size, u32 val); > irqreturn_t dw_handle_msi_irq(struct pcie_port *pp); > void dw_pcie_msi_init(struct pcie_port *pp); > +void dw_pcie_msi_cfg_restore(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);
> -----Original Message----- > From: Lucas Stach [mailto:l.stach@pengutronix.de] > Sent: Tuesday, September 30, 2014 10:58 PM > To: Zhu Richard-R65037 > Cc: linux-pci-owner@vger.kernel.org; linux-pci@vger.kernel.org; Guo Shawn- > R65073; festevam@gmail.com; tharvey@gateworks.com > Subject: Re: [PATCH v4 04/10] PCI: designware: refine setup_rc and add msi > data restore > > Am Dienstag, den 30.09.2014, 17:36 +0800 schrieb Richard Zhu: > > - move "program correct class for RC" from dw_pcie_host_init() to > > dw_pcie_setup_rc(). since this is RC setup, it's better to contained > > in dw_pcie_setup_rc function. > > Then, RC can be re-setup really by dw_pcie_setup_rc(). > > - add one re-store msi data function. Because that pcie controller > > maybe powered off during system suspend, and the msi data > > configuration would be lost. > > this functions can be used to restore the msi data during the resume > > callback. > > > > Signed-off-by: Richard Zhu <r65037@freescale.com> > > NACK. I asked you to split this patch and move it before the imx6 pcie changes > in the series in order to not break compilation within the series. > [Richard] Ok. Accepted. > > --- > > drivers/pci/host/pcie-designware.c | 15 ++++++++++++--- > > drivers/pci/host/pcie-designware.h | 1 + > > 2 files changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/pci/host/pcie-designware.c > > b/drivers/pci/host/pcie-designware.c > > index 538bbf3..ae1e6c5 100644 > > --- a/drivers/pci/host/pcie-designware.c > > +++ b/drivers/pci/host/pcie-designware.c > > @@ -194,6 +194,13 @@ void dw_pcie_msi_init(struct pcie_port *pp) > > dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); } > > > > +void dw_pcie_msi_cfg_restore(struct pcie_port *pp) { > > + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_LO, 4, > > + virt_to_phys((void *)pp->msi_data)); > > + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); } > > + > > static int find_valid_pos0(struct pcie_port *pp, int msgvec, int pos, > > int *pos0) { > > int flag = 1; > > @@ -570,9 +577,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > > > 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); @@ > > -917,6 +921,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp) > > val = memlimit | membase; > > dw_pcie_writel_rc(pp, val, PCI_MEMORY_BASE); > > > > + /* program correct class for RC */ > > + dw_pcie_readl_rc(pp, PCI_CLASS_REVISION, &val); > > + val |= PCI_CLASS_BRIDGE_PCI << 16; > > + dw_pcie_writel_rc(pp, val, PCI_CLASS_REVISION); > > + > > /* setup command register */ > > dw_pcie_readl_rc(pp, PCI_COMMAND, &val); > > val &= 0xffff0000; > > diff --git a/drivers/pci/host/pcie-designware.h > > b/drivers/pci/host/pcie-designware.h > > index a476e60..bb75715 100644 > > --- a/drivers/pci/host/pcie-designware.h > > +++ b/drivers/pci/host/pcie-designware.h > > @@ -83,6 +83,7 @@ int dw_pcie_cfg_read(void __iomem *addr, int where, > > int size, u32 *val); int dw_pcie_cfg_write(void __iomem *addr, int > > where, int size, u32 val); irqreturn_t dw_handle_msi_irq(struct > > pcie_port *pp); void dw_pcie_msi_init(struct pcie_port *pp); > > +void dw_pcie_msi_cfg_restore(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); > > -- > Pengutronix e.K. | Lucas Stach | > Industrial Linux Solutions | http://www.pengutronix.de/ | Best Regards Richard Zhu
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 538bbf3..ae1e6c5 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -194,6 +194,13 @@ void dw_pcie_msi_init(struct pcie_port *pp) dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); } +void dw_pcie_msi_cfg_restore(struct pcie_port *pp) +{ + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_LO, 4, + virt_to_phys((void *)pp->msi_data)); + dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, 0); +} + static int find_valid_pos0(struct pcie_port *pp, int msgvec, int pos, int *pos0) { int flag = 1; @@ -570,9 +577,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) 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); @@ -917,6 +921,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp) val = memlimit | membase; dw_pcie_writel_rc(pp, val, PCI_MEMORY_BASE); + /* program correct class for RC */ + dw_pcie_readl_rc(pp, PCI_CLASS_REVISION, &val); + val |= PCI_CLASS_BRIDGE_PCI << 16; + dw_pcie_writel_rc(pp, val, PCI_CLASS_REVISION); + /* setup command register */ dw_pcie_readl_rc(pp, PCI_COMMAND, &val); val &= 0xffff0000; diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h index a476e60..bb75715 100644 --- a/drivers/pci/host/pcie-designware.h +++ b/drivers/pci/host/pcie-designware.h @@ -83,6 +83,7 @@ int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val); int dw_pcie_cfg_write(void __iomem *addr, int where, int size, u32 val); irqreturn_t dw_handle_msi_irq(struct pcie_port *pp); void dw_pcie_msi_init(struct pcie_port *pp); +void dw_pcie_msi_cfg_restore(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);
- move "program correct class for RC" from dw_pcie_host_init() to dw_pcie_setup_rc(). since this is RC setup, it's better to contained in dw_pcie_setup_rc function. Then, RC can be re-setup really by dw_pcie_setup_rc(). - add one re-store msi data function. Because that pcie controller maybe powered off during system suspend, and the msi data configuration would be lost. this functions can be used to restore the msi data during the resume callback. Signed-off-by: Richard Zhu <r65037@freescale.com> --- drivers/pci/host/pcie-designware.c | 15 ++++++++++++--- drivers/pci/host/pcie-designware.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-)