January 2023 - Linux-stable-mirror

[PATCH v2 5.10] block: fix and cleanup bio_check_ro

by Fedor Pchelkin

From: Christoph Hellwig <hch(a)lst.de> commit 57e95e4670d1126c103305bcf34a9442f49f6d6a upstream. Don't use a WARN_ON when printing a potentially user triggered condition. Also don't print the partno when the block device name already includes it, and use the %pg specifier to simplify printing the block device name. Signed-off-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Chaitanya Kulkarni <kch(a)nvidia.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com> Link: https://lore.kernel.org/r/20220304180105.409765-2-hch@lst.de Signed-off-by: Jens Axboe <axboe(a)kernel.dk> [the formatted string layout is not changed because struct bio hasn't got bi_bdev field in stable branches older than 5.15] Signed-off-by: Fedor Pchelkin <pchelkin(a)ispras.ru> --- v1->v2: added backport comment block/blk-core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 26664f2a139e..9afb79b322fb 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -700,9 +700,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) return false; - - WARN_ONCE(1, - "Trying to write to read-only block-device %s (partno %d)\n", + pr_warn("Trying to write to read-only block-device %s (partno %d)\n", bio_devname(bio, b), part->partno); /* Older lvm-tools actually trigger this */ return false; -- 2.30.2

1 year, 3 months

1
0
0 0

[PATCH RESEND] pipe: avoid creating empty pipe buffers

by Wiktor Garbacz

pipe_write cannot be called on notification pipes so post_one_notification cannot race it. Locking and second pipe_full check are thus redundant. This fixes an issue where pipe write could unexpectedly block: // Assume there is no reader or reader polls and uses FIONREAD ioctl // to read all the available bytes. for (int i = 0; i < PIPE_DEF_BUFFERS+1; ++i) { write(pipe_fd, buf_that_efaults, PAGE_SIZE); } // Never reached Fixes: a194dfe6e6f6 ("pipe: Rearrange sequence in pipe_write() to preallocate slot") Cc: stable(a)vger.kernel.org Signed-off-by: Wiktor Garbacz <wiktorg(a)google.com> --- fs/pipe.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index 42c7ff41c2db..87356a2823cf 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -501,43 +501,26 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from) pipe->tmp_page = page; } - /* Allocate a slot in the ring in advance and attach an - * empty buffer. If we fault or otherwise fail to use - * it, either the reader will consume it or it'll still - * be there for the next write. - */ - spin_lock_irq(&pipe->rd_wait.lock); - - head = pipe->head; - if (pipe_full(head, pipe->tail, pipe->max_usage)) { - spin_unlock_irq(&pipe->rd_wait.lock); - continue; + copied = copy_page_from_iter(page, 0, PAGE_SIZE, from); + if (unlikely(copied < PAGE_SIZE && iov_iter_count(from))) { + if (!ret) + ret = -EFAULT; + break; } - - pipe->head = head + 1; - spin_unlock_irq(&pipe->rd_wait.lock); + ret += copied; /* Insert it into the buffer array */ - buf = &pipe->bufs[head & mask]; buf->page = page; buf->ops = &anon_pipe_buf_ops; buf->offset = 0; - buf->len = 0; + buf->len = copied; if (is_packetized(filp)) buf->flags = PIPE_BUF_FLAG_PACKET; else buf->flags = PIPE_BUF_FLAG_CAN_MERGE; pipe->tmp_page = NULL; - - copied = copy_page_from_iter(page, 0, PAGE_SIZE, from); - if (unlikely(copied < PAGE_SIZE && iov_iter_count(from))) { - if (!ret) - ret = -EFAULT; - break; - } - ret += copied; - buf->offset = 0; - buf->len = copied; + head++; + pipe->head = head; if (!iov_iter_count(from)) break; -- 2.39.1.456.gfc5497dd1b-goog

1 year, 3 months

1
0
0 0

[tip: x86/urgent] x86/debug: Fix stack recursion caused by wrongly ordered DR7 accesses

by tip-bot2 for Joerg Roedel

The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 9d2c7203ffdb846399b82b0660563c89e918c751 Gitweb: https://git.kernel.org/tip/9d2c7203ffdb846399b82b0660563c89e918c751 Author: Joerg Roedel <jroedel(a)suse.de> AuthorDate: Tue, 31 Jan 2023 09:57:18 +01:00 Committer: Borislav Petkov (AMD) <bp(a)alien8.de> CommitterDate: Tue, 31 Jan 2023 12:51:19 +01:00 x86/debug: Fix stack recursion caused by wrongly ordered DR7 accesses In kernels compiled with CONFIG_PARAVIRT=n, the compiler re-orders the DR7 read in exc_nmi() to happen before the call to sev_es_ist_enter(). This is problematic when running as an SEV-ES guest because in this environment the DR7 read might cause a #VC exception, and taking #VC exceptions is not safe in exc_nmi() before sev_es_ist_enter() has run. The result is stack recursion if the NMI was caused on the #VC IST stack, because a subsequent #VC exception in the NMI handler will overwrite the stack frame of the interrupted #VC handler. As there are no compiler barriers affecting the ordering of DR7 reads/writes, make the accesses to this register volatile, forbidding the compiler to re-order them. [ bp: Massage text, make them volatile too, to make sure some aggressive compiler optimization pass doesn't discard them. ] Fixes: 315562c9af3d ("x86/sev-es: Adjust #VC IST Stack on entering NMI handler") Reported-by: Alexey Kardashevskiy <aik(a)amd.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> Signed-off-by: Borislav Petkov (AMD) <bp(a)alien8.de> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230127035616.508966-1-aik@amd.com --- arch/x86/include/asm/debugreg.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h index b049d95..ca97442 100644 --- a/arch/x86/include/asm/debugreg.h +++ b/arch/x86/include/asm/debugreg.h @@ -39,7 +39,20 @@ static __always_inline unsigned long native_get_debugreg(int regno) asm("mov %%db6, %0" :"=r" (val)); break; case 7: - asm("mov %%db7, %0" :"=r" (val)); + /* + * Apply __FORCE_ORDER to DR7 reads to forbid re-ordering them + * with other code. + * + * This is needed because a DR7 access can cause a #VC exception + * when running under SEV-ES. Taking a #VC exception is not a + * safe thing to do just anywhere in the entry code and + * re-ordering might place the access into an unsafe location. + * + * This happened in the NMI handler, where the DR7 read was + * re-ordered to happen before the call to sev_es_ist_enter(), + * causing stack recursion. + */ + asm volatile("mov %%db7, %0" : "=r" (val) : __FORCE_ORDER); break; default: BUG(); @@ -66,7 +79,16 @@ static __always_inline void native_set_debugreg(int regno, unsigned long value) asm("mov %0, %%db6" ::"r" (value)); break; case 7: - asm("mov %0, %%db7" ::"r" (value)); + /* + * Apply __FORCE_ORDER to DR7 writes to forbid re-ordering them + * with other code. + * + * While is didn't happen with a DR7 write (see the DR7 read + * comment above which explains where it happened), add the + * __FORCE_ORDER here too to avoid similar problems in the + * future. + */ + asm volatile("mov %0, %%db7" ::"r" (value), __FORCE_ORDER); break; default: BUG();

1 year, 3 months

1
0
0 0

