From: Sasha Levin Date: Fri, 29 Sep 2023 13:45:22 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v6.5.6~76 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67c395ed9c0f91c73c7f6241e0c9210fdff18179;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch b/queue-5.4/mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch new file mode 100644 index 00000000000..626384b1fbf --- /dev/null +++ b/queue-5.4/mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch @@ -0,0 +1,134 @@ +From f18069819d69e1911a1fd0b8e84de745164c3d2c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Sep 2023 09:06:56 +0200 +Subject: MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled + +From: Christoph Hellwig + +[ Upstream commit ef8f8f04a0b25e8f294b24350e8463a8d6a9ba0b ] + +While commit d4a5c59a955b ("mmc: au1xmmc: force non-modular build and +remove symbol_get usage") to be built in, it can still build a kernel +without MMC support and thuse no mmc_detect_change symbol at all. + +Add ifdefs to build the mmc support code in the alchemy arch code +conditional on mmc support. + +Fixes: d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") +Reported-by: kernel test robot +Signed-off-by: Christoph Hellwig +Acked-by: Randy Dunlap +Tested-by: Randy Dunlap # build-tested +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/alchemy/devboards/db1000.c | 4 ++++ + arch/mips/alchemy/devboards/db1200.c | 6 ++++++ + arch/mips/alchemy/devboards/db1300.c | 4 ++++ + 3 files changed, 14 insertions(+) + +diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c +index 50de86eb8784c..3183df60ad337 100644 +--- a/arch/mips/alchemy/devboards/db1000.c ++++ b/arch/mips/alchemy/devboards/db1000.c +@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = { + + /******************************************************************************/ + ++#ifdef CONFIG_MMC_AU1X + static irqreturn_t db1100_mmc_cd(int irq, void *ptr) + { + mmc_detect_change(ptr, msecs_to_jiffies(500)); +@@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = { + .num_resources = ARRAY_SIZE(au1100_mmc1_res), + .resource = au1100_mmc1_res, + }; ++#endif /* CONFIG_MMC_AU1X */ + + /******************************************************************************/ + +@@ -432,8 +434,10 @@ static struct platform_device *db1x00_devs[] = { + + static struct platform_device *db1100_devs[] = { + &au1100_lcd_device, ++#ifdef CONFIG_MMC_AU1X + &db1100_mmc0_dev, + &db1100_mmc1_dev, ++#endif + }; + + int __init db1000_dev_setup(void) +diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c +index b70e2cf8a27bc..414f92eacb5e5 100644 +--- a/arch/mips/alchemy/devboards/db1200.c ++++ b/arch/mips/alchemy/devboards/db1200.c +@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = { + + /**********************************************************************/ + ++#ifdef CONFIG_MMC_AU1X + /* SD carddetects: they're supposed to be edge-triggered, but ack + * doesn't seem to work (CPLD Rev 2). Instead, the screaming one + * is disabled and its counterpart enabled. The 200ms timeout is +@@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = { + .num_resources = ARRAY_SIZE(au1200_mmc1_res), + .resource = au1200_mmc1_res, + }; ++#endif /* CONFIG_MMC_AU1X */ + + /**********************************************************************/ + +@@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = { + static struct platform_device *db1200_devs[] __initdata = { + NULL, /* PSC0, selected by S6.8 */ + &db1200_ide_dev, ++#ifdef CONFIG_MMC_AU1X + &db1200_mmc0_dev, ++#endif + &au1200_lcd_dev, + &db1200_eth_dev, + &db1200_nand_dev, +@@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = { + }; + + static struct platform_device *pb1200_devs[] __initdata = { ++#ifdef CONFIG_MMC_AU1X + &pb1200_mmc1_dev, ++#endif + }; + + /* Some peripheral base addresses differ on the PB1200 */ +diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c +index 6f16543c16fc5..fcfefa48d2608 100644 +--- a/arch/mips/alchemy/devboards/db1300.c ++++ b/arch/mips/alchemy/devboards/db1300.c +@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = { + + /**********************************************************************/ + ++#ifdef CONFIG_MMC_AU1X + static irqreturn_t db1300_mmc_cd(int irq, void *ptr) + { + disable_irq_nosync(irq); +@@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = { + .resource = au1300_sd0_res, + .num_resources = ARRAY_SIZE(au1300_sd0_res), + }; ++#endif /* CONFIG_MMC_AU1X */ + + /**********************************************************************/ + +@@ -769,8 +771,10 @@ static struct platform_device *db1300_dev[] __initdata = { + &db1300_5waysw_dev, + &db1300_nand_dev, + &db1300_ide_dev, ++#ifdef CONFIG_MMC_AU1X + &db1300_sd0_dev, + &db1300_sd1_dev, ++#endif + &db1300_lcd_dev, + &db1300_ac97_dev, + &db1300_i2s_dev, +-- +2.40.1 + diff --git a/queue-5.4/series b/queue-5.4/series index 59453272a28..dd1b91c3351 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -43,3 +43,4 @@ drm-amd-display-fix-lfc-multiplier-changing-erratica.patch drm-amd-display-prevent-potential-division-by-zero-e.patch ata-move-export_symbol_gpl-s-close-to-exported-code.patch ata-libata-disallow-dev-initiated-lpm-transitions-to.patch +mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch