August 2020 - Linux-stable-mirror

[PATCH] ALSA: hda: avoid reset of sdo_limit

by Sameer Pujar

By default 'sdo_limit' is initialized with a default value of '8' as per spec. This is overridden in cases where a different value is required. However this is getting reset when snd_hdac_bus_init_chip() is called again, which happens during runtime PM cycle. Avoid reset by not initializing to default value everytime. Fixes: 67ae482a59e9 ("ALSA: hda: add member to store ratio for stripe control") Cc: <stable(a)vger.kernel.org> Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> --- sound/hda/hdac_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 011b17c..0e26e96 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -538,7 +538,8 @@ bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset) * { ((num_channels * bits_per_sample * rate/48000) / * number of SDOs) >= 8 } */ - bus->sdo_limit = 8; + if (!bus->sdo_limit) + bus->sdo_limit = 8; return true; } -- 2.7.4

4 years, 4 months

2
2
0 0

FAILED: patch "[PATCH] pinctrl: ingenic: Properly detect GPIO direction when" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 84e7a946da71f678affacea301f6d5cb4d9784e8 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul(a)crapouillou.net> Date: Mon, 22 Jun 2020 23:45:48 +0200 Subject: [PATCH] pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PAT1 register contains information about the IRQ type (edge/level) for input GPIOs with IRQ enabled, and the direction for non-IRQ GPIOs. So it makes sense to read it only if the GPIO has no interrupt configured, otherwise input GPIOs configured for level IRQs are misdetected as output GPIOs. Fixes: ebd6651418b6 ("pinctrl: ingenic: Implement .get_direction for GPIO chips") Reported-by: João Henrique <johnnyonflame(a)hotmail.com> Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20200622214548.265417-2-paul@crapouillou.net Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 241e563d5814..a8d1b53ec4c1 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -1958,7 +1958,8 @@ static int ingenic_gpio_get_direction(struct gpio_chip *gc, unsigned int offset) unsigned int pin = gc->base + offset; if (jzpc->info->version >= ID_JZ4760) { - if (ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1)) + if (ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_INT) || + ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1)) return GPIO_LINE_DIRECTION_IN; return GPIO_LINE_DIRECTION_OUT; }

4 years, 4 months

3
2
0 0

submission for 5.4 LTS

by Mike Marshall

upstream commit id: ec95f1dedc9c64ac5a8b0bdb7c276936c70fdedd I verified that ec95f1de "orangefs: get rid of knob code..." will apply to 5.4 and I compiled and ran a patched 5.4 kernel against my normal xfstests... I wish that ec95f1de could be in the 5.4 long term stable kernel. ec95f1de went upstream in 5.7. When I sent up the patch it was just a theoretical race condition to me: I accepted what Christoph said about it. We now have experienced in-the-real-world how important the patch is... Someone was trying to read a whole large (more than 100 meg) file from orangefs into some kind of cloud bucket. The resulting read failed with a "Bad address" error. I immediately thought of this patch. I reproduced the "Bad address" error with dd in kernel versions that lack ec95f1de. The "Bad address" error does not occur in kernels that include ec95f1de: 5.7.11-100.fc31.x86_64: $ ./wr.sh 10000000 > /pvfsmnt/wr.10000000 $ dd if=/pvfsmnt/wr.10000000 of=/tmp/wr.10000000 count=10 bs=419430400 $ ls -l /pvfsmnt/wr.10000000 /tmp/wr.10000000 -rw-rw-r--. 1 hubcap hubcap 498888897 Aug 14 15:41 /pvfsmnt/wr.10000000 -rw-rw-r--. 1 hubcap hubcap 498888897 Aug 14 16:51 /tmp/wr.10000000 $ md5sum /pvfsmnt/wr.10000000 /tmp/wr.10000000 669daa04f91f561f5fb2851fb30e4ffe /pvfsmnt/wr.10000000 669daa04f91f561f5fb2851fb30e4ffe /tmp/wr.10000000 5.6.0hubcap: $ ./wr.sh 10000000 > /pvfsmnt/wr.10000000 $ dd if=/pvfsmnt/wr.10000000 of=/tmp/wr.10000000 count=10 bs=419430400 dd: error reading '/pvfsmnt/wr.10000000': Bad address 0+0 records in 0+0 records out 0 bytes copied, 10.3365 s, 0.0 kB/s Thanks! -Mike

4 years, 4 months

2
2
0 0

stable-rc/linux-5.7.y baseline: 198 runs, 5 regressions (v5.7.16)

by kernelci.org bot