[PATCH 6.1 000/313] 6.1.9-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.9 release. There are 313 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 Wed, 01 Feb 2023 18:15:14 +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/v6.x/stable-review/patch-6.1.9-rc2.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.1.9-rc2 Dave Airlie <airlied(a)redhat.com> amdgpu: fix build on non-DCN platforms. Colin Ian King <colin.i.king(a)gmail.com> perf/x86/amd: fix potential integer overflow on shift of a int Sriram Yagnaraman <sriram.yagnaraman(a)est.tech> netfilter: conntrack: unify established states for SCTP paths Fabrizio Castro <fabrizio.castro.jz(a)renesas.com> dt-bindings: i2c: renesas,rzv2m: Fix SoC specific string Thomas Gleixner <tglx(a)linutronix.de> x86/i8259: Mark legacy PIC interrupts with IRQ_LEVEL Conor Dooley <conor.dooley(a)microchip.com> dt-bindings: riscv: fix single letter canonical order Conor Dooley <conor.dooley(a)microchip.com> dt-bindings: riscv: fix underscore requirement for multi-letter extensions Juergen Gross <jgross(a)suse.com> acpi: Fix suspend with Xen PV Nikunj A Dadhania <nikunj(a)amd.com> x86/sev: Add SEV-SNP guest feature negotiation support Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add Clevo PCX0DX to i8042 quirk table Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode" Vlastimil Babka <vbabka(a)suse.cz> Revert "mm/compaction: fix set skip in fast_find_migrateblock" Linus Torvalds <torvalds(a)linux-foundation.org> Fix up more non-executable files marked executable Ivo Borisov Shopov <ivoshopov(a)gmail.com> tools: gpio: fix -c option of gpio-event-mon Linus Torvalds <torvalds(a)linux-foundation.org> treewide: fix up files incorrectly marked executable Ming Lei <ming.lei(a)redhat.com> block: ublk: move ublk_chr_class destroying after devices are removed Robin Murphy <robin.murphy(a)arm.com> Partially revert "perf/arm-cmn: Optimise DTC counter accesses" Jerome Brunet <jbrunet(a)baylibre.com> net: mdio-mux-meson-g12a: force internal PHY off on mux switch Gerhard Engleder <gerhard(a)engleder-embedded.com> tsnep: Fix TX queue stop/wake for multiple queues David Christensen <drc(a)linux.vnet.ibm.com> net/tg3: resolve deadlock in tg3_reset_task() during EEH Ley Foon Tan <leyfoon.tan(a)starfivetech.com> riscv: Move call to init_cpu_topology() to later initialization stage Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type() Jeremy Kerr <jk(a)codeconstruct.com.au> net: mctp: mark socks as dead on unhash, prevent re-add Paolo Abeni <pabeni(a)redhat.com> net: mctp: hold key reference when looking up a general key Jeremy Kerr <jk(a)codeconstruct.com.au> net: mctp: move expiry timer delete to unhash Jeremy Kerr <jk(a)codeconstruct.com.au> net: mctp: add an explicit reference from a mctp_sk_key to sock Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> net: ravb: Fix possible hang if RIS2_QFF1 happen Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> net: ravb: Fix lack of register setting after system resumed for Gen3 Nikita Shubin <nikita.shubin(a)maquefel.me> gpio: ep93xx: Fix port F hwirq numbers in handler Dan Carpenter <error27(a)gmail.com> gpio: mxc: Unlock on error path in mxc_flip_edge() Keith Busch <kbusch(a)kernel.org> nvme: fix passthrough csi check Liao Chang <liaochang1(a)huawei.com> riscv/kprobe: Fix instruction simulation of JALR Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: fail if no bound addresses can be used for a given scope Eric Dumazet <edumazet(a)google.com> net/sched: sch_taprio: do not schedule in taprio_reset() Chuang Wang <nashuiliang(a)gmail.com> tracing/osnoise: Use built-in RCU list checking Hans de Goede <hdegoede(a)redhat.com> ACPI: video: Fix apple gmux detection Hans de Goede <hdegoede(a)redhat.com> platform/x86: apple-gmux: Add apple_gmux_detect() helper Hans de Goede <hdegoede(a)redhat.com> platform/x86: apple-gmux: Move port defines to apple-gmux.h Hans de Goede <hdegoede(a)redhat.com> platform/x86: asus-wmi: Fix kbd_dock_devid tablet-switch reporting Kuniyuki Iwashima <kuniyu(a)amazon.com> netrom: Fix use-after-free of a listening socket. Sriram Yagnaraman <sriram.yagnaraman(a)est.tech> netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE Alexandru Tachici <alexandru.tachici(a)analog.com> net: ethernet: adi: adin1110: Fix multicast offloading Ahmad Fatoum <a.fatoum(a)pengutronix.de> net: dsa: microchip: fix probe of I2C-connected KSZ8563 Eric Dumazet <edumazet(a)google.com> ipv4: prevent potential spectre v1 gadget in fib_metrics_match() Eric Dumazet <edumazet(a)google.com> ipv4: prevent potential spectre v1 gadget in ip_metrics_convert() Eric Dumazet <edumazet(a)google.com> netlink: annotate data races around sk_state Eric Dumazet <edumazet(a)google.com> netlink: annotate data races around dst_portid and dst_group Eric Dumazet <edumazet(a)google.com> netlink: annotate data races around nlk->portid Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: skip elements in transaction from garbage collection Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: Switch to node list walk for overlap detection Hans de Goede <hdegoede(a)redhat.com> ACPI: video: Add backlight=native DMI quirk for Asus U46E Hans de Goede <hdegoede(a)redhat.com> ACPI: video: Add backlight=native DMI quirk for HP EliteBook 8460p Hans de Goede <hdegoede(a)redhat.com> ACPI: video: Add backlight=native DMI quirk for HP Pavilion g6-1d80nr Arnd Bergmann <arnd(a)arndb.de> drm/i915/selftest: fix intel_selftest_modify_policy argument types Ross Lagerwall <ross.lagerwall(a)citrix.com> nvme-fc: fix initialization order Christoph Hellwig <hch(a)lst.de> nvme: consolidate setting the tagset flags Christoph Hellwig <hch(a)lst.de> nvme: simplify transport specific device attribute handling Wei Fang <wei.fang(a)nxp.com> net: fec: Use page_pool_put_full_page when freeing rx buffers Paolo Abeni <pabeni(a)redhat.com> net: fix UaF in netns ops registration error path Eric Dumazet <edumazet(a)google.com> netlink: prevent potential spectre v1 gadgets Stefan Assmann <sassmann(a)kpanic.de> iavf: schedule watchdog immediately when changing primary MAC Michal Schmidt <mschmidt(a)redhat.com> iavf: fix temporary deadlock and failure to set MAC address Nirmoy Das <nirmoy.das(a)intel.com> drm/i915: Fix a memory leak with reused mmap_offset Nirmoy Das <nirmoy.das(a)intel.com> drm/drm_vma_manager: Add drm_vma_node_allow_once() Richard Fitzgerald <rf(a)opensource.cirrus.com> i2c: designware: Fix unbalanced suspended flag Lareine Khawaly <lareine(a)amazon.com> i2c: designware: use casting of u64 in clock multiplication to avoid overflow Dylan Yudaken <dylany(a)meta.com> io_uring: always prep_async for drain requests Haiyang Zhang <haiyangz(a)microsoft.com> net: mana: Fix IRQ name - add PCI and queue number Pavel Begunkov <asml.silence(a)gmail.com> io_uring: inline __io_req_complete_put() Pavel Begunkov <asml.silence(a)gmail.com> io_uring: remove io_req_tw_post_queue Pavel Begunkov <asml.silence(a)gmail.com> io_uring: use io_req_task_complete() in timeout Pavel Begunkov <asml.silence(a)gmail.com> io_uring: hold locks for io_req_complete_failed Pavel Begunkov <asml.silence(a)gmail.com> io_uring: inline __io_req_complete_post() Pavel Begunkov <asml.silence(a)gmail.com> io_uring: inline io_req_task_work_add() Wayne Lin <Wayne.Lin(a)amd.com> drm/amdgpu/display/mst: update mst_mgr relevant variable when long HPD Wayne Lin <Wayne.Lin(a)amd.com> drm/amdgpu/display/mst: limit payload to be updated one by one Lyude Paul <lyude(a)redhat.com> drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments Jonathan Kim <jonathan.kim(a)amd.com> drm/amdgpu: remove unconditional trap enable on add gfx11 queues Evan Quan <evan.quan(a)amd.com> drm/amd/pm: add missing AllowIHInterrupt message mapping for SMU13.0.0 Wayne Lin <Wayne.Lin(a)amd.com> drm/display/dp_mst: Correct the kref of port. Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: thinkpad_acpi: Fix profile modes on Intel platforms Manivannan Sadhasivam <mani(a)kernel.org> EDAC/qcom: Do not pass llcc_driv_data as edac_device_ctl_info's pvt_info Manivannan Sadhasivam <mani(a)kernel.org> EDAC/device: Respect any driver-supplied workqueue polling value Giulio Benetti <giulio.benetti(a)benettiengineering.com> ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment Gergely Risko <gergely.risko(a)gmail.com> ipv6: fix reachability confirmation with proxy_ndp Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> thermal: intel: int340x: Protect trip temperature from concurrent updates Masahiro Yamada <masahiroy(a)kernel.org> riscv: fix -Wundef warning for CONFIG_RISCV_BOOT_SPINWAIT Johan Hovold <johan+linaro(a)kernel.org> scsi: ufs: core: Fix devfreq deadlocks Marc Zyngier <maz(a)kernel.org> KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation Hendrik Borghorst <hborghor(a)amazon.de> KVM: x86/vmx: Do not skip segment attributes if unusable bit is set Jens Axboe <axboe(a)kernel.dk> io_uring/net: cache provided buffer group value for multishot receives Miklos Szeredi <mszeredi(a)redhat.com> ovl: fail on invalid uid/gid mapping at copy up Miklos Szeredi <mszeredi(a)redhat.com> ovl: fix tmpfile leak Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: limit pdu length size according to connection status Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: downgrade ndr version error message to debug Marios Makassikis <mmakassikis(a)freebox.fr> ksmbd: do not sign response to session request for guest login Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: add max connections parameter David Howells <dhowells(a)redhat.com> cifs: Fix oops due to uncleared server->smbd_conn in reconnect Steven Rostedt (Google) <rostedt(a)goodmis.org> ftrace/scripts: Update the instructions for ftrace-bisect.sh Natalia Petrova <n.petrova(a)fintech.ru> trace_events_hist: add check for return value of 'create_hist_field' Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Make sure trace_printk() can output as soon as it can be used Mark Rutland <mark.rutland(a)arm.com> ftrace: Export ftrace_free_filter() to modules Petr Pavlu <petr.pavlu(a)suse.com> module: Don't wait for GOING modules Jeff Layton <jlayton(a)kernel.org> nfsd: don't free files unconditionally in __nfsd_file_cache_purge Yi Liu <yi.l.liu(a)intel.com> kvm/vfio: Fix potential deadlock on vfio group_lock Alexey V. Vissarionov <gremlin(a)altlinux.org> scsi: hpsa: Fix allocation size for scsi_host_alloc() Niklas Schnelle <schnelle(a)linux.ibm.com> vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp() Qais Yousef <qyousef(a)layalina.io> sched/uclamp: Fix a uninitialized variable warnings Pierre Gondois <pierre.gondois(a)arm.com> sched/fair: Check if prev_cpu has highest spare cap in feec() Alexander Wetzel <alexander(a)wetzel-home.de> wifi: mac80211: Fix iTXQ AMPDU fragmentation handling Alexander Wetzel <alexander(a)wetzel-home.de> wifi: mac80211: Proper mark iTXQs for resumption Pavel Begunkov <asml.silence(a)gmail.com> io_uring/msg_ring: fix remote queue to disabled ring Harsh Jain <harsh.jain(a)amd.com> drm/amdgpu: complete gfxoff allow signal during suspend without delay Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Allow alternate fixed modes always for eDP Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Allow panel fixed modes to have differing sync polarities Archie Pusaka <apusaka(a)chromium.org> Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Ard Biesheuvel <ardb(a)kernel.org> arm64: efi: Account for the EFI runtime stack in stack unwinder Ard Biesheuvel <ardb(a)kernel.org> arm64: efi: Avoid workqueue to check whether EFI runtime is live Ard Biesheuvel <ardb(a)kernel.org> arm64: efi: Recover from synchronous exceptions occurring in firmware Sasha Levin <sashal(a)kernel.org> Revert "selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID" Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: zoned: enable metadata over-commit for non-ZNS setup Kees Cook <keescook(a)chromium.org> firmware: coreboot: Check size of table entry and use flex-array Peter Foley <pefoley2(a)pefoley.com> ata: pata_cs5535: Don't build on UML Mateusz Guzik <mjguzik(a)gmail.com> lockref: stop doing cpu_relax in the cmpxchg loop Henning Schild <henning.schild(a)siemens.com> platform/x86: simatic-ipc: add another model Henning Schild <henning.schild(a)siemens.com> platform/x86: simatic-ipc: correct name of a model Thomas Weißschuh <linux(a)weissschuh.net> platform/x86: asus-wmi: Ignore fan on E410MA Thomas Weißschuh <linux(a)weissschuh.net> platform/x86: asus-wmi: Add quirk wmi_ignore_fan Hans de Goede <hdegoede(a)redhat.com> platform/x86: asus-nb-wmi: Add alternate mapping for KEY_SCREENLOCK Thomas Weißschuh <linux(a)weissschuh.net> platform/x86: asus-nb-wmi: Add alternate mapping for KEY_CAMERA Michael Klein <m.klein(a)mvz-labor-lb.de> platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD Andre Przywara <andre.przywara(a)arm.com> r8152: add vendor/device ID pair for Microsoft Devkit Yihang Li <liyihang9(a)huawei.com> scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id Xingui Yang <yangxingui(a)huawei.com> scsi: hisi_sas: Use abort task set to reset SAS disks when discovered Heiko Carstens <hca(a)linux.ibm.com> KVM: s390: interrupt: use READ_ONCE() before cmpxchg() Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org> spi: spidev: remove debug messages that access spidev->spi without locking Paulo Alcantara <pc(a)cjr.nz> cifs: fix potential memory leaks in session setup Eric Huang <jinhuieric.huang(a)amd.com> drm/amdkfd: Fix NULL pointer error for GC 11.0.1 on mGPU Eric Huang <jinhuieric.huang(a)amd.com> drm/amdkfd: Add sync after creating vram bo Tamim Khan <tamim(a)fusetak.com> ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA Mark Brown <broonie(a)kernel.org> ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets Mark Brown <broonie(a)kernel.org> ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC Miles Chen <miles.chen(a)mediatek.com> cpufreq: armada-37xx: stop using 0 as NULL pointer Willy Tarreau <w(a)1wt.eu> tools/nolibc: prevent gcc from making memset() loop over itself Willy Tarreau <w(a)1wt.eu> tools/nolibc: fix missing includes causing build issues at -O0 Warner Losh <imp(a)bsdimp.com> tools/nolibc: Fix S_ISxxx macros Sven Schnelle <svens(a)linux.ibm.com> nolibc: fix fd_set type Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel/uncore: Add Emerald Rapids Kan Liang <kan.liang(a)linux.intel.com> perf/x86/msr: Add Emerald Rapids Kan Liang <kan.liang(a)linux.intel.com> perf/x86/msr: Add Meteor Lake support Kan Liang <kan.liang(a)linux.intel.com> perf/x86/cstate: Add Meteor Lake support Oleksii Moisieiev <Oleksii_Moisieiev(a)epam.com> xen/pvcalls: free active map buffer on pvcalls_front_free_map Alexander Gordeev <agordeev(a)linux.ibm.com> s390: expicitly align _edata and _end symbols on page boundary Niklas Schnelle <schnelle(a)linux.ibm.com> s390/debug: add _ASM_S390_ prefix to header guard Patrick Thompson <ptf(a)google.com> drm: Add orientation quirk for Lenovo ideapad D330-10IGL Hui Wang <hui.wang(a)canonical.com> net: usb: cdc_ether: add support for Thales Cinterion PLS62-W modem Akhil P Oommen <quic_akhilpo(a)quicinc.com> drm/msm/a6xx: Avoid gx gbit halt during rpm suspend Chancel Liu <chancel.liu(a)nxp.com> ASoC: fsl_micfil: Correct the number of steps on SX controls Konrad Dybcio <konrad.dybcio(a)linaro.org> cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist Max Filippov <jcmvbkbc(a)gmail.com> kcsan: test: don't put the expect array on the stack Mars Chen <chenxiangrui(a)huaqin.corp-partner.google.com> ASoC: support machine driver with max98360 Aniol Martí <aniol(a)aniolmarti.cat> ASoC: amd: yc: Add ASUS M5402RA into DMI table Allen-KH Cheng <allen-kh.cheng(a)mediatek.com> ASoC: mediatek: mt8186: Add machine support for max98357a tongjian <tongjian(a)huaqin.corp-partner.google.com> ASoC: mediatek: mt8186: support rt5682s_max98360 Sumit Gupta <sumitg(a)nvidia.com> cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist Pierre Gondois <pierre.gondois(a)arm.com> cpufreq: CPPC: Add u64 casts to avoid overflowing Witold Sadowski <wsadowski(a)marvell.com> spi: cadence: Fix busy cycles calculation Wim Van Boven <wimvanboven(a)gmail.com> ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table Curtis Malainey <cujomalainey(a)chromium.org> ASoC: SOF: Add FW state to debugfs Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: SOF: pm: Always tear down pipelines before DSP suspend Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: SOF: pm: Set target state earlier Wenchao Hao <haowenchao(a)huawei.com> scsi: iscsi: Fix multiple iSCSI session unbind events sent to userspace David Morley <morleyd(a)google.com> tcp: fix rate_app_limited to default to 1 Kees Cook <keescook(a)chromium.org> bnxt: Do not read past the end of test names Andrew Halaney <ahalaney(a)redhat.com> net: stmmac: enable all safety features by default Viresh Kumar <viresh.kumar(a)linaro.org> thermal: core: call put_device() only after device_register() fails Dan Carpenter <error27(a)gmail.com> thermal/core: fix error code in __thermal_cooling_device_register() Viresh Kumar <viresh.kumar(a)linaro.org> thermal: Validate new state in cur_state_store() Rakesh Sankaranarayanan <rakesh.sankaranarayanan(a)microchip.com> net: dsa: microchip: ksz9477: port map correction in ALU table entry register Willem de Bruijn <willemb(a)google.com> selftests/net: toeplitz: fix race on tpacket_v3 block close Chen Zhongjin <chenzhongjin(a)huawei.com> driver core: Fix test_async_probe_init saves device in wrong array Yang Yingliang <yangyingliang(a)huawei.com> w1: fix WARNING after calling w1_process() Yang Yingliang <yangyingliang(a)huawei.com> w1: fix deadloop in __w1_remove_master_device() Yang Yingliang <yangyingliang(a)huawei.com> device property: fix of node refcount leak in fwnode_graph_get_next_endpoint() Eric Pilmore <epilmore(a)gigaio.com> ptdma: pt_core_execute_cmd() should use spinlock Arnd Bergmann <arnd(a)arndb.de> usb: dwc3: fix extcon dependency Jason Xing <kernelxing(a)tencent.com> tcp: avoid the lookup process failing to get sk in ehash table Keith Busch <kbusch(a)kernel.org> nvme-pci: fix timeout request state check Jakub Kicinski <kuba(a)kernel.org> net: sched: gred: prevent races when adding offloads to stats Hamza Mahfooz <hamza.mahfooz(a)amd.com> drm/amd/display: fix issues with driver unload Geert Uytterhoeven <geert+renesas(a)glider.be> phy: phy-can-transceiver: Skip warning if no "max-bitrate" Akhil R <akhilrajeev(a)nvidia.com> dmaengine: tegra: Fix memory leak in terminate_all() Liu Shixin <liushixin2(a)huawei.com> dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node() Paulo Alcantara <pc(a)cjr.nz> cifs: fix potential deadlock in cache_refresh_path() Chris Wilson <chris.p.wilson(a)linux.intel.com> drm/i915/selftests: Unwind hugepages to drop wakeref on error Pietro Borrello <borrello(a)diag.uniroma1.it> HID: betop: check shape of output reports Eric Dumazet <edumazet(a)google.com> l2tp: prevent lockdep issue in l2tp_tunnel_register() Jason Wang <jasowang(a)redhat.com> virtio-net: correctly enable callback during start_xmit Robert Hancock <robert.hancock(a)calian.com> net: macb: fix PTP TX timestamp failure due to packet padding Koba Ko <koba.ko(a)canonical.com> dmaengine: Fix double increment of client_count in dma_chan_get() Arnd Bergmann <arnd(a)arndb.de> drm/panfrost: fix GENERIC_ATOMIC64 dependency Randy Dunlap <rdunlap(a)infradead.org> net: mlx5: eliminate anonymous module_init & module_exit Chris Mi <cmi(a)nvidia.com> net/mlx5: E-switch, Fix switchdev mode after devlink reload Chris Mi <cmi(a)nvidia.com> net/mlx5e: Set decap action based on attr for sample Maor Dickman <maord(a)nvidia.com> net/mlx5e: QoS, Fix wrongfully setting parent_element_id on MODIFY_SCHEDULING_ELEMENT Maor Dickman <maord(a)nvidia.com> net/mlx5: E-switch, Fix setting of reserved fields on MODIFY_SCHEDULING_ELEMENT Vlad Buslov <vladbu(a)nvidia.com> net/mlx5e: Avoid false lock dependency warning on tc_ht even more Caleb Connolly <caleb.connolly(a)linaro.org> net: ipa: disable ipa interrupt during suspend Ying Hsu <yinghsu(a)chromium.org> Bluetooth: Fix possible deadlock in rfcomm_sk_state_change Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_event: Fix Invalid wait context Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: ISO: Fix possible circular locking dependency Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: ISO: Avoid circular locking dependency Zhengchao Shao <shaozhengchao(a)huawei.com> Bluetooth: hci_sync: fix memory leak in hci_update_adv_data() Zhengchao Shao <shaozhengchao(a)huawei.com> Bluetooth: hci_conn: Fix memory leaks Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> Bluetooth: Fix a buffer overflow in mgmt_mesh_add() Florian Westphal <fw(a)strlen.de> netfilter: conntrack: handle tcp challenge acks during connection reuse Udipto Goswami <quic_ugoswami(a)quicinc.com> usb: gadget: f_fs: Ensure ep0req is dequeued before free_request Udipto Goswami <quic_ugoswami(a)quicinc.com> usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait Jack Pham <quic_jackp(a)quicinc.com> usb: ucsi: Ensure connector delayed work items are flushed Guoqing Jiang <guoqing.jiang(a)linux.dev> block/rnbd-clt: fix wrong max ID in ida_alloc_max Jiri Kosina <jkosina(a)suse.cz> HID: revert CHERRY_MOUSE_000C quirk Patrice Chotard <patrice.chotard(a)foss.st.com> ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l Patrice Chotard <patrice.chotard(a)foss.st.com> ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon Patrice Chotard <patrice.chotard(a)foss.st.com> ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som Patrice Chotard <patrice.chotard(a)foss.st.com> ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som Jonas Karlman <jonas(a)kwiboo.se> pinctrl: rockchip: fix mux route data for rk3568 Heiner Kallweit <hkallweit1(a)gmail.com> net: stmmac: fix invalid call to mdiobus_get_phy() Pietro Borrello <borrello(a)diag.uniroma1.it> HID: check empty report_list in bigben_probe() Pietro Borrello <borrello(a)diag.uniroma1.it> HID: check empty report_list in hid_validate_values() Heiner Kallweit <hkallweit1(a)gmail.com> net: mdio: validate parameter addr in mdiobus_get_phy() Szymon Heidrich <szymon.heidrich(a)gmail.com> net: usb: sr9700: Handle negative len Cong Wang <cong.wang(a)bytedance.com> l2tp: close all race conditions in l2tp_tunnel_register() Cong Wang <cong.wang(a)bytedance.com> l2tp: convert l2tp_tunnel_list to idr Eric Dumazet <edumazet(a)google.com> net/sched: sch_taprio: fix possible use-after-free Kurt Kanzenbach <kurt(a)linutronix.de> net: stmmac: Fix queue statistics reading Jonas Karlman <jonas(a)kwiboo.se> pinctrl: rockchip: fix reading pull type on rk3568 Szymon Heidrich <szymon.heidrich(a)gmail.com> wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid Marek Vasut <marex(a)denx.de> gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode Marek Vasut <marex(a)denx.de> gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock Rahul Rameshbabu <rrameshbabu(a)nvidia.com> sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb Clément Léger <clement.leger(a)bootlin.com> net: lan966x: add missing fwnode_handle_put() for ports node Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: avoid deadlock in enetc_tx_onestep_tstamp() Esina Ekaterina <eesina(a)astralinux.ru> net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs Jisoo Jang <jisoo.jang(a)yonsei.ac.kr> net: nfc: Fix use-after-free in local_cleanup() Shang XiaoJing <shangxiaojing(a)huawei.com> phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on() Maxime Ripard <maxime(a)cerno.tech> drm/vc4: bo: Fix unused variable warning Luis Gerhorst <gerhorst(a)cs.fau.de> bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: Delay AN timeout during KR training Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent Tonghao Zhang <tong(a)infragraf.org> bpf: hash map, avoid deadlock with suitable hash mask Shang XiaoJing <shangxiaojing(a)huawei.com> phy: usb: sunplus: Fix potential null-ptr-deref in sp_usb_phy_probe() Maxime Ripard <maxime(a)cerno.tech> drm/vc4: bo: Fix drmm_mutex_init memory hog Claudiu Beznea <claudiu.beznea(a)microchip.com> ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60 Xingyuan Mo <hdthky0(a)gmail.com> NFSD: fix use-after-free in nfsd4_ssc_setup_dul() Rob Clark <robdclark(a)chromium.org> drm/msm/gpu: Fix potential double-free Randy Dunlap <rdunlap(a)infradead.org> phy: ti: fix Kconfig warning and operator precedence Masahiro Yamada <masahiroy(a)kernel.org> kbuild: fix 'make modules' error when CONFIG_DEBUG_INFO_BTF_MODULES=y Masahiro Yamada <masahiroy(a)kernel.org> kbuild: export top-level LDFLAGS_vmlinux only to scripts/Makefile.vmlinux Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8992-libra: Fix the memory map Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8992: Don't use sfpb mutex Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe() Alexander Potapenko <glider(a)google.com> affs: initialize fsdata in affs_truncate() Dean Luick <dean.luick(a)cornelisnetworks.com> IB/hfi1: Remove user expected buffer invalidate race Dean Luick <dean.luick(a)cornelisnetworks.com> IB/hfi1: Immediately remove invalid memory from hardware Dean Luick <dean.luick(a)cornelisnetworks.com> IB/hfi1: Fix expected receive setup error exit issues Dean Luick <dean.luick(a)cornelisnetworks.com> IB/hfi1: Reserve user expected TIDs Dean Luick <dean.luick(a)cornelisnetworks.com> IB/hfi1: Reject a zero-length user expected buffer Yonatan Nachum <ynachum(a)amazon.com> RDMA/core: Fix ib block iterator counter overflow Chris Packham <chris.packham(a)alliedtelesis.co.nz> arm64: dts: marvell: AC5/AC5X: Fix address for UART1 Gao Xiang <xiang(a)kernel.org> erofs: fix kvcalloc() misuse with __GFP_NOFAIL Daisuke Matsuda <matsuda-daisuke(a)fujitsu.com> RDMA/rxe: Prevent faulty rkey generation Daisuke Matsuda <matsuda-daisuke(a)fujitsu.com> RDMA/rxe: Fix inaccurate constants in rxe_type_info Tejun Heo <tj(a)kernel.org> block: Drop spurious might_sleep() from blk_put_queue() Christoph Hellwig <hch(a)lst.de> block: mark blk_put_queue as potentially blocking Christoph Hellwig <hch(a)lst.de> block: untangle request_queue refcounting from sysfs Christoph Hellwig <hch(a)lst.de> block: fix error unwinding in blk_register_queue Christoph Hellwig <hch(a)lst.de> block: factor out a blk_debugfs_remove helper Christoph Hellwig <hch(a)lst.de> blk-crypto: pass a gendisk to blk_crypto_sysfs_{,un}register Christoph Hellwig <hch(a)lst.de> blk-mq: move the srcu_struct used for quiescing to the tagset Masahiro Yamada <masahiroy(a)kernel.org> tomoyo: fix broken dependency on *.conf.default Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> HID: amd_sfh: Fix warning unwind goto Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: msm8996: Fix regmap max_register values Konrad Dybcio <konrad.dybcio(a)linaro.org> interconnect: qcom: msm8996: Provide UFS clocks to A2NoC Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Fix virtio channels cleanup on shutdown Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Harden shared memory access in fetch_notification Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Harden shared memory access in fetch_response Miaoqian Lin <linmq006(a)gmail.com> EDAC/highbank: Fix memory leak in highbank_mc_probe() Hui Tang <tanghui20(a)huawei.com> reset: uniphier-glue: Fix possible null-ptr-deref Randy Dunlap <rdunlap(a)infradead.org> reset: ti-sci: honor TI_SCI_PROTOCOL setting when not COMPILE_TEST Miaoqian Lin <linmq006(a)gmail.com> soc: imx8m: Fix incorrect check for of_clk_get_by_name() Tim Harvey <tharvey(a)gateworks.com> arm64: dts: imx8mm-venice-gw7901: fix USB2 controller OC polarity Jiasheng Jiang <jiasheng(a)iscas.ac.cn> HID: intel_ish-hid: Add check for ishtp_dma_tx_map Marco Felsch <m.felsch(a)pengutronix.de> arm64: dts: imx8mp-evk: pcie0-refclk cosmetic cleanup Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mp: Fix power-domain typo Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mp: Fix missing GPC Interrupt Lucas Stach <l.stach(a)pengutronix.de> soc: imx: imx8mp-blk-ctrl: don't set power device name Dario Binacchi <dario.binacchi(a)amarulasolutions.com> ARM: imx: add missing of_node_put() Haibo Chen <haibo.chen(a)nxp.com> arm64: dts: imx93-11x11-evk: correct clock and strobe pad setting Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> arm64: dts: verdin-imx8mm: fix dev board audio playback Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mm-beacon: Fix ecspi2 pinmux Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> arm64: dts: verdin-imx8mm: fix dahlia audio playback Fabio Estevam <festevam(a)denx.de> ARM: dts: imx6qdl-gw560x: Remove incorrect 'uart-has-rtscts' Fabio Estevam <festevam(a)denx.de> ARM: dts: imx7d-pico: Use 'clock-frequency' Fabio Estevam <festevam(a)denx.de> ARM: dts: imx6ul-pico-dwarf: Use 'clock-frequency' Fabio Estevam <festevam(a)denx.de> arm64: dts: imx8mp-phycore-som: Remove invalid PMIC property Lucas Stach <l.stach(a)pengutronix.de> soc: imx: imx8mp-blk-ctrl: enable global pixclk with HDMI_TX_PHY PD Jayesh Choudhary <j-choudhary(a)ti.com> dmaengine: ti: k3-udma: Do conditional decrement of UDMA_CHAN_RT_PEER_BCNT_REG Vijaya Krishna Nivarthi <quic_vnivarth(a)quicinc.com> dmaengine: qcom: gpi: Set link_rx bit on GO TRE for rx operation Johan Hovold <johan+linaro(a)kernel.org> arm64: dts: qcom: sc8280xp: fix primary USB-DP PHY reset Gaosheng Cui <cuigaosheng1(a)huawei.com> memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe() Gaosheng Cui <cuigaosheng1(a)huawei.com> memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe() Ashish Mhetre <amhetre(a)nvidia.com> memory: tegra: Remove clients SID override programming ------------- Diffstat: .../devicetree/bindings/i2c/renesas,rzv2m.yaml | 4 +- .../bindings/regulator/samsung,s2mps14.yaml | 21 +- Documentation/devicetree/bindings/riscv/cpus.yaml | 2 +- .../devicetree/bindings/sound/everest,es8326.yaml | 0 Documentation/x86/amd-memory-encryption.rst | 36 +++ Makefile | 19 +- arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 - arch/arm/boot/dts/imx6ul-pico-dwarf.dts | 2 +- arch/arm/boot/dts/imx7d-pico-dwarf.dts | 4 +- arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 +- arch/arm/boot/dts/sam9x60.dtsi | 2 +- arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 8 +- arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 8 +- arch/arm/mach-imx/cpu-imx25.c | 1 + arch/arm/mach-imx/cpu-imx27.c | 1 + arch/arm/mach-imx/cpu-imx31.c | 1 + arch/arm/mach-imx/cpu-imx35.c | 1 + arch/arm/mach-imx/cpu-imx5.c | 1 + arch/arm/mm/nommu.c | 2 +- .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1 + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 1 + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 +- .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 - arch/arm64/boot/dts/freescale/imx8mp.dtsi | 3 +- arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 6 +- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 77 +++-- arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 - arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- arch/arm64/include/asm/efi.h | 17 ++ arch/arm64/include/asm/stacktrace.h | 15 + arch/arm64/kernel/efi-rt-wrapper.S | 38 ++- arch/arm64/kernel/efi.c | 23 ++ arch/arm64/kernel/stacktrace.c | 12 + arch/arm64/kvm/vgic/vgic-v3.c | 25 +- arch/arm64/kvm/vgic/vgic-v4.c | 8 +- arch/arm64/kvm/vgic/vgic.h | 1 + arch/arm64/mm/fault.c | 4 + arch/riscv/kernel/head.S | 2 +- arch/riscv/kernel/probes/simulate-insn.c | 4 +- arch/riscv/kernel/smpboot.c | 3 +- arch/s390/include/asm/debug.h | 6 +- arch/s390/kernel/vmlinux.lds.S | 2 + arch/s390/kvm/interrupt.c | 12 +- arch/x86/boot/compressed/ident_map_64.c | 6 + arch/x86/boot/compressed/misc.h | 2 + arch/x86/boot/compressed/sev.c | 70 +++++ arch/x86/events/amd/core.c | 2 +- arch/x86/events/intel/cstate.c | 21 +- arch/x86/events/intel/uncore.c | 1 + arch/x86/events/msr.c | 3 + arch/x86/include/asm/acpi.h | 8 + arch/x86/include/asm/msr-index.h | 20 ++ arch/x86/include/uapi/asm/svm.h | 6 + arch/x86/kernel/i8259.c | 1 + arch/x86/kernel/irqinit.c | 4 +- arch/x86/kvm/vmx/vmx.c | 21 +- block/blk-core.c | 70 +++-- block/blk-crypto-internal.h | 10 +- block/blk-crypto-sysfs.c | 11 +- block/blk-ia-ranges.c | 3 +- block/blk-mq.c | 33 +- block/blk-mq.h | 14 +- block/blk-sysfs.c | 134 ++++----- block/blk.h | 13 +- block/bsg.c | 11 +- block/elevator.c | 2 +- block/genhd.c | 2 +- drivers/acpi/resource.c | 7 + drivers/acpi/sleep.c | 6 +- drivers/acpi/video_detect.c | 49 +-- drivers/ata/Kconfig | 1 + drivers/base/property.c | 18 +- drivers/base/test/test_async_driver_probe.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 2 +- drivers/block/ublk_drv.c | 7 +- drivers/cpufreq/armada-37xx-cpufreq.c | 2 +- drivers/cpufreq/cppc_cpufreq.c | 11 +- drivers/cpufreq/cpufreq-dt-platdev.c | 2 + drivers/dma/dmaengine.c | 7 +- drivers/dma/ptdma/ptdma-dev.c | 7 +- drivers/dma/ptdma/ptdma.h | 2 +- drivers/dma/qcom/gpi.c | 1 + drivers/dma/tegra186-gpc-dma.c | 1 + drivers/dma/ti/k3-udma.c | 5 +- drivers/dma/xilinx/xilinx_dma.c | 4 +- drivers/edac/edac_device.c | 15 +- drivers/edac/highbank_mc_edac.c | 7 +- drivers/edac/qcom_edac.c | 5 +- drivers/firmware/arm_scmi/shmem.c | 9 +- drivers/firmware/arm_scmi/virtio.c | 7 +- drivers/firmware/efi/runtime-wrappers.c | 1 + drivers/firmware/google/coreboot_table.c | 9 +- drivers/firmware/google/coreboot_table.h | 1 + drivers/gpio/gpio-ep93xx.c | 2 +- drivers/gpio/gpio-mxc.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 10 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 - .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 51 +++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 - drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/drm_vma_manager.c | 76 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 +- .../drm/i915/selftests/intel_scheduler_helpers.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 15 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 + drivers/gpu/drm/msm/msm_gpu.c | 2 + drivers/gpu/drm/msm/msm_gpu.h | 12 +- drivers/gpu/drm/panfrost/Kconfig | 3 +- drivers/gpu/drm/vc4/vc4_bo.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 0 drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +- drivers/hid/hid-betopff.c | 17 +- drivers/hid/hid-bigbenff.c | 5 + drivers/hid/hid-core.c | 4 +- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-quirks.c | 1 - drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 + drivers/i2c/busses/i2c-designware-common.c | 9 +- drivers/i2c/busses/i2c-designware-platdrv.c | 20 +- drivers/infiniband/core/verbs.c | 7 +- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 200 +++++++++---- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 3 + drivers/infiniband/sw/rxe/rxe_param.h | 10 +- drivers/infiniband/sw/rxe/rxe_pool.c | 22 +- drivers/input/mouse/synaptics.c | 1 - drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/interconnect/qcom/msm8996.c | 19 +- drivers/memory/atmel-sdramc.c | 6 +- drivers/memory/mvebu-devbus.c | 3 +- drivers/memory/tegra/tegra186.c | 36 --- drivers/net/dsa/microchip/ksz9477.c | 4 +- drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- drivers/net/ethernet/adi/adin1110.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 23 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 ++ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 13 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 9 +- drivers/net/ethernet/broadcom/tg3.c | 8 +- drivers/net/ethernet/cadence/macb_main.c | 9 +- drivers/net/ethernet/engleder/tsnep_main.c | 15 +- drivers/net/ethernet/freescale/enetc/enetc.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 86 +++--- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/htb.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 18 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/qos.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/qos.h | 2 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 13 +- drivers/net/ethernet/microsoft/mana/gdma.h | 3 + drivers/net/ethernet/microsoft/mana/gdma_main.c | 9 +- drivers/net/ethernet/renesas/ravb_main.c | 10 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 14 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 + drivers/net/ipa/ipa_interrupt.c | 10 + drivers/net/ipa/ipa_interrupt.h | 16 + drivers/net/ipa/ipa_power.c | 17 ++ drivers/net/mdio/mdio-mux-meson-g12a.c | 23 +- drivers/net/phy/mdio_bus.c | 7 +- drivers/net/usb/cdc_ether.c | 6 + drivers/net/usb/r8152.c | 1 + drivers/net/usb/sr9700.c | 2 +- drivers/net/virtio_net.c | 6 +- drivers/net/wan/fsl_ucc_hdlc.c | 6 +- drivers/net/wireless/rndis_wlan.c | 19 +- drivers/nvme/host/core.c | 25 +- drivers/nvme/host/fc.c | 20 +- drivers/nvme/host/nvme.h | 11 +- drivers/nvme/host/pci.c | 25 +- drivers/nvme/host/rdma.c | 3 +- drivers/nvme/host/tcp.c | 5 +- drivers/nvme/target/loop.c | 4 +- drivers/perf/arm-cmn.c | 7 +- drivers/phy/phy-can-transceiver.c | 5 +- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +- drivers/phy/sunplus/phy-sunplus-usb2.c | 3 + drivers/phy/ti/Kconfig | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 31 +- drivers/platform/x86/apple-gmux.c | 93 ++---- drivers/platform/x86/asus-nb-wmi.c | 15 + drivers/platform/x86/asus-wmi.c | 21 +- drivers/platform/x86/asus-wmi.h | 1 + drivers/platform/x86/simatic-ipc.c | 3 +- drivers/platform/x86/thinkpad_acpi.c | 11 +- drivers/platform/x86/touchscreen_dmi.c | 25 ++ drivers/reset/Kconfig | 2 +- drivers/reset/reset-uniphier-glue.c | 4 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 +- drivers/scsi/hpsa.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 50 +++- drivers/soc/imx/imx8mp-blk-ctrl.c | 7 +- drivers/soc/imx/soc-imx8m.c | 4 +- drivers/soc/qcom/cpr.c | 6 +- drivers/spi/spi-cadence-xspi.c | 5 +- drivers/spi/spidev.c | 2 - drivers/thermal/gov_fair_share.c | 6 +- .../intel/int340x_thermal/int340x_thermal_zone.c | 28 +- .../intel/int340x_thermal/int340x_thermal_zone.h | 1 + drivers/thermal/thermal_core.c | 25 +- drivers/thermal/thermal_sysfs.c | 11 +- drivers/ufs/core/ufshcd.c | 29 +- drivers/usb/dwc3/Kconfig | 2 +- drivers/usb/gadget/function/f_fs.c | 7 + drivers/usb/typec/ucsi/ucsi.c | 24 +- drivers/usb/typec/ucsi/ucsi.h | 1 + drivers/vfio/vfio_iommu_type1.c | 31 +- drivers/w1/w1.c | 6 +- drivers/w1/w1_int.c | 5 +- drivers/xen/pvcalls-front.c | 4 +- fs/affs/file.c | 2 +- fs/btrfs/ctree.h | 6 + fs/btrfs/space-info.c | 3 +- fs/btrfs/zoned.c | 2 + fs/cifs/cifsencrypt.c | 1 + fs/cifs/dfs_cache.c | 42 +-- fs/cifs/sess.c | 2 + fs/cifs/smb2pdu.c | 1 + fs/cifs/smbdirect.c | 1 + fs/erofs/zdata.c | 12 +- fs/ksmbd/connection.c | 17 +- fs/ksmbd/ksmbd_netlink.h | 3 +- fs/ksmbd/ndr.c | 8 +- fs/ksmbd/server.h | 1 + fs/ksmbd/smb2pdu.c | 2 + fs/ksmbd/smb2pdu.h | 5 +- fs/ksmbd/transport_ipc.c | 3 + fs/ksmbd/transport_tcp.c | 17 +- fs/nfsd/filecache.c | 61 ++-- fs/nfsd/nfs4proc.c | 1 + fs/overlayfs/copy_up.c | 6 +- include/drm/drm_vma_manager.h | 1 + include/linux/apple-gmux.h | 109 ++++++- include/linux/blk-mq.h | 4 + include/linux/blkdev.h | 15 +- include/linux/platform_data/x86/simatic-ipc.h | 3 +- include/linux/thermal.h | 1 + include/net/mac80211.h | 4 - include/net/sch_generic.h | 7 + include/scsi/scsi_transport_iscsi.h | 9 + include/uapi/linux/netfilter/nf_conntrack_sctp.h | 2 +- include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 2 +- include/ufs/ufshcd.h | 2 + io_uring/io_uring.c | 68 ++--- io_uring/io_uring.h | 16 +- io_uring/msg_ring.c | 4 + io_uring/net.c | 11 + io_uring/timeout.c | 10 +- kernel/bpf/hashtab.c | 4 +- kernel/bpf/verifier.c | 4 +- kernel/kcsan/kcsan_test.c | 7 +- kernel/module/main.c | 26 +- kernel/sched/fair.c | 48 ++- kernel/trace/ftrace.c | 23 +- kernel/trace/trace.c | 2 + kernel/trace/trace.h | 1 + kernel/trace/trace_events_hist.c | 2 + kernel/trace/trace_osnoise.c | 5 +- kernel/trace/trace_output.c | 3 +- lib/lockref.c | 1 - lib/nlattr.c | 3 + mm/compaction.c | 1 + net/bluetooth/hci_conn.c | 18 +- net/bluetooth/hci_event.c | 5 +- net/bluetooth/hci_sync.c | 14 +- net/bluetooth/iso.c | 110 +++---- net/bluetooth/mgmt_util.h | 2 +- net/bluetooth/rfcomm/sock.c | 7 +- net/core/net_namespace.c | 2 +- net/ipv4/fib_semantics.c | 2 + net/ipv4/inet_hashtables.c | 17 +- net/ipv4/inet_timewait_sock.c | 8 +- net/ipv4/metrics.c | 2 + net/ipv4/tcp.c | 2 + net/ipv6/ip6_output.c | 15 +- net/l2tp/l2tp_core.c | 102 ++++--- net/mac80211/agg-tx.c | 2 - net/mac80211/debugfs_sta.c | 5 +- net/mac80211/driver-ops.h | 2 +- net/mac80211/ht.c | 37 +++ net/mac80211/ieee80211_i.h | 2 +- net/mac80211/tx.c | 30 +- net/mac80211/util.c | 20 +- net/mctp/af_mctp.c | 10 +- net/mctp/route.c | 34 ++- net/netfilter/nf_conntrack_proto_sctp.c | 118 ++++---- net/netfilter/nf_conntrack_proto_tcp.c | 15 + net/netfilter/nf_conntrack_standalone.c | 8 - net/netfilter/nft_set_rbtree.c | 332 +++++++++++++-------- net/netlink/af_netlink.c | 38 ++- net/netrom/nr_timer.c | 1 + net/nfc/llcp_core.c | 1 + net/sched/sch_gred.c | 2 + net/sched/sch_htb.c | 27 +- net/sched/sch_taprio.c | 2 + net/sctp/bind_addr.c | 6 + samples/ftrace/ftrace-direct-multi-modify.c | 1 + samples/ftrace/ftrace-direct-multi.c | 1 + scripts/atomic/atomics.tbl | 0 scripts/tracing/ftrace-bisect.sh | 34 ++- security/tomoyo/Makefile | 2 +- sound/soc/amd/yc/acp6x-mach.c | 14 + sound/soc/codecs/es8326.c | 0 sound/soc/codecs/es8326.h | 0 sound/soc/fsl/fsl-asoc-card.c | 8 +- sound/soc/fsl/fsl_micfil.c | 16 +- sound/soc/fsl/fsl_ssi.c | 4 +- sound/soc/mediatek/Kconfig | 4 +- .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 +- sound/soc/sof/debug.c | 4 +- sound/soc/sof/pm.c | 9 +- tools/gpio/gpio-event-mon.c | 1 + tools/include/nolibc/ctype.h | 3 + tools/include/nolibc/errno.h | 3 + tools/include/nolibc/signal.h | 3 + tools/include/nolibc/stdio.h | 3 + tools/include/nolibc/stdlib.h | 3 + tools/include/nolibc/string.h | 8 +- tools/include/nolibc/sys.h | 2 + tools/include/nolibc/time.h | 3 + tools/include/nolibc/types.h | 70 +++-- tools/include/nolibc/unistd.h | 3 + .../selftests/bpf/prog_tests/jeq_infer_not_null.c | 9 - .../selftests/bpf/progs/jeq_infer_not_null_fail.c | 42 --- tools/testing/selftests/net/toeplitz.c | 12 +- virt/kvm/vfio.c | 6 +- 351 files changed, 2972 insertions(+), 1692 deletions(-)

