Re: [PATCH v2 3/5] PCI: dwc: Free MSI in the error code path of dw_pcie_host_init()

[Gustavo Pimentel]

Hi,


On 01/03/2019 05:05, Jisheng Zhang wrote:
> If we ever did some msi related initializations, we need to call
> dw_pcie_free_msi() in the error code path.
> 
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx>
> ---
>  drivers/pci/controller/dwc/pcie-designware-host.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> index abe3ff5f0867..66569d0f3ab9 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> @@ -482,7 +482,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	if (pp->ops->host_init) {
>  		ret = pp->ops->host_init(pp);
>  		if (ret)
> -			goto error;
> +			goto err_free_msi;
>  	}
>  
>  	pp->root_bus_nr = pp->busn->start;
> @@ -496,7 +496,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  
>  	ret = pci_scan_root_bus_bridge(bridge);
>  	if (ret)
> -		goto error;
> +		goto err_free_msi;
>  
>  	bus = bridge->bus;
>  
> @@ -512,6 +512,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	pci_bus_add_devices(bus);
>  	return 0;
>  
> +err_free_msi:
> +	if (IS_ENABLED(CONFIG_PCI_MSI) && !pp->ops->msi_host_init)

Look to Lucas Stach patch 3afc8299f39a ("PCI: dwc: skip MSI init if MSIs have
been explicitly disabled")

You need to change this to:

if (IS_ENABLED(CONFIG_PCI_MSI) && pci_msi_enabled() && !pp->ops->msi_host_init)


> +		dw_pcie_free_msi(pp);
>  error:
>  	pci_free_host_bridge(bridge);
>  	return ret;
> 

Sounds good, thanks.

Acked-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>