Re: [PATCH] PCI: designware: move dw_pcie_iatu_unroll_enabled to pcie-designware.c

[Bjorn Helgaas]

On Tue, Oct 24, 2017 at 07:10:55PM +0530, Pankaj Dubey wrote:
> On 20 October 2017 at 23:11, Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> >
> > On Thu, Oct 12, 2017 at 10:11:08AM +0530, Pankaj Dubey wrote:
> > > IATU unroll feature can be enabled in EP mode as well, so we need to
> > > have this check in pcie-designware-ep.c, so instead of making this
> > > function as static in pcie-desigware-host.c, let's move this in
> > > pcie-designware.c so that both pcie-designware-host.c and
> > > pcie-designware-ep.c can use it.
> > >
> > > Signed-off-by: Pankaj Dubey <pankaj.dubey@xxxxxxxxxxx>
> >
> > This is fine with me but I'm looking for an ack from Jingoo and/or Joao.
> 
> Jingoo / Joao any comments on this?

Dropping for lack of ack.  Please repost if/when we have an ack.

> > > ---
> > >  drivers/pci/dwc/pcie-designware-ep.c   |  4 ++++
> > >  drivers/pci/dwc/pcie-designware-host.c | 11 -----------
> > >  drivers/pci/dwc/pcie-designware.c      | 11 +++++++++++
> > >  drivers/pci/dwc/pcie-designware.h      |  1 +
> > >  4 files changed, 16 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c
> > > index d53d5f1..64803a9 100644
> > > --- a/drivers/pci/dwc/pcie-designware-ep.c
> > > +++ b/drivers/pci/dwc/pcie-designware-ep.c
> > > @@ -314,6 +314,10 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
> > >       if (ep->ops->ep_init)
> > >               ep->ops->ep_init(ep);
> > >
> > > +     pci->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pci);
> > > +     dev_dbg(dev, "iATU unroll: %s\n",
> > > +             pci->iatu_unroll_enabled ? "enabled" : "disabled");
> > > +
> > >       epc = devm_pci_epc_create(dev, &epc_ops);
> > >       if (IS_ERR(epc)) {
> > >               dev_err(dev, "failed to create epc device\n");
> > > diff --git a/drivers/pci/dwc/pcie-designware-host.c b/drivers/pci/dwc/pcie-designware-host.c
> > > index 81e2157..d3f579e 100644
> > > --- a/drivers/pci/dwc/pcie-designware-host.c
> > > +++ b/drivers/pci/dwc/pcie-designware-host.c
> > > @@ -574,17 +574,6 @@ static struct pci_ops dw_pcie_ops = {
> > >       .write = dw_pcie_wr_conf,
> > >  };
> > >
> > > -static u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci)
> > > -{
> > > -     u32 val;
> > > -
> > > -     val = dw_pcie_readl_dbi(pci, PCIE_ATU_VIEWPORT);
> > > -     if (val == 0xffffffff)
> > > -             return 1;
> > > -
> > > -     return 0;
> > > -}
> > > -
> > >  void dw_pcie_setup_rc(struct pcie_port *pp)
> > >  {
> > >       u32 val;
> > > diff --git a/drivers/pci/dwc/pcie-designware.c b/drivers/pci/dwc/pcie-designware.c
> > > index 88abddd..f15da90 100644
> > > --- a/drivers/pci/dwc/pcie-designware.c
> > > +++ b/drivers/pci/dwc/pcie-designware.c
> > > @@ -92,6 +92,17 @@ void __dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> > >               dev_err(pci->dev, "write DBI address failed\n");
> > >  }
> > >
> > > +u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci)
> >
> > I know this is just moved verbatim, but it's more conventional to simply
> > return an int (or possibly bool) for a predicate like this.  There's really
> > no point in going out of your way to specify "u8" for the return type.
> >
> 
> Ok, it can be done, will wait for comments from Jingoo and or Joao and
> then update.
> 
> Thanks,
> Pankaj
> 
> 
> > > +{
> > > +     u32 val;
> > > +
> > > +     val = dw_pcie_readl_dbi(pci, PCIE_ATU_VIEWPORT);
> > > +     if (val == 0xffffffff)
> > > +             return 1;
> > > +
> > > +     return 0;
> > > +}
> > > +
> > >  static u32 dw_pcie_readl_ob_unroll(struct dw_pcie *pci, u32 index, u32 reg)
> > >  {
> > >       u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
> > > diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
> > > index e5d9d77..8d6829c 100644
> > > --- a/drivers/pci/dwc/pcie-designware.h
> > > +++ b/drivers/pci/dwc/pcie-designware.h
> > > @@ -242,6 +242,7 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int bar,
> > >  void dw_pcie_disable_atu(struct dw_pcie *pci, int index,
> > >                        enum dw_pcie_region_type type);
> > >  void dw_pcie_setup(struct dw_pcie *pci);
> > > +u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci);
> > >
> > >  static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val)
> > >  {
> > > --
> > > 2.7.4
> > >