1 year, 3 months

8
8
0 0

[tip: x86/urgent] x86/debug: Fix stack recursion caused by wrongly ordered DR7 accesses

by tip-bot2 for Joerg Roedel

The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 31859551393bc00f705cae2e1f9d31b80c62f365 Gitweb: https://git.kernel.org/tip/31859551393bc00f705cae2e1f9d31b80c62f365 Author: Joerg Roedel <jroedel(a)suse.de> AuthorDate: Tue, 31 Jan 2023 09:57:18 +01:00 Committer: Borislav Petkov (AMD) <bp(a)alien8.de> CommitterDate: Tue, 31 Jan 2023 11:26:15 +01:00 x86/debug: Fix stack recursion caused by wrongly ordered DR7 accesses In kernels compiled with CONFIG_PARAVIRT=n, the compiler re-orders the DR7 read in exc_nmi() to happen before the call to sev_es_ist_enter(). This is problematic when running as an SEV-ES guest because in this environment the DR7 read might cause a #VC exception, and taking #VC exceptions is not safe in exc_nmi() before sev_es_ist_enter() has run. The result is stack recursion if the NMI was caused on the #VC IST stack, because a subsequent #VC exception in the NMI handler will overwrite the stack frame of the interrupted #VC handler. As there are no compiler barriers affecting the ordering of DR7 reads/writes, make the accesses to this register volatile, forbidding the compiler to re-order them. [ bp: Massage text, make them volatile too, to make sure some aggressive compiler optimization pass doesn't discard them. ] Fixes: 315562c9af3d ("x86/sev-es: Adjust #VC IST Stack on entering NMI handler") Reported-by: Alexey Kardashevskiy <aik(a)amd.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> Signed-off-by: Borislav Petkov (AMD) <bp(a)alien8.de> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230127035616.508966-1-aik@amd.com --- arch/x86/include/asm/debugreg.h | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h index b049d95..ff1a924 100644 --- a/arch/x86/include/asm/debugreg.h +++ b/arch/x86/include/asm/debugreg.h @@ -39,7 +39,20 @@ static __always_inline unsigned long native_get_debugreg(int regno) asm("mov %%db6, %0" :"=r" (val)); break; case 7: - asm("mov %%db7, %0" :"=r" (val)); + /* + * Apply __FORCE_ORDER to DR7 reads to forbid re-ordering them + * with other code. + * + * This is needed because a DR7 access can cause a #VC exception + * when running under SEV-ES. Taking a #VC exception is not a + * safe thing to do just anywhere in the entry code and + * re-ordering might place the access into an unsafe location. + * + * This happened in the NMI handler, where the DR7 read was + * re-ordered to happen before the call to sev_es_ist_enter(), + * causing stack recursion. + */ + asm volatile("mov %%db7, %0" : "=r" (val) : __FORCE_ORDER); break; default: BUG(); @@ -66,8 +79,16 @@ static __always_inline void native_set_debugreg(int regno, unsigned long value) asm("mov %0, %%db6" ::"r" (value)); break; case 7: - asm("mov %0, %%db7" ::"r" (value)); - break; + /* + * Apply __FORCE_ORDER to DR7 writes to forbid re-ordering them + * with other code. + * + * While is didn't happen with a DR7 write (see the DR7 read + * comment above which explains where it happened), add the + * __FORCE_ORDER here too to avoid similar problems in the + * future. + */ + asm volatile("mov %0, %%db7" ::"r" (value), __FORCE_ORDER); break; default: BUG(); }

