April 2019 - Linux-stable-mirror

[PATCH-tip v7 01/20] locking/rwsem: Prevent decrement of reader count before increment

by Waiman Long

During my rwsem testing, it was found that after a down_read(), the reader count may occasionally become 0 or even negative. Consequently, a writer may steal the lock at that time and execute with the reader in parallel thus breaking the mutual exclusion guarantee of the write lock. In other words, both readers and writer can become rwsem owners simultaneously. The current reader wakeup code does it in one pass to clear waiter->task and put them into wake_q before fully incrementing the reader count. Once waiter->task is cleared, the corresponding reader may see it, finish the critical section and do unlock to decrement the count before the count is incremented. This is not a problem if there is only one reader to wake up as the count has been pre-incremented by 1. It is a problem if there are more than one readers to be woken up and writer can steal the lock. The wakeup was actually done in 2 passes before the v4.9 commit 70800c3c0cc5 ("locking/rwsem: Scan the wait_list for readers only once"). To fix this problem, the wakeup is now done in two passes again. In the first pass, we collect the readers and count them. The reader count is then fully incremented. In the second pass, the waiter->task is then cleared and they are put into wake_q to be woken up later. Fixes: 70800c3c0cc5 ("locking/rwsem: Scan the wait_list for readers only once") Cc: <stable(a)vger.kernel.org> Signed-off-by: Waiman Long <longman(a)redhat.com> --- kernel/locking/rwsem-xadd.c | 46 +++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c index 6b3ee9948bf1..0b1f77957240 100644 --- a/kernel/locking/rwsem-xadd.c +++ b/kernel/locking/rwsem-xadd.c @@ -130,6 +130,7 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, { struct rwsem_waiter *waiter, *tmp; long oldcount, woken = 0, adjustment = 0; + struct list_head wlist; /* * Take a peek at the queue head waiter such that we can determine @@ -188,18 +189,43 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, * of the queue. We know that woken will be at least 1 as we accounted * for above. Note we increment the 'active part' of the count by the * number of readers before waking any processes up. + * + * We have to do wakeup in 2 passes to prevent the possibility that + * the reader count may be decremented before it is incremented. It + * is because the to-be-woken waiter may not have slept yet. So it + * may see waiter->task got cleared, finish its critical section and + * do an unlock before the reader count increment. + * + * 1) Collect the read-waiters in a separate list, count them and + * fully increment the reader count in rwsem. + * 2) For each waiters in the new list, clear waiter->task and + * put them into wake_q to be woken up later. */ - list_for_each_entry_safe(waiter, tmp, &sem->wait_list, list) { - struct task_struct *tsk; - + list_for_each_entry(waiter, &sem->wait_list, list) { if (waiter->type == RWSEM_WAITING_FOR_WRITE) break; woken++; - tsk = waiter->task; + } + list_cut_before(&wlist, &sem->wait_list, &waiter->list); + + adjustment = woken * RWSEM_ACTIVE_READ_BIAS - adjustment; + lockevent_cond_inc(rwsem_wake_reader, woken); + if (list_empty(&sem->wait_list)) { + /* hit end of list above */ + adjustment -= RWSEM_WAITING_BIAS; + } + + if (adjustment) + atomic_long_add(adjustment, &sem->count); + + /* 2nd pass */ + list_for_each_entry_safe(waiter, tmp, &wlist, list) { + struct task_struct *tsk; + tsk = waiter->task; get_task_struct(tsk); - list_del(&waiter->list); + /* * Ensure calling get_task_struct() before setting the reader * waiter to nil such that rwsem_down_read_failed() cannot @@ -213,16 +239,6 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, */ wake_q_add_safe(wake_q, tsk); } - - adjustment = woken * RWSEM_ACTIVE_READ_BIAS - adjustment; - lockevent_cond_inc(rwsem_wake_reader, woken); - if (list_empty(&sem->wait_list)) { - /* hit end of list above */ - adjustment -= RWSEM_WAITING_BIAS; - } - - if (adjustment) - atomic_long_add(adjustment, &sem->count); } /* -- 2.18.1

4 years, 12 months

2
2
0 0

[PATCH 5.0 00/89] 5.0.11-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.0.11 release. There are 89 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 Thu 02 May 2019 11:35:03 AM 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.0.11-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.0.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.0.11-rc1 Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: don't leak IV and record seq when offload fails Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: avoid potential deadlock in tls_set_device_offload_rx() Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix use-after-free after xdp_return_frame Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix the max MTU check in case of XDP Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum: Put MC TCs into DWRR mode Ido Schimmel <idosch(a)mellanox.com> mlxsw: pci: Reincrease PCI reset timeout Tao Ren <taoren(a)fb.com> net/ncsi: handle overflow when incrementing mac address Ilias Apalodimas <ilias.apalodimas(a)linaro.org> net: socionext: replace napi_alloc_frag with the netdev variant on init Hangbin Liu <liuhangbin(a)gmail.com> team: fix possible recursive locking when add slaves Su Bao Cheng <baocheng.su(a)siemens.com> stmmac: pci: Adjust IOT2000 matching Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: fix refcount adjustment in fallback Vinod Koul <vkoul(a)kernel.org> net: stmmac: move stmmac_check_ether_addr() to driver probe Eric Dumazet <edumazet(a)google.com> net/rose: fix unbound loop in rose_loopback_timer() Zhu Yanjun <yanjun.zhu(a)oracle.com> net: rds: exchange of 8K and 1M pool Erez Alfasi <ereza(a)mellanox.com> net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query Amit Cohen <amitc(a)mellanox.com> mlxsw: spectrum: Fix autoneg status in ethtool ZhangXiaoxu <zhangxiaoxu5(a)huawei.com> ipv4: set the tcp_min_rtt_wlen range from 0 to one day Eric Dumazet <edumazet(a)google.com> ipv4: add sanity checks in ipv4_link_failure() Linus Torvalds <torvalds(a)linux-foundation.org> rdma: fix build errors on s390 and MIPS due to bad ZERO_PAGE use Daniel Borkmann <daniel(a)iogearbox.net> x86/retpolines: Disable switch jump tables when retpolines are enabled Daniel Borkmann <daniel(a)iogearbox.net> x86, retpolines: Raise limit for generating indirect calls from switch-case Al Viro <viro(a)zeniv.linux.org.uk> Fix aio_poll() races Al Viro <viro(a)zeniv.linux.org.uk> aio: store event at final iocb_put() Al Viro <viro(a)zeniv.linux.org.uk> aio: keep io_event in aio_kiocb Al Viro <viro(a)zeniv.linux.org.uk> aio: fold lookup_kiocb() into its sole caller Linus Torvalds <torvalds(a)linux-foundation.org> pin iocb through aio. Eric Dumazet <edumazet(a)google.com> rxrpc: fix race condition in rxrpc_input_packet() Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> net/rds: Check address length before reading address family YueHaibing <yuehaibing(a)huawei.com> net: netrom: Fix error cleanup path of nr_proto_init Xin Long <lucien.xin(a)gmail.com> tipc: check link name with right length in tipc_nl_compat_link_set Xin Long <lucien.xin(a)gmail.com> tipc: check bearer name with right length in tipc_nl_compat_bearer_enable Yue Haibing <yuehaibing(a)huawei.com> fm10k: Fix a potential NULL pointer dereference Florian Westphal <fw(a)strlen.de> netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family. Johannes Berg <johannes.berg(a)intel.com> mac80211_hwsim: calculate if_combination.max_interfaces luca abeni <luca.abeni(a)santannapisa.it> sched/deadline: Correctly handle active 0-lag timers Todd Kjos <tkjos(a)android.com> binder: fix handling of misaligned binder object Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> workqueue: Try to catch flush_work() without INIT_WORK(). Linus Torvalds <torvalds(a)linux-foundation.org> slip: make slhc_free() silently accept an error pointer Xin Long <lucien.xin(a)gmail.com> tipc: handle the err returned from cmd header function Dongli Zhang <dongli.zhang(a)oracle.com> loop: do not print warn message if partition scan is successful Dan Carpenter <dan.carpenter(a)oracle.com> ext4: fix some error pointer dereferences Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: Consolidate LPM checks to avoid enabling LPM twice Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: Add new USB LPM helpers Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> drm/vc4: Fix compilation error reported by kbuild test bot Dave Airlie <airlied(a)redhat.com> Revert "drm/i915/fbdev: Actually configure untiled displays" Christian König <christian.koenig(a)amd.com> drm/ttm: fix re-init of global structures Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> drm/vc4: Fix memory leak during gpu reset. Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm/radix: Make Radix require HUGETLB_PAGE Ard Biesheuvel <ard.biesheuvel(a)linaro.org> ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache Shun-Chih Yu <shun-chih.yu(a)mediatek.com> dmaengine: mediatek-cqdma: fix wrong register usage in mtk_cqdma_start Achim Dahlhoff <Achim.Dahlhoff(a)de.bosch.com> dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status Dirk Behme <dirk.behme(a)de.bosch.com> dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid Alex Williamson <alex.williamson(a)redhat.com> vfio/type1: Limit DMA mappings per container Lucas Stach <l.stach(a)pengutronix.de> Input: synaptics-rmi4 - write config register values to the right offset Harry Pan <harry.pan(a)intel.com> perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters NeilBrown <neilb(a)suse.com> sunrpc: don't mark uninitialised items as VALID. Jeff Layton <jlayton(a)kernel.org> nfsd: wake blocked file lock waiters before sending callback Jeff Layton <jlayton(a)kernel.org> nfsd: wake waiters blocked on file_lock before deleting it Trond Myklebust <trondmy(a)gmail.com> nfsd: Don't release the callback slot unless it was actually held Yan, Zheng <zyan(a)redhat.com> ceph: fix ci->i_head_snapc leak Jeff Layton <jlayton(a)kernel.org> ceph: ensure d_name stability in ceph_dentry_hash() Jeff Layton <jlayton(a)kernel.org> ceph: only use d_name directly when parent is locked Xie XiuQi <xiexiuqi(a)huawei.com> sched/numa: Fix a possible divide-by-zero Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/ucontext: Fix regression with disassociate Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/mlx5: Do not allow the user to write to the clock page Josh Collier <josh.d.collier(a)intel.com> IB/rdmavt: Fix frwr memory registration Bjorn Andersson <bjorn.andersson(a)linaro.org> arm64: mm: Ensure tail of unaligned initrd is reserved Mel Gorman <mgorman(a)techsingularity.net> mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model Peter Zijlstra <peterz(a)infradead.org> trace: Fix preempt_enable_no_resched() abuse Aurelien Jarno <aurelien(a)aurel32.net> MIPS: scall64-o32: Fix indirect syscall number load YueHaibing <yuehaibing(a)huawei.com> lib/Kconfig.debug: fix build error without CONFIG_BLOCK Jérôme Glisse <jglisse(a)redhat.com> zram: pass down the bvec we need to read into in the work struct Baolin Wang <baolin.wang(a)linaro.org> gpio: eic: sprd: Fix incorrect irq type setting for the sync EIC Herbert Xu <herbert(a)gondor.apana.org.au> crypto: lrw - Fix atomic sleep when walking skcipher Herbert Xu <herbert(a)gondor.apana.org.au> crypto: xts - Fix atomic sleep when walking skcipher Jann Horn <jannh(a)google.com> tracing: Fix buffer_ref pipe ops Wenwen Wang <wang6495(a)umn.edu> tracing: Fix a memory leak by early error exit in trace_pid_write() Frank Sorenson <sorenson(a)redhat.com> cifs: do not attempt cifs operation on smb2+ rename error Jérôme Glisse <jglisse(a)redhat.com> cifs: fix page reference leak with readv/writev Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix memory leak in SMB2_read Paolo Valente <paolo.valente(a)linaro.org> block, bfq: fix use after free in bfq_bfqq_expire YueHaibing <yuehaibing(a)huawei.com> fs/proc/proc_sysctl.c: Fix a NULL pointer dereference Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Move to ACT_INIT state Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64 Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: gth: Fix an off-by-one in output unassigning Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: bogus EBUSY in helper removal from transaction Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: bogus EBUSY when deleting set after flush ------------- Diffstat: Documentation/networking/ip-sysctl.txt | 1 + Documentation/sysctl/vm.txt | 16 +- Makefile | 4 +- arch/arm/boot/compressed/head.S | 16 +- arch/arm64/mm/init.c | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/powerpc/configs/skiroot_defconfig | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 2 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/x86/Makefile | 9 + arch/x86/events/intel/cstate.c | 10 +- block/bfq-iosched.c | 15 +- block/bfq-iosched.h | 2 +- block/bfq-wf2q.c | 17 +- crypto/lrw.c | 6 +- crypto/xts.c | 6 +- drivers/android/binder_alloc.c | 18 +- drivers/block/loop.c | 5 +- drivers/block/zram/zram_drv.c | 5 +- drivers/dma/mediatek/mtk-cqdma.c | 2 +- drivers/dma/sh/rcar-dmac.c | 30 +++- drivers/gpio/gpio-eic-sprd.c | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 12 +- drivers/gpu/drm/ttm/ttm_bo.c | 10 +- drivers/gpu/drm/ttm/ttm_memory.c | 5 +- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- drivers/hwtracing/intel_th/gth.c | 2 +- drivers/infiniband/core/uverbs.h | 1 + drivers/infiniband/core/uverbs_main.c | 52 +++++- drivers/infiniband/hw/mlx5/main.c | 10 +- drivers/infiniband/sw/rdmavt/mr.c | 17 +- drivers/input/rmi4/rmi_f11.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 24 ++- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 3 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 - drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +- drivers/net/ethernet/socionext/netsec.c | 11 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 8 +- drivers/net/slip/slhc.c | 2 +- drivers/net/team/team.c | 7 + drivers/net/wireless/mac80211_hwsim.c | 19 +- drivers/usb/core/driver.c | 23 ++- drivers/usb/core/hub.c | 16 +- drivers/usb/core/message.c | 3 +- drivers/usb/core/sysfs.c | 5 +- drivers/usb/core/usb.h | 10 +- drivers/vfio/vfio_iommu_type1.c | 14 ++ fs/aio.c | 200 +++++++++------------ fs/ceph/dir.c | 6 +- fs/ceph/mds_client.c | 70 ++++++-- fs/ceph/snap.c | 7 +- fs/cifs/file.c | 15 +- fs/cifs/inode.c | 4 + fs/cifs/misc.c | 23 ++- fs/cifs/smb2pdu.c | 1 + fs/ext4/xattr.c | 3 + fs/nfs/super.c | 3 +- fs/nfsd/nfs4callback.c | 8 +- fs/nfsd/nfs4state.c | 12 +- fs/nfsd/state.h | 1 + fs/proc/proc_sysctl.c | 6 +- fs/splice.c | 4 +- include/drm/ttm/ttm_bo_driver.h | 1 - include/linux/etherdevice.h | 12 ++ include/linux/pipe_fs_i.h | 1 + include/net/netfilter/nf_tables.h | 6 + include/net/netrom.h | 2 +- kernel/sched/deadline.c | 3 +- kernel/sched/fair.c | 4 + kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace.c | 33 ++-- kernel/workqueue.c | 3 + lib/Kconfig.debug | 1 + mm/page_alloc.c | 13 ++ net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/route.c | 32 +++- net/ipv4/sysctl_net_ipv4.c | 5 +- net/ncsi/ncsi-rsp.c | 6 +- net/netfilter/nf_tables_api.c | 28 ++- net/netfilter/nft_dynset.c | 13 +- net/netfilter/nft_lookup.c | 13 +- net/netfilter/nft_objref.c | 32 +++- net/netrom/af_netrom.c | 76 +++++--- net/netrom/nr_loopback.c | 2 +- net/netrom/nr_route.c | 2 +- net/netrom/sysctl_net_netrom.c | 5 +- net/rds/af_rds.c | 3 + net/rds/bind.c | 2 + net/rds/ib_fmr.c | 11 ++ net/rds/ib_rdma.c | 3 - net/rose/rose_loopback.c | 27 +-- net/rxrpc/input.c | 12 +- net/rxrpc/local_object.c | 3 +- net/sunrpc/cache.c | 3 + net/tipc/netlink_compat.c | 24 ++- net/tls/tls_device.c | 4 +- net/tls/tls_device_fallback.c | 13 +- net/tls/tls_main.c | 5 +- net/tls/tls_sw.c | 3 + sound/pci/hda/patch_realtek.c | 41 +++-- 105 files changed, 874 insertions(+), 396 deletions(-)

4 years, 12 months

9
105
0 0

[PATCH v6 00/12] mm: Sub-section memory hotplug support

by Dan Williams

Changes since v5 [1]: - Rebase on next-20190416 and the new 'struct mhp_restrictions' infrastructure. - Extend mhp_restrictions to the 'remove' case so the sub-section policy can be clarified with respect to the memblock-api in a symmetric manner with the 'add' case. - Kill is_dev_zone() since cleanups have now made it moot [1]: https://lwn.net/Articles/783808/ --- The memory hotplug section is an arbitrary / convenient unit for memory hotplug. 'Section-size' units have bled into the user interface ('memblock' sysfs) and can not be changed without breaking existing userspace. The section-size constraint, while mostly benign for typical memory hotplug, has and continues to wreak havoc with 'device-memory' use cases, persistent memory (pmem) in particular. Recall that pmem uses devm_memremap_pages(), and subsequently arch_add_memory(), to allocate a 'struct page' memmap for pmem. However, it does not use the 'bottom half' of memory hotplug, i.e. never marks pmem pages online and never exposes the userspace memblock interface for pmem. This leaves an opening to redress the section-size constraint. To date, the libnvdimm subsystem has attempted to inject padding to satisfy the internal constraints of arch_add_memory(). Beyond complicating the code, leading to bugs [2], wasting memory, and limiting configuration flexibility, the padding hack is broken when the platform changes this physical memory alignment of pmem from one boot to the next. Device failure (intermittent or permanent) and physical reconfiguration are events that can cause the platform firmware to change the physical placement of pmem on a subsequent boot, and device failure is an everyday event in a data-center. It turns out that sections are only a hard requirement of the user-facing interface for memory hotplug and with a bit more infrastructure sub-section arch_add_memory() support can be added for kernel internal usages like devm_memremap_pages(). Here is an analysis of the current design assumptions in the current code and how they are addressed in the new implementation: Current design assumptions: - Sections that describe boot memory (early sections) are never unplugged / removed. - pfn_valid(), in the CONFIG_SPARSEMEM_VMEMMAP=y, case devolves to a valid_section() check - __add_pages() and helper routines assume all operations occur in PAGES_PER_SECTION units. - The memblock sysfs interface only comprehends full sections New design assumptions: - Sections are instrumented with a sub-section bitmask to track (on x86) individual 2MB sub-divisions of a 128MB section. - Partially populated early sections can be extended with additional sub-sections, and those sub-sections can be removed with arch_remove_memory(). With this in place we no longer lose usable memory capacity to padding. - pfn_valid() is updated to look deeper than valid_section() to also check the active-sub-section mask. This indication is in the same cacheline as the valid_section() so the performance impact is expected to be negligible. So far the lkp robot has not reported any regressions. - Outside of the core vmemmap population routines which are replaced, other helper routines like shrink_{zone,pgdat}_span() are updated to handle the smaller granularity. Core memory hotplug routines that deal with online memory are not touched. - The existing memblock sysfs user api guarantees / assumptions are not touched since this capability is limited to !online !memblock-sysfs-accessible sections. Meanwhile the issue reports continue to roll in from users that do not understand when and how the 128MB constraint will bite them. The current implementation relied on being able to support at least one misaligned namespace, but that immediately falls over on any moderately complex namespace creation attempt. Beyond the initial problem of 'System RAM' colliding with pmem, and the unsolvable problem of physical alignment changes, Linux is now being exposed to platforms that collide pmem ranges with other pmem ranges by default [3]. In short, devm_memremap_pages() has pushed the venerable section-size constraint past the breaking point, and the simplicity of section-aligned arch_add_memory() is no longer tenable. These patches are exposed to the kbuild robot on my libnvdimm-pending branch [4], and a preview of the unit test for this functionality is available on the 'subsection-pending' branch of ndctl [5]. [2]: https://lore.kernel.org/r/155000671719.348031.2347363160141119237.stgit@dwi… [3]: https://github.com/pmem/ndctl/issues/76 [4]: https://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm.git/log/?h=libn… [5]: https://github.com/pmem/ndctl/commit/7c59b4867e1c --- Dan Williams (12): mm/sparsemem: Introduce struct mem_section_usage mm/sparsemem: Introduce common definitions for the size and mask of a section mm/sparsemem: Add helpers track active portions of a section at boot mm/hotplug: Prepare shrink_{zone,pgdat}_span for sub-section removal mm/sparsemem: Convert kmalloc_section_memmap() to populate_section_memmap() mm/hotplug: Add mem-hotplug restrictions for remove_memory() mm: Kill is_dev_zone() helper mm/sparsemem: Prepare for sub-section ranges mm/sparsemem: Support sub-section hotplug mm/devm_memremap_pages: Enable sub-section remap libnvdimm/pfn: Fix fsdax-mode namespace info-block zero-fields libnvdimm/pfn: Stop padding pmem namespaces to section alignment arch/ia64/mm/init.c | 4 arch/powerpc/mm/mem.c | 5 - arch/s390/mm/init.c | 2 arch/sh/mm/init.c | 4 arch/x86/mm/init_32.c | 4 arch/x86/mm/init_64.c | 9 + drivers/nvdimm/dax_devs.c | 2 drivers/nvdimm/pfn.h | 12 - drivers/nvdimm/pfn_devs.c | 93 +++------- include/linux/memory_hotplug.h | 12 + include/linux/mm.h | 4 include/linux/mmzone.h | 72 ++++++-- kernel/memremap.c | 70 +++----- mm/hmm.c | 2 mm/memory_hotplug.c | 148 +++++++++------- mm/page_alloc.c | 8 + mm/sparse-vmemmap.c | 21 ++ mm/sparse.c | 371 +++++++++++++++++++++++++++------------- 18 files changed, 503 insertions(+), 340 deletions(-)

4 years, 12 months

5
14
0 0

[PATCH v2] powerpc/booke64: set RI in default MSR

by laurentiu.tudor＠nxp.com

From: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Set RI in the default kernel's MSR so that the architected way of detecting unrecoverable machine check interrupts has a chance to work. This is inline with the MSR setup of the rest of booke powerpc architectures configured here. Signed-off-by: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Cc: stable(a)vger.kernel.org --- Changes in v2: - fixed typo - s/SI/RI arch/powerpc/include/asm/reg_booke.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index eb2a33d5df26..e382bd6ede84 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -41,7 +41,7 @@ #if defined(CONFIG_PPC_BOOK3E_64) #define MSR_64BIT MSR_CM -#define MSR_ (MSR_ME | MSR_CE) +#define MSR_ (MSR_ME | MSR_RI | MSR_CE) #define MSR_KERNEL (MSR_ | MSR_64BIT) #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) #define MSR_USER64 (MSR_USER32 | MSR_64BIT) -- 2.17.1

5 years

2
1
0 0

[PATCH] ASoC: Intel: avoid Oops if DMA setup fails

by Ross Zwisler

Currently in sst_dsp_new() if we get an error return from sst_dma_new() we just print an error message and then still complete the function successfully. This means that we are trying to run without sst->dma properly set up, which will result in NULL pointer dereference when sst->dma is later used. This was happening for me in sst_dsp_dma_get_channel(): struct sst_dma *dma = dsp->dma; ... dma->ch = dma_request_channel(mask, dma_chan_filter, dsp); This resulted in: BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: sst_dsp_dma_get_channel+0x4f/0x125 [snd_soc_sst_firmware] Fix this by adding proper error handling for the case where we fail to set up DMA. Signed-off-by: Ross Zwisler <zwisler(a)google.com> Cc: stable(a)vger.kernel.org --- sound/soc/intel/common/sst-firmware.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 1e067504b6043..9be3a793a55e3 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -1251,11 +1251,15 @@ struct sst_dsp *sst_dsp_new(struct device *dev, goto irq_err; err = sst_dma_new(sst); - if (err) + if (err) { dev_warn(dev, "sst_dma_new failed %d\n", err); + goto dma_err; + } return sst; +dma_err: + free_irq(sst->irq, sst); irq_err: if (sst->ops->free) sst->ops->free(sst); -- 2.21.0.593.g511ec345e18-goog

5 years

4
8
0 0

[PATCH 1/4] crypto4xx: fix ctr-aes missing output IV

by Christian Lamparter

Commit 8efd972ef96a ("crypto: testmgr - support checking skcipher output IV") caused the crypto4xx driver to produce the following error: | ctr-aes-ppc4xx encryption test failed (wrong output IV) | on test vector 0, cfg="in-place" This patch fixes this by reworking the crypto4xx_setkey_aes() function to: - not save the iv for ECB (as per 18.2.38 CRYP0_SA_CMD_0: "This bit mut be cleared for DES ECB mode or AES ECB mode, when no IV is used.") - instruct the hardware to save the generated IV for all other modes of operations that have IV and then supply it back to the callee in pretty much the same way as we do it for cbc-aes already. - make it clear that the DIR_(IN|OUT)BOUND is the important bit that tells the hardware to encrypt or decrypt the data. (this is cosmetic - but it hopefully prevents me from getting confused again). - don't load any bogus hash when we don't use any hash operation to begin with. Cc: stable(a)vger.kernel.org Signed-off-by: Christian Lamparter <chunkeey(a)gmail.com> --- drivers/crypto/amcc/crypto4xx_alg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c index 4092c2aad8e2..3458c5a085d9 100644 --- a/drivers/crypto/amcc/crypto4xx_alg.c +++ b/drivers/crypto/amcc/crypto4xx_alg.c @@ -141,9 +141,10 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher, /* Setup SA */ sa = ctx->sa_in; - set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ? - SA_SAVE_IV : SA_NOT_SAVE_IV), - SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE, + set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_ECB ? + SA_NOT_SAVE_IV : SA_SAVE_IV), + SA_NOT_LOAD_HASH, (cm == CRYPTO_MODE_ECB ? + SA_LOAD_IV_FROM_SA : SA_LOAD_IV_FROM_STATE), SA_NO_HEADER_PROC, SA_HASH_ALG_NULL, SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO, SA_OP_GROUP_BASIC, SA_OPCODE_DECRYPT, @@ -162,6 +163,11 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher, memcpy(ctx->sa_out, ctx->sa_in, ctx->sa_len * 4); sa = ctx->sa_out; sa->sa_command_0.bf.dir = DIR_OUTBOUND; + /* + * SA_OPCODE_ENCRYPT is the same value as SA_OPCODE_DECRYPT. + * it's the DIR_(IN|OUT)BOUND that matters + */ + sa->sa_command_0.bf.opcode = SA_OPCODE_ENCRYPT; return 0; } -- 2.20.1

