Skip to content

Commit dfa5235

Browse files
khusikakhusika
committed
Merge tag 'v6.1.136' into orange-pi-6.1-rk35xx
This is the 6.1.136 stable release * tag 'v6.1.136' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.136 objtool: Silence more KCOV warnings, part 2 ASoC: qcom: q6afe-dai: fix Display Port Playback stream name PCI: Fix use-after-free in pci_bus_release_domain_nr() tracing: Remove pointer (asterisk) and brackets from cpumask_t field phy: freescale: imx8m-pcie: Add one missing error return phy: freescale: imx8m-pcie: Do CMN_RST just before PHY PLL lock check nvme: fixup scan failure for non-ANA multipath controllers MIPS: cm: Fix warning if MIPS_CM is disabled xdp: Reset bpf_redirect_info before running a xdp's BPF prog. net: dsa: mv88e6xxx: enable STU methods for 6320 family net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family net: dsa: mv88e6xxx: enable PVT for 6321 switch net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family net/sched: act_mirred: don't override retval if we already lost the skb crypto: atmel-sha204a - Set hwrng quality to lowest possible comedi: jr3_pci: Fix synchronous deletion of timer jfs: define xtree root and page independently of: module: add buffer overflow check in of_modalias() spi: spi-imx: Add check for spi_imx_setupxfer() md/raid1: Add check for missing source disk in process_checks() ubsan: Fix panic from test_ubsan_out_of_bounds spi: tegra210-quad: add rate limiting and simplify timeout error message spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts loop: aio inherit the ioprio of original request x86/i8253: Call clockevent_i8253_disable() with interrupts disabled scsi: pm80xx: Set phy_attached to zero when device is gone scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init() scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes ext4: make block validity check resistent to sb bh corruption nvmet-fc: put ref when assoc->del_work is already scheduled nvmet-fc: take tgtport reference only once x86/bugs: Don't fill RSB on context switch with eIBRS x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline x86/bugs: Use SBPB in write_ibpb() if applicable selftests/mincore: Allow read-ahead pages to reach the end of the file objtool: Stop UNRET validation on UD2 nvme: re-read ANA log page after ns scan completes ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls ACPI: EC: Set ec_no_wakeup for Lenovo Go S nvme: requeue namespace scan on missed AENs xen: Change xen-acpi-processor dom0 dependency selftests: ublk: fix test_stripe_04 udmabuf: fix a buf size overflow issue during udmabuf creation KVM: s390: Don't use %pK through tracepoints sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP rtc: pcf85063: do a SW reset if POR failed 9p/net: fix improper handling of bogus negative read/write replies ntb_hw_amd: Add NTB PCI ID for new gen CPU ntb: reduce stack usage in idt_scan_mws qibfs: fix _another_ leak objtool, lkdtm: Obfuscate the do_nothing() pointer objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler() objtool: Silence more KCOV warnings thunderbolt: Scan retimers after device router has been enumerated usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running dmaengine: dmatest: Fix dmatest waiting less when interrupted sound/virtio: Fix cancel_sync warnings on uninitialized work_structs usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield usb: dwc3: gadget: Refactor loop to avoid NULL endpoints fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size usb: host: max3421-hcd: Add missing spi_device_id table s390/tty: Fix a potential memory leak bug s390/sclp: Add check for get_zeroed_page() parisc: PDT: Fix missing prototype warning clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() bpf: Fix deadlock between rcu_tasks_trace and event_mutex. crypto: null - Use spin lock instead of mutex MIPS: cm: Detect CM quirks from device tree pinctrl: renesas: rza2: Fix potential NULL pointer dereference USB: wdm: add annotation USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context USB: wdm: close race between wdm_open and wdm_wwan_port_stop USB: wdm: handle IO errors in wdm_wwan_port_start USB: VLI disk crashes if LPM is used usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive usb: dwc3: xilinx: Prevent spike in reset signal usb: dwc3: gadget: check that event count does not exceed event buffer length USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02) usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines usb: chipidea: ci_hdrc_imx: fix usbmisc handling usb: cdns3: Fix deadlock when using NCM gadget USB: serial: simple: add OWON HDS200 series oscilloscope support USB: serial: option: add Sierra Wireless EM9291 USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe serial: sifive: lock port in startup()/shutdown() callbacks serial: msm: Configure correct working mode before starting earlycon misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration KVM: x86: Reset IRTE to host control if *new* route isn't postable KVM: x86: Explicitly treat routing entry type changes as changes mei: me: add panther lake H DID USB: storage: quirk for ADATA Portable HDD CH94 mcb: fix a double free bug in chameleon_parse_gdd() KVM: SVM: Allocate IR data using atomic allocation LoongArch: Remove a bogus reference to ZONE_DMA LoongArch: Return NULL from huge_pte_offset() for invalid PMD drm/amd/display: Force full update in gpu reset drm/amd/display: Fix gpu reset in multidisplay config net: selftests: initialize TCP header and skb payload with zero xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() virtio_console: fix missing byte order handling for cols and rows wifi: rtw88: use ieee80211_purge_tx_queue() to purge TX skb wifi: mac80211: export ieee80211_purge_tx_queue() for drivers LoongArch: Make regs_irqs_disabled() more clear LoongArch: Select ARCH_USE_MEMTEST perf/x86: Fix non-sampling (counting) events on certain x86 platforms iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too net_sched: hfsc: Fix a UAF vulnerability in class handling tipc: fix NULL pointer dereference in tipc_mon_reinit_self() net: phy: leds: fix memory leak net: lwtunnel: disable BHs when required scsi: core: Clear flags for scsi_cmnd that did not complete btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range() cpufreq: cppc: Fix invalid return value in .get() callback cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() dma/contiguous: avoid warning about unused size_bytes selftests/mm: generate a temporary mountpoint for cgroup filesystem ASoC: qcom: Fix sc7280 lpass potential buffer overflow ASoC: qcom: q6dsp: add support to more display ports phy: freescale: imx8m-pcie: assert phy reset and perst in power off phy: freescale: imx8m-pcie: Add i.MX8MP PCIe PHY support PCI: Fix reference leak in pci_register_host_bridge() PCI: Assign PCI domain IDs by ida_alloc() of: resolver: Fix device node refcount leakage in of_resolve_phandles() of: resolver: Simplify of_resolve_phandles() using __free() clk: renesas: r9a07g043: Fix HP clock source for RZ/Five clk: renesas: r9a07g04[34]: Fix typo for sel_shdi variable clk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux clk: renesas: rzg2l: Refactor SD mux driver clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header clk: renesas: rzg2l: Add struct clk_hw_data clk: renesas: rzg2l: Use u32 for flag and mux_flags backlight: led_bl: Hold led_access lock when calling led_sysfs_disable() backlight: led_bl: Convert to platform remove callback returning void iio: adc: ad7768-1: Fix conversion result sign iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check net: dsa: mv88e6xxx: fix VTU methods for 6320 family net: dsa: mv88e6xxx: fix internal PHYs for 6320 family net: dsa: mv88e6xxx: add field to specify internal phys layout net: dsa: mv88e6xxx: pass directly chip structure to mv88e6xxx_phy_is_internal net: dsa: mv88e6xxx: move link forcing to mac_prepare/mac_finish net: dsa: add support for mac_prepare() and mac_finish() calls net: dsa: mv88e6xxx: don't dispose of Global2 IRQ mappings from mdiobus code auxdisplay: hd44780: Fix an API misuse in hd44780.c auxdisplay: hd44780: Convert to platform remove callback returning void tracing: Verify event formats that have "%*p.." tracing: Add __print_dynamic_array() helper tracing: Add __string_len() example tracing: Fix cpumask() example typo tracing: Add __cpumask to denote a trace event field that is a cpumask_t module: sign with sha512 instead of sha1 by default Signed-off-by: Khusika Dhamar Gusti <[email protected]> Conflicts: drivers/usb/core/quirks.c
2 parents 8ba9812 + b6736e0 commit dfa5235

