summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-09-03 07:50:53 -0400
committerLaura Abbott <labbott@redhat.com>2019-09-03 07:50:53 -0400
commitf637d98ba5bfcca150375eb2058b04a26bb6ad8e (patch)
treedbdd3d03dbe769efe558f106dd75b234f610e38a
parent02d14b969c07e3f1ff2dea57e99e0e65318ed18d (diff)
downloadkernel-f637d98ba5bfcca150375eb2058b04a26bb6ad8e.tar.gz
kernel-f637d98ba5bfcca150375eb2058b04a26bb6ad8e.tar.xz
kernel-f637d98ba5bfcca150375eb2058b04a26bb6ad8e.zip
Linux v5.3-rc7
-rw-r--r--arm64-Revert-mmc-sdhci-tegra-drop---get_ro-implementation.patch158
-rw-r--r--kernel.spec9
-rw-r--r--sources3
3 files changed, 6 insertions, 164 deletions
diff --git a/arm64-Revert-mmc-sdhci-tegra-drop---get_ro-implementation.patch b/arm64-Revert-mmc-sdhci-tegra-drop---get_ro-implementation.patch
deleted file mode 100644
index 831ec8a18..000000000
--- a/arm64-Revert-mmc-sdhci-tegra-drop---get_ro-implementation.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From patchwork Thu Aug 8 22:24:30 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Dmitry Osipenko <digetx@gmail.com>
-X-Patchwork-Id: 11084925
-Return-Path: <linux-mmc-owner@kernel.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E38C414DB
- for <patchwork-linux-mmc@patchwork.kernel.org>;
- Thu, 8 Aug 2019 22:25:47 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D121728911
- for <patchwork-linux-mmc@patchwork.kernel.org>;
- Thu, 8 Aug 2019 22:25:47 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id C3F6B289AD; Thu, 8 Aug 2019 22:25:47 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI
- autolearn=ham version=3.3.1
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 656C628911
- for <patchwork-linux-mmc@patchwork.kernel.org>;
- Thu, 8 Aug 2019 22:25:47 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S2404695AbfHHWZr (ORCPT
- <rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
- Thu, 8 Aug 2019 18:25:47 -0400
-Received: from mail-lj1-f196.google.com ([209.85.208.196]:39456 "EHLO
- mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1732708AbfHHWZq (ORCPT
- <rfc822;linux-mmc@vger.kernel.org>); Thu, 8 Aug 2019 18:25:46 -0400
-Received: by mail-lj1-f196.google.com with SMTP id v18so90278587ljh.6;
- Thu, 08 Aug 2019 15:25:45 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=20161025;
- h=from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding;
- bh=Q9p8dp4Vwd7zb49ZfmkHjOde2lTf1kQmZ0LZmoXXg+Y=;
- b=X/HCeJp6SdIpegsENNIX5jnBFbtDSt0UzsTUaN0a3V8l4KnCb/S47gsOo5w4dI/NuL
- V5etWewZyguGVw5FG6KZWbW1LS15klZZSFCTiM7xpoSJFKT0PQDSyqOStwc5XptUNDIb
- qgY409tTcnSLMME5LL0QF9qUqJEJ5eul/A29A05dpYuiAE/VlwyFHs9wqNchY3n6E3tm
- PvQ0AGqmCEPC4oalZvcTWwYpZWM+7HKgb3eXOP5yluvevmLCNFylOeAYk+oId8vPdONf
- JOWaRweXeFZl1b7jrY0HUlayIuG7iqV2+q/o6hzKZx9BLRodDP11LPPM9cHiWEb3wN3X
- 4CBA==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding;
- bh=Q9p8dp4Vwd7zb49ZfmkHjOde2lTf1kQmZ0LZmoXXg+Y=;
- b=JGAzGWjuAZo8BCyJ+jFiDtGtbpEogcNiooDB8Q1/3nLH0goLK+zBDHd1O9vjLhGwy2
- AMGb5hZq8/csTSRCwTLpO0XWbLb+GETMzbiW7kBz5wrUIXdMfnxkVrAemaUbPFFPp8jh
- 17jh5PvWtDEfBiixw6hba23owcAHs9TZ6s+6adekP+0J4Rw+hLjVuJQ1J/eIcS8Ea5T5
- 9pj9rHF7cZ+CvccJTgTk45Q6YVjZIVbOTZmvvRTVwNULu29Op2EPzwI9oTVQj75V+RpE
- QFGIAEgayyd0hCaz93b9eC/4UjtpyX3SLjqWLNoa7OgLy2F+D3tQzZ+dzq1ljGT2bwWt
- UnPA==
-X-Gm-Message-State: APjAAAUx1JJ0CXUgSqw4EMqq5ZYk57Si1XVKMzl5tKnOckrzsVCbL18C
- y0L1c2r4HgvumbNZx1lPlCY=
-X-Google-Smtp-Source:
- APXvYqyRb0wvQlmXB+gXw3/gwm+pd7UaBZTu3orpe9dFWQXE6Yy8xkJqi7BlFLmgkM9E0td9w8j+IQ==
-X-Received: by 2002:a2e:9b48:: with SMTP id o8mr9572286ljj.122.1565303144838;
- Thu, 08 Aug 2019 15:25:44 -0700 (PDT)
-Received: from localhost.localdomain ([94.29.34.218])
- by smtp.gmail.com with ESMTPSA id
- g5sm19318415ljj.69.2019.08.08.15.25.43
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Thu, 08 Aug 2019 15:25:43 -0700 (PDT)
-From: Dmitry Osipenko <digetx@gmail.com>
-To: Thierry Reding <thierry.reding@gmail.com>,
- Jonathan Hunter <jonathanh@nvidia.com>,
- Adrian Hunter <adrian.hunter@intel.com>,
- Ulf Hansson <ulf.hansson@linaro.org>
-Cc: linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org,
- linux-kernel@vger.kernel.org
-Subject: [PATCH v1] Revert "mmc: sdhci-tegra: drop ->get_ro() implementation"
-Date: Fri, 9 Aug 2019 01:24:30 +0300
-Message-Id: <20190808222430.28477-1-digetx@gmail.com>
-X-Mailer: git-send-email 2.22.0
-MIME-Version: 1.0
-Sender: linux-mmc-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-mmc.vger.kernel.org>
-X-Mailing-List: linux-mmc@vger.kernel.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The WRITE_PROTECT bit is always in a "protected mode" on Tegra and
-WP-GPIO state need to be used instead. In a case of the GPIO absence,
-write-enable should be assumed. External SD is writable once again as
-a result of this patch because the offending commit changed behaviour for
-the case of a missing WP-GPIO to fall back to WRITE_PROTECT bit-checking,
-which is incorrect for Tegra.
-
-Cc: stable@vger.kernel.org # v5.1+
-Fixes: e8391453e27f ("mmc: sdhci-tegra: drop ->get_ro() implementation")
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Acked-by: Thierry Reding <treding@nvidia.com>
-Acked-by: Adrian Hunter <adrian.hunter@intel.com>
----
- drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index f4d4761cf20a..02d8f524bb9e 100644
---- a/drivers/mmc/host/sdhci-tegra.c
-+++ b/drivers/mmc/host/sdhci-tegra.c
-@@ -258,6 +258,16 @@ static void tegra210_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
- }
- }
-
-+static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
-+{
-+ /*
-+ * Write-enable shall be assumed if GPIO is missing in a board's
-+ * device-tree because SDHCI's WRITE_PROTECT bit doesn't work on
-+ * Tegra.
-+ */
-+ return mmc_gpio_get_ro(host->mmc);
-+}
-+
- static bool tegra_sdhci_is_pad_and_regulator_valid(struct sdhci_host *host)
- {
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -1224,6 +1234,7 @@ static const struct cqhci_host_ops sdhci_tegra_cqhci_ops = {
- };
-
- static const struct sdhci_ops tegra_sdhci_ops = {
-+ .get_ro = tegra_sdhci_get_ro,
- .read_w = tegra_sdhci_readw,
- .write_l = tegra_sdhci_writel,
- .set_clock = tegra_sdhci_set_clock,
-@@ -1279,6 +1290,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra30 = {
- };
-
- static const struct sdhci_ops tegra114_sdhci_ops = {
-+ .get_ro = tegra_sdhci_get_ro,
- .read_w = tegra_sdhci_readw,
- .write_w = tegra_sdhci_writew,
- .write_l = tegra_sdhci_writel,
-@@ -1332,6 +1344,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra124 = {
- };
-
- static const struct sdhci_ops tegra210_sdhci_ops = {
-+ .get_ro = tegra_sdhci_get_ro,
- .read_w = tegra_sdhci_readw,
- .write_w = tegra210_sdhci_writew,
- .write_l = tegra_sdhci_writel,
-@@ -1366,6 +1379,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
- };
-
- static const struct sdhci_ops tegra186_sdhci_ops = {
-+ .get_ro = tegra_sdhci_get_ro,
- .read_w = tegra_sdhci_readw,
- .write_l = tegra_sdhci_writel,
- .set_clock = tegra_sdhci_set_clock,
diff --git a/kernel.spec b/kernel.spec
index 015c0ab06..96642e2d7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 6
+%global rcrev 7
# The git snapshot level
-%define gitrev 2
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -558,8 +558,6 @@ Patch306: arm-sdhci-esdhc-imx-fixes.patch
Patch320: arm64-tegra-jetson-tx1-fixes.patch
# https://www.spinics.net/lists/linux-tegra/msg43110.html
Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
-# https://patchwork.kernel.org/patch/11084925/
-Patch322: arm64-Revert-mmc-sdhci-tegra-drop---get_ro-implementation.patch
# 400 - IBM (ppc/s390x) patches
@@ -1775,6 +1773,9 @@ fi
#
#
%changelog
+* Tue Sep 03 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc7.git0.1
+- Linux v5.3-rc7
+
* Tue Sep 03 2019 Laura Abbott <labbott@redhat.com>
- Disable debugging options.
diff --git a/sources b/sources
index ce06fc408..0b91ba899 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
-SHA512 (patch-5.3-rc6.xz) = 67863e79064488873309ac99b8691d3e9afa230900532675c8b8699768b2eba21409aceb0925dfc7e8a2403aed2b3de3d3fcd3c9fde08435cd4e4a643dc79a70
-SHA512 (patch-5.3-rc6-git2.xz) = b9a11e72fa6c66a68f0fec36ebf616baa6a72071e62932b29577d352eef5549538b9170581c088f055757c2d0b7292f5a06805e4917475cc707eb272ec2b1379
+SHA512 (patch-5.3-rc7.xz) = ffd7c60bf69a2a9b7673dbf351845e7ba9ad3f75775dede63f6ff346ff3fc9810b26399a8f3db0c2ed2bbdcc24de9367b260a56005e0bbca7cefcba95a4b50df