December 2023 - Linux-stable-mirror

[PATCH v2 2/6] serial: sc16is7xx: remove global regmap from struct sc16is7xx_port

by Hugo Villeneuve

From: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> Remove global struct regmap so that it is more obvious that this regmap is to be used only in the probe function. Also add a comment to that effect in probe function. Fixes: 3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one regmap per port") Cc: stable(a)vger.kernel.org Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> Signed-off-by: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> --- drivers/tty/serial/sc16is7xx.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 8d1de4982b65..a4ad3ae8cae2 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -334,7 +334,6 @@ struct sc16is7xx_one { struct sc16is7xx_port { const struct sc16is7xx_devtype *devtype; - struct regmap *regmap; struct clk *clk; #ifdef CONFIG_GPIOLIB struct gpio_chip gpio; @@ -1434,7 +1433,8 @@ static void sc16is7xx_setup_irda_ports(struct sc16is7xx_port *s) /* * Configure ports designated to operate as modem control lines. */ -static int sc16is7xx_setup_mctrl_ports(struct sc16is7xx_port *s) +static int sc16is7xx_setup_mctrl_ports(struct sc16is7xx_port *s, + struct regmap *regmap) { int i; int ret; @@ -1463,7 +1463,7 @@ static int sc16is7xx_setup_mctrl_ports(struct sc16is7xx_port *s) if (s->mctrl_mask) regmap_update_bits( - s->regmap, + regmap, SC16IS7XX_IOCONTROL_REG, SC16IS7XX_IOCONTROL_MODEM_A_BIT | SC16IS7XX_IOCONTROL_MODEM_B_BIT, s->mctrl_mask); @@ -1495,6 +1495,10 @@ static int sc16is7xx_probe(struct device *dev, * This device does not have an identification register that would * tell us if we are really connected to the correct device. * The best we can do is to check if communication is at all possible. + * + * Note: regmap[0] is used in the probe function to access registers + * common to all channels/ports, as it is guaranteed to be present on + * all variants. */ ret = regmap_read(regmaps[0], SC16IS7XX_LSR_REG, &val); if (ret < 0) @@ -1530,7 +1534,6 @@ static int sc16is7xx_probe(struct device *dev, return -EINVAL; } - s->regmap = regmaps[0]; s->devtype = devtype; dev_set_drvdata(dev, s); mutex_init(&s->efr_lock); @@ -1545,7 +1548,7 @@ static int sc16is7xx_probe(struct device *dev, sched_set_fifo(s->kworker_task); /* reset device, purging any pending irq / data */ - regmap_write(s->regmap, SC16IS7XX_IOCONTROL_REG, + regmap_write(regmaps[0], SC16IS7XX_IOCONTROL_REG, SC16IS7XX_IOCONTROL_SRESET_BIT); for (i = 0; i < devtype->nr_uart; ++i) { @@ -1616,7 +1619,7 @@ static int sc16is7xx_probe(struct device *dev, sc16is7xx_setup_irda_ports(s); - ret = sc16is7xx_setup_mctrl_ports(s); + ret = sc16is7xx_setup_mctrl_ports(s, regmaps[0]); if (ret) goto out_ports; -- 2.39.2

10 months, 2 weeks

1
0
0 0

[PATCH v2 1/6] serial: sc16is7xx: remove wasteful static buffer in sc16is7xx_regmap_name()

by Hugo Villeneuve

From: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> Using a static buffer inside sc16is7xx_regmap_name() was a convenient and simple way to set the regmap name without having to allocate and free a buffer each time it is called. The drawback is that the static buffer wastes memory for nothing once regmap is fully initialized. Remove static buffer and use constant strings instead. This also avoids a truncation warning when using "%d" or "%u" in snprintf which was flagged by kernel test robot. Fixes: 3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one regmap per port") Cc: stable(a)vger.kernel.org # 6.1.x: 3837a03 serial: sc16is7xx: improve regmap debugfs by using one regmap per port Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> Signed-off-by: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> --- drivers/tty/serial/sc16is7xx.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 9cb503169a48..8d1de4982b65 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1708,13 +1708,15 @@ static struct regmap_config regcfg = { .max_register = SC16IS7XX_EFCR_REG, }; -static const char *sc16is7xx_regmap_name(unsigned int port_id) +static const char *sc16is7xx_regmap_name(u8 port_id) { - static char buf[6]; - - snprintf(buf, sizeof(buf), "port%d", port_id); - - return buf; + switch (port_id) { + case 0: return "port0"; + case 1: return "port1"; + default: + WARN_ON(true); + return NULL; + } } static unsigned int sc16is7xx_regmap_port_mask(unsigned int port_id) -- 2.39.2

