As reported by the OpenWRT team, write requests sometimes fail on some
platforms.
Currently to check the state chip_ready() is used correctly as described by
the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was
implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error
checking").
But actually the write failure is caused on some platforms and also it can
be fixed by using chip_good() to check the state and retry instead.
Also it seems that it is caused after repeated about 1,000 times to retry
the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the
retry with reset.
It is depended on the actual flash chip behavior so the root cause is
unknown.
Cc: Chris Packham <chris.packham(a)alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com>
Cc: linux-mtd(a)lists.infradead.org
Cc: stable(a)vger.kernel.org
Reported-by: Fabio Bettoni <fbettoni(a)gmail.com>
Signed-off-by: Felix Fietkau <nbd(a)nbd.name>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: Tokunori Ikegami <ikegami.t(a)gmail.com>
[vigneshr(a)ti.com: Fix a checkpatch warning]
Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
mode change 100644 => 100755 drivers/mtd/chips/cfi_cmdset_0002.c
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
old mode 100644
new mode 100755
index fb5a3052f144..7589d891b311
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1626,29 +1626,35 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
continue;
}
- if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
+ /*
+ * We check "time_after" and "!chip_good" before checking
+ * "chip_good" to avoid the failure due to scheduling.
+ */
+ if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)) {
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr);
+ ret = -EIO;
break;
}
- if (chip_ready(map, adr))
+ if (chip_good(map, adr, datum))
break;
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
}
+
/* Did we succeed? */
- if (!chip_good(map, adr, datum)) {
+ if (ret) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES) {
+ ret = 0;
goto retry;
-
- ret = -EIO;
+ }
}
xip_enable(map, chip, adr);
op_done:
--
2.11.0
As reported by the OpenWRT team, write requests sometimes fail on some
platforms.
Currently to check the state chip_ready() is used correctly as described by
the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was
implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error
checking").
But actually the write failure is caused on some platforms and also it can
be fixed by using chip_good() to check the state and retry instead.
Also it seems that it is caused after repeated about 1,000 times to retry
the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the
retry with reset.
It is depended on the actual flash chip behavior so the root cause is
unknown.
Cc: Chris Packham <chris.packham(a)alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com>
Cc: linux-mtd(a)lists.infradead.org
Cc: stable(a)vger.kernel.org
Reported-by: Fabio Bettoni <fbettoni(a)gmail.com>
Signed-off-by: Felix Fietkau <nbd(a)nbd.name>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: Tokunori Ikegami <ikegami.t(a)gmail.com>
[vigneshr(a)ti.com: Fix a checkpatch warning]
Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
mode change 100644 => 100755 drivers/mtd/chips/cfi_cmdset_0002.c
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
old mode 100644
new mode 100755
index de35a2a362f9..8725e406a9eb
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1624,29 +1624,35 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
continue;
}
- if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
+ /*
+ * We check "time_after" and "!chip_good" before checking
+ * "chip_good" to avoid the failure due to scheduling.
+ */
+ if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)) {
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr);
+ ret = -EIO;
break;
}
- if (chip_ready(map, adr))
+ if (chip_good(map, adr, datum))
break;
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
}
+
/* Did we succeed? */
- if (!chip_good(map, adr, datum)) {
+ if (ret) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES) {
+ ret = 0;
goto retry;
-
- ret = -EIO;
+ }
}
xip_enable(map, chip, adr);
op_done:
--
2.11.0
As reported by the OpenWRT team, write requests sometimes fail on some
platforms.
Currently to check the state chip_ready() is used correctly as described by
the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was
implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error
checking").
But actually the write failure is caused on some platforms and also it can
be fixed by using chip_good() to check the state and retry instead.
Also it seems that it is caused after repeated about 1,000 times to retry
the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the
retry with reset.
It is depended on the actual flash chip behavior so the root cause is
unknown.
Cc: Chris Packham <chris.packham(a)alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com>
Cc: linux-mtd(a)lists.infradead.org
Cc: stable(a)vger.kernel.org
Reported-by: Fabio Bettoni <fbettoni(a)gmail.com>
Signed-off-by: Felix Fietkau <nbd(a)nbd.name>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: Tokunori Ikegami <ikegami.t(a)gmail.com>
[vigneshr(a)ti.com: Fix a checkpatch warning]
Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
mode change 100644 => 100755 drivers/mtd/chips/cfi_cmdset_0002.c
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
old mode 100644
new mode 100755
index af3d207c9cc4..e773dc6fdd3c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1628,29 +1628,35 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
continue;
}
- if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
+ /*
+ * We check "time_after" and "!chip_good" before checking
+ * "chip_good" to avoid the failure due to scheduling.
+ */
+ if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)) {
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr);
+ ret = -EIO;
break;
}
- if (chip_ready(map, adr))
+ if (chip_good(map, adr, datum))
break;
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
}
+
/* Did we succeed? */
- if (!chip_good(map, adr, datum)) {
+ if (ret) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES) {
+ ret = 0;
goto retry;
-
- ret = -EIO;
+ }
}
xip_enable(map, chip, adr);
op_done:
--
2.11.0
As reported by the OpenWRT team, write requests sometimes fail on some
platforms.
Currently to check the state chip_ready() is used correctly as described by
the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was
implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error
checking").
But actually the write failure is caused on some platforms and also it can
be fixed by using chip_good() to check the state and retry instead.
Also it seems that it is caused after repeated about 1,000 times to retry
the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the
retry with reset.
It is depended on the actual flash chip behavior so the root cause is
unknown.
Cc: Chris Packham <chris.packham(a)alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com>
Cc: linux-mtd(a)lists.infradead.org
Cc: stable(a)vger.kernel.org
Reported-by: Fabio Bettoni <fbettoni(a)gmail.com>
Signed-off-by: Felix Fietkau <nbd(a)nbd.name>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: Tokunori Ikegami <ikegami.t(a)gmail.com>
[vigneshr(a)ti.com: Fix a checkpatch warning]
Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
mode change 100644 => 100755 drivers/mtd/chips/cfi_cmdset_0002.c
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
old mode 100644
new mode 100755
index 72428b6bfc47..ba44ea6d497e
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1627,29 +1627,35 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
continue;
}
- if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
+ /*
+ * We check "time_after" and "!chip_good" before checking
+ * "chip_good" to avoid the failure due to scheduling.
+ */
+ if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)) {
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr);
+ ret = -EIO;
break;
}
- if (chip_ready(map, adr))
+ if (chip_good(map, adr, datum))
break;
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
}
+
/* Did we succeed? */
- if (!chip_good(map, adr, datum)) {
+ if (ret) {
/* reset on all failures. */
map_write(map, CMD(0xF0), chip->start);
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES) {
+ ret = 0;
goto retry;
-
- ret = -EIO;
+ }
}
xip_enable(map, chip, adr);
op_done:
--
2.11.0
Commit c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor
interface") removed setting gpios via platform data. This means that
fbtft will now only work with Device Tree so set the dependency.
This also prevents a NULL pointer deref on non-DT platform because
fbtftops.request_gpios is not set in that case anymore.
Fixes: c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor interface")
Cc: stable <stable(a)vger.kernel.org>
Signed-off-by: Noralf Trønnes <noralf(a)tronnes.org>
---
drivers/staging/fbtft/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
index 8ec524a95ec8..4e5d860fd788 100644
--- a/drivers/staging/fbtft/Kconfig
+++ b/drivers/staging/fbtft/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
menuconfig FB_TFT
tristate "Support for small TFT LCD display modules"
- depends on FB && SPI
+ depends on FB && SPI && OF
depends on GPIOLIB || COMPILE_TEST
select FB_SYS_FILLRECT
select FB_SYS_COPYAREA
--
2.20.1
Hello,
We ran automated tests on a patchset that was proposed for merging into this
kernel tree. The patches were applied to:
Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
The results of these automated tests are provided below.
Overall result: PASSED
Merge: OK
Compile: OK
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://artifacts.cki-project.org/pipelines/169017
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Merge testing
-------------
We cloned this repository and checked out the following commit:
Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
We grabbed the 210459e9afbb commit of the stable queue repository.
We then merged the patchset with `git am`:
bridge-mdb-remove-wrong-use-of-nlm_f_multi.patch
cdc_ether-fix-rndis-support-for-mediatek-based-smartphones.patch
ipv6-fix-the-link-time-qualifier-of-ping_v6_proc_exit_net.patch
isdn-capi-check-message-length-in-capi_write.patch
ixgbe-fix-secpath-usage-for-ipsec-tx-offload.patch
ixgbevf-fix-secpath-usage-for-ipsec-tx-offload.patch
net-fix-null-de-reference-of-device-refcount.patch
net-gso-fix-skb_segment-splat-when-splitting-gso_size-mangled-skb-having-linear-headed-frag_list.patch
net-phylink-fix-flow-control-resolution.patch
net-sched-fix-reordering-issues.patch
sch_hhf-ensure-quantum-and-hhf_non_hh_weight-are-non-zero.patch
sctp-fix-the-link-time-qualifier-of-sctp_ctrlsock_exit.patch
sctp-use-transport-pf_retrans-in-sctp_do_8_2_transport_strike.patch
tcp-fix-tcp_ecn_withdraw_cwr-to-clear-tcp_ecn_queue_cwr.patch
tipc-add-null-pointer-check-before-calling-kfree_rcu.patch
tun-fix-use-after-free-when-register-netdev-failed.patch
net-ipv6-fix-excessive-rtf_addrconf-flag-on-1-128-local-route-and-others.patch
ipv6-addrconf_f6i_alloc-fix-non-null-pointer-check-to-is_err.patch
net-fixed_phy-add-forward-declaration-for-struct-gpio_desc.patch
sctp-fix-the-missing-put_user-when-dumping-transport-thresholds.patch
net-sock_map-fix-missing-ulp-check-in-sock-hash-case.patch
gpiolib-acpi-add-gpiolib_acpi_run_edge_events_on_boot-option-and-blacklist.patch
gpio-mockup-add-missing-single_release.patch
gpio-fix-line-flag-validation-in-linehandle_create.patch
gpio-fix-line-flag-validation-in-lineevent_create.patch
btrfs-fix-assertion-failure-during-fsync-and-use-of-stale-transaction.patch
cgroup-freezer-fix-frozen-state-inheritance.patch
revert-mmc-bcm2835-terminate-timeout-work-synchronously.patch
revert-mmc-sdhci-remove-unneeded-quirk2-flag-of-o2-sd-host-controller.patch
mmc-tmio-fixup-runtime-pm-management-during-probe.patch
mmc-tmio-fixup-runtime-pm-management-during-remove.patch
drm-lima-fix-lima_gem_wait-return-value.patch
drm-i915-limit-mst-to-8bpc-once-again.patch
drm-i915-restore-relaxed-padding-ocl_oob_suppres_enable-for-skl.patch
ipc-fix-semtimedop-for-generic-32-bit-architectures.patch
ipc-fix-sparc64-ipc-wrapper.patch
ixgbe-fix-double-clean-of-tx-descriptors-with-xdp.patch
ixgbe-prevent-u8-wrapping-of-itr-value-to-something-less-than-10us.patch
revert-rt2800-enable-tx_pin_cfg_lna_pe_-bits-per-band.patch
mt76-mt76x0e-disable-5ghz-band-for-mt7630e.patch
genirq-prevent-null-pointer-dereference-in-resend_irqs.patch
regulator-twl-voltage-lists-for-vdd1-2-on-twl4030.patch
kvm-s390-kvm_s390_vm_start_migration-check-dirty_bitmap-before-using-it-as-target-for-memset.patch
kvm-s390-do-not-leak-kernel-stack-data-in-the-kvm_s390_interrupt-ioctl.patch
kvm-x86-work-around-leak-of-uninitialized-stack-contents.patch
kvm-x86-mmu-reintroduce-fast-invalidate-zap-for-flushing-memslot.patch
kvm-nvmx-handle-page-fault-in-vmread.patch
x86-purgatory-change-compiler-flags-from-mcmodel-kernel-to-mcmodel-large-to-fix-kexec-relocation-errors.patch
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
ppc64le:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
s390x:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
x86_64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test [0]
⚡⚡⚡ Podman system integration test (as root) [2]
⚡⚡⚡ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
⚡⚡⚡ jvm test suite [4]
⚡⚡⚡ AMTU (Abstract Machine Test Utility) [5]
⚡⚡⚡ LTP: openposix test suite [6]
⚡⚡⚡ Ethernet drivers sanity [7]
⚡⚡⚡ Networking socket: fuzz [8]
⚡⚡⚡ Networking sctp-auth: sockopts test [9]
⚡⚡⚡ Networking TCP: keepalive test [10]
⚡⚡⚡ audit: audit testsuite test [11]
⚡⚡⚡ httpd: mod_ssl smoke sanity [12]
⚡⚡⚡ iotop: sanity [13]
⚡⚡⚡ tuned: tune-processes-through-perf [14]
⚡⚡⚡ Usex - version 1.9-29 [15]
⚡⚡⚡ stress: stress-ng [16]
🚧 ⚡⚡⚡ LTP lite [17]
🚧 ⚡⚡⚡ Networking bridge: sanity [18]
🚧 ⚡⚡⚡ Networking route: pmtu [19]
🚧 ⚡⚡⚡ Networking route_func: local [20]
🚧 ⚡⚡⚡ Networking route_func: forward [20]
ppc64le:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [2]
✅ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
✅ jvm test suite [4]
✅ AMTU (Abstract Machine Test Utility) [5]
✅ LTP: openposix test suite [6]
✅ Ethernet drivers sanity [7]
✅ Networking socket: fuzz [8]
✅ Networking sctp-auth: sockopts test [9]
✅ Networking TCP: keepalive test [10]
✅ audit: audit testsuite test [11]
✅ httpd: mod_ssl smoke sanity [12]
✅ iotop: sanity [13]
✅ tuned: tune-processes-through-perf [14]
✅ Usex - version 1.9-29 [15]
🚧 ✅ LTP lite [17]
🚧 ✅ Networking bridge: sanity [18]
🚧 ✅ Networking route: pmtu [19]
🚧 ✅ Networking route_func: local [20]
🚧 ✅ Networking route_func: forward [20]
s390x:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
x86_64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [2]
✅ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
✅ jvm test suite [4]
✅ AMTU (Abstract Machine Test Utility) [5]
✅ LTP: openposix test suite [6]
✅ Ethernet drivers sanity [7]
✅ Networking socket: fuzz [8]
✅ Networking sctp-auth: sockopts test [9]
✅ Networking TCP: keepalive test [10]
✅ audit: audit testsuite test [11]
✅ httpd: mod_ssl smoke sanity [12]
✅ iotop: sanity [13]
✅ tuned: tune-processes-through-perf [14]
✅ pciutils: sanity smoke test [21]
✅ Usex - version 1.9-29 [15]
✅ stress: stress-ng [16]
🚧 ✅ LTP lite [17]
🚧 ✅ Networking bridge: sanity [18]
🚧 ✅ Networking route: pmtu [19]
🚧 ✅ Networking route_func: local [20]
🚧 ✅ Networking route_func: forward [20]
Test source:
💚 Pull requests are welcome for new tests or improvements to existing tests!
[0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se…
[2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/container/p…
[3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/…
[4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/jvm
[5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu
[6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s…
[10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t…
[11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud…
[12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt…
[13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot…
[14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun…
[15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…
[16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres…
[17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/b…
[19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#pciutils/san…
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Hello,
We ran automated tests on a patchset that was proposed for merging into this
kernel tree. The patches were applied to:
Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
The results of these automated tests are provided below.
Overall result: PASSED
Merge: OK
Compile: OK
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://artifacts.cki-project.org/pipelines/168682
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Merge testing
-------------
We cloned this repository and checked out the following commit:
Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
We grabbed the 6ce8f5d40fdb commit of the stable queue repository.
We then merged the patchset with `git am`:
bridge-mdb-remove-wrong-use-of-nlm_f_multi.patch
cdc_ether-fix-rndis-support-for-mediatek-based-smartphones.patch
ipv6-fix-the-link-time-qualifier-of-ping_v6_proc_exit_net.patch
isdn-capi-check-message-length-in-capi_write.patch
ixgbe-fix-secpath-usage-for-ipsec-tx-offload.patch
ixgbevf-fix-secpath-usage-for-ipsec-tx-offload.patch
net-fix-null-de-reference-of-device-refcount.patch
net-gso-fix-skb_segment-splat-when-splitting-gso_size-mangled-skb-having-linear-headed-frag_list.patch
net-phylink-fix-flow-control-resolution.patch
net-sched-fix-reordering-issues.patch
sch_hhf-ensure-quantum-and-hhf_non_hh_weight-are-non-zero.patch
sctp-fix-the-link-time-qualifier-of-sctp_ctrlsock_exit.patch
sctp-use-transport-pf_retrans-in-sctp_do_8_2_transport_strike.patch
tcp-fix-tcp_ecn_withdraw_cwr-to-clear-tcp_ecn_queue_cwr.patch
tipc-add-null-pointer-check-before-calling-kfree_rcu.patch
tun-fix-use-after-free-when-register-netdev-failed.patch
net-ipv6-fix-excessive-rtf_addrconf-flag-on-1-128-local-route-and-others.patch
ipv6-addrconf_f6i_alloc-fix-non-null-pointer-check-to-is_err.patch
net-fixed_phy-add-forward-declaration-for-struct-gpio_desc.patch
sctp-fix-the-missing-put_user-when-dumping-transport-thresholds.patch
net-sock_map-fix-missing-ulp-check-in-sock-hash-case.patch
gpiolib-acpi-add-gpiolib_acpi_run_edge_events_on_boot-option-and-blacklist.patch
gpio-mockup-add-missing-single_release.patch
gpio-fix-line-flag-validation-in-linehandle_create.patch
gpio-fix-line-flag-validation-in-lineevent_create.patch
btrfs-fix-assertion-failure-during-fsync-and-use-of-stale-transaction.patch
cgroup-freezer-fix-frozen-state-inheritance.patch
revert-mmc-bcm2835-terminate-timeout-work-synchronously.patch
revert-mmc-sdhci-remove-unneeded-quirk2-flag-of-o2-sd-host-controller.patch
mmc-tmio-fixup-runtime-pm-management-during-probe.patch
mmc-tmio-fixup-runtime-pm-management-during-remove.patch
drm-lima-fix-lima_gem_wait-return-value.patch
drm-i915-limit-mst-to-8bpc-once-again.patch
drm-i915-restore-relaxed-padding-ocl_oob_suppres_enable-for-skl.patch
ipc-fix-semtimedop-for-generic-32-bit-architectures.patch
ipc-fix-sparc64-ipc-wrapper.patch
ixgbe-fix-double-clean-of-tx-descriptors-with-xdp.patch
ixgbe-prevent-u8-wrapping-of-itr-value-to-something-less-than-10us.patch
revert-rt2800-enable-tx_pin_cfg_lna_pe_-bits-per-band.patch
mt76-mt76x0e-disable-5ghz-band-for-mt7630e.patch
genirq-prevent-null-pointer-dereference-in-resend_irqs.patch
regulator-twl-voltage-lists-for-vdd1-2-on-twl4030.patch
kvm-s390-kvm_s390_vm_start_migration-check-dirty_bitmap-before-using-it-as-target-for-memset.patch
kvm-s390-do-not-leak-kernel-stack-data-in-the-kvm_s390_interrupt-ioctl.patch
kvm-x86-work-around-leak-of-uninitialized-stack-contents.patch
kvm-x86-mmu-reintroduce-fast-invalidate-zap-for-flushing-memslot.patch
kvm-nvmx-handle-page-fault-in-vmread.patch
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
ppc64le:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
s390x:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
x86_64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [2]
✅ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
✅ jvm test suite [4]
✅ AMTU (Abstract Machine Test Utility) [5]
✅ LTP: openposix test suite [6]
✅ Ethernet drivers sanity [7]
✅ Networking socket: fuzz [8]
✅ Networking sctp-auth: sockopts test [9]
✅ Networking TCP: keepalive test [10]
✅ audit: audit testsuite test [11]
✅ httpd: mod_ssl smoke sanity [12]
✅ iotop: sanity [13]
✅ tuned: tune-processes-through-perf [14]
✅ Usex - version 1.9-29 [15]
✅ stress: stress-ng [16]
🚧 ✅ LTP lite [17]
🚧 ✅ Networking bridge: sanity [18]
🚧 ✅ Networking route: pmtu [19]
🚧 ✅ Networking route_func: local [20]
🚧 ✅ Networking route_func: forward [20]
ppc64le:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [2]
✅ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
✅ jvm test suite [4]
✅ AMTU (Abstract Machine Test Utility) [5]
✅ LTP: openposix test suite [6]
✅ Ethernet drivers sanity [7]
✅ Networking socket: fuzz [8]
✅ Networking sctp-auth: sockopts test [9]
✅ Networking TCP: keepalive test [10]
✅ audit: audit testsuite test [11]
✅ httpd: mod_ssl smoke sanity [12]
✅ iotop: sanity [13]
✅ tuned: tune-processes-through-perf [14]
✅ Usex - version 1.9-29 [15]
🚧 ✅ LTP lite [17]
🚧 ✅ Networking bridge: sanity [18]
🚧 ✅ Networking route: pmtu [19]
🚧 ✅ Networking route_func: local [20]
🚧 ✅ Networking route_func: forward [20]
s390x:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
x86_64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [2]
✅ Podman system integration test (as user) [2]
⚡⚡⚡ Loopdev Sanity [3]
✅ jvm test suite [4]
✅ AMTU (Abstract Machine Test Utility) [5]
✅ LTP: openposix test suite [6]
✅ Ethernet drivers sanity [7]
✅ Networking socket: fuzz [8]
✅ Networking sctp-auth: sockopts test [9]
✅ Networking TCP: keepalive test [10]
✅ audit: audit testsuite test [11]
✅ httpd: mod_ssl smoke sanity [12]
✅ iotop: sanity [13]
✅ tuned: tune-processes-through-perf [14]
✅ pciutils: sanity smoke test [21]
✅ Usex - version 1.9-29 [15]
✅ stress: stress-ng [16]
🚧 ✅ LTP lite [17]
🚧 ✅ Networking bridge: sanity [18]
🚧 ✅ Networking route: pmtu [19]
🚧 ✅ Networking route_func: local [20]
🚧 ✅ Networking route_func: forward [20]
Test source:
💚 Pull requests are welcome for new tests or improvements to existing tests!
[0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se…
[2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/container/p…
[3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/…
[4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/jvm
[5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu
[6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s…
[10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t…
[11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud…
[12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt…
[13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot…
[14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun…
[15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…
[16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres…
[17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/b…
[19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#pciutils/san…
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
From: Wanpeng Li <wanpengli(a)tencent.com>
Reported by syzkaller:
WARNING: CPU: 0 PID: 6544 at /home/kernel/data/kvm/arch/x86/kvm//vmx/vmx.c:4689 handle_desc+0x37/0x40 [kvm_intel]
CPU: 0 PID: 6544 Comm: a.out Tainted: G OE 5.3.0-rc4+ #4
RIP: 0010:handle_desc+0x37/0x40 [kvm_intel]
Call Trace:
vmx_handle_exit+0xbe/0x6b0 [kvm_intel]
vcpu_enter_guest+0x4dc/0x18d0 [kvm]
kvm_arch_vcpu_ioctl_run+0x407/0x660 [kvm]
kvm_vcpu_ioctl+0x3ad/0x690 [kvm]
do_vfs_ioctl+0xa2/0x690
ksys_ioctl+0x6d/0x80
__x64_sys_ioctl+0x1a/0x20
do_syscall_64+0x74/0x720
entry_SYSCALL_64_after_hwframe+0x49/0xbe
When CR4.UMIP is set, guest should have UMIP cpuid flag. Current
kvm set_sregs function doesn't have such check when userspace inputs
sregs values. SECONDARY_EXEC_DESC is enabled on writes to CR4.UMIP in
vmx_set_cr4 though guest doesn't have UMIP cpuid flag. The testcast
triggers handle_desc warning when executing ltr instruction since guest
architectural CR4 doesn't set UMIP. This patch fixes it by adding check
for guest UMIP cpuid flag when get sreg inputs from userspace.
Reported-by: syzbot+0f1819555fbdce992df9(a)syzkaller.appspotmail.com
Fixes: 0367f205a3b7 ("KVM: vmx: add support for emulating UMIP")
Cc: stable(a)vger.kernel.org
Signed-off-by: Wanpeng Li <wanpengli(a)tencent.com>
---
Note: syzbot report link https://lkml.org/lkml/2019/9/11/799
arch/x86/kvm/x86.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f7cfd8e..83288ba 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8645,6 +8645,10 @@ static int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
(sregs->cr4 & X86_CR4_OSXSAVE))
return -EINVAL;
+ if (!guest_cpuid_has(vcpu, X86_FEATURE_UMIP) &&
+ (sregs->cr4 & X86_CR4_UMIP))
+ return -EINVAL;
+
if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {
/*
* When EFER.LME and CR0.PG are set, the processor is in
--
2.7.4
Hi Greg,
please apply the following patches to v4.4.y, v4.9.y, and v4.14.y.
351fdddd3662 ("MIPS: VDSO: Prevent use of smp_processor_id()")
0648e50e548d ("MIPS: VDSO: Use same -m%-float cflag as the kernel proper")
The second patch fixes the build error reported for decstation_defconfig and others
by kernelci, and the first patch is needed to avoid a merge conflict (and it doesn't
hurt to have it in the branch).
Thanks,
Guenter
From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
When emulating open-drain/open-source by not actively driving the output
lines - we're simply changing their mode to input. This is wrong as it
will then make it impossible to change the value of such line - it's now
considered to actually be in input mode. If we want to still use the
direction_input() callback for simplicity then we need to set FLAG_IS_OUT
manually in gpiod_direction_output() and not clear it in
gpio_set_open_drain_value_commit() and
gpio_set_open_source_value_commit().
Fixes: c663e5f56737 ("gpio: support native single-ended hardware drivers")
Cc: stable(a)vger.kernel.org
Reported-by: Kent Gibson <warthog618(a)gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
---
drivers/gpio/gpiolib.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index cca749010cd0..6bb4191d3844 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2769,8 +2769,10 @@ int gpiod_direction_output(struct gpio_desc *desc, int value)
if (!ret)
goto set_output_value;
/* Emulate open drain by not actively driving the line high */
- if (value)
- return gpiod_direction_input(desc);
+ if (value) {
+ ret = gpiod_direction_input(desc);
+ goto set_output_flag;
+ }
}
else if (test_bit(FLAG_OPEN_SOURCE, &desc->flags)) {
ret = gpio_set_config(gc, gpio_chip_hwgpio(desc),
@@ -2778,8 +2780,10 @@ int gpiod_direction_output(struct gpio_desc *desc, int value)
if (!ret)
goto set_output_value;
/* Emulate open source by not actively driving the line low */
- if (!value)
- return gpiod_direction_input(desc);
+ if (!value) {
+ ret = gpiod_direction_input(desc);
+ goto set_output_flag;
+ }
} else {
gpio_set_config(gc, gpio_chip_hwgpio(desc),
PIN_CONFIG_DRIVE_PUSH_PULL);
@@ -2787,6 +2791,17 @@ int gpiod_direction_output(struct gpio_desc *desc, int value)
set_output_value:
return gpiod_direction_output_raw_commit(desc, value);
+
+set_output_flag:
+ /*
+ * When emulating open-source or open-drain functionalities by not
+ * actively driving the line (setting mode to input) we still need to
+ * set the IS_OUT flag or otherwise we won't be able to set the line
+ * value anymore.
+ */
+ if (ret == 0)
+ set_bit(FLAG_IS_OUT, &desc->flags);
+ return ret;
}
EXPORT_SYMBOL_GPL(gpiod_direction_output);
@@ -3147,8 +3162,6 @@ static void gpio_set_open_drain_value_commit(struct gpio_desc *desc, bool value)
if (value) {
err = chip->direction_input(chip, offset);
- if (!err)
- clear_bit(FLAG_IS_OUT, &desc->flags);
} else {
err = chip->direction_output(chip, offset, 0);
if (!err)
@@ -3178,8 +3191,6 @@ static void gpio_set_open_source_value_commit(struct gpio_desc *desc, bool value
set_bit(FLAG_IS_OUT, &desc->flags);
} else {
err = chip->direction_input(chip, offset);
- if (!err)
- clear_bit(FLAG_IS_OUT, &desc->flags);
}
trace_gpio_direction(desc_to_gpio(desc), !value, err);
if (err < 0)
--
2.21.0
On Thu, 12 Sep 2019 07:30:49 +0000
Sasha Levin <sashal(a)kernel.org> wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: 4.12+
>
> The bot has tested the following trees: v5.2.14, v4.19.72, v4.14.143.
>
> v5.2.14: Build OK!
> v4.19.72: Failed to apply! Possible dependencies:
> 75d9fc7fd94e ("powerpc/powernv: move OPAL call wrapper tracing and interrupt handling to C")
>
This is the only dependency indeed.
> v4.14.143: Failed to apply! Possible dependencies:
> 104daea149c4 ("kconfig: reference environment variables directly and remove 'option env='")
> 21c54b774744 ("kconfig: show compiler version text in the top comment")
> 315bab4e972d ("kbuild: fix endless syncconfig in case arch Makefile sets CROSS_COMPILE")
> 3298b690b21c ("kbuild: Add a cache for generated variables")
> 4e56207130ed ("kbuild: Cache a few more calls to the compiler")
> 75d9fc7fd94e ("powerpc/powernv: move OPAL call wrapper tracing and interrupt handling to C")
> 8f2133cc0e1f ("powerpc/pseries: hcall_exit tracepoint retval should be signed")
> 9a234a2e3843 ("kbuild: create directory for make cache only when necessary")
> d677a4d60193 ("Makefile: support flag -fsanitizer-coverage=trace-cmp")
> e08d6de4e532 ("kbuild: remove kbuild cache")
> e17c400ae194 ("kbuild: shrink .cache.mk when it exceeds 1000 lines")
> e501ce957a78 ("x86: Force asm-goto")
> e9666d10a567 ("jump_label: move 'asm goto' support test to Kconfig")
>
That's quite a lot of patches to workaround a hard to hit skiboot bug.
As an alternative, the patch can be backported so that it applies the
following change:
-OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ);
+OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ);
to "arch/powerpc/platforms/powernv/opal-wrappers.S"
instead of "arch/powerpc/platforms/powernv/opal-call.c" .
BTW, this could also be done for 4.19.y .
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
>
Michael ?
> --
> Thanks,
> Sasha
At higher sampling rate (e.g. 192.0 kHz), Alesis iO26 transfers 4 data
channels per data block in CIP.
Both iO14 and iO26 have the same contents in their configuration ROM.
For this reason, ALSA Dice driver attempts to distinguish them according
to the value of TX0_AUDIO register at probe callback. Although the way is
valid at lower and middle sampling rate, it's lastly invalid at higher
sampling rate because because the two models returns the same value for
read transaction to the register.
In the most cases, users just plug-in the device and ALSA dice driver
detects it. In the case, the device runs at lower sampling rate and
the driver detects expectedly. For this reason, this commit leaves the
way to detect as is.
Fixes: 28b208f600a3 ("ALSA: dice: add parameters of stream formats for models produced by Alesis")
Cc: <stable(a)vger.kernel.org> # v4.18+
Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp>
---
sound/firewire/dice/dice-alesis.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/firewire/dice/dice-alesis.c b/sound/firewire/dice/dice-alesis.c
index 218292bdace6..f5b325263b67 100644
--- a/sound/firewire/dice/dice-alesis.c
+++ b/sound/firewire/dice/dice-alesis.c
@@ -15,7 +15,7 @@ alesis_io14_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {
static const unsigned int
alesis_io26_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {
- {10, 10, 8}, /* Tx0 = Analog + S/PDIF. */
+ {10, 10, 4}, /* Tx0 = Analog + S/PDIF. */
{16, 8, 0}, /* Tx1 = ADAT1 + ADAT2. */
};
--
2.20.1
It is preferrable to reject unknown flags within rseq unregistration
rather than to ignore them. It is an oversight caused by the fact that
the check for unknown flags is after the rseq unregister flag check.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com>
Cc: Thomas Gleixner <tglx(a)linutronix.de>
Cc: Peter Zijlstra (Intel) <peterz(a)infradead.org>
Cc: "Paul E. McKenney" <paulmck(a)linux.ibm.com>
Cc: Boqun Feng <boqun.feng(a)gmail.com>
Cc: "H . Peter Anvin" <hpa(a)zytor.com>
Cc: Paul Turner <pjt(a)google.com>
Cc: linux-api(a)vger.kernel.org
Cc: <stable(a)vger.kernel.org>
---
kernel/rseq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/rseq.c b/kernel/rseq.c
index 27c48eb7de40..a4f86a9d6937 100644
--- a/kernel/rseq.c
+++ b/kernel/rseq.c
@@ -310,6 +310,8 @@ SYSCALL_DEFINE4(rseq, struct rseq __user *, rseq, u32, rseq_len,
int ret;
if (flags & RSEQ_FLAG_UNREGISTER) {
+ if (flags & ~RSEQ_FLAG_UNREGISTER)
+ return -EINVAL;
/* Unregister rseq for current thread. */
if (current->rseq != rseq || !current->rseq)
return -EINVAL;
--
2.17.1
Hello,
We ran automated tests on a patchset that was proposed for merging into this
kernel tree. The patches were applied to:
Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
The results of these automated tests are provided below.
Overall result: PASSED
Merge: OK
Compile: OK
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://artifacts.cki-project.org/pipelines/168287
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Merge testing
-------------
We cloned this repository and checked out the following commit:
Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 6e282ba6ff6b - Linux 5.2.15
We grabbed the b3793b83d825 commit of the stable queue repository.
We then merged the patchset with `git am`:
bridge-mdb-remove-wrong-use-of-nlm_f_multi.patch
cdc_ether-fix-rndis-support-for-mediatek-based-smartphones.patch
ipv6-fix-the-link-time-qualifier-of-ping_v6_proc_exit_net.patch
isdn-capi-check-message-length-in-capi_write.patch
ixgbe-fix-secpath-usage-for-ipsec-tx-offload.patch
ixgbevf-fix-secpath-usage-for-ipsec-tx-offload.patch
net-fix-null-de-reference-of-device-refcount.patch
net-gso-fix-skb_segment-splat-when-splitting-gso_size-mangled-skb-having-linear-headed-frag_list.patch
net-phylink-fix-flow-control-resolution.patch
net-sched-fix-reordering-issues.patch
sch_hhf-ensure-quantum-and-hhf_non_hh_weight-are-non-zero.patch
sctp-fix-the-link-time-qualifier-of-sctp_ctrlsock_exit.patch
sctp-use-transport-pf_retrans-in-sctp_do_8_2_transport_strike.patch
tcp-fix-tcp_ecn_withdraw_cwr-to-clear-tcp_ecn_queue_cwr.patch
tipc-add-null-pointer-check-before-calling-kfree_rcu.patch
tun-fix-use-after-free-when-register-netdev-failed.patch
net-ipv6-fix-excessive-rtf_addrconf-flag-on-1-128-local-route-and-others.patch
ipv6-addrconf_f6i_alloc-fix-non-null-pointer-check-to-is_err.patch
net-fixed_phy-add-forward-declaration-for-struct-gpio_desc.patch
sctp-fix-the-missing-put_user-when-dumping-transport-thresholds.patch
net-sock_map-fix-missing-ulp-check-in-sock-hash-case.patch
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
ppc64le:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
s390x:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
x86_64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test [0]
✅ Podman system integration test (as root) [1]
✅ Podman system integration test (as user) [1]
✅ jvm test suite [2]
✅ AMTU (Abstract Machine Test Utility) [3]
✅ LTP: openposix test suite [4]
✅ Ethernet drivers sanity [5]
✅ Networking socket: fuzz [6]
✅ Networking sctp-auth: sockopts test [7]
✅ Networking TCP: keepalive test [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
✅ stress: stress-ng [13]
🚧 ✅ LTP lite [14]
🚧 ✅ Networking bridge: sanity [15]
🚧 ✅ Networking route: pmtu [16]
🚧 ✅ Networking route_func: local [17]
🚧 ✅ Networking route_func: forward [17]
Host 2:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [18]
ppc64le:
Host 1:
✅ Boot test [0]
✅ Podman system integration test (as root) [1]
✅ Podman system integration test (as user) [1]
✅ jvm test suite [2]
✅ AMTU (Abstract Machine Test Utility) [3]
✅ LTP: openposix test suite [4]
✅ Ethernet drivers sanity [5]
✅ Networking socket: fuzz [6]
✅ Networking sctp-auth: sockopts test [7]
✅ Networking TCP: keepalive test [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
🚧 ✅ LTP lite [14]
🚧 ✅ Networking bridge: sanity [15]
🚧 ✅ Networking route: pmtu [16]
🚧 ✅ Networking route_func: local [17]
🚧 ✅ Networking route_func: forward [17]
Host 2:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [18]
s390x:
Host 1:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test [0]
⚡⚡⚡ selinux-policy: serge-testsuite [18]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test [0]
⚡⚡⚡ Podman system integration test (as root) [1]
⚡⚡⚡ Podman system integration test (as user) [1]
⚡⚡⚡ jvm test suite [2]
⚡⚡⚡ LTP: openposix test suite [4]
⚡⚡⚡ Ethernet drivers sanity [5]
⚡⚡⚡ Networking sctp-auth: sockopts test [7]
⚡⚡⚡ Networking TCP: keepalive test [8]
⚡⚡⚡ audit: audit testsuite test [9]
⚡⚡⚡ httpd: mod_ssl smoke sanity [10]
⚡⚡⚡ iotop: sanity [11]
⚡⚡⚡ tuned: tune-processes-through-perf [12]
⚡⚡⚡ stress: stress-ng [13]
🚧 ⚡⚡⚡ LTP lite [14]
🚧 ⚡⚡⚡ Networking bridge: sanity [15]
🚧 ⚡⚡⚡ Networking route: pmtu [16]
🚧 ⚡⚡⚡ Networking route_func: local [17]
🚧 ⚡⚡⚡ Networking route_func: forward [17]
x86_64:
Host 1:
✅ Boot test [0]
✅ Podman system integration test (as root) [1]
✅ Podman system integration test (as user) [1]
✅ jvm test suite [2]
✅ AMTU (Abstract Machine Test Utility) [3]
✅ LTP: openposix test suite [4]
✅ Ethernet drivers sanity [5]
✅ Networking socket: fuzz [6]
✅ Networking sctp-auth: sockopts test [7]
✅ Networking TCP: keepalive test [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
✅ pciutils: sanity smoke test [19]
✅ stress: stress-ng [13]
🚧 ✅ LTP lite [14]
🚧 ✅ Networking bridge: sanity [15]
🚧 ✅ Networking route: pmtu [16]
🚧 ✅ Networking route_func: local [17]
🚧 ✅ Networking route_func: forward [17]
Host 2:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [18]
Test source:
💚 Pull requests are welcome for new tests or improvements to existing tests!
[0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/container/p…
[2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/jvm
[3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu
[4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s…
[8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t…
[9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud…
[10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt…
[11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot…
[12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun…
[13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres…
[14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/b…
[16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se…
[19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#pciutils/san…
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
The patch below does not apply to the 4.19-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 2eb0964eec5f1d99f9eaf4963eee267acc72b615 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Wed, 4 Sep 2019 11:07:07 +0100
Subject: [PATCH] drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE)
for skl+
This bit was fliped on for "syncing dependencies between camera and
graphics". BSpec has no recollection why, and it is causing
unrecoverable GPU hangs with Vulkan compute workloads.
>From BSpec, setting bit5 to 0 enables relaxed padding requirements for
buffers, 1D and 2D non-array, non-MSAA, non-mip-mapped linear surfaces;
and *must* be set to 0h on skl+ to ensure "Out of Bounds" case is
suppressed.
Reported-by: Jason Ekstrand <jason(a)jlekstrand.net>
Suggested-by: Jason Ekstrand <jason(a)jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110998
Fixes: 8424171e135c ("drm/i915/gen9: h/w w/a: syncing dependencies between camera and graphics")
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Tested-by: denys.kostin(a)globallogic.com
Cc: Jason Ekstrand <jason(a)jlekstrand.net>
Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Cc: <stable(a)vger.kernel.org> # v4.1+
Reviewed-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190904100707.7377-1-chris@c…
(cherry picked from commit 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37)
Signed-off-by: Jani Nikula <jani.nikula(a)intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 98dfb086320f..99e8242194c0 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -308,11 +308,6 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine,
FLOW_CONTROL_ENABLE |
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
- if (!IS_COFFEELAKE(i915))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
Hi
The commit
e16c2983fba0: x86/purgatory: Change compiler flags from
-mcmodel=kernel to -mcmodel=large to fix kexec relocation errors
fixes a regression introduced by:
b059f801a937 x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS
which has gone into 4.19.y and 5.2.y
Thanks,
Andreas
The patch below does not apply to the 5.2-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 968dcfb4905245dc64d65312c0d17692fa087b99 Mon Sep 17 00:00:00 2001
From: Luca Coelho <luciano.coelho(a)intel.com>
Date: Thu, 29 Aug 2019 11:13:46 +0300
Subject: [PATCH] iwlwifi: assign directly to iwl_trans->cfg in QuZ detection
We were erroneously assigning the new configuration to a local
variable cfg, but that was not being assigned to anything, so the
change was getting lost. Assign directly to iwl_trans->cfg instead.
Fixes: 5a8c31aa6357 ("iwlwifi: pcie: fix recognition of QuZ devices")
Cc: stable(a)vger.kernel.org # 5.2
Signed-off-by: Luca Coelho <luciano.coelho(a)intel.com>
Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org>
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index d9ed53b7c768..3b12e7ad35e1 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1070,18 +1070,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* same thing for QuZ... */
if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
- if (cfg == &iwl_ax101_cfg_qu_hr)
- cfg = &iwl_ax101_cfg_quz_hr;
- else if (cfg == &iwl_ax201_cfg_qu_hr)
- cfg = &iwl_ax201_cfg_quz_hr;
- else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
- cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
- else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
- cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
- else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
- cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
- else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
- cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
+ if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
+ iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
+ else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
+ iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
+ else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
+ iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
+ iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
+ iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
+ iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
}
#endif
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 2eb0964eec5f1d99f9eaf4963eee267acc72b615 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Wed, 4 Sep 2019 11:07:07 +0100
Subject: [PATCH] drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE)
for skl+
This bit was fliped on for "syncing dependencies between camera and
graphics". BSpec has no recollection why, and it is causing
unrecoverable GPU hangs with Vulkan compute workloads.
>From BSpec, setting bit5 to 0 enables relaxed padding requirements for
buffers, 1D and 2D non-array, non-MSAA, non-mip-mapped linear surfaces;
and *must* be set to 0h on skl+ to ensure "Out of Bounds" case is
suppressed.
Reported-by: Jason Ekstrand <jason(a)jlekstrand.net>
Suggested-by: Jason Ekstrand <jason(a)jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110998
Fixes: 8424171e135c ("drm/i915/gen9: h/w w/a: syncing dependencies between camera and graphics")
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Tested-by: denys.kostin(a)globallogic.com
Cc: Jason Ekstrand <jason(a)jlekstrand.net>
Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Cc: <stable(a)vger.kernel.org> # v4.1+
Reviewed-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190904100707.7377-1-chris@c…
(cherry picked from commit 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37)
Signed-off-by: Jani Nikula <jani.nikula(a)intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 98dfb086320f..99e8242194c0 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -308,11 +308,6 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine,
FLOW_CONTROL_ENABLE |
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
- if (!IS_COFFEELAKE(i915))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
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 2eb0964eec5f1d99f9eaf4963eee267acc72b615 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Wed, 4 Sep 2019 11:07:07 +0100
Subject: [PATCH] drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE)
for skl+
This bit was fliped on for "syncing dependencies between camera and
graphics". BSpec has no recollection why, and it is causing
unrecoverable GPU hangs with Vulkan compute workloads.
>From BSpec, setting bit5 to 0 enables relaxed padding requirements for
buffers, 1D and 2D non-array, non-MSAA, non-mip-mapped linear surfaces;
and *must* be set to 0h on skl+ to ensure "Out of Bounds" case is
suppressed.
Reported-by: Jason Ekstrand <jason(a)jlekstrand.net>
Suggested-by: Jason Ekstrand <jason(a)jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110998
Fixes: 8424171e135c ("drm/i915/gen9: h/w w/a: syncing dependencies between camera and graphics")
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Tested-by: denys.kostin(a)globallogic.com
Cc: Jason Ekstrand <jason(a)jlekstrand.net>
Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Cc: <stable(a)vger.kernel.org> # v4.1+
Reviewed-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190904100707.7377-1-chris@c…
(cherry picked from commit 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37)
Signed-off-by: Jani Nikula <jani.nikula(a)intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 98dfb086320f..99e8242194c0 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -308,11 +308,6 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine,
FLOW_CONTROL_ENABLE |
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
- if (!IS_COFFEELAKE(i915))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
The patch below does not apply to the 4.14-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 2eb0964eec5f1d99f9eaf4963eee267acc72b615 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Wed, 4 Sep 2019 11:07:07 +0100
Subject: [PATCH] drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE)
for skl+
This bit was fliped on for "syncing dependencies between camera and
graphics". BSpec has no recollection why, and it is causing
unrecoverable GPU hangs with Vulkan compute workloads.
>From BSpec, setting bit5 to 0 enables relaxed padding requirements for
buffers, 1D and 2D non-array, non-MSAA, non-mip-mapped linear surfaces;
and *must* be set to 0h on skl+ to ensure "Out of Bounds" case is
suppressed.
Reported-by: Jason Ekstrand <jason(a)jlekstrand.net>
Suggested-by: Jason Ekstrand <jason(a)jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110998
Fixes: 8424171e135c ("drm/i915/gen9: h/w w/a: syncing dependencies between camera and graphics")
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Tested-by: denys.kostin(a)globallogic.com
Cc: Jason Ekstrand <jason(a)jlekstrand.net>
Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Cc: <stable(a)vger.kernel.org> # v4.1+
Reviewed-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190904100707.7377-1-chris@c…
(cherry picked from commit 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37)
Signed-off-by: Jani Nikula <jani.nikula(a)intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 98dfb086320f..99e8242194c0 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -308,11 +308,6 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine,
FLOW_CONTROL_ENABLE |
PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
- if (!IS_COFFEELAKE(i915))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: 4.4+
The bot has tested the following trees: v5.2.14, v4.19.72, v4.14.143, v4.9.192, v4.4.192.
v5.2.14: Build OK!
v4.19.72: Failed to apply! Possible dependencies:
6b5fc433a7ad ("Btrfs: fix fsync after succession of renames of different files")
a3baaf0d786e ("Btrfs: fix fsync after succession of renames and unlink/rmdir")
b8aa330d2acb ("Btrfs: improve performance on fsync of files with multiple hardlinks")
v4.14.143: Failed to apply! Possible dependencies:
0d836392cadd ("Btrfs: fix mount failure after fsync due to hard link recreation")
1f250e929a9c ("Btrfs: fix log replay failure after unlink and link combination")
6b5fc433a7ad ("Btrfs: fix fsync after succession of renames of different files")
8d9e220ca084 ("btrfs: simplify IS_ERR/PTR_ERR checks")
a3baaf0d786e ("Btrfs: fix fsync after succession of renames and unlink/rmdir")
b8aa330d2acb ("Btrfs: improve performance on fsync of files with multiple hardlinks")
v4.9.192: Failed to apply! Possible dependencies:
0b246afa62b0 ("btrfs: root->fs_info cleanup, add fs_info convenience variables")
0d836392cadd ("Btrfs: fix mount failure after fsync due to hard link recreation")
1f250e929a9c ("Btrfs: fix log replay failure after unlink and link combination")
4791c8f19c45 ("btrfs: Make btrfs_check_ref_name_override take btrfs_inode")
6b5fc433a7ad ("Btrfs: fix fsync after succession of renames of different files")
a3baaf0d786e ("Btrfs: fix fsync after succession of renames and unlink/rmdir")
cf8cddd38bab ("btrfs: don't abuse REQ_OP_* flags for btrfs_map_block")
da17066c4047 ("btrfs: pull node/sector/stripe sizes out of root and into fs_info")
db0a669fb002 ("btrfs: Make btrfs_add_link take btrfs_inode")
de143792253e ("btrfs: struct btrfsic_state->root should be an fs_info")
fb456252d3d9 ("btrfs: root->fs_info cleanup, use fs_info->dev_root everywhere")
v4.4.192: Failed to apply! Possible dependencies:
0132761017e0 ("btrfs: fix string and comment grammatical issues and typos")
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
0b246afa62b0 ("btrfs: root->fs_info cleanup, add fs_info convenience variables")
0d836392cadd ("Btrfs: fix mount failure after fsync due to hard link recreation")
0e749e54244e ("dax: increase granularity of dax_clear_blocks() operations")
1f250e929a9c ("Btrfs: fix log replay failure after unlink and link combination")
44f714dae50a ("Btrfs: improve performance on fsync against new inode after rename/unlink")
4791c8f19c45 ("btrfs: Make btrfs_check_ref_name_override take btrfs_inode")
52db400fcd50 ("pmem, dax: clean up clear_pmem()")
6b5fc433a7ad ("Btrfs: fix fsync after succession of renames of different files")
781feef7e6be ("Btrfs: fix lockdep warning about log_mutex")
a3baaf0d786e ("Btrfs: fix fsync after succession of renames and unlink/rmdir")
b2e0d1625e19 ("dax: fix lifetime of in-kernel dax mappings with dax_map_atomic()")
bb7ab3b92e46 ("btrfs: Fix misspellings in comments.")
cf8cddd38bab ("btrfs: don't abuse REQ_OP_* flags for btrfs_map_block")
d1a5f2b4d8a1 ("block: use DAX for partition table reads")
db0a669fb002 ("btrfs: Make btrfs_add_link take btrfs_inode")
de143792253e ("btrfs: struct btrfsic_state->root should be an fs_info")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks,
Sasha
----- On Sep 14, 2019, at 3:47 PM, Sasha Levin sashal(a)kernel.org wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: all
>
> The bot has tested the following trees: v5.2.14, v4.19.72, v4.14.143, v4.9.192,
> v4.4.192.
>
> v5.2.14: Build OK!
> v4.19.72: Build OK!
> v4.14.143: Failed to apply! Possible dependencies:
> c960e9909d33 ("rseq/selftests: Provide parametrized tests")
>
> v4.9.192: Failed to apply! Possible dependencies:
> c960e9909d33 ("rseq/selftests: Provide parametrized tests")
>
> v4.4.192: Failed to apply! Possible dependencies:
> c960e9909d33 ("rseq/selftests: Provide parametrized tests")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
rseq was merged into 4.18, so none of those patches are needed prior to that
kernel version.
This applies to all 3 rseq patches.
Thanks,
Mathieu
>
> --
> Thanks,
> Sasha
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
Hi Greg,
Here's the backport of aa53e3bfac72 ("btrfs: correctly validate compression
type") for v4.14 with it's prerequisite e128f9c3f724 ("btrfs: compression:
add helper for type to string conversion").
David Sterba (1):
btrfs: compression: add helper for type to string conversion
Johannes Thumshirn (1):
btrfs: correctly validate compression type
fs/btrfs/compression.c | 31 +++++++++++++++++++++++++++++++
fs/btrfs/compression.h | 3 +++
fs/btrfs/props.c | 6 +-----
3 files changed, 35 insertions(+), 5 deletions(-)
--
2.16.4
I'm announcing the release of the 5.2.15 kernel.
All users of the 5.2 kernel series must upgrade.
The updated 5.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.2.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/powerpc/kernel/process.c | 21 ---
arch/powerpc/mm/nohash/tlb.c | 1
drivers/gpio/gpio-pca953x.c | 15 --
drivers/gpu/drm/i915/i915_reg.h | 7 +
drivers/gpu/drm/i915/intel_cdclk.c | 11 +
drivers/gpu/drm/i915/intel_workarounds.c | 136 ++++++++++++++++----
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 12 +
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 8 -
drivers/infiniband/hw/hfi1/rc.c | 28 ----
drivers/infiniband/hw/qib/qib_rc.c | 26 ---
drivers/infiniband/sw/rdmavt/qp.c | 31 +---
drivers/md/bcache/btree.c | 49 ++++++-
drivers/md/bcache/btree.h | 2
drivers/md/bcache/journal.c | 7 +
drivers/mmc/host/sdhci-acpi.c | 2
drivers/mmc/host/sdhci-esdhc-imx.c | 2
drivers/mmc/host/sdhci-of-at91.c | 2
drivers/mmc/host/sdhci-pci-core.c | 4
drivers/mmc/host/sdhci-pxav3.c | 2
drivers/mmc/host/sdhci-s3c.c | 2
drivers/mmc/host/sdhci-sprd.c | 2
drivers/mmc/host/sdhci-xenon.c | 2
drivers/mmc/host/sdhci.c | 4
drivers/mmc/host/sdhci.h | 2
drivers/s390/virtio/virtio_ccw.c | 3
drivers/usb/chipidea/ci_hdrc_imx.c | 43 +++++-
drivers/usb/chipidea/usbmisc_imx.c | 4
drivers/vhost/test.c | 13 +
drivers/vhost/vhost.c | 4
fs/btrfs/extent_io.c | 35 +++--
include/linux/usb/chipidea.h | 1
include/rdma/rdmavt_qp.h | 117 +++++++++++------
kernel/sched/fair.c | 5
net/batman-adv/bat_iv_ogm.c | 20 +-
net/batman-adv/netlink.c | 2
sound/pci/hda/hda_auto_parser.c | 4
sound/pci/hda/hda_generic.c | 3
sound/pci/hda/hda_generic.h | 1
sound/pci/hda/patch_realtek.c | 17 ++
40 files changed, 434 insertions(+), 218 deletions(-)
André Draszik (1):
usb: chipidea: imx: fix EPROBE_DEFER support during driver probe
Baolin Wang (1):
mmc: sdhci-sprd: Fix the incorrect soft reset operation when runtime resuming
Ben Skeggs (1):
drm/nouveau/sec2/gp102: add missing MODULE_FIRMWAREs
Christophe Leroy (1):
powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup
Coly Li (3):
bcache: only clear BTREE_NODE_dirty bit when it is set
bcache: add comments for mutex_lock(&b->write_lock)
bcache: fix race in btree_flush_write()
Dan Carpenter (1):
drm/vmwgfx: Fix double free in vmw_recv_msg()
David Jander (2):
gpio: pca953x: correct type of reg_direction
gpio: pca953x: use pca953x_read_regs instead of regmap_bulk_read
Eric Dumazet (1):
batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
Filipe Manana (1):
Btrfs: fix unwritten extent buffers and hangs on future writeback attempts
Greg Kroah-Hartman (1):
Linux 5.2.15
Gustavo Romero (2):
powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts
Halil Pasic (1):
virtio/s390: fix race on airq_areas[]
Hui Wang (1):
ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre
Jian-Hong Pan (1):
ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL
John Harrison (3):
drm/i915: Support flags in whitlist WAs
drm/i915: Support whitelist workarounds on all engines
drm/i915: Add whitelist workarounds for ICL
Kaike Wan (1):
IB/hfi1: Unreserve a flushed OPFN request
Kenneth Graunke (1):
drm/i915: Disable SAMPLER_STATE prefetching on all Gen11 steppings.
Liangyan (1):
sched/fair: Don't assign runtime for throttled cfs_rq
Lionel Landwerlin (2):
drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT
Mike Marciniszyn (2):
IB/rdmavt: Add new completion inline
IB/{rdmavt, qib, hfi1}: Convert to new completion API
Peter Chen (1):
usb: chipidea: imx: add imx7ulp support
Sam Bazley (1):
ALSA: hda/realtek - Add quirk for HP Pavilion 15
Sven Eckelmann (1):
batman-adv: Only read OGM tvlv_len after buffer len check
Takashi Iwai (2):
ALSA: hda - Fix potential endless loop at applying quirks
ALSA: hda/realtek - Fix overridden device-specific initialization
Tiwei Bie (2):
vhost/test: fix build for vhost test
vhost/test: fix build for vhost test - again
Ville Syrjälä (1):
drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV
yongduan (1):
vhost: make sure log_num < in_num
This is the start of the stable review cycle for the 4.14.144 release.
There are 21 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun 15 Sep 2019 01:03:32 PM UTC.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.144-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.14.144-rc1
yongduan <yongduan(a)tencent.com>
vhost: make sure log_num < in_num
Michael S. Tsirkin <mst(a)redhat.com>
vhost: block speculation of translated descriptors
YueHaibing <yuehaibing(a)huawei.com>
kernel/module: Fix mem leak in module_add_modinfo_attrs
Nathan Chancellor <natechancellor(a)gmail.com>
clk: s2mps11: Add used attribute to s2mps11_dt_match
Nicolas Boichat <drinkcat(a)chromium.org>
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
Dmitry Voytik <voytikd(a)gmail.com>
arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64
Christophe Leroy <christophe.leroy(a)c-s.fr>
powerpc/64: mark start_here_multiplatform as __ref
Dexuan Cui <decui(a)microsoft.com>
hv_sock: Fix hang when a connection is closed
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Only read OGM tvlv_len after buffer len check
Eric Dumazet <edumazet(a)google.com>
batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
Tiwei Bie <tiwei.bie(a)intel.com>
vhost/test: fix build for vhost test
Vignesh R <vigneshr(a)ti.com>
PCI: dra7xx: Fix legacy INTD IRQ handling
Niklas Cassel <niklas.cassel(a)axis.com>
PCI: designware-ep: Fix find_first_zero_bit() usage
Eric Dumazet <edumazet(a)google.com>
ip6: fix skb leak in ip6frag_expire_frag_queue()
Cong Wang <xiyou.wangcong(a)gmail.com>
xfrm: clean up xfrm protocol checks
Gustavo Romero <gromero(a)linux.ibm.com>
powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
Dan Carpenter <dan.carpenter(a)oracle.com>
drm/vmwgfx: Fix double free in vmw_recv_msg()
Liangyan <liangyan.peng(a)linux.alibaba.com>
sched/fair: Don't assign runtime for throttled cfs_rq
Hui Wang <hui.wang(a)canonical.com>
ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek - Fix overridden device-specific initialization
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda - Fix potential endless loop at applying quirks
-------------
Diffstat:
Makefile | 4 +--
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 ++
arch/powerpc/kernel/head_64.S | 2 ++
arch/powerpc/kernel/process.c | 3 ++-
drivers/clk/clk-s2mps11.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 8 +++---
drivers/pci/dwc/pci-dra7xx.c | 3 ++-
drivers/pci/dwc/pcie-designware-ep.c | 34 ++++++++++++++++++++------
drivers/pci/dwc/pcie-designware.h | 8 ++++--
drivers/vhost/test.c | 13 +++++++---
drivers/vhost/vhost.c | 10 +++++---
include/net/ipv6_frag.h | 1 -
include/net/xfrm.h | 17 +++++++++++++
kernel/module.c | 22 +++++++++++++----
kernel/sched/fair.c | 5 ++++
net/batman-adv/bat_iv_ogm.c | 20 +++++++++------
net/batman-adv/netlink.c | 2 +-
net/key/af_key.c | 4 ++-
net/vmw_vsock/hyperv_transport.c | 8 ++++++
net/xfrm/xfrm_state.c | 2 +-
net/xfrm/xfrm_user.c | 14 +----------
scripts/decode_stacktrace.sh | 2 +-
sound/pci/hda/hda_auto_parser.c | 4 +--
sound/pci/hda/hda_generic.c | 3 ++-
sound/pci/hda/hda_generic.h | 1 +
sound/pci/hda/patch_realtek.c | 4 +++
26 files changed, 137 insertions(+), 61 deletions(-)
This is the start of the stable review cycle for the 4.9.193 release.
There are 14 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun 15 Sep 2019 01:03:32 PM UTC.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.193-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.193-rc1
yongduan <yongduan(a)tencent.com>
vhost: make sure log_num < in_num
Michael S. Tsirkin <mst(a)redhat.com>
vhost: block speculation of translated descriptors
Nathan Chancellor <natechancellor(a)gmail.com>
clk: s2mps11: Add used attribute to s2mps11_dt_match
Nicolas Boichat <drinkcat(a)chromium.org>
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Only read OGM tvlv_len after buffer len check
Eric Dumazet <edumazet(a)google.com>
batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
Tiwei Bie <tiwei.bie(a)intel.com>
vhost/test: fix build for vhost test
Eric Dumazet <edumazet(a)google.com>
ip6: fix skb leak in ip6frag_expire_frag_queue()
Cong Wang <xiyou.wangcong(a)gmail.com>
xfrm: clean up xfrm protocol checks
Gustavo Romero <gromero(a)linux.ibm.com>
powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
Dan Carpenter <dan.carpenter(a)oracle.com>
drm/vmwgfx: Fix double free in vmw_recv_msg()
Liangyan <liangyan.peng(a)linux.alibaba.com>
sched/fair: Don't assign runtime for throttled cfs_rq
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek - Fix overridden device-specific initialization
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda - Fix potential endless loop at applying quirks
-------------
Diffstat:
Makefile | 4 ++--
arch/powerpc/kernel/process.c | 3 ++-
drivers/clk/clk-s2mps11.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 8 +++-----
drivers/vhost/test.c | 13 +++++++++----
drivers/vhost/vhost.c | 10 ++++++----
include/net/ipv6_frag.h | 1 -
include/net/xfrm.h | 17 +++++++++++++++++
kernel/sched/fair.c | 5 +++++
net/batman-adv/bat_iv_ogm.c | 20 +++++++++++++-------
net/batman-adv/netlink.c | 2 +-
net/key/af_key.c | 4 +++-
net/xfrm/xfrm_state.c | 2 +-
net/xfrm/xfrm_user.c | 14 +-------------
scripts/decode_stacktrace.sh | 2 +-
sound/pci/hda/hda_auto_parser.c | 4 ++--
sound/pci/hda/hda_generic.c | 3 ++-
sound/pci/hda/hda_generic.h | 1 +
sound/pci/hda/patch_realtek.c | 2 ++
19 files changed, 72 insertions(+), 45 deletions(-)
This is the start of the stable review cycle for the 5.2.15 release.
There are 37 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun 15 Sep 2019 01:03:32 PM UTC.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.15-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.2.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.2.15-rc1
yongduan <yongduan(a)tencent.com>
vhost: make sure log_num < in_num
Michael S. Tsirkin <mst(a)redhat.com>
vhost: block speculation of translated descriptors
Filipe Manana <fdmanana(a)suse.com>
Btrfs: fix unwritten extent buffers and hangs on future writeback attempts
Lionel Landwerlin <lionel.g.landwerlin(a)intel.com>
drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT
John Harrison <John.C.Harrison(a)Intel.com>
drm/i915: Add whitelist workarounds for ICL
Lionel Landwerlin <lionel.g.landwerlin(a)intel.com>
drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
John Harrison <John.C.Harrison(a)Intel.com>
drm/i915: Support whitelist workarounds on all engines
John Harrison <John.C.Harrison(a)Intel.com>
drm/i915: Support flags in whitlist WAs
Halil Pasic <pasic(a)linux.ibm.com>
virtio/s390: fix race on airq_areas[]
André Draszik <git(a)andred.net>
usb: chipidea: imx: fix EPROBE_DEFER support during driver probe
Peter Chen <peter.chen(a)nxp.com>
usb: chipidea: imx: add imx7ulp support
Baolin Wang <baolin.wang(a)linaro.org>
mmc: sdhci-sprd: Fix the incorrect soft reset operation when runtime resuming
Ville Syrjälä <ville.syrjala(a)linux.intel.com>
drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV
Kenneth Graunke <kenneth(a)whitecape.org>
drm/i915: Disable SAMPLER_STATE prefetching on all Gen11 steppings.
Kaike Wan <kaike.wan(a)intel.com>
IB/hfi1: Unreserve a flushed OPFN request
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/{rdmavt, qib, hfi1}: Convert to new completion API
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/rdmavt: Add new completion inline
Coly Li <colyli(a)suse.de>
bcache: fix race in btree_flush_write()
Coly Li <colyli(a)suse.de>
bcache: add comments for mutex_lock(&b->write_lock)
Coly Li <colyli(a)suse.de>
bcache: only clear BTREE_NODE_dirty bit when it is set
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Only read OGM tvlv_len after buffer len check
Eric Dumazet <edumazet(a)google.com>
batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
Gustavo Romero <gromero(a)linux.ibm.com>
powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts
Gustavo Romero <gromero(a)linux.ibm.com>
powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
Christophe Leroy <christophe.leroy(a)c-s.fr>
powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup
Tiwei Bie <tiwei.bie(a)intel.com>
vhost/test: fix build for vhost test - again
Tiwei Bie <tiwei.bie(a)intel.com>
vhost/test: fix build for vhost test
Ben Skeggs <bskeggs(a)redhat.com>
drm/nouveau/sec2/gp102: add missing MODULE_FIRMWAREs
Dan Carpenter <dan.carpenter(a)oracle.com>
drm/vmwgfx: Fix double free in vmw_recv_msg()
Liangyan <liangyan.peng(a)linux.alibaba.com>
sched/fair: Don't assign runtime for throttled cfs_rq
Hui Wang <hui.wang(a)canonical.com>
ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre
Jian-Hong Pan <jian-hong(a)endlessm.com>
ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL
Sam Bazley <sambazley(a)fastmail.com>
ALSA: hda/realtek - Add quirk for HP Pavilion 15
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek - Fix overridden device-specific initialization
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda - Fix potential endless loop at applying quirks
David Jander <david(a)protonic.nl>
gpio: pca953x: use pca953x_read_regs instead of regmap_bulk_read
David Jander <david(a)protonic.nl>
gpio: pca953x: correct type of reg_direction
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/kernel/process.c | 21 +---
arch/powerpc/mm/nohash/tlb.c | 1 -
drivers/gpio/gpio-pca953x.c | 15 +--
drivers/gpu/drm/i915/i915_reg.h | 7 ++
drivers/gpu/drm/i915/intel_cdclk.c | 11 ++
drivers/gpu/drm/i915/intel_workarounds.c | 136 +++++++++++++++++----
.../gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 12 ++
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 8 +-
drivers/infiniband/hw/hfi1/rc.c | 28 +----
drivers/infiniband/hw/qib/qib_rc.c | 26 +---
drivers/infiniband/sw/rdmavt/qp.c | 31 ++---
drivers/md/bcache/btree.c | 49 +++++++-
drivers/md/bcache/btree.h | 2 +
drivers/md/bcache/journal.c | 7 ++
drivers/mmc/host/sdhci-acpi.c | 2 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
drivers/mmc/host/sdhci-of-at91.c | 2 +-
drivers/mmc/host/sdhci-pci-core.c | 4 +-
drivers/mmc/host/sdhci-pxav3.c | 2 +-
drivers/mmc/host/sdhci-s3c.c | 2 +-
drivers/mmc/host/sdhci-sprd.c | 2 +-
drivers/mmc/host/sdhci-xenon.c | 2 +-
drivers/mmc/host/sdhci.c | 4 +-
drivers/mmc/host/sdhci.h | 2 +-
drivers/s390/virtio/virtio_ccw.c | 3 +
drivers/usb/chipidea/ci_hdrc_imx.c | 43 ++++++-
drivers/usb/chipidea/usbmisc_imx.c | 4 +
drivers/vhost/test.c | 13 +-
drivers/vhost/vhost.c | 10 +-
fs/btrfs/extent_io.c | 35 ++++--
include/linux/usb/chipidea.h | 1 +
include/rdma/rdmavt_qp.h | 117 +++++++++++-------
kernel/sched/fair.c | 5 +
net/batman-adv/bat_iv_ogm.c | 20 +--
net/batman-adv/netlink.c | 2 +-
sound/pci/hda/hda_auto_parser.c | 4 +-
sound/pci/hda/hda_generic.c | 3 +-
sound/pci/hda/hda_generic.h | 1 +
sound/pci/hda/patch_realtek.c | 17 +++
40 files changed, 439 insertions(+), 221 deletions(-)
Set the size of the tpm_buf correctly. Now it is set to the header
length by tpm_buf_init().
Reported-by: Mimi Zohar <zohar(a)linux.ibm.com>
Cc: stable(a)vger.kernel.org
Fixes: 412eb585587a ("use tpm_buf in tpm_transmit_cmd() as the IO parameter")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com>
---
drivers/char/tpm/tpm-interface.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index d9ace5480665..4aa7e7f91139 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -363,6 +363,8 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)
goto out;
memcpy(buf.data, cmd, buflen);
+ buf.length = buflen;
+
rc = tpm_transmit_cmd(chip, &buf, 0, "attempting to a send a command");
tpm_buf_destroy(&buf);
out:
--
2.20.1
>From Tegra186 onwards OUTSTANDING_REQUESTS field is added in channel
configuration register(bits 7:4) which defines the maximum number of reads
from the source and writes to the destination that may be outstanding at
any given point of time. This field must be programmed with a value
between 1 and 8. A value of 0 will prevent any transfers from happening.
Thus added 'has_outstanding_reqs' bool member in chip data structure and is
set to false for Tegra210, since the field is not applicable. For Tegra186
it is set to true and channel configuration is updated with maximum
outstanding requests.
Fixes: 433de642a76c ("dmaengine: tegra210-adma: add support for Tegra186/Tegra194")
Cc: stable(a)vger.kernel.org
Signed-off-by: Sameer Pujar <spujar(a)nvidia.com>
---
drivers/dma/tegra210-adma.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index 5f8adf5..e19732f 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -66,6 +66,8 @@
#define TEGRA186_FIFO_CTRL_DEFAULT (TEGRA186_ADMA_CH_FIFO_CTRL_TXSIZE(3) | \
TEGRA186_ADMA_CH_FIFO_CTRL_RXSIZE(3))
+#define TEGRA186_ADMA_CH_CONFIG_OUTSTANDING_REQS(reqs) (reqs << 4)
+
#define ADMA_CH_REG_FIELD_VAL(val, mask, shift) (((val) & mask) << shift)
struct tegra_adma;
@@ -77,6 +79,7 @@ struct tegra_adma;
* @ch_req_tx_shift: Register offset for AHUB transmit channel select.
* @ch_req_rx_shift: Register offset for AHUB receive channel select.
* @ch_base_offset: Register offset of DMA channel registers.
+ * @has_outstanding_reqs: If DMA channel can have outstanding requests.
* @ch_fifo_ctrl: Default value for channel FIFO CTRL register.
* @ch_req_mask: Mask for Tx or Rx channel select.
* @ch_req_max: Maximum number of Tx or Rx channels available.
@@ -95,6 +98,7 @@ struct tegra_adma_chip_data {
unsigned int ch_req_max;
unsigned int ch_reg_size;
unsigned int nr_channels;
+ bool has_outstanding_reqs;
};
/*
@@ -594,6 +598,8 @@ static int tegra_adma_set_xfer_params(struct tegra_adma_chan *tdc,
ADMA_CH_CTRL_FLOWCTRL_EN;
ch_regs->config |= cdata->adma_get_burst_config(burst_size);
ch_regs->config |= ADMA_CH_CONFIG_WEIGHT_FOR_WRR(1);
+ if (cdata->has_outstanding_reqs)
+ ch_regs->config |= TEGRA186_ADMA_CH_CONFIG_OUTSTANDING_REQS(8);
ch_regs->fifo_ctrl = cdata->ch_fifo_ctrl;
ch_regs->tc = desc->period_len & ADMA_CH_TC_COUNT_MASK;
@@ -778,6 +784,7 @@ static const struct tegra_adma_chip_data tegra210_chip_data = {
.ch_req_tx_shift = 28,
.ch_req_rx_shift = 24,
.ch_base_offset = 0,
+ .has_outstanding_reqs = false,
.ch_fifo_ctrl = TEGRA210_FIFO_CTRL_DEFAULT,
.ch_req_mask = 0xf,
.ch_req_max = 10,
@@ -792,6 +799,7 @@ static const struct tegra_adma_chip_data tegra186_chip_data = {
.ch_req_tx_shift = 27,
.ch_req_rx_shift = 22,
.ch_base_offset = 0x10000,
+ .has_outstanding_reqs = true,
.ch_fifo_ctrl = TEGRA186_FIFO_CTRL_DEFAULT,
.ch_req_mask = 0x1f,
.ch_req_max = 20,
--
2.7.4
This is the start of the stable review cycle for the 4.4.193 release.
There are 9 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun 15 Sep 2019 01:03:32 PM UTC.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.193-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.4.193-rc1
yongduan <yongduan(a)tencent.com>
vhost: make sure log_num < in_num
Dave Jones <davej(a)codemonkey.org.uk>
af_packet: tone down the Tx-ring unsupported spew.
Zhenzhong Duan <zhenzhong.duan(a)oracle.com>
x86, boot: Remove multiple copy of static function sanitize_boot_params()
Nathan Chancellor <natechancellor(a)gmail.com>
clk: s2mps11: Add used attribute to s2mps11_dt_match
Nicolas Boichat <drinkcat(a)chromium.org>
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
Tiwei Bie <tiwei.bie(a)intel.com>
vhost/test: fix build for vhost test
Cong Wang <xiyou.wangcong(a)gmail.com>
xfrm: clean up xfrm protocol checks
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/realtek - Fix overridden device-specific initialization
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda - Fix potential endless loop at applying quirks
-------------
Diffstat:
Makefile | 4 ++--
arch/x86/boot/compressed/misc.c | 1 +
arch/x86/boot/compressed/misc.h | 1 -
drivers/clk/clk-s2mps11.c | 2 +-
drivers/vhost/test.c | 13 +++++++++----
drivers/vhost/vhost.c | 4 ++--
include/net/xfrm.h | 17 +++++++++++++++++
net/key/af_key.c | 4 +++-
net/packet/af_packet.c | 2 +-
net/xfrm/xfrm_state.c | 2 +-
net/xfrm/xfrm_user.c | 14 +-------------
scripts/decode_stacktrace.sh | 2 +-
sound/pci/hda/hda_auto_parser.c | 4 ++--
sound/pci/hda/hda_generic.c | 3 ++-
sound/pci/hda/hda_generic.h | 1 +
sound/pci/hda/patch_realtek.c | 2 ++
16 files changed, 46 insertions(+), 30 deletions(-)
Hello,
We ran automated tests on a patchset that was proposed for merging into this
kernel tree. The patches were applied to:
Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 997fee5473ce - Linux 5.2.14
The results of these automated tests are provided below.
Overall result: PASSED
Merge: OK
Compile: OK
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://artifacts.cki-project.org/pipelines/166424
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Merge testing
-------------
We cloned this repository and checked out the following commit:
Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 997fee5473ce - Linux 5.2.14
We grabbed the 652de59d50b1 commit of the stable queue repository.
We then merged the patchset with `git am`:
gpio-pca953x-correct-type-of-reg_direction.patch
gpio-pca953x-use-pca953x_read_regs-instead-of-regmap_bulk_read.patch
alsa-hda-fix-potential-endless-loop-at-applying-quirks.patch
alsa-hda-realtek-fix-overridden-device-specific-initialization.patch
alsa-hda-realtek-add-quirk-for-hp-pavilion-15.patch
alsa-hda-realtek-enable-internal-speaker-headset-mic-of-asus-ux431fl.patch
alsa-hda-realtek-fix-the-problem-of-two-front-mics-on-a-thinkcentre.patch
sched-fair-don-t-assign-runtime-for-throttled-cfs_rq.patch
drm-vmwgfx-fix-double-free-in-vmw_recv_msg.patch
drm-nouveau-sec2-gp102-add-missing-module_firmwares.patch
vhost-test-fix-build-for-vhost-test.patch
vhost-test-fix-build-for-vhost-test-again.patch
powerpc-64e-drop-stale-call-to-smp_processor_id-which-hangs-smp-startup.patch
powerpc-tm-fix-fp-vmx-unavailable-exceptions-inside-a-transaction.patch
powerpc-tm-fix-restoring-fp-vmx-facility-incorrectly-on-interrupts.patch
batman-adv-fix-uninit-value-in-batadv_netlink_get_ifindex.patch
batman-adv-only-read-ogm-tvlv_len-after-buffer-len-check.patch
bcache-only-clear-btree_node_dirty-bit-when-it-is-se.patch
bcache-add-comments-for-mutex_lock-b-write_lock.patch
bcache-fix-race-in-btree_flush_write.patch
ib-rdmavt-add-new-completion-inline.patch
ib-rdmavt-qib-hfi1-convert-to-new-completion-api.patch
ib-hfi1-unreserve-a-flushed-opfn-request.patch
drm-i915-disable-sampler_state-prefetching-on-all-ge.patch
drm-i915-make-sure-cdclk-is-high-enough-for-dp-audio.patch
mmc-sdhci-sprd-fix-the-incorrect-soft-reset-operatio.patch
usb-chipidea-imx-add-imx7ulp-support.patch
usb-chipidea-imx-fix-eprobe_defer-support-during-dri.patch
virtio-s390-fix-race-on-airq_areas.patch
drm-i915-support-flags-in-whitlist-was.patch
drm-i915-support-whitelist-workarounds-on-all-engine.patch
drm-i915-whitelist-ps_-depth-invocation-_count.patch
drm-i915-add-whitelist-workarounds-for-icl.patch
drm-i915-icl-whitelist-ps_-depth-invocation-_count.patch
btrfs-fix-unwritten-extent-buffers-and-hangs-on-future-writeback-attempts.patch
vhost-make-sure-log_num-in_num.patch
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
ppc64le:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
s390x:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
x86_64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
✅ storage: software RAID testing [2]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [3]
✅ Podman system integration test (as user) [3]
⚡⚡⚡ Loopdev Sanity [4]
✅ jvm test suite [5]
✅ AMTU (Abstract Machine Test Utility) [6]
✅ LTP: openposix test suite [7]
✅ Networking socket: fuzz [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
✅ Usex - version 1.9-29 [13]
✅ stress: stress-ng [14]
🚧 ✅ LTP lite [15]
🚧 ✅ ALSA PCM loopback test [16]
🚧 ✅ ALSA Control (mixer) Userspace Element test [17]
ppc64le:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
✅ storage: software RAID testing [2]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [3]
✅ Podman system integration test (as user) [3]
⚡⚡⚡ Loopdev Sanity [4]
✅ jvm test suite [5]
✅ AMTU (Abstract Machine Test Utility) [6]
✅ LTP: openposix test suite [7]
✅ Networking socket: fuzz [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
✅ Usex - version 1.9-29 [13]
🚧 ✅ LTP lite [15]
🚧 ✅ ALSA PCM loopback test [16]
🚧 ✅ ALSA Control (mixer) Userspace Element test [17]
s390x:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
x86_64:
Host 1:
✅ Boot test [0]
✅ selinux-policy: serge-testsuite [1]
✅ storage: software RAID testing [2]
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test [0]
✅ Podman system integration test (as root) [3]
✅ Podman system integration test (as user) [3]
⚡⚡⚡ Loopdev Sanity [4]
✅ jvm test suite [5]
✅ AMTU (Abstract Machine Test Utility) [6]
✅ LTP: openposix test suite [7]
✅ Networking socket: fuzz [8]
✅ audit: audit testsuite test [9]
✅ httpd: mod_ssl smoke sanity [10]
✅ iotop: sanity [11]
✅ tuned: tune-processes-through-perf [12]
✅ pciutils: sanity smoke test [18]
✅ Usex - version 1.9-29 [13]
✅ stress: stress-ng [14]
🚧 ✅ LTP lite [15]
🚧 ✅ ALSA PCM loopback test [16]
🚧 ✅ ALSA Control (mixer) Userspace Element test [17]
Test source:
💚 Pull requests are welcome for new tests or improvements to existing tests!
[0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se…
[2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/swra…
[3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/container/p…
[4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/…
[5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/jvm
[6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu
[7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/…
[9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud…
[10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt…
[11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot…
[12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun…
[13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…
[14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres…
[15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution…
[16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/sound/aloop
[17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/sound/user-…
[18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#pciutils/san…
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
From: Jan-Marek Glogowski <glogow(a)fbihome.de>
[ Upstream commit 3cf71bc9904d7ee4a25a822c5dcb54c7804ea388 ]
This re-applies the workaround for "some DP sinks, [which] are a
little nuts" from commit 1a36147bb939 ("drm/i915: Perform link
quality check unconditionally during long pulse").
It makes the secondary AOC E2460P monitor connected via DP to an
acer Veriton N4640G usable again.
This hunk was dropped in commit c85d200e8321 ("drm/i915: Move SST
DP link retraining into the ->post_hotplug() hook")
Fixes: c85d200e8321 ("drm/i915: Move SST DP link retraining into the ->post_hotplug() hook")
[Cleaned up commit message, added stable cc]
Signed-off-by: Lyude Paul <lyude(a)redhat.com>
Signed-off-by: Jan-Marek Glogowski <glogow(a)fbihome.de>
Cc: stable(a)vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20180825191035.3945-1-lyude@r…
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
---
drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f92079e19de8d..20cd4c8acecc3 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4739,6 +4739,22 @@ intel_dp_long_pulse(struct intel_connector *connector,
*/
status = connector_status_disconnected;
goto out;
+ } else {
+ /*
+ * If display is now connected check links status,
+ * there has been known issues of link loss triggering
+ * long pulse.
+ *
+ * Some sinks (eg. ASUS PB287Q) seem to perform some
+ * weird HPD ping pong during modesets. So we can apparently
+ * end up with HPD going low during a modeset, and then
+ * going back up soon after. And once that happens we must
+ * retrain the link to get a picture. That's in case no
+ * userspace component reacted to intermittent HPD dip.
+ */
+ struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
+
+ intel_dp_retrain_link(encoder, ctx);
}
/*
--
2.20.1
So I made a mess of it. Sent a pull before making sure it works on 32
bit too. Hope it's not too late to revert. Will teach me to be way more
careful in the near future.
The following changes since commit 060423bfdee3f8bc6e2c1bac97de24d5415e2bc4:
vhost: make sure log_num < in_num (2019-09-11 15:15:26 -0400)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus
for you to fetch changes up to 0d4a3f2abbef73b9e5bb5f12213c275565473588:
Revert "vhost: block speculation of translated descriptors" (2019-09-14 15:21:51 -0400)
----------------------------------------------------------------
virtio: a last minute revert
32 bit build got broken by the latest defence in depth patch.
Revert and we'll try again in the next cycle.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
----------------------------------------------------------------
Michael S. Tsirkin (1):
Revert "vhost: block speculation of translated descriptors"
drivers/vhost/vhost.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
On the ThinkPad P71, we have one eDP connector exposed along with 5 DP
connectors, resulting in a total of 11 TMDS encoders. Since the GPU on
this system is also capable of MST, we create an additional 4 fake MST
encoders for each DP port. Unfortunately, we also do this for the eDP
port as well, resulting in:
1 eDP port: +1 TMDS encoder
+4 DPMST encoders
5 DP ports: +2 TMDS encoders
+4 DPMST encoders
*5 ports
== 35 encoders
Which breaks things, since DRM has a hard coded limit of 32 encoders.
So, fix this by not creating MSTMs for any eDP connectors. This brings
us down to 31 encoders, although we can do better.
This fixes driver probing for nouveau on the ThinkPad P71.
Signed-off-by: Lyude Paul <lyude(a)redhat.com>
Cc: stable(a)vger.kernel.org
---
drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 307584107d77..b46be8a091e9 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1603,7 +1603,8 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
nv_encoder->aux = aux;
}
- if ((data = nvbios_dp_table(bios, &ver, &hdr, &cnt, &len)) &&
+ if (nv_connector->type != DCB_CONNECTOR_eDP &&
+ (data = nvbios_dp_table(bios, &ver, &hdr, &cnt, &len)) &&
ver >= 0x40 && (nvbios_rd08(bios, data + 0x08) & 0x04)) {
ret = nv50_mstm_new(nv_encoder, &nv_connector->aux, 16,
nv_connector->base.base.id,
--
2.21.0