| Message ID | 4417267.EzK5DAjM5p@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Thanks Arnd, this looks ok to me Zhou Wang can you please Ack? > -----Original Message----- > From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel- > owner@vger.kernel.org] On Behalf Of Arnd Bergmann > Sent: 12 November 2015 12:22 > To: linux-arm-kernel@lists.infradead.org > Cc: Jisheng Zhang; Wangzhou (B); bhelgaas@google.com; linux- > pci@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH] PCI: hisi: fix deferred probing > > The hisi_pcie_probe function is incorrectly marked as __init, as Kconfig > tells us: > > WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in > reference from the variable hisi_pcie_driver to the > function .init.text:hisi_pcie_probe() > > If the probe for this device gets deferred past the point where __init > functions are removed, or the device is unbound and then reattached to > the driver, we branch into uninitialized memory, which is bad. > > This removes the __init annotation. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c > index 35457ecd8e70..163671a4f798 100644 > --- a/drivers/pci/host/pcie-hisi.c > +++ b/drivers/pci/host/pcie-hisi.c > @@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = { > .link_up = hisi_pcie_link_up, > }; > > -static int __init hisi_add_pcie_port(struct pcie_port *pp, > +static int hisi_add_pcie_port(struct pcie_port *pp, > struct platform_device *pdev) > { > int ret; > @@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp, > return 0; > } > > -static int __init hisi_pcie_probe(struct platform_device *pdev) > +static int hisi_pcie_probe(struct platform_device *pdev) > { > struct hisi_pcie *hisi_pcie; > struct pcie_port *pp; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015/11/12 20:21, Arnd Bergmann wrote: > The hisi_pcie_probe function is incorrectly marked as __init, as Kconfig > tells us: > > WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe() > > If the probe for this device gets deferred past the point where __init > functions are removed, or the device is unbound and then reattached to > the driver, we branch into uninitialized memory, which is bad. > > This removes the __init annotation. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Hi Arnd, Many thanks, it looks good to me. so Acked-by: Zhou Wang <wangzhou1@hisilicon.com> Regards, Zhou > diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c > index 35457ecd8e70..163671a4f798 100644 > --- a/drivers/pci/host/pcie-hisi.c > +++ b/drivers/pci/host/pcie-hisi.c > @@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = { > .link_up = hisi_pcie_link_up, > }; > > -static int __init hisi_add_pcie_port(struct pcie_port *pp, > +static int hisi_add_pcie_port(struct pcie_port *pp, > struct platform_device *pdev) > { > int ret; > @@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp, > return 0; > } > > -static int __init hisi_pcie_probe(struct platform_device *pdev) > +static int hisi_pcie_probe(struct platform_device *pdev) > { > struct hisi_pcie *hisi_pcie; > struct pcie_port *pp; > > > . > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/13/2015 03:29 PM, Zhou Wang wrote: > On 2015/11/12 20:21, Arnd Bergmann wrote: >> The hisi_pcie_probe function is incorrectly marked as __init, as Kconfig >> tells us: >> >> WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe() >> >> If the probe for this device gets deferred past the point where __init >> functions are removed, or the device is unbound and then reattached to >> the driver, we branch into uninitialized memory, which is bad. >> >> This removes the __init annotation. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> > > Hi Arnd, > > Many thanks, it looks good to me. so > Acked-by: Zhou Wang <wangzhou1@hisilicon.com> I found this problem too and prepared a patch for it, but I noticed that Arnd already fixed it :) Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Thanks Hanjun -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 12, 2015 at 01:21:37PM +0100, Arnd Bergmann wrote: > The hisi_pcie_probe function is incorrectly marked as __init, as Kconfig > tells us: > > WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe() > > If the probe for this device gets deferred past the point where __init > functions are removed, or the device is unbound and then reattached to > the driver, we branch into uninitialized memory, which is bad. > > This removes the __init annotation. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> We merged pcie-hisi.c in the v4.4 merge window, so I applied this to for-linus for v4.4 with ack/reviewed-by from Zhou and Hanjun, thanks! > diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c > index 35457ecd8e70..163671a4f798 100644 > --- a/drivers/pci/host/pcie-hisi.c > +++ b/drivers/pci/host/pcie-hisi.c > @@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = { > .link_up = hisi_pcie_link_up, > }; > > -static int __init hisi_add_pcie_port(struct pcie_port *pp, > +static int hisi_add_pcie_port(struct pcie_port *pp, > struct platform_device *pdev) > { > int ret; > @@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp, > return 0; > } > > -static int __init hisi_pcie_probe(struct platform_device *pdev) > +static int hisi_pcie_probe(struct platform_device *pdev) > { > struct hisi_pcie *hisi_pcie; > struct pcie_port *pp; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c index 35457ecd8e70..163671a4f798 100644 --- a/drivers/pci/host/pcie-hisi.c +++ b/drivers/pci/host/pcie-hisi.c @@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = { .link_up = hisi_pcie_link_up, }; -static int __init hisi_add_pcie_port(struct pcie_port *pp, +static int hisi_add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) { int ret; @@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp, return 0; } -static int __init hisi_pcie_probe(struct platform_device *pdev) +static int hisi_pcie_probe(struct platform_device *pdev) { struct hisi_pcie *hisi_pcie; struct pcie_port *pp;
The hisi_pcie_probe function is incorrectly marked as __init, as Kconfig tells us: WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe() If the probe for this device gets deferred past the point where __init functions are removed, or the device is unbound and then reattached to the driver, we branch into uninitialized memory, which is bad. This removes the __init annotation. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html