[SRU,Bionic/raspi2] UBUNTU: [Config] raspi2: Remove upstream mmc modules
diff mbox series

Message ID 20191119110845.10137-1-juergh@canonical.com
State New
Headers show
Series
  • [SRU,Bionic/raspi2] UBUNTU: [Config] raspi2: Remove upstream mmc modules
Related show

Commit Message

Juerg Haefliger Nov. 19, 2019, 11:08 a.m. UTC
From: Adam Smith <blondesaluki@gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1762835

The Bionic Linux-raspi2 kernel has both the upstream and downstream pi
mmc modules enabled. Running the latest server image users can see
this error in dmesg:

Error: Driver 'sdhost-bcm2835' is already registered, aborting...

Due to this error the pi server image is failing a testcase on the iso
tracker.  It is also not clear to users what mmc modules are in use.

The attached patch removes the upstream mmc modules from the kernel config.

Signed-off-by: Adam Smith <blondesaluki@gmail.com>
[juergh:
 - Adjusted context.
 - Kept CONFIG_MMC_SDHCI_IPROC=m to match rpi-4.19.y.]
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 debian.raspi2/config/config.common.ubuntu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paolo Pisati Nov. 20, 2019, 10:43 a.m. UTC | #1
On Tue, Nov 19, 2019 at 12:08:45PM +0100, Juerg Haefliger wrote:
> From: Adam Smith <blondesaluki@gmail.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1762835

Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Connor Kuehl Nov. 20, 2019, 9:37 p.m. UTC | #2
On 11/19/19 3:08 AM, Juerg Haefliger wrote:
> From: Adam Smith <blondesaluki@gmail.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1762835
> 
> The Bionic Linux-raspi2 kernel has both the upstream and downstream pi
> mmc modules enabled. Running the latest server image users can see
> this error in dmesg:
> 
> Error: Driver 'sdhost-bcm2835' is already registered, aborting...
> 
> Due to this error the pi server image is failing a testcase on the iso
> tracker.  It is also not clear to users what mmc modules are in use.
> 
> The attached patch removes the upstream mmc modules from the kernel config.
> 
> Signed-off-by: Adam Smith <blondesaluki@gmail.com>
> [juergh:
>   - Adjusted context.
>   - Kept CONFIG_MMC_SDHCI_IPROC=m to match rpi-4.19.y.]
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>

Acked-by: Connor Kuehl <connor.kuehl@canonical.com>

> ---
>   debian.raspi2/config/config.common.ubuntu | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
> index f27d75f7e828..cb8132cdb3f7 100644
> --- a/debian.raspi2/config/config.common.ubuntu
> +++ b/debian.raspi2/config/config.common.ubuntu
> @@ -3484,7 +3484,7 @@ CONFIG_MMA9553=m
>   CONFIG_MMC=y
>   CONFIG_MMC35240=m
>   CONFIG_MMC_ARMMMCI=y
> -CONFIG_MMC_BCM2835=y
> +# CONFIG_MMC_BCM2835 is not set
>   CONFIG_MMC_BCM2835_DMA=y
>   CONFIG_MMC_BCM2835_MMC=y
>   CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
>
Khalid Elmously Nov. 22, 2019, 1:57 a.m. UTC | #3
On 2019-11-19 12:08:45 , Juerg Haefliger wrote:
> From: Adam Smith <blondesaluki@gmail.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1762835
> 
> The Bionic Linux-raspi2 kernel has both the upstream and downstream pi
> mmc modules enabled. Running the latest server image users can see
> this error in dmesg:
> 
> Error: Driver 'sdhost-bcm2835' is already registered, aborting...
> 
> Due to this error the pi server image is failing a testcase on the iso
> tracker.  It is also not clear to users what mmc modules are in use.
> 
> The attached patch removes the upstream mmc modules from the kernel config.
> 
> Signed-off-by: Adam Smith <blondesaluki@gmail.com>
> [juergh:
>  - Adjusted context.
>  - Kept CONFIG_MMC_SDHCI_IPROC=m to match rpi-4.19.y.]
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  debian.raspi2/config/config.common.ubuntu | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
> index f27d75f7e828..cb8132cdb3f7 100644
> --- a/debian.raspi2/config/config.common.ubuntu
> +++ b/debian.raspi2/config/config.common.ubuntu
> @@ -3484,7 +3484,7 @@ CONFIG_MMA9553=m
>  CONFIG_MMC=y
>  CONFIG_MMC35240=m
>  CONFIG_MMC_ARMMMCI=y
> -CONFIG_MMC_BCM2835=y
> +# CONFIG_MMC_BCM2835 is not set
>  CONFIG_MMC_BCM2835_DMA=y
>  CONFIG_MMC_BCM2835_MMC=y
>  CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
> -- 
> 2.20.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Patch
diff mbox series

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index f27d75f7e828..cb8132cdb3f7 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -3484,7 +3484,7 @@  CONFIG_MMA9553=m
 CONFIG_MMC=y
 CONFIG_MMC35240=m
 CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_BCM2835=y
+# CONFIG_MMC_BCM2835 is not set
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2