From patchwork Tue Nov 19 11:08:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1197376 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 47HNP74Q3Yz9sPn; Tue, 19 Nov 2019 22:08:59 +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 1iX1NI-0005nK-UA; Tue, 19 Nov 2019 11:08:48 +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 1iX1NI-0005nD-2o for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:08:48 +0000 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iX1NH-0004Ck-U3 for kernel-team@lists.ubuntu.com; Tue, 19 Nov 2019 11:08:47 +0000 Received: by mail-wm1-f72.google.com with SMTP id i23so2082258wmb.3 for ; Tue, 19 Nov 2019 03:08:47 -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=ha7WbIhvt+KD0O8FhF2yiIbtHa5Gx3vDPdepQ2A+fk8=; b=sn4ertOcSqQh7j9oXADPQcu8MdfyIXU/uBcOHGpjL6k98JRbRGk/t5SsTpVIwyMonK 0zrdJ1bgiabbzZP3wILAP4eiL+g98SRJt0ky90XxbqFePtS1xysO0Xw9Z5TNmoIbiUvM 7Fkuvj5OgCXK2GE67T5cjh0fMpGjknMFkR7R+WwwWZFCD83O6CwVwVeaaLPAR+tEOijQ Ip1FVY7H1rltaqeTZaJfaWl6gZniHQaH6JKosI+MNQiPB9wHdyh9U6odyYfYGxWHUyV0 vT2GjslXUYjRiUyGxrCX10DDgsT+awRN9FzMiPAVDJeS59GCTJKYqiaHCHkFeFpgt43G 1U9Q== X-Gm-Message-State: APjAAAWGrCrqQczhpIT6nORcF5YK92Xxv4wDUFdwt/MpnCfpNa8ZsxQn WghfvjiHghnK2dDZgpYbygHdfUqimvJJU+GeF6f+A9QCAYujVsEpB09PD99mdhLOXu57vc1o+XQ EgBEiENbwiOrhe4rEwklIkJx4fZxojaMMwwAJXnly9w== X-Received: by 2002:adf:f18c:: with SMTP id h12mr17191008wro.122.1574161727469; Tue, 19 Nov 2019 03:08:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwCZoWpa4Rko0IEM1SJDCLCPnign9Llv4mEKDtu1sBZZDQpytxVx7HvutLAaXDUyNqVOFqs6Q== X-Received: by 2002:adf:f18c:: with SMTP id h12mr17190980wro.122.1574161727219; Tue, 19 Nov 2019 03:08:47 -0800 (PST) Received: from gollum.fritz.box ([194.191.228.147]) by smtp.gmail.com with ESMTPSA id d11sm26785656wrn.28.2019.11.19.03.08.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 03:08:46 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic/raspi2][PATCH] UBUNTU: [Config] raspi2: Remove upstream mmc modules Date: Tue, 19 Nov 2019 12:08:45 +0100 Message-Id: <20191119110845.10137-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 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