10 months, 2 weeks

1
0
0 0

FAILED: patch "[PATCH] parisc: Fix asm operand number out of range build error in" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-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>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 487635756198cad563feb47539c6a37ea57f1dae # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023120949-waged-entail-7b6b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 487635756198 ("parisc: Fix asm operand number out of range build error in bug table") 43266838515d ("parisc: Reduce size of the bug_table on 64-bit kernel by half") fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 487635756198cad563feb47539c6a37ea57f1dae Mon Sep 17 00:00:00 2001 From: Helge Deller <deller(a)gmx.de> Date: Mon, 27 Nov 2023 10:39:26 +0100 Subject: [PATCH] parisc: Fix asm operand number out of range build error in bug table Build is broken if CONFIG_DEBUG_BUGVERBOSE=n. Fix it be using the correct asm operand number. Signed-off-by: Helge Deller <deller(a)gmx.de> Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> Fixes: fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table") Cc: stable(a)vger.kernel.org # v6.0+ diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h index 1641ff9a8b83..833555f74ffa 100644 --- a/arch/parisc/include/asm/bug.h +++ b/arch/parisc/include/asm/bug.h @@ -71,7 +71,7 @@ asm volatile("\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \ "\t.pushsection __bug_table,\"a\"\n" \ - "\t.align %2\n" \ + "\t.align 4\n" \ "2:\t" __BUG_REL(1b) "\n" \ "\t.short %0\n" \ "\t.blockz %1-4-2\n" \

10 months, 2 weeks

3
4
0 0