1 year, 3 months

1
0
0 0

patch "iio: imu: fxos8700: fix MAGN sensor scale and unit" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: imu: fxos8700: fix MAGN sensor scale and unit to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From 2acd031347f645871959a799238a7caf6803aa18 Mon Sep 17 00:00:00 2001 From: Carlos Song <carlos.song(a)nxp.com> Date: Wed, 18 Jan 2023 15:42:27 +0800 Subject: iio: imu: fxos8700: fix MAGN sensor scale and unit +/-1200uT is a MAGN sensor full measurement range. Magnetometer scale is the magnetic sensitivity parameter. It is referenced as 0.1uT according to datasheet and magnetometer channel unit is Gauss in sysfs-bus-iio documentation. Gauss and uTesla unit conversion relationship as follows: 0.1uT = 0.001Gs. Set magnetometer scale and available magnetometer scale as fixed 0.001Gs. Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU") Signed-off-by: Carlos Song <carlos.song(a)nxp.com> Link: https://lore.kernel.org/r/20230118074227.1665098-5-carlos.song@nxp.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/imu/fxos8700_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/imu/fxos8700_core.c b/drivers/iio/imu/fxos8700_core.c index 880b9bcb80ff..6d189c4b9ff9 100644 --- a/drivers/iio/imu/fxos8700_core.c +++ b/drivers/iio/imu/fxos8700_core.c @@ -351,7 +351,7 @@ static int fxos8700_set_scale(struct fxos8700_data *data, struct device *dev = regmap_get_device(data->regmap); if (t == FXOS8700_MAGN) { - dev_err(dev, "Magnetometer scale is locked at 1200uT\n"); + dev_err(dev, "Magnetometer scale is locked at 0.001Gs\n"); return -EINVAL; } @@ -396,7 +396,7 @@ static int fxos8700_get_scale(struct fxos8700_data *data, static const int scale_num = ARRAY_SIZE(fxos8700_accel_scale); if (t == FXOS8700_MAGN) { - *uscale = 1200; /* Magnetometer is locked at 1200uT */ + *uscale = 1000; /* Magnetometer is locked at 0.001Gs */ return 0; } @@ -588,7 +588,7 @@ static IIO_CONST_ATTR(in_accel_sampling_frequency_available, static IIO_CONST_ATTR(in_magn_sampling_frequency_available, "1.5625 6.25 12.5 50 100 200 400 800"); static IIO_CONST_ATTR(in_accel_scale_available, "0.000244 0.000488 0.000976"); -static IIO_CONST_ATTR(in_magn_scale_available, "0.000001200"); +static IIO_CONST_ATTR(in_magn_scale_available, "0.001000"); static struct attribute *fxos8700_attrs[] = { &iio_const_attr_in_accel_sampling_frequency_available.dev_attr.attr, -- 2.39.1

