August 2021 - Linux-stable-mirror

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.140 release. There are 85 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, 12 Aug 2021 17:29:30 +0000. 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.4.140-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.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 5.4.140-rc1 Mark Rutland <mark.rutland(a)arm.com> arm64: fix compat syscall return truncation Letu Ren <fantasquex(a)gmail.com> net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset Prarit Bhargava <prarit(a)redhat.com> alpha: Send stop IPI to send to online CPUs Matteo Croce <mcroce(a)microsoft.com> virt_wifi: fix error on connect Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> reiserfs: check directory items on read from disk Yu Kuai <yukuai3(a)huawei.com> reiserfs: add check for root_inode in reiserfs_fill_super Christoph Hellwig <hch(a)lst.de> libata: fix ata_pio_sector for CONFIG_HIGHMEM Daniel Borkmann <daniel(a)iogearbox.net> bpf, selftests: Adjust few selftest result_unpriv outcomes Like Xu <likexu(a)tencent.com> perf/x86/amd: Don't touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest Arnd Bergmann <arnd(a)arndb.de> soc: ixp4xx/qmgr: fix invalid __iomem access Dongliang Mu <mudongliangabcd(a)gmail.com> spi: meson-spicc: fix memory leak in meson_spicc_remove Arnd Bergmann <arnd(a)arndb.de> soc: ixp4xx: fix printing resources Will Deacon <will(a)kernel.org> arm64: vdso: Avoid ISB after reading from cntvct_el0 Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Fix per-cpu counter corruption on 32-bit builds Paolo Bonzini <pbonzini(a)redhat.com> KVM: Do not leak memory for duplicate debugfs directories Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: accept userspace interrupt only if no event is injected Wei Shuyu <wsy(a)dogben.com> md/raid10: properly indicate failure when ending a failed write request Zheyu Ma <zheyuma97(a)gmail.com> pcmcia: i82092: fix a null pointer dereference bug Thomas Gleixner <tglx(a)linutronix.de> timers: Move clearing of base::timer_running under base:: Lock Mario Kleiner <mario.kleiner.de(a)gmail.com> serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts. Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated driver Maciej W. Rozycki <macro(a)orcam.me.uk> MIPS: Malta: Do not byte-swap accesses to the CBUS UART Maciej W. Rozycki <macro(a)orcam.me.uk> serial: 8250: Mask out floating 16/32-bit bus bits Zhiyong Tao <zhiyong.tao(a)mediatek.com> serial: 8250_mtk: fix uart corruption issue when rx power off Jon Hunter <jonathanh(a)nvidia.com> serial: tegra: Only print FIFO error message when an error occurs Theodore Ts'o <tytso(a)mit.edu> ext4: fix potential htree corruption when growing large_dir directories Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> pipe: increase minimum default pipe size to 2 pages Johan Hovold <johan(a)kernel.org> media: rtl28xxu: fix zero-length control request Pavel Skripkin <paskripkin(a)gmail.com> staging: rtl8712: get rid of flush_scheduled_work Xiangyang Zhang <xyz.sun.ok(a)gmail.com> staging: rtl8723bs: Fix a resource leak in sd_int_dpc Tyler Hicks <tyhicks(a)linux.microsoft.com> tpm_ftpm_tee: Free and unregister TEE shared memory during kexec Tyler Hicks <tyhicks(a)linux.microsoft.com> optee: Fix memory leak when failing to register shm pages Jens Wiklander <jens.wiklander(a)linaro.org> tee: add tee_shm_alloc_kernel_buf() Tyler Hicks <tyhicks(a)linux.microsoft.com> optee: Clear stale cache entries during initialization Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing / histogram: Give calculation hist_fields a size Hui Su <suhui(a)zeku.com> scripts/tracing: fix the bug that can't parse raw_trace_func Brian Norris <briannorris(a)chromium.org> clk: fix leak on devm_clk_bulk_get_all() unwind Dmitry Osipenko <digetx(a)gmail.com> usb: otg-fsm: Fix hrtimer list corruption Maxim Devaev <mdevaev(a)gmail.com> usb: gadget: f_hid: idle uses the highest byte for duration Phil Elwell <phil(a)raspberrypi.com> usb: gadget: f_hid: fixed NULL pointer dereference Maxim Devaev <mdevaev(a)gmail.com> usb: gadget: f_hid: added GET_IDLE and SET_IDLE handlers Pawel Laszczak <pawell(a)cadence.com> usb: cdns3: Fixed incorrect gadget state Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: Add registration quirk for JBL Quantum 600 Alexander Monakov <amonakov(a)ispras.ru> ALSA: hda/realtek: add mic quirk for Acer SF314-42 Anirudh Rayabharam <mail(a)anirudhrb.com> firmware_loader: fix use-after-free in firmware_fallback_sysfs Anirudh Rayabharam <mail(a)anirudhrb.com> firmware_loader: use -ETIMEDOUT instead of -EAGAIN in fw_load_sysfs_fallback David Bauer <mail(a)david-bauer.net> USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2 Willy Tarreau <w(a)1wt.eu> USB: serial: ch341: fix character loss at high transfer rates Daniele Palmas <dnlplm(a)gmail.com> USB: serial: option: add Telit FD980 composition 0x1056 Qiang.zhang <qiang.zhang(a)windriver.com> USB: usbtmc: Fix RCU stall warning Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Bluetooth: defer cleanup of resources in hci_unregister_dev() Yu Kuai <yukuai3(a)huawei.com> blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit() Pavel Skripkin <paskripkin(a)gmail.com> net: vxge: fix use-after-free in vxge_device_unregister Pavel Skripkin <paskripkin(a)gmail.com> net: fec: fix use-after-free in fec_drv_remove Pavel Skripkin <paskripkin(a)gmail.com> net: pegasus: fix uninit-value in get_interrupt_interval Dan Carpenter <dan.carpenter(a)oracle.com> bnx2x: fix an error code in bnx2x_nic_load() H. Nikolaus Schaller <hns(a)goldelico.com> mips: Fix non-POSIX regexp Antoine Tenart <atenart(a)kernel.org> net: ipv6: fix returned variable type in ip6_skb_dst_mtu Fei Qin <fei.qin(a)corigine.com> nfp: update ethtool reporting of pauseframe control Xin Long <lucien.xin(a)gmail.com> sctp: move the active_key update after sh_keys is added Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> gpio: tqmx86: really make IRQ optional Wang Hai <wanghai38(a)huawei.com> net: natsemi: Fix missing pci_disable_device() in probe and remove Steve Bennett <steveb(a)workware.net.au> net: phy: micrel: Fix detection of ksz87xx switch Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: sja1105: invalidate dynamic FDB entries learned concurrently with statically added ones Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: sja1105: overwrite dynamic FDB entries with static ones in .port_fdb_add Jakub Sitnicki <jakub(a)cloudflare.com> net, gro: Set inner transport header offset in tcp/udp GRO hook Juergen Borleis <jbe(a)pengutronix.de> dmaengine: imx-dma: configure the generic DMA type to make it work Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: videobuf2-core: dequeue if start_streaming fails Li Manyi <limanyi(a)uniontech.com> scsi: sr: Return correct event when media event code is 3 Marek Vasut <marex(a)denx.de> spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation Marek Vasut <marex(a)denx.de> spi: imx: mx51-ecspi: Reinstate low-speed CONFIGREG delay H. Nikolaus Schaller <hns(a)goldelico.com> omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator Dario Binacchi <dariobin(a)libero.it> ARM: dts: am437x-l4: fix typo in can@0 node Dario Binacchi <dariobin(a)libero.it> clk: stm32f4: fix post divisor setup for I2S/SAI PLLs chihhao.chen <chihhao.chen(a)mediatek.com> ALSA: usb-audio: fix incorrect clock source setting Pali Rohár <pali(a)kernel.org> arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode Marek Vasut <marex(a)denx.de> ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins Colin Ian King <colin.king(a)canonical.com> ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz Maxime Chevallier <maxime.chevallier(a)bootlin.com> ARM: dts: imx6qdl-sr-som: Increase the PHY reset duration to 10ms Yang Yingliang <yangyingliang(a)huawei.com> ARM: imx: add missing clk_disable_unprepare() Yang Yingliang <yangyingliang(a)huawei.com> ARM: imx: add missing iounmap() Vladimir Oltean <vladimir.oltean(a)nxp.com> arm64: dts: ls1028a: fix node name for the sysclk Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Fix racy deletion of subscriber Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Revert "ACPICA: Fix memory leak caused by _CID repair function" ------------- Diffstat: Makefile | 4 +- arch/alpha/kernel/smp.c | 2 +- arch/arm/boot/dts/am437x-l4.dtsi | 2 +- arch/arm/boot/dts/imx53-m53menlo.dts | 4 +- arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 8 ++- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 + arch/arm/boot/dts/omap5-board-common.dtsi | 9 +-- arch/arm/mach-imx/mmdc.c | 17 +++++- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- .../boot/dts/marvell/armada-3720-turris-mox.dts | 1 + arch/arm64/include/asm/arch_timer.h | 21 ------- arch/arm64/include/asm/barrier.h | 19 ++++++ arch/arm64/include/asm/ptrace.h | 12 +++- arch/arm64/include/asm/syscall.h | 19 +++--- arch/arm64/include/asm/vdso/gettimeofday.h | 6 +- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/signal.c | 3 +- arch/arm64/kernel/syscall.c | 7 +-- arch/mips/Makefile | 2 +- arch/mips/mti-malta/malta-platform.c | 3 +- arch/x86/events/perf_event.h | 3 +- arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/x86.c | 13 ++++- block/blk-iolatency.c | 6 +- drivers/acpi/acpica/nsrepair2.c | 7 --- drivers/ata/libata-sff.c | 35 ++++++++--- drivers/base/firmware_loader/fallback.c | 14 +++-- drivers/base/firmware_loader/firmware.h | 10 +++- drivers/base/firmware_loader/main.c | 2 + drivers/char/tpm/tpm_ftpm_tee.c | 8 +-- drivers/clk/clk-devres.c | 9 ++- drivers/clk/clk-stm32f4.c | 10 ++-- drivers/dma/imx-dma.c | 2 + drivers/gpio/gpio-tqmx86.c | 6 +- drivers/md/raid1.c | 2 - drivers/md/raid10.c | 4 +- drivers/media/common/videobuf2/videobuf2-core.c | 13 ++++- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 11 +++- drivers/net/dsa/sja1105/sja1105_main.c | 67 ++++++++++++++++++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/natsemi/natsemi.c | 8 +-- drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 + drivers/net/ethernet/qlogic/qla3xxx.c | 6 +- drivers/net/phy/micrel.c | 10 ++-- drivers/net/usb/pegasus.c | 14 ++++- drivers/net/wireless/virt_wifi.c | 52 ++++++++++------- drivers/pcmcia/i82092.c | 1 + drivers/scsi/sr.c | 2 +- drivers/soc/ixp4xx/ixp4xx-npe.c | 11 ++-- drivers/soc/ixp4xx/ixp4xx-qmgr.c | 9 +-- drivers/spi/spi-imx.c | 52 +++++++++++------ drivers/spi/spi-meson-spicc.c | 2 + drivers/staging/rtl8712/rtl8712_led.c | 8 +++ drivers/staging/rtl8712/rtl871x_led.h | 1 + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 8 +++ drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 + drivers/staging/rtl8712/usb_intf.c | 3 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 + drivers/tee/optee/call.c | 36 +++++++++++- drivers/tee/optee/core.c | 9 +++ drivers/tee/optee/optee_private.h | 1 + drivers/tee/optee/shm_pool.c | 12 +++- drivers/tee/tee_shm.c | 18 ++++++ drivers/tty/serial/8250/8250_mtk.c | 5 ++ drivers/tty/serial/8250/8250_pci.c | 7 +++ drivers/tty/serial/8250/8250_port.c | 12 +++- drivers/tty/serial/serial-tegra.c | 6 +- drivers/usb/cdns3/ep0.c | 1 + drivers/usb/class/usbtmc.c | 9 +-- drivers/usb/common/usb-otg-fsm.c | 6 +- drivers/usb/gadget/function/f_hid.c | 44 ++++++++++++-- drivers/usb/serial/ch341.c | 1 + drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 3 + drivers/usb/serial/option.c | 2 + fs/ext4/namei.c | 2 +- fs/pipe.c | 19 +++++- fs/reiserfs/stree.c | 31 ++++++++-- fs/reiserfs/super.c | 8 +++ include/linux/tee_drv.h | 1 + include/linux/usb/otg-fsm.h | 1 + include/net/bluetooth/hci_core.h | 1 + include/net/ip6_route.h | 2 +- kernel/time/timer.c | 6 +- kernel/trace/trace_events_hist.c | 4 ++ net/bluetooth/hci_core.c | 16 +++--- net/bluetooth/hci_sock.c | 49 ++++++++++------ net/bluetooth/hci_sysfs.c | 3 + net/ipv4/tcp_offload.c | 3 + net/ipv4/udp_offload.c | 4 ++ net/sctp/auth.c | 14 +++-- scripts/tracing/draw_functrace.py | 6 +- sound/core/seq/seq_ports.c | 39 +++++++++---- sound/pci/hda/patch_realtek.c | 1 + sound/usb/clock.c | 6 ++ sound/usb/quirks.c | 1 + tools/testing/selftests/bpf/verifier/stack_ptr.c | 2 - .../selftests/bpf/verifier/value_ptr_arith.c | 8 --- virt/kvm/kvm_main.c | 18 +++++- 101 files changed, 708 insertions(+), 281 deletions(-)