[PATCH 5.4 00/90] 5.4.263-rc3 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.263 release. There are 90 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, 07 Dec 2023 18:32:16 +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.263-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.263-rc3 Adrian Hunter <adrian.hunter(a)intel.com> mmc: block: Retry commands in CQE error recovery Zheng Yongjun <zhengyongjun3(a)huawei.com> mmc: core: convert comma to semicolon Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Fix task clearing in CQE error recovery Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Warn of halt or task clear failure Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Increase recovery halt timeout Christoph Niedermaier <cniedermaier(a)dh-electronics.com> cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily Christoph Niedermaier <cniedermaier(a)dh-electronics.com> cpufreq: imx6q: don't warn for disabling a non-existing frequency Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix system crash due to bad pointer access Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Bart Van Assche <bvanassche(a)acm.org> scsi: core: Introduce the scsi_cmd_to_rq() function Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Simplify the code for aborting SCSI commands Mimi Zohar <zohar(a)linux.ibm.com> ima: detect changes to the backing overlay file Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> ovl: skip overlayfs superblocks at global sync Amir Goldstein <amir73il(a)gmail.com> ima: annotate iint mutex to avoid lockdep false positive warnings Helge Deller <deller(a)gmx.de> fbdev: stifb: Make the STI next font pointer a 32-bit signed offset Linus Walleij <linus.walleij(a)linaro.org> mtd: cfi_cmdset_0001: Byte swap OTP info Jean-Philippe Brucker <jean-philippe(a)linaro.org> mtd: cfi_cmdset_0001: Support the absence of protection registers Heiko Carstens <hca(a)linux.ibm.com> s390/cmma: fix detection of DAT pages Alexander Gordeev <agordeev(a)linux.ibm.com> s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family Steve French <stfrench(a)microsoft.com> smb3: fix touch -h of symlink Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> net: ravb: Start TX queues after HW initialization succeeded Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> net: ravb: Use pm_runtime_resume_and_get() Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix races between ravb_tx_timeout_work() and net related ops Furong Xu <0x1207(a)gmail.com> net: stmmac: xgmac: Disable FPE MMC interrupts Zhengchao Shao <shaozhengchao(a)huawei.com> ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet Max Nguyen <maxwell.nguyen(a)hp.com> Input: xpad - add HyperX Clutch Gladiate Support Filipe Manana <fdmanana(a)suse.com> btrfs: make error messages more clear when getting a chunk map Jann Horn <jannh(a)google.com> btrfs: send: ensure send_fd is writable Filipe Manana <fdmanana(a)suse.com> btrfs: fix off-by-one when checking chunk map includes logical address Qu Wenruo <wqu(a)suse.com> btrfs: add dmesg output for first mount and last unmount of a filesystem Timothy Pearson <tpearson(a)raptorengineering.com> powerpc: Don't clobber f0/vs0 during fp|altivec register save Markus Weippert <markus(a)gekmihesg.de> bcache: revert replacing IS_ERR_OR_NULL with IS_ERR Wu Bo <bo.wu(a)vivo.com> dm verity: don't perform FEC for failed readahead IO Mikulas Patocka <mpatocka(a)redhat.com> dm-verity: align struct dm_verity_fec_io properly Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek: Add supported ALC257 for ChromeOS Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek: Headset Mic VREF to 100% Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Disable power-save on KONTRON SinglePC Adrian Hunter <adrian.hunter(a)intel.com> mmc: block: Do not lose cache flush during CQE error recovery Yang Yingliang <yangyingliang(a)huawei.com> firewire: core: fix possible memory leak in create_units() Maria Yu <quic_aiquny(a)quicinc.com> pinctrl: avoid reload of p state in list iteration Keith Busch <kbusch(a)kernel.org> io_uring: fix off-by one bvec index Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: qcom: fix wakeup after probe deferral Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: qcom: fix resource leaks on probe deferral Ricardo Ribalda <ribalda(a)chromium.org> usb: dwc3: set the dma max_seg_size Oliver Neukum <oneukum(a)suse.com> USB: dwc2: write HCINT with INTMASK applied Lech Perczak <lech.perczak(a)gmail.com> USB: serial: option: don't claim interface 4 for ZTE MF290 Puliang Lu <puliang.lu(a)fibocom.com> USB: serial: option: fix FM101R-GL defines Victor Fragoso <victorffs(a)hotmail.com> USB: serial: option: add Fibocom L7xx modules Rand Deeb <rand.sec96(a)gmail.com> bcache: prevent potential division by zero error Coly Li <colyli(a)suse.de> bcache: check return value from btree_node_alloc_replacement() Mikulas Patocka <mpatocka(a)redhat.com> dm-delay: fix a race between delay_presuspend and delay_bio Long Li <longli(a)microsoft.com> hv_netvsc: Mark VF as slave before exposing it to user-mode Haiyang Zhang <haiyangz(a)microsoft.com> hv_netvsc: Fix race of register_netdevice_notifier and VF register Asuna Yang <spriteovo(a)gmail.com> USB: serial: option: add Luat Air72*U series products Jan Höppner <hoeppner(a)linux.ibm.com> s390/dasd: protect device queue against concurrent access Coly Li <colyli(a)suse.de> bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA Andrew Murray <andrew.murray(a)arm.com> KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 Andrew Murray <andrew.murray(a)arm.com> arm64: cpufeature: Extract capped perfmon fields Zhang Yi <yi.zhang(a)huawei.com> ext4: make sure allocate pending entry not fail Baokun Li <libaokun1(a)huawei.com> ext4: fix slab-use-after-free in ext4_es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_insert_delayed_block() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_remove_extent() Baokun Li <libaokun1(a)huawei.com> ext4: use pre-allocated es in __es_remove_extent() Baokun Li <libaokun1(a)huawei.com> ext4: use pre-allocated es in __es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: factor out __es_alloc_extent() and __es_free_extent() Baokun Li <libaokun1(a)huawei.com> ext4: add a new helper to check if es must be kept Huacai Chen <chenhuacai(a)loongson.cn> MIPS: KVM: Fix a build warning about variable set but not used Christoph Hellwig <hch(a)lst.de> nvmet: nul-terminate the NQNs passed in the connect command Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> nvmet: remove unnecessary ctrl parameter David Howells <dhowells(a)redhat.com> afs: Fix file locking on R/O volumes to operate in local mode David Howells <dhowells(a)redhat.com> afs: Return ENOENT if no cell DNS record can be found Samuel Holland <samuel.holland(a)sifive.com> net: axienet: Fix check for partial TX checksum Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: propagate the correct speed and duplex status Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: handle the corner-case during tx completion Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: handle corner-case during sfp hotplug Stefano Stabellini <sstabellini(a)kernel.org> arm/xen: fix xen_vcpu_info allocation alignment Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> net: usb: ax88179_178a: fix failed operations during ax88179_reset Kunwu Chan <chentao(a)kylinos.cn> ipv4: Correct/silence an endian warning in __ip_do_redirect Charles Yi <be286(a)163.com> HID: fix HID device resource race between HID core and debugging support Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: core: store the unique system identifier in hid_device Jonas Karlman <jonas(a)kwiboo.se> drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full Chen Ni <nichen(a)iscas.ac.cn> ata: pata_isapnp: Add missing error check for devm_ioport_map() Marek Vasut <marex(a)denx.de> drm/panel: simple: Fix Innolux G101ICE-L01 timings Marek Vasut <marex(a)denx.de> drm/panel: simple: Fix Innolux G101ICE-L01 bus flags David Howells <dhowells(a)redhat.com> afs: Make error on cell lookup failure consistent with OpenAFS Nathan Chancellor <nathan(a)kernel.org> PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}() Christopher Bednarz <christopher.n.bednarz(a)intel.com> RDMA/irdma: Prevent zero-length STAG registration Saravana Kannan <saravanak(a)google.com> driver core: Release all resources during unbind before updating device links ------------- Diffstat: Makefile | 4 +- arch/arm/xen/enlighten.c | 3 +- arch/arm64/include/asm/cpufeature.h | 23 ++ arch/arm64/include/asm/sysreg.h | 6 + arch/arm64/kvm/sys_regs.c | 10 + arch/mips/kvm/mmu.c | 3 +- arch/powerpc/kernel/fpu.S | 13 + arch/powerpc/kernel/vector.S | 2 + arch/s390/mm/page-states.c | 14 +- drivers/acpi/resource.c | 7 + drivers/ata/pata_isapnp.c | 3 + drivers/base/dd.c | 4 +- drivers/cpufreq/imx6q-cpufreq.c | 32 +-- drivers/firewire/core-device.c | 11 +- drivers/gpu/drm/panel/panel-simple.c | 13 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +- drivers/hid/hid-core.c | 16 +- drivers/hid/hid-debug.c | 3 + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 6 + drivers/infiniband/hw/i40iw/i40iw_type.h | 2 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 +- drivers/input/joystick/xpad.c | 2 + drivers/md/bcache/btree.c | 6 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/dm-delay.c | 17 +- drivers/md/dm-verity-fec.c | 3 +- drivers/md/dm-verity-target.c | 4 +- drivers/md/dm-verity.h | 6 - drivers/mmc/core/block.c | 2 + drivers/mmc/core/core.c | 15 +- drivers/mmc/host/cqhci.c | 44 ++-- drivers/mtd/chips/cfi_cmdset_0001.c | 29 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 11 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 14 +- drivers/net/ethernet/renesas/ravb_main.c | 20 +- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 41 ++- drivers/net/usb/ax88179_178a.c | 4 +- drivers/nvme/target/core.c | 21 +- drivers/nvme/target/fabrics-cmd.c | 15 +- drivers/nvme/target/nvmet.h | 5 +- drivers/pci/controller/dwc/pci-keystone.c | 8 +- drivers/pinctrl/core.c | 6 +- drivers/s390/block/dasd.c | 24 +- drivers/scsi/qla2xxx/qla_def.h | 3 - drivers/scsi/qla2xxx/qla_isr.c | 5 - drivers/scsi/qla2xxx/qla_os.c | 39 +-- drivers/usb/dwc2/hcd_intr.c | 15 +- drivers/usb/dwc3/core.c | 2 + drivers/usb/dwc3/dwc3-qcom.c | 17 +- drivers/usb/serial/option.c | 11 +- drivers/video/fbdev/sticore.h | 2 +- fs/afs/dynroot.c | 4 +- fs/afs/super.c | 2 + fs/afs/vl_rotate.c | 10 + fs/btrfs/disk-io.c | 1 + fs/btrfs/send.c | 2 +- fs/btrfs/super.c | 5 +- fs/btrfs/volumes.c | 9 +- fs/cifs/cifsfs.c | 1 + fs/ext4/extents_status.c | 306 +++++++++++++++------- fs/io_uring.c | 2 +- fs/overlayfs/super.c | 5 +- fs/sync.c | 3 +- include/linux/fs.h | 2 + include/linux/hid.h | 5 + include/scsi/scsi_cmnd.h | 6 + net/ipv4/igmp.c | 6 +- net/ipv4/route.c | 2 +- security/integrity/iint.c | 48 +++- security/integrity/ima/ima_api.c | 5 + security/integrity/ima/ima_main.c | 16 +- security/integrity/integrity.h | 2 + sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 12 + 77 files changed, 753 insertions(+), 315 deletions(-)

