Re: [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host

[Vidya Sagar]

On 5/2/2019 8:28 PM, Lorenzo Pieralisi wrote:
> On Tue, Apr 16, 2019 at 07:45:15PM +0530, Vidya Sagar wrote:
> > Add an API to group all the tasks to be done to de-initialize host which
> > can then be called by any DesignWare core based driver implementations
> > while adding .remove() support in their respective drivers.
> >
> > Signed-off-by: Vidya Sagar <vidyas@xxxxxxxxxx>
> > Acked-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
> > ---
> > v2:
> > * s/Designware/DesignWare
> >
> >   drivers/pci/controller/dwc/pcie-designware-host.c | 7 +++++++
> >   drivers/pci/controller/dwc/pcie-designware.h      | 5 +++++
> >   2 files changed, 12 insertions(+)
> >
> > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> > index 3e4169e738a5..d7881490282d 100644
> > --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> > @@ -516,6 +516,13 @@ int dw_pcie_host_init(struct pcie_port *pp)
> >   	return ret;
> >   }
> >   
> > +void dw_pcie_host_deinit(struct pcie_port *pp)
> > +{
> > +	pci_stop_root_bus(pp->root_bus);
> > +	pci_remove_root_bus(pp->root_bus);
> > +	dw_pcie_free_msi(pp);
>
> This must mirror the init path, so AFAICS it should not be done
> if pp->ops->msi_host_init != NULL
Done.
I'll add check "if (pci_msi_enabled() && !pp->ops->msi_host_init)"

> Lorenzo
>
> > +}
> > +
> >   static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus,
> >   				     u32 devfn, int where, int size, u32 *val,
> >   				     bool write)
> > diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
> > index adff0c713665..ea8d1caf11c5 100644
> > --- a/drivers/pci/controller/dwc/pcie-designware.h
> > +++ b/drivers/pci/controller/dwc/pcie-designware.h
> > @@ -343,6 +343,7 @@ void dw_pcie_msi_init(struct pcie_port *pp);
> >   void dw_pcie_free_msi(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_host_deinit(struct pcie_port *pp);
> >   int dw_pcie_allocate_domains(struct pcie_port *pp);
> >   #else
> >   static inline irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)
> > @@ -367,6 +368,10 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)
> >   	return 0;
> >   }
> >   
> > +static inline void dw_pcie_host_deinit(struct pcie_port *pp)
> > +{
> > +}
> > +
> >   static inline int dw_pcie_allocate_domains(struct pcie_port *pp)
> >   {
> >   	return 0;
> > --
> > 2.17.1