Following compilation warning occurs when compiled with:
CONFIG_DEBUG_SECTION_MISMATCH=y
WARNING: drivers/pci/host/built-in.o(.data+0x308): Section mismatch in
reference from the variable hisi_pcie_driver to the function
.init.text:hisi_pcie_probe()
Fix it by dropping __init from hisi_pcie_probe().
Signed-off-by: Jisheng Zhang <[email protected]>
Fixes: 500a1d9a43e0 ("PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver")
---
drivers/pci/host/pcie-hisi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
index 35457ec..1cc0a21 100644
--- a/drivers/pci/host/pcie-hisi.c
+++ b/drivers/pci/host/pcie-hisi.c
@@ -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;
--
2.6.2
On Thursday 12 November 2015 20:02:08 Jisheng Zhang wrote:
> Following compilation warning occurs when compiled with:
> CONFIG_DEBUG_SECTION_MISMATCH=y
>
> WARNING: drivers/pci/host/built-in.o(.data+0x308): Section mismatch in
> reference from the variable hisi_pcie_driver to the function
> .init.text:hisi_pcie_probe()
>
> Fix it by dropping __init from hisi_pcie_probe().
The patch description should ideally say what the impact is here, not
only what the warning says.
> Signed-off-by: Jisheng Zhang <[email protected]>
> Fixes: 500a1d9a43e0 ("PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver")
> ---
> drivers/pci/host/pcie-hisi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
> index 35457ec..1cc0a21 100644
> --- a/drivers/pci/host/pcie-hisi.c
> +++ b/drivers/pci/host/pcie-hisi.c
> @@ -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;
This seems incomplete, you now get a new warning about hisi_add_pcie_port().
I did a similar patch yesterday, will follow up with my version.
Arnd
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 <[email protected]>
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;
On Thu, 12 Nov 2015 13:21:02 +0100
Arnd Bergmann <[email protected]> wrote:
> On Thursday 12 November 2015 20:02:08 Jisheng Zhang wrote:
> > Following compilation warning occurs when compiled with:
> > CONFIG_DEBUG_SECTION_MISMATCH=y
> >
> > WARNING: drivers/pci/host/built-in.o(.data+0x308): Section mismatch in
> > reference from the variable hisi_pcie_driver to the function
> > .init.text:hisi_pcie_probe()
> >
> > Fix it by dropping __init from hisi_pcie_probe().
>
> The patch description should ideally say what the impact is here, not
> only what the warning says.
>
> > Signed-off-by: Jisheng Zhang <[email protected]>
> > Fixes: 500a1d9a43e0 ("PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver")
> > ---
> > drivers/pci/host/pcie-hisi.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
> > index 35457ec..1cc0a21 100644
> > --- a/drivers/pci/host/pcie-hisi.c
> > +++ b/drivers/pci/host/pcie-hisi.c
> > @@ -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;
>
> This seems incomplete, you now get a new warning about hisi_add_pcie_port().
oops, yes. Thanks.
>
> I did a similar patch yesterday, will follow up with my version.
Your version is completed.
Thanks,
Jisheng
Thanks Arnd, this looks ok to me
Zhou Wang can you please Ack?
> -----Original Message-----
> From: [email protected] [mailto:linux-kernel-
> [email protected]] On Behalf Of Arnd Bergmann
> Sent: 12 November 2015 12:22
> To: [email protected]
> Cc: Jisheng Zhang; Wangzhou (B); [email protected]; linux-
> [email protected]; [email protected]
> 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 <[email protected]>
>
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
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 <[email protected]>
>
Hi Arnd,
Many thanks, it looks good to me. so
Acked-by: Zhou Wang <[email protected]>
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;
>
>
> .
>
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 <[email protected]>
>>
>
> Hi Arnd,
>
> Many thanks, it looks good to me. so
> Acked-by: Zhou Wang <[email protected]>
I found this problem too and prepared a patch for it, but
I noticed that Arnd already fixed it :)
Reviewed-by: Hanjun Guo <[email protected]>
Thanks
Hanjun
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 <[email protected]>
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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/