1 year, 3 months

1
0
0 0

patch "iio: imu: fxos8700: remove definition FXOS8700_CTRL_ODR_MIN" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: imu: fxos8700: remove definition FXOS8700_CTRL_ODR_MIN to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From ff5e2cd92ffda9a25ffa2cbdb3a0cf17650172a6 Mon Sep 17 00:00:00 2001 From: Carlos Song <carlos.song(a)nxp.com> Date: Wed, 18 Jan 2023 15:42:26 +0800 Subject: iio: imu: fxos8700: remove definition FXOS8700_CTRL_ODR_MIN FXOS8700_CTRL_ODR_MIN is not used but value is probably wrong. Remove it for a good readability. Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU") Signed-off-by: Carlos Song <carlos.song(a)nxp.com> Link: https://lore.kernel.org/r/20230118074227.1665098-4-carlos.song@nxp.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/imu/fxos8700_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/imu/fxos8700_core.c b/drivers/iio/imu/fxos8700_core.c index 514411d5ddff..880b9bcb80ff 100644 --- a/drivers/iio/imu/fxos8700_core.c +++ b/drivers/iio/imu/fxos8700_core.c @@ -146,7 +146,6 @@ /* Bit definitions for FXOS8700_CTRL_REG1 */ #define FXOS8700_CTRL_ODR_MAX 0x00 -#define FXOS8700_CTRL_ODR_MIN GENMASK(4, 3) #define FXOS8700_CTRL_ODR_MSK GENMASK(5, 3) /* Bit definitions for FXOS8700_M_CTRL_REG1 */ -- 2.39.1

