Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-11-01 07:05:02 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-11-01 07:05:02 +0100
commit45884c0c5e1310ca3c8d69237f6316691b3fc830 (patch)
treeefdb55f34c8f9315aaad92b1ba30d5f61a96660f
parentc5aea2424ca0b2f08cfde4a2d30eefe45308195d (diff)
parentf773242a6f6fcd2cbd2ae5d118018b81862e04a8 (diff)
Merge branch 'SLE15' into SLE15-AZURE
-rw-r--r--blacklist.conf3
-rw-r--r--patches.drivers/spi-bcm-qspi-switch-back-to-reading-flash-using-smal.patch53
-rw-r--r--patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch115
-rw-r--r--patches.drivers/spi-sh-msiof-fix-deferred-probing.patch41
-rw-r--r--patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch4
-rw-r--r--series.conf3
6 files changed, 217 insertions, 2 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 4e1f3f276c..30bec138ed 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -880,3 +880,6 @@ af424a410749ed7e0c2bffd3cedbc7c274d0ff6f # usb: dwc2: breaks kABI
e7c52b84fb18f08ce49b6067ae6285aca79084a8 # kasan fix
ad1a56f1bf2bd2394f98320baf9ad430f7b1534c # We don't carry the reverted patch.
d60996ab430c8a6033a0944c068edc5ec5becb9b # Duplicate of 3af71f649d22f359790b4032446456a967a81742
+c894696188d5c2af1e636e458190e80c53fb893d # rtlwifi: the target function doesn't exist yet
+16d571bb0fe6aa7fed82e19166ca1542026c9c06 # rt2x00: not cleanly applicable, merely optimization
+d59d2f9995d28974877750f429e821324bd603c7 # r8822be: not present in SLE15
diff --git a/patches.drivers/spi-bcm-qspi-switch-back-to-reading-flash-using-smal.patch b/patches.drivers/spi-bcm-qspi-switch-back-to-reading-flash-using-smal.patch
new file mode 100644
index 0000000000..51b992d9e9
--- /dev/null
+++ b/patches.drivers/spi-bcm-qspi-switch-back-to-reading-flash-using-smal.patch
@@ -0,0 +1,53 @@
+From 940ec770c295682993d1cccce3081fd7c74fece8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 11 Oct 2018 09:42:17 +0200
+Subject: [PATCH] spi: bcm-qspi: switch back to reading flash using smaller chunks
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 940ec770c295682993d1cccce3081fd7c74fece8
+Patch-mainline: v4.20-rc1
+References: bsc#1051510
+
+Fixing/optimizing bcm_qspi_bspi_read() performance introduced two
+Changes:
+1) It added a loop to read all requested data using multiple BSPI ops.
+2) It bumped max size of a single BSPI block request from 256 to 512 B.
+
+The later change resulted in occasional BSPI timeouts causing a
+regression.
+
+For some unknown reason hardware doesn't always handle reads as expected
+when using 512 B chunks. In such cases it may happen that BSPI returns
+amount of requested bytes without the last 1-3 ones. It provides the
+remaining bytes later but doesn't raise an interrupt until another LR
+start.
+
+Switching back to 256 B reads fixes that problem and regression.
+
+Fixes: 345309fa7c0c ("spi: bcm-qspi: Fix bcm_qspi_bspi_read() performance")
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: stable@vger.kernel.org
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi-bcm-qspi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
+index eb3d67f01e8c..584bcb018a62 100644
+--- a/drivers/spi/spi-bcm-qspi.c
++++ b/drivers/spi/spi-bcm-qspi.c
+@@ -89,7 +89,7 @@
+ #define BSPI_BPP_MODE_SELECT_MASK BIT(8)
+ #define BSPI_BPP_ADDR_SELECT_MASK BIT(16)
+
+-#define BSPI_READ_LENGTH 512
++#define BSPI_READ_LENGTH 256
+
+ /* MSPI register offsets */
+ #define MSPI_SPCR0_LSB 0x000
+--
+2.19.1
+
diff --git a/patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch b/patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch
new file mode 100644
index 0000000000..82992195c1
--- /dev/null
+++ b/patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch
@@ -0,0 +1,115 @@
+From 0fd85869c2a9c8723a98bc1f56a876e8383649f4 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 28 Aug 2018 13:44:11 +0200
+Subject: [PATCH] spi/bcm63xx-hsspi: keep pll clk enabled
+Git-commit: 0fd85869c2a9c8723a98bc1f56a876e8383649f4
+Patch-mainline: v4.20-rc1
+References: bsc#1051510
+
+If the pll clock needs to be enabled to get its rate, it will also need
+to be enabled to provide it. So ensure it is kept enabled through the
+lifetime of the device.
+
+Fixes: 0d7412ed1f5dc ("spi/bcm63xx-hspi: Enable the clock before calling clk_get_rate().")
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi-bcm63xx-hsspi.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
+index c23849f7aa7b..9a06ffdb73b8 100644
+--- a/drivers/spi/spi-bcm63xx-hsspi.c
++++ b/drivers/spi/spi-bcm63xx-hsspi.c
+@@ -101,6 +101,7 @@ struct bcm63xx_hsspi {
+
+ struct platform_device *pdev;
+ struct clk *clk;
++ struct clk *pll_clk;
+ void __iomem *regs;
+ u8 __iomem *fifo;
+
+@@ -332,7 +333,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
+ struct resource *res_mem;
+ void __iomem *regs;
+ struct device *dev = &pdev->dev;
+- struct clk *clk;
++ struct clk *clk, *pll_clk = NULL;
+ int irq, ret;
+ u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS;
+
+@@ -358,7 +359,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
+
+ rate = clk_get_rate(clk);
+ if (!rate) {
+- struct clk *pll_clk = devm_clk_get(dev, "pll");
++ pll_clk = devm_clk_get(dev, "pll");
+
+ if (IS_ERR(pll_clk)) {
+ ret = PTR_ERR(pll_clk);
+@@ -373,19 +374,20 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
+ clk_disable_unprepare(pll_clk);
+ if (!rate) {
+ ret = -EINVAL;
+- goto out_disable_clk;
++ goto out_disable_pll_clk;
+ }
+ }
+
+ master = spi_alloc_master(&pdev->dev, sizeof(*bs));
+ if (!master) {
+ ret = -ENOMEM;
+- goto out_disable_clk;
++ goto out_disable_pll_clk;
+ }
+
+ bs = spi_master_get_devdata(master);
+ bs->pdev = pdev;
+ bs->clk = clk;
++ bs->pll_clk = pll_clk;
+ bs->regs = regs;
+ bs->speed_hz = rate;
+ bs->fifo = (u8 __iomem *)(bs->regs + HSSPI_FIFO_REG(0));
+@@ -440,6 +442,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
+
+ out_put_master:
+ spi_master_put(master);
++out_disable_pll_clk:
++ clk_disable_unprepare(pll_clk);
+ out_disable_clk:
+ clk_disable_unprepare(clk);
+ return ret;
+@@ -453,6 +457,7 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)
+
+ /* reset the hardware and block queue progress */
+ __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
++ clk_disable_unprepare(bs->pll_clk);
+ clk_disable_unprepare(bs->clk);
+
+ return 0;
+@@ -465,6 +470,7 @@ static int bcm63xx_hsspi_suspend(struct device *dev)
+ struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
+
+ spi_master_suspend(master);
++ clk_disable_unprepare(bs->pll_clk);
+ clk_disable_unprepare(bs->clk);
+
+ return 0;
+@@ -480,6 +486,12 @@ static int bcm63xx_hsspi_resume(struct device *dev)
+ if (ret)
+ return ret;
+
++ if (bs->pll_clk) {
++ ret = clk_prepare_enable(bs->pll_clk);
++ if (ret)
++ return ret;
++ }
++
+ spi_master_resume(master);
+
+ return 0;
+--
+2.19.1
+
diff --git a/patches.drivers/spi-sh-msiof-fix-deferred-probing.patch b/patches.drivers/spi-sh-msiof-fix-deferred-probing.patch
new file mode 100644
index 0000000000..06fab960cb
--- /dev/null
+++ b/patches.drivers/spi-sh-msiof-fix-deferred-probing.patch
@@ -0,0 +1,41 @@
+From f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69 Mon Sep 17 00:00:00 2001
+From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Date: Fri, 12 Oct 2018 22:48:22 +0300
+Subject: [PATCH] spi: sh-msiof: fix deferred probing
+Git-commit: f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69
+Patch-mainline: v4.20-rc1
+References: bsc#1051510
+
+Since commit 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq")
+platform_get_irq() can return -EPROBE_DEFER. However, the driver overrides
+an error returned by that function with -ENOENT which breaks the deferred
+probing. Propagate upstream an error code returned by platform_get_irq()
+and remove the bogus "platform" from the error message, while at it...
+
+Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq")
+Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi-sh-msiof.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
+index 101cd6aae2ea..30ea0a2068e0 100644
+--- a/drivers/spi/spi-sh-msiof.c
++++ b/drivers/spi/spi-sh-msiof.c
+@@ -1343,8 +1343,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
+
+ i = platform_get_irq(pdev, 0);
+ if (i < 0) {
+- dev_err(&pdev->dev, "cannot get platform IRQ\n");
+- ret = -ENOENT;
++ dev_err(&pdev->dev, "cannot get IRQ\n");
++ ret = i;
+ goto err1;
+ }
+
+--
+2.19.1
+
diff --git a/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch b/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
index a3c0e294d7..b7df52a28c 100644
--- a/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
+++ b/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
@@ -2,8 +2,8 @@ From 435198f33b56d7b875a8173a0227ddf0de285aa1 Mon Sep 17 00:00:00 2001
From: James Zhu <jzhums@gmail.com>
Date: Fri, 10 Aug 2018 00:31:39 +0800
Subject: [PATCH] drm/amdgpu: update tmr mc address
-References: bsc#1100132
-Patch-mainline: v4.18-rc7
+References: bsc#1106110
+Patch-mainline: v4.19-rc1
Git-commit: 435198f33b56d7b875a8173a0227ddf0de285aa1
Update tmr mc address with firmware loading address
diff --git a/series.conf b/series.conf
index 625fa9a1b6..718d10ac8b 100644
--- a/series.conf
+++ b/series.conf
@@ -18301,6 +18301,9 @@
patches.fixes/cdrom-fix-improper-type-cast-which-can-leat-to-infor.patch
patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
+ patches.drivers/spi-bcm-qspi-switch-back-to-reading-flash-using-smal.patch
+ patches.drivers/spi-sh-msiof-fix-deferred-probing.patch
+ patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch
patches.drivers/ACPI-processor-Fix-the-return-value-of-acpi_processo.patch
patches.drivers/iwlwifi-mvm-send-BCAST-management-frames-to-the-righ.patch
patches.drivers/iwlwifi-dbg-don-t-crash-if-the-firmware-crashes-in-t.patch