10 months, 2 weeks

7
8
0 0

[PATCH] drm/amd/display: Disable PSR-SU on Parade 0803 TCON again

by Mario Limonciello

When screen brightness is rapidly changed and PSR-SU is enabled the display hangs on panels with this TCON even on the latest DCN 3.1.4 microcode (0x8002a81 at this time). This was disabled previously as commit 072030b17830 ("drm/amd: Disable PSR-SU on Parade 0803 TCON") but reverted as commit 1e66a17ce546 ("Revert "drm/amd: Disable PSR-SU on Parade 0803 TCON"") in favor of testing for a new enough microcode (commit cd2e31a9ab93 ("drm/amd/display: Set minimum requirement for using PSR-SU on Phoenix")). As hangs are still happening specifically with this TCON, disable PSR-SU again for it until it can be root caused. Cc: stable(a)vger.kernel.org Cc: aaron.ma(a)canonical.com Cc: binli(a)gnome.org Cc: Marc Rossi <Marc.Rossi(a)amd.com> Cc: Hamza Mahfooz <Hamza.Mahfooz(a)amd.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- drivers/gpu/drm/amd/display/modules/power/power_helpers.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c index a522a7c02911..1675314a3ff2 100644 --- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c +++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c @@ -839,6 +839,8 @@ bool is_psr_su_specific_panel(struct dc_link *link) ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) || (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07))) isPSRSUSupported = false; + else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03) + isPSRSUSupported = false; else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1) isPSRSUSupported = true; } -- 2.34.1