1 year, 3 months

1
0
0 0

patch "iio: imu: fxos8700: fix failed initialization ODR mode assignment" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: imu: fxos8700: fix failed initialization ODR mode assignment to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From eb6d8f8705bc19141bac81d8161461f9e256948a Mon Sep 17 00:00:00 2001 From: Carlos Song <carlos.song(a)nxp.com> Date: Wed, 18 Jan 2023 15:42:25 +0800 Subject: iio: imu: fxos8700: fix failed initialization ODR mode assignment The absence of correct offset leads a failed initialization ODR mode assignment. Select MAX ODR mode as the initialization ODR mode by field mask and FIELD_PREP. Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU") Signed-off-by: Carlos Song <carlos.song(a)nxp.com> Link: https://lore.kernel.org/r/20230118074227.1665098-3-carlos.song@nxp.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/imu/fxos8700_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iio/imu/fxos8700_core.c b/drivers/iio/imu/fxos8700_core.c index caa474402d53..514411d5ddff 100644 --- a/drivers/iio/imu/fxos8700_core.c +++ b/drivers/iio/imu/fxos8700_core.c @@ -664,8 +664,10 @@ static int fxos8700_chip_init(struct fxos8700_data *data, bool use_spi) return ret; /* Max ODR (800Hz individual or 400Hz hybrid), active mode */ - return regmap_write(data->regmap, FXOS8700_CTRL_REG1, - FXOS8700_CTRL_ODR_MAX | FXOS8700_ACTIVE); + return regmap_update_bits(data->regmap, FXOS8700_CTRL_REG1, + FXOS8700_CTRL_ODR_MSK | FXOS8700_ACTIVE, + FIELD_PREP(FXOS8700_CTRL_ODR_MSK, FXOS8700_CTRL_ODR_MAX) | + FXOS8700_ACTIVE); } static void fxos8700_chip_uninit(void *data) -- 2.39.1