5 years

2
2
0 0

[PATCH] i2c: Prevent runtime suspend of adapter when Host Notify is required

by Jarkko Nikula

Multiple users have reported their Synaptics touchpad has stopped working between v4.20.1 and v4.20.2 when using SMBus interface. The culprit for this appeared to be commit c5eb1190074c ("PCI / PM: Allow runtime PM without callback functions") that fixed the runtime PM for i2c-i801 SMBus adapter. Those Synaptics touchpad are using i2c-i801 for SMBus communication and testing showed they are able to get back working by preventing the runtime suspend of adapter. Normally when i2c-i801 SMBus adapter transmits with the client it resumes before operation and autosuspends after. However, if client requires SMBus Host Notify protocol, what those Synaptics touchpads do, then the host adapter must not go to runtime suspend since then it cannot process incoming SMBus Host Notify commands the client may send. Fix this by keeping I2C/SMBus adapter active in case client requires Host Notify. Reported-by: Keijo Vaara <ferdasyn(a)rocketmail.com> Link: https://bugzilla.kernel.org/show_bug.cgi?id=203297 Fixes: c5eb1190074c ("PCI / PM: Allow runtime PM without callback functions") Cc: stable(a)vger.kernel.org # v4.20+ Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- Keijo: could you test this does it fix the issue you reported? This is practically the same diff I sent earlier what you probably haven't tested yet. I wanted to send a commitable fix in case it works since I'll be out of office in a few coming days. --- drivers/i2c/i2c-core-base.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 38af18645133..8149c9e32b69 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -327,6 +327,8 @@ static int i2c_device_probe(struct device *dev) if (client->flags & I2C_CLIENT_HOST_NOTIFY) { dev_dbg(dev, "Using Host Notify IRQ\n"); + /* Keep adapter active when Host Notify is required */ + pm_runtime_get_sync(&client->adapter->dev); irq = i2c_smbus_host_notify_to_irq(client); } else if (dev->of_node) { irq = of_irq_get_byname(dev->of_node, "irq"); @@ -431,6 +433,8 @@ static int i2c_device_remove(struct device *dev) device_init_wakeup(&client->dev, false); client->irq = client->init_irq; + if (client->flags & I2C_CLIENT_HOST_NOTIFY) + pm_runtime_put(&client->adapter->dev); return status; } -- 2.20.1