10 months, 2 weeks

3
3
0 0

FAILED: patch "[PATCH] mmc: block: Be sure to wait while busy in CQE error recovery" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-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>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x c616696a902987352426fdaeec1b0b3240949e6b # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023120358-baking-anymore-b0c7@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: c616696a9029 ("mmc: block: Be sure to wait while busy in CQE error recovery") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From c616696a902987352426fdaeec1b0b3240949e6b Mon Sep 17 00:00:00 2001 From: Adrian Hunter <adrian.hunter(a)intel.com> Date: Fri, 3 Nov 2023 10:47:17 +0200 Subject: [PATCH] mmc: block: Be sure to wait while busy in CQE error recovery STOP command does not guarantee to wait while busy, but subsequent command MMC_CMDQ_TASK_MGMT to discard the queue will fail if the card is busy, so be sure to wait by employing mmc_poll_for_busy(). Fixes: 72a5af554df8 ("mmc: core: Add support for handling CQE requests") Cc: stable(a)vger.kernel.org Signed-off-by: Adrian Hunter <adrian.hunter(a)intel.com> Reviewed-by: Avri Altman <avri.altman(a)wdc.com> Reviewed-by: Christian Loehle <christian.loehle(a)arm.com> Link: https://lore.kernel.org/r/20231103084720.6886-4-adrian.hunter@intel.com Signed-off-by: Ulf Hansson <ulf.hansson(a)linaro.org> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 3d3e0ca52614..befde2bd26d3 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -553,6 +553,8 @@ int mmc_cqe_recovery(struct mmc_host *host) cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; mmc_wait_for_cmd(host, &cmd, 0); + mmc_poll_for_busy(host->card, MMC_CQE_RECOVERY_TIMEOUT, true, MMC_BUSY_IO); + memset(&cmd, 0, sizeof(cmd)); cmd.opcode = MMC_CMDQ_TASK_MGMT; cmd.arg = 1; /* Discard entire queue */

10 months, 2 weeks

3
2
0 0

[PATCH 1/1] drm/mediatek: Fix access violation in mtk_drm_crtc_dma_dev_get

by Stuart Lee