1 year, 3 months

1
0
0 0

patch "iio: light: cm32181: Fix PM support on system with 2 I2C resources" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: light: cm32181: Fix PM support on system with 2 I2C resources to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From ee3c5b644a0fdcfed27515a39fb2dd3a016704c1 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Date: Thu, 19 Jan 2023 01:04:22 +0800 Subject: iio: light: cm32181: Fix PM support on system with 2 I2C resources Commit c1e62062ff54 ("iio: light: cm32181: Handle CM3218 ACPI devices with 2 I2C resources") creates a second client for the actual I2C address, but the "struct device" passed to PM ops is the first I2C client that can't talk to the sensor. That means the I2C transfers in both suspend and resume routines can fail and blocking the whole suspend process. Instead of using the first client for I2C transfer, use the I2C client stored in the cm32181 private struct so the PM ops can get the correct I2C client to really talk to the sensor device. Fixes: 68c1b3dd5c48 ("iio: light: cm32181: Add PM support") BugLink: https://bugs.launchpad.net/bugs/1988346 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2152281 Tested-by: Wahaj <wahajaved(a)protonmail.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Link: https://lore.kernel.org/r/20230118170422.339619-1-kai.heng.feng@canonical.c… Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/light/cm32181.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c index 001055d09750..b1674a5bfa36 100644 --- a/drivers/iio/light/cm32181.c +++ b/drivers/iio/light/cm32181.c @@ -440,6 +440,8 @@ static int cm32181_probe(struct i2c_client *client) if (!indio_dev) return -ENOMEM; + i2c_set_clientdata(client, indio_dev); + /* * Some ACPI systems list 2 I2C resources for the CM3218 sensor, the * SMBus Alert Response Address (ARA, 0x0c) and the actual I2C address. @@ -460,8 +462,6 @@ static int cm32181_probe(struct i2c_client *client) return PTR_ERR(client); } - i2c_set_clientdata(client, indio_dev); - cm32181 = iio_priv(indio_dev); cm32181->client = client; cm32181->dev = dev; @@ -490,7 +490,8 @@ static int cm32181_probe(struct i2c_client *client) static int cm32181_suspend(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); + struct cm32181_chip *cm32181 = iio_priv(dev_get_drvdata(dev)); + struct i2c_client *client = cm32181->client; return i2c_smbus_write_word_data(client, CM32181_REG_ADDR_CMD, CM32181_CMD_ALS_DISABLE); @@ -498,8 +499,8 @@ static int cm32181_suspend(struct device *dev) static int cm32181_resume(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); struct cm32181_chip *cm32181 = iio_priv(dev_get_drvdata(dev)); + struct i2c_client *client = cm32181->client; return i2c_smbus_write_word_data(client, CM32181_REG_ADDR_CMD, cm32181->conf_regs[CM32181_REG_ADDR_CMD]); -- 2.39.1