stable-rc/linux-5.7.y baseline: 198 runs, 5 regressions (v5.7.16) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results -------------------------+-------+---------------+----------+--------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 3/4 exynos5422-odroidxu3 | arm | lab-collabora | gcc-8 | exynos_defconfig | 0/1 imx6q-var-dt6customboard | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 2/4 Details: https://kernelci.org/test/job/stable-rc/branch/linux-5.7.y/kernel/v5.7.16/p… Test: baseline Tree: stable-rc Branch: linux-5.7.y Describe: v5.7.16 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: d036b5d2dd8fa3de540ec3357f657c436ce1d626 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results -------------------------+-------+---------------+----------+--------------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f3cf779968a8a3b51d99a45 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/sama5_defco… HTML log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/sama5_defco… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/armel/basel… * baseline.login: https://kernelci.org/test/case/id/5f3cf779968a8a3b51d99a46 failing since 33 days (last pass: v5.7.8-167-gc2fb28a4b6e4, first fail: v5.7.9) platform | arch | lab | compiler | defconfig | results -------------------------+-------+---------------+----------+--------------------+-------- bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 3/4 Details: https://kernelci.org/test/plan/id/5f3cf8006800182068d99a77 Results: 3 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm64/defconfig… HTML log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm64/defconfig… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/arm64/basel… * baseline.dmesg.crit: https://kernelci.org/test/case/id/5f3cf8006800182068d99a79 failing since 1 day (last pass: v5.7.15, first fail: v5.7.15-381-g4832c39ae70e) 3 lines 2020-08-19 09:59:12.060000 / # 2020-08-19 09:59:12.064000 2020-08-19 09:59:12.172000 / # # 2020-08-19 09:59:12.175000 # 2020-08-19 09:59:13.441000 / # export SHELL=/bin/sh 2020-08-19 09:59:13.454000 export SHELL=/bin/sh 2020-08-19 09:59:14.961000 / # . /lava-4099/environment 2020-08-19 09:59:14.972000 . /lava-4099/environment 2020-08-19 09:59:17.692000 / # /lava-4099/bin/lava-test-runner /lava-4099/0 2020-08-19 09:59:17.705000 /lava-4099/bin/lava-test-runner /la[ 62.143696] hwmon hwmon1: Undervoltage detected! ... (11 line(s) more) platform | arch | lab | compiler | defconfig | results -------------------------+-------+---------------+----------+--------------------+-------- exynos5422-odroidxu3 | arm | lab-collabora | gcc-8 | exynos_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f3d0619482ed55850d99a3d Results: 0 PASS, 1 FAIL, 0 SKIP Full config: exynos_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/exynos_defc… HTML log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/exynos_defc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/armel/basel… * baseline.login: https://kernelci.org/test/case/id/5f3d0619482ed55850d99a3e new failure (last pass: v5.7.15-394-g833b53db2607) platform | arch | lab | compiler | defconfig | results -------------------------+-------+---------------+----------+--------------------+-------- imx6q-var-dt6customboard | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 2/4 Details: https://kernelci.org/test/plan/id/5f3cfb8dbd08dee251d99a50 Results: 2 PASS, 2 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/multi_v7_de… HTML log: https://storage.kernelci.org//stable-rc/linux-5.7.y/v5.7.16/arm/multi_v7_de… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/armel/basel… * baseline.dmesg.alert: https://kernelci.org/test/case/id/5f3cfb8dbd08dee251d99a53 new failure (last pass: v5.7.15-394-g833b53db2607) 4 lines 2020-08-19 10:13:22.377000 kern :alert : 8<--- cut here --- 2020-08-19 10:13:22.377000 kern :alert : Unhandled fault: alignment exception (0x001) at 0xcec60207 2020-08-19 10:13:22.378000 kern :alert : pgd = (ptrval) 2020-08-19 10:13:22.378000 kern :alert : [cec60207] *pgd=1ec1141e(bad) * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f3cfb8dbd08dee251d99a54 new failure (last pass: v5.7.15-394-g833b53db2607) 15 lines 2020-08-19 10:13:22.420000 kern :emerg : Internal error: : 1 [#1] SMP ARM 2020-08-19 10:13:22.420000 kern :emerg : Process kworker/1:2 (pid: 79, stack limit = 0x(ptrval)) 2020-08-19 10:13:22.421000 kern :emerg : Stack: (0xedc0feb0 to 0xedc10000) 2020-08-19 10:13:22.421000 kern :emerg : fea0: c0388ae4 00000000 ffffe000 cec60207 2020-08-19 10:13:22.421000 kern :emerg : fec0: 00000000 00000000 00000003 00000000 00000000 6adf3990 cec601ff ed09f040 2020-08-19 10:13:22.421000 kern :emerg : fee0: ed09f094 cec6008f 00000000 c0985624 fffffc90 fffffc90 ed1f5000 ef7ad400 2020-08-19 10:13:22.463000 kern :emerg : ff00: 00000000 c19b4330 00000000 c09857f8 ed1f5190 ed9d5700 ef7aa200 c0361e80 2020-08-19 10:13:22.463000 kern :emerg : ff20: ee927200 ef7aa200 00000008 ed9d5700 ed9d5714 ef7aa200 00000008 c1803d00 2020-08-19 10:13:22.464000 kern :emerg : ff40: ef7aa218 ef7aa200 ffffe000 c0362464 ee927200 c19b3b8c c136d8ac ed9d5700 2020-08-19 10:13:22.464000 kern :emerg : ff60: c03621bc eee5d480 ed9d4a40 00000000 edc0e000 ed9d5700 c03621bc ee915ea4 ... (5 line(s) more)

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] drm/panel-simple: Fix inverted V/H SYNC for Frida" failed to apply to 5.7-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.7-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bad20a2dbfdfaf01560026909506b6ed69d65ba2 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul(a)crapouillou.net> Date: Thu, 16 Jul 2020 14:56:46 +0200 Subject: [PATCH] drm/panel-simple: Fix inverted V/H SYNC for Frida FRD350H54004 panel The FRD350H54004 panel was marked as having active-high VSYNC and HSYNC signals, which sorts-of worked, but resulted in the picture fading out under certain circumstances. Fix this issue by marking VSYNC and HSYNC signals active-low. v2: Rebase on drm-misc-next Fixes: 7b6bd8433609 ("drm/panel: simple: Add support for the Frida FRD350H54004 panel") Cc: stable(a)vger.kernel.org # v5.5 Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200716125647.10964-1-paul@c… diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index f42249b72548..8b0bab9dd075 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1763,7 +1763,7 @@ static const struct drm_display_mode frida_frd350h54004_mode = { .vsync_start = 240 + 2, .vsync_end = 240 + 2 + 6, .vtotal = 240 + 2 + 6 + 2, - .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; static const struct panel_desc frida_frd350h54004 = {

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] drm/panel-simple: Fix inverted V/H SYNC for Frida" failed to apply to 5.8-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.8-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bad20a2dbfdfaf01560026909506b6ed69d65ba2 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul(a)crapouillou.net> Date: Thu, 16 Jul 2020 14:56:46 +0200 Subject: [PATCH] drm/panel-simple: Fix inverted V/H SYNC for Frida FRD350H54004 panel The FRD350H54004 panel was marked as having active-high VSYNC and HSYNC signals, which sorts-of worked, but resulted in the picture fading out under certain circumstances. Fix this issue by marking VSYNC and HSYNC signals active-low. v2: Rebase on drm-misc-next Fixes: 7b6bd8433609 ("drm/panel: simple: Add support for the Frida FRD350H54004 panel") Cc: stable(a)vger.kernel.org # v5.5 Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200716125647.10964-1-paul@c… diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index f42249b72548..8b0bab9dd075 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1763,7 +1763,7 @@ static const struct drm_display_mode frida_frd350h54004_mode = { .vsync_start = 240 + 2, .vsync_end = 240 + 2 + 6, .vtotal = 240 + 2 + 6 + 2, - .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; static const struct panel_desc frida_frd350h54004 = {

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] drm/imx: imx-ldb: Disable both channels for split mode in" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3b2a999582c467d1883716b37ffcc00178a13713 Mon Sep 17 00:00:00 2001 From: Liu Ying <victor.liu(a)nxp.com> Date: Thu, 9 Jul 2020 10:28:52 +0800 Subject: [PATCH] drm/imx: imx-ldb: Disable both channels for split mode in enc->disable() Both of the two LVDS channels should be disabled for split mode in the encoder's ->disable() callback, because they are enabled in the encoder's ->enable() callback. Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging") Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Pengutronix Kernel Team <kernel(a)pengutronix.de> Cc: NXP Linux Team <linux-imx(a)nxp.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Liu Ying <victor.liu(a)nxp.com> Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 909682a74474..8791d60be92e 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -296,18 +296,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder) { struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; + int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int mux, ret; drm_panel_disable(imx_ldb_ch->panel); - if (imx_ldb_ch == &ldb->channel[0]) + if (imx_ldb_ch == &ldb->channel[0] || dual) ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; - else if (imx_ldb_ch == &ldb->channel[1]) + if (imx_ldb_ch == &ldb->channel[1] || dual) ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl); - if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) { + if (dual) { clk_disable_unprepare(ldb->clk[0]); clk_disable_unprepare(ldb->clk[1]); }

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] drm/imx: imx-ldb: Disable both channels for split mode in" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3b2a999582c467d1883716b37ffcc00178a13713 Mon Sep 17 00:00:00 2001 From: Liu Ying <victor.liu(a)nxp.com> Date: Thu, 9 Jul 2020 10:28:52 +0800 Subject: [PATCH] drm/imx: imx-ldb: Disable both channels for split mode in enc->disable() Both of the two LVDS channels should be disabled for split mode in the encoder's ->disable() callback, because they are enabled in the encoder's ->enable() callback. Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging") Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Pengutronix Kernel Team <kernel(a)pengutronix.de> Cc: NXP Linux Team <linux-imx(a)nxp.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Liu Ying <victor.liu(a)nxp.com> Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 909682a74474..8791d60be92e 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -296,18 +296,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder) { struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; + int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int mux, ret; drm_panel_disable(imx_ldb_ch->panel); - if (imx_ldb_ch == &ldb->channel[0]) + if (imx_ldb_ch == &ldb->channel[0] || dual) ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; - else if (imx_ldb_ch == &ldb->channel[1]) + if (imx_ldb_ch == &ldb->channel[1] || dual) ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl); - if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) { + if (dual) { clk_disable_unprepare(ldb->clk[0]); clk_disable_unprepare(ldb->clk[1]); }

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] drm/ast: Initialize DRAM type before posting GPU" failed to apply to 5.8-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.8-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 244d012801dae30c91983b360457c78d481584b0 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann <tzimmermann(a)suse.de> Date: Thu, 16 Jul 2020 14:53:52 +0200 Subject: [PATCH] drm/ast: Initialize DRAM type before posting GPU Posting the GPU requires the correct DRAM type to be stored in struct ast_private. Therefore first initialize the DRAM info and then post the GPU. This restores the original order of instructions in this function. Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> Reviewed-by: Sam Ravnborg <sam(a)ravnborg.org> Acked-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Fixes: bad09da6deab ("drm/ast: Fixed vram size incorrect issue on POWER") Cc: Joel Stanley <joel(a)jms.id.au> Cc: Y.C. Chen <yc_chen(a)aspeedtech.com> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Emil Velikov <emil.l.velikov(a)gmail.com> Cc: "Y.C. Chen" <yc_chen(a)aspeedtech.com> Cc: <stable(a)vger.kernel.org> # v4.11+ Link: https://patchwork.freedesktop.org/patch/msgid/20200716125353.31512-6-tzimme… diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index b162cc82204d..87e5baded2a7 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -418,15 +418,15 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) ast_detect_chip(dev, &need_post); - if (need_post) - ast_post_gpu(dev); - ret = ast_get_dram_info(dev); if (ret) goto out_free; drm_info(dev, "dram MCLK=%u Mhz type=%d bus_width=%d\n", ast->mclk, ast->dram_type, ast->dram_bus_width); + if (need_post) + ast_post_gpu(dev); + ret = ast_mm_init(ast); if (ret) goto out_free;