5 years

4
3
0 0

[PATCH v4.4, v4.9, v4.14 1/2] usbnet: ipheth: prevent TX queue timeouts when device not ready

by Guenter Roeck

From: Alexander Kappner <agk(a)godking.net> commit bb1b40c7cb863f0800a6410c7dcb86cf3f28d3b1 upstream. iOS devices require the host to be "trusted" before servicing network packets. Establishing trust requires the user to confirm a dialog on the iOS device.Until trust is established, the iOS device will silently discard network packets from the host. Currently, the ipheth driver does not detect whether an iOS device has established trust with the host, and immediately sets up the transmit queues. This causes the following problems: - Kernel taint due to WARN() in netdev watchdog. - Dmesg spam ("TX timeout"). - Disruption of user space networking activity (dhcpd, etc...) when new interface comes up but cannot be used. - Unnecessary host and device wakeups and USB traffic Example dmesg output: [ 1101.319778] NETDEV WATCHDOG: eth1 (ipheth): transmit queue 0 timed out [ 1101.319817] ------------[ cut here ]------------ [ 1101.319828] WARNING: CPU: 0 PID: 0 at net/sched/sch_generic.c:316 dev_watchdog+0x20f/0x220 [ 1101.319831] Modules linked in: ipheth usbmon nvidia_drm(PO) nvidia_modeset(PO) nvidia(PO) iwlmvm mac80211 iwlwifi btusb btrtl btbcm btintel qmi_wwan bluetooth cfg80211 ecdh_generic thinkpad_acpi rfkill [last unloaded: ipheth] [ 1101.319861] CPU: 0 PID: 0 Comm: swapper/0 Tainted: P O 4.13.12.1 #1 [ 1101.319864] Hardware name: LENOVO 20ENCTO1WW/20ENCTO1WW, BIOS N1EET62W (1.35 ) 11/10/2016 [ 1101.319867] task: ffffffff81e11500 task.stack: ffffffff81e00000 [ 1101.319873] RIP: 0010:dev_watchdog+0x20f/0x220 [ 1101.319876] RSP: 0018:ffff8810a3c03e98 EFLAGS: 00010292 [ 1101.319880] RAX: 000000000000003a RBX: 0000000000000000 RCX: 0000000000000000 [ 1101.319883] RDX: ffff8810a3c15c48 RSI: ffffffff81ccbfc2 RDI: 00000000ffffffff [ 1101.319886] RBP: ffff880c04ebc41c R08: 0000000000000000 R09: 0000000000000379 [ 1101.319889] R10: 00000100696589d0 R11: 0000000000000378 R12: ffff880c04ebc000 [ 1101.319892] R13: 0000000000000000 R14: 0000000000000001 R15: ffff880c2865fc80 [ 1101.319896] FS: 0000000000000000(0000) GS:ffff8810a3c00000(0000) knlGS:0000000000000000 [ 1101.319899] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1101.319902] CR2: 00007f3ff24ac000 CR3: 0000000001e0a000 CR4: 00000000003406f0 [ 1101.319905] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1101.319908] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1101.319910] Call Trace: [ 1101.319914] <IRQ> [ 1101.319921] ? dev_graft_qdisc+0x70/0x70 [ 1101.319928] ? dev_graft_qdisc+0x70/0x70 [ 1101.319934] ? call_timer_fn+0x2e/0x170 [ 1101.319939] ? dev_graft_qdisc+0x70/0x70 [ 1101.319944] ? run_timer_softirq+0x1ea/0x440 [ 1101.319951] ? timerqueue_add+0x54/0x80 [ 1101.319956] ? enqueue_hrtimer+0x38/0xa0 [ 1101.319963] ? __do_softirq+0xed/0x2e7 [ 1101.319970] ? irq_exit+0xb4/0xc0 [ 1101.319976] ? smp_apic_timer_interrupt+0x39/0x50 [ 1101.319981] ? apic_timer_interrupt+0x8c/0xa0 [ 1101.319983] </IRQ> [ 1101.319992] ? cpuidle_enter_state+0xfa/0x2a0 [ 1101.319999] ? do_idle+0x1a3/0x1f0 [ 1101.320004] ? cpu_startup_entry+0x5f/0x70 [ 1101.320011] ? start_kernel+0x444/0x44c [ 1101.320017] ? early_idt_handler_array+0x120/0x120 [ 1101.320023] ? x86_64_start_kernel+0x145/0x154 [ 1101.320028] ? secondary_startup_64+0x9f/0x9f [ 1101.320033] Code: 20 04 00 00 eb 9f 4c 89 e7 c6 05 59 44 71 00 01 e8 a7 df fd ff 89 d9 4c 89 e6 48 c7 c7 70 b7 cd 81 48 89 c2 31 c0 e8 97 64 90 ff <0f> ff eb bf 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 [ 1101.320103] ---[ end trace 0cc4d251e2b57080 ]--- [ 1101.320110] ipheth 1-5:4.2: ipheth_tx_timeout: TX timeout The last message "TX timeout" is repeated every 5 seconds until trust is established or the device is disconnected, filling up dmesg. The proposed patch eliminates the problem by, upon connection, keeping the TX queue and carrier disabled until a packet is first received from the iOS device. This is reflected by the confirmed_pairing variable in the device structure. Only after at least one packet has been received from the iOS device, the transmit queue and carrier are brought up during the periodic device poll in ipheth_carrier_set. Because the iOS device will always send a packet immediately upon trust being established, this should not delay the interface becoming useable. To prevent failed UBRs in ipheth_rcvbulk_callback from perpetually re-enabling the queue if it was disabled, a new check is added so only successful transfers re-enable the queue, whereas failed transfers only trigger an immediate poll. This has the added benefit of removing the periodic control requests to the iOS device until trust has been established and thus should reduce wakeup events on both the host and the iOS device. Signed-off-by: Alexander Kappner <agk(a)godking.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> [groeck: Fixed context conflict seen because 45611c61dd50 was applied first] Signed-off-by: Guenter Roeck <linux(a)roeck-us.net> --- drivers/net/usb/ipheth.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index f1f8227e7342..cefb75f8cc94 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -148,6 +148,7 @@ struct ipheth_device { u8 bulk_in; u8 bulk_out; struct delayed_work carrier_work; + bool confirmed_pairing; }; static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags); @@ -259,7 +260,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb) dev->net->stats.rx_packets++; dev->net->stats.rx_bytes += len; - + dev->confirmed_pairing = true; netif_rx(skb); ipheth_rx_submit(dev, GFP_ATOMIC); } @@ -280,14 +281,21 @@ static void ipheth_sndbulk_callback(struct urb *urb) dev_err(&dev->intf->dev, "%s: urb status: %d\n", __func__, status); - netif_wake_queue(dev->net); + if (status == 0) + netif_wake_queue(dev->net); + else + // on URB error, trigger immediate poll + schedule_delayed_work(&dev->carrier_work, 0); } static int ipheth_carrier_set(struct ipheth_device *dev) { struct usb_device *udev = dev->udev; int retval; - + if (!dev) + return 0; + if (!dev->confirmed_pairing) + return 0; retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP), IPHETH_CMD_CARRIER_CHECK, /* request */ @@ -302,11 +310,14 @@ static int ipheth_carrier_set(struct ipheth_device *dev) return retval; } - if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON) + if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON) { netif_carrier_on(dev->net); - else + if (dev->tx_urb->status != -EINPROGRESS) + netif_wake_queue(dev->net); + } else { netif_carrier_off(dev->net); - + netif_stop_queue(dev->net); + } return 0; } @@ -386,7 +397,6 @@ static int ipheth_open(struct net_device *net) return retval; schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT); - netif_start_queue(net); return retval; } @@ -489,7 +499,7 @@ static int ipheth_probe(struct usb_interface *intf, dev->udev = udev; dev->net = netdev; dev->intf = intf; - + dev->confirmed_pairing = false; /* Set up endpoints */ hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM); if (hintf == NULL) { @@ -540,7 +550,9 @@ static int ipheth_probe(struct usb_interface *intf, retval = -EIO; goto err_register_netdev; } - + // carrier down and transmit queues stopped until packet from device + netif_carrier_off(netdev); + netif_tx_stop_all_queues(netdev); dev_info(&intf->dev, "Apple iPhone USB Ethernet device attached\n"); return 0; -- 2.7.4