1 year, 3 months

1
0
0 0

patch "iio: imu: fxos8700: fix incorrect ODR mode readback" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled iio: imu: fxos8700: fix incorrect ODR mode readback to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From 78ad6864e9e012cdba7c353d044d21ffcfd5f34b Mon Sep 17 00:00:00 2001 From: Carlos Song <carlos.song(a)nxp.com> Date: Wed, 18 Jan 2023 15:42:24 +0800 Subject: iio: imu: fxos8700: fix incorrect ODR mode readback The absence of a correct offset leads an incorrect ODR mode readback after use a hexadecimal number to mark the value from FXOS8700_CTRL_REG1. Get ODR mode by field mask and FIELD_GET clearly and conveniently. And attach other additional fix for keeping the original code logic and a good readability. Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU") Signed-off-by: Carlos Song <carlos.song(a)nxp.com> Link: https://lore.kernel.org/r/20230118074227.1665098-2-carlos.song@nxp.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> --- drivers/iio/imu/fxos8700_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/iio/imu/fxos8700_core.c b/drivers/iio/imu/fxos8700_core.c index ec622123ccac..caa474402d53 100644 --- a/drivers/iio/imu/fxos8700_core.c +++ b/drivers/iio/imu/fxos8700_core.c @@ -10,6 +10,7 @@ #include <linux/regmap.h> #include <linux/acpi.h> #include <linux/bitops.h> +#include <linux/bitfield.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -144,9 +145,9 @@ #define FXOS8700_NVM_DATA_BNK0 0xa7 /* Bit definitions for FXOS8700_CTRL_REG1 */ -#define FXOS8700_CTRL_ODR_MSK 0x38 #define FXOS8700_CTRL_ODR_MAX 0x00 #define FXOS8700_CTRL_ODR_MIN GENMASK(4, 3) +#define FXOS8700_CTRL_ODR_MSK GENMASK(5, 3) /* Bit definitions for FXOS8700_M_CTRL_REG1 */ #define FXOS8700_HMS_MASK GENMASK(1, 0) @@ -508,10 +509,9 @@ static int fxos8700_set_odr(struct fxos8700_data *data, enum fxos8700_sensor t, if (i >= odr_num) return -EINVAL; - return regmap_update_bits(data->regmap, - FXOS8700_CTRL_REG1, - FXOS8700_CTRL_ODR_MSK + FXOS8700_ACTIVE, - fxos8700_odr[i].bits << 3 | active_mode); + val &= ~FXOS8700_CTRL_ODR_MSK; + val |= FIELD_PREP(FXOS8700_CTRL_ODR_MSK, fxos8700_odr[i].bits) | FXOS8700_ACTIVE; + return regmap_write(data->regmap, FXOS8700_CTRL_REG1, val); } static int fxos8700_get_odr(struct fxos8700_data *data, enum fxos8700_sensor t, @@ -524,7 +524,7 @@ static int fxos8700_get_odr(struct fxos8700_data *data, enum fxos8700_sensor t, if (ret) return ret; - val &= FXOS8700_CTRL_ODR_MSK; + val = FIELD_GET(FXOS8700_CTRL_ODR_MSK, val); for (i = 0; i < odr_num; i++) if (val == fxos8700_odr[i].bits) -- 2.39.1

1 year, 3 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2023