File tree

148 files changed

+1429
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1429
-575
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 135
4+
SUBLEVEL = 136
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/loongarch/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ config LOONGARCH
5151
select ARCH_SUPPORTS_NUMA_BALANCING
5252
select ARCH_USE_BUILTIN_BSWAP
5353
select ARCH_USE_CMPXCHG_LOCKREF
54+
select ARCH_USE_MEMTEST
5455
select ARCH_USE_QUEUED_RWLOCKS
5556
select ARCH_USE_QUEUED_SPINLOCKS
5657
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT

‎arch/loongarch/include/asm/ptrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ struct pt_regs {
3232
unsigned long __last[];
3333
} __aligned(8);
3434

35-
static inline int regs_irqs_disabled(struct pt_regs *regs)
35+
static __always_inline bool regs_irqs_disabled(struct pt_regs *regs)
3636
{
37-
return arch_irqs_disabled_flags(regs->csr_prmd);
37+
return !(regs->csr_prmd & CSR_PRMD_PIE);
3838
}
3939

4040
static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

‎arch/loongarch/mm/hugetlbpage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr,
4747
pmd = pmd_offset(pud, addr);
4848
}
4949
}
50-
return (pte_t *) pmd;
50+
return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd;
5151
}
5252

5353
/*

‎arch/loongarch/mm/init.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ void __init paging_init(void)
8989
{
9090
unsigned long max_zone_pfns[MAX_NR_ZONES];
9191

92-
#ifdef CONFIG_ZONE_DMA
93-
max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
94-
#endif
9592
#ifdef CONFIG_ZONE_DMA32
9693
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
9794
#endif

‎arch/mips/include/asm/mips-cm.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ extern phys_addr_t __mips_cm_phys_base(void);
4747
*/
4848
extern int mips_cm_is64;
4949

