On Mon, Oct 18, 2021 at 08:07:34AM +0100, Mauro Carvalho Chehab wrote: > This driver currently doesn't call dw_pcie_host_deinit() > at the .remove() callback. This can cause an OOPS if the driver > is unbound. This looks like a fix, it has to be marked as such. > While here, add a poweroff function, in order to abstract > between the internal and external PHY logic. > > Acked-by: Xiaowei Song <songxiaowei@xxxxxxxxxxxxx> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> > --- > > See [PATCH v13 00/10] at: https://lore.kernel.org/all/cover.1634539769.git.mchehab+huawei@xxxxxxxxxx/ > > drivers/pci/controller/dwc/pcie-kirin.c | 30 ++++++++++++++++--------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c > index b17a194cf78d..ffc63d12f8ed 100644 > --- a/drivers/pci/controller/dwc/pcie-kirin.c > +++ b/drivers/pci/controller/dwc/pcie-kirin.c > @@ -680,6 +680,23 @@ static const struct dw_pcie_host_ops kirin_pcie_host_ops = { > .host_init = kirin_pcie_host_init, > }; > > +static int kirin_pcie_power_off(struct kirin_pcie *kirin_pcie) > +{ > + int i; > + > + if (kirin_pcie->type == PCIE_KIRIN_INTERNAL_PHY) > + return hi3660_pcie_phy_power_off(kirin_pcie); > + > + for (i = 0; i < kirin_pcie->n_gpio_clkreq; i++) { > + gpio_direction_output(kirin_pcie->gpio_id_clkreq[i], 1); > + } It looks like you are adding functionality here (ie gpio), not just wrapping common code in a function. Also, remove the braces, they aren't needed. Lorenzo > + > + phy_power_off(kirin_pcie->phy); > + phy_exit(kirin_pcie->phy); > + > + return 0; > +} > + > static int kirin_pcie_power_on(struct platform_device *pdev, > struct kirin_pcie *kirin_pcie) > { > @@ -725,12 +742,7 @@ static int kirin_pcie_power_on(struct platform_device *pdev, > > return 0; > err: > - if (kirin_pcie->type == PCIE_KIRIN_INTERNAL_PHY) { > - hi3660_pcie_phy_power_off(kirin_pcie); > - } else { > - phy_power_off(kirin_pcie->phy); > - phy_exit(kirin_pcie->phy); > - } > + kirin_pcie_power_off(kirin_pcie); > > return ret; > } > @@ -739,11 +751,9 @@ static int __exit kirin_pcie_remove(struct platform_device *pdev) > { > struct kirin_pcie *kirin_pcie = platform_get_drvdata(pdev); > > - if (kirin_pcie->type == PCIE_KIRIN_INTERNAL_PHY) > - return hi3660_pcie_phy_power_off(kirin_pcie); > + dw_pcie_host_deinit(&kirin_pcie->pci->pp); > > - phy_power_off(kirin_pcie->phy); > - phy_exit(kirin_pcie->phy); > + kirin_pcie_power_off(kirin_pcie); > > return 0; > } > -- > 2.31.1 >