5 years

3
3
0 0

[PATCH AUTOSEL 5.0 01/98] arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels

by Sasha Levin

From: Takeshi Kihara <takeshi.kihara.df(a)renesas.com> [ Upstream commit e20119f7eaaaf6aad5b44f35155ce500429e17f6 ] According to the R-Car Gen3 Hardware Manual Errata for Rev 1.50 of Feb 12, 2019, the DMA channels for SCIF5 are corrected from 16..47 to 0..15 on R-Car E3. Signed-off-by: Takeshi Kihara <takeshi.kihara.df(a)renesas.com> Fixes: a5ebe5e49a862e21 ("arm64: dts: renesas: r8a77990: Add SCIF-{0,1,3,4,5} device nodes") Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Reviewed-by: Fabrizio Castro <fabrizio.castro(a)bp.renesas.com> Signed-off-by: Simon Horman <horms+renesas(a)verge.net.au> Signed-off-by: Sasha Levin (Microsoft) <sashal(a)kernel.org> --- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi index b2f606e286ce..327d12097643 100644 --- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi @@ -2,7 +2,7 @@ /* * Device Tree Source for the R-Car E3 (R8A77990) SoC * - * Copyright (C) 2018 Renesas Electronics Corp. + * Copyright (C) 2018-2019 Renesas Electronics Corp. */ #include <dt-bindings/clock/r8a77990-cpg-mssr.h> @@ -1040,9 +1040,8 @@ <&cpg CPG_CORE R8A77990_CLK_S3D1C>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac1 0x5b>, <&dmac1 0x5a>, - <&dmac2 0x5b>, <&dmac2 0x5a>; - dma-names = "tx", "rx", "tx", "rx"; + dmas = <&dmac0 0x5b>, <&dmac0 0x5a>; + dma-names = "tx", "rx"; power-domains = <&sysc R8A77990_PD_ALWAYS_ON>; resets = <&cpg 202>; status = "disabled"; -- 2.19.1

