From patchwork Tue Nov 19 11:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1197377 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 47HNPP4FyYz9sR6; Tue, 19 Nov 2019 22:09:13 +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 1iX1Ne-0005pn-5D; Tue, 19 Nov 2019 11:09:10 +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 1iX1Nc-0005pa-Ar for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:09:08 +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 1iX1Nc-0004EG-61 for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:09:08 +0000 Received: by mail-wm1-f70.google.com with SMTP id f191so2241235wme.1 for ; Tue, 19 Nov 2019 03:09:08 -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=AthyGYzlErjJ503VuF41P8H8KTPU0ZA3T6Bi3fPMV2w=; b=QBtuf244hfhQvxi4woC7Y6wPMwnOxeEY7JyJcUvDxcHhcG+r8rpViw3P4xNFvnNd0C lymO2KSvxVwNJ4MOlijZ6fMrigbEZ8T9Ls450cOi8IcwKkdo4awmrLpZ9tXE4zBY9t8R nWVQYc21djDy8h/S1I/VYlfk534aahVlS/1emA/egCTPhQ5h6q5qdytlgCOABTfpLYp4 EghdZi+JbCGVWJ+Ds0pDbV5Ei6CKsMQz4npvHqmn1vKSQ/PeuUZ2bw+xMYqB0qUrI48K C53A7KH/4A9u1uqTGhOX6pr33gsaelZN7Mf0yIUKHpjVYuutFKDvo/T5qm78US/fpelJ TaSA== X-Gm-Message-State: APjAAAUuyPAqh4EgNeQdcN9SEBw8pi0WMWhYDY5zwKI3Rw5NT9jbZkzu t1cxqA7+rKnsCt+6nIuNP0N5OSl1J3eEhoA2aH5hh29P1HmD42f+23LM1WrMpQmFF/Fx8gr79Yg v5BojPl2bELlvwfNWca/QYkukd3JDQaf4An3KRtADVA== X-Received: by 2002:a1c:a556:: with SMTP id o83mr4633655wme.165.1574161747603; Tue, 19 Nov 2019 03:09:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxlX7HLA2L0RIqwe1zo36qFWvpXBeuiHicGVa5IyD2wvRh8ULt+RU6bTXM6IWlzzpq5pDtaaQ== X-Received: by 2002:a1c:a556:: with SMTP id o83mr4633627wme.165.1574161747388; Tue, 19 Nov 2019 03:09:07 -0800 (PST) Received: from gollum.fritz.box ([194.191.228.147]) by smtp.gmail.com with ESMTPSA id 72sm28653529wrl.73.2019.11.19.03.09.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 03:09:06 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Disco/raspi2][PATCH] UBUNTU: [Config] raspi2: Remove upstream mmc modules Date: Tue, 19 Nov 2019 12:09:05 +0100 Message-Id: <20191119110905.10246-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 c650ed157be9..b330320e73b3 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -3700,7 +3700,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