From patchwork Tue Nov 19 11:09:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1197378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47HNPp6XkKz9sPn; Tue, 19 Nov 2019 22:09:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iX1Nz-0005sO-Bo; Tue, 19 Nov 2019 11:09:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iX1Nx-0005sH-TR for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:09:29 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iX1Nx-0004Fc-OZ for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:09:29 +0000 Received: by mail-wm1-f70.google.com with SMTP id y14so2237196wmi.4 for ; Tue, 19 Nov 2019 03:09:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=iNmPz8N5ph3WYrzjCz7s4Izj7Vtk6g5wnNODjQ6ShpU=; b=ORO4KFYNRT3KALCLvEQQnNNW4zMyrW8Ee3Qm3Ja+GoOoyuY3bxWlZVjnn7U6VXBB5B kg9jVfbpJ+Im5Q33xEeWqyPX9JxoSdChlEXIwjr0UopshDD8R17Xt2lcohyptyGldhaK VkbXL3UiivmjmwkUNc5o+k06XJtcFBOvhTevh5G8hm47IEcHFNo+FZHitLrk7upT0vhj s6ucuSxcWCxOlYKM0uOv1cZw3TDXiC0qgQTvZrN55ycVwimEYiPR6U4aBvhl49a8aCSX wdIDrL4HBWhz4RMmlybPFKqpv/Rj8dJSiXDi16iM7pXH1rYuo5+RqCHMprEBLBDdINV2 lsWw== X-Gm-Message-State: APjAAAV/jaaEK3tLmevpjGZMJu9BSGDKy317mejAJSij1ObO7qKj0LDn WLJ7DIRB9HIqu5SkJw7k3wbyRrQ4tcsDyvasA6eS3WiN78w9gVIthLSmZ6W9k4R+sOdqJixBFVa H/jYnd4oIy/I4Gg0kJvIRBAcjT5EvusDO67ucsS1lgQ== X-Received: by 2002:a05:6000:103:: with SMTP id o3mr38959958wrx.80.1574161769246; Tue, 19 Nov 2019 03:09:29 -0800 (PST) X-Google-Smtp-Source: APXvYqwGEdtZNfu5Cl0TlzhDkdg4EDSYB4O5TSkwPXihjlKJDCEHDV4AEie5VNyVDfP/e5RhrgXFLw== X-Received: by 2002:a05:6000:103:: with SMTP id o3mr38959932wrx.80.1574161769075; Tue, 19 Nov 2019 03:09:29 -0800 (PST) Received: from gollum.fritz.box ([194.191.228.147]) by smtp.gmail.com with ESMTPSA id v184sm2791039wme.31.2019.11.19.03.09.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 03:09:28 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Eoan/raspi2][PATCH] UBUNTU: [Config] raspi2: Remove upstream mmc modules Date: Tue, 19 Nov 2019 12:09:27 +0100 Message-Id: <20191119110927.10354-1-juergh@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Adam Smith 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 [juergh: - Adjusted context. - Kept CONFIG_MMC_SDHCI_IPROC=m to match rpi-4.19.y.] Signed-off-by: Juerg Haefliger Acked-by: Paolo Pisati Acked-by: Connor Kuehl --- 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 97ac35d4ef61..623eb0a568ac 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -4087,7 +4087,7 @@ CONFIG_MMC=y CONFIG_MMC35240=m # CONFIG_MMC_ALCOR is not set 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