5 years

4
103
0 0

FAILED: patch "[PATCH] drm/i915: Do not enable FEC without DSC" failed to apply to 5.0-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.0-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 5aae7832d1b4ec614996ea0f4fafc4d9855ec0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala(a)linux.intel.com> Date: Tue, 26 Mar 2019 16:49:02 +0200 Subject: [PATCH] drm/i915: Do not enable FEC without DSC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we enable FEC even when DSC is no used. While that is theoretically valid supposedly there isn't much of a benefit from this. But more importantly we do not account for the FEC link bandwidth overhead (2.4%) in the non-DSC link bandwidth computations. So the code may think we have enough bandwidth when we in fact do not. Cc: stable(a)vger.kernel.org Cc: Anusha Srivatsa <anusha.srivatsa(a)intel.com> Cc: Manasi Navare <manasi.d.navare(a)intel.com> Fixes: 240999cf339f ("i915/dp/fec: Add fec_enable to the crtc state.") Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190326144903.6617-1-ville.s… Reviewed-by: Manasi Navare <manasi.d.navare(a)intel.com> (cherry picked from commit 6fd3134ae3551d4802a04669c0f39f2f5c56f77d) Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 8891f29a8c7f..48da4a969a0a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1886,6 +1886,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, int pipe_bpp; int ret; + pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) && + intel_dp_supports_fec(intel_dp, pipe_config); + if (!intel_dp_supports_dsc(intel_dp, pipe_config)) return -EINVAL; @@ -2116,9 +2119,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) return -EINVAL; - pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) && - intel_dp_supports_fec(intel_dp, pipe_config); - ret = intel_dp_compute_link_config(encoder, pipe_config, conn_state); if (ret < 0) return ret;

5 years

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2019