Add error handling to check NULL input in mtk_drm_crtc_dma_dev_get function. While display path is not configured correctly, none of crtc is established. So the caller of mtk_drm_crtc_dma_dev_get may pass input parameter *crtc as NULL, Which may cause coredump when we try to get the container of NULL pointer. Fixes: cb1d6bcca542 ("drm/mediatek: Add dma dev get function") Signed-off-by: Stuart Lee <stuart.lee(a)mediatek.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index c277b9fae950..047c9a31d306 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -921,7 +921,14 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev, struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) { - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); + struct mtk_drm_crtc *mtk_crtc = NULL; + + if (!crtc) + return NULL; + + mtk_crtc = to_mtk_crtc(crtc); + if (!mtk_crtc) + return NULL; return mtk_crtc->dma_dev; } -- 2.18.0

10 months, 2 weeks

4
3
0 0

Backport riscv kconfig for v6.6

by Nam Cao

Hi, Please backport 78a03b9f8e6b ("riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE") to v6.6 Without this, it is not possible to configure the kernel with SPI drivers for the Visionfive 2 board. This one depends a1a5f2c88725 ("dmaengine: pl330: rename _start to prevent build error"), which is already in stable. It should be backported to v6.1 too, but it does not apply cleanly. So I will send a patch for that. Best regards, Nam

10 months, 2 weeks

2
3
0 0

[PATCH AUTOSEL 6.1 01/29] hwtracing: hisi_ptt: Handle the interrupt in hardirq context

by Sasha Levin

From: Yicong Yang <yangyicong(a)hisilicon.com> [ Upstream commit e0dd27ad8af00f147ac3c9de88e0687986afc3ea ] Handle the trace interrupt in the hardirq context, make sure the irq core won't threaded it by declaring IRQF_NO_THREAD and userspace won't balance it by declaring IRQF_NOBALANCING. Otherwise we may violate the synchronization requirements of the perf core, referenced to the change of arm-ccn PMU commit 0811ef7e2f54 ("bus: arm-ccn: fix PMU interrupt flags"). In the interrupt handler we mainly doing 2 things: - Copy the data from the local DMA buffer to the AUX buffer - Commit the data in the AUX buffer Signed-off-by: Yicong Yang <yangyicong(a)hisilicon.com> Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> [ Fixed commit description to suppress checkpatch warning ] Signed-off-by: Suzuki K Poulose <suzuki.poulose(a)arm.com> Link: https://lore.kernel.org/r/20231010084731.30450-3-yangyicong@huawei.com Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/hwtracing/ptt/hisi_ptt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c index 4140efd664097..75a8f24fdafee 100644 --- a/drivers/hwtracing/ptt/hisi_ptt.c +++ b/drivers/hwtracing/ptt/hisi_ptt.c @@ -342,9 +342,9 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt) return ret; hisi_ptt->trace_irq = pci_irq_vector(pdev, HISI_PTT_TRACE_DMA_IRQ); - ret = devm_request_threaded_irq(&pdev->dev, hisi_ptt->trace_irq, - NULL, hisi_ptt_isr, 0, - DRV_NAME, hisi_ptt); + ret = devm_request_irq(&pdev->dev, hisi_ptt->trace_irq, hisi_ptt_isr, + IRQF_NOBALANCING | IRQF_NO_THREAD, DRV_NAME, + hisi_ptt); if (ret) { pci_err(pdev, "failed to request irq %d, ret = %d\n", hisi_ptt->trace_irq, ret); -- 2.42.0

10 months, 2 weeks

2
29
0 0

[PATCH AUTOSEL 4.14 1/5] ASoC: cs43130: Fix the position of const qualifier

by Sasha Levin

From: Maciej Strozek <mstrozek(a)opensource.cirrus.com> [ Upstream commit e7f289a59e76a5890a57bc27b198f69f175f75d9 ] Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20231117141344.64320-2-mstrozek@opensource.cirrus… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/cs43130.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index 643e37fc218e1..793496e8d262d 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -1675,7 +1675,7 @@ static ssize_t cs43130_show_dc_r(struct device *dev, return cs43130_show_dc(dev, buf, HP_RIGHT); } -static u16 const cs43130_ac_freq[CS43130_AC_FREQ] = { +static const u16 cs43130_ac_freq[CS43130_AC_FREQ] = { 24, 43, 93, @@ -2351,7 +2351,7 @@ static const struct regmap_config cs43130_regmap = { .use_single_rw = true, /* needed for regcache_sync */ }; -static u16 const cs43130_dc_threshold[CS43130_DC_THRESHOLD] = { +static const u16 cs43130_dc_threshold[CS43130_DC_THRESHOLD] = { 50, 120, }; -- 2.42.0

10 months, 2 weeks

1
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2023