> -----Original Message----- > From: Mark Brown <broonie@xxxxxxxxxx> > Sent: 2023年7月4日 0:23 > To: Hongxing Zhu <hongxing.zhu@xxxxxxx>; Lucas Stach > <l.stach@xxxxxxxxxxxxxx>; Lorenzo Pieralisi <lpieralisi@xxxxxxxxxx>; Krzysztof > Wilczyński <kw@xxxxxxxxx>; Rob Herring <robh@xxxxxxxxxx>; Bjorn Helgaas > <bhelgaas@xxxxxxxxxx>; Shawn Guo <shawnguo@xxxxxxxxxx>; Sascha Hauer > <s.hauer@xxxxxxxxxxxxxx>; Pengutronix Kernel Team <kernel@xxxxxxxxxxxxxx>; > Fabio Estevam <festevam@xxxxxxxxx>; dl-linux-imx <linux-imx@xxxxxxx> > Cc: linux-pci@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > linux-kernel@xxxxxxxxxxxxxxx; Mark Brown <broonie@xxxxxxxxxx> > Subject: [PATCH] PCI: dwc: Provide deinit callback for i.MX > > The i.MX integration for the DesignWare PCI controller has a _host_exit() > operation which undoes everything that the _host_init() operation does but does > not wire this up as the host_deinit callback for the core, or call it in any path other > than suspend. This means that if we ever unwind the initial probe of the device, > for example because it fails, the regulator core complains that the regulators for > the device were left enabled: > > imx6q-pcie 33800000.pcie: iATU: unroll T, 4 ob, 4 ib, align 64K, limit 16G > imx6q-pcie 33800000.pcie: Phy link never came up imx6q-pcie 33800000.pcie: > Phy link never came up > imx6q-pcie: probe of 33800000.pcie failed with error -110 ------------[ cut > here ]------------ > WARNING: CPU: 2 PID: 46 at drivers/regulator/core.c:2396 > _regulator_put+0x110/0x128 > > Wire up the callback so that the core can clean up after itself. > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> Reviewed-by: Richard Zhu <hongxing.zhu@xxxxxxx> Thanks. Best Regards Richard Zhu > --- > drivers/pci/controller/dwc/pci-imx6.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c > b/drivers/pci/controller/dwc/pci-imx6.c > index 52906f999f2b..e4942bd2598d 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1039,6 +1039,7 @@ static void imx6_pcie_host_exit(struct dw_pcie_rp > *pp) > > static const struct dw_pcie_host_ops imx6_pcie_host_ops = { > .host_init = imx6_pcie_host_init, > + .host_deinit = imx6_pcie_host_exit, > }; > > static const struct dw_pcie_ops dw_pcie_ops = { > > --- > base-commit: 6995e2de6891c724bfeb2db33d7b87775f913ad1 > change-id: 20230703-pci-imx-regulator-cleanup-a17c8fd15ec5 > > Best regards, > -- > Mark Brown <broonie@xxxxxxxxxx>