4 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] libnvdimm: Validate command family indices" failed to apply to 5.7-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.7-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 92fe2aa859f52ce6aa595ca97fec110dc7100e63 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams(a)intel.com> Date: Mon, 20 Jul 2020 15:07:30 -0700 Subject: [PATCH] libnvdimm: Validate command family indices The ND_CMD_CALL format allows for a general passthrough of passlisted commands targeting a given command set. However there is no validation of the family index relative to what the bus supports. - Update the NFIT bus implementation (the only one that supports ND_CMD_CALL passthrough) to also passlist the valid set of command family indices. - Update the generic __nd_ioctl() path to validate that field on behalf of all implementations. Fixes: 31eca76ba2fc ("nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanism") Cc: Vishal Verma <vishal.l.verma(a)intel.com> Cc: Dave Jiang <dave.jiang(a)intel.com> Cc: Ira Weiny <ira.weiny(a)intel.com> Cc: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> Cc: Len Brown <lenb(a)kernel.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Signed-off-by: Vishal Verma <vishal.l.verma(a)intel.com> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 7c138a4edc03..1f72ce1a782b 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -1823,6 +1823,7 @@ static void populate_shutdown_status(struct nfit_mem *nfit_mem) static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, struct nfit_mem *nfit_mem, u32 device_handle) { + struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc; struct acpi_device *adev, *adev_dimm; struct device *dev = acpi_desc->dev; unsigned long dsm_mask, label_mask; @@ -1834,6 +1835,7 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, /* nfit test assumes 1:1 relationship between commands and dsms */ nfit_mem->dsm_mask = acpi_desc->dimm_cmd_force_en; nfit_mem->family = NVDIMM_FAMILY_INTEL; + set_bit(NVDIMM_FAMILY_INTEL, &nd_desc->dimm_family_mask); if (dcr->valid_fields & ACPI_NFIT_CONTROL_MFG_INFO_VALID) sprintf(nfit_mem->id, "%04x-%02x-%04x-%08x", @@ -1886,10 +1888,13 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, * Note, that checking for function0 (bit0) tells us if any commands * are reachable through this GUID. */ + clear_bit(NVDIMM_FAMILY_INTEL, &nd_desc->dimm_family_mask); for (i = 0; i <= NVDIMM_FAMILY_MAX; i++) - if (acpi_check_dsm(adev_dimm->handle, to_nfit_uuid(i), 1, 1)) + if (acpi_check_dsm(adev_dimm->handle, to_nfit_uuid(i), 1, 1)) { + set_bit(i, &nd_desc->dimm_family_mask); if (family < 0 || i == default_dsm_family) family = i; + } /* limit the supported commands to those that are publicly documented */ nfit_mem->family = family; @@ -2153,6 +2158,9 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en; nd_desc->bus_dsm_mask = acpi_desc->bus_nfit_cmd_force_en; + set_bit(ND_CMD_CALL, &nd_desc->cmd_mask); + set_bit(NVDIMM_BUS_FAMILY_NFIT, &nd_desc->bus_family_mask); + adev = to_acpi_dev(acpi_desc); if (!adev) return; @@ -2160,7 +2168,6 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) for (i = ND_CMD_ARS_CAP; i <= ND_CMD_CLEAR_ERROR; i++) if (acpi_check_dsm(adev->handle, guid, 1, 1ULL << i)) set_bit(i, &nd_desc->cmd_mask); - set_bit(ND_CMD_CALL, &nd_desc->cmd_mask); dsm_mask = (1 << ND_CMD_ARS_CAP) | diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h index f5525f8bb770..5c5e7ebba8dc 100644 --- a/drivers/acpi/nfit/nfit.h +++ b/drivers/acpi/nfit/nfit.h @@ -33,7 +33,6 @@ | ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \ | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED) -#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV #define NVDIMM_CMD_MAX 31 #define NVDIMM_STANDARD_CMDMASK \ diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 09087c38fabd..955265656b96 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -1037,9 +1037,25 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, dimm_name = "bus"; } + /* Validate command family support against bus declared support */ if (cmd == ND_CMD_CALL) { + unsigned long *mask; + if (copy_from_user(&pkg, p, sizeof(pkg))) return -EFAULT; + + if (nvdimm) { + if (pkg.nd_family > NVDIMM_FAMILY_MAX) + return -EINVAL; + mask = &nd_desc->dimm_family_mask; + } else { + if (pkg.nd_family > NVDIMM_BUS_FAMILY_MAX) + return -EINVAL; + mask = &nd_desc->bus_family_mask; + } + + if (!test_bit(pkg.nd_family, mask)) + return -EINVAL; } if (!desc || diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index 18da4059be09..bd39a2cf7972 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -78,6 +78,8 @@ struct nvdimm_bus_descriptor { const struct attribute_group **attr_groups; unsigned long bus_dsm_mask; unsigned long cmd_mask; + unsigned long dimm_family_mask; + unsigned long bus_family_mask; struct module *module; char *provider_name; struct device_node *of_node; diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h index 0e09dc5cec19..e9468b9332bd 100644 --- a/include/uapi/linux/ndctl.h +++ b/include/uapi/linux/ndctl.h @@ -245,6 +245,10 @@ struct nd_cmd_pkg { #define NVDIMM_FAMILY_MSFT 3 #define NVDIMM_FAMILY_HYPERV 4 #define NVDIMM_FAMILY_PAPR 5 +#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_PAPR + +#define NVDIMM_BUS_FAMILY_NFIT 0 +#define NVDIMM_BUS_FAMILY_MAX NVDIMM_BUS_FAMILY_NFIT #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\ struct nd_cmd_pkg)

4 years, 4 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2020