Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ee47b0a authored by Balaji T K's avatar Balaji T K Committed by Tony Lindgren
Browse files

ARM: OMAP4: hsmmc: check for null pointer 



platform_device pdev can be NULL if CONFIG_MMC_OMAP_HS is not set.
Add check for NULL pointer. while at it move the duplicated functions
to omap4-common.c

Fixes the following boot crash seen with omap4sdp and omap4panda
when MMC is disabled.

Unable to handle kernel NULL pointer dereference at virtual address 0000008c
pgd = c0004000
[0000008c] *pgd=00000000
Internal error: Oops: 5 [#1] SMP ARM
Modules linked in:
CPU: 0    Not tainted  (3.4.0-rc1-05971-ga4dfa82 #4)
PC is at omap_4430sdp_init+0x184/0x410
LR is at device_add+0x1a0/0x664

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Reported-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e54bdc18

arch/arm/mach-omap2/board-4430sdp.c

+0 −44
Original line number Original line Diff line number Diff line
@@ -489,50 +489,6 @@ static struct platform_device omap_vwlan_device = { 
	},

	},

};

};





static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			pr_err("Failed configuring MMC1 card detect\n");

			return irq;

		}

		pdata->slots[0].card_detect_irq = irq;

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed %s\n", __func__);

		return;

	}

	pdata = dev->platform_data;

	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++)

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);



	return 0;

}



static struct regulator_init_data sdp4430_vaux1 = {

static struct regulator_init_data sdp4430_vaux1 = {

	.constraints = {

	.constraints = {

		.min_uV			= 1000000,

		.min_uV			= 1000000,

arch/arm/mach-omap2/board-omap4panda.c

+0 −49
Original line number Original line Diff line number Diff line
@@ -236,55 +236,6 @@ struct wl12xx_platform_data omap_panda_wlan_data __initdata = { 
	.board_ref_clock = 2,

	.board_ref_clock = 2,

};

};





static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	if (!pdata) {

		dev_err(dev, "%s: NULL platform data\n", __func__);

		return -EINVAL;

	}

	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			dev_err(dev, "%s: Error card detect config(%d)\n",

				__func__, irq);

			return irq;

		}

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed omap4_twl6030_hsmmc_set_late_init\n");

		return;

	}

	pdata = dev->platform_data;



	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++)

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);



	return 0;

}



static struct twl6040_codec_data twl6040_codec = {

static struct twl6040_codec_data twl6040_codec = {

	/* single-step ramp for headset and handsfree */

	/* single-step ramp for headset and handsfree */

	.hs_left_step	= 0x0f,

	.hs_left_step	= 0x0f,

arch/arm/mach-omap2/common.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#ifndef __ASSEMBLER__

#ifndef __ASSEMBLER__





#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/i2c/twl.h>

#include <plat/common.h>

#include <plat/common.h>

#include <asm/proc-fns.h>

#include <asm/proc-fns.h>
@@ -254,6 +255,8 @@ static inline u32 omap4_mpuss_read_prev_context_state(void) 
struct omap_sdrc_params;

struct omap_sdrc_params;

extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1);

				      struct omap_sdrc_params *sdrc_cs1);

struct omap2_hsmmc_info;

extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);





#endif /* __ASSEMBLER__ */

#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
 
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/mach-omap2/omap4-common.c

+58 −0
Original line number Original line Diff line number Diff line
@@ -25,11 +25,13 @@ 
#include <plat/irqs.h>

#include <plat/irqs.h>

#include <plat/sram.h>

#include <plat/sram.h>

#include <plat/omap-secure.h>

#include <plat/omap-secure.h>

#include <plat/mmc.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/omap-wakeupgen.h>

#include <mach/omap-wakeupgen.h>





#include "common.h"

#include "common.h"

#include "hsmmc.h"

#include "omap4-sar-layout.h"

#include "omap4-sar-layout.h"

#include <linux/export.h>

#include <linux/export.h>
@@ -207,3 +209,59 @@ static int __init omap4_sar_ram_init(void) 
	return 0;

	return 0;

}

}

early_initcall(omap4_sar_ram_init);

early_initcall(omap4_sar_ram_init);



#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			dev_err(dev, "%s: Error card detect config(%d)\n",

				__func__, irq);

			return irq;

		}

		pdata->slots[0].card_detect_irq = irq;

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed %s\n", __func__);

		return;

	}

	pdata = dev->platform_data;

	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++) {

		/* pdev can be null if CONFIG_MMC_OMAP_HS is not set */

		if (!c->pdev)

			continue;

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);

	}



	return 0;

}

#else

int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	return 0;

}

#endif