From: Amit Kumar Mahapatra <amit.kumar-mahapatra(a)xilinx.com>
[ Upstream commit 167721a5909f867f8c18c8e78ea58e705ad9bbd4 ]
In kernel 5.4, support has been added for reading MTD devices via the nvmem
API.
For this the mtd devices are registered as read-only NVMEM providers under
sysfs with the same name as the flash partition label property.
So if flash partition label property of multiple flash devices are
identical then the second mtd device fails to get registered as a NVMEM
provider.
This patch fixes the issue by having different label property for different
flashes.
Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra(a)xilinx.com>
Signed-off-by: Michal Simek <michal.simek(a)xilinx.com>
Link: https://lore.kernel.org/r/6c4b9b9232b93d9e316a63c086540fd5bf6b8687.16236842…
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
---
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
index 4a86efa32d687..f7124e15f0ff6 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
@@ -131,7 +131,7 @@
reg = <0>;
partition@0 {
- label = "data";
+ label = "spi0-data";
reg = <0x0 0x100000>;
};
};
@@ -149,7 +149,7 @@
reg = <0>;
partition@0 {
- label = "data";
+ label = "spi1-data";
reg = <0x0 0x84000>;
};
};
--
2.33.0
From: Guo Ren <guoren(a)linux.alibaba.com>
When using "devm_request_threaded_irq(,,,,IRQF_ONESHOT,,)" in the driver,
only the first interrupt could be handled, and continue irq is blocked by
hw. Because the riscv plic couldn't complete masked irq source which has
been disabled in enable register. The bug was firstly reported in [1].
Here is the description of Interrupt Completion in PLIC spec [2]:
The PLIC signals it has completed executing an interrupt handler by
writing the interrupt ID it received from the claim to the claim/complete
register. The PLIC does not check whether the completion ID is the same
as the last claim ID for that target. If the completion ID does not match
an interrupt source that is currently enabled for the target, the
^^ ^^^^^^^^^ ^^^^^^^
completion is silently ignored.
[1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007441.html
[2] https://github.com/riscv/riscv-plic-spec/blob/8bc15a35d07c9edf7b5d23fec9728…
Fixes: bb0fed1c60cc ("irqchip/sifive-plic: Switch to fasteoi flow")
Reported-by: Vincent Pelletier <plr.vincent(a)gmail.com>
Tested-by: Nikita Shubin <nikita.shubin(a)maquefel.me>
Signed-off-by: Guo Ren <guoren(a)linux.alibaba.com>
Cc: stable(a)vger.kernel.org
Cc: Anup Patel <anup(a)brainfault.org>
Cc: Thomas Gleixner <tglx(a)linutronix.de>
Cc: Marc Zyngier <maz(a)kernel.org>
Cc: Palmer Dabbelt <palmer(a)dabbelt.com>
Cc: Atish Patra <atish.patra(a)wdc.com>
Cc: Nikita Shubin <nikita.shubin(a)maquefel.me>
Cc: incent Pelletier <plr.vincent(a)gmail.com>
---
Changes since V7:
- Add Fixes tag
- Add Tested-by
- Add Cc stable
Changes since V6:
- Propagate to plic_irq_eoi for all riscv,plic by Nikita Shubin
- Remove thead related codes
Changes since V5:
- Move back to mask/unmask
- Fixup the problem in eoi callback
- Remove allwinner,sun20i-d1 IRQCHIP_DECLARE
- Rewrite comment log
Changes since V4:
- Update comment by Anup
Changes since V3:
- Rename "c9xx" to "c900"
- Add sifive_plic_chip and thead_plic_chip for difference
Changes since V2:
- Add a separate compatible string "thead,c9xx-plic"
- set irq_mask/unmask of "plic_chip" to NULL and point
irq_enable/disable of "plic_chip" to plic_irq_mask/unmask
- Add a detailed comment block in plic_init() about the
differences in Claim/Completion process of RISC-V PLIC and C9xx
PLIC.
---
drivers/irqchip/irq-sifive-plic.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index cf74cfa82045..259065d271ef 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -163,7 +163,13 @@ static void plic_irq_eoi(struct irq_data *d)
{
struct plic_handler *handler = this_cpu_ptr(&plic_handlers);
- writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+ if (irqd_irq_masked(d)) {
+ plic_irq_unmask(d);
+ writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+ plic_irq_mask(d);
+ } else {
+ writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+ }
}
static struct irq_chip plic_chip = {
--
2.25.1
This is the start of the stable review cycle for the 5.15.2 release.
There are 26 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 Fri, 12 Nov 2021 18:19:54 +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.15.2-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.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.15.2-rc1
Johan Hovold <johan(a)kernel.org>
rsi: fix control-message timeout
Gustavo A. R. Silva <gustavoars(a)kernel.org>
media: staging/intel-ipu3: css: Fix wrong size comparison imgu_css_fw_init
Martin Kaiser <martin(a)kaiser.cx>
staging: r8188eu: fix memleak in rtw_wx_set_enc_ext
Johan Hovold <johan(a)kernel.org>
staging: rtl8192u: fix control-message timeouts
Johan Hovold <johan(a)kernel.org>
staging: r8712u: fix control-message timeout
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix bulk and interrupt message timeouts
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix bulk-buffer overflow
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix transfer-buffer overflows
Johan Hovold <johan(a)kernel.org>
comedi: ni_usb6501: fix NULL-deref in command paths
Johan Hovold <johan(a)kernel.org>
comedi: dt9812: fix DMA buffers on stack
Jan Kara <jack(a)suse.cz>
isofs: Fix out of bound access for corrupted isofs image
Pavel Skripkin <paskripkin(a)gmail.com>
staging: rtl8712: fix use-after-free in rtl8712_dl_fw
Linus Torvalds <torvalds(a)linux-foundation.org>
btrfs: fix lzo_decompress_bio() kmap leakage
Marco Elver <elver(a)google.com>
kfence: default to dynamic branch instead of static keys mode
Marco Elver <elver(a)google.com>
kfence: always use static branches to guard kfence_alloc()
Todd Kjos <tkjos(a)google.com>
binder: don't detect sender/target during buffer cleanup
Todd Kjos <tkjos(a)google.com>
binder: use cred instead of task for getsecid
Todd Kjos <tkjos(a)google.com>
binder: use cred instead of task for selinux checks
Todd Kjos <tkjos(a)google.com>
binder: use euid from cred instead of using task
Kees Cook <keescook(a)chromium.org>
Revert "proc/wchan: use printk format instead of lookup_symbol_name()"
James Buren <braewoods+lkml(a)braewoods.net>
usb-storage: Add compatibility quirk flags for iODD 2531/2541
Viraj Shah <viraj.shah(a)linutronix.de>
usb: musb: Balance list entry in musb_gadget_queue
Geert Uytterhoeven <geert(a)linux-m68k.org>
usb: gadget: Mark USB_FSL_QE broken on 64-bit
Neal Liu <neal_liu(a)aspeedtech.com>
usb: ehci: handshake CMD_RUN instead of STS_HALT
Juergen Gross <jgross(a)suse.com>
Revert "x86/kvm: fix vcpu-id indexed array sizes"
Paolo Bonzini <pbonzini(a)redhat.com>
KVM: x86: avoid warning with -Wbitwise-instead-of-logical
-------------
Diffstat:
Documentation/dev-tools/kfence.rst | 12 ++-
Makefile | 4 +-
arch/x86/kvm/ioapic.c | 2 +-
arch/x86/kvm/ioapic.h | 4 +-
arch/x86/kvm/mmu/spte.h | 7 +-
drivers/android/binder.c | 41 ++++------
drivers/android/binder_internal.h | 4 +
drivers/comedi/drivers/dt9812.c | 115 ++++++++++++++++++++-------
drivers/comedi/drivers/ni_usb6501.c | 10 +++
drivers/comedi/drivers/vmk80xx.c | 28 ++++---
drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +-
drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +-
drivers/staging/r8188eu/os_dep/ioctl_linux.c | 5 +-
drivers/staging/rtl8192u/r8192U_core.c | 18 ++---
drivers/staging/rtl8712/usb_intf.c | 4 +-
drivers/staging/rtl8712/usb_ops_linux.c | 2 +-
drivers/usb/gadget/udc/Kconfig | 1 +
drivers/usb/host/ehci-hcd.c | 11 ++-
drivers/usb/host/ehci-platform.c | 6 ++
drivers/usb/host/ehci.h | 1 +
drivers/usb/musb/musb_gadget.c | 4 +-
drivers/usb/storage/unusual_devs.h | 10 +++
fs/btrfs/lzo.c | 3 +-
fs/isofs/inode.c | 2 +
fs/proc/base.c | 19 +++--
include/linux/kfence.h | 21 ++---
include/linux/lsm_hook_defs.h | 14 ++--
include/linux/lsm_hooks.h | 14 ++--
include/linux/security.h | 33 ++++----
lib/Kconfig.kfence | 26 +++---
mm/kfence/core.c | 16 ++--
security/security.c | 14 ++--
security/selinux/hooks.c | 48 +++--------
34 files changed, 298 insertions(+), 212 deletions(-)
This is the start of the stable review cycle for the 5.14.18 release.
There are 24 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 Fri, 12 Nov 2021 18:19:54 +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.14.18-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.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.14.18-rc1
Johan Hovold <johan(a)kernel.org>
rsi: fix control-message timeout
Gustavo A. R. Silva <gustavoars(a)kernel.org>
media: staging/intel-ipu3: css: Fix wrong size comparison imgu_css_fw_init
Johan Hovold <johan(a)kernel.org>
staging: rtl8192u: fix control-message timeouts
Johan Hovold <johan(a)kernel.org>
staging: r8712u: fix control-message timeout
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix bulk and interrupt message timeouts
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix bulk-buffer overflow
Johan Hovold <johan(a)kernel.org>
comedi: vmk80xx: fix transfer-buffer overflows
Johan Hovold <johan(a)kernel.org>
comedi: ni_usb6501: fix NULL-deref in command paths
Johan Hovold <johan(a)kernel.org>
comedi: dt9812: fix DMA buffers on stack
Jan Kara <jack(a)suse.cz>
isofs: Fix out of bound access for corrupted isofs image
Pavel Skripkin <paskripkin(a)gmail.com>
staging: rtl8712: fix use-after-free in rtl8712_dl_fw
Todd Kjos <tkjos(a)google.com>
binder: don't detect sender/target during buffer cleanup
Todd Kjos <tkjos(a)google.com>
binder: use cred instead of task for getsecid
Todd Kjos <tkjos(a)google.com>
binder: use cred instead of task for selinux checks
Todd Kjos <tkjos(a)google.com>
binder: use euid from cred instead of using task
Kees Cook <keescook(a)chromium.org>
Revert "proc/wchan: use printk format instead of lookup_symbol_name()"
James Buren <braewoods+lkml(a)braewoods.net>
usb-storage: Add compatibility quirk flags for iODD 2531/2541
Viraj Shah <viraj.shah(a)linutronix.de>
usb: musb: Balance list entry in musb_gadget_queue
Geert Uytterhoeven <geert(a)linux-m68k.org>
usb: gadget: Mark USB_FSL_QE broken on 64-bit
Neal Liu <neal_liu(a)aspeedtech.com>
usb: ehci: handshake CMD_RUN instead of STS_HALT
Juergen Gross <jgross(a)suse.com>
Revert "x86/kvm: fix vcpu-id indexed array sizes"
Paolo Bonzini <pbonzini(a)redhat.com>
KVM: x86: avoid warning with -Wbitwise-instead-of-logical
Takashi Iwai <tiwai(a)suse.de>
ALSA: pci: cs46xx: Fix set up buffer type properly
Takashi Iwai <tiwai(a)suse.de>
ALSA: pcm: Check mmap capability of runtime dma buffer at first
-------------
Diffstat:
Makefile | 4 +-
arch/x86/kvm/ioapic.c | 2 +-
arch/x86/kvm/ioapic.h | 4 +-
arch/x86/kvm/mmu/spte.h | 7 +-
drivers/android/binder.c | 41 +++++------
drivers/android/binder_internal.h | 4 ++
drivers/comedi/drivers/dt9812.c | 115 +++++++++++++++++++++++--------
drivers/comedi/drivers/ni_usb6501.c | 10 +++
drivers/comedi/drivers/vmk80xx.c | 28 ++++----
drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +-
drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +-
drivers/staging/rtl8192u/r8192U_core.c | 18 ++---
drivers/staging/rtl8712/usb_intf.c | 4 +-
drivers/staging/rtl8712/usb_ops_linux.c | 2 +-
drivers/usb/gadget/udc/Kconfig | 1 +
drivers/usb/host/ehci-hcd.c | 11 ++-
drivers/usb/host/ehci-platform.c | 6 ++
drivers/usb/host/ehci.h | 1 +
drivers/usb/musb/musb_gadget.c | 4 +-
drivers/usb/storage/unusual_devs.h | 10 +++
fs/isofs/inode.c | 2 +
fs/proc/base.c | 19 ++---
include/linux/lsm_hook_defs.h | 14 ++--
include/linux/lsm_hooks.h | 14 ++--
include/linux/security.h | 33 +++++----
security/security.c | 14 ++--
security/selinux/hooks.c | 48 ++++---------
sound/core/pcm_native.c | 9 ++-
sound/pci/cs46xx/cs46xx_lib.c | 30 +++-----
30 files changed, 267 insertions(+), 199 deletions(-)