50+
/*
51+
* mips_cm_is_l2_hci_broken - determine if HCI is broken
52+
*
53+
* Some CM reports show that Hardware Cache Initialization is
54+
* complete, but in reality it's not the case. They also incorrectly
55+
* indicate that Hardware Cache Initialization is supported. This
56+
* flags allows warning about this broken feature.
57+
*/
58+
extern bool mips_cm_is_l2_hci_broken;
59+
5060
/**
5161
* mips_cm_error_report - Report CM cache errors
5262
*/
@@ -85,6 +95,18 @@ static inline bool mips_cm_present(void)
8595
#endif
8696
}
8797

98+
/**
99+
* mips_cm_update_property - update property from the device tree
100+
*
101+
* Retrieve the properties from the device tree if a CM node exist and
102+
* update the internal variable based on this.
103+
*/
104+
#ifdef CONFIG_MIPS_CM
105+
extern void mips_cm_update_property(void);
106+
#else
107+
static inline void mips_cm_update_property(void) {}
108+
#endif
109+
88110
/**
89111
* mips_cm_has_l2sync - determine whether an L2-only sync region is present
90112
*

‎arch/mips/kernel/mips-cm.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <linux/errno.h>
8+
#include <linux/of.h>
89
#include <linux/percpu.h>
910
#include <linux/spinlock.h>
1011

@@ -14,6 +15,7 @@
1415
void __iomem *mips_gcr_base;
1516
void __iomem *mips_cm_l2sync_base;
1617
int mips_cm_is64;
18+
bool mips_cm_is_l2_hci_broken;
1719

1820
static char *cm2_tr[8] = {
1921
"mem", "gcr", "gic", "mmio",
@@ -238,6 +240,18 @@ static void mips_cm_probe_l2sync(void)
238240
mips_cm_l2sync_base = ioremap(addr, MIPS_CM_L2SYNC_SIZE);
239241
}
240242

243+
void mips_cm_update_property(void)
244+
{
245+
struct device_node *cm_node;
246+
247+
cm_node = of_find_compatible_node(of_root, NULL, "mobileye,eyeq6-cm");
248+
if (!cm_node)
249+
return;
250+
pr_info("HCI (Hardware Cache Init for the L2 cache) in GCR_L2_RAM_CONFIG from the CM3 is broken");
251+
mips_cm_is_l2_hci_broken = true;
252+
of_node_put(cm_node);
253+
}
254+
241255
int mips_cm_probe(void)
242256
{
243257
phys_addr_t addr;

‎arch/parisc/kernel/pdt.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ static unsigned long pdt_entry[MAX_PDT_ENTRIES] __page_aligned_bss;
6262
#define PDT_ADDR_PERM_ERR (pdt_type != PDT_PDC ? 2UL : 0UL)
6363
#define PDT_ADDR_SINGLE_ERR 1UL
6464

65+
#ifdef CONFIG_PROC_FS
6566
/* report PDT entries via /proc/meminfo */
6667
void arch_report_meminfo(struct seq_file *m)
6768
{
@@ -73,6 +74,7 @@ void arch_report_meminfo(struct seq_file *m)
7374
seq_printf(m, "PDT_cur_entries: %7lu\n",
7475
pdt_status.pdt_entries);
7576
}
77+
#endif
7678

7779
static int get_info_pat_new(void)
7880
{

‎arch/s390/kvm/trace-s390.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TRACE_EVENT(kvm_s390_create_vcpu,
5656
__entry->sie_block = sie_block;
5757
),
5858

59-
TP_printk("create cpu %d at 0x%pK, sie block at 0x%pK",
59+
TP_printk("create cpu %d at 0x%p, sie block at 0x%p",
6060
__entry->id, __entry->vcpu, __entry->sie_block)
6161
);
6262

@@ -255,7 +255,7 @@ TRACE_EVENT(kvm_s390_enable_css,
255255
__entry->kvm = kvm;
256256
),
257257

258-
TP_printk("enabling channel I/O support (kvm @ %pK)\n",
258+
TP_printk("enabling channel I/O support (kvm @ %p)\n",
259259
__entry->kvm)
260260
);
261261

‎arch/x86/entry/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
SYM_FUNC_START(entry_ibpb)
1818
movl $MSR_IA32_PRED_CMD, %ecx
19-
movl $PRED_CMD_IBPB, %eax
19+
movl _ASM_RIP(x86_pred_cmd), %eax
2020
xorl %edx, %edx
2121
wrmsr
2222

0 commit comments

Comments
 (0)