Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753539AbbBSRl6 (ORCPT ); Thu, 19 Feb 2015 12:41:58 -0500 Received: from mail-lb0-f176.google.com ([209.85.217.176]:34995 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbbBSRl4 (ORCPT ); Thu, 19 Feb 2015 12:41:56 -0500 From: "Matwey V. Kornilov" To: mohit.kumar@st.com Cc: viresh.kumar@linaro.org, linux-pci@vger.kernel.org, gregkh@linuxfoundation.org, bhelgaas@google.com, linux-kernel@vger.kernel.org, svarbanov@mm-sol.com, "Matwey V. Kornilov" Subject: [PATCH v3] pci: spear: Drop __initdata from spear13xx_pcie_driver Date: Thu, 19 Feb 2015 20:41:48 +0300 Message-Id: <1424367708-17149-1-git-send-email-matwey@sai.msu.ru> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5168 Lines: 100 spear13xx_pcie_driver.driver is allocated in text.init section and then the pointer to it is passed futher. This patch is to avoid crashes like the following, when freed memory is used. Also, __init has been dropped from the probe() function referred from the struct and all called functions. #0 __device_attach (drv=0xc0ed5608 , data=0xdb622610) at ../drivers/base/dd.c:409 #1 0xc07a4798 in bus_for_each_drv (bus=, start=, data=0xda0, fn=0xc07a6740 <__device_attach>) at ../drivers/base/bus.c:463 #2 0xc07a6324 in device_attach (dev=0xdb622610) at ../drivers/base/dd.c:447 #3 0xc07a5814 in bus_probe_device (dev=0xdb622610) at ../drivers/base/bus.c:558 #4 0xc07a38d8 in device_add (dev=) at ../drivers/base/core.c:1058 #5 0xc08b6a5c in of_device_add (ofdev=) at ../drivers/of/device.c:66 #6 0xc08b742c in of_platform_device_create_pdata (np=, bus_id=0x0 <__vectors_start>, platform_data=0x0 <__vectors_start>, parent=) at ../drivers/of/platform.c:241 #7 0xc08b7568 in of_platform_bus_create (bus=0xdfa46780, matches=0x0 <__vectors_start>, lookup=0x0 <__vectors_start>, parent=0xdb183410, strict=true) at ../drivers/of/platform.c:414 #8 0xc08b79bc in of_platform_populate (root=0xc0ed5608 , matches=0xdb622610, lookup=0xda0, parent=0xc07a6740 <__device_attach>) at ../drivers/of/platform.c:501 #9 0xbf000030 in am335x_child_probe (pdev=0xdb183400) at ../drivers/usb/musb/musb_am335x.c:12 #10 0xc07a83f0 in platform_drv_probe (_dev=0xdb183410) at ../drivers/base/platform.c:512 #11 0xc07a64e8 in really_probe (drv=, dev=) at ../drivers/base/dd.c:302 #12 driver_probe_device (drv=0xbf000234, dev=0xdb183410) at ../drivers/base/dd.c:399 #13 0xc07a6820 in __driver_attach (dev=0xdb183410, data=0xbf000234) at ../drivers/base/dd.c:477 #14 0xc07a46e8 in bus_for_each_dev (bus=, start=, data=0xda0, fn=0xc07a83a4 ) at ../drivers/base/bus.c:313 #15 0xc07a5ebc in driver_attach (drv=) at ../drivers/base/dd.c:496 #16 0xc07a5af0 in bus_add_driver (drv=0xbf000234) at ../drivers/base/bus.c:694 #17 0xc07a6fec in driver_register (drv=0xbf000234) at ../drivers/base/driver.c:167 #18 0xc0209c34 in do_one_initcall (fn=0xbf002000) at ../init/main.c:801 #19 0xc02e0494 in do_init_module (mod=) at ../kernel/module.c:3142 #20 load_module (info=0xdb6b1f54, uargs=, flags=) at ../kernel/module.c:3461 #21 0xc02e0a44 in SYSC_finit_module (flags=, uargs=, fd=) at ../kernel/module.c:3537 #22 SyS_finit_module (fd=7, uargs=-1225602132, flags=0) at ../kernel/module.c:3518 #23 0xc021a680 in ?? () Signed-off-by: Matwey V. Kornilov --- Changes from v2: - Drop __init from all probing functions to allow deferred probing. Changes from v1: - Use platform_driver_probe instead of platform_driver_register to make linker happy. drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/host/pcie-spear13xx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index df781cd..5b8a056 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -339,7 +339,7 @@ static const struct irq_domain_ops msi_domain_ops = { .map = dw_pcie_msi_map, }; -int __init dw_pcie_host_init(struct pcie_port *pp) +int dw_pcie_host_init(struct pcie_port *pp) { struct device_node *np = pp->dev->of_node; struct platform_device *pdev = to_platform_device(pp->dev); diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c index 866465f..020d788 100644 --- a/drivers/pci/host/pcie-spear13xx.c +++ b/drivers/pci/host/pcie-spear13xx.c @@ -269,7 +269,7 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { .host_init = spear13xx_pcie_host_init, }; -static int __init spear13xx_add_pcie_port(struct pcie_port *pp, +static int spear13xx_add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -299,7 +299,7 @@ static int __init spear13xx_add_pcie_port(struct pcie_port *pp, return 0; } -static int __init spear13xx_pcie_probe(struct platform_device *pdev) +static int spear13xx_pcie_probe(struct platform_device *pdev) { struct spear13xx_pcie *spear13xx_pcie; struct pcie_port *pp; @@ -370,7 +370,7 @@ static const struct of_device_id spear13xx_pcie_of_match[] = { }; MODULE_DEVICE_TABLE(of, spear13xx_pcie_of_match); -static struct platform_driver spear13xx_pcie_driver __initdata = { +static struct platform_driver spear13xx_pcie_driver = { .probe = spear13xx_pcie_probe, .driver = { .name = "spear-pcie", -- 2.1.4 -- 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/