Commit 89eacbd1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by sanglipeng
Browse files

mmc: au1xmmc: force non-modular build and remove symbol_get usage 

stable inclusion
from stable-v5.10.195
commit d90e5956c0ccd93e90cdf142353ce8ea4696eb64
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d90e5956c0ccd93e90cdf142353ce8ea4696eb64



--------------------------------

commit d4a5c59a upstream.

au1xmmc is split somewhat awkwardly into the main mmc subsystem driver,
and callbacks in platform_data that sit under arch/mips/ and are
always built in.  The latter than call mmc_detect_change through
symbol_get.  Remove the use of symbol_get by requiring the driver
to be built in.  In the future the interrupt handlers for card
insert/eject detection should probably be moved into the main driver,
and which point it can be built modular again.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
[mcgrof: squashed in depends on MMC=y suggested by Arnd]
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 79d09a68

arch/mips/alchemy/devboards/db1000.c

+1 −7
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/interrupt.h>

#include <linux/leds.h>

#include <linux/mmc/host.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/spi/spi.h>
@@ -167,12 +166,7 @@ static struct platform_device db1x00_audio_dev = { 


static irqreturn_t db1100_mmc_cd(int irq, void *ptr)

{

	void (*mmc_cd)(struct mmc_host *, unsigned long);

	/* link against CONFIG_MMC=m */

	mmc_cd = symbol_get(mmc_detect_change);

	mmc_cd(ptr, msecs_to_jiffies(500));

	symbol_put(mmc_detect_change);



	mmc_detect_change(ptr, msecs_to_jiffies(500));

	return IRQ_HANDLED;

}

arch/mips/alchemy/devboards/db1200.c

+2 −17
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/leds.h>
@@ -340,14 +339,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr) 


static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr)

{

	void (*mmc_cd)(struct mmc_host *, unsigned long);



	/* link against CONFIG_MMC=m */

	mmc_cd = symbol_get(mmc_detect_change);

	if (mmc_cd) {

		mmc_cd(ptr, msecs_to_jiffies(200));

		symbol_put(mmc_detect_change);

	}

	mmc_detect_change(ptr, msecs_to_jiffies(200));



	msleep(100);	/* debounce */

	if (irq == DB1200_SD0_INSERT_INT)
@@ -431,14 +423,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr) 


static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr)

{

	void (*mmc_cd)(struct mmc_host *, unsigned long);



	/* link against CONFIG_MMC=m */

	mmc_cd = symbol_get(mmc_detect_change);

	if (mmc_cd) {

		mmc_cd(ptr, msecs_to_jiffies(200));

		symbol_put(mmc_detect_change);

	}

	mmc_detect_change(ptr, msecs_to_jiffies(200));



	msleep(100);	/* debounce */

	if (irq == PB1200_SD1_INSERT_INT)

arch/mips/alchemy/devboards/db1300.c

+1 −9
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/interrupt.h>

#include <linux/ata_platform.h>

#include <linux/mmc/host.h>

#include <linux/module.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/platnand.h>

#include <linux/platform_device.h>
@@ -459,14 +458,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr) 


static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr)

{

	void (*mmc_cd)(struct mmc_host *, unsigned long);



	/* link against CONFIG_MMC=m.  We can only be called once MMC core has

	 * initialized the controller, so symbol_get() should always succeed.

	 */

	mmc_cd = symbol_get(mmc_detect_change);

	mmc_cd(ptr, msecs_to_jiffies(200));

	symbol_put(mmc_detect_change);

	mmc_detect_change(ptr, msecs_to_jiffies(200));



	msleep(100);	/* debounce */

	if (irq == DB1300_SD1_INSERT_INT)

drivers/mmc/host/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -520,11 +520,12 @@ config MMC_ALCOR 
	  of Alcor Micro PCI-E card reader



config MMC_AU1X

	tristate "Alchemy AU1XX0 MMC Card Interface support"

	bool "Alchemy AU1XX0 MMC Card Interface support"

	depends on MIPS_ALCHEMY

	depends on MMC=y

	help

	  This selects the AMD Alchemy(R) Multimedia card interface.

	  If you have a Alchemy platform with a MMC slot, say Y or M here.

	  If you have a Alchemy platform with a MMC slot, say Y here.



	  If unsure, say N.