3 years, 6 months

6
90
0 0

Re: Please Advise

by Antony Jenkins

Attn! We are in custody of an inheritance attached to your surname, contact Mr Antony on antony00jenk(a)naver.com with your full names for validation. Ts & Cs apply.

3 years, 6 months

1
0
0 0

[PATCH] ACPI: NFIT: Fix support for virtual SPA ranges

by Dan Williams

Fix the NFIT parsing code to treat a 0 index in a SPA Range Structure as a special case and not match Region Mapping Structures that use 0 to indicate that they are not mapped. Without this fix some platform BIOS descriptions of "virtual disk" ranges do not result in the pmem driver attaching to the range. Details: In addition to typical persistent memory ranges, the ACPI NFIT may also convey "virtual" ranges. These ranges are indicated by a UUID in the SPA Range Structure of UUID_VOLATILE_VIRTUAL_DISK, UUID_VOLATILE_VIRTUAL_CD, UUID_PERSISTENT_VIRTUAL_DISK, or UUID_PERSISTENT_VIRTUAL_CD. The critical difference between virtual ranges and UUID_PERSISTENT_MEMORY, is that virtual do not support associations with Region Mapping Structures. For this reason the "index" value of virtual SPA Range Structures is allowed to be 0. If a platform BIOS decides to represent unmapped NVDIMMs with a 0 index in their "SPA Range Structure Index" the driver falsely matches them and may falsely require labels where "virtual disks" are expected to be label-less. I.e. label-less is where the namespace-range == region-range and the pmem driver attaches with no user action to create a namespace. Cc: Jacek Zloch <jacek.zloch(a)intel.com> Cc: Lukasz Sobieraj <lukasz.sobieraj(a)intel.com> Cc: "Lee, Chun-Yi" <jlee(a)suse.com> Cc: <stable(a)vger.kernel.org> Fixes: c2f32acdf848 ("acpi, nfit: treat virtual ramdisk SPA as pmem region") Reported-by: Krzysztof Rusocki <krzysztof.rusocki(a)intel.com> Reported-by: Damian Bassa <damian.bassa(a)intel.com> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> --- drivers/acpi/nfit/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 23d9a09d7060..6f15e56ef955 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3021,6 +3021,8 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc, struct acpi_nfit_memory_map *memdev = nfit_memdev->memdev; struct nd_mapping_desc *mapping; + if (memdev->range_index == 0 || spa->range_index == 0) + continue; if (memdev->range_index != spa->range_index) continue; if (count >= ND_MAX_MAPPINGS) {

3 years, 6 months

2
2
0 0

[PATCH 1/2] btrfs: reduce the preemptive flushing threshold to 90%

by Josef Bacik

The preemptive flushing code was added in order to avoid needing to synchronously wait for ENOSPC flushing to recover space. Once we're almost full however we can essentially flush constantly. We were using 98% as a threshold to determine if we were simply full, however in practice this is a really high bar to hit. For example reports of systems running into this problem had around 94% usage and thus continued to flush. Fix this by lowering the threshold to 90%, which is a more sane value, especially for smaller file systems. cc: stable(a)vger.kernel.org Link: https://bugzilla.kernel.org/show_bug.cgi?id=212185 Fixes: 576fa34830af ("btrfs: improve preemptive background space flushing") Signed-off-by: Josef Bacik <josef(a)toxicpanda.com> --- fs/btrfs/space-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index d9c8d738678f..ddb4878e94df 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -733,7 +733,7 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info, { u64 global_rsv_size = fs_info->global_block_rsv.reserved; u64 ordered, delalloc; - u64 thresh = div_factor_fine(space_info->total_bytes, 98); + u64 thresh = div_factor(space_info->total_bytes, 9); u64 used; /* If we're just plain full then async reclaim just slows us down. */ -- 2.26.3

3 years, 6 months

1
0
0 0

[PATCH] drm/msi/mdp4: populate priv->kms in mdp4_kms_init

by David Heidelberg

Without this fix boot throws NULL ptr exception at msm_dsi_manager_setup_encoder on devices like Nexus 7 2013 (MDP4 v4.4). Fixes: 03436e3ec69c ("drm/msm/dsi: Move setup_encoder to modeset_init") Cc: <stable(a)vger.kernel.org> Signed-off-by: David Heidelberg <david(a)ixit.cz> --- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 1f12bccee2b8..cdcaf470f148 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -399,6 +399,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) { struct platform_device *pdev = to_platform_device(dev->dev); struct mdp4_platform_config *config = mdp4_get_config(pdev); + struct msm_drm_private *priv = dev->dev_private; struct mdp4_kms *mdp4_kms; struct msm_kms *kms = NULL; struct msm_gem_address_space *aspace; @@ -418,7 +419,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - kms = &mdp4_kms->base.base; + priv->kms = &mdp4_kms->base.base; + kms = priv->kms; mdp4_kms->dev = dev; -- 2.30.2

3 years, 6 months

1
0
0 0

[PATCH v3] drm/i915/display: Fix the 12 BPC bits for PIPE_MISC reg

by Ankit Nautiyal

Till DISPLAY12 the PIPE_MISC bits 5-7 are used to set the Dithering BPC, with valid values of 6, 8, 10 BPC. For ADLP+ these bits are used to set the PORT OUTPUT BPC, with valid values of: 6, 8, 10, 12 BPC, and need to be programmed whether dithering is enabled or not. This patch: -corrects the bits 5-7 for PIPE MISC register for 12 BPC. -renames the bits and mask to have generic names for these bits for dithering bpc and port output bpc. v3: Added a note for MIPI DSI which uses the PIPE_MISC for readout for pipe_bpp. (Uma Shankar) v2: Added 'display' to the subject and fixes tag. (Uma Shankar) Fixes: 756f85cffef2 ("drm/i915/bdw: Broadwell has PIPEMISC") Cc: Paulo Zanoni <paulo.r.zanoni(a)intel.com> (v1) Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: intel-gfx(a)lists.freedesktop.org Cc: <stable(a)vger.kernel.org> # v3.13+ Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal(a)intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 34 ++++++++++++++------ drivers/gpu/drm/i915/i915_reg.h | 16 ++++++--- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index b25c596f6f7e..a257e5dc381c 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5838,16 +5838,18 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state) switch (crtc_state->pipe_bpp) { case 18: - val |= PIPEMISC_DITHER_6_BPC; + val |= PIPEMISC_6_BPC; break; case 24: - val |= PIPEMISC_DITHER_8_BPC; + val |= PIPEMISC_8_BPC; break; case 30: - val |= PIPEMISC_DITHER_10_BPC; + val |= PIPEMISC_10_BPC; break; case 36: - val |= PIPEMISC_DITHER_12_BPC; + /* Port output 12BPC defined for ADLP+ */ + if (DISPLAY_VER(dev_priv) > 12) + val |= PIPEMISC_12_BPC_ADLP; break; default: MISSING_CASE(crtc_state->pipe_bpp); @@ -5900,15 +5902,27 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc) tmp = intel_de_read(dev_priv, PIPEMISC(crtc->pipe)); - switch (tmp & PIPEMISC_DITHER_BPC_MASK) { - case PIPEMISC_DITHER_6_BPC: + switch (tmp & PIPEMISC_BPC_MASK) { + case PIPEMISC_6_BPC: return 18; - case PIPEMISC_DITHER_8_BPC: + case PIPEMISC_8_BPC: return 24; - case PIPEMISC_DITHER_10_BPC: + case PIPEMISC_10_BPC: return 30; - case PIPEMISC_DITHER_12_BPC: - return 36; + /* + * PORT OUTPUT 12 BPC defined for ADLP+. + * + * TODO: + * For previous platforms with DSI interface, bits 5:7 + * are used for storing pipe_bpp irrespective of dithering. + * Since the value of 12 BPC is not defined for these bits + * on older platforms, need to find a workaround for 12 BPC + * MIPI DSI HW readout. + */ + case PIPEMISC_12_BPC_ADLP: + if (DISPLAY_VER(dev_priv) > 12) + return 36; + fallthrough; default: MISSING_CASE(tmp); return 0; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 167eaa87501b..664970f2bc62 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -6203,11 +6203,17 @@ enum { #define PIPEMISC_HDR_MODE_PRECISION (1 << 23) /* icl+ */ #define PIPEMISC_OUTPUT_COLORSPACE_YUV (1 << 11) #define PIPEMISC_PIXEL_ROUNDING_TRUNC REG_BIT(8) /* tgl+ */ -#define PIPEMISC_DITHER_BPC_MASK (7 << 5) -#define PIPEMISC_DITHER_8_BPC (0 << 5) -#define PIPEMISC_DITHER_10_BPC (1 << 5) -#define PIPEMISC_DITHER_6_BPC (2 << 5) -#define PIPEMISC_DITHER_12_BPC (3 << 5) +/* + * For Display < 13, Bits 5-7 of PIPE MISC represent DITHER BPC with + * valid values of: 6, 8, 10 BPC. + * ADLP+, the bits 5-7 represent PORT OUTPUT BPC with valid values of: + * 6, 8, 10, 12 BPC. + */ +#define PIPEMISC_BPC_MASK (7 << 5) +#define PIPEMISC_8_BPC (0 << 5) +#define PIPEMISC_10_BPC (1 << 5) +#define PIPEMISC_6_BPC (2 << 5) +#define PIPEMISC_12_BPC_ADLP (4 << 5) /* adlp+ */ #define PIPEMISC_DITHER_ENABLE (1 << 4) #define PIPEMISC_DITHER_TYPE_MASK (3 << 2) #define PIPEMISC_DITHER_TYPE_SP (0 << 2) -- 2.25.1

3 years, 6 months

2
2
0 0

[RESEND PATCH] perf/x86/intel/uncore: Fix invalid unit check

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> The uncore unit with the type ID 0 and the unit ID 0 is missed. The table3 of the uncore unit maybe 0. The uncore_discovery_invalid_unit() mistakenly treated it as an invalid value. Remove the !unit.table3 check. Fixes: edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables") Reviewed-by: Andi Kleen <ak(a)linux.intel.com> Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- The patch was posted as a part of the "perf: Add Sapphire Rapids server uncore support" patch set. But it doesn't depend on the other patches in the patch set. The bugfix can be accepted and merged separately. https://lore.kernel.org/lkml/cb0d2d43-102a-994c-f777-e11d61c77bf5@linux.int… arch/x86/events/intel/uncore_discovery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_discovery.h b/arch/x86/events/intel/uncore_discovery.h index 1d65293..abfb1e8 100644 --- a/arch/x86/events/intel/uncore_discovery.h +++ b/arch/x86/events/intel/uncore_discovery.h @@ -30,7 +30,7 @@ #define uncore_discovery_invalid_unit(unit) \ - (!unit.table1 || !unit.ctl || !unit.table3 || \ + (!unit.table1 || !unit.ctl || \ unit.table1 == -1ULL || unit.ctl == -1ULL || \ unit.table3 == -1ULL) -- 2.7.4

3 years, 6 months

2
3
0 0

[PATCH v5 2/2] blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN

by Niklas Cassel

From: Niklas Cassel <niklas.cassel(a)wdc.com> A user space process should not need the CAP_SYS_ADMIN capability set in order to perform a BLKREPORTZONE ioctl. Getting the zone report is required in order to get the write pointer. Neither read() nor write() requires CAP_SYS_ADMIN, so it is reasonable that a user space process that can read/write from/to the device, also can get the write pointer. (Since e.g. writes have to be at the write pointer.) Fixes: 3ed05a987e0f ("blk-zoned: implement ioctls") Signed-off-by: Niklas Cassel <niklas.cassel(a)wdc.com> Reviewed-by: Damien Le Moal <damien.lemoal(a)wdc.com> Reviewed-by: Aravind Ramesh <aravind.ramesh(a)wdc.com> Reviewed-by: Adam Manzanares <a.manzanares(a)samsung.com> Reviewed-by: Himanshu Madhani <himanshu.madhani(a)oracle.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com> Cc: stable(a)vger.kernel.org # v4.10+ --- Changes since v4: -Picked up additional Reviewed-by tag. -Corrected Damien's email. block/blk-zoned.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 8a60dbeb44be..1d0c76c18fc5 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -360,9 +360,6 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode, if (!blk_queue_is_zoned(q)) return -ENOTTY; - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - if (copy_from_user(&rep, argp, sizeof(struct blk_zone_report))) return -EFAULT; -- 2.31.1

3 years, 6 months

1
0
0 0

[PATCH v5 1/2] blk-zoned: allow zone management send operations without CAP_SYS_ADMIN

by Niklas Cassel

From: Niklas Cassel <niklas.cassel(a)wdc.com> Zone management send operations (BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE and BLKFINISHZONE) should be allowed under the same permissions as write(). (write() does not require CAP_SYS_ADMIN). Additionally, other ioctls like BLKSECDISCARD and BLKZEROOUT only check if the fd was successfully opened with FMODE_WRITE. (They do not require CAP_SYS_ADMIN). Currently, zone management send operations require both CAP_SYS_ADMIN and that the fd was successfully opened with FMODE_WRITE. Remove the CAP_SYS_ADMIN requirement, so that zone management send operations match the access control requirement of write(), BLKSECDISCARD and BLKZEROOUT. Fixes: 3ed05a987e0f ("blk-zoned: implement ioctls") Signed-off-by: Niklas Cassel <niklas.cassel(a)wdc.com> Reviewed-by: Damien Le Moal <damien.lemoal(a)wdc.com> Reviewed-by: Aravind Ramesh <aravind.ramesh(a)wdc.com> Reviewed-by: Adam Manzanares <a.manzanares(a)samsung.com> Reviewed-by: Himanshu Madhani <himanshu.madhani(a)oracle.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com> Cc: stable(a)vger.kernel.org # v4.10+ --- Changes since v4: -Picked up additional Reviewed-by tag. Note to backporter: Function was added as blkdev_reset_zones_ioctl() in v4.10. Function was renamed to blkdev_zone_mgmt_ioctl() in v5.5. The patch is valid both before and after the function rename. block/blk-zoned.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 86fce751bb17..8a60dbeb44be 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -421,9 +421,6 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode, if (!blk_queue_is_zoned(q)) return -ENOTTY; - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - if (!(mode & FMODE_WRITE)) return -EBADF; -- 2.31.1

3 years, 6 months

1
0
0 0

[PATCH v2] arm64: clean vdso & vdso32 files

by Andrew Delgadillo

commit a5b8ca97fbf8 ("arm64: do not descend to vdso directories twice") changes the cleaning behavior of arm64's vdso files, in that vdso.lds, vdso.so, and vdso.so.dbg are not removed upon a 'make clean/mrproper': $ make defconfig ARCH=arm64 $ make ARCH=arm64 $ make mrproper ARCH=arm64 $ git clean -nxdf Would remove arch/arm64/kernel/vdso/vdso.lds Would remove arch/arm64/kernel/vdso/vdso.so Would remove arch/arm64/kernel/vdso/vdso.so.dbg To remedy this, manually descend into arch/arm64/kernel/vdso upon cleaning. After this commit: $ make defconfig ARCH=arm64 $ make ARCH=arm64 $ make mrproper ARCH=arm64 $ git clean -nxdf <empty> Similar results are obtained for the vdso32 equivalent. Signed-off-by: Andrew Delgadillo <adelg(a)google.com> Cc: stable(a)vger.kernel.org --- Changelog since v1: - Also descend into vdso32 upon archclean - Add stable to cc in signoff area arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index b52481f0605d..02997b253dee 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -181,6 +181,8 @@ archprepare: # We use MRPROPER_FILES and CLEAN_FILES now archclean: $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso + $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso32 ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. -- 2.32.0.605.g8dce9f2422-goog

3 years, 6 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2021