data_type large_stringclasses 3 values | source large_stringclasses 29 values | code large_stringlengths 98 49.4M | filepath large_stringlengths 5 161 ⌀ | message large_stringclasses 234 values | commit large_stringclasses 234 values | subject large_stringclasses 418 values | critique large_stringlengths 101 1.26M ⌀ | metadata dict |
|---|---|---|---|---|---|---|---|---|
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | The crash memory exclude of crashk_res and crashk_cma memory on powerpc
are almost identical to the generic crash_exclude_core_ranges().
By introducing the architecture-specific arch_crash_exclude_mem_range()
function with a default implementation of crash_exclude_mem_range(),
and using crash_exclude_mem_range_guarded as powerpc's separate
implementation, the generic crash_exclude_core_ranges() helper function
can be reused.
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
arch/powerpc/kexec/ranges.c | 16 ++++------------
include/linux/crash_core.h | 4 ++++
kernel/crash_core.c | 19 +++++++++++++------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c
index 6c58bcc3e130..e5fea23b191b 100644
--- a/arch/powerpc/kexec/ranges.c
+++ b/arch/powerpc/kexec/ranges.c
@@ -553,9 +553,9 @@ int get_usable_memory_ranges(struct crash_mem **mem_ranges)
#endif /* CONFIG_KEXEC_FILE */
#ifdef CONFIG_CRASH_DUMP
-int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,
- unsigned long long mstart,
- unsigned long long mend)
+int arch_crash_exclude_mem_range(struct crash_mem **mem_ranges,
+ unsigned long long mstart,
+ unsigned long long mend)
{
struct crash_mem *tmem = *mem_ranges;
@@ -604,18 +604,10 @@ int get_crash_memory_ranges(struct crash_mem **mem_ranges)
sort_memory_ranges(*mem_ranges, true);
}
- /* Exclude crashkernel region */
- ret = crash_exclude_mem_range_guarded(mem_ranges, crashk_res.start, crashk_res.end);
+ ret = crash_exclude_core_ranges(mem_ranges);
if (ret)
goto out;
- for (i = 0; i < crashk_cma_cnt; ++i) {
- ret = crash_exclude_mem_range_guarded(mem_ranges, crashk_cma_ranges[i].start,
- crashk_cma_ranges[i].end);
- if (ret)
- goto out;
- }
-
/*
* FIXME: For now, stay in parity with kexec-tools but if RTAS/OPAL
* regions are exported to save their context at the time of
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 033b20204aca..dbec826dc53b 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -68,6 +68,7 @@ extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_ma
void **addr, unsigned long *sz);
extern int crash_prepare_headers(int need_kernel_map, void **addr,
unsigned long *sz, unsigned long *nr_mem_ranges);
+extern int crash_exclude_core_ranges(struct crash_mem **cmem);
struct kimage;
struct kexec_segment;
@@ -88,6 +89,9 @@ extern int kimage_crash_copy_vmcoreinfo(struct kimage *image);
extern unsigned int arch_get_system_nr_ranges(void);
extern int arch_crash_populate_cmem(struct crash_mem *cmem);
extern int arch_crash_exclude_ranges(struct crash_mem *cmem);
+extern int arch_crash_exclude_mem_range(struct crash_mem **mem,
+ unsigned long long mstart,
+ unsigned long long mend);
#else /* !CONFIG_CRASH_DUMP*/
struct pt_regs;
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 96a96e511f5a..300d44ad5471 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -287,24 +287,31 @@ unsigned int __weak arch_get_system_nr_ranges(void) { return 0; }
int __weak arch_crash_populate_cmem(struct crash_mem *cmem) { return -1; }
int __weak arch_crash_exclude_ranges(struct crash_mem *cmem) { return 0; }
-static int crash_exclude_core_ranges(struct crash_mem *cmem)
+int __weak arch_crash_exclude_mem_range(struct crash_mem **mem,
+ unsigned long long mstart,
+ unsigned long long mend)
+{
+ return crash_exclude_mem_range(*mem, mstart, mend);
+}
+
+int crash_exclude_core_ranges(struct crash_mem **cmem)
{
int ret, i;
/* Exclude crashkernel region */
- ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
+ ret = arch_crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
if (ret)
return ret;
if (crashk_low_res.end) {
- ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
+ ret = arch_crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
if (ret)
return ret;
}
for (i = 0; i < crashk_cma_cnt; ++i) {
- ret = crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start,
- crashk_cma_ranges[i].end);
+ ret = arch_crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start,
+ crashk_cma_ranges[i].end);
if (ret)
return ret;
}
@@ -331,7 +338,7 @@ int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz,
if (ret)
goto out;
- ret = crash_exclude_core_ranges(cmem);
+ ret = crash_exclude_core_ranges(&cmem);
if (ret)
goto out;
--
2.34.1 | {
"author": "Jinjie Ruan <ruanjinjie@huawei.com>",
"date": "Thu, 26 Feb 2026 21:04:35 +0800",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | From: Sourabh Jain <sourabhjain@linux.ibm.com>
During a memory hot-remove event, the elfcorehdr is rebuilt to exclude
the removed memory. While updating the crash memory ranges for this
operation, the crash memory ranges array can become unsorted. This
happens because remove_mem_range() may split a memory range into two
parts and append the higher-address part as a separate range at the end
of the array.
So far, no issues have been observed due to the unsorted crash memory
ranges. However, this could lead to problems once crash memory range
removal is handled by generic code, as introduced in the upcoming
patches in this series.
Currently, powerpc uses a platform-specific function,
remove_mem_range(), to exclude hot-removed memory from the crash memory
ranges. This function performs the same task as the generic
crash_exclude_mem_range() in crash_core.c. The generic helper also
ensures that the crash memory ranges remain sorted. So remove the
redundant powerpc-specific implementation and instead call
crash_exclude_mem_range_guarded() (which internally calls
crash_exclude_mem_range()) to exclude the hot-removed memory ranges.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Baoquan he <bhe@redhat.com>
Cc: Jinjie Ruan <ruanjinjie@huawei.com>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mahesh Salgaonkar <mahesh@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Cc: Shivang Upadhyay <shivangu@linux.ibm.com>
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 87 +------------------------
3 files changed, 7 insertions(+), 89 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec_ranges.h b/arch/powerpc/include/asm/kexec_ranges.h
index 14055896cbcb..ad95e3792d10 100644
--- a/arch/powerpc/include/asm/kexec_ranges.h
+++ b/arch/powerpc/include/asm/kexec_ranges.h
@@ -7,7 +7,9 @@
void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
struct crash_mem *realloc_mem_ranges(struct crash_mem **mem_ranges);
int add_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size);
-int remove_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size);
+int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,
+ unsigned long long mstart,
+ unsigned long long mend);
int get_exclude_memory_ranges(struct crash_mem **mem_ranges);
int get_reserved_memory_ranges(struct crash_mem **mem_ranges);
int get_crash_memory_ranges(struct crash_mem **mem_ranges);
diff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c
index a325c1c02f96..898742a5205c 100644
--- a/arch/powerpc/kexec/crash.c
+++ b/arch/powerpc/kexec/crash.c
@@ -431,7 +431,7 @@ static void update_crash_elfcorehdr(struct kimage *image, struct memory_notify *
struct crash_mem *cmem = NULL;
struct kexec_segment *ksegment;
void *ptr, *mem, *elfbuf = NULL;
- unsigned long elfsz, memsz, base_addr, size;
+ unsigned long elfsz, memsz, base_addr, size, end;
ksegment = &image->segment[image->elfcorehdr_index];
mem = (void *) ksegment->mem;
@@ -450,7 +450,8 @@ static void update_crash_elfcorehdr(struct kimage *image, struct memory_notify *
if (image->hp_action == KEXEC_CRASH_HP_REMOVE_MEMORY) {
base_addr = PFN_PHYS(mn->start_pfn);
size = mn->nr_pages * PAGE_SIZE;
- ret = remove_mem_range(&cmem, base_addr, size);
+ end = base_addr + size - 1;
+ ret = crash_exclude_mem_range_guarded(&cmem, base_addr, end);
if (ret) {
pr_err("Failed to remove hot-unplugged memory from crash memory ranges\n");
goto out;
diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c
index 867135560e5c..6c58bcc3e130 100644
--- a/arch/powerpc/kexec/ranges.c
+++ b/arch/powerpc/kexec/ranges.c
@@ -553,7 +553,7 @@ int get_usable_memory_ranges(struct crash_mem **mem_ranges)
#endif /* CONFIG_KEXEC_FILE */
#ifdef CONFIG_CRASH_DUMP
-static int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,
+int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,
unsigned long long mstart,
unsigned long long mend)
{
@@ -641,89 +641,4 @@ int get_crash_memory_ranges(struct crash_mem **mem_ranges)
pr_err("Failed to setup crash memory ranges\n");
return ret;
}
-
-/**
- * remove_mem_range - Removes the given memory range from the range list.
- * @mem_ranges: Range list to remove the memory range to.
- * @base: Base address of the range to remove.
- * @size: Size of the memory range to remove.
- *
- * (Re)allocates memory, if needed.
- *
- * Returns 0 on success, negative errno on error.
- */
-int remove_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size)
-{
- u64 end;
- int ret = 0;
- unsigned int i;
- u64 mstart, mend;
- struct crash_mem *mem_rngs = *mem_ranges;
-
- if (!size)
- return 0;
-
- /*
- * Memory range are stored as start and end address, use
- * the same format to do remove operation.
- */
- end = base + size - 1;
-
- for (i = 0; i < mem_rngs->nr_ranges; i++) {
- mstart = mem_rngs->ranges[i].start;
- mend = mem_rngs->ranges[i].end;
-
- /*
- * Memory range to remove is not part of this range entry
- * in the memory range list
- */
- if (!(base >= mstart && end <= mend))
- continue;
-
- /*
- * Memory range to remove is equivalent to this entry in the
- * memory range list. Remove the range entry from the list.
- */
- if (base == mstart && end == mend) {
- for (; i < mem_rngs->nr_ranges - 1; i++) {
- mem_rngs->ranges[i].start = mem_rngs->ranges[i+1].start;
- mem_rngs->ranges[i].end = mem_rngs->ranges[i+1].end;
- }
- mem_rngs->nr_ranges--;
- goto out;
- }
- /*
- * Start address of the memory range to remove and the
- * current memory range entry in the list is same. Just
- * move the start address of the current memory range
- * entry in the list to end + 1.
- */
- else if (base == mstart) {
- mem_rngs->ranges[i].start = end + 1;
- goto out;
- }
- /*
- * End address of the memory range to remove and the
- * current memory range entry in the list is same.
- * Just move the end address of the current memory
- * range entry in the list to base - 1.
- */
- else if (end == mend) {
- mem_rngs->ranges[i].end = base - 1;
- goto out;
- }
- /*
- * Memory range to remove is not at the edge of current
- * memory range entry. Split the current memory entry into
- * two half.
- */
- else {
- size = mem_rngs->ranges[i].end - end + 1;
- mem_rngs->ranges[i].end = base - 1;
- ret = add_mem_range(mem_ranges, end + 1, size);
- }
- }
-out:
- return ret;
-}
#endif /* CONFIG_CRASH_DUMP */
--
2.34.1 | {
"author": "Jinjie Ruan <ruanjinjie@huawei.com>",
"date": "Thu, 26 Feb 2026 21:04:33 +0800",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | Commit 35c18f2933c5 ("Add a new optional ",cma" suffix to the
crashkernel= command line option") and commit ab475510e042 ("kdump:
implement reserve_crashkernel_cma") added CMA support for kdump
crashkernel reservation.
Crash kernel memory reservation wastes production resources if too
large, risks kdump failure if too small, and faces allocation difficulties
on fragmented systems due to contiguous block constraints. The new
CMA-based crashkernel reservation scheme splits the "large fixed
reservation" into a "small fixed region + large CMA dynamic region": the
CMA memory is available to userspace during normal operation to avoid
waste, and is reclaimed for kdump upon crash—saving memory while
improving reliability.
So extend crashkernel CMA reservation support to arm64. The following
changes are made to enable CMA reservation:
- Parse and obtain the CMA reservation size along with other crashkernel
parameters.
- Call reserve_crashkernel_cma() to allocate the CMA region for kdump.
- Include the CMA-reserved ranges for kdump kernel to use.
- Exclude the CMA-reserved ranges from the crash kernel memory to
prevent them from being exported through /proc/vmcore, which is already
done in the crash core.
Update kernel-parameters.txt to document CMA support for crashkernel on
arm64 architecture.
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
v7:
- Correct the inclusion of CMA-reserved ranges for kdump
kernel in of/kexec.
v3:
- Add Acked-by.
v2:
- Free cmem in prepare_elf_headers()
- Add the mtivation.
---
Documentation/admin-guide/kernel-parameters.txt | 2 +-
arch/arm64/kernel/machine_kexec_file.c | 2 +-
arch/arm64/mm/init.c | 5 +++--
drivers/of/fdt.c | 9 +++++----
drivers/of/kexec.c | 13 +++++++++++--
5 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index cb850e5290c2..afb3112510f7 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1121,7 +1121,7 @@ Kernel parameters
It will be ignored when crashkernel=X,high is not used
or memory reserved is below 4G.
crashkernel=size[KMG],cma
- [KNL, X86, ppc] Reserve additional crash kernel memory from
+ [KNL, X86, ARM64, PPC] Reserve additional crash kernel memory from
CMA. This reservation is usable by the first system's
userspace memory and kernel movable allocations (memory
balloon, zswap). Pages allocated from this memory range
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index c338506a580b..cc577d77df00 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -42,7 +42,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
#ifdef CONFIG_CRASH_DUMP
unsigned int arch_get_system_nr_ranges(void)
{
- unsigned int nr_ranges = 2; /* for exclusion of crashkernel region */
+ unsigned int nr_ranges = 2 + crashk_cma_cnt; /* for exclusion of crashkernel region */
phys_addr_t start, end;
u64 i;
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 96711b8578fd..144e30fe9a75 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -96,8 +96,8 @@ phys_addr_t __ro_after_init arm64_dma_phys_limit;
static void __init arch_reserve_crashkernel(void)
{
+ unsigned long long crash_base, crash_size, cma_size = 0;
unsigned long long low_size = 0;
- unsigned long long crash_base, crash_size;
bool high = false;
int ret;
@@ -106,11 +106,12 @@ static void __init arch_reserve_crashkernel(void)
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
&crash_size, &crash_base,
- &low_size, NULL, &high);
+ &low_size, &cma_size, &high);
if (ret)
return;
reserve_crashkernel_generic(crash_size, crash_base, low_size, high);
+ reserve_crashkernel_cma(cma_size);
}
static phys_addr_t __init max_zone_phys(phys_addr_t zone_limit)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 331646d667b9..531be5fcdeb6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -871,11 +871,12 @@ static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;
/*
* The main usage of linux,usable-memory-range is for crash dump kernel.
* Originally, the number of usable-memory regions is one. Now there may
- * be two regions, low region and high region.
- * To make compatibility with existing user-space and older kdump, the low
- * region is always the last range of linux,usable-memory-range if exist.
+ * be 2 + CRASHKERNEL_CMA_RANGES_MAX regions, low region, high region and
+ * cma regions. To make compatibility with existing user-space and older
+ * kdump, the low region is always the last range of linux,usable-memory-range
+ * if exist.
*/
-#define MAX_USABLE_RANGES 2
+#define MAX_USABLE_RANGES (2 + CRASHKERNEL_CMA_RANGES_MAX)
/**
* early_init_dt_check_for_usable_mem_range - Decode usable memory range
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
index c4cf3552c018..02a8cfc47180 100644
--- a/drivers/of/kexec.c
+++ b/drivers/of/kexec.c
@@ -309,10 +309,10 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
unsigned long initrd_len,
const char *cmdline, size_t extra_fdt_size)
{
- void *fdt;
- int ret, chosen_node, len;
+ int ret, chosen_node, len, i;
const void *prop;
size_t fdt_size;
+ void *fdt;
fdt_size = fdt_totalsize(initial_boot_params) +
(cmdline ? strlen(cmdline) : 0) +
@@ -431,6 +431,15 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
if (ret)
goto out;
+ for (i = 0; i < crashk_cma_cnt; i++) {
+ ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,
+ "linux,usable-memory-range",
+ crashk_cma_ranges[i].start,
+ crashk_cma_ranges[i].end - crashk_cma_ranges[i].start + 1);
+ if (ret)
+ goto out;
+ }
+
if (crashk_low_res.end) {
ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,
"linux,usable-memory-range",
--
2.34.1 | {
"author": "Jinjie Ruan <ruanjinjie@huawei.com>",
"date": "Thu, 26 Feb 2026 21:04:36 +0800",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | The crash memory alloc, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
handling them in the crash core would eliminate a lot of duplication, so
do them in the common code.
To achieve the above goal, three architecture-specific functions are
introduced:
- arch_get_system_nr_ranges(). Pre-counts the max number of memory ranges.
- arch_crash_populate_cmem(). Collects the memory ranges and fills them
into cmem.
- arch_crash_exclude_ranges(). Architecture's additional crash memory
ranges exclusion, defaulting to empty.
Acked-by: Baoquan He <bhe@redhat.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
arch/arm64/kernel/machine_kexec_file.c | 39 +++-------
arch/loongarch/kernel/machine_kexec_file.c | 39 +++-------
arch/riscv/kernel/machine_kexec_file.c | 38 +++------
arch/x86/kernel/crash.c | 89 +++-------------------
include/linux/crash_core.h | 5 ++
kernel/crash_core.c | 82 +++++++++++++++++++-
6 files changed, 132 insertions(+), 160 deletions(-)
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index fba260ad87a9..c338506a580b 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -40,23 +40,23 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
}
#ifdef CONFIG_CRASH_DUMP
-static int prepare_elf_headers(void **addr, unsigned long *sz)
+unsigned int arch_get_system_nr_ranges(void)
{
- struct crash_mem *cmem;
- unsigned int nr_ranges;
- int ret;
- u64 i;
+ unsigned int nr_ranges = 2; /* for exclusion of crashkernel region */
phys_addr_t start, end;
+ u64 i;
- nr_ranges = 2; /* for exclusion of crashkernel region */
for_each_mem_range(i, &start, &end)
nr_ranges++;
- cmem = kmalloc_flex(*cmem, ranges, nr_ranges);
- if (!cmem)
- return -ENOMEM;
+ return nr_ranges;
+}
+
+int arch_crash_populate_cmem(struct crash_mem *cmem)
+{
+ phys_addr_t start, end;
+ u64 i;
- cmem->max_nr_ranges = nr_ranges;
cmem->nr_ranges = 0;
for_each_mem_range(i, &start, &end) {
cmem->ranges[cmem->nr_ranges].start = start;
@@ -64,22 +64,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
cmem->nr_ranges++;
}
- /* Exclude crashkernel region */
- ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
- if (ret)
- goto out;
-
- if (crashk_low_res.end) {
- ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
- if (ret)
- goto out;
- }
-
- ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
-
-out:
- kfree(cmem);
- return ret;
+ return 0;
}
#endif
@@ -109,7 +94,7 @@ int load_other_segments(struct kimage *image,
void *headers;
unsigned long headers_sz;
if (image->type == KEXEC_TYPE_CRASH) {
- ret = prepare_elf_headers(&headers, &headers_sz);
+ ret = crash_prepare_headers(true, &headers, &headers_sz, NULL);
if (ret) {
pr_err("Preparing elf core header failed\n");
goto out_err;
diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c
index 5584b798ba46..4b318a94b564 100644
--- a/arch/loongarch/kernel/machine_kexec_file.c
+++ b/arch/loongarch/kernel/machine_kexec_file.c
@@ -56,23 +56,23 @@ static void cmdline_add_initrd(struct kimage *image, unsigned long *cmdline_tmpl
}
#ifdef CONFIG_CRASH_DUMP
-
-static int prepare_elf_headers(void **addr, unsigned long *sz)
+unsigned int arch_get_system_nr_ranges(void)
{
- int ret, nr_ranges;
- uint64_t i;
+ int nr_ranges = 2; /* for exclusion of crashkernel region */
phys_addr_t start, end;
- struct crash_mem *cmem;
+ uint64_t i;
- nr_ranges = 2; /* for exclusion of crashkernel region */
for_each_mem_range(i, &start, &end)
nr_ranges++;
- cmem = kmalloc_flex(*cmem, ranges, nr_ranges);
- if (!cmem)
- return -ENOMEM;
+ return nr_ranges;
+}
+
+int arch_crash_populate_cmem(struct crash_mem *cmem)
+{
+ phys_addr_t start, end;
+ uint64_t i;
- cmem->max_nr_ranges = nr_ranges;
cmem->nr_ranges = 0;
for_each_mem_range(i, &start, &end) {
cmem->ranges[cmem->nr_ranges].start = start;
@@ -80,22 +80,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
cmem->nr_ranges++;
}
- /* Exclude crashkernel region */
- ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
- if (ret < 0)
- goto out;
-
- if (crashk_low_res.end) {
- ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
- if (ret < 0)
- goto out;
- }
-
- ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
-
-out:
- kfree(cmem);
- return ret;
+ return 0;
}
/*
@@ -163,7 +148,7 @@ int load_other_segments(struct kimage *image,
void *headers;
unsigned long headers_sz;
- ret = prepare_elf_headers(&headers, &headers_sz);
+ ret = crash_prepare_headers(true, &headers, &headers_sz, NULL);
if (ret < 0) {
pr_err("Preparing elf core header failed\n");
goto out_err;
diff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c
index 54e2d9552e93..d0e331d87155 100644
--- a/arch/riscv/kernel/machine_kexec_file.c
+++ b/arch/riscv/kernel/machine_kexec_file.c
@@ -44,6 +44,15 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)
return 0;
}
+unsigned int arch_get_system_nr_ranges(void)
+{
+ unsigned int nr_ranges = 1; /* For exclusion of crashkernel region */
+
+ walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);
+
+ return nr_ranges;
+}
+
static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
{
struct crash_mem *cmem = arg;
@@ -55,33 +64,10 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
return 0;
}
-static int prepare_elf_headers(void **addr, unsigned long *sz)
+int arch_crash_populate_cmem(struct crash_mem *cmem)
{
- struct crash_mem *cmem;
- unsigned int nr_ranges;
- int ret;
-
- nr_ranges = 1; /* For exclusion of crashkernel region */
- walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);
-
- cmem = kmalloc_flex(*cmem, ranges, nr_ranges);
- if (!cmem)
- return -ENOMEM;
-
- cmem->max_nr_ranges = nr_ranges;
cmem->nr_ranges = 0;
- ret = walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);
- if (ret)
- goto out;
-
- /* Exclude crashkernel region */
- ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
- if (!ret)
- ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
-
-out:
- kfree(cmem);
- return ret;
+ return walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);
}
static char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
@@ -273,7 +259,7 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start,
if (image->type == KEXEC_TYPE_CRASH) {
void *headers;
unsigned long headers_sz;
- ret = prepare_elf_headers(&headers, &headers_sz);
+ ret = crash_prepare_headers(true, &headers, &headers_sz, NULL);
if (ret) {
pr_err("Preparing elf core header failed\n");
goto out;
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 335fd2ee9766..3ad3f8b758a4 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -152,16 +152,8 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)
return 0;
}
-/* Gather all the required information to prepare elf headers for ram regions */
-static struct crash_mem *fill_up_crash_elf_data(void)
+unsigned int arch_get_system_nr_ranges(void)
{
- unsigned int nr_ranges = 0;
- struct crash_mem *cmem;
-
- walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);
- if (!nr_ranges)
- return NULL;
-
/*
* Exclusion of crash region, crashk_low_res and/or crashk_cma_ranges
* may cause range splits. So add extra slots here.
@@ -176,49 +168,16 @@ static struct crash_mem *fill_up_crash_elf_data(void)
* But in order to lest the low 1M could be changed in the future,
* (e.g. [start, 1M]), add a extra slot.
*/
- nr_ranges += 3 + crashk_cma_cnt;
- cmem = vzalloc(struct_size(cmem, ranges, nr_ranges));
- if (!cmem)
- return NULL;
-
- cmem->max_nr_ranges = nr_ranges;
+ unsigned int nr_ranges = 3 + crashk_cma_cnt;
- return cmem;
+ walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);
+ return nr_ranges;
}
-/*
- * Look for any unwanted ranges between mstart, mend and remove them. This
- * might lead to split and split ranges are put in cmem->ranges[] array
- */
-static int elf_header_exclude_ranges(struct crash_mem *cmem)
+int arch_crash_exclude_ranges(struct crash_mem *cmem)
{
- int ret = 0;
- int i;
-
/* Exclude the low 1M because it is always reserved */
- ret = crash_exclude_mem_range(cmem, 0, SZ_1M - 1);
- if (ret)
- return ret;
-
- /* Exclude crashkernel region */
- ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
- if (ret)
- return ret;
-
- if (crashk_low_res.end)
- ret = crash_exclude_mem_range(cmem, crashk_low_res.start,
- crashk_low_res.end);
- if (ret)
- return ret;
-
- for (i = 0; i < crashk_cma_cnt; ++i) {
- ret = crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start,
- crashk_cma_ranges[i].end);
- if (ret)
- return ret;
- }
-
- return 0;
+ return crash_exclude_mem_range(cmem, 0, SZ_1M - 1);
}
static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
@@ -232,35 +191,9 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
return 0;
}
-/* Prepare elf headers. Return addr and size */
-static int prepare_elf_headers(void **addr, unsigned long *sz,
- unsigned long *nr_mem_ranges)
+int arch_crash_populate_cmem(struct crash_mem *cmem)
{
- struct crash_mem *cmem;
- int ret;
-
- cmem = fill_up_crash_elf_data();
- if (!cmem)
- return -ENOMEM;
-
- ret = walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);
- if (ret)
- goto out;
-
- /* Exclude unwanted mem ranges */
- ret = elf_header_exclude_ranges(cmem);
- if (ret)
- goto out;
-
- /* Return the computed number of memory ranges, for hotplug usage */
- *nr_mem_ranges = cmem->nr_ranges;
-
- /* By default prepare 64bit headers */
- ret = crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
-
-out:
- vfree(cmem);
- return ret;
+ return walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);
}
#endif
@@ -418,7 +351,8 @@ int crash_load_segments(struct kimage *image)
.buf_max = ULONG_MAX, .top_down = false };
/* Prepare elf headers and add a segment */
- ret = prepare_elf_headers(&kbuf.buffer, &kbuf.bufsz, &pnum);
+ ret = crash_prepare_headers(IS_ENABLED(CONFIG_X86_64), &kbuf.buffer,
+ &kbuf.bufsz, &pnum);
if (ret)
return ret;
@@ -529,7 +463,8 @@ void arch_crash_handle_hotplug_event(struct kimage *image, void *arg)
* Create the new elfcorehdr reflecting the changes to CPU and/or
* memory resources.
*/
- if (prepare_elf_headers(&elfbuf, &elfsz, &nr_mem_ranges)) {
+ if (crash_prepare_headers(IS_ENABLED(CONFIG_X86_64), &elfbuf, &elfsz,
+ &nr_mem_ranges)) {
pr_err("unable to create new elfcorehdr");
goto out;
}
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index d35726d6a415..033b20204aca 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -66,6 +66,8 @@ extern int crash_exclude_mem_range(struct crash_mem *mem,
unsigned long long mend);
extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
void **addr, unsigned long *sz);
+extern int crash_prepare_headers(int need_kernel_map, void **addr,
+ unsigned long *sz, unsigned long *nr_mem_ranges);
struct kimage;
struct kexec_segment;
@@ -83,6 +85,9 @@ int kexec_should_crash(struct task_struct *p);
int kexec_crash_loaded(void);
void crash_save_cpu(struct pt_regs *regs, int cpu);
extern int kimage_crash_copy_vmcoreinfo(struct kimage *image);
+extern unsigned int arch_get_system_nr_ranges(void);
+extern int arch_crash_populate_cmem(struct crash_mem *cmem);
+extern int arch_crash_exclude_ranges(struct crash_mem *cmem);
#else /* !CONFIG_CRASH_DUMP*/
struct pt_regs;
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 2c1a3791e410..96a96e511f5a 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -170,9 +170,6 @@ static inline resource_size_t crash_resource_size(const struct resource *res)
return !res->end ? 0 : resource_size(res);
}
-
-
-
int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
void **addr, unsigned long *sz)
{
@@ -274,6 +271,85 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
return 0;
}
+static struct crash_mem *alloc_cmem(unsigned int nr_ranges)
+{
+ struct crash_mem *cmem;
+
+ cmem = kvzalloc_flex(*cmem, ranges, nr_ranges);
+ if (!cmem)
+ return NULL;
+
+ cmem->max_nr_ranges = nr_ranges;
+ return cmem;
+}
+
+unsigned int __weak arch_get_system_nr_ranges(void) { return 0; }
+int __weak arch_crash_populate_cmem(struct crash_mem *cmem) { return -1; }
+int __weak arch_crash_exclude_ranges(struct crash_mem *cmem) { return 0; }
+
+static int crash_exclude_core_ranges(struct crash_mem *cmem)
+{
+ int ret, i;
+
+ /* Exclude crashkernel region */
+ ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
+ if (ret)
+ return ret;
+
+ if (crashk_low_res.end) {
+ ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
+ if (ret)
+ return ret;
+ }
+
+ for (i = 0; i < crashk_cma_cnt; ++i) {
+ ret = crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start,
+ crashk_cma_ranges[i].end);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz,
+ unsigned long *nr_mem_ranges)
+{
+ unsigned int max_nr_ranges;
+ struct crash_mem *cmem;
+ int ret;
+
+ max_nr_ranges = arch_get_system_nr_ranges();
+ if (!max_nr_ranges)
+ return -ENOMEM;
+
+ cmem = alloc_cmem(max_nr_ranges);
+ if (!cmem)
+ return -ENOMEM;
+
+ ret = arch_crash_populate_cmem(cmem);
+ if (ret)
+ goto out;
+
+ ret = crash_exclude_core_ranges(cmem);
+ if (ret)
+ goto out;
+
+ ret = arch_crash_exclude_ranges(cmem);
+ if (ret)
+ goto out;
+
+ /* Return the computed number of memory ranges, for hotplug usage */
+ if (nr_mem_ranges)
+ *nr_mem_ranges = cmem->nr_ranges;
+
+ ret = crash_prepare_elf64_headers(cmem, need_kernel_map, addr, sz);
+
+out:
+ kvfree(cmem);
+ return ret;
+}
+
/**
* crash_exclude_mem_range - exclude a mem range for existing ranges
* @mem: mem->range contains an array of ranges sorted in ascending order
--
2.34.1 | {
"author": "Jinjie Ruan <ruanjinjie@huawei.com>",
"date": "Thu, 26 Feb 2026 21:04:34 +0800",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | Commit 35c18f2933c5 ("Add a new optional ",cma" suffix to the
crashkernel= command line option") and commit ab475510e042 ("kdump:
implement reserve_crashkernel_cma") added CMA support for kdump
crashkernel reservation. This allows the kernel to dynamically allocate
contiguous memory for crash dumping when needed, rather than permanently
reserving a fixed region at boot time.
So extend crashkernel CMA reservation support to riscv. The following
changes are made to enable CMA reservation:
- Parse and obtain the CMA reservation size along with other crashkernel
parameters.
- Call reserve_crashkernel_cma() to allocate the CMA region for kdump.
- Include the CMA-reserved ranges for kdump kernel to use, which was
already done in of_kexec_alloc_and_setup_fdt().
- Exclude the CMA-reserved ranges from the crash kernel memory to
prevent them from being exported through /proc/vmcore, which was
already done in the crash core.
Update kernel-parameters.txt to document CMA support for crashkernel on
riscv architecture.
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Paul Walmsley <pjw@kernel.org> # arch/riscv
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
Documentation/admin-guide/kernel-parameters.txt | 16 ++++++++--------
arch/riscv/kernel/machine_kexec_file.c | 2 +-
arch/riscv/mm/init.c | 5 +++--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index afb3112510f7..3fe5724d6e39 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1121,14 +1121,14 @@ Kernel parameters
It will be ignored when crashkernel=X,high is not used
or memory reserved is below 4G.
crashkernel=size[KMG],cma
- [KNL, X86, ARM64, PPC] Reserve additional crash kernel memory from
- CMA. This reservation is usable by the first system's
- userspace memory and kernel movable allocations (memory
- balloon, zswap). Pages allocated from this memory range
- will not be included in the vmcore so this should not
- be used if dumping of userspace memory is intended and
- it has to be expected that some movable kernel pages
- may be missing from the dump.
+ [KNL, X86, ARM64, RISCV, PPC] Reserve additional crash
+ kernel memory from CMA. This reservation is usable by
+ the first system's userspace memory and kernel movable
+ allocations (memory balloon, zswap). Pages allocated
+ from this memory range will not be included in the vmcore
+ so this should not be used if dumping of userspace memory
+ is intended and it has to be expected that some movable
+ kernel pages may be missing from the dump.
A standard crashkernel reservation, as described above,
is still needed to hold the crash kernel and initrd.
diff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c
index d0e331d87155..297b910e4116 100644
--- a/arch/riscv/kernel/machine_kexec_file.c
+++ b/arch/riscv/kernel/machine_kexec_file.c
@@ -46,7 +46,7 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)
unsigned int arch_get_system_nr_ranges(void)
{
- unsigned int nr_ranges = 1; /* For exclusion of crashkernel region */
+ unsigned int nr_ranges = 1 + crashk_cma_cnt; /* For exclusion of crashkernel region */
walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 811e03786c56..4cd49afa9077 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -1398,7 +1398,7 @@ static inline void setup_vm_final(void)
*/
static void __init arch_reserve_crashkernel(void)
{
- unsigned long long low_size = 0;
+ unsigned long long low_size = 0, cma_size = 0;
unsigned long long crash_base, crash_size;
bool high = false;
int ret;
@@ -1408,11 +1408,12 @@ static void __init arch_reserve_crashkernel(void)
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
&crash_size, &crash_base,
- &low_size, NULL, &high);
+ &low_size, &cma_size, &high);
if (ret)
return;
reserve_crashkernel_generic(crash_size, crash_base, low_size, high);
+ reserve_crashkernel_cma(cma_size);
}
void __init paging_init(void)
--
2.34.1 | {
"author": "Jinjie Ruan <ruanjinjie@huawei.com>",
"date": "Thu, 26 Feb 2026 21:04:37 +0800",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | On 26/02/26 18:34, Jinjie Ruan wrote:
update_crash_elfcorehdr() in arch/powerpc/kexec/crash.c still calls
crash_exclude_mem_range_guarded(), causing a build failure. ld:
arch/powerpc/kexec/crash.o: in function `update_crash_elfcorehdr':
/root/linux/arch/powerpc/kexec/crash.c:454: undefined reference to
`crash_exclude_mem_range_guarded' To fix this: diff --git
a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c index
898742a5205c..e59e909c369d 100644 --- a/arch/powerpc/kexec/crash.c +++
b/arch/powerpc/kexec/crash.c @@ -451,7 +451,7 @@ static void
update_crash_elfcorehdr(struct kimage *image, struct memory_notify *
base_addr = PFN_PHYS(mn->start_pfn); size = mn->nr_pages * PAGE_SIZE;
end = base_addr + size - 1; - ret =
crash_exclude_mem_range_guarded(&cmem, base_addr, end); + ret =
arch_crash_exclude_mem_range(&cmem, base_addr, end); if (ret) {
pr_err("Failed to remove hot-unplugged memory from crash memory
ranges\n"); goto out; With the above change included, things are working
fine on powerpc. | {
"author": "Sourabh Jain <sourabhjain@linux.ibm.com>",
"date": "Fri, 27 Feb 2026 20:13:56 +0530",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.
And add support for crashkernel CMA reservation for arm64 and riscv.
Rebased on v7.0-rc1.
Basic second kernel boot test were performed on QEMU platforms for x86, ARM64,
and RISC-V architectures with the following parameters:
"cma=256M crashkernel=256M crashkernel=64M,cma"
Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
for arm64 and riscv.
- Add Acked-by.
Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanjinjie@huawei.com/
Changes in v5:
- Fix the kernel test robot build warnings.
- Sort crash memory ranges before preparing elfcorehdr for powerpc
- Link to v4: https://lore.kernel.org/all/20260209095931.2813152-1-ruanjinjie@huawei.com/
Changes in v4:
- Move the size calculation (and the realloc if needed) into the
generic crash.
- Link to v3: https://lore.kernel.org/all/20260204093728.1447527-1-ruanjinjie@huawei.com/
Jinjie Ruan (4):
crash: Exclude crash kernel memory in crash core
crash: Use crash_exclude_core_ranges() on powerpc
arm64: kexec: Add support for crashkernel CMA reservation
riscv: kexec: Add support for crashkernel CMA reservation
Sourabh Jain (1):
powerpc/crash: sort crash memory ranges before preparing elfcorehdr
.../admin-guide/kernel-parameters.txt | 16 +--
arch/arm64/kernel/machine_kexec_file.c | 39 +++----
arch/arm64/mm/init.c | 5 +-
arch/loongarch/kernel/machine_kexec_file.c | 39 +++----
arch/powerpc/include/asm/kexec_ranges.h | 4 +-
arch/powerpc/kexec/crash.c | 5 +-
arch/powerpc/kexec/ranges.c | 101 +-----------------
arch/riscv/kernel/machine_kexec_file.c | 38 +++----
arch/riscv/mm/init.c | 5 +-
arch/x86/kernel/crash.c | 89 +++------------
drivers/of/fdt.c | 9 +-
drivers/of/kexec.c | 13 ++-
include/linux/crash_core.h | 9 ++
kernel/crash_core.c | 89 ++++++++++++++-
14 files changed, 183 insertions(+), 278 deletions(-)
--
2.34.1
| null | null | null | [PATCH v7 0/5] arm64/riscv: Add support for crashkernel CMA reservation | Resend of:
https://lore.kernel.org/all/19cf18b5-362d-4ff2-8b85-e2e72809250c@linux.ibm.com/
On 26/02/26 18:34, Jinjie Ruan wrote:
update_crash_elfcorehdr() in arch/powerpc/kexec/crash.c still calls
crash_exclude_mem_range_guarded(), causing a build failure.
ld: arch/powerpc/kexec/crash.o: in function `update_crash_elfcorehdr':
/root/linux/arch/powerpc/kexec/crash.c:454: undefined reference to
`crash_exclude_mem_range_guarded'
To fix this:
--------------
diff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c
index 898742a5205c..e59e909c369d 100644
--- a/arch/powerpc/kexec/crash.c
+++ b/arch/powerpc/kexec/crash.c
@@ -451,7 +451,7 @@ static void update_crash_elfcorehdr(struct kimage
*image, struct memory_notify *
base_addr = PFN_PHYS(mn->start_pfn);
size = mn->nr_pages * PAGE_SIZE;
end = base_addr + size - 1;
- ret = crash_exclude_mem_range_guarded(&cmem, base_addr,
end);
+ ret = arch_crash_exclude_mem_range(&cmem, base_addr, end);
if (ret) {
pr_err("Failed to remove hot-unplugged memory
from crash memory ranges\n");
goto out;
With the above change included, things are working fine on powerpc. | {
"author": "Sourabh Jain <sourabhjain@linux.ibm.com>",
"date": "Fri, 27 Feb 2026 20:20:34 +0530",
"is_openbsd": false,
"thread_id": "20260226130437.1867658-1-ruanjinjie@huawei.com.mbox.gz"
} |
lkml_critique | lkml | Convert various legacy .txt bindings for Microchip (formerly Atmel) AT91/SAMA
family system peripherals to proper YAML schemas. This includes:
- CHIPID (SoC ID register block)
- PIT (Period Interval Timer, old style)
- PIT64B (64-bit Period Interval Timer, newer parts)
- ST (System Timer, including watchdog subnode)
- RAMC/SDRAMC/DDRAMC/UDDRC (SDRAM/DDR memory controller
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
Changes in v4:
- atmel,at91rm9200-sdramc: remove "- items enum:" and replace it with "- enum:" for compatible property.
- Link to v3: https://lore.kernel.org/r/20260226-arm-microchip-v3-0-0bda15abd922@gmail.com
Changes in v3:
- Change email for maintainers.
- atmel,at91rm9200-st: redefine watchdog node as a pattern property.
- Remove corresponding binding node from txt document for every yaml patch.
- Link to v2: https://lore.kernel.org/r/20260224-arm-microchip-v2-0-8bedacd2cdcb@gmail.com
Changes in v2:
- Change email for maintainers.
- microchip,sam9x60-pit64b: modify compatible and clock-names in properties.
- Link to v1: https://lore.kernel.org/r/20260217-arm-microchip-v1-0-ae5d907e10e3@gmail.com
---
Akhila YS (5):
dt-bindings: arm: microchip,sama7g5-chipid : convert to DT schema
dt-bindings: arm: atmel,at91sam9260-pit: convert to DT schema
dt-bindings: arm: microchip,sam9x60-pit64b : convert to DT schema
dt-bindings: arm: atmel,at91rm9200-st: convert to DT schema
dt-bindings: arm: atmel,at91rm9200-sdramc: convert to DT schema
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 +++++++++++++++++++++
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 +++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 48 ---------------
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 +++++++++++++++++++++
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 +++++++++++++
6 files changed, 293 insertions(+), 48 deletions(-)
---
base-commit: ca3a02fda4da8e2c1cb6baee5d72352e9e2cfaea
change-id: 20260128-arm-microchip-c0c0515024e6
Best regards,
--
Akhila YS <akhilayalmati@gmail.com>
| null | null | null | [PATCH v4 0/5] dt-bindings: Microchip/Atmel AT91/SAMA system
peripherals: convert to YAML | Convert Atmel system registers binding to YAML format.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
.../devicetree/bindings/arm/atmel-sysregs.txt | 5 ---
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 5ce54f9befe6..4ee18112586d 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -1,10 +1,5 @@
Atmel system registers
-Chipid required properties:
-- compatible: Should be "atmel,sama5d2-chipid" or "microchip,sama7g5-chipid"
- "microchip,sama7d65-chipid"
-- reg : Should contain registers location and length
-
PIT Timer required properties:
- compatible: Should be "atmel,at91sam9260-pit"
- reg: Should contain registers location and length
diff --git a/Documentation/devicetree/bindings/arm/microchip,sama7g5-chipid.yaml b/Documentation/devicetree/bindings/arm/microchip,sama7g5-chipid.yaml
new file mode 100644
index 000000000000..4fdb068be929
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/microchip,sama7g5-chipid.yaml
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/microchip,sama7g5-chipid.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Atmel/Microchip RAMC SDRAM/DDR Controller
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+ - Claudiu Beznea <claudiu.beznea@tuxon.dev>
+
+description:
+ This binding describes the Atmel/Microchip Chip ID register block used
+ for SoC identification and revision information. It requires compatible
+ strings matching specific SoC families and a reg property defining the
+ register address and size.
+
+properties:
+ compatible:
+ enum:
+ - atmel,sama5d2-chipid
+ - microchip,sama7g5-chipid
+ - microchip,sama7d65-chipid
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ chipid@fc069000 {
+ compatible = "atmel,sama5d2-chipid";
+ reg = <0xfc069000 0x8>;
+ };
+...
--
2.43.0 | {
"author": "Akhila YS <akhilayalmati@gmail.com>",
"date": "Fri, 27 Feb 2026 15:14:31 +0000",
"is_openbsd": false,
"thread_id": "20260227-arm-microchip-v4-0-7e2ae1c5b5d6@gmail.com.mbox.gz"
} |
lkml_critique | lkml | Convert various legacy .txt bindings for Microchip (formerly Atmel) AT91/SAMA
family system peripherals to proper YAML schemas. This includes:
- CHIPID (SoC ID register block)
- PIT (Period Interval Timer, old style)
- PIT64B (64-bit Period Interval Timer, newer parts)
- ST (System Timer, including watchdog subnode)
- RAMC/SDRAMC/DDRAMC/UDDRC (SDRAM/DDR memory controller
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
Changes in v4:
- atmel,at91rm9200-sdramc: remove "- items enum:" and replace it with "- enum:" for compatible property.
- Link to v3: https://lore.kernel.org/r/20260226-arm-microchip-v3-0-0bda15abd922@gmail.com
Changes in v3:
- Change email for maintainers.
- atmel,at91rm9200-st: redefine watchdog node as a pattern property.
- Remove corresponding binding node from txt document for every yaml patch.
- Link to v2: https://lore.kernel.org/r/20260224-arm-microchip-v2-0-8bedacd2cdcb@gmail.com
Changes in v2:
- Change email for maintainers.
- microchip,sam9x60-pit64b: modify compatible and clock-names in properties.
- Link to v1: https://lore.kernel.org/r/20260217-arm-microchip-v1-0-ae5d907e10e3@gmail.com
---
Akhila YS (5):
dt-bindings: arm: microchip,sama7g5-chipid : convert to DT schema
dt-bindings: arm: atmel,at91sam9260-pit: convert to DT schema
dt-bindings: arm: microchip,sam9x60-pit64b : convert to DT schema
dt-bindings: arm: atmel,at91rm9200-st: convert to DT schema
dt-bindings: arm: atmel,at91rm9200-sdramc: convert to DT schema
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 +++++++++++++++++++++
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 +++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 48 ---------------
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 +++++++++++++++++++++
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 +++++++++++++
6 files changed, 293 insertions(+), 48 deletions(-)
---
base-commit: ca3a02fda4da8e2c1cb6baee5d72352e9e2cfaea
change-id: 20260128-arm-microchip-c0c0515024e6
Best regards,
--
Akhila YS <akhilayalmati@gmail.com>
| null | null | null | [PATCH v4 0/5] dt-bindings: Microchip/Atmel AT91/SAMA system
peripherals: convert to YAML | Convert Atmel Periodic interval timer (PIT) binding to YAML format.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 ++++++++++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 6 ---
2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel,at91sam9260-pit.yaml b/Documentation/devicetree/bindings/arm/atmel,at91sam9260-pit.yaml
new file mode 100644
index 000000000000..d1bdc4a4f9e0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel,at91sam9260-pit.yaml
@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/atmel,at91sam9260-pit.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Atmel AT91SAM9260 Periodic Interval Timer (PIT)
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+ - Claudiu Beznea <claudiu.beznea@tuxon.dev>
+
+description:
+ The Periodic Interval Timer (PIT) is part of the System Controller of
+ various Microchip 32-bit ARM-based SoCs (formerly Atmel AT91 series).
+ It is a simple down-counter timer used mainly as the kernel tick source.
+ The PIT is clocked from the slow clock and shares a single IRQ line with
+ other System Controller peripherals.
+
+properties:
+ compatible:
+ const: atmel,at91sam9260-pit
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ timer@fffffd30 {
+ compatible = "atmel,at91sam9260-pit";
+ reg = <0xfffffd30 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk32k>;
+ };
+...
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 4ee18112586d..70059f66f2b4 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -1,11 +1,5 @@
Atmel system registers
-PIT Timer required properties:
-- compatible: Should be "atmel,at91sam9260-pit"
-- reg: Should contain registers location and length
-- interrupts: Should contain interrupt for the PIT which is the IRQ line
- shared across all System Controller members.
-
PIT64B Timer required properties:
- compatible: Should be "microchip,sam9x60-pit64b" or
"microchip,sam9x7-pit64b", "microchip,sam9x60-pit64b"
--
2.43.0 | {
"author": "Akhila YS <akhilayalmati@gmail.com>",
"date": "Fri, 27 Feb 2026 15:14:32 +0000",
"is_openbsd": false,
"thread_id": "20260227-arm-microchip-v4-0-7e2ae1c5b5d6@gmail.com.mbox.gz"
} |
lkml_critique | lkml | Convert various legacy .txt bindings for Microchip (formerly Atmel) AT91/SAMA
family system peripherals to proper YAML schemas. This includes:
- CHIPID (SoC ID register block)
- PIT (Period Interval Timer, old style)
- PIT64B (64-bit Period Interval Timer, newer parts)
- ST (System Timer, including watchdog subnode)
- RAMC/SDRAMC/DDRAMC/UDDRC (SDRAM/DDR memory controller
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
Changes in v4:
- atmel,at91rm9200-sdramc: remove "- items enum:" and replace it with "- enum:" for compatible property.
- Link to v3: https://lore.kernel.org/r/20260226-arm-microchip-v3-0-0bda15abd922@gmail.com
Changes in v3:
- Change email for maintainers.
- atmel,at91rm9200-st: redefine watchdog node as a pattern property.
- Remove corresponding binding node from txt document for every yaml patch.
- Link to v2: https://lore.kernel.org/r/20260224-arm-microchip-v2-0-8bedacd2cdcb@gmail.com
Changes in v2:
- Change email for maintainers.
- microchip,sam9x60-pit64b: modify compatible and clock-names in properties.
- Link to v1: https://lore.kernel.org/r/20260217-arm-microchip-v1-0-ae5d907e10e3@gmail.com
---
Akhila YS (5):
dt-bindings: arm: microchip,sama7g5-chipid : convert to DT schema
dt-bindings: arm: atmel,at91sam9260-pit: convert to DT schema
dt-bindings: arm: microchip,sam9x60-pit64b : convert to DT schema
dt-bindings: arm: atmel,at91rm9200-st: convert to DT schema
dt-bindings: arm: atmel,at91rm9200-sdramc: convert to DT schema
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 +++++++++++++++++++++
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 +++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 48 ---------------
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 +++++++++++++++++++++
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 +++++++++++++
6 files changed, 293 insertions(+), 48 deletions(-)
---
base-commit: ca3a02fda4da8e2c1cb6baee5d72352e9e2cfaea
change-id: 20260128-arm-microchip-c0c0515024e6
Best regards,
--
Akhila YS <akhilayalmati@gmail.com>
| null | null | null | [PATCH v4 0/5] dt-bindings: Microchip/Atmel AT91/SAMA system
peripherals: convert to YAML | Convert Atmel Periodic interval timer of 64bit (PIT64b) binding to YAML
format.
Changes during conversion:
- Add missing compatible "microchip,sama7g5-pit64b" along with a fallback
compatible "microchip,sam9x60-pit64b".
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
.../devicetree/bindings/arm/atmel-sysregs.txt | 8 ---
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 70059f66f2b4..d0561f7f465c 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -1,13 +1,5 @@
Atmel system registers
-PIT64B Timer required properties:
-- compatible: Should be "microchip,sam9x60-pit64b" or
- "microchip,sam9x7-pit64b", "microchip,sam9x60-pit64b"
- "microchip,sama7d65-pit64b", "microchip,sam9x60-pit64b"
-- reg: Should contain registers location and length
-- interrupts: Should contain interrupt for PIT64B timer
-- clocks: Should contain the available clock sources for PIT64B timer.
-
System Timer (ST) required properties:
- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"
- reg: Should contain registers location and length
diff --git a/Documentation/devicetree/bindings/arm/microchip,sam9x60-pit64b.yaml b/Documentation/devicetree/bindings/arm/microchip,sam9x60-pit64b.yaml
new file mode 100644
index 000000000000..f00ac7e858d9
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/microchip,sam9x60-pit64b.yaml
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/microchip,sam9x60-pit64b.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Microchip PIT64B 64-bit Periodic Interval Timer
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+ - Claudiu Beznea <claudiu.beznea@tuxon.dev>
+
+description:
+ The Microchip PIT64B is a 64-bit periodic interval timer used in
+ several modern Microchip ARM SoCs including SAM9X60, SAM9X7 and
+ SAMA7D65 families. It provides extended timing range, flexible
+ clock selection and supports both periodic and one-shot interrupt
+ generation modes.
+
+properties:
+ compatible:
+ oneOf:
+ - const: microchip,sam9x60-pit64b
+ - items:
+ - enum:
+ - microchip,sama7d65-pit64b
+ - microchip,sama7g5-pit64b
+ - microchip,sam9x7-pit64b
+ - const: microchip,sam9x60-pit64b
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ minItems: 1
+ maxItems: 2
+
+ clock-names:
+ minItems: 1
+ maxItems: 2
+ items:
+ enum:
+ - pclk
+ - gclk
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/clock/at91.h>
+ timer@f0028000 {
+ compatible = "microchip,sama7g5-pit64b", "microchip,sam9x60-pit64b";
+ reg = <0xf0028000 0x100>;
+ interrupts = <37 IRQ_TYPE_LEVEL_HIGH 7>;
+ clocks = <&pmc PMC_TYPE_PERIPHERAL 37>, <&pmc PMC_TYPE_GCK 37>;
+ clock-names = "pclk", "gclk";
+ };
+...
--
2.43.0 | {
"author": "Akhila YS <akhilayalmati@gmail.com>",
"date": "Fri, 27 Feb 2026 15:14:33 +0000",
"is_openbsd": false,
"thread_id": "20260227-arm-microchip-v4-0-7e2ae1c5b5d6@gmail.com.mbox.gz"
} |
lkml_critique | lkml | Convert various legacy .txt bindings for Microchip (formerly Atmel) AT91/SAMA
family system peripherals to proper YAML schemas. This includes:
- CHIPID (SoC ID register block)
- PIT (Period Interval Timer, old style)
- PIT64B (64-bit Period Interval Timer, newer parts)
- ST (System Timer, including watchdog subnode)
- RAMC/SDRAMC/DDRAMC/UDDRC (SDRAM/DDR memory controller
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
Changes in v4:
- atmel,at91rm9200-sdramc: remove "- items enum:" and replace it with "- enum:" for compatible property.
- Link to v3: https://lore.kernel.org/r/20260226-arm-microchip-v3-0-0bda15abd922@gmail.com
Changes in v3:
- Change email for maintainers.
- atmel,at91rm9200-st: redefine watchdog node as a pattern property.
- Remove corresponding binding node from txt document for every yaml patch.
- Link to v2: https://lore.kernel.org/r/20260224-arm-microchip-v2-0-8bedacd2cdcb@gmail.com
Changes in v2:
- Change email for maintainers.
- microchip,sam9x60-pit64b: modify compatible and clock-names in properties.
- Link to v1: https://lore.kernel.org/r/20260217-arm-microchip-v1-0-ae5d907e10e3@gmail.com
---
Akhila YS (5):
dt-bindings: arm: microchip,sama7g5-chipid : convert to DT schema
dt-bindings: arm: atmel,at91sam9260-pit: convert to DT schema
dt-bindings: arm: microchip,sam9x60-pit64b : convert to DT schema
dt-bindings: arm: atmel,at91rm9200-st: convert to DT schema
dt-bindings: arm: atmel,at91rm9200-sdramc: convert to DT schema
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 +++++++++++++++++++++
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 +++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 48 ---------------
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 +++++++++++++++++++++
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 +++++++++++++
6 files changed, 293 insertions(+), 48 deletions(-)
---
base-commit: ca3a02fda4da8e2c1cb6baee5d72352e9e2cfaea
change-id: 20260128-arm-microchip-c0c0515024e6
Best regards,
--
Akhila YS <akhilayalmati@gmail.com>
| null | null | null | [PATCH v4 0/5] dt-bindings: Microchip/Atmel AT91/SAMA system
peripherals: convert to YAML | Convert System Timer binding to YAML format.
Changes during conversion:
- Add "#address-cells" and "#size-cells" to the properties and required as
watchdog is defined as a child node to the timer parent node.
- Define watchdog as a pattern property along with unit address in
examples.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 9 ---
2 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel,at91rm9200-st.yaml b/Documentation/devicetree/bindings/arm/atmel,at91rm9200-st.yaml
new file mode 100644
index 000000000000..3f6a934a2a69
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel,at91rm9200-st.yaml
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/atmel,at91rm9200-st.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Atmel System Timer
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+ - Claudiu Beznea <claudiu.beznea@tuxon.dev>
+
+description:
+ The System Timer (ST) module in AT91RM9200 provides periodic tick and
+ alarm capabilities. It is exposed as a simple multi-function device
+ (simple-mfd + syscon) because it shares its register space and interrupt
+ with other System Controller blocks.
+
+properties:
+ compatible:
+ items:
+ - const: atmel,at91rm9200-st
+ - const: syscon
+ - const: simple-mfd
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 1
+
+patternProperties:
+ "^watchdog@[0-9a-f]+$":
+ $ref: /schemas/watchdog/atmel,at91rm9200-wdt.yaml#
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ timer@fffffd00 {
+ compatible = "atmel,at91rm9200-st", "syscon", "simple-mfd";
+ reg = <0xfffffd00 0x100>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ clocks = <&slow_xtal>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ watchdog@fffffd40 {
+ compatible = "atmel,at91rm9200-wdt";
+ reg = <0xfffffd40 0x40>;
+ };
+ };
+...
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index d0561f7f465c..14642384bc87 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -1,14 +1,5 @@
Atmel system registers
-System Timer (ST) required properties:
-- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"
-- reg: Should contain registers location and length
-- interrupts: Should contain interrupt for the ST which is the IRQ line
- shared across all System Controller members.
-- clocks: phandle to input clock.
-Its subnodes can be:
-- watchdog: compatible should be "atmel,at91rm9200-wdt"
-
RAMC SDRAM/DDR Controller required properties:
- compatible: Should be "atmel,at91rm9200-sdramc", "syscon" or
"atmel,at91sam9260-sdramc" or
--
2.43.0 | {
"author": "Akhila YS <akhilayalmati@gmail.com>",
"date": "Fri, 27 Feb 2026 15:14:34 +0000",
"is_openbsd": false,
"thread_id": "20260227-arm-microchip-v4-0-7e2ae1c5b5d6@gmail.com.mbox.gz"
} |
lkml_critique | lkml | Convert various legacy .txt bindings for Microchip (formerly Atmel) AT91/SAMA
family system peripherals to proper YAML schemas. This includes:
- CHIPID (SoC ID register block)
- PIT (Period Interval Timer, old style)
- PIT64B (64-bit Period Interval Timer, newer parts)
- ST (System Timer, including watchdog subnode)
- RAMC/SDRAMC/DDRAMC/UDDRC (SDRAM/DDR memory controller
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
Changes in v4:
- atmel,at91rm9200-sdramc: remove "- items enum:" and replace it with "- enum:" for compatible property.
- Link to v3: https://lore.kernel.org/r/20260226-arm-microchip-v3-0-0bda15abd922@gmail.com
Changes in v3:
- Change email for maintainers.
- atmel,at91rm9200-st: redefine watchdog node as a pattern property.
- Remove corresponding binding node from txt document for every yaml patch.
- Link to v2: https://lore.kernel.org/r/20260224-arm-microchip-v2-0-8bedacd2cdcb@gmail.com
Changes in v2:
- Change email for maintainers.
- microchip,sam9x60-pit64b: modify compatible and clock-names in properties.
- Link to v1: https://lore.kernel.org/r/20260217-arm-microchip-v1-0-ae5d907e10e3@gmail.com
---
Akhila YS (5):
dt-bindings: arm: microchip,sama7g5-chipid : convert to DT schema
dt-bindings: arm: atmel,at91sam9260-pit: convert to DT schema
dt-bindings: arm: microchip,sam9x60-pit64b : convert to DT schema
dt-bindings: arm: atmel,at91rm9200-st: convert to DT schema
dt-bindings: arm: atmel,at91rm9200-sdramc: convert to DT schema
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 +++++++++++++++++++++
.../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++++++++++++++++++++++
.../bindings/arm/atmel,at91sam9260-pit.yaml | 49 +++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 48 ---------------
.../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 +++++++++++++++++++++
.../bindings/arm/microchip,sama7g5-chipid.yaml | 41 +++++++++++++
6 files changed, 293 insertions(+), 48 deletions(-)
---
base-commit: ca3a02fda4da8e2c1cb6baee5d72352e9e2cfaea
change-id: 20260128-arm-microchip-c0c0515024e6
Best regards,
--
Akhila YS <akhilayalmati@gmail.com>
| null | null | null | [PATCH v4 0/5] dt-bindings: Microchip/Atmel AT91/SAMA system
peripherals: convert to YAML | Convert RAMC SDRAM/DDR controller binding to YAML format.
Signed-off-by: Akhila YS <akhilayalmati@gmail.com>
---
.../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 ++++++++++++++++++++++
.../devicetree/bindings/arm/atmel-sysregs.txt | 20 -------
2 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel,at91rm9200-sdramc.yaml b/Documentation/devicetree/bindings/arm/atmel,at91rm9200-sdramc.yaml
new file mode 100644
index 000000000000..ac7e0f454a34
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel,at91rm9200-sdramc.yaml
@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/atmel,at91rm9200-sdramc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Microchip (Atmel) SDRAM / DDR Controller (RAMC / DDRAMC / UDDRC)
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+ - Claudiu Beznea <claudiu.beznea@tuxon.dev>
+
+description:
+ The SDRAM/DDR Controller (often called RAMC or DDRAMC) in various
+ Atmel/Microchip ARM9 and Cortex-A5/A7 SoCs manages external
+ SDRAM / DDR memory. It is typically exposed as a syscon node for
+ register access from other drivers (e.g. for initialization or mode
+ configuration). No interrupts or clocks are usually required in the
+ binding.
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - const: atmel,at91rm9200-sdramc
+ - const: syscon
+ - items:
+ - const: microchip,sama7d65-uddrc
+ - const: microchip,sama7g5-uddrc
+ - enum:
+ - atmel,at91sam9260-sdramc
+ - atmel,at91sam9g45-ddramc
+ - atmel,sama5d3-ddramc
+ - microchip,sam9x60-ddramc
+ - microchip,sam9x7-ddramc
+ - microchip,sama7g5-uddrc
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ minItems: 1
+ maxItems: 2
+
+ clock-names:
+ minItems: 1
+ items:
+ - const: ddrck
+ - const: mpddr
+
+required:
+ - compatible
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/at91.h>
+ ramc@ffffe400 {
+ compatible = "atmel,at91sam9g45-ddramc";
+ reg = <0xffffe400 0x200>;
+ clocks = <&pmc PMC_TYPE_SYSTEM 2>;
+ clock-names = "ddrck";
+ };
+...
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
deleted file mode 100644
index 14642384bc87..000000000000
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Atmel system registers
-
-RAMC SDRAM/DDR Controller required properties:
-- compatible: Should be "atmel,at91rm9200-sdramc", "syscon" or
- "atmel,at91sam9260-sdramc" or
- "atmel,at91sam9g45-ddramc" or
- "atmel,sama5d3-ddramc" or
- "microchip,sam9x60-ddramc" or
- "microchip,sama7g5-uddrc" or
- "microchip,sama7d65-uddrc", "microchip,sama7g5-uddrc" or
- "microchip,sam9x7-ddramc", "atmel,sama5d3-ddramc".
-- reg: Should contain registers location and length
-
-Examples:
-
- ramc0: ramc@ffffe800 {
- compatible = "atmel,at91sam9g45-ddramc";
- reg = <0xffffe800 0x200>;
- };
-
--
2.43.0 | {
"author": "Akhila YS <akhilayalmati@gmail.com>",
"date": "Fri, 27 Feb 2026 15:14:35 +0000",
"is_openbsd": false,
"thread_id": "20260227-arm-microchip-v4-0-7e2ae1c5b5d6@gmail.com.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | diff --git a/Documentation/ABI/testing/sysfs-driver-intel-xe-sriov b/Documentation/ABI/testing/sysfs-driver-intel-xe-sriov
index 2fd7e9b7bacc..7f5ef9eada53 100644
--- a/Documentation/ABI/testing/sysfs-driver-intel-xe-sriov
+++ b/Documentation/ABI/testing/sysfs-driver-intel-xe-sriov
@@ -119,7 +119,7 @@ Description:
The GT preemption timeout (PT) in [us] to be applied to all functions.
See sriov_admin/{pf,vf<N>}/profile/preempt_timeout_us for more details.
- sched_priority: (RW/RO) string
+ sched_priority: (WO) string
The GT scheduling priority to be applied for all functions.
See sriov_admin/{pf,vf<N>}/profile/sched_priority for more details.
diff --git a/Documentation/PCI/endpoint/pci-vntb-howto.rst b/Documentation/PCI/endpoint/pci-vntb-howto.rst
index 9a7a2f0a6849..3679f5c30254 100644
--- a/Documentation/PCI/endpoint/pci-vntb-howto.rst
+++ b/Documentation/PCI/endpoint/pci-vntb-howto.rst
@@ -52,14 +52,14 @@ pci-epf-vntb device, the following commands can be used::
# cd /sys/kernel/config/pci_ep/
# mkdir functions/pci_epf_vntb/func1
-The "mkdir func1" above creates the pci-epf-ntb function device that will
+The "mkdir func1" above creates the pci-epf-vntb function device that will
be probed by pci_epf_vntb driver.
The PCI endpoint framework populates the directory with the following
configurable fields::
- # ls functions/pci_epf_ntb/func1
- baseclass_code deviceid msi_interrupts pci-epf-ntb.0
+ # ls functions/pci_epf_vntb/func1
+ baseclass_code deviceid msi_interrupts pci-epf-vntb.0
progif_code secondary subsys_id vendorid
cache_line_size interrupt_pin msix_interrupts primary
revid subclass_code subsys_vendor_id
@@ -111,13 +111,13 @@ A sample configuration for virtual NTB driver for virtual PCI bus::
# echo 0x080A > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vntb_pid
# echo 0x10 > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vbus_number
-Binding pci-epf-ntb Device to EP Controller
+Binding pci-epf-vntb Device to EP Controller
--------------------------------------------
NTB function device should be attached to PCI endpoint controllers
connected to the host.
- # ln -s controllers/5f010000.pcie_ep functions/pci-epf-ntb/func1/primary
+ # ln -s controllers/5f010000.pcie_ep functions/pci_epf_vntb/func1/primary
Once the above step is completed, the PCI endpoint controllers are ready to
establish a link with the host.
@@ -139,7 +139,7 @@ lspci Output at Host side
-------------------------
Note that the devices listed here correspond to the values populated in
-"Creating pci-epf-ntb Device" section above::
+"Creating pci-epf-vntb Device" section above::
# lspci
00:00.0 PCI bridge: Freescale Semiconductor Inc Device 0000 (rev 01)
@@ -152,7 +152,7 @@ lspci Output at EP Side / Virtual PCI bus
-----------------------------------------
Note that the devices listed here correspond to the values populated in
-"Creating pci-epf-ntb Device" section above::
+"Creating pci-epf-vntb Device" section above::
# lspci
10:00.0 Unassigned class [ffff]: Dawicontrol Computersysteme GmbH Device 1234 (rev ff)
diff --git a/Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml b/Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml
index 80a4540a22dc..e5f170aa4d9e 100644
--- a/Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml
@@ -120,6 +120,14 @@ properties:
items:
- const: top
+ vdda-phy-supply:
+ description:
+ Phandle to a 0.88V regulator supply to CSI PHYs.
+
+ vdda-pll-supply:
+ description:
+ Phandle to 1.2V regulator supply to CSI PHYs pll block.
+
ports:
$ref: /schemas/graph.yaml#/properties/ports
@@ -160,6 +168,8 @@ required:
- power-domains
- power-domain-names
- ports
+ - vdda-phy-supply
+ - vdda-pll-supply
additionalProperties: false
@@ -328,6 +338,9 @@ examples:
power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
power-domain-names = "top";
+ vdda-phy-supply = <&vreg_l4a_0p88>;
+ vdda-pll-supply = <&vreg_l1c_1p2>;
+
ports {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml
index eb97181cbb95..bfc4d75f50ff 100644
--- a/Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml
@@ -37,12 +37,15 @@ properties:
- description: PLL register block
clocks:
- maxItems: 2
+ minItems: 2
+ maxItems: 3
clock-names:
+ minItems: 2
items:
- const: aux
- const: cfg_ahb
+ - const: ref
"#clock-cells":
const: 1
@@ -64,6 +67,29 @@ required:
- "#clock-cells"
- "#phy-cells"
+allOf:
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,x1e80100-dp-phy
+ then:
+ properties:
+ clocks:
+ minItems: 3
+ maxItems: 3
+ clock-names:
+ minItems: 3
+ maxItems: 3
+ else:
+ properties:
+ clocks:
+ minItems: 2
+ maxItems: 2
+ clock-names:
+ minItems: 2
+ maxItems: 2
+
additionalProperties: false
examples:
diff --git a/Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml b/Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml
index 1fdbeecc5eff..3a3313ea0890 100644
--- a/Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml
+++ b/Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml
@@ -21,10 +21,10 @@ properties:
reg:
maxItems: 1
- avdd-supply:
+ AVDD-supply:
description: Analog power supply
- dvdd-supply:
+ DVDD-supply:
description: Digital power supply
reset-gpios:
@@ -60,7 +60,7 @@ allOf:
properties:
dsd-path: false
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
diff --git a/Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml b/Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml
index d3d494ae8abf..dc8f85f266bf 100644
--- a/Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml
+++ b/Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml
@@ -19,10 +19,10 @@ properties:
reg:
maxItems: 1
- avdd-supply:
+ AVDD-supply:
description: A 1.8V supply that powers up the AVDD pin.
- dvdd-supply:
+ DVDD-supply:
description: A 1.2V supply that powers up the DVDD pin.
reset-gpios:
diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index bc9a01606daf..2c65d57103fb 100644
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -3232,12 +3232,13 @@ enhanced_dad - BOOLEAN
===========
ratelimit - INTEGER
- Limit the maximal rates for sending ICMPv6 messages.
+ Limit the maximal rates for sending ICMPv6 messages to a particular
+ peer.
0 to disable any limiting,
- otherwise the minimal space between responses in milliseconds.
+ otherwise the space between responses in milliseconds.
- Default: 1000
+ Default: 100
ratemask - list of comma separated ranges
For ICMPv6 message types matching the ranges in the ratemask, limit
diff --git a/Documentation/trace/events-pci.rst b/Documentation/trace/events-pci.rst
new file mode 100644
index 000000000000..03ff4ad30ddf
--- /dev/null
+++ b/Documentation/trace/events-pci.rst
@@ -0,0 +1,74 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+===========================
+Subsystem Trace Points: PCI
+===========================
+
+Overview
+========
+The PCI tracing system provides tracepoints to monitor critical hardware events
+that can impact system performance and reliability. These events normally show
+up here:
+
+ /sys/kernel/tracing/events/pci
+
+Cf. include/trace/events/pci.h for the events definitions.
+
+Available Tracepoints
+=====================
+
+pci_hp_event
+------------
+
+Monitors PCI hotplug events including card insertion/removal and link
+state changes.
+::
+
+ pci_hp_event "%s slot:%s, event:%s\n"
+
+**Event Types**:
+
+* ``LINK_UP`` - PCIe link established
+* ``LINK_DOWN`` - PCIe link lost
+* ``CARD_PRESENT`` - Card detected in slot
+* ``CARD_NOT_PRESENT`` - Card removed from slot
+
+**Example Usage**::
+
+ # Enable the tracepoint
+ echo 1 > /sys/kernel/debug/tracing/events/pci/pci_hp_event/enable
+
+ # Monitor events (the following output is generated when a device is hotplugged)
+ cat /sys/kernel/debug/tracing/trace_pipe
+ irq/51-pciehp-88 [001] ..... 1311.177459: pci_hp_event: 0000:00:02.0 slot:10, event:CARD_PRESENT
+
+ irq/51-pciehp-88 [001] ..... 1311.177566: pci_hp_event: 0000:00:02.0 slot:10, event:LINK_UP
+
+pcie_link_event
+---------------
+
+Monitors PCIe link speed changes and provides detailed link status information.
+::
+
+ pcie_link_event "%s type:%d, reason:%d, cur_bus_speed:%d, max_bus_speed:%d, width:%u, flit_mode:%u, status:%s\n"
+
+**Parameters**:
+
+* ``type`` - PCIe device type (4=Root Port, etc.)
+* ``reason`` - Reason for link change:
+
+ - ``0`` - Link retrain
+ - ``1`` - Bus enumeration
+ - ``2`` - Bandwidth notification enable
+ - ``3`` - Bandwidth notification IRQ
+ - ``4`` - Hotplug event
+
+
+**Example Usage**::
+
+ # Enable the tracepoint
+ echo 1 > /sys/kernel/debug/tracing/events/pci/pcie_link_event/enable
+
+ # Monitor events (the following output is generated when a device is hotplugged)
+ cat /sys/kernel/debug/tracing/trace_pipe
+ irq/51-pciehp-88 [001] ..... 381.545386: pcie_link_event: 0000:00:02.0 type:4, reason:4, cur_bus_speed:20, max_bus_speed:23, width:1, flit_mode:0, status:DLLLA
diff --git a/Documentation/trace/index.rst b/Documentation/trace/index.rst
index b4a429dc4f7a..0a40bfabcf19 100644
--- a/Documentation/trace/index.rst
+++ b/Documentation/trace/index.rst
@@ -54,6 +54,7 @@ applications.
events-power
events-nmi
events-msr
+ events-pci
boottime-trace
histogram
histogram-design
diff --git a/Makefile b/Makefile
index 21df63507119..e9396657c546 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 19
-SUBLEVEL = 3
+SUBLEVEL = 4
EXTRAVERSION =
NAME = Baby Opossum Posse
@@ -1474,6 +1474,15 @@ ifneq ($(wildcard $(resolve_btfids_O)),)
$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean
endif
+PHONY += objtool_clean
+
+objtool_O = $(abspath $(objtree))/tools/objtool
+
+objtool_clean:
+ifneq ($(wildcard $(objtool_O)),)
+ $(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean
+endif
+
tools/: FORCE
$(Q)mkdir -p $(objtree)/tools
$(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
@@ -1637,7 +1646,7 @@ vmlinuxclean:
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
-clean: archclean vmlinuxclean resolve_btfids_clean
+clean: archclean vmlinuxclean resolve_btfids_clean objtool_clean
# mrproper - Delete all generated files, including .config
#
diff --git a/arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts
index be486d28d04f..428cab5a0e90 100644
--- a/arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts
@@ -102,6 +102,7 @@ &touchscreen {
/* The P66 uses a different EINT then the reference design */
interrupts = <6 9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */
/* The icn8318 binding expects wake-gpios instead of power-gpios */
+ /delete-property/ power-gpios;
wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
touchscreen-size-x = <800>;
touchscreen-size-y = <480>;
diff --git a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
index 2236901a0031..8e9ed93da129 100644
--- a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
@@ -302,6 +302,7 @@ i2c2: i2c@400a8000 {
mpwm: pwm@400e8000 {
compatible = "nxp,lpc3220-motor-pwm";
reg = <0x400e8000 0x78>;
+ clocks = <&clk LPC32XX_CLK_MCPWM>;
#pwm-cells = <3>;
status = "disabled";
};
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c
index e38a30477f3d..566c40f0f7c7 100644
--- a/arch/arm/kernel/vdso.c
+++ b/arch/arm/kernel/vdso.c
@@ -161,6 +161,7 @@ static void __init patch_vdso(void *ehdr)
vdso_nullpatch_one(&einfo, "__vdso_gettimeofday");
vdso_nullpatch_one(&einfo, "__vdso_clock_gettime");
vdso_nullpatch_one(&einfo, "__vdso_clock_gettime64");
+ vdso_nullpatch_one(&einfo, "__vdso_clock_getres");
}
}
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index 13b7ac03f9b2..885d9d64e9e4 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -969,6 +969,10 @@ sdio: mmc@88000 {
no-sd;
resets = <&reset RESET_SD_EMMC_A>;
status = "disabled";
+
+ assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_A>;
+ assigned-clock-rates = <24000000>;
+
};
sd: mmc@8a000 {
@@ -984,6 +988,9 @@ sd: mmc@8a000 {
no-sdio;
resets = <&reset RESET_SD_EMMC_B>;
status = "disabled";
+
+ assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_B>;
+ assigned-clock-rates = <24000000>;
};
nand: nand-controller@8d000 {
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index e95c91894968..cc72491eaf6f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -1960,6 +1960,9 @@ sd_emmc_b: mmc@5000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_B>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
+ assigned-clock-rates = <24000000>;
};
sd_emmc_c: mmc@7000 {
@@ -1972,6 +1975,9 @@ sd_emmc_c: mmc@7000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
+ assigned-clock-rates = <24000000>;
};
nfc: nand-controller@7800 {
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index ca455f634834..00609d2da674 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -2431,6 +2431,9 @@ sd_emmc_a: mmc@ffe03000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_A>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_A_CLK0>;
+ assigned-clock-rates = <24000000>;
};
sd_emmc_b: mmc@ffe05000 {
@@ -2443,6 +2446,9 @@ sd_emmc_b: mmc@ffe05000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_B>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
+ assigned-clock-rates = <24000000>;
};
sd_emmc_c: mmc@ffe07000 {
@@ -2455,6 +2461,9 @@ sd_emmc_c: mmc@ffe07000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
+ assigned-clock-rates = <24000000>;
};
usb: usb@ffe09000 {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index f69923da07fe..a9c830a570cc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -824,6 +824,9 @@ &sd_emmc_a {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_A>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_A_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&sd_emmc_b {
@@ -832,6 +835,9 @@ &sd_emmc_b {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_B>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&sd_emmc_c {
@@ -840,6 +846,9 @@ &sd_emmc_c {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&simplefb_hdmi {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index ba535010a3c9..e202d84f0672 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -894,6 +894,9 @@ &sd_emmc_a {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_A>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_A_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&sd_emmc_b {
@@ -902,6 +905,9 @@ &sd_emmc_b {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_B>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&sd_emmc_c {
@@ -910,6 +916,9 @@ &sd_emmc_c {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+
+ assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
+ assigned-clock-rates = <24000000>;
};
&simplefb_hdmi {
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index 9d99ed2994df..dfc0a30a6e61 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -819,13 +819,16 @@ sdio: mmc@fe088000 {
reg = <0x0 0xfe088000 0x0 0x800>;
interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc_periphs CLKID_SDEMMC_A>,
- <&xtal>,
+ <&clkc_periphs CLKID_SD_EMMC_A>,
<&clkc_pll CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_A>;
cap-sdio-irq;
keep-power-in-suspend;
status = "disabled";
+
+ assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_A>;
+ assigned-clock-rates = <24000000>;
};
sd: mmc@fe08a000 {
@@ -838,6 +841,9 @@ sd: mmc@fe08a000 {
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_B>;
status = "disabled";
+
+ assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_B>;
+ assigned-clock-rates = <24000000>;
};
emmc: mmc@fe08c000 {
@@ -845,13 +851,16 @@ emmc: mmc@fe08c000 {
reg = <0x0 0xfe08c000 0x0 0x800>;
interrupts = <GIC_SPI 178 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_NAND>,
- <&xtal>,
+ <&clkc_periphs CLKID_SD_EMMC_C>,
<&clkc_pll CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_NAND_EMMC>;
no-sdio;
no-sd;
status = "disabled";
+
+ assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_C>;
+ assigned-clock-rates = <24000000>;
};
};
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index 0170139b8d32..3ece30a0a1ff 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -52,6 +52,7 @@ p12v_0: regulator-p12v-0 {
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
@@ -65,6 +66,7 @@ p12v_1: regulator-p12v-1 {
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index c4524eb4f099..0bce4e8d965f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -37,6 +37,7 @@ tflash_vdd: regulator-tflash-vdd {
gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
@@ -50,6 +51,7 @@ tf_io: gpio-regulator-tf-io {
enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
@@ -81,6 +83,7 @@ vcc_5v: regulator-vcc-5v {
regulator-name = "5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
+ regulator-boot-on;
regulator-always-on;
vin-supply = <&main_12v>;
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts
index f7346b3d35fe..a122f2ed5f53 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts
@@ -704,7 +704,7 @@ pinctrl_hdmi: hdmigrp {
fsl,pins = <MX8MP_IOMUXC_HDMI_DDC_SCL__HDMIMIX_HDMI_SCL 0x400001c2>,
<MX8MP_IOMUXC_HDMI_DDC_SDA__HDMIMIX_HDMI_SDA 0x400001c2>,
<MX8MP_IOMUXC_HDMI_HPD__HDMIMIX_HDMI_HPD 0x40000010>,
- <MX8MP_IOMUXC_HDMI_CEC__HDMIMIX_HDMI_CEC 0x40000154>;
+ <MX8MP_IOMUXC_HDMI_CEC__HDMIMIX_HDMI_CEC 0x40000030>;
};
pinctrl_gpt1: gpt1grp {
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
index 59642a8a2c44..c73d40fb789f 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
@@ -867,7 +867,7 @@ pinctrl_hdmi: hdmigrp {
fsl,pins = <MX8MP_IOMUXC_HDMI_DDC_SCL__HDMIMIX_HDMI_SCL 0x400001c2>,
<MX8MP_IOMUXC_HDMI_DDC_SDA__HDMIMIX_HDMI_SDA 0x400001c2>,
<MX8MP_IOMUXC_HDMI_HPD__HDMIMIX_HDMI_HPD 0x40000010>,
- <MX8MP_IOMUXC_HDMI_CEC__HDMIMIX_HDMI_CEC 0x40000010>;
+ <MX8MP_IOMUXC_HDMI_CEC__HDMIMIX_HDMI_CEC 0x40000030>;
};
pinctrl_hoggpio2: hoggpio2grp {
diff --git a/arch/arm64/boot/dts/freescale/imx95-clock.h b/arch/arm64/boot/dts/freescale/imx95-clock.h
index e1f91203e794..22311612e440 100644
--- a/arch/arm64/boot/dts/freescale/imx95-clock.h
+++ b/arch/arm64/boot/dts/freescale/imx95-clock.h
@@ -183,5 +183,6 @@
#define IMX95_CLK_SEL_A55P (IMX95_CCM_NUM_CLK_SRC + 123 + 7)
#define IMX95_CLK_SEL_DRAM (IMX95_CCM_NUM_CLK_SRC + 123 + 8)
#define IMX95_CLK_SEL_TEMPSENSE (IMX95_CCM_NUM_CLK_SRC + 123 + 9)
+#define IMX95_CLK_GPU_CGC (IMX95_CCM_NUM_CLK_SRC + 123 + 10)
#endif /* __CLOCK_IMX95_H */
diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
index a4d854817559..55e2da094c88 100644
--- a/arch/arm64/boot/dts/freescale/imx95.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -2164,7 +2164,7 @@ netc_emdio: mdio@0,0 {
gpu: gpu@4d900000 {
compatible = "nxp,imx95-mali", "arm,mali-valhall-csf";
reg = <0 0x4d900000 0 0x480000>;
- clocks = <&scmi_clk IMX95_CLK_GPU>, <&scmi_clk IMX95_CLK_GPUAPB>;
+ clocks = <&scmi_clk IMX95_CLK_GPU_CGC>, <&scmi_clk IMX95_CLK_GPUAPB>;
clock-names = "core", "coregroup";
interrupts = <GIC_SPI 289 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
index cce326aec1aa..40af5656d6f1 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
@@ -91,7 +91,7 @@ bluetooth@2 {
&pio {
bt_pins_wakeup: bt-pins-wakeup {
- piins-bt-wakeup {
+ pins-bt-wakeup {
pinmux = <PINMUX_GPIO42__FUNC_GPIO42>;
input-enable;
};
diff --git a/arch/arm64/boot/dts/qcom/agatti.dtsi b/arch/arm64/boot/dts/qcom/agatti.dtsi
index 8bf5c5583fc2..969ae1378db2 100644
--- a/arch/arm64/boot/dts/qcom/agatti.dtsi
+++ b/arch/arm64/boot/dts/qcom/agatti.dtsi
@@ -1591,8 +1591,12 @@ usb_dwc3_ss: endpoint {
gpu: gpu@5900000 {
compatible = "qcom,adreno-07000200", "qcom,adreno";
- reg = <0x0 0x05900000 0x0 0x40000>;
- reg-names = "kgsl_3d0_reg_memory";
+ reg = <0x0 0x05900000 0x0 0x40000>,
+ <0x0 0x0599e000 0x0 0x1000>,
+ <0x0 0x05961000 0x0 0x800>;
+ reg-names = "kgsl_3d0_reg_memory",
+ "cx_mem",
+ "cx_dbgc";
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
index a17900eacb20..83a0a0c3239d 100644
--- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
@@ -791,8 +791,8 @@ soc: soc@0 {
#address-cells = <2>;
#size-cells = <2>;
- dma-ranges = <0 0 0 0 0x10 0>;
- ranges = <0 0 0 0 0x10 0>;
+ dma-ranges = <0 0 0 0 0x100 0>;
+ ranges = <0 0 0 0 0x100 0>;
gcc: clock-controller@100000 {
compatible = "qcom,x1e80100-gcc";
@@ -2937,7 +2937,7 @@ usb_1_ss1_qmpphy: phy@fda000 {
reg = <0 0x00fda000 0 0x4000>;
clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>,
- <&rpmhcc RPMH_CXO_CLK>,
+ <&tcsr TCSR_USB4_1_CLKREF_EN>,
<&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>,
<&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;
clock-names = "aux",
@@ -3008,7 +3008,7 @@ usb_1_ss2_qmpphy: phy@fdf000 {
reg = <0 0x00fdf000 0 0x4000>;
clocks = <&gcc GCC_USB3_TERT_PHY_AUX_CLK>,
- <&rpmhcc RPMH_CXO_CLK>,
+ <&tcsr TCSR_USB4_2_CLKREF_EN>,
<&gcc GCC_USB3_TERT_PHY_COM_AUX_CLK>,
<&gcc GCC_USB3_TERT_PHY_PIPE_CLK>;
clock-names = "aux",
diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
index 4c983b10dd92..7ace3540ef0a 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
@@ -378,7 +378,7 @@ &blsp2_i2c1 {
status = "okay";
sideinteraction: touch@2c {
- compatible = "ad,ad7147_captouch";
+ compatible = "adi,ad7147_captouch";
reg = <0x2c>;
pinctrl-names = "default", "sleep";
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index 0cd36c54632f..5f8613150bdd 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -694,7 +694,7 @@ sdc2_card_det_n: sd-card-det-n-state {
&uart3 {
interrupts-extended = <&intc GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
- <&tlmm 11 IRQ_TYPE_LEVEL_HIGH>;
+ <&tlmm 11 IRQ_TYPE_EDGE_FALLING>;
pinctrl-0 = <&uart3_default>;
pinctrl-1 = <&uart3_sleep>;
pinctrl-names = "default", "sleep";
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 8b1a45a4e56e..b383e480a394 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -598,8 +598,8 @@ qusb2_hstx_trim: hstx-trim@240 {
};
gpu_speed_bin: gpu-speed-bin@41a0 {
- reg = <0x41a2 0x1>;
- bits = <5 7>;
+ reg = <0x41a2 0x2>;
+ bits = <5 8>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index ce23f87e0316..5118b776a9bb 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -379,6 +379,12 @@ vreg_l21a_2p95: ldo21 {
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
+ vreg_l23a_3p3: ldo23 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3312000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
vreg_l24a_3p075: ldo24 {
regulator-min-microvolt = <3088000>;
regulator-max-microvolt = <3088000>;
@@ -850,7 +856,6 @@ &spi0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&qup_spi0_default>;
- cs-gpios = <&tlmm 3 GPIO_ACTIVE_LOW>;
can@0 {
compatible = "microchip,mcp2517fd";
@@ -1156,6 +1161,7 @@ &wifi {
vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
+ vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
qcom,snoc-host-cap-8bit-quirk;
qcom,calibration-variant = "Thundercomm_DB845C";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index db6dd04c51bb..8251f5a2f947 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -148,7 +148,6 @@ ts_1p8_supply: ts-1p8-regulator {
gpio = <&tlmm 88 0>;
enable-active-high;
- regulator-boot-on;
};
panel_vci_3v3: panel-vci-3v3-regulator {
@@ -273,7 +272,7 @@ vreg_l14a_1p88: ldo14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-always-on;
+ regulator-boot-on;
};
vreg_l17a_1p3: ldo17 {
diff --git a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
index 0ef9ea38a424..f04865381870 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
@@ -30,9 +30,7 @@
/delete-node/ &ipa_fw_mem;
/delete-node/ &ipa_gsi_mem;
/delete-node/ &gpu_mem;
-/delete-node/ &adsp_mem;
/delete-node/ &wlan_msa_mem;
-/delete-node/ &slpi_mem;
/ {
model = "Huawei MateBook E 2019";
@@ -145,22 +143,13 @@ wlan_msa_mem: wlan-msa@8c400000 {
no-map;
};
- adsp_mem: adsp@8c500000 {
- reg = <0 0x8c500000 0 0x1a00000>;
- no-map;
- };
-
ipa_fw_mem: ipa-fw@8df00000 {
- reg = <0 0x8df00000 0 0x100000>;
+ reg = <0 0x8df00000 0 0x5a000>;
no-map;
};
- slpi_mem: slpi@96700000 {
- reg = <0 0x96700000 0 0x1200000>;
- };
-
- gpu_mem: gpu@97900000 {
- reg = <0 0x97900000 0 0x5000>;
+ gpu_mem: gpu@8df5a000 {
+ reg = <0 0x8df5a000 0 0x5000>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index 5e2032c26ea3..4dba724f2c75 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -1715,8 +1715,12 @@ usb_dwc3_ss: endpoint {
gpu: gpu@5900000 {
compatible = "qcom,adreno-610.0", "qcom,adreno";
- reg = <0x0 0x05900000 0x0 0x40000>;
- reg-names = "kgsl_3d0_reg_memory";
+ reg = <0x0 0x05900000 0x0 0x40000>,
+ <0x0 0x0599e000 0x0 0x1000>,
+ <0x0 0x05961000 0x0 0x800>;
+ reg-names = "kgsl_3d0_reg_memory",
+ "cx_mem",
+ "cx_dbgc";
/* There's no (real) GMU, so we have to handle quite a bunch of clocks! */
clocks = <&gpucc GPU_CC_GX_GFX3D_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
index 0339a572f34d..1eea9c5c6684 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
@@ -387,6 +387,10 @@ &gpu {
status = "okay";
};
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8150/a640_zap.mbn";
+};
+
&i2c4 {
clock-frequency = <100000>;
diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
index 12e8e1ada6d8..0f2d511624a8 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
@@ -358,6 +358,10 @@ &gpu {
status = "okay";
};
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8150/a640_zap.mbn";
+};
+
&pon {
mode-bootloader = <0x2>;
mode-recovery = <0x1>;
diff --git a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
index f5c193c6c5f9..3ea9d2b1a7d5 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
@@ -373,6 +373,10 @@ &gpu {
status = "okay";
};
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8250/a650_zap.mbn";
+};
+
&pon {
mode-bootloader = <0x2>;
mode-recovery = <0x1>;
diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index 95d26e313622..3ef21bae3174 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -537,7 +537,6 @@ cdsp_smp2p_in: slave-kernel {
qup_opp_table: opp-table-qup {
compatible = "operating-points-v2";
- opp-shared;
opp-75000000 {
opp-hz = /bits/ 64 <75000000>;
diff --git a/arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts b/arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts
index 08e814c03fa8..ed6fcdc337a0 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts
+++ b/arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts
@@ -8,7 +8,6 @@
/dts-v1/;
/* Switch selection settings */
-#define SW_LCD_EN 0
#define SW_GPIO8_CAN0_STB 0
#define SW_GPIO9_CAN1_STB 0
#define SW_LCD_EN 0
diff --git a/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi b/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
index 3eed1f3948e8..63bd91690b54 100644
--- a/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
@@ -224,8 +224,7 @@ data-pins {
ctrl-pins {
pinmux = <RZT2H_PORT_PINMUX(12, 0, 0x29)>, /* SD0_CLK */
<RZT2H_PORT_PINMUX(12, 1, 0x29)>, /* SD0_CMD */
- <RZT2H_PORT_PINMUX(22, 5, 0x29)>, /* SD0_CD */
- <RZT2H_PORT_PINMUX(22, 6, 0x29)>; /* SD0_WP */
+ <RZT2H_PORT_PINMUX(22, 5, 0x29)>; /* SD0_CD */
};
};
@@ -282,6 +281,7 @@ &sdhi0 {
pinctrl-names = "default", "state_uhs";
vmmc-supply = <®_3p3v>;
vqmmc-supply = <&vqmmc_sdhi0>;
+ wp-gpios = <&pinctrl RZT2H_GPIO(22, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
sd-uhs-sdr50;
sd-uhs-sdr104;
diff --git a/arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts b/arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts
index 7169d934adac..95234c8460ed 100644
--- a/arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts
+++ b/arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts
@@ -85,8 +85,7 @@ reserved_memory: reserved-memory {
linux,cma {
compatible = "shared-dma-pool";
reusable;
- size = <0x10000000>;
- alignment = <0x2000>;
+ size = <0x00 0x10000000>;
linux,cma-default;
};
@@ -174,6 +173,7 @@ vcc_3p3_sd_vio_s0: regulator-6 {
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_3p3_s0>;
regulator-boot-on;
+ enable-active-high;
enable-gpios = <&main_gpio0 7 GPIO_ACTIVE_HIGH>;
gpios = <&main_gpio0 8 GPIO_ACTIVE_HIGH>;
states = <3300000 0x0>,
diff --git a/arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts b/arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts
index 55fd214a82e4..c816ba3bfbdf 100644
--- a/arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts
+++ b/arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts
@@ -280,8 +280,8 @@ connector {
try-power-role = "sink";
self-powered;
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
- sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
- op-sink-microwatt = <1000000>;
+ sink-pdos = <PDO_FIXED(5000, 0, PDO_FIXED_USB_COMM)>;
+ op-sink-microwatt = <0>;
ports {
#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts b/arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts
index c7ce804eac70..f48601ae38b7 100644
--- a/arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts
+++ b/arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts
@@ -399,8 +399,8 @@ connector {
try-power-role = "sink";
self-powered;
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
- sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
- op-sink-microwatt = <1000000>;
+ sink-pdos = <PDO_FIXED(5000, 0, PDO_FIXED_USB_COMM)>;
+ op-sink-microwatt = <0>;
ports {
#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
index 9cc0901d58fb..c2636e624f18 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
@@ -2378,42 +2378,6 @@ watchdog3: watchdog@2230000 {
assigned-clock-parents = <&k3_clks 351 4>;
};
- watchdog4: watchdog@2240000 {
- compatible = "ti,j7-rti-wdt";
- reg = <0x00 0x2240000 0x00 0x100>;
- clocks = <&k3_clks 352 0>;
- power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>;
- assigned-clocks = <&k3_clks 352 0>;
- assigned-clock-parents = <&k3_clks 352 4>;
- };
-
- watchdog5: watchdog@2250000 {
- compatible = "ti,j7-rti-wdt";
- reg = <0x00 0x2250000 0x00 0x100>;
- clocks = <&k3_clks 353 0>;
- power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>;
- assigned-clocks = <&k3_clks 353 0>;
- assigned-clock-parents = <&k3_clks 353 4>;
- };
-
- watchdog6: watchdog@2260000 {
- compatible = "ti,j7-rti-wdt";
- reg = <0x00 0x2260000 0x00 0x100>;
- clocks = <&k3_clks 354 0>;
- power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>;
- assigned-clocks = <&k3_clks 354 0>;
- assigned-clock-parents = <&k3_clks 354 4>;
- };
-
- watchdog7: watchdog@2270000 {
- compatible = "ti,j7-rti-wdt";
- reg = <0x00 0x2270000 0x00 0x100>;
- clocks = <&k3_clks 355 0>;
- power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>;
- assigned-clocks = <&k3_clks 355 0>;
- assigned-clock-parents = <&k3_clks 355 4>;
- };
-
/*
* The following RTI instances are coupled with MCU R5Fs, c7x and
* GPU so keeping them reserved as these will be used by their
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
index 0160fe0da983..78fcd0c40abc 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
@@ -6,17 +6,40 @@
*/
&cbass_main {
- c71_3: dsp@67800000 {
- compatible = "ti,j721s2-c71-dsp";
- reg = <0x00 0x67800000 0x00 0x00080000>,
- <0x00 0x67e00000 0x00 0x0000c000>;
- reg-names = "l2sram", "l1dram";
- resets = <&k3_reset 40 1>;
- firmware-name = "j784s4-c71_3-fw";
- ti,sci = <&sms>;
- ti,sci-dev-id = <40>;
- ti,sci-proc-ids = <0x33 0xff>;
- status = "disabled";
+ watchdog4: watchdog@2240000 {
+ compatible = "ti,j7-rti-wdt";
+ reg = <0x00 0x2240000 0x00 0x100>;
+ clocks = <&k3_clks 352 0>;
+ power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>;
+ assigned-clocks = <&k3_clks 352 0>;
+ assigned-clock-parents = <&k3_clks 352 4>;
+ };
+
+ watchdog5: watchdog@2250000 {
+ compatible = "ti,j7-rti-wdt";
+ reg = <0x00 0x2250000 0x00 0x100>;
+ clocks = <&k3_clks 353 0>;
+ power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>;
+ assigned-clocks = <&k3_clks 353 0>;
+ assigned-clock-parents = <&k3_clks 353 4>;
+ };
+
+ watchdog6: watchdog@2260000 {
+ compatible = "ti,j7-rti-wdt";
+ reg = <0x00 0x2260000 0x00 0x100>;
+ clocks = <&k3_clks 354 0>;
+ power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>;
+ assigned-clocks = <&k3_clks 354 0>;
+ assigned-clock-parents = <&k3_clks 354 4>;
+ };
+
+ watchdog7: watchdog@2270000 {
+ compatible = "ti,j7-rti-wdt";
+ reg = <0x00 0x2270000 0x00 0x100>;
+ clocks = <&k3_clks 355 0>;
+ power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>;
+ assigned-clocks = <&k3_clks 355 0>;
+ assigned-clock-parents = <&k3_clks 355 4>;
};
pcie2_rc: pcie@2920000 {
@@ -113,6 +136,19 @@ serdes2: serdes@5020000 {
status = "disabled";
};
};
+
+ c71_3: dsp@67800000 {
+ compatible = "ti,j721s2-c71-dsp";
+ reg = <0x00 0x67800000 0x00 0x00080000>,
+ <0x00 0x67e00000 0x00 0x0000c000>;
+ reg-names = "l2sram", "l1dram";
+ resets = <&k3_reset 40 1>;
+ firmware-name = "j784s4-c71_3-fw";
+ ti,sci = <&sms>;
+ ti,sci-dev-id = <40>;
+ ti,sci-proc-ids = <0x33 0xff>;
+ status = "disabled";
+ };
};
&scm_conf {
diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c
index 6e93f78de79b..04a23a497f20 100644
--- a/arch/arm64/mm/gcs.c
+++ b/arch/arm64/mm/gcs.c
@@ -199,8 +199,8 @@ int arch_set_shadow_stack_status(struct task_struct *task, unsigned long arg)
size = gcs_size(0);
gcs = alloc_gcs(0, size);
- if (!gcs)
- return -ENOMEM;
+ if (IS_ERR_VALUE(gcs))
+ return gcs;
task->thread.gcspr_el0 = gcs + size - sizeof(u64);
task->thread.gcs_base = gcs;
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index b6eb7a465ad2..1d657bd3ce65 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -2951,7 +2951,7 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
u64 plt_target = 0ULL;
bool poking_bpf_entry;
- if (!__bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
+ if (!bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
/* Only poking bpf text is supported. Since kernel function
* entry is set up by ftrace, we reply on ftrace to poke kernel
* functions.
diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
index d1d5a65308b9..3b63bc5b99d9 100644
--- a/arch/loongarch/net/bpf_jit.c
+++ b/arch/loongarch/net/bpf_jit.c
@@ -1319,7 +1319,7 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
/* Only poking bpf text is supported. Since kernel function entry
* is set up by ftrace, we rely on ftrace to poke kernel functions.
*/
- if (!__bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
+ if (!bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
return -ENOTSUPP;
image = ip - offset;
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b88b97139fa8..d87db7c535ea 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1408,7 +1408,6 @@ config CPU_LOONGSON32
select CPU_MIPS32
select CPU_MIPSR2
select CPU_HAS_PREFETCH
- select CPU_HAS_LOAD_STORE_LR
select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_CPUFREQ
diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
index 7f1c136ad850..59833210542f 100644
--- a/arch/mips/kernel/relocate.c
+++ b/arch/mips/kernel/relocate.c
@@ -420,7 +420,20 @@ void *__init relocate_kernel(void)
goto out;
/* The current thread is now within the relocated image */
+#ifndef CONFIG_CC_IS_CLANG
__current_thread_info = RELOCATED(&init_thread_union);
+#else
+ /*
+ * LLVM may wrongly restore $gp ($28) in epilog even if it's
+ * intentionally modified. Work around this by using inline
+ * assembly to assign $gp. $gp couldn't be listed as output or
+ * clobber, or LLVM will still restore its original value.
+ * See also LLVM upstream issue
+ * https://github.com/llvm/llvm-project/issues/176546
+ */
+ asm volatile("move $28, %0" : :
+ "r" (RELOCATED(&init_thread_union)));
+#endif
/* Return the new kernel's entry point */
kernel_entry = RELOCATED(start_kernel);
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 5e34611de9ef..b7ebb4ac2c71 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -289,6 +289,8 @@ void eeh_pe_dev_traverse(struct eeh_pe *root,
void eeh_pe_restore_bars(struct eeh_pe *pe);
const char *eeh_pe_loc_get(struct eeh_pe *pe);
struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe);
+const char *eeh_pe_loc_get_bus(struct pci_bus *bus);
+struct pci_bus *eeh_pe_bus_get_nolock(struct eeh_pe *pe);
void eeh_show_enabled(void);
int __init eeh_init(struct eeh_ops *ops);
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index dab63b82a8d4..f2009d7c8cfa 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -134,7 +134,6 @@ static __always_inline void kuap_assert_locked(void)
static __always_inline void allow_read_from_user(const void __user *from, unsigned long size)
{
- barrier_nospec();
allow_user_access(NULL, from, size, KUAP_READ);
}
@@ -146,7 +145,6 @@ static __always_inline void allow_write_to_user(void __user *to, unsigned long s
static __always_inline void allow_read_write_user(void __user *to, const void __user *from,
unsigned long size)
{
- barrier_nospec();
allow_user_access(to, from, size, KUAP_READ_WRITE);
}
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index 784a00e681fa..3e622e647d62 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -301,6 +301,7 @@ do { \
__typeof__(sizeof(*(ptr))) __gu_size = sizeof(*(ptr)); \
\
might_fault(); \
+ barrier_nospec(); \
allow_read_from_user(__gu_addr, __gu_size); \
__get_user_size_allowed(__gu_val, __gu_addr, __gu_size, __gu_err); \
prevent_read_from_user(__gu_addr, __gu_size); \
@@ -329,6 +330,7 @@ raw_copy_in_user(void __user *to, const void __user *from, unsigned long n)
{
unsigned long ret;
+ barrier_nospec();
allow_read_write_user(to, from, n);
ret = __copy_tofrom_user(to, from, n);
prevent_read_write_user(to, from, n);
@@ -415,6 +417,7 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt
might_fault();
+ barrier_nospec();
allow_read_write_user((void __user *)ptr, ptr, len);
return true;
}
@@ -431,6 +434,7 @@ user_read_access_begin(const void __user *ptr, size_t len)
might_fault();
+ barrier_nospec();
allow_read_from_user(ptr, len);
return true;
}
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index ef78ff77cf8f..028f69158532 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -846,7 +846,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
pci_lock_rescan_remove();
- bus = eeh_pe_bus_get(pe);
+ bus = eeh_pe_bus_get_nolock(pe);
if (!bus) {
pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",
__func__, pe->phb->global_number, pe->addr);
@@ -886,14 +886,15 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
/* Log the event */
if (pe->type & EEH_PE_PHB) {
pr_err("EEH: Recovering PHB#%x, location: %s\n",
- pe->phb->global_number, eeh_pe_loc_get(pe));
+ pe->phb->global_number, eeh_pe_loc_get_bus(bus));
} else {
struct eeh_pe *phb_pe = eeh_phb_pe_get(pe->phb);
pr_err("EEH: Recovering PHB#%x-PE#%x\n",
pe->phb->global_number, pe->addr);
pr_err("EEH: PE location: %s, PHB location: %s\n",
- eeh_pe_loc_get(pe), eeh_pe_loc_get(phb_pe));
+ eeh_pe_loc_get_bus(bus),
+ eeh_pe_loc_get_bus(eeh_pe_bus_get_nolock(phb_pe)));
}
#ifdef CONFIG_STACKTRACE
@@ -1098,7 +1099,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS, true);
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
- bus = eeh_pe_bus_get(pe);
+ bus = eeh_pe_bus_get_nolock(pe);
if (bus)
pci_hp_remove_devices(bus);
else
@@ -1222,7 +1223,7 @@ void eeh_handle_special_event(void)
(phb_pe->state & EEH_PE_RECOVERING))
continue;
- bus = eeh_pe_bus_get(phb_pe);
+ bus = eeh_pe_bus_get_nolock(phb_pe);
if (!bus) {
pr_err("%s: Cannot find PCI bus for "
"PHB#%x-PE#%x\n",
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index e740101fadf3..040e8f69a4aa 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -812,6 +812,24 @@ void eeh_pe_restore_bars(struct eeh_pe *pe)
const char *eeh_pe_loc_get(struct eeh_pe *pe)
{
struct pci_bus *bus = eeh_pe_bus_get(pe);
+ return eeh_pe_loc_get_bus(bus);
+}
+
+/**
+ * eeh_pe_loc_get_bus - Retrieve location code binding to the given PCI bus
+ * @bus: PCI bus
+ *
+ * Retrieve the location code associated with the given PCI bus. If the bus
+ * is a root bus, the location code is fetched from the PHB device tree node
+ * or root port. Otherwise, the location code is obtained from the device
+ * tree node of the upstream bridge of the bus. The function walks up the
+ * bus hierarchy if necessary, checking each node for the appropriate
+ * location code property ("ibm,io-base-loc-code" for root buses,
+ * "ibm,slot-location-code" for others). If no location code is found,
+ * returns "N/A".
+ */
+const char *eeh_pe_loc_get_bus(struct pci_bus *bus)
+{
struct device_node *dn;
const char *loc = NULL;
@@ -838,8 +856,9 @@ const char *eeh_pe_loc_get(struct eeh_pe *pe)
}
/**
- * eeh_pe_bus_get - Retrieve PCI bus according to the given PE
+ * _eeh_pe_bus_get - Retrieve PCI bus according to the given PE
* @pe: EEH PE
+ * @do_lock: Is the caller already held the pci_lock_rescan_remove?
*
* Retrieve the PCI bus according to the given PE. Basically,
* there're 3 types of PEs: PHB/Bus/Device. For PHB PE, the
@@ -847,7 +866,7 @@ const char *eeh_pe_loc_get(struct eeh_pe *pe)
* returned for BUS PE. However, we don't have associated PCI
* bus for DEVICE PE.
*/
-struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
+static struct pci_bus *_eeh_pe_bus_get(struct eeh_pe *pe, bool do_lock)
{
struct eeh_dev *edev;
struct pci_dev *pdev;
@@ -862,11 +881,58 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
/* Retrieve the parent PCI bus of first (top) PCI device */
edev = list_first_entry_or_null(&pe->edevs, struct eeh_dev, entry);
- pci_lock_rescan_remove();
+ if (do_lock)
+ pci_lock_rescan_remove();
pdev = eeh_dev_to_pci_dev(edev);
if (pdev)
bus = pdev->bus;
- pci_unlock_rescan_remove();
+ if (do_lock)
+ pci_unlock_rescan_remove();
return bus;
}
+
+/**
+ * eeh_pe_bus_get - Retrieve PCI bus associated with the given EEH PE, locking
+ * if needed
+ * @pe: Pointer to the EEH PE
+ *
+ * This function is a wrapper around _eeh_pe_bus_get(), which retrieves the PCI
+ * bus associated with the provided EEH PE structure. It acquires the PCI
+ * rescans lock to ensure safe access to shared data during the retrieval
+ * process. This function should be used when the caller requires the PCI bus
+ * while holding the rescan/remove lock, typically during operations that modify
+ * or inspect PCIe device state in a safe manner.
+ *
+ * RETURNS:
+ * A pointer to the PCI bus associated with the EEH PE, or NULL if none found.
+ */
+
+struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
+{
+ return _eeh_pe_bus_get(pe, true);
+}
+
+/**
+ * eeh_pe_bus_get_nolock - Retrieve PCI bus associated with the given EEH PE
+ * without locking
+ * @pe: Pointer to the EEH PE
+ *
+ * This function is a variant of _eeh_pe_bus_get() that retrieves the PCI bus
+ * associated with the specified EEH PE without acquiring the
+ * pci_lock_rescan_remove lock. It should only be used when the caller can
+ * guarantee safe access to PE structures without the need for that lock,
+ * typically in contexts where the lock is already held locking is otherwise
+ * managed.
+ *
+ * RETURNS:
+ * pointer to the PCI bus associated with the EEH PE, or NULL if none is found.
+ *
+ * NOTE:
+ * Use this function carefully to avoid race conditions and data corruption.
+ */
+
+struct pci_bus *eeh_pe_bus_get_nolock(struct eeh_pe *pe)
+{
+ return _eeh_pe_bus_get(pe, false);
+}
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 5e976730b2f5..e199976e410a 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -1122,7 +1122,7 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
bpf_func = (unsigned long)ip;
/* We currently only support poking bpf programs */
- if (!__bpf_address_lookup(bpf_func, &size, &offset, name)) {
+ if (!bpf_address_lookup(bpf_func, &size, &offset, name)) {
pr_err("%s (0x%lx): kernel/modules are not supported\n", __func__, bpf_func);
return -EOPNOTSUPP;
}
diff --git a/arch/riscv/boot/dts/sophgo/cv180x.dtsi b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
index 1b2b1969a648..06b0ce5a2db7 100644
--- a/arch/riscv/boot/dts/sophgo/cv180x.dtsi
+++ b/arch/riscv/boot/dts/sophgo/cv180x.dtsi
@@ -438,8 +438,8 @@ usb: usb@4340000 {
clocks = <&clk CLK_AXI4_USB>, <&clk CLK_APB_USB>;
clock-names = "otg", "utmi";
g-np-tx-fifo-size = <32>;
- g-rx-fifo-size = <536>;
- g-tx-fifo-size = <768 512 512 384 128 128>;
+ g-rx-fifo-size = <1536>;
+ g-tx-fifo-size = <128 128 64 64 64 64 32 32>;
interrupts = <SOC_PERIPHERAL_IRQ(14) IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbphy>;
phy-names = "usb2-phy";
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 0e5fad5f06ca..783be50f38f2 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -275,6 +275,7 @@ config S390
select SPARSE_IRQ
select SWIOTLB
select SYSCTL_EXCEPTION_TRACE
+ select SYSTEM_DATA_VERIFICATION if KEXEC_SIG
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
select TTY
@@ -301,7 +302,7 @@ config ARCH_SUPPORTS_KEXEC_FILE
def_bool y
config ARCH_SUPPORTS_KEXEC_SIG
- def_bool MODULE_SIG_FORMAT
+ def_bool y
config ARCH_SUPPORTS_KEXEC_PURGATORY
def_bool y
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 576baa9a52c5..af1329ae9f82 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -3073,8 +3073,8 @@ void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap)
cap->version = x86_pmu.version;
cap->num_counters_gp = x86_pmu_num_counters(NULL);
cap->num_counters_fixed = x86_pmu_num_counters_fixed(NULL);
- cap->bit_width_gp = x86_pmu.cntval_bits;
- cap->bit_width_fixed = x86_pmu.cntval_bits;
+ cap->bit_width_gp = cap->num_counters_gp ? x86_pmu.cntval_bits : 0;
+ cap->bit_width_fixed = cap->num_counters_fixed ? x86_pmu.cntval_bits : 0;
cap->events_mask = (unsigned int)x86_pmu.events_maskl;
cap->events_mask_len = x86_pmu.events_mask_len;
cap->pebs_ept = x86_pmu.pebs_ept;
diff --git a/arch/x86/hyperv/hv_crash.c b/arch/x86/hyperv/hv_crash.c
index c0e22921ace1..a78e4fed5720 100644
--- a/arch/x86/hyperv/hv_crash.c
+++ b/arch/x86/hyperv/hv_crash.c
@@ -628,7 +628,9 @@ void hv_root_crash_init(void)
if (rc)
goto err_out;
+#ifdef CONFIG_SMP
smp_ops.crash_stop_other_cpus = hv_crash_stop_other_cpus;
+#endif
crash_kexec_post_notifiers = true;
hv_crash_enabled = true;
diff --git a/arch/x86/hyperv/hv_vtl.c b/arch/x86/hyperv/hv_vtl.c
index c0edaed0efb3..9b6a9bc4ab76 100644
--- a/arch/x86/hyperv/hv_vtl.c
+++ b/arch/x86/hyperv/hv_vtl.c
@@ -110,7 +110,7 @@ static void hv_vtl_ap_entry(void)
static int hv_vtl_bringup_vcpu(u32 target_vp_index, int cpu, u64 eip_ignored)
{
- u64 status;
+ u64 status, rsp, rip;
int ret = 0;
struct hv_enable_vp_vtl *input;
unsigned long irq_flags;
@@ -123,9 +123,11 @@ static int hv_vtl_bringup_vcpu(u32 target_vp_index, int cpu, u64 eip_ignored)
struct desc_struct *gdt;
struct task_struct *idle = idle_thread_get(cpu);
- u64 rsp = (unsigned long)idle->thread.sp;
+ if (IS_ERR(idle))
+ return PTR_ERR(idle);
- u64 rip = (u64)&hv_vtl_ap_entry;
+ rsp = (unsigned long)idle->thread.sp;
+ rip = (u64)&hv_vtl_ap_entry;
native_store_gdt(&gdt_ptr);
store_idt(&idt_ptr);
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index b08c95872eed..c56e1e63b893 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -57,7 +57,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
}
#define arch_ftrace_partial_regs(regs) do { \
- regs->flags &= ~X86_EFLAGS_FIXED; \
+ regs->flags |= X86_EFLAGS_FIXED; \
regs->cs = __KERNEL_CS; \
} while (0)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index bc94ff1e250a..86059f2c0fcd 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -951,26 +951,14 @@ static void init_amd_zen1(struct cpuinfo_x86 *c)
}
}
-static bool cpu_has_zenbleed_microcode(void)
-{
- u32 good_rev = 0;
-
- switch (boot_cpu_data.x86_model) {
- case 0x30 ... 0x3f: good_rev = 0x0830107b; break;
- case 0x60 ... 0x67: good_rev = 0x0860010c; break;
- case 0x68 ... 0x6f: good_rev = 0x08608107; break;
- case 0x70 ... 0x7f: good_rev = 0x08701033; break;
- case 0xa0 ... 0xaf: good_rev = 0x08a00009; break;
-
- default:
- return false;
- }
-
- if (boot_cpu_data.microcode < good_rev)
- return false;
-
- return true;
-}
+static const struct x86_cpu_id amd_zenbleed_microcode[] = {
+ ZEN_MODEL_STEP_UCODE(0x17, 0x31, 0x0, 0x0830107b),
+ ZEN_MODEL_STEP_UCODE(0x17, 0x60, 0x1, 0x0860010c),
+ ZEN_MODEL_STEP_UCODE(0x17, 0x68, 0x1, 0x08608107),
+ ZEN_MODEL_STEP_UCODE(0x17, 0x71, 0x0, 0x08701033),
+ ZEN_MODEL_STEP_UCODE(0x17, 0xa0, 0x0, 0x08a00009),
+ {}
+};
static void zen2_zenbleed_check(struct cpuinfo_x86 *c)
{
@@ -980,7 +968,7 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c)
if (!cpu_has(c, X86_FEATURE_AVX))
return;
- if (!cpu_has_zenbleed_microcode()) {
+ if (!x86_match_min_microcode_rev(amd_zenbleed_microcode)) {
pr_notice_once("Zenbleed: please update your microcode for the most optimal fix\n");
msr_set_bit(MSR_AMD64_DE_CFG, MSR_AMD64_DE_CFG_ZEN2_FP_BACKUP_FIX_BIT);
} else {
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index a132608265f6..62c1c93aa1c6 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -364,6 +364,9 @@ SYM_CODE_START(return_to_handler)
UNWIND_HINT_UNDEFINED
ANNOTATE_NOENDBR
+ /* Store original rsp for pt_regs.sp value. */
+ movq %rsp, %rdi
+
/* Restore return_to_handler value that got eaten by previous ret instruction. */
subq $8, %rsp
UNWIND_HINT_FUNC
@@ -374,7 +377,7 @@ SYM_CODE_START(return_to_handler)
movq %rax, RAX(%rsp)
movq %rdx, RDX(%rsp)
movq %rbp, RBP(%rsp)
- movq %rsp, RSP(%rsp)
+ movq %rdi, RSP(%rsp)
movq %rsp, %rdi
call ftrace_return_to_handler
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 53282dc7d5ac..23b91bf9b663 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -470,7 +470,7 @@ int __init arch_xen_unpopulated_init(struct resource **res)
* driver to know how much of the physmap is unpopulated and
* set an accurate initial memory target.
*/
- xen_released_pages += xen_extra_mem[i].n_pfns;
+ xen_unpopulated_pages += xen_extra_mem[i].n_pfns;
/* Zero so region is not also added to the balloon driver. */
xen_extra_mem[i].n_pfns = 0;
}
diff --git a/block/ioctl.c b/block/ioctl.c
index 344478348a54..337e4c3b65b2 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -318,7 +318,13 @@ int blkdev_compat_ptr_ioctl(struct block_device *bdev, blk_mode_t mode,
EXPORT_SYMBOL(blkdev_compat_ptr_ioctl);
#endif
-static bool blkdev_pr_allowed(struct block_device *bdev, blk_mode_t mode)
+enum pr_direction {
+ PR_IN, /* read from device */
+ PR_OUT, /* write to device */
+};
+
+static bool blkdev_pr_allowed(struct block_device *bdev, blk_mode_t mode,
+ enum pr_direction dir)
{
/* no sense to make reservations for partitions */
if (bdev_is_partition(bdev))
@@ -326,11 +332,17 @@ static bool blkdev_pr_allowed(struct block_device *bdev, blk_mode_t mode)
if (capable(CAP_SYS_ADMIN))
return true;
+
/*
- * Only allow unprivileged reservations if the file descriptor is open
- * for writing.
+ * Only allow unprivileged reservation _out_ commands if the file
+ * descriptor is open for writing. Allow reservation _in_ commands if
+ * the file descriptor is open for reading since they do not modify the
+ * device.
*/
- return mode & BLK_OPEN_WRITE;
+ if (dir == PR_IN)
+ return mode & BLK_OPEN_READ;
+ else
+ return mode & BLK_OPEN_WRITE;
}
static int blkdev_pr_register(struct block_device *bdev, blk_mode_t mode,
@@ -339,7 +351,7 @@ static int blkdev_pr_register(struct block_device *bdev, blk_mode_t mode,
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
struct pr_registration reg;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_OUT))
return -EPERM;
if (!ops || !ops->pr_register)
return -EOPNOTSUPP;
@@ -357,7 +369,7 @@ static int blkdev_pr_reserve(struct block_device *bdev, blk_mode_t mode,
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
struct pr_reservation rsv;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_OUT))
return -EPERM;
if (!ops || !ops->pr_reserve)
return -EOPNOTSUPP;
@@ -375,7 +387,7 @@ static int blkdev_pr_release(struct block_device *bdev, blk_mode_t mode,
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
struct pr_reservation rsv;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_OUT))
return -EPERM;
if (!ops || !ops->pr_release)
return -EOPNOTSUPP;
@@ -393,7 +405,7 @@ static int blkdev_pr_preempt(struct block_device *bdev, blk_mode_t mode,
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
struct pr_preempt p;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_OUT))
return -EPERM;
if (!ops || !ops->pr_preempt)
return -EOPNOTSUPP;
@@ -411,7 +423,7 @@ static int blkdev_pr_clear(struct block_device *bdev, blk_mode_t mode,
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
struct pr_clear c;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_OUT))
return -EPERM;
if (!ops || !ops->pr_clear)
return -EOPNOTSUPP;
@@ -434,7 +446,7 @@ static int blkdev_pr_read_keys(struct block_device *bdev, blk_mode_t mode,
size_t keys_copy_len;
int ret;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_IN))
return -EPERM;
if (!ops || !ops->pr_read_keys)
return -EOPNOTSUPP;
@@ -486,7 +498,7 @@ static int blkdev_pr_read_reservation(struct block_device *bdev,
struct pr_read_reservation out = {};
int ret;
- if (!blkdev_pr_allowed(bdev, mode))
+ if (!blkdev_pr_allowed(bdev, mode, PR_IN))
return -EPERM;
if (!ops || !ops->pr_read_reservation)
return -EOPNOTSUPP;
diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
index 42d876a427c5..37d05f2e986f 100644
--- a/drivers/accel/amdxdna/aie2_ctx.c
+++ b/drivers/accel/amdxdna/aie2_ctx.c
@@ -47,17 +47,6 @@ static void aie2_job_put(struct amdxdna_sched_job *job)
kref_put(&job->refcnt, aie2_job_release);
}
-static void aie2_hwctx_status_shift_stop(struct amdxdna_hwctx *hwctx)
-{
- hwctx->old_status = hwctx->status;
- hwctx->status = HWCTX_STAT_STOP;
-}
-
-static void aie2_hwctx_status_restore(struct amdxdna_hwctx *hwctx)
-{
- hwctx->status = hwctx->old_status;
-}
-
/* The bad_job is used in aie2_sched_job_timedout, otherwise, set it to NULL */
static void aie2_hwctx_stop(struct amdxdna_dev *xdna, struct amdxdna_hwctx *hwctx,
struct drm_sched_job *bad_job)
@@ -84,11 +73,6 @@ static int aie2_hwctx_restart(struct amdxdna_dev *xdna, struct amdxdna_hwctx *hw
goto out;
}
- if (hwctx->status != HWCTX_STAT_READY) {
- XDNA_DBG(xdna, "hwctx is not ready, status %d", hwctx->status);
- goto out;
- }
-
ret = aie2_config_cu(hwctx, NULL);
if (ret) {
XDNA_ERR(xdna, "Config cu failed, ret %d", ret);
@@ -140,7 +124,6 @@ static int aie2_hwctx_suspend_cb(struct amdxdna_hwctx *hwctx, void *arg)
aie2_hwctx_wait_for_idle(hwctx);
aie2_hwctx_stop(xdna, hwctx, NULL);
- aie2_hwctx_status_shift_stop(hwctx);
return 0;
}
@@ -162,7 +145,6 @@ static int aie2_hwctx_resume_cb(struct amdxdna_hwctx *hwctx, void *arg)
{
struct amdxdna_dev *xdna = hwctx->client->xdna;
- aie2_hwctx_status_restore(hwctx);
return aie2_hwctx_restart(xdna, hwctx);
}
@@ -292,7 +274,7 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
ret = -EINVAL;
goto out;
}
- amdxdna_cmd_set_state(cmd_abo, fail_cmd_status);
+ amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {
struct amdxdna_cmd_chain *cc = amdxdna_cmd_get_payload(cmd_abo, NULL);
@@ -315,12 +297,19 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
struct dma_fence *fence;
int ret;
+ if (!hwctx->priv->mbox_chann)
+ return NULL;
+
if (!mmget_not_zero(job->mm))
return ERR_PTR(-ESRCH);
kref_get(&job->refcnt);
fence = dma_fence_get(job->fence);
+ ret = amdxdna_pm_resume_get(hwctx->client->xdna);
+ if (ret)
+ goto out;
+
if (job->drv_cmd) {
switch (job->drv_cmd->opcode) {
case SYNC_DEBUG_BO:
@@ -347,6 +336,7 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
out:
if (ret) {
+ amdxdna_pm_suspend_put(hwctx->client->xdna);
dma_fence_put(job->fence);
aie2_job_put(job);
mmput(job->mm);
@@ -468,6 +458,12 @@ static int aie2_alloc_resource(struct amdxdna_hwctx *hwctx)
struct alloc_requests *xrs_req;
int ret;
+ if (AIE2_FEATURE_ON(xdna->dev_handle, AIE2_TEMPORAL_ONLY)) {
+ hwctx->num_unused_col = xdna->dev_handle->total_col - hwctx->num_col;
+ hwctx->num_col = xdna->dev_handle->total_col;
+ return aie2_create_context(xdna->dev_handle, hwctx);
+ }
+
xrs_req = kzalloc(sizeof(*xrs_req), GFP_KERNEL);
if (!xrs_req)
return -ENOMEM;
@@ -499,9 +495,15 @@ static void aie2_release_resource(struct amdxdna_hwctx *hwctx)
struct amdxdna_dev *xdna = hwctx->client->xdna;
int ret;
- ret = xrs_release_resource(xdna->xrs_hdl, (uintptr_t)hwctx);
- if (ret)
- XDNA_ERR(xdna, "Release AIE resource failed, ret %d", ret);
+ if (AIE2_FEATURE_ON(xdna->dev_handle, AIE2_TEMPORAL_ONLY)) {
+ ret = aie2_destroy_context(xdna->dev_handle, hwctx);
+ if (ret)
+ XDNA_ERR(xdna, "Destroy temporal only context failed, ret %d", ret);
+ } else {
+ ret = xrs_release_resource(xdna->xrs_hdl, (uintptr_t)hwctx);
+ if (ret)
+ XDNA_ERR(xdna, "Release AIE resource failed, ret %d", ret);
+ }
}
static int aie2_ctx_syncobj_create(struct amdxdna_hwctx *hwctx)
@@ -651,7 +653,6 @@ int aie2_hwctx_init(struct amdxdna_hwctx *hwctx)
}
amdxdna_pm_suspend_put(xdna);
- hwctx->status = HWCTX_STAT_INIT;
init_waitqueue_head(&priv->job_free_wq);
XDNA_DBG(xdna, "hwctx %s init completed", hwctx->name);
@@ -693,7 +694,9 @@ void aie2_hwctx_fini(struct amdxdna_hwctx *hwctx)
aie2_hwctx_wait_for_idle(hwctx);
/* Request fw to destroy hwctx and cancel the rest pending requests */
+ drm_sched_stop(&hwctx->priv->sched, NULL);
aie2_release_resource(hwctx);
+ drm_sched_start(&hwctx->priv->sched, 0);
mutex_unlock(&xdna->dev_lock);
drm_sched_entity_destroy(&hwctx->priv->entity);
@@ -737,7 +740,7 @@ static int aie2_hwctx_cu_config(struct amdxdna_hwctx *hwctx, void *buf, u32 size
if (XDNA_MBZ_DBG(xdna, config->pad, sizeof(config->pad)))
return -EINVAL;
- if (hwctx->status != HWCTX_STAT_INIT) {
+ if (hwctx->cus) {
XDNA_ERR(xdna, "Not support re-config CU");
return -EINVAL;
}
@@ -768,7 +771,6 @@ static int aie2_hwctx_cu_config(struct amdxdna_hwctx *hwctx, void *buf, u32 size
}
wmb(); /* To avoid locking in command submit when check status */
- hwctx->status = HWCTX_STAT_READY;
return 0;
@@ -991,15 +993,11 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
goto free_chain;
}
- ret = amdxdna_pm_resume_get(xdna);
- if (ret)
- goto cleanup_job;
-
retry:
ret = drm_gem_lock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
if (ret) {
XDNA_WARN(xdna, "Failed to lock BOs, ret %d", ret);
- goto suspend_put;
+ goto cleanup_job;
}
for (i = 0; i < job->bo_cnt; i++) {
@@ -1007,7 +1005,7 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
if (ret) {
XDNA_WARN(xdna, "Failed to reserve fences %d", ret);
drm_gem_unlock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
- goto suspend_put;
+ goto cleanup_job;
}
}
@@ -1022,12 +1020,12 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
} else if (time_after(jiffies, timeout)) {
ret = -ETIME;
- goto suspend_put;
+ goto cleanup_job;
}
ret = aie2_populate_range(abo);
if (ret)
- goto suspend_put;
+ goto cleanup_job;
goto retry;
}
}
@@ -1053,8 +1051,6 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
return 0;
-suspend_put:
- amdxdna_pm_suspend_put(xdna);
cleanup_job:
drm_sched_job_cleanup(&job->base);
free_chain:
diff --git a/drivers/accel/amdxdna/aie2_message.c b/drivers/accel/amdxdna/aie2_message.c
index d493bb1c3360..2c5b27d90563 100644
--- a/drivers/accel/amdxdna/aie2_message.c
+++ b/drivers/accel/amdxdna/aie2_message.c
@@ -39,7 +39,6 @@ static int aie2_send_mgmt_msg_wait(struct amdxdna_dev_hdl *ndev,
if (!ndev->mgmt_chann)
return -ENODEV;
- drm_WARN_ON(&xdna->ddev, xdna->rpm_on && !mutex_is_locked(&xdna->dev_lock));
ret = xdna_send_msg_wait(xdna, ndev->mgmt_chann, msg);
if (ret == -ETIME) {
xdna_mailbox_stop_channel(ndev->mgmt_chann);
@@ -186,6 +185,19 @@ int aie2_query_firmware_version(struct amdxdna_dev_hdl *ndev,
return 0;
}
+static int aie2_destroy_context_req(struct amdxdna_dev_hdl *ndev, u32 id)
+{
+ DECLARE_AIE2_MSG(destroy_ctx, MSG_OP_DESTROY_CONTEXT);
+ struct amdxdna_dev *xdna = ndev->xdna;
+ int ret;
+
+ req.context_id = id;
+ ret = aie2_send_mgmt_msg_wait(ndev, &msg);
+ if (ret)
+ XDNA_WARN(xdna, "Destroy context failed, ret %d", ret);
+
+ return ret;
+}
int aie2_create_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwctx)
{
DECLARE_AIE2_MSG(create_ctx, MSG_OP_CREATE_CONTEXT);
@@ -199,6 +211,7 @@ int aie2_create_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwct
req.aie_type = 1;
req.start_col = hwctx->start_col;
req.num_col = hwctx->num_col;
+ req.num_unused_col = hwctx->num_unused_col;
req.num_cq_pairs_requested = 1;
req.pasid = hwctx->client->pasid;
req.context_priority = 2;
@@ -208,13 +221,14 @@ int aie2_create_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwct
return ret;
hwctx->fw_ctx_id = resp.context_id;
- WARN_ONCE(hwctx->fw_ctx_id == -1, "Unexpected context id");
+ if (WARN_ON_ONCE(hwctx->fw_ctx_id == -1))
+ return -EINVAL;
if (ndev->force_preempt_enabled) {
ret = aie2_runtime_cfg(ndev, AIE2_RT_CFG_FORCE_PREEMPT, &hwctx->fw_ctx_id);
if (ret) {
XDNA_ERR(xdna, "failed to enable force preempt %d", ret);
- return ret;
+ goto del_ctx_req;
}
}
@@ -231,51 +245,39 @@ int aie2_create_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwct
ret = pci_irq_vector(to_pci_dev(xdna->ddev.dev), resp.msix_id);
if (ret == -EINVAL) {
- XDNA_ERR(xdna, "not able to create channel");
- goto out_destroy_context;
+ XDNA_ERR(xdna, "Alloc IRQ failed %d", ret);
+ goto del_ctx_req;
}
intr_reg = i2x.mb_head_ptr_reg + 4;
hwctx->priv->mbox_chann = xdna_mailbox_create_channel(ndev->mbox, &x2i, &i2x,
intr_reg, ret);
if (!hwctx->priv->mbox_chann) {
- XDNA_ERR(xdna, "not able to create channel");
+ XDNA_ERR(xdna, "Not able to create channel");
ret = -EINVAL;
- goto out_destroy_context;
+ goto del_ctx_req;
}
ndev->hwctx_num++;
- XDNA_DBG(xdna, "%s mailbox channel irq: %d, msix_id: %d",
- hwctx->name, ret, resp.msix_id);
- XDNA_DBG(xdna, "%s created fw ctx %d pasid %d", hwctx->name,
- hwctx->fw_ctx_id, hwctx->client->pasid);
+ XDNA_DBG(xdna, "Mailbox channel irq: %d, msix_id: %d", ret, resp.msix_id);
+ XDNA_DBG(xdna, "Created fw ctx %d pasid %d", hwctx->fw_ctx_id, hwctx->client->pasid);
return 0;
-out_destroy_context:
- aie2_destroy_context(ndev, hwctx);
+del_ctx_req:
+ aie2_destroy_context_req(ndev, hwctx->fw_ctx_id);
return ret;
}
int aie2_destroy_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwctx)
{
- DECLARE_AIE2_MSG(destroy_ctx, MSG_OP_DESTROY_CONTEXT);
struct amdxdna_dev *xdna = ndev->xdna;
int ret;
- if (hwctx->fw_ctx_id == -1)
- return 0;
-
xdna_mailbox_stop_channel(hwctx->priv->mbox_chann);
-
- req.context_id = hwctx->fw_ctx_id;
- ret = aie2_send_mgmt_msg_wait(ndev, &msg);
- if (ret)
- XDNA_WARN(xdna, "%s destroy context failed, ret %d", hwctx->name, ret);
-
+ ret = aie2_destroy_context_req(ndev, hwctx->fw_ctx_id);
xdna_mailbox_destroy_channel(hwctx->priv->mbox_chann);
- XDNA_DBG(xdna, "%s destroyed fw ctx %d", hwctx->name,
- hwctx->fw_ctx_id);
+ XDNA_DBG(xdna, "Destroyed fw ctx %d", hwctx->fw_ctx_id);
hwctx->priv->mbox_chann = NULL;
hwctx->fw_ctx_id = -1;
ndev->hwctx_num--;
@@ -448,6 +450,9 @@ int aie2_config_cu(struct amdxdna_hwctx *hwctx,
if (!chann)
return -ENODEV;
+ if (!hwctx->cus)
+ return 0;
+
if (hwctx->cus->num_cus > MAX_NUM_CUS) {
XDNA_DBG(xdna, "Exceed maximum CU %d", MAX_NUM_CUS);
return -EINVAL;
@@ -646,6 +651,7 @@ aie2_cmdlist_fill_npu_cf(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *siz
u32 cmd_len;
void *cmd;
+ memset(npu_slot, 0, sizeof(*npu_slot));
cmd = amdxdna_cmd_get_payload(cmd_bo, &cmd_len);
if (*size < sizeof(*npu_slot) + cmd_len)
return -EINVAL;
@@ -654,7 +660,6 @@ aie2_cmdlist_fill_npu_cf(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *siz
if (npu_slot->cu_idx == INVALID_CU_IDX)
return -EINVAL;
- memset(npu_slot, 0, sizeof(*npu_slot));
npu_slot->type = EXEC_NPU_TYPE_NON_ELF;
npu_slot->arg_cnt = cmd_len / sizeof(u32);
memcpy(npu_slot->args, cmd, cmd_len);
@@ -671,6 +676,7 @@ aie2_cmdlist_fill_npu_dpu(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *si
u32 cmd_len;
u32 arg_sz;
+ memset(npu_slot, 0, sizeof(*npu_slot));
sn = amdxdna_cmd_get_payload(cmd_bo, &cmd_len);
arg_sz = cmd_len - sizeof(*sn);
if (cmd_len < sizeof(*sn) || arg_sz > MAX_NPU_ARGS_SIZE)
@@ -683,7 +689,6 @@ aie2_cmdlist_fill_npu_dpu(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *si
if (npu_slot->cu_idx == INVALID_CU_IDX)
return -EINVAL;
- memset(npu_slot, 0, sizeof(*npu_slot));
npu_slot->type = EXEC_NPU_TYPE_PARTIAL_ELF;
npu_slot->inst_buf_addr = sn->buffer;
npu_slot->inst_size = sn->buffer_size;
@@ -703,6 +708,7 @@ aie2_cmdlist_fill_npu_preempt(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t
u32 cmd_len;
u32 arg_sz;
+ memset(npu_slot, 0, sizeof(*npu_slot));
pd = amdxdna_cmd_get_payload(cmd_bo, &cmd_len);
arg_sz = cmd_len - sizeof(*pd);
if (cmd_len < sizeof(*pd) || arg_sz > MAX_NPU_ARGS_SIZE)
@@ -715,7 +721,6 @@ aie2_cmdlist_fill_npu_preempt(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t
if (npu_slot->cu_idx == INVALID_CU_IDX)
return -EINVAL;
- memset(npu_slot, 0, sizeof(*npu_slot));
npu_slot->type = EXEC_NPU_TYPE_PREEMPT;
npu_slot->inst_buf_addr = pd->inst_buf;
npu_slot->save_buf_addr = pd->save_buf;
@@ -739,6 +744,7 @@ aie2_cmdlist_fill_npu_elf(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *si
u32 cmd_len;
u32 arg_sz;
+ memset(npu_slot, 0, sizeof(*npu_slot));
pd = amdxdna_cmd_get_payload(cmd_bo, &cmd_len);
arg_sz = cmd_len - sizeof(*pd);
if (cmd_len < sizeof(*pd) || arg_sz > MAX_NPU_ARGS_SIZE)
@@ -747,7 +753,6 @@ aie2_cmdlist_fill_npu_elf(struct amdxdna_gem_obj *cmd_bo, void *slot, size_t *si
if (*size < sizeof(*npu_slot) + arg_sz)
return -EINVAL;
- memset(npu_slot, 0, sizeof(*npu_slot));
npu_slot->type = EXEC_NPU_TYPE_ELF;
npu_slot->inst_buf_addr = pd->inst_buf;
npu_slot->save_buf_addr = pd->save_buf;
diff --git a/drivers/accel/amdxdna/aie2_msg_priv.h b/drivers/accel/amdxdna/aie2_msg_priv.h
index 1c957a6298d3..cc912b7899ce 100644
--- a/drivers/accel/amdxdna/aie2_msg_priv.h
+++ b/drivers/accel/amdxdna/aie2_msg_priv.h
@@ -112,7 +112,8 @@ struct create_ctx_req {
__u32 aie_type;
__u8 start_col;
__u8 num_col;
- __u16 reserved;
+ __u8 num_unused_col;
+ __u8 reserved;
__u8 num_cq_pairs_requested;
__u8 reserved1;
__u16 pasid;
diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c
index 8141d8e51636..ec1c3ad57d49 100644
--- a/drivers/accel/amdxdna/aie2_pci.c
+++ b/drivers/accel/amdxdna/aie2_pci.c
@@ -322,7 +322,7 @@ static int aie2_xrs_set_dft_dpm_level(struct drm_device *ddev, u32 dpm_level)
if (ndev->pw_mode != POWER_MODE_DEFAULT || ndev->dpm_level == dpm_level)
return 0;
- return ndev->priv->hw_ops.set_dpm(ndev, dpm_level);
+ return aie2_pm_set_dpm(ndev, dpm_level);
}
static struct xrs_action_ops aie2_xrs_actions = {
diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_pci.h
index a5f9c42155d1..4fdc032bc171 100644
--- a/drivers/accel/amdxdna/aie2_pci.h
+++ b/drivers/accel/amdxdna/aie2_pci.h
@@ -231,6 +231,7 @@ struct aie2_hw_ops {
enum aie2_fw_feature {
AIE2_NPU_COMMAND,
AIE2_PREEMPT,
+ AIE2_TEMPORAL_ONLY,
AIE2_FEATURE_MAX
};
@@ -285,6 +286,7 @@ int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level);
/* aie2_pm.c */
int aie2_pm_init(struct amdxdna_dev_hdl *ndev);
int aie2_pm_set_mode(struct amdxdna_dev_hdl *ndev, enum amdxdna_power_mode_type target);
+int aie2_pm_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level);
/* aie2_psp.c */
struct psp_device *aie2m_psp_create(struct drm_device *ddev, struct psp_config *conf);
diff --git a/drivers/accel/amdxdna/aie2_pm.c b/drivers/accel/amdxdna/aie2_pm.c
index 426c38fce848..579b8be13b18 100644
--- a/drivers/accel/amdxdna/aie2_pm.c
+++ b/drivers/accel/amdxdna/aie2_pm.c
@@ -10,6 +10,7 @@
#include "aie2_pci.h"
#include "amdxdna_pci_drv.h"
+#include "amdxdna_pm.h"
#define AIE2_CLK_GATING_ENABLE 1
#define AIE2_CLK_GATING_DISABLE 0
@@ -26,6 +27,22 @@ static int aie2_pm_set_clk_gating(struct amdxdna_dev_hdl *ndev, u32 val)
return 0;
}
+int aie2_pm_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
+{
+ int ret;
+
+ ret = amdxdna_pm_resume_get(ndev->xdna);
+ if (ret)
+ return ret;
+
+ ret = ndev->priv->hw_ops.set_dpm(ndev, dpm_level);
+ if (!ret)
+ ndev->dpm_level = dpm_level;
+ amdxdna_pm_suspend_put(ndev->xdna);
+
+ return ret;
+}
+
int aie2_pm_init(struct amdxdna_dev_hdl *ndev)
{
int ret;
@@ -50,6 +67,7 @@ int aie2_pm_init(struct amdxdna_dev_hdl *ndev)
ret = ndev->priv->hw_ops.set_dpm(ndev, ndev->max_dpm_level);
if (ret)
return ret;
+ ndev->dpm_level = ndev->max_dpm_level;
ret = aie2_pm_set_clk_gating(ndev, AIE2_CLK_GATING_ENABLE);
if (ret)
@@ -94,7 +112,7 @@ int aie2_pm_set_mode(struct amdxdna_dev_hdl *ndev, enum amdxdna_power_mode_type
return -EOPNOTSUPP;
}
- ret = ndev->priv->hw_ops.set_dpm(ndev, dpm_level);
+ ret = aie2_pm_set_dpm(ndev, dpm_level);
if (ret)
return ret;
diff --git a/drivers/accel/amdxdna/aie2_smu.c b/drivers/accel/amdxdna/aie2_smu.c
index bd94ee96c2bc..d8c31924e501 100644
--- a/drivers/accel/amdxdna/aie2_smu.c
+++ b/drivers/accel/amdxdna/aie2_smu.c
@@ -11,7 +11,6 @@
#include "aie2_pci.h"
#include "amdxdna_pci_drv.h"
-#include "amdxdna_pm.h"
#define SMU_RESULT_OK 1
@@ -67,16 +66,12 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
u32 freq;
int ret;
- ret = amdxdna_pm_resume_get(ndev->xdna);
- if (ret)
- return ret;
-
ret = aie2_smu_exec(ndev, AIE2_SMU_SET_MPNPUCLK_FREQ,
ndev->priv->dpm_clk_tbl[dpm_level].npuclk, &freq);
if (ret) {
XDNA_ERR(ndev->xdna, "Set npu clock to %d failed, ret %d\n",
ndev->priv->dpm_clk_tbl[dpm_level].npuclk, ret);
- goto suspend_put;
+ return ret;
}
ndev->npuclk_freq = freq;
@@ -85,12 +80,10 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
if (ret) {
XDNA_ERR(ndev->xdna, "Set h clock to %d failed, ret %d\n",
ndev->priv->dpm_clk_tbl[dpm_level].hclk, ret);
- goto suspend_put;
+ return ret;
}
- amdxdna_pm_suspend_put(ndev->xdna);
ndev->hclk_freq = freq;
- ndev->dpm_level = dpm_level;
ndev->max_tops = 2 * ndev->total_col;
ndev->curr_tops = ndev->max_tops * freq / 1028;
@@ -98,38 +91,28 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
ndev->npuclk_freq, ndev->hclk_freq);
return 0;
-
-suspend_put:
- amdxdna_pm_suspend_put(ndev->xdna);
- return ret;
}
int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
{
int ret;
- ret = amdxdna_pm_resume_get(ndev->xdna);
- if (ret)
- return ret;
-
ret = aie2_smu_exec(ndev, AIE2_SMU_SET_HARD_DPMLEVEL, dpm_level, NULL);
if (ret) {
XDNA_ERR(ndev->xdna, "Set hard dpm level %d failed, ret %d ",
dpm_level, ret);
- goto suspend_put;
+ return ret;
}
ret = aie2_smu_exec(ndev, AIE2_SMU_SET_SOFT_DPMLEVEL, dpm_level, NULL);
if (ret) {
XDNA_ERR(ndev->xdna, "Set soft dpm level %d failed, ret %d",
dpm_level, ret);
- goto suspend_put;
+ return ret;
}
- amdxdna_pm_suspend_put(ndev->xdna);
ndev->npuclk_freq = ndev->priv->dpm_clk_tbl[dpm_level].npuclk;
ndev->hclk_freq = ndev->priv->dpm_clk_tbl[dpm_level].hclk;
- ndev->dpm_level = dpm_level;
ndev->max_tops = NPU4_DPM_TOPS(ndev, ndev->max_dpm_level);
ndev->curr_tops = NPU4_DPM_TOPS(ndev, dpm_level);
@@ -137,10 +120,6 @@ int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
ndev->npuclk_freq, ndev->hclk_freq);
return 0;
-
-suspend_put:
- amdxdna_pm_suspend_put(ndev->xdna);
- return ret;
}
int aie2_smu_init(struct amdxdna_dev_hdl *ndev)
diff --git a/drivers/accel/amdxdna/amdxdna_ctx.h b/drivers/accel/amdxdna/amdxdna_ctx.h
index b6151244d64f..16c85f08f03c 100644
--- a/drivers/accel/amdxdna/amdxdna_ctx.h
+++ b/drivers/accel/amdxdna/amdxdna_ctx.h
@@ -98,11 +98,7 @@ struct amdxdna_hwctx {
u32 *col_list;
u32 start_col;
u32 num_col;
-#define HWCTX_STAT_INIT 0
-#define HWCTX_STAT_READY 1
-#define HWCTX_STAT_STOP 2
- u32 status;
- u32 old_status;
+ u32 num_unused_col;
struct amdxdna_qos_info qos;
struct amdxdna_hwctx_param_config_cu *cus;
diff --git a/drivers/accel/amdxdna/amdxdna_mailbox.c b/drivers/accel/amdxdna/amdxdna_mailbox.c
index 858df97cd3fb..8b72cf6bd6e4 100644
--- a/drivers/accel/amdxdna/amdxdna_mailbox.c
+++ b/drivers/accel/amdxdna/amdxdna_mailbox.c
@@ -207,26 +207,34 @@ mailbox_send_msg(struct mailbox_channel *mb_chann, struct mailbox_msg *mb_msg)
u32 head, tail;
u32 start_addr;
u32 tmp_tail;
+ int ret;
head = mailbox_get_headptr(mb_chann, CHAN_RES_X2I);
tail = mb_chann->x2i_tail;
- ringbuf_size = mailbox_get_ringbuf_size(mb_chann, CHAN_RES_X2I);
+ ringbuf_size = mailbox_get_ringbuf_size(mb_chann, CHAN_RES_X2I) - sizeof(u32);
start_addr = mb_chann->res[CHAN_RES_X2I].rb_start_addr;
tmp_tail = tail + mb_msg->pkg_size;
- if (tail < head && tmp_tail >= head)
- goto no_space;
-
- if (tail >= head && (tmp_tail > ringbuf_size - sizeof(u32) &&
- mb_msg->pkg_size >= head))
- goto no_space;
- if (tail >= head && tmp_tail > ringbuf_size - sizeof(u32)) {
+check_again:
+ if (tail >= head && tmp_tail > ringbuf_size) {
write_addr = mb_chann->mb->res.ringbuf_base + start_addr + tail;
writel(TOMBSTONE, write_addr);
/* tombstone is set. Write from the start of the ringbuf */
tail = 0;
+ tmp_tail = tail + mb_msg->pkg_size;
+ }
+
+ if (tail < head && tmp_tail >= head) {
+ ret = read_poll_timeout(mailbox_get_headptr, head,
+ tmp_tail < head || tail >= head,
+ 1, 100, false, mb_chann, CHAN_RES_X2I);
+ if (ret)
+ return ret;
+
+ if (tail >= head)
+ goto check_again;
}
write_addr = mb_chann->mb->res.ringbuf_base + start_addr + tail;
@@ -238,9 +246,6 @@ mailbox_send_msg(struct mailbox_channel *mb_chann, struct mailbox_msg *mb_msg)
mb_msg->pkg.header.id);
return 0;
-
-no_space:
- return -ENOSPC;
}
static int
diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c
index 1973ab67721b..bcb0d77b63cb 100644
--- a/drivers/accel/amdxdna/amdxdna_pci_drv.c
+++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c
@@ -83,6 +83,8 @@ static int amdxdna_drm_open(struct drm_device *ddev, struct drm_file *filp)
ret = -ENODEV;
goto unbind_sva;
}
+ client->mm = current->mm;
+ mmgrab(client->mm);
init_srcu_struct(&client->hwctx_srcu);
xa_init_flags(&client->hwctx_xa, XA_FLAGS_ALLOC);
mutex_init(&client->mm_lock);
@@ -119,6 +121,7 @@ static void amdxdna_drm_close(struct drm_device *ddev, struct drm_file *filp)
drm_gem_object_put(to_gobj(client->dev_heap));
iommu_sva_unbind_device(client->sva);
+ mmdrop(client->mm);
XDNA_DBG(xdna, "pid %d closed", client->pid);
kfree(client);
@@ -282,7 +285,7 @@ static int amdxdna_probe(struct pci_dev *pdev, const struct pci_device_id *id)
fs_reclaim_release(GFP_KERNEL);
}
- xdna->notifier_wq = alloc_ordered_workqueue("notifier_wq", 0);
+ xdna->notifier_wq = alloc_ordered_workqueue("notifier_wq", WQ_MEM_RECLAIM);
if (!xdna->notifier_wq)
return -ENOMEM;
diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.h b/drivers/accel/amdxdna/amdxdna_pci_drv.h
index c99477f5e454..ec21cb378a47 100644
--- a/drivers/accel/amdxdna/amdxdna_pci_drv.h
+++ b/drivers/accel/amdxdna/amdxdna_pci_drv.h
@@ -101,7 +101,6 @@ struct amdxdna_dev {
struct amdxdna_fw_ver fw_ver;
struct rw_semaphore notifier_lock; /* for mmu notifier*/
struct workqueue_struct *notifier_wq;
- bool rpm_on;
};
/*
@@ -131,6 +130,7 @@ struct amdxdna_client {
struct iommu_sva *sva;
int pasid;
+ struct mm_struct *mm;
};
#define amdxdna_for_each_hwctx(client, hwctx_id, entry) \
diff --git a/drivers/accel/amdxdna/amdxdna_pm.c b/drivers/accel/amdxdna/amdxdna_pm.c
index fa38e65d617c..d024d480521c 100644
--- a/drivers/accel/amdxdna/amdxdna_pm.c
+++ b/drivers/accel/amdxdna/amdxdna_pm.c
@@ -15,14 +15,9 @@ int amdxdna_pm_suspend(struct device *dev)
{
struct amdxdna_dev *xdna = to_xdna_dev(dev_get_drvdata(dev));
int ret = -EOPNOTSUPP;
- bool rpm;
- if (xdna->dev_info->ops->suspend) {
- rpm = xdna->rpm_on;
- xdna->rpm_on = false;
+ if (xdna->dev_info->ops->suspend)
ret = xdna->dev_info->ops->suspend(xdna);
- xdna->rpm_on = rpm;
- }
XDNA_DBG(xdna, "Suspend done ret %d", ret);
return ret;
@@ -32,14 +27,9 @@ int amdxdna_pm_resume(struct device *dev)
{
struct amdxdna_dev *xdna = to_xdna_dev(dev_get_drvdata(dev));
int ret = -EOPNOTSUPP;
- bool rpm;
- if (xdna->dev_info->ops->resume) {
- rpm = xdna->rpm_on;
- xdna->rpm_on = false;
+ if (xdna->dev_info->ops->resume)
ret = xdna->dev_info->ops->resume(xdna);
- xdna->rpm_on = rpm;
- }
XDNA_DBG(xdna, "Resume done ret %d", ret);
return ret;
@@ -50,9 +40,6 @@ int amdxdna_pm_resume_get(struct amdxdna_dev *xdna)
struct device *dev = xdna->ddev.dev;
int ret;
- if (!xdna->rpm_on)
- return 0;
-
ret = pm_runtime_resume_and_get(dev);
if (ret) {
XDNA_ERR(xdna, "Resume failed: %d", ret);
@@ -66,9 +53,6 @@ void amdxdna_pm_suspend_put(struct amdxdna_dev *xdna)
{
struct device *dev = xdna->ddev.dev;
- if (!xdna->rpm_on)
- return;
-
pm_runtime_put_autosuspend(dev);
}
@@ -81,14 +65,12 @@ void amdxdna_pm_init(struct amdxdna_dev *xdna)
pm_runtime_use_autosuspend(dev);
pm_runtime_allow(dev);
pm_runtime_put_autosuspend(dev);
- xdna->rpm_on = true;
}
void amdxdna_pm_fini(struct amdxdna_dev *xdna)
{
struct device *dev = xdna->ddev.dev;
- xdna->rpm_on = false;
pm_runtime_get_noresume(dev);
pm_runtime_forbid(dev);
}
diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c
index 077b2261cf2a..9e3b3b055caa 100644
--- a/drivers/accel/amdxdna/amdxdna_ubuf.c
+++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
@@ -34,15 +34,21 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach,
ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->nr_pages, 0,
ubuf->nr_pages << PAGE_SHIFT, GFP_KERNEL);
if (ret)
- return ERR_PTR(ret);
+ goto err_free_sg;
if (ubuf->flags & AMDXDNA_UBUF_FLAG_MAP_DMA) {
ret = dma_map_sgtable(attach->dev, sg, direction, 0);
if (ret)
- return ERR_PTR(ret);
+ goto err_free_table;
}
return sg;
+
+err_free_table:
+ sg_free_table(sg);
+err_free_sg:
+ kfree(sg);
+ return ERR_PTR(ret);
}
static void amdxdna_ubuf_unmap(struct dma_buf_attachment *attach,
diff --git a/drivers/accel/amdxdna/npu4_regs.c b/drivers/accel/amdxdna/npu4_regs.c
index 986a5f28ba24..2ceedfe583a8 100644
--- a/drivers/accel/amdxdna/npu4_regs.c
+++ b/drivers/accel/amdxdna/npu4_regs.c
@@ -89,6 +89,7 @@ const struct dpm_clk_freq npu4_dpm_clk_table[] = {
const struct aie2_fw_feature_tbl npu4_fw_feature_table[] = {
{ .feature = AIE2_NPU_COMMAND, .min_minor = 15 },
{ .feature = AIE2_PREEMPT, .min_minor = 12 },
+ { .feature = AIE2_TEMPORAL_ONLY, .min_minor = 12 },
{ 0 }
};
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index fa3475da7ea9..b6198f73c81d 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -163,7 +163,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
return_ACPI_STATUS(AE_NOT_EXIST);
}
- if (region_obj->region.space_id == ACPI_ADR_SPACE_PLATFORM_COMM) {
+ if (field_obj
+ && region_obj->region.space_id ==
+ ACPI_ADR_SPACE_PLATFORM_COMM) {
struct acpi_pcc_info *ctx =
handler_desc->address_space.context;
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index e66e20d1f31b..b59b0100d03c 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -362,7 +362,7 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd)
end:
if (cmd == CMD_WRITE) {
if (unlikely(ret)) {
- for_each_possible_cpu(i) {
+ for_each_online_cpu(i) {
struct cpc_desc *desc = per_cpu(cpc_desc_ptr, i);
if (!desc)
@@ -524,7 +524,7 @@ int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data)
else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
cpu_data->shared_type = CPUFREQ_SHARED_TYPE_ANY;
- for_each_possible_cpu(i) {
+ for_each_online_cpu(i) {
if (i == cpu)
continue;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 361a7721a6a8..7da5ae5594a7 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -1113,6 +1113,19 @@ static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Click Mini L9W-B"),
},
},
+ {
+ /*
+ * THUNDEROBOT ZERO laptop: Due to its SSDT table bug, power
+ * resource 'PXP' will be shut down on initialization, making
+ * the NVMe #2 and the NVIDIA dGPU both unavailable (they're
+ * both controlled by 'PXP').
+ */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "THUNDEROBOT"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ZERO"),
+ }
+
+ },
{}
};
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 65e779be64ff..7644de24d2fa 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device)
if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
dev_dbg(&device->dev, "CPPC data invalid or not present\n");
- if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+ if (cpuidle_get_driver() == &acpi_idle_driver)
acpi_processor_power_init(pr);
acpi_pss_perf_init(pr);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ddf9a7b28a59..50dfce8d8bba 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -77,6 +77,7 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
static void ata_dev_xfermask(struct ata_device *dev);
static unsigned int ata_dev_quirks(const struct ata_device *dev);
+static u64 ata_dev_get_quirk_value(struct ata_device *dev, unsigned int quirk);
static DEFINE_IDA(ata_ida);
@@ -3152,9 +3153,10 @@ int ata_dev_configure(struct ata_device *dev)
dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_1024,
dev->max_sectors);
- if (dev->quirks & ATA_QUIRK_MAX_SEC_8191)
- dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_8191,
- dev->max_sectors);
+ if (dev->quirks & ATA_QUIRK_MAX_SEC)
+ dev->max_sectors = min_t(unsigned int, dev->max_sectors,
+ ata_dev_get_quirk_value(dev,
+ ATA_QUIRK_MAX_SEC));
if (dev->quirks & ATA_QUIRK_MAX_SEC_LBA48)
dev->max_sectors = ATA_MAX_SECTORS_LBA48;
@@ -4008,7 +4010,7 @@ static const char * const ata_quirk_names[] = {
[__ATA_QUIRK_NO_DMA_LOG] = "nodmalog",
[__ATA_QUIRK_NOTRIM] = "notrim",
[__ATA_QUIRK_MAX_SEC_1024] = "maxsec1024",
- [__ATA_QUIRK_MAX_SEC_8191] = "maxsec8191",
+ [__ATA_QUIRK_MAX_SEC] = "maxsec",
[__ATA_QUIRK_MAX_TRIM_128M] = "maxtrim128m",
[__ATA_QUIRK_NO_NCQ_ON_ATI] = "noncqonati",
[__ATA_QUIRK_NO_LPM_ON_ATI] = "nolpmonati",
@@ -4053,6 +4055,22 @@ static void ata_dev_print_quirks(const struct ata_device *dev,
kfree(str);
}
+struct ata_dev_quirk_value {
+ const char *model_num;
+ const char *model_rev;
+ u64 val;
+};
+
+static const struct ata_dev_quirk_value __ata_dev_max_sec_quirks[] = {
+ { "TORiSAN DVD-ROM DRD-N216", NULL, 128 },
+ { "ST380013AS", "3.20", 1024 },
+ { "LITEON CX1-JB*-HP", NULL, 1024 },
+ { "LITEON EP1-*", NULL, 1024 },
+ { "DELLBOSS VD", "MV.R00-0", 8191 },
+ { "INTEL SSDSC2KG480G8", "XCV10120", 8191 },
+ { },
+};
+
struct ata_dev_quirks_entry {
const char *model_num;
const char *model_rev;
@@ -4097,7 +4115,7 @@ static const struct ata_dev_quirks_entry __ata_dev_quirks[] = {
{ "ASMT109x- Config", NULL, ATA_QUIRK_DISABLE },
/* Weird ATAPI devices */
- { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_QUIRK_MAX_SEC_128 },
+ { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_QUIRK_MAX_SEC },
{ "QUANTUM DAT DAT72-000", NULL, ATA_QUIRK_ATAPI_MOD16_DMA },
{ "Slimtype DVD A DS8A8SH", NULL, ATA_QUIRK_MAX_SEC_LBA48 },
{ "Slimtype DVD A DS8A9SH", NULL, ATA_QUIRK_MAX_SEC_LBA48 },
@@ -4106,20 +4124,20 @@ static const struct ata_dev_quirks_entry __ata_dev_quirks[] = {
* Causes silent data corruption with higher max sects.
* http://lkml.kernel.org/g/x49wpy40ysk.fsf@segfault.boston.devel.redhat.com
*/
- { "ST380013AS", "3.20", ATA_QUIRK_MAX_SEC_1024 },
+ { "ST380013AS", "3.20", ATA_QUIRK_MAX_SEC },
/*
* These devices time out with higher max sects.
* https://bugzilla.kernel.org/show_bug.cgi?id=121671
*/
- { "LITEON CX1-JB*-HP", NULL, ATA_QUIRK_MAX_SEC_1024 },
- { "LITEON EP1-*", NULL, ATA_QUIRK_MAX_SEC_1024 },
+ { "LITEON CX1-JB*-HP", NULL, ATA_QUIRK_MAX_SEC },
+ { "LITEON EP1-*", NULL, ATA_QUIRK_MAX_SEC },
/*
* These devices time out with higher max sects.
* https://bugzilla.kernel.org/show_bug.cgi?id=220693
*/
- { "DELLBOSS VD", "MV.R00-0", ATA_QUIRK_MAX_SEC_8191 },
+ { "DELLBOSS VD", "MV.R00-0", ATA_QUIRK_MAX_SEC },
/* Devices we expect to fail diagnostics */
@@ -4307,6 +4325,8 @@ static const struct ata_dev_quirks_entry __ata_dev_quirks[] = {
{ "Micron*", NULL, ATA_QUIRK_ZERO_AFTER_TRIM },
{ "Crucial*", NULL, ATA_QUIRK_ZERO_AFTER_TRIM },
+ { "INTEL SSDSC2KG480G8", "XCV10120", ATA_QUIRK_ZERO_AFTER_TRIM |
+ ATA_QUIRK_MAX_SEC },
{ "INTEL*SSD*", NULL, ATA_QUIRK_ZERO_AFTER_TRIM },
{ "SSD*INTEL*", NULL, ATA_QUIRK_ZERO_AFTER_TRIM },
{ "Samsung*SSD*", NULL, ATA_QUIRK_ZERO_AFTER_TRIM },
@@ -4372,6 +4392,39 @@ static unsigned int ata_dev_quirks(const struct ata_device *dev)
return 0;
}
+static u64 ata_dev_get_max_sec_quirk_value(struct ata_device *dev)
+{
+ unsigned char model_num[ATA_ID_PROD_LEN + 1];
+ unsigned char model_rev[ATA_ID_FW_REV_LEN + 1];
+ const struct ata_dev_quirk_value *ad = __ata_dev_max_sec_quirks;
+ u64 val = 0;
+
+ ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
+ ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
+
+ while (ad->model_num) {
+ if (glob_match(ad->model_num, model_num) &&
+ (!ad->model_rev || glob_match(ad->model_rev, model_rev))) {
+ val = ad->val;
+ break;
+ }
+ ad++;
+ }
+
+ ata_dev_warn(dev, "%s quirk is using value: %llu\n",
+ ata_quirk_names[__ATA_QUIRK_MAX_SEC], val);
+
+ return val;
+}
+
+static u64 ata_dev_get_quirk_value(struct ata_device *dev, unsigned int quirk)
+{
+ if (quirk == ATA_QUIRK_MAX_SEC)
+ return ata_dev_get_max_sec_quirk_value(dev);
+
+ return 0;
+}
+
static bool ata_dev_nodma(const struct ata_device *dev)
{
/*
@@ -5567,6 +5620,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
mutex_init(&ap->scsi_scan_mutex);
INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug);
INIT_DELAYED_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan);
+ INIT_WORK(&ap->deferred_qc_work, ata_scsi_deferred_qc_work);
INIT_LIST_HEAD(&ap->eh_done_q);
init_waitqueue_head(&ap->eh_wait_q);
init_completion(&ap->park_req_pending);
@@ -6189,9 +6243,11 @@ static void ata_port_detach(struct ata_port *ap)
/* wait till EH commits suicide */
ata_port_wait_eh(ap);
- /* it better be dead now */
+ /* It better be dead now and not have any remaining deferred qc. */
WARN_ON(!(ap->pflags & ATA_PFLAG_UNLOADED));
+ WARN_ON(ap->deferred_qc);
+ cancel_work_sync(&ap->deferred_qc_work);
cancel_delayed_work_sync(&ap->hotplug_task);
cancel_delayed_work_sync(&ap->scsi_rescan_task);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 2586e77ebf45..258e657f3527 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -640,12 +640,28 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,
set_host_byte(scmd, DID_OK);
ata_qc_for_each_raw(ap, qc, i) {
- if (qc->flags & ATA_QCFLAG_ACTIVE &&
- qc->scsicmd == scmd)
+ if (qc->scsicmd != scmd)
+ continue;
+ if ((qc->flags & ATA_QCFLAG_ACTIVE) ||
+ qc == ap->deferred_qc)
break;
}
- if (i < ATA_MAX_QUEUE) {
+ if (qc == ap->deferred_qc) {
+ /*
+ * This is a deferred command that timed out while
+ * waiting for the command queue to drain. Since the qc
+ * is not active yet (deferred_qc is still set, so the
+ * deferred qc work has not issued the command yet),
+ * simply signal the timeout by finishing the SCSI
+ * command and clear the deferred qc to prevent the
+ * deferred qc work from issuing this qc.
+ */
+ WARN_ON_ONCE(qc->flags & ATA_QCFLAG_ACTIVE);
+ ap->deferred_qc = NULL;
+ set_host_byte(scmd, DID_TIME_OUT);
+ scsi_eh_finish_cmd(scmd, &ap->eh_done_q);
+ } else if (i < ATA_MAX_QUEUE) {
/* the scmd has an associated qc */
if (!(qc->flags & ATA_QCFLAG_EH)) {
/* which hasn't failed yet, timeout */
@@ -917,6 +933,12 @@ static void ata_eh_set_pending(struct ata_port *ap, bool fastdrain)
ap->pflags |= ATA_PFLAG_EH_PENDING;
+ /*
+ * If we have a deferred qc, requeue it so that it is retried once EH
+ * completes.
+ */
+ ata_scsi_requeue_deferred_qc(ap);
+
if (!fastdrain)
return;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 721d3f270c8e..5f9abeb7b2a8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1658,8 +1658,77 @@ static void ata_qc_done(struct ata_queued_cmd *qc)
done(cmd);
}
+void ata_scsi_deferred_qc_work(struct work_struct *work)
+{
+ struct ata_port *ap =
+ container_of(work, struct ata_port, deferred_qc_work);
+ struct ata_queued_cmd *qc;
+ unsigned long flags;
+
+ spin_lock_irqsave(ap->lock, flags);
+
+ /*
+ * If we still have a deferred qc and we are not in EH, issue it. In
+ * such case, we should not need any more deferring the qc, so warn if
+ * qc_defer() says otherwise.
+ */
+ qc = ap->deferred_qc;
+ if (qc && !ata_port_eh_scheduled(ap)) {
+ WARN_ON_ONCE(ap->ops->qc_defer(qc));
+ ap->deferred_qc = NULL;
+ ata_qc_issue(qc);
+ }
+
+ spin_unlock_irqrestore(ap->lock, flags);
+}
+
+void ata_scsi_requeue_deferred_qc(struct ata_port *ap)
+{
+ struct ata_queued_cmd *qc = ap->deferred_qc;
+ struct scsi_cmnd *scmd;
+
+ lockdep_assert_held(ap->lock);
+
+ /*
+ * If we have a deferred qc when a reset occurs or NCQ commands fail,
+ * do not try to be smart about what to do with this deferred command
+ * and simply retry it by completing it with DID_SOFT_ERROR.
+ */
+ if (!qc)
+ return;
+
+ scmd = qc->scsicmd;
+ ap->deferred_qc = NULL;
+ ata_qc_free(qc);
+ scmd->result = (DID_SOFT_ERROR << 16);
+ scsi_done(scmd);
+}
+
+static void ata_scsi_schedule_deferred_qc(struct ata_port *ap)
+{
+ struct ata_queued_cmd *qc = ap->deferred_qc;
+
+ lockdep_assert_held(ap->lock);
+
+ /*
+ * If we have a deferred qc, then qc_defer() is defined and we can use
+ * this callback to determine if this qc is good to go, unless EH has
+ * been scheduled.
+ */
+ if (!qc)
+ return;
+
+ if (ata_port_eh_scheduled(ap)) {
+ ata_scsi_requeue_deferred_qc(ap);
+ return;
+ }
+ if (!ap->ops->qc_defer(qc))
+ queue_work(system_highpri_wq, &ap->deferred_qc_work);
+}
+
static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
{
+ struct ata_port *ap = qc->ap;
struct scsi_cmnd *cmd = qc->scsicmd;
u8 *cdb = cmd->cmnd;
bool have_sense = qc->flags & ATA_QCFLAG_SENSE_VALID;
@@ -1689,6 +1758,66 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
}
ata_qc_done(qc);
+
+ ata_scsi_schedule_deferred_qc(ap);
+}
+
+static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc)
+{
+ int ret;
+
+ if (!ap->ops->qc_defer)
+ goto issue;
+
+ /*
+ * If we already have a deferred qc, then rely on the SCSI layer to
+ * requeue and defer all incoming commands until the deferred qc is
+ * processed, once all on-going commands complete.
+ */
+ if (ap->deferred_qc) {
+ ata_qc_free(qc);
+ return SCSI_MLQUEUE_DEVICE_BUSY;
+ }
+
+ /* Check if the command needs to be deferred. */
+ ret = ap->ops->qc_defer(qc);
+ switch (ret) {
+ case 0:
+ break;
+ case ATA_DEFER_LINK:
+ ret = SCSI_MLQUEUE_DEVICE_BUSY;
+ break;
+ case ATA_DEFER_PORT:
+ ret = SCSI_MLQUEUE_HOST_BUSY;
+ break;
+ default:
+ WARN_ON_ONCE(1);
+ ret = SCSI_MLQUEUE_HOST_BUSY;
+ break;
+ }
+
+ if (ret) {
+ /*
+ * We must defer this qc: if this is not an NCQ command, keep
+ * this qc as a deferred one and report to the SCSI layer that
+ * we issued it so that it is not requeued. The deferred qc will
+ * be issued with the port deferred_qc_work once all on-going
+ * commands complete.
+ */
+ if (!ata_is_ncq(qc->tf.protocol)) {
+ ap->deferred_qc = qc;
+ return 0;
+ }
+
+ /* Force a requeue of the command to defer its execution. */
+ ata_qc_free(qc);
+ return ret;
+ }
+
+issue:
+ ata_qc_issue(qc);
+
+ return 0;
}
/**
@@ -1714,66 +1843,49 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
* spin_lock_irqsave(host lock)
*
* RETURNS:
- * 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY if the command
- * needs to be deferred.
+ * 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY or SCSI_MLQUEUE_HOST_BUSY if the
+ * command needs to be deferred.
*/
static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
ata_xlat_func_t xlat_func)
{
struct ata_port *ap = dev->link->ap;
struct ata_queued_cmd *qc;
- int rc;
+ lockdep_assert_held(ap->lock);
+
+ /*
+ * ata_scsi_qc_new() calls scsi_done(cmd) in case of failure. So we
+ * have nothing further to do when allocating a qc fails.
+ */
qc = ata_scsi_qc_new(dev, cmd);
if (!qc)
- goto err_mem;
+ return 0;
/* data is present; dma-map it */
if (cmd->sc_data_direction == DMA_FROM_DEVICE ||
cmd->sc_data_direction == DMA_TO_DEVICE) {
if (unlikely(scsi_bufflen(cmd) < 1)) {
ata_dev_warn(dev, "WARNING: zero len r/w req\n");
- goto err_did;
+ cmd->result = (DID_ERROR << 16);
+ goto done;
}
ata_sg_init(qc, scsi_sglist(cmd), scsi_sg_count(cmd));
-
qc->dma_dir = cmd->sc_data_direction;
}
qc->complete_fn = ata_scsi_qc_complete;
if (xlat_func(qc))
- goto early_finish;
+ goto done;
- if (ap->ops->qc_defer) {
- if ((rc = ap->ops->qc_defer(qc)))
- goto defer;
- }
-
- /* select device, send command to hardware */
- ata_qc_issue(qc);
+ return ata_scsi_qc_issue(ap, qc);
- return 0;
-
-early_finish:
- ata_qc_free(qc);
- scsi_done(cmd);
- return 0;
-
-err_did:
+done:
ata_qc_free(qc);
- cmd->result = (DID_ERROR << 16);
scsi_done(cmd);
-err_mem:
return 0;
-
-defer:
- ata_qc_free(qc);
- if (rc == ATA_DEFER_LINK)
- return SCSI_MLQUEUE_DEVICE_BUSY;
- else
- return SCSI_MLQUEUE_HOST_BUSY;
}
/**
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 0e7ecac73680..60a675df61dc 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -165,6 +165,8 @@ void ata_scsi_sdev_config(struct scsi_device *sdev);
int ata_scsi_dev_config(struct scsi_device *sdev, struct queue_limits *lim,
struct ata_device *dev);
int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev);
+void ata_scsi_deferred_qc_work(struct work_struct *work);
+void ata_scsi_requeue_deferred_qc(struct ata_port *ap);
/* libata-eh.c */
extern unsigned int ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd);
diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
index c3a8384c3e04..c41da296eb38 100644
--- a/drivers/ata/pata_ftide010.c
+++ b/drivers/ata/pata_ftide010.c
@@ -122,10 +122,10 @@ static const u8 mwdma_50_active_time[3] = {6, 2, 2};
static const u8 mwdma_50_recovery_time[3] = {6, 2, 1};
static const u8 mwdma_66_active_time[3] = {8, 3, 3};
static const u8 mwdma_66_recovery_time[3] = {8, 2, 1};
-static const u8 udma_50_setup_time[6] = {3, 3, 2, 2, 1, 1};
+static const u8 udma_50_setup_time[6] = {3, 3, 2, 2, 1, 9};
static const u8 udma_50_hold_time[6] = {3, 1, 1, 1, 1, 1};
-static const u8 udma_66_setup_time[7] = {4, 4, 3, 2, };
-static const u8 udma_66_hold_time[7] = {};
+static const u8 udma_66_setup_time[7] = {4, 4, 3, 2, 1, 9, 9};
+static const u8 udma_66_hold_time[7] = {4, 2, 1, 1, 1, 1, 1};
/*
* We set 66 MHz for all MWDMA modes
diff --git a/drivers/auxdisplay/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c
index a7eae99a48f7..4e22882f57c9 100644
--- a/drivers/auxdisplay/arm-charlcd.c
+++ b/drivers/auxdisplay/arm-charlcd.c
@@ -323,7 +323,7 @@ static int __init charlcd_probe(struct platform_device *pdev)
out_no_irq:
iounmap(lcd->virtbase);
out_no_memregion:
- release_mem_region(lcd->phybase, SZ_4K);
+ release_mem_region(lcd->phybase, lcd->physize);
out_no_resource:
kfree(lcd);
return ret;
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
index 8aa28c08b289..c0809d18fc54 100644
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -83,13 +83,16 @@ EXPORT_SYMBOL_GPL(dev_pm_set_wake_irq);
*/
void dev_pm_clear_wake_irq(struct device *dev)
{
- struct wake_irq *wirq = dev->power.wakeirq;
+ struct wake_irq *wirq;
unsigned long flags;
- if (!wirq)
+ spin_lock_irqsave(&dev->power.lock, flags);
+ wirq = dev->power.wakeirq;
+ if (!wirq) {
+ spin_unlock_irqrestore(&dev->power.lock, flags);
return;
+ }
- spin_lock_irqsave(&dev->power.lock, flags);
device_wakeup_detach_irq(dev);
dev->power.wakeirq = NULL;
spin_unlock_irqrestore(&dev->power.lock, flags);
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 1e1a0e7eeac5..e69033d16fba 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -275,9 +275,7 @@ EXPORT_SYMBOL_GPL(wakeup_sources_read_unlock);
*/
struct wakeup_source *wakeup_sources_walk_start(void)
{
- struct list_head *ws_head = &wakeup_sources;
-
- return list_entry_rcu(ws_head->next, struct wakeup_source, entry);
+ return list_first_or_null_rcu(&wakeup_sources, struct wakeup_source, entry);
}
EXPORT_SYMBOL_GPL(wakeup_sources_walk_start);
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index c73376886e7a..1f6ac9202b66 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2659,9 +2659,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
* connect.
*/
.max_hw_sectors = DRBD_MAX_BIO_SIZE_SAFE >> 8,
- .features = BLK_FEAT_WRITE_CACHE | BLK_FEAT_FUA |
- BLK_FEAT_ROTATIONAL |
- BLK_FEAT_STABLE_WRITES,
};
device = minor_to_device(minor);
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 91f3b8afb63c..b502038be0a9 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1296,6 +1296,8 @@ void drbd_reconsider_queue_parameters(struct drbd_device *device,
lim.max_segments = drbd_backing_dev_max_segments(device);
} else {
lim.max_segments = BLK_MAX_SEGMENTS;
+ lim.features = BLK_FEAT_WRITE_CACHE | BLK_FEAT_FUA |
+ BLK_FEAT_ROTATIONAL | BLK_FEAT_STABLE_WRITES;
}
lim.max_hw_sectors = new >> SECTOR_SHIFT;
@@ -1318,8 +1320,24 @@ void drbd_reconsider_queue_parameters(struct drbd_device *device,
lim.max_hw_discard_sectors = 0;
}
- if (bdev)
+ if (bdev) {
blk_stack_limits(&lim, &b->limits, 0);
+ /*
+ * blk_set_stacking_limits() cleared the features, and
+ * blk_stack_limits() may or may not have inherited
+ * BLK_FEAT_STABLE_WRITES from the backing device.
+ *
+ * DRBD always requires stable writes because:
+ * 1. The same bio data is read for both local disk I/O and
+ * network transmission. If the page changes mid-flight,
+ * the local and remote copies could diverge.
+ * 2. When data integrity is enabled, DRBD calculates a
+ * checksum before sending the data. If the page changes
+ * between checksum calculation and transmission, the
+ * receiver will detect a checksum mismatch.
+ */
+ lim.features |= BLK_FEAT_STABLE_WRITES;
+ }
/*
* If we can handle "zeroes" efficiently on the protocol, we want to do
diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index 2df8941a6b14..9b3fdc202e15 100644
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -145,18 +145,30 @@ static int process_rdma(struct rnbd_srv_session *srv_sess,
priv->sess_dev = sess_dev;
priv->id = id;
- bio = bio_alloc(file_bdev(sess_dev->bdev_file), 1,
+ bio = bio_alloc(file_bdev(sess_dev->bdev_file), !!datalen,
rnbd_to_bio_flags(le32_to_cpu(msg->rw)), GFP_KERNEL);
- bio_add_virt_nofail(bio, data, datalen);
-
- bio->bi_opf = rnbd_to_bio_flags(le32_to_cpu(msg->rw));
- if (bio_has_data(bio) &&
- bio->bi_iter.bi_size != le32_to_cpu(msg->bi_size)) {
- rnbd_srv_err_rl(sess_dev, "Datalen mismatch: bio bi_size (%u), bi_size (%u)\n",
- bio->bi_iter.bi_size, msg->bi_size);
- err = -EINVAL;
- goto bio_put;
+ if (unlikely(!bio)) {
+ err = -ENOMEM;
+ goto put_sess_dev;
}
+
+ if (!datalen) {
+ /*
+ * For special requests like DISCARD and WRITE_ZEROES, the datalen is zero.
+ */
+ bio->bi_iter.bi_size = le32_to_cpu(msg->bi_size);
+ } else {
+ bio_add_virt_nofail(bio, data, datalen);
+ bio->bi_opf = rnbd_to_bio_flags(le32_to_cpu(msg->rw));
+ if (bio->bi_iter.bi_size != le32_to_cpu(msg->bi_size)) {
+ rnbd_srv_err_rl(sess_dev,
+ "Datalen mismatch: bio bi_size (%u), bi_size (%u)\n",
+ bio->bi_iter.bi_size, msg->bi_size);
+ err = -EINVAL;
+ goto bio_put;
+ }
+ }
+
bio->bi_end_io = rnbd_dev_bi_end_io;
bio->bi_private = priv;
bio->bi_iter.bi_sector = le64_to_cpu(msg->sector);
@@ -170,6 +182,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess,
bio_put:
bio_put(bio);
+put_sess_dev:
rnbd_put_sess_dev(sess_dev);
err:
kfree(priv);
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index cd1e84653002..06e0790150d1 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -2462,11 +2462,11 @@ static int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,
io->res = result;
req = ublk_fill_io_cmd(io, cmd);
ret = ublk_config_io_buf(ub, io, cmd, addr, &buf_idx);
+ if (buf_idx != UBLK_INVALID_BUF_IDX)
+ io_buffer_unregister_bvec(cmd, buf_idx, issue_flags);
compl = ublk_need_complete_req(ub, io);
/* can't touch 'ublk_io' any more */
- if (buf_idx != UBLK_INVALID_BUF_IDX)
- io_buffer_unregister_bvec(cmd, buf_idx, issue_flags);
if (req_op(req) == REQ_OP_ZONE_APPEND)
req->__sector = addr;
if (compl)
@@ -3311,12 +3311,11 @@ static int ublk_ctrl_del_dev(struct ublk_device **p_ub, bool wait)
return 0;
}
-static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd)
+static inline void ublk_ctrl_cmd_dump(u32 cmd_op,
+ const struct ublksrv_ctrl_cmd *header)
{
- const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe);
-
pr_devel("%s: cmd_op %x, dev id %d qid %d data %llx buf %llx len %u\n",
- __func__, cmd->cmd_op, header->dev_id, header->queue_id,
+ __func__, cmd_op, header->dev_id, header->queue_id,
header->data[0], header->addr, header->len);
}
@@ -3685,9 +3684,8 @@ static int ublk_char_dev_permission(struct ublk_device *ub,
}
static int ublk_ctrl_uring_cmd_permission(struct ublk_device *ub,
- struct io_uring_cmd *cmd)
+ u32 cmd_op, struct ublksrv_ctrl_cmd *header)
{
- struct ublksrv_ctrl_cmd *header = (struct ublksrv_ctrl_cmd *)io_uring_sqe_cmd(cmd->sqe);
bool unprivileged = ub->dev_info.flags & UBLK_F_UNPRIVILEGED_DEV;
void __user *argp = (void __user *)(unsigned long)header->addr;
char *dev_path = NULL;
@@ -3703,7 +3701,7 @@ static int ublk_ctrl_uring_cmd_permission(struct ublk_device *ub,
* know if the specified device is created as unprivileged
* mode.
*/
- if (_IOC_NR(cmd->cmd_op) != UBLK_CMD_GET_DEV_INFO2)
+ if (_IOC_NR(cmd_op) != UBLK_CMD_GET_DEV_INFO2)
return 0;
}
@@ -3724,7 +3722,7 @@ static int ublk_ctrl_uring_cmd_permission(struct ublk_device *ub,
return PTR_ERR(dev_path);
ret = -EINVAL;
- switch (_IOC_NR(cmd->cmd_op)) {
+ switch (_IOC_NR(cmd_op)) {
case UBLK_CMD_GET_DEV_INFO:
case UBLK_CMD_GET_DEV_INFO2:
case UBLK_CMD_GET_QUEUE_AFFINITY:
@@ -3753,7 +3751,7 @@ static int ublk_ctrl_uring_cmd_permission(struct ublk_device *ub,
header->addr += header->dev_path_len;
}
pr_devel("%s: dev id %d cmd_op %x uid %d gid %d path %s ret %d\n",
- __func__, ub->ub_number, cmd->cmd_op,
+ __func__, ub->ub_number, cmd_op,
ub->dev_info.owner_uid, ub->dev_info.owner_gid,
dev_path, ret);
exit:
@@ -3777,7 +3775,9 @@ static bool ublk_ctrl_uring_cmd_may_sleep(u32 cmd_op)
static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
unsigned int issue_flags)
{
- const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe);
+ /* May point to userspace-mapped memory */
+ const struct ublksrv_ctrl_cmd *ub_src = io_uring_sqe_cmd(cmd->sqe);
+ struct ublksrv_ctrl_cmd header;
struct ublk_device *ub = NULL;
u32 cmd_op = cmd->cmd_op;
int ret = -EINVAL;
@@ -3786,44 +3786,50 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
issue_flags & IO_URING_F_NONBLOCK)
return -EAGAIN;
- ublk_ctrl_cmd_dump(cmd);
-
if (!(issue_flags & IO_URING_F_SQE128))
- goto out;
+ return -EINVAL;
+
+ header.dev_id = READ_ONCE(ub_src->dev_id);
+ header.queue_id = READ_ONCE(ub_src->queue_id);
+ header.len = READ_ONCE(ub_src->len);
+ header.addr = READ_ONCE(ub_src->addr);
+ header.data[0] = READ_ONCE(ub_src->data[0]);
+ header.dev_path_len = READ_ONCE(ub_src->dev_path_len);
+ ublk_ctrl_cmd_dump(cmd_op, &header);
ret = ublk_check_cmd_op(cmd_op);
if (ret)
goto out;
if (cmd_op == UBLK_U_CMD_GET_FEATURES) {
- ret = ublk_ctrl_get_features(header);
+ ret = ublk_ctrl_get_features(&header);
goto out;
}
if (_IOC_NR(cmd_op) != UBLK_CMD_ADD_DEV) {
ret = -ENODEV;
- ub = ublk_get_device_from_id(header->dev_id);
+ ub = ublk_get_device_from_id(header.dev_id);
if (!ub)
goto out;
- ret = ublk_ctrl_uring_cmd_permission(ub, cmd);
+ ret = ublk_ctrl_uring_cmd_permission(ub, cmd_op, &header);
if (ret)
goto put_dev;
}
switch (_IOC_NR(cmd_op)) {
case UBLK_CMD_START_DEV:
- ret = ublk_ctrl_start_dev(ub, header);
+ ret = ublk_ctrl_start_dev(ub, &header);
break;
case UBLK_CMD_STOP_DEV:
ret = ublk_ctrl_stop_dev(ub);
break;
case UBLK_CMD_GET_DEV_INFO:
case UBLK_CMD_GET_DEV_INFO2:
- ret = ublk_ctrl_get_dev_info(ub, header);
+ ret = ublk_ctrl_get_dev_info(ub, &header);
break;
case UBLK_CMD_ADD_DEV:
- ret = ublk_ctrl_add_dev(header);
+ ret = ublk_ctrl_add_dev(&header);
break;
case UBLK_CMD_DEL_DEV:
ret = ublk_ctrl_del_dev(&ub, true);
@@ -3832,26 +3838,26 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
ret = ublk_ctrl_del_dev(&ub, false);
break;
case UBLK_CMD_GET_QUEUE_AFFINITY:
- ret = ublk_ctrl_get_queue_affinity(ub, header);
+ ret = ublk_ctrl_get_queue_affinity(ub, &header);
break;
case UBLK_CMD_GET_PARAMS:
- ret = ublk_ctrl_get_params(ub, header);
+ ret = ublk_ctrl_get_params(ub, &header);
break;
case UBLK_CMD_SET_PARAMS:
- ret = ublk_ctrl_set_params(ub, header);
+ ret = ublk_ctrl_set_params(ub, &header);
break;
case UBLK_CMD_START_USER_RECOVERY:
- ret = ublk_ctrl_start_recovery(ub, header);
+ ret = ublk_ctrl_start_recovery(ub, &header);
break;
case UBLK_CMD_END_USER_RECOVERY:
- ret = ublk_ctrl_end_recovery(ub, header);
+ ret = ublk_ctrl_end_recovery(ub, &header);
break;
case UBLK_CMD_UPDATE_SIZE:
- ublk_ctrl_set_size(ub, header);
+ ublk_ctrl_set_size(ub, &header);
ret = 0;
break;
case UBLK_CMD_QUIESCE_DEV:
- ret = ublk_ctrl_quiesce_dev(ub, header);
+ ret = ublk_ctrl_quiesce_dev(ub, &header);
break;
default:
ret = -EOPNOTSUPP;
@@ -3863,7 +3869,7 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
ublk_put_device(ub);
out:
pr_devel("%s: cmd done ret %d cmd_op %x, dev id %d qid %d\n",
- __func__, ret, cmd->cmd_op, header->dev_id, header->queue_id);
+ __func__, ret, cmd_op, header.dev_id, header.queue_id);
return ret;
}
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 2936b535479f..704767b334b9 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -1431,11 +1431,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
}
}
-static irqreturn_t btintel_pcie_msix_isr(int irq, void *data)
-{
- return IRQ_WAKE_THREAD;
-}
-
static inline bool btintel_pcie_is_rxq_empty(struct btintel_pcie_data *data)
{
return data->ia.cr_hia[BTINTEL_PCIE_RXQ_NUM] == data->ia.cr_tia[BTINTEL_PCIE_RXQ_NUM];
@@ -1537,9 +1532,9 @@ static int btintel_pcie_setup_irq(struct btintel_pcie_data *data)
err = devm_request_threaded_irq(&data->pdev->dev,
msix_entry->vector,
- btintel_pcie_msix_isr,
+ NULL,
btintel_pcie_irq_msix_handler,
- IRQF_SHARED,
+ IRQF_ONESHOT | IRQF_SHARED,
KBUILD_MODNAME,
msix_entry);
if (err) {
diff --git a/drivers/char/hw_random/airoha-trng.c b/drivers/char/hw_random/airoha-trng.c
index 1dbfa9505c21..9a648f6d9fd4 100644
--- a/drivers/char/hw_random/airoha-trng.c
+++ b/drivers/char/hw_random/airoha-trng.c
@@ -212,6 +212,7 @@ static int airoha_trng_probe(struct platform_device *pdev)
trng->rng.init = airoha_trng_init;
trng->rng.cleanup = airoha_trng_cleanup;
trng->rng.read = airoha_trng_read;
+ trng->rng.quality = 900;
ret = devm_hwrng_register(dev, &trng->rng);
if (ret) {
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 96d7fe41b373..aba92d777f72 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -20,23 +20,25 @@
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/random.h>
+#include <linux/rcupdate.h>
#include <linux/sched.h>
#include <linux/sched/signal.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/uaccess.h>
+#include <linux/workqueue.h>
#define RNG_MODULE_NAME "hw_random"
#define RNG_BUFFER_SIZE (SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES)
-static struct hwrng *current_rng;
+static struct hwrng __rcu *current_rng;
/* the current rng has been explicitly chosen by user via sysfs */
static int cur_rng_set_by_user;
static struct task_struct *hwrng_fill;
/* list of registered rngs */
static LIST_HEAD(rng_list);
-/* Protects rng_list and current_rng */
+/* Protects rng_list, hwrng_fill and updating on current_rng */
static DEFINE_MUTEX(rng_mutex);
/* Protects rng read functions, data_avail, rng_buffer and rng_fillbuf */
static DEFINE_MUTEX(reading_mutex);
@@ -64,18 +66,39 @@ static size_t rng_buffer_size(void)
return RNG_BUFFER_SIZE;
}
-static inline void cleanup_rng(struct kref *kref)
+static void cleanup_rng_work(struct work_struct *work)
{
- struct hwrng *rng = container_of(kref, struct hwrng, ref);
+ struct hwrng *rng = container_of(work, struct hwrng, cleanup_work);
+
+ /*
+ * Hold rng_mutex here so we serialize in case they set_current_rng
+ * on rng again immediately.
+ */
+ mutex_lock(&rng_mutex);
+
+ /* Skip if rng has been reinitialized. */
+ if (kref_read(&rng->ref)) {
+ mutex_unlock(&rng_mutex);
+ return;
+ }
if (rng->cleanup)
rng->cleanup(rng);
complete(&rng->cleanup_done);
+ mutex_unlock(&rng_mutex);
+}
+
+static inline void cleanup_rng(struct kref *kref)
+{
+ struct hwrng *rng = container_of(kref, struct hwrng, ref);
+
+ schedule_work(&rng->cleanup_work);
}
static int set_current_rng(struct hwrng *rng)
{
+ struct hwrng *old_rng;
int err;
BUG_ON(!mutex_is_locked(&rng_mutex));
@@ -84,8 +107,14 @@ static int set_current_rng(struct hwrng *rng)
if (err)
return err;
- drop_current_rng();
- current_rng = rng;
+ old_rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ rcu_assign_pointer(current_rng, rng);
+
+ if (old_rng) {
+ synchronize_rcu();
+ kref_put(&old_rng->ref, cleanup_rng);
+ }
/* if necessary, start hwrng thread */
if (!hwrng_fill) {
@@ -101,47 +130,56 @@ static int set_current_rng(struct hwrng *rng)
static void drop_current_rng(void)
{
- BUG_ON(!mutex_is_locked(&rng_mutex));
- if (!current_rng)
+ struct hwrng *rng;
+
+ rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ if (!rng)
return;
+ RCU_INIT_POINTER(current_rng, NULL);
+ synchronize_rcu();
+
+ if (hwrng_fill) {
+ kthread_stop(hwrng_fill);
+ hwrng_fill = NULL;
+ }
+
/* decrease last reference for triggering the cleanup */
- kref_put(¤t_rng->ref, cleanup_rng);
- current_rng = NULL;
+ kref_put(&rng->ref, cleanup_rng);
}
-/* Returns ERR_PTR(), NULL or refcounted hwrng */
+/* Returns NULL or refcounted hwrng */
static struct hwrng *get_current_rng_nolock(void)
{
- if (current_rng)
- kref_get(¤t_rng->ref);
+ struct hwrng *rng;
+
+ rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ if (rng)
+ kref_get(&rng->ref);
- return current_rng;
+ return rng;
}
static struct hwrng *get_current_rng(void)
{
struct hwrng *rng;
- if (mutex_lock_interruptible(&rng_mutex))
- return ERR_PTR(-ERESTARTSYS);
+ rcu_read_lock();
+ rng = rcu_dereference(current_rng);
+ if (rng)
+ kref_get(&rng->ref);
- rng = get_current_rng_nolock();
+ rcu_read_unlock();
- mutex_unlock(&rng_mutex);
return rng;
}
static void put_rng(struct hwrng *rng)
{
- /*
- * Hold rng_mutex here so we serialize in case they set_current_rng
- * on rng again immediately.
- */
- mutex_lock(&rng_mutex);
if (rng)
kref_put(&rng->ref, cleanup_rng);
- mutex_unlock(&rng_mutex);
}
static int hwrng_init(struct hwrng *rng)
@@ -213,10 +251,6 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf,
while (size) {
rng = get_current_rng();
- if (IS_ERR(rng)) {
- err = PTR_ERR(rng);
- goto out;
- }
if (!rng) {
err = -ENODEV;
goto out;
@@ -303,7 +337,7 @@ static struct miscdevice rng_miscdev = {
static int enable_best_rng(void)
{
- struct hwrng *rng, *new_rng = NULL;
+ struct hwrng *rng, *cur_rng, *new_rng = NULL;
int ret = -ENODEV;
BUG_ON(!mutex_is_locked(&rng_mutex));
@@ -321,7 +355,9 @@ static int enable_best_rng(void)
new_rng = rng;
}
- ret = ((new_rng == current_rng) ? 0 : set_current_rng(new_rng));
+ cur_rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ ret = ((new_rng == cur_rng) ? 0 : set_current_rng(new_rng));
if (!ret)
cur_rng_set_by_user = 0;
@@ -371,8 +407,6 @@ static ssize_t rng_current_show(struct device *dev,
struct hwrng *rng;
rng = get_current_rng();
- if (IS_ERR(rng))
- return PTR_ERR(rng);
ret = sysfs_emit(buf, "%s\n", rng ? rng->name : "none");
put_rng(rng);
@@ -416,8 +450,6 @@ static ssize_t rng_quality_show(struct device *dev,
struct hwrng *rng;
rng = get_current_rng();
- if (IS_ERR(rng))
- return PTR_ERR(rng);
if (!rng) /* no need to put_rng */
return -ENODEV;
@@ -432,6 +464,7 @@ static ssize_t rng_quality_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
+ struct hwrng *rng;
u16 quality;
int ret = -EINVAL;
@@ -448,12 +481,13 @@ static ssize_t rng_quality_store(struct device *dev,
goto out;
}
- if (!current_rng) {
+ rng = rcu_dereference_protected(current_rng, lockdep_is_held(&rng_mutex));
+ if (!rng) {
ret = -ENODEV;
goto out;
}
- current_rng->quality = quality;
+ rng->quality = quality;
current_quality = quality; /* obsolete */
/* the best available RNG may have changed */
@@ -489,8 +523,20 @@ static int hwrng_fillfn(void *unused)
struct hwrng *rng;
rng = get_current_rng();
- if (IS_ERR(rng) || !rng)
+ if (!rng) {
+ /*
+ * Keep the task_struct alive until kthread_stop()
+ * is called to avoid UAF in drop_current_rng().
+ */
+ while (!kthread_should_stop()) {
+ set_current_state(TASK_INTERRUPTIBLE);
+ if (!kthread_should_stop())
+ schedule();
+ }
+ set_current_state(TASK_RUNNING);
break;
+ }
+
mutex_lock(&reading_mutex);
rc = rng_get_data(rng, rng_fillbuf,
rng_buffer_size(), 1);
@@ -518,14 +564,13 @@ static int hwrng_fillfn(void *unused)
add_hwgenerator_randomness((void *)rng_fillbuf, rc,
entropy >> 10, true);
}
- hwrng_fill = NULL;
return 0;
}
int hwrng_register(struct hwrng *rng)
{
int err = -EINVAL;
- struct hwrng *tmp;
+ struct hwrng *cur_rng, *tmp;
if (!rng->name || (!rng->data_read && !rng->read))
goto out;
@@ -540,6 +585,7 @@ int hwrng_register(struct hwrng *rng)
}
list_add_tail(&rng->list, &rng_list);
+ INIT_WORK(&rng->cleanup_work, cleanup_rng_work);
init_completion(&rng->cleanup_done);
complete(&rng->cleanup_done);
init_completion(&rng->dying);
@@ -547,16 +593,19 @@ int hwrng_register(struct hwrng *rng)
/* Adjust quality field to always have a proper value */
rng->quality = min3(default_quality, 1024, rng->quality ?: 1024);
- if (!cur_rng_set_by_user &&
- (!current_rng || rng->quality > current_rng->quality)) {
- /*
- * Set new rng as current as the new rng source
- * provides better entropy quality and was not
- * chosen by userspace.
- */
- err = set_current_rng(rng);
- if (err)
- goto out_unlock;
+ if (!cur_rng_set_by_user) {
+ cur_rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ if (!cur_rng || rng->quality > cur_rng->quality) {
+ /*
+ * Set new rng as current as the new rng source
+ * provides better entropy quality and was not
+ * chosen by userspace.
+ */
+ err = set_current_rng(rng);
+ if (err)
+ goto out_unlock;
+ }
}
mutex_unlock(&rng_mutex);
return 0;
@@ -569,14 +618,17 @@ EXPORT_SYMBOL_GPL(hwrng_register);
void hwrng_unregister(struct hwrng *rng)
{
- struct hwrng *new_rng;
+ struct hwrng *cur_rng;
int err;
mutex_lock(&rng_mutex);
list_del(&rng->list);
complete_all(&rng->dying);
- if (current_rng == rng) {
+
+ cur_rng = rcu_dereference_protected(current_rng,
+ lockdep_is_held(&rng_mutex));
+ if (cur_rng == rng) {
err = enable_best_rng();
if (err) {
drop_current_rng();
@@ -584,17 +636,7 @@ void hwrng_unregister(struct hwrng *rng)
}
}
- new_rng = get_current_rng_nolock();
- if (list_empty(&rng_list)) {
- mutex_unlock(&rng_mutex);
- if (hwrng_fill)
- kthread_stop(hwrng_fill);
- } else
- mutex_unlock(&rng_mutex);
-
- if (new_rng)
- put_rng(new_rng);
-
+ mutex_unlock(&rng_mutex);
wait_for_completion(&rng->cleanup_done);
}
EXPORT_SYMBOL_GPL(hwrng_unregister);
@@ -682,7 +724,7 @@ static int __init hwrng_modinit(void)
static void __exit hwrng_modexit(void)
{
mutex_lock(&rng_mutex);
- BUG_ON(current_rng);
+ WARN_ON(rcu_access_pointer(current_rng));
kfree(rng_buffer);
kfree(rng_fillbuf);
mutex_unlock(&rng_mutex);
diff --git a/drivers/char/misc_minor_kunit.c b/drivers/char/misc_minor_kunit.c
index 6fc8b05169c5..e930c78e1ef9 100644
--- a/drivers/char/misc_minor_kunit.c
+++ b/drivers/char/misc_minor_kunit.c
@@ -166,7 +166,7 @@ static void __init miscdev_test_can_open(struct kunit *test, struct miscdevice *
KUNIT_FAIL(test, "failed to create node\n");
filp = filp_open(devname, O_RDONLY, 0);
- if (IS_ERR_OR_NULL(filp))
+ if (IS_ERR(filp))
KUNIT_FAIL(test, "failed to open misc device: %ld\n", PTR_ERR(filp));
else
fput(filp);
diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c
index 2ed7815e4899..e2b7451ea7cc 100644
--- a/drivers/char/tpm/st33zp24/st33zp24.c
+++ b/drivers/char/tpm/st33zp24/st33zp24.c
@@ -328,8 +328,10 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,
for (i = 0; i < len - 1;) {
burstcnt = get_burstcount(chip);
- if (burstcnt < 0)
- return burstcnt;
+ if (burstcnt < 0) {
+ ret = burstcnt;
+ goto out_err;
+ }
size = min_t(int, len - i - 1, burstcnt);
ret = tpm_dev->ops->send(tpm_dev->phy_id, TPM_DATA_FIFO,
buf + i, size);
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index bdf1f329a679..8b7d32de0b2e 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -544,8 +544,10 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
burstcnt = get_burstcount(chip);
/* burstcnt < 0 = TPM is busy */
- if (burstcnt < 0)
- return burstcnt;
+ if (burstcnt < 0) {
+ rc = burstcnt;
+ goto out_err;
+ }
if (burstcnt > (len - 1 - count))
burstcnt = len - 1 - count;
diff --git a/drivers/clk/actions/owl-composite.c b/drivers/clk/actions/owl-composite.c
index 00b74f8bc437..9540444307d6 100644
--- a/drivers/clk/actions/owl-composite.c
+++ b/drivers/clk/actions/owl-composite.c
@@ -57,15 +57,10 @@ static int owl_comp_div_determine_rate(struct clk_hw *hw,
struct clk_rate_request *req)
{
struct owl_composite *comp = hw_to_owl_comp(hw);
- long rate;
-
- rate = owl_divider_helper_round_rate(&comp->common, &comp->rate.div_hw,
- req->rate, &req->best_parent_rate);
- if (rate < 0)
- return rate;
+ struct owl_divider_hw *div = &comp->rate.div_hw;
- req->rate = rate;
- return 0;
+ return divider_determine_rate(&comp->common.hw, req, div->table,
+ div->width, div->div_flags);
}
static unsigned long owl_comp_div_recalc_rate(struct clk_hw *hw,
diff --git a/drivers/clk/actions/owl-divider.c b/drivers/clk/actions/owl-divider.c
index 118f1393c678..316ace80e87e 100644
--- a/drivers/clk/actions/owl-divider.c
+++ b/drivers/clk/actions/owl-divider.c
@@ -13,26 +13,13 @@
#include "owl-divider.h"
-long owl_divider_helper_round_rate(struct owl_clk_common *common,
- const struct owl_divider_hw *div_hw,
- unsigned long rate,
- unsigned long *parent_rate)
-{
- return divider_round_rate(&common->hw, rate, parent_rate,
- div_hw->table, div_hw->width,
- div_hw->div_flags);
-}
-
static int owl_divider_determine_rate(struct clk_hw *hw,
struct clk_rate_request *req)
{
struct owl_divider *div = hw_to_owl_divider(hw);
- req->rate = owl_divider_helper_round_rate(&div->common, &div->div_hw,
- req->rate,
- &req->best_parent_rate);
-
- return 0;
+ return divider_determine_rate(hw, req, div->div_hw.table,
+ div->div_hw.width, div->div_hw.div_flags);
}
unsigned long owl_divider_helper_recalc_rate(struct owl_clk_common *common,
diff --git a/drivers/clk/actions/owl-divider.h b/drivers/clk/actions/owl-divider.h
index d76f58782c52..1d3bb4e5898a 100644
--- a/drivers/clk/actions/owl-divider.h
+++ b/drivers/clk/actions/owl-divider.h
@@ -56,11 +56,6 @@ static inline struct owl_divider *hw_to_owl_divider(struct clk_hw *hw)
return container_of(common, struct owl_divider, common);
}
-long owl_divider_helper_round_rate(struct owl_clk_common *common,
- const struct owl_divider_hw *div_hw,
- unsigned long rate,
- unsigned long *parent_rate);
-
unsigned long owl_divider_helper_recalc_rate(struct owl_clk_common *common,
const struct owl_divider_hw *div_hw,
unsigned long parent_rate);
diff --git a/drivers/clk/clk-bm1880.c b/drivers/clk/clk-bm1880.c
index dac190bc6e19..d2617fe16d2e 100644
--- a/drivers/clk/clk-bm1880.c
+++ b/drivers/clk/clk-bm1880.c
@@ -629,10 +629,7 @@ static int bm1880_clk_div_determine_rate(struct clk_hw *hw,
return 0;
}
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- div->table, div->width, div->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, div->table, div->width, div->flags);
}
static int bm1880_clk_div_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/clk-loongson1.c b/drivers/clk/clk-loongson1.c
index f9f060d08a5f..1674181a1107 100644
--- a/drivers/clk/clk-loongson1.c
+++ b/drivers/clk/clk-loongson1.c
@@ -99,10 +99,7 @@ static int ls1x_divider_determine_rate(struct clk_hw *hw,
struct ls1x_clk *ls1x_clk = to_ls1x_clk(hw);
const struct ls1x_clk_div_data *d = ls1x_clk->data;
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- d->table, d->width, d->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, d->table, d->width, d->flags);
}
static int ls1x_divider_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/clk-milbeaut.c b/drivers/clk/clk-milbeaut.c
index b4f9b7143eaa..bb94d02a76cf 100644
--- a/drivers/clk/clk-milbeaut.c
+++ b/drivers/clk/clk-milbeaut.c
@@ -407,10 +407,7 @@ static int m10v_clk_divider_determine_rate(struct clk_hw *hw,
return 0;
}
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- divider->table, divider->width, divider->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, divider->table, divider->width, divider->flags);
}
static int m10v_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/clk-versaclock3.c b/drivers/clk/clk-versaclock3.c
index 1849863dbd67..27b6cf70f3ae 100644
--- a/drivers/clk/clk-versaclock3.c
+++ b/drivers/clk/clk-versaclock3.c
@@ -523,11 +523,8 @@ static int vc3_div_determine_rate(struct clk_hw *hw,
return 0;
}
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- div_data->table,
- div_data->width, div_data->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, div_data->table, div_data->width,
+ div_data->flags);
}
static int vc3_div_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisilicon/clkdivider-hi6220.c
index 6bae18a84cb6..fd7ceb92d651 100644
--- a/drivers/clk/hisilicon/clkdivider-hi6220.c
+++ b/drivers/clk/hisilicon/clkdivider-hi6220.c
@@ -60,10 +60,8 @@ static int hi6220_clkdiv_determine_rate(struct clk_hw *hw,
{
struct hi6220_clk_divider *dclk = to_hi6220_clk_divider(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, dclk->table,
- dclk->width, CLK_DIVIDER_ROUND_CLOSEST);
-
- return 0;
+ return divider_determine_rate(hw, req, dclk->table, dclk->width,
+ CLK_DIVIDER_ROUND_CLOSEST);
}
static int hi6220_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/mediatek/clk-mt7981-eth.c b/drivers/clk/mediatek/clk-mt7981-eth.c
index 906aec9ddff5..0655ebb6c561 100644
--- a/drivers/clk/mediatek/clk-mt7981-eth.c
+++ b/drivers/clk/mediatek/clk-mt7981-eth.c
@@ -31,7 +31,7 @@ static const struct mtk_gate_regs sgmii0_cg_regs = {
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
}
-static const struct mtk_gate sgmii0_clks[] __initconst = {
+static const struct mtk_gate sgmii0_clks[] = {
GATE_SGMII0(CLK_SGM0_TX_EN, "sgm0_tx_en", "usb_tx250m", 2),
GATE_SGMII0(CLK_SGM0_RX_EN, "sgm0_rx_en", "usb_eq_rx250m", 3),
GATE_SGMII0(CLK_SGM0_CK0_EN, "sgm0_ck0_en", "usb_ln0", 4),
@@ -53,7 +53,7 @@ static const struct mtk_gate_regs sgmii1_cg_regs = {
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
}
-static const struct mtk_gate sgmii1_clks[] __initconst = {
+static const struct mtk_gate sgmii1_clks[] = {
GATE_SGMII1(CLK_SGM1_TX_EN, "sgm1_tx_en", "usb_tx250m", 2),
GATE_SGMII1(CLK_SGM1_RX_EN, "sgm1_rx_en", "usb_eq_rx250m", 3),
GATE_SGMII1(CLK_SGM1_CK1_EN, "sgm1_ck1_en", "usb_ln0", 4),
@@ -75,7 +75,7 @@ static const struct mtk_gate_regs eth_cg_regs = {
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
}
-static const struct mtk_gate eth_clks[] __initconst = {
+static const struct mtk_gate eth_clks[] = {
GATE_ETH(CLK_ETH_FE_EN, "eth_fe_en", "netsys_2x", 6),
GATE_ETH(CLK_ETH_GP2_EN, "eth_gp2_en", "sgm_325m", 7),
GATE_ETH(CLK_ETH_GP1_EN, "eth_gp1_en", "sgm_325m", 8),
diff --git a/drivers/clk/mediatek/clk-mt8196-mfg.c b/drivers/clk/mediatek/clk-mt8196-mfg.c
index ae1eb9de79ae..f40795b47ff1 100644
--- a/drivers/clk/mediatek/clk-mt8196-mfg.c
+++ b/drivers/clk/mediatek/clk-mt8196-mfg.c
@@ -58,24 +58,25 @@
.pcw_shift = _pcw_shift, \
.pcwbits = _pcwbits, \
.pcwibits = MT8196_INTEGER_BITS, \
+ .parent_name = "mfg_eb", \
}
static const struct mtk_pll_data mfg_ao_plls[] = {
- PLL(CLK_MFG_AO_MFGPLL, "mfgpll", MFGPLL_CON0, MFGPLL_CON0, 0, 0, 0,
- BIT(0), MFGPLL_CON1, 24, 0, 0, 0,
+ PLL(CLK_MFG_AO_MFGPLL, "mfgpll", MFGPLL_CON0, MFGPLL_CON0, 0, 0,
+ PLL_PARENT_EN, BIT(0), MFGPLL_CON1, 24, 0, 0, 0,
MFGPLL_CON1, 0, 22),
};
static const struct mtk_pll_data mfgsc0_ao_plls[] = {
PLL(CLK_MFGSC0_AO_MFGPLL_SC0, "mfgpll-sc0", MFGPLL_SC0_CON0,
- MFGPLL_SC0_CON0, 0, 0, 0, BIT(0), MFGPLL_SC0_CON1, 24, 0, 0, 0,
- MFGPLL_SC0_CON1, 0, 22),
+ MFGPLL_SC0_CON0, 0, 0, PLL_PARENT_EN, BIT(0), MFGPLL_SC0_CON1, 24,
+ 0, 0, 0, MFGPLL_SC0_CON1, 0, 22),
};
static const struct mtk_pll_data mfgsc1_ao_plls[] = {
PLL(CLK_MFGSC1_AO_MFGPLL_SC1, "mfgpll-sc1", MFGPLL_SC1_CON0,
- MFGPLL_SC1_CON0, 0, 0, 0, BIT(0), MFGPLL_SC1_CON1, 24, 0, 0, 0,
- MFGPLL_SC1_CON1, 0, 22),
+ MFGPLL_SC1_CON0, 0, 0, PLL_PARENT_EN, BIT(0), MFGPLL_SC1_CON1, 24,
+ 0, 0, 0, MFGPLL_SC1_CON1, 0, 22),
};
static const struct of_device_id of_match_clk_mt8196_mfg[] = {
diff --git a/drivers/clk/mediatek/clk-mt8516.c b/drivers/clk/mediatek/clk-mt8516.c
index 21eb052b0a53..342a59019fea 100644
--- a/drivers/clk/mediatek/clk-mt8516.c
+++ b/drivers/clk/mediatek/clk-mt8516.c
@@ -544,7 +544,7 @@ static const struct mtk_gate_regs top5_cg_regs = {
#define GATE_TOP5(_id, _name, _parent, _shift) \
GATE_MTK(_id, _name, _parent, &top5_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
-static const struct mtk_gate top_clks[] __initconst = {
+static const struct mtk_gate top_clks[] = {
/* TOP1 */
GATE_TOP1(CLK_TOP_THEM, "them", "ahb_infra_sel", 1),
GATE_TOP1(CLK_TOP_APDMA, "apdma", "ahb_infra_sel", 2),
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 19cd27941747..deafe55a96cb 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -497,14 +497,16 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,
if (mcd->need_runtime_pm) {
- devm_pm_runtime_enable(&pdev->dev);
+ r = devm_pm_runtime_enable(&pdev->dev);
+ if (r)
+ goto unmap_io;
/*
* Do a pm_runtime_resume_and_get() to workaround a possible
* deadlock between clk_register() and the genpd framework.
*/
r = pm_runtime_resume_and_get(&pdev->dev);
if (r)
- return r;
+ goto unmap_io;
}
/* Calculate how many clk_hw_onecell_data entries to allocate */
@@ -618,11 +620,11 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,
free_data:
mtk_free_clk_data(clk_data);
free_base:
- if (mcd->shared_io && base)
- iounmap(base);
-
if (mcd->need_runtime_pm)
pm_runtime_put(&pdev->dev);
+unmap_io:
+ if (mcd->shared_io && base)
+ iounmap(base);
return r;
}
diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index cd2b6ce551c6..de3eb0267055 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -358,6 +358,9 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,
init.name = data->name;
init.flags = (data->flags & PLL_AO) ? CLK_IS_CRITICAL : 0;
+ if (data->flags & PLL_PARENT_EN)
+ init.flags |= CLK_OPS_PARENT_ENABLE;
+
init.ops = pll_ops;
if (data->parent_name)
init.parent_names = &data->parent_name;
diff --git a/drivers/clk/mediatek/clk-pll.h b/drivers/clk/mediatek/clk-pll.h
index d71c150ce83e..de5a8fb7cbcf 100644
--- a/drivers/clk/mediatek/clk-pll.h
+++ b/drivers/clk/mediatek/clk-pll.h
@@ -21,6 +21,7 @@ struct mtk_pll_div_table {
#define HAVE_RST_BAR BIT(0)
#define PLL_AO BIT(1)
+#define PLL_PARENT_EN BIT(2)
#define POSTDIV_MASK GENMASK(2, 0)
struct mtk_pll_data {
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index 185b6348251d..d0d4c7b6dc82 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -777,12 +777,23 @@ static struct clk_regmap g12a_hdmi_pll_dco = {
},
};
+/*
+ * G12/SM1 hdmi OD dividers are POWER_OF_TWO dividers but limited to /4.
+ * A divider value of 3 should map to /8 but instead map /4 so ignore it.
+ */
+static const struct clk_div_table g12a_hdmi_pll_od_div_table[] = {
+ { .val = 0, .div = 1 },
+ { .val = 1, .div = 2 },
+ { .val = 2, .div = 4 },
+ { /* sentinel */ }
+};
+
static struct clk_regmap g12a_hdmi_pll_od = {
.data = &(struct clk_regmap_div_data){
.offset = HHI_HDMI_PLL_CNTL0,
.shift = 16,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = g12a_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll_od",
@@ -800,7 +811,7 @@ static struct clk_regmap g12a_hdmi_pll_od2 = {
.offset = HHI_HDMI_PLL_CNTL0,
.shift = 18,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = g12a_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll_od2",
@@ -818,7 +829,7 @@ static struct clk_regmap g12a_hdmi_pll = {
.offset = HHI_HDMI_PLL_CNTL0,
.shift = 20,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = g12a_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll",
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 5a229c4ffae1..ec9a3414875a 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -349,12 +349,23 @@ static struct clk_regmap gxbb_hdmi_pll = {
},
};
+/*
+ * GXL hdmi OD dividers are POWER_OF_TWO dividers but limited to /4.
+ * A divider value of 3 should map to /8 but instead map /4 so ignore it.
+ */
+static const struct clk_div_table gxl_hdmi_pll_od_div_table[] = {
+ { .val = 0, .div = 1 },
+ { .val = 1, .div = 2 },
+ { .val = 2, .div = 4 },
+ { /* sentinel */ }
+};
+
static struct clk_regmap gxl_hdmi_pll_od = {
.data = &(struct clk_regmap_div_data){
.offset = HHI_HDMI_PLL_CNTL + 8,
.shift = 21,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = gxl_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll_od",
@@ -372,7 +383,7 @@ static struct clk_regmap gxl_hdmi_pll_od2 = {
.offset = HHI_HDMI_PLL_CNTL + 8,
.shift = 23,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = gxl_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll_od2",
@@ -390,7 +401,7 @@ static struct clk_regmap gxl_hdmi_pll = {
.offset = HHI_HDMI_PLL_CNTL + 8,
.shift = 19,
.width = 2,
- .flags = CLK_DIVIDER_POWER_OF_TWO,
+ .table = gxl_hdmi_pll_od_div_table,
},
.hw.init = &(struct clk_init_data){
.name = "hdmi_pll",
diff --git a/drivers/clk/microchip/clk-core.c b/drivers/clk/microchip/clk-core.c
index b34348d491f3..a0163441dfe5 100644
--- a/drivers/clk/microchip/clk-core.c
+++ b/drivers/clk/microchip/clk-core.c
@@ -780,15 +780,6 @@ static unsigned long sclk_get_rate(struct clk_hw *hw, unsigned long parent_rate)
return parent_rate / div;
}
-static int sclk_determine_rate(struct clk_hw *hw,
- struct clk_rate_request *req)
-{
- req->rate = calc_best_divided_rate(req->rate, req->best_parent_rate,
- SLEW_SYSDIV, 1);
-
- return 0;
-}
-
static int sclk_set_rate(struct clk_hw *hw,
unsigned long rate, unsigned long parent_rate)
{
@@ -912,7 +903,6 @@ static int sclk_init(struct clk_hw *hw)
const struct clk_ops pic32_sclk_ops = {
.get_parent = sclk_get_parent,
.set_parent = sclk_set_parent,
- .determine_rate = sclk_determine_rate,
.set_rate = sclk_set_rate,
.recalc_rate = sclk_get_rate,
.init = sclk_init,
diff --git a/drivers/clk/nuvoton/clk-ma35d1-divider.c b/drivers/clk/nuvoton/clk-ma35d1-divider.c
index e39f53d5bf45..e992e7c30341 100644
--- a/drivers/clk/nuvoton/clk-ma35d1-divider.c
+++ b/drivers/clk/nuvoton/clk-ma35d1-divider.c
@@ -44,11 +44,8 @@ static int ma35d1_clkdiv_determine_rate(struct clk_hw *hw,
{
struct ma35d1_adc_clk_div *dclk = to_ma35d1_adc_clk_div(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- dclk->table, dclk->width,
- CLK_DIVIDER_ROUND_CLOSEST);
-
- return 0;
+ return divider_determine_rate(hw, req, dclk->table, dclk->width,
+ CLK_DIVIDER_ROUND_CLOSEST);
}
static int ma35d1_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate)
diff --git a/drivers/clk/nxp/clk-lpc32xx.c b/drivers/clk/nxp/clk-lpc32xx.c
index 23f980cf6a2b..ae2fa5341a2e 100644
--- a/drivers/clk/nxp/clk-lpc32xx.c
+++ b/drivers/clk/nxp/clk-lpc32xx.c
@@ -975,10 +975,8 @@ static int clk_divider_determine_rate(struct clk_hw *hw,
return 0;
}
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- divider->table, divider->width, divider->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, divider->table, divider->width,
+ divider->flags);
}
static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index 6aeba40358c1..a84e8bee6534 100644
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -1257,11 +1257,8 @@ static int clk_alpha_pll_postdiv_determine_rate(struct clk_hw *hw,
else
table = clk_alpha_div_table;
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- table, pll->width,
- CLK_DIVIDER_POWER_OF_TWO);
-
- return 0;
+ return divider_determine_rate(hw, req, table, pll->width,
+ CLK_DIVIDER_POWER_OF_TWO);
}
static int clk_alpha_pll_postdiv_ro_determine_rate(struct clk_hw *hw,
@@ -1617,11 +1614,8 @@ static int clk_trion_pll_postdiv_determine_rate(struct clk_hw *hw,
{
struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- pll->post_div_table,
- pll->width, CLK_DIVIDER_ROUND_CLOSEST);
-
- return 0;
+ return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
+ CLK_DIVIDER_ROUND_CLOSEST);
};
static int
@@ -1657,11 +1651,8 @@ static int clk_alpha_pll_postdiv_fabia_determine_rate(struct clk_hw *hw,
{
struct clk_alpha_pll_postdiv *pll = to_clk_alpha_pll_postdiv(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- pll->post_div_table,
- pll->width, CLK_DIVIDER_ROUND_CLOSEST);
-
- return 0;
+ return divider_determine_rate(hw, req, pll->post_div_table, pll->width,
+ CLK_DIVIDER_ROUND_CLOSEST);
}
static int clk_alpha_pll_postdiv_fabia_set_rate(struct clk_hw *hw,
diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
index e18cb8807d73..d0a5847f9111 100644
--- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c
@@ -755,7 +755,7 @@ static int clk_rcg2_get_duty_cycle(struct clk_hw *hw, struct clk_duty *duty)
static int clk_rcg2_set_duty_cycle(struct clk_hw *hw, struct clk_duty *duty)
{
struct clk_rcg2 *rcg = to_clk_rcg2(hw);
- u32 notn_m, n, m, d, not2d, mask, duty_per, cfg;
+ u32 notn_m, n, m, d, not2d, mask, cfg;
int ret;
/* Duty-cycle cannot be modified for non-MND RCGs */
@@ -774,10 +774,8 @@ static int clk_rcg2_set_duty_cycle(struct clk_hw *hw, struct clk_duty *duty)
n = (~(notn_m) + m) & mask;
- duty_per = (duty->num * 100) / duty->den;
-
/* Calculate 2d value */
- d = DIV_ROUND_CLOSEST(n * duty_per * 2, 100);
+ d = DIV_ROUND_CLOSEST(n * duty->num * 2, duty->den);
/*
* Check bit widths of 2d. If D is too big reduce duty cycle.
@@ -1266,6 +1264,7 @@ static int clk_gfx3d_determine_rate(struct clk_hw *hw,
if (req->max_rate < parent_req.max_rate)
parent_req.max_rate = req->max_rate;
+ parent_req.best_parent_hw = req->best_parent_hw;
ret = __clk_determine_rate(req->best_parent_hw, &parent_req);
if (ret)
return ret;
diff --git a/drivers/clk/qcom/clk-regmap-divider.c b/drivers/clk/qcom/clk-regmap-divider.c
index 4f5395f0ab6d..672e82caf205 100644
--- a/drivers/clk/qcom/clk-regmap-divider.c
+++ b/drivers/clk/qcom/clk-regmap-divider.c
@@ -26,24 +26,16 @@ static int div_ro_determine_rate(struct clk_hw *hw,
val >>= divider->shift;
val &= BIT(divider->width) - 1;
- req->rate = divider_ro_round_rate(hw, req->rate,
- &req->best_parent_rate, NULL,
- divider->width,
- CLK_DIVIDER_ROUND_CLOSEST, val);
-
- return 0;
+ return divider_ro_determine_rate(hw, req, NULL, divider->width,
+ CLK_DIVIDER_ROUND_CLOSEST, val);
}
static int div_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
{
struct clk_regmap_div *divider = to_clk_regmap_div(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- NULL,
- divider->width,
- CLK_DIVIDER_ROUND_CLOSEST);
-
- return 0;
+ return divider_determine_rate(hw, req, NULL, divider->width,
+ CLK_DIVIDER_ROUND_CLOSEST);
}
static int div_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index 121591886774..eec369d2173b 100644
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -454,7 +454,7 @@ int qcom_cc_probe_by_index(struct platform_device *pdev, int index,
base = devm_platform_ioremap_resource(pdev, index);
if (IS_ERR(base))
- return -ENOMEM;
+ return PTR_ERR(base);
regmap = devm_regmap_init_mmio(&pdev->dev, base, desc->config);
if (IS_ERR(regmap))
diff --git a/drivers/clk/qcom/dispcc-sdm845.c b/drivers/clk/qcom/dispcc-sdm845.c
index 2f9e9665d7e9..78e43f6d7502 100644
--- a/drivers/clk/qcom/dispcc-sdm845.c
+++ b/drivers/clk/qcom/dispcc-sdm845.c
@@ -280,7 +280,7 @@ static struct clk_rcg2 disp_cc_mdss_pclk0_clk_src = {
.name = "disp_cc_mdss_pclk0_clk_src",
.parent_data = disp_cc_parent_data_4,
.num_parents = ARRAY_SIZE(disp_cc_parent_data_4),
- .flags = CLK_SET_RATE_PARENT,
+ .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE,
.ops = &clk_pixel_ops,
},
};
@@ -295,7 +295,7 @@ static struct clk_rcg2 disp_cc_mdss_pclk1_clk_src = {
.name = "disp_cc_mdss_pclk1_clk_src",
.parent_data = disp_cc_parent_data_4,
.num_parents = ARRAY_SIZE(disp_cc_parent_data_4),
- .flags = CLK_SET_RATE_PARENT,
+ .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE,
.ops = &clk_pixel_ops,
},
};
diff --git a/drivers/clk/qcom/dispcc-sm7150.c b/drivers/clk/qcom/dispcc-sm7150.c
index 811d380a8e9f..ed8e34ffd69b 100644
--- a/drivers/clk/qcom/dispcc-sm7150.c
+++ b/drivers/clk/qcom/dispcc-sm7150.c
@@ -371,7 +371,7 @@ static struct clk_rcg2 dispcc_mdss_pclk1_clk_src = {
.name = "dispcc_mdss_pclk1_clk_src",
.parent_data = dispcc_parent_data_4,
.num_parents = ARRAY_SIZE(dispcc_parent_data_4),
- .flags = CLK_SET_RATE_PARENT,
+ .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE,
.ops = &clk_pixel_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-glymur.c b/drivers/clk/qcom/gcc-glymur.c
index deab819576d0..238e205735ed 100644
--- a/drivers/clk/qcom/gcc-glymur.c
+++ b/drivers/clk/qcom/gcc-glymur.c
@@ -2317,7 +2317,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_17,
.num_parents = ARRAY_SIZE(gcc_parent_data_17),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -2339,7 +2339,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_3,
.num_parents = ARRAY_SIZE(gcc_parent_data_3),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-ipq5018.c b/drivers/clk/qcom/gcc-ipq5018.c
index dcda2be8c1a5..64792cda0620 100644
--- a/drivers/clk/qcom/gcc-ipq5018.c
+++ b/drivers/clk/qcom/gcc-ipq5018.c
@@ -1340,6 +1340,7 @@ static struct clk_branch gcc_sleep_clk_src = {
.name = "gcc_sleep_clk_src",
.parent_data = gcc_sleep_clk_data,
.num_parents = ARRAY_SIZE(gcc_sleep_clk_data),
+ .flags = CLK_IS_CRITICAL,
.ops = &clk_branch2_ops,
},
},
diff --git a/drivers/clk/qcom/gcc-milos.c b/drivers/clk/qcom/gcc-milos.c
index c9d61b05bafa..81fa09ec55d7 100644
--- a/drivers/clk/qcom/gcc-milos.c
+++ b/drivers/clk/qcom/gcc-milos.c
@@ -917,7 +917,7 @@ static struct clk_rcg2 gcc_sdcc1_apps_clk_src = {
.name = "gcc_sdcc1_apps_clk_src",
.parent_data = gcc_parent_data_9,
.num_parents = ARRAY_SIZE(gcc_parent_data_9),
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -938,7 +938,7 @@ static struct clk_rcg2 gcc_sdcc1_ice_core_clk_src = {
.name = "gcc_sdcc1_ice_core_clk_src",
.parent_data = gcc_parent_data_10,
.num_parents = ARRAY_SIZE(gcc_parent_data_10),
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -962,7 +962,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.name = "gcc_sdcc2_apps_clk_src",
.parent_data = gcc_parent_data_11,
.num_parents = ARRAY_SIZE(gcc_parent_data_11),
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-msm8917.c b/drivers/clk/qcom/gcc-msm8917.c
index 0a1aa623cd49..9d1c5a9953e2 100644
--- a/drivers/clk/qcom/gcc-msm8917.c
+++ b/drivers/clk/qcom/gcc-msm8917.c
@@ -3409,7 +3409,6 @@ static struct gdsc cpp_gdsc = {
.pd = {
.name = "cpp_gdsc",
},
- .flags = ALWAYS_ON,
.pwrsts = PWRSTS_OFF_ON,
};
diff --git a/drivers/clk/qcom/gcc-msm8953.c b/drivers/clk/qcom/gcc-msm8953.c
index 8f29ecc74c50..8fe1d3e42144 100644
--- a/drivers/clk/qcom/gcc-msm8953.c
+++ b/drivers/clk/qcom/gcc-msm8953.c
@@ -3946,7 +3946,6 @@ static struct gdsc cpp_gdsc = {
.pd = {
.name = "cpp_gdsc",
},
- .flags = ALWAYS_ON,
.pwrsts = PWRSTS_OFF_ON,
};
diff --git a/drivers/clk/qcom/gcc-qdu1000.c b/drivers/clk/qcom/gcc-qdu1000.c
index dbe9e9437939..915bb9b4ff81 100644
--- a/drivers/clk/qcom/gcc-qdu1000.c
+++ b/drivers/clk/qcom/gcc-qdu1000.c
@@ -904,7 +904,7 @@ static struct clk_rcg2 gcc_sdcc5_apps_clk_src = {
.name = "gcc_sdcc5_apps_clk_src",
.parent_data = gcc_parent_data_8,
.num_parents = ARRAY_SIZE(gcc_parent_data_8),
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -923,7 +923,7 @@ static struct clk_rcg2 gcc_sdcc5_ice_core_clk_src = {
.name = "gcc_sdcc5_ice_core_clk_src",
.parent_data = gcc_parent_data_2,
.num_parents = ARRAY_SIZE(gcc_parent_data_2),
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sdx75.c b/drivers/clk/qcom/gcc-sdx75.c
index 453a6bf8e878..1f3cd58483a2 100644
--- a/drivers/clk/qcom/gcc-sdx75.c
+++ b/drivers/clk/qcom/gcc-sdx75.c
@@ -1033,7 +1033,7 @@ static struct clk_rcg2 gcc_sdcc1_apps_clk_src = {
.name = "gcc_sdcc1_apps_clk_src",
.parent_data = gcc_parent_data_17,
.num_parents = ARRAY_SIZE(gcc_parent_data_17),
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1057,7 +1057,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.name = "gcc_sdcc2_apps_clk_src",
.parent_data = gcc_parent_data_18,
.num_parents = ARRAY_SIZE(gcc_parent_data_18),
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sm4450.c b/drivers/clk/qcom/gcc-sm4450.c
index e2d9e4691c5b..023d840e9f4e 100644
--- a/drivers/clk/qcom/gcc-sm4450.c
+++ b/drivers/clk/qcom/gcc-sm4450.c
@@ -769,7 +769,7 @@ static struct clk_rcg2 gcc_sdcc1_apps_clk_src = {
.parent_data = gcc_parent_data_4,
.num_parents = ARRAY_SIZE(gcc_parent_data_4),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -791,7 +791,7 @@ static struct clk_rcg2 gcc_sdcc1_ice_core_clk_src = {
.parent_data = gcc_parent_data_4,
.num_parents = ARRAY_SIZE(gcc_parent_data_4),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -815,7 +815,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_6,
.num_parents = ARRAY_SIZE(gcc_parent_data_6),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sm8450.c b/drivers/clk/qcom/gcc-sm8450.c
index 65d7d52bce03..b18bb34889ab 100644
--- a/drivers/clk/qcom/gcc-sm8450.c
+++ b/drivers/clk/qcom/gcc-sm8450.c
@@ -1034,7 +1034,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_7,
.num_parents = ARRAY_SIZE(gcc_parent_data_7),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1057,7 +1057,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_0,
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sm8550.c b/drivers/clk/qcom/gcc-sm8550.c
index 862a9bf73bcb..36a5b7de5b55 100644
--- a/drivers/clk/qcom/gcc-sm8550.c
+++ b/drivers/clk/qcom/gcc-sm8550.c
@@ -1025,7 +1025,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_9,
.num_parents = ARRAY_SIZE(gcc_parent_data_9),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1048,7 +1048,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_0,
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sm8650.c b/drivers/clk/qcom/gcc-sm8650.c
index 24f98062b9dd..2dd6444ce036 100644
--- a/drivers/clk/qcom/gcc-sm8650.c
+++ b/drivers/clk/qcom/gcc-sm8650.c
@@ -1257,7 +1257,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_11,
.num_parents = ARRAY_SIZE(gcc_parent_data_11),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1279,7 +1279,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_0,
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_shared_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-sm8750.c b/drivers/clk/qcom/gcc-sm8750.c
index def86b71a3da..db81569dd4b1 100644
--- a/drivers/clk/qcom/gcc-sm8750.c
+++ b/drivers/clk/qcom/gcc-sm8750.c
@@ -1030,7 +1030,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_8,
.num_parents = ARRAY_SIZE(gcc_parent_data_8),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1052,7 +1052,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_0,
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/qcom/gcc-x1e80100.c b/drivers/clk/qcom/gcc-x1e80100.c
index b63c8abdd2fc..e46e65e63151 100644
--- a/drivers/clk/qcom/gcc-x1e80100.c
+++ b/drivers/clk/qcom/gcc-x1e80100.c
@@ -1516,7 +1516,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
.parent_data = gcc_parent_data_9,
.num_parents = ARRAY_SIZE(gcc_parent_data_9),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
@@ -1538,7 +1538,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
.parent_data = gcc_parent_data_0,
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
.flags = CLK_SET_RATE_PARENT,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_shared_floor_ops,
},
};
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 2601df3b1066..9ac9d13e87de 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -693,7 +693,7 @@ void rockchip_clk_register_late_branches(struct device *dev,
break;
}
- if (!pdev)
+ if (IS_ERR_OR_NULL(pdev))
dev_err(dev, "failed to register device for clock %s\n", list->name);
}
}
diff --git a/drivers/clk/sophgo/clk-sg2042-clkgen.c b/drivers/clk/sophgo/clk-sg2042-clkgen.c
index 683661b71787..9725ac4e050a 100644
--- a/drivers/clk/sophgo/clk-sg2042-clkgen.c
+++ b/drivers/clk/sophgo/clk-sg2042-clkgen.c
@@ -180,7 +180,6 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
struct clk_rate_request *req)
{
struct sg2042_divider_clock *divider = to_sg2042_clk_divider(hw);
- unsigned long ret_rate;
u32 bestdiv;
/* if read only, just return current value */
@@ -191,17 +190,13 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
bestdiv = readl(divider->reg) >> divider->shift;
bestdiv &= clk_div_mask(divider->width);
}
- ret_rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
- } else {
- ret_rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, NULL,
- divider->width, divider->div_flags);
- }
+ req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
- pr_debug("--> %s: divider_round_rate: val = %ld\n",
- clk_hw_get_name(hw), ret_rate);
- req->rate = ret_rate;
+ return 0;
+ }
- return 0;
+ return divider_determine_rate(hw, req, NULL, divider->width,
+ divider->div_flags);
}
static int sg2042_clk_divider_set_rate(struct clk_hw *hw,
diff --git a/drivers/clk/spacemit/Makefile b/drivers/clk/spacemit/Makefile
index 5ec6da61db98..ad2bf315109b 100644
--- a/drivers/clk/spacemit/Makefile
+++ b/drivers/clk/spacemit/Makefile
@@ -1,5 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_SPACEMIT_K1_CCU) = spacemit-ccu-k1.o
-spacemit-ccu-k1-y = ccu_pll.o ccu_mix.o ccu_ddn.o
+obj-$(CONFIG_SPACEMIT_CCU) += spacemit-ccu.o
+spacemit-ccu-y += ccu_common.o
+spacemit-ccu-y += ccu_pll.o
+spacemit-ccu-y += ccu_mix.o
+spacemit-ccu-y += ccu_ddn.o
+
+obj-$(CONFIG_SPACEMIT_K1_CCU) += spacemit-ccu-k1.o
spacemit-ccu-k1-y += ccu-k1.o
diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c
index 4761bc1e3b6e..01d9485b615d 100644
--- a/drivers/clk/spacemit/ccu-k1.c
+++ b/drivers/clk/spacemit/ccu-k1.c
@@ -1204,6 +1204,7 @@ static struct platform_driver k1_ccu_driver = {
};
module_platform_driver(k1_ccu_driver);
+MODULE_IMPORT_NS("CLK_SPACEMIT");
MODULE_DESCRIPTION("SpacemiT K1 CCU driver");
MODULE_AUTHOR("Haylen Chu <heylenay@4d2.org>");
MODULE_LICENSE("GPL");
diff --git a/drivers/clk/spacemit/ccu_common.c b/drivers/clk/spacemit/ccu_common.c
new file mode 100644
index 000000000000..4412c4104dab
--- /dev/null
+++ b/drivers/clk/spacemit/ccu_common.c
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <linux/module.h>
+
+MODULE_DESCRIPTION("SpacemiT CCU common clock driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/clk/spacemit/ccu_ddn.c b/drivers/clk/spacemit/ccu_ddn.c
index 5b16e273bee5..b5540e0781ff 100644
--- a/drivers/clk/spacemit/ccu_ddn.c
+++ b/drivers/clk/spacemit/ccu_ddn.c
@@ -84,3 +84,4 @@ const struct clk_ops spacemit_ccu_ddn_ops = {
.determine_rate = ccu_ddn_determine_rate,
.set_rate = ccu_ddn_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_ddn_ops, "CLK_SPACEMIT");
diff --git a/drivers/clk/spacemit/ccu_mix.c b/drivers/clk/spacemit/ccu_mix.c
index 7b7990875372..67f8b12b4f5b 100644
--- a/drivers/clk/spacemit/ccu_mix.c
+++ b/drivers/clk/spacemit/ccu_mix.c
@@ -198,24 +198,28 @@ const struct clk_ops spacemit_ccu_gate_ops = {
.enable = ccu_gate_enable,
.is_enabled = ccu_gate_is_enabled,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_gate_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_factor_ops = {
.determine_rate = ccu_factor_determine_rate,
.recalc_rate = ccu_factor_recalc_rate,
.set_rate = ccu_factor_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_factor_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_mux_ops = {
.determine_rate = ccu_mix_determine_rate,
.get_parent = ccu_mux_get_parent,
.set_parent = ccu_mux_set_parent,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_mux_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_div_ops = {
.determine_rate = ccu_mix_determine_rate,
.recalc_rate = ccu_div_recalc_rate,
.set_rate = ccu_mix_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_div_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_factor_gate_ops = {
.disable = ccu_gate_disable,
@@ -226,6 +230,7 @@ const struct clk_ops spacemit_ccu_factor_gate_ops = {
.recalc_rate = ccu_factor_recalc_rate,
.set_rate = ccu_factor_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_factor_gate_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_mux_gate_ops = {
.disable = ccu_gate_disable,
@@ -236,6 +241,7 @@ const struct clk_ops spacemit_ccu_mux_gate_ops = {
.get_parent = ccu_mux_get_parent,
.set_parent = ccu_mux_set_parent,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_mux_gate_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_div_gate_ops = {
.disable = ccu_gate_disable,
@@ -246,6 +252,7 @@ const struct clk_ops spacemit_ccu_div_gate_ops = {
.recalc_rate = ccu_div_recalc_rate,
.set_rate = ccu_mix_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_div_gate_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_mux_div_gate_ops = {
.disable = ccu_gate_disable,
@@ -259,6 +266,7 @@ const struct clk_ops spacemit_ccu_mux_div_gate_ops = {
.recalc_rate = ccu_div_recalc_rate,
.set_rate = ccu_mix_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_mux_div_gate_ops, "CLK_SPACEMIT");
const struct clk_ops spacemit_ccu_mux_div_ops = {
.get_parent = ccu_mux_get_parent,
@@ -268,3 +276,4 @@ const struct clk_ops spacemit_ccu_mux_div_ops = {
.recalc_rate = ccu_div_recalc_rate,
.set_rate = ccu_mix_set_rate,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_mux_div_ops, "CLK_SPACEMIT");
diff --git a/drivers/clk/spacemit/ccu_pll.c b/drivers/clk/spacemit/ccu_pll.c
index d92f0dae65a4..76d0244873d8 100644
--- a/drivers/clk/spacemit/ccu_pll.c
+++ b/drivers/clk/spacemit/ccu_pll.c
@@ -157,3 +157,4 @@ const struct clk_ops spacemit_ccu_pll_ops = {
.determine_rate = ccu_pll_determine_rate,
.is_enabled = ccu_pll_is_enabled,
};
+EXPORT_SYMBOL_NS_GPL(spacemit_ccu_pll_ops, "CLK_SPACEMIT");
diff --git a/drivers/clk/sprd/div.c b/drivers/clk/sprd/div.c
index 013423881968..cd57163a7204 100644
--- a/drivers/clk/sprd/div.c
+++ b/drivers/clk/sprd/div.c
@@ -14,11 +14,7 @@ static int sprd_div_determine_rate(struct clk_hw *hw,
{
struct sprd_div *cd = hw_to_sprd_div(hw);
- req->rate = divider_round_rate(&cd->common.hw, req->rate,
- &req->best_parent_rate,
- NULL, cd->div.width, 0);
-
- return 0;
+ return divider_determine_rate(&cd->common.hw, req, NULL, cd->div.width, 0);
}
unsigned long sprd_div_helper_recalc_rate(struct sprd_clk_common *common,
diff --git a/drivers/clk/stm32/clk-stm32-core.c b/drivers/clk/stm32/clk-stm32-core.c
index 72825b9c36a4..e921c25a929c 100644
--- a/drivers/clk/stm32/clk-stm32-core.c
+++ b/drivers/clk/stm32/clk-stm32-core.c
@@ -369,22 +369,14 @@ static int clk_stm32_divider_determine_rate(struct clk_hw *hw,
val = readl(div->base + divider->offset) >> divider->shift;
val &= clk_div_mask(divider->width);
- req->rate = divider_ro_round_rate(hw, req->rate,
- &req->best_parent_rate,
- divider->table,
- divider->width,
- divider->flags, val);
-
- return 0;
+ return divider_ro_determine_rate(hw, req,
+ divider->table,
+ divider->width,
+ divider->flags, val);
}
- req->rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
- req->rate,
- &req->best_parent_rate,
- divider->table,
- divider->width, divider->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, divider->table, divider->width,
+ divider->flags);
}
static unsigned long clk_stm32_divider_recalc_rate(struct clk_hw *hw,
@@ -441,7 +433,6 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
{
struct clk_stm32_composite *composite = to_clk_stm32_composite(hw);
const struct stm32_div_cfg *divider;
- long rate;
if (composite->div_id == NO_STM32_DIV)
return 0;
@@ -455,24 +446,13 @@ static int clk_stm32_composite_determine_rate(struct clk_hw *hw,
val = readl(composite->base + divider->offset) >> divider->shift;
val &= clk_div_mask(divider->width);
- rate = divider_ro_round_rate(hw, req->rate, &req->best_parent_rate,
- divider->table, divider->width, divider->flags,
- val);
- if (rate < 0)
- return rate;
-
- req->rate = rate;
- return 0;
+ return divider_ro_determine_rate(hw, req, divider->table,
+ divider->width, divider->flags,
+ val);
}
- rate = divider_round_rate_parent(hw, clk_hw_get_parent(hw),
- req->rate, &req->best_parent_rate,
- divider->table, divider->width, divider->flags);
- if (rate < 0)
- return rate;
-
- req->rate = rate;
- return 0;
+ return divider_determine_rate(hw, req, divider->table, divider->width,
+ divider->flags);
}
static u8 clk_stm32_composite_get_parent(struct clk_hw *hw)
diff --git a/drivers/clk/thead/clk-th1520-ap.c b/drivers/clk/thead/clk-th1520-ap.c
index 71ad03a998e8..d870f0c665f8 100644
--- a/drivers/clk/thead/clk-th1520-ap.c
+++ b/drivers/clk/thead/clk-th1520-ap.c
@@ -8,11 +8,14 @@
#include <dt-bindings/clock/thead,th1520-clk-ap.h>
#include <linux/bitfield.h>
#include <linux/clk-provider.h>
+#include <linux/delay.h>
#include <linux/device.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
+#define TH1520_PLL_STS 0x80
+
#define TH1520_PLL_POSTDIV2 GENMASK(26, 24)
#define TH1520_PLL_POSTDIV1 GENMASK(22, 20)
#define TH1520_PLL_FBDIV GENMASK(19, 8)
@@ -23,6 +26,13 @@
#define TH1520_PLL_FRAC GENMASK(23, 0)
#define TH1520_PLL_FRAC_BITS 24
+/*
+ * All PLLs in TH1520 take 21250ns at maximum to lock, let's take its double
+ * for safety.
+ */
+#define TH1520_PLL_LOCK_TIMEOUT_US 44
+#define TH1520_PLL_STABLE_DELAY_US 30
+
struct ccu_internal {
u8 shift;
u8 width;
@@ -64,6 +74,7 @@ struct ccu_div {
struct ccu_pll {
struct ccu_common common;
+ u32 lock_sts_mask;
};
#define TH_CCU_ARG(_shift, _width) \
@@ -299,9 +310,21 @@ static void ccu_pll_disable(struct clk_hw *hw)
static int ccu_pll_enable(struct clk_hw *hw)
{
struct ccu_pll *pll = hw_to_ccu_pll(hw);
+ u32 reg;
+ int ret;
- return regmap_clear_bits(pll->common.map, pll->common.cfg1,
- TH1520_PLL_VCO_RST);
+ regmap_clear_bits(pll->common.map, pll->common.cfg1,
+ TH1520_PLL_VCO_RST);
+
+ ret = regmap_read_poll_timeout_atomic(pll->common.map, TH1520_PLL_STS,
+ reg, reg & pll->lock_sts_mask,
+ 5, TH1520_PLL_LOCK_TIMEOUT_US);
+ if (ret)
+ return ret;
+
+ udelay(TH1520_PLL_STABLE_DELAY_US);
+
+ return 0;
}
static int ccu_pll_is_enabled(struct clk_hw *hw)
@@ -389,6 +412,7 @@ static struct ccu_pll cpu_pll0_clk = {
&clk_pll_ops,
CLK_IS_CRITICAL),
},
+ .lock_sts_mask = BIT(1),
};
static struct ccu_pll cpu_pll1_clk = {
@@ -401,6 +425,7 @@ static struct ccu_pll cpu_pll1_clk = {
&clk_pll_ops,
CLK_IS_CRITICAL),
},
+ .lock_sts_mask = BIT(4),
};
static struct ccu_pll gmac_pll_clk = {
@@ -413,6 +438,7 @@ static struct ccu_pll gmac_pll_clk = {
&clk_pll_ops,
CLK_IS_CRITICAL),
},
+ .lock_sts_mask = BIT(3),
};
static const struct clk_hw *gmac_pll_clk_parent[] = {
@@ -433,6 +459,7 @@ static struct ccu_pll video_pll_clk = {
&clk_pll_ops,
CLK_IS_CRITICAL),
},
+ .lock_sts_mask = BIT(7),
};
static const struct clk_hw *video_pll_clk_parent[] = {
@@ -453,6 +480,7 @@ static struct ccu_pll dpu0_pll_clk = {
&clk_pll_ops,
0),
},
+ .lock_sts_mask = BIT(8),
};
static const struct clk_hw *dpu0_pll_clk_parent[] = {
@@ -469,6 +497,7 @@ static struct ccu_pll dpu1_pll_clk = {
&clk_pll_ops,
0),
},
+ .lock_sts_mask = BIT(9),
};
static const struct clk_hw *dpu1_pll_clk_parent[] = {
@@ -485,6 +514,7 @@ static struct ccu_pll tee_pll_clk = {
&clk_pll_ops,
CLK_IS_CRITICAL),
},
+ .lock_sts_mask = BIT(10),
};
static const struct clk_parent_data c910_i0_parents[] = {
diff --git a/drivers/clk/x86/clk-cgu.c b/drivers/clk/x86/clk-cgu.c
index d099667355f8..92ee05d75af2 100644
--- a/drivers/clk/x86/clk-cgu.c
+++ b/drivers/clk/x86/clk-cgu.c
@@ -137,10 +137,8 @@ static int lgm_clk_divider_determine_rate(struct clk_hw *hw,
{
struct lgm_clk_divider *divider = to_lgm_clk_divider(hw);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, divider->table,
- divider->width, divider->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, divider->table, divider->width,
+ divider->flags);
}
static int
diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c
index c824eeacd8eb..984e577ea671 100644
--- a/drivers/clk/zynqmp/divider.c
+++ b/drivers/clk/zynqmp/divider.c
@@ -111,10 +111,9 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw,
}
/**
- * zynqmp_clk_divider_round_rate() - Round rate of divider clock
+ * zynqmp_clk_divider_determine_rate() - Determine rate of divider clock
* @hw: handle between common and hardware-specific interfaces
- * @rate: rate of clock to be set
- * @prate: rate of parent clock
+ * @req: rate of clock to be set
*
* Return: 0 on success else error+reason
*/
@@ -151,8 +150,9 @@ static int zynqmp_clk_divider_determine_rate(struct clk_hw *hw,
width = fls(divider->max_div);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- NULL, width, divider->flags);
+ ret = divider_determine_rate(hw, req, NULL, width, divider->flags);
+ if (ret != 0)
+ return ret;
if (divider->is_frac && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) &&
(req->rate % req->best_parent_rate))
diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c
index 630a3936c97c..6bc2c3934f56 100644
--- a/drivers/clk/zynqmp/pll.c
+++ b/drivers/clk/zynqmp/pll.c
@@ -91,10 +91,9 @@ static inline void zynqmp_pll_set_mode(struct clk_hw *hw, bool on)
}
/**
- * zynqmp_pll_round_rate() - Round a clock frequency
+ * zynqmp_pll_determine_rate() - Round a clock frequency
* @hw: Handle between common and hardware-specific interfaces
- * @rate: Desired clock frequency
- * @prate: Clock frequency of parent clock
+ * @req: Desired clock frequency
*
* Return: Frequency closest to @rate the hardware can generate
*/
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index e82a95ea4724..d69858427359 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -106,21 +106,25 @@ static u64 notrace sp804_read(void)
return ~readl_relaxed(sched_clkevt->value);
}
+/* Register delay timer backed by the hardware counter */
#ifdef CONFIG_ARM
static struct delay_timer delay;
+static struct sp804_clkevt *delay_clkevt;
+
static unsigned long sp804_read_delay_timer_read(void)
{
- return sp804_read();
+ return ~readl_relaxed(delay_clkevt->value);
}
-static void sp804_register_delay_timer(int freq)
+static void sp804_register_delay_timer(struct sp804_clkevt *clk, int freq)
{
+ delay_clkevt = clk;
delay.freq = freq;
delay.read_current_timer = sp804_read_delay_timer_read;
register_current_timer_delay(&delay);
}
#else
-static inline void sp804_register_delay_timer(int freq) {}
+static inline void sp804_register_delay_timer(struct sp804_clkevt *clk, int freq) {}
#endif
static int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
@@ -135,8 +139,6 @@ static int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
if (rate < 0)
return -EINVAL;
- sp804_register_delay_timer(rate);
-
clkevt = sp804_clkevt_get(base);
writel(0, clkevt->ctrl);
@@ -152,6 +154,8 @@ static int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
clocksource_mmio_init(clkevt->value, name,
rate, 200, 32, clocksource_mmio_readl_down);
+ sp804_register_delay_timer(clkevt, rate);
+
if (use_sched_clock) {
sched_clkevt = clkevt;
sched_clock_register(sp804_read, 32, rate);
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index ec4abe374573..1625ec2d0d06 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1161,7 +1161,7 @@ static void hybrid_init_cpu_capacity_scaling(bool refresh)
* the capacity of SMT threads is not deterministic even approximately,
* do not do that when SMT is in use.
*/
- if (hwp_is_hybrid && !sched_smt_active() && arch_enable_hybrid_capacity_scale()) {
+ if (hwp_is_hybrid && !cpu_smt_possible() && arch_enable_hybrid_capacity_scale()) {
hybrid_refresh_cpu_capacity_scaling();
/*
* Disabling ITMT causes sched domains to be rebuilt to disable asym
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index d2a110079f5f..c450cf9c881d 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -101,6 +101,7 @@ static int scmi_cpu_domain_id(struct device *cpu_dev)
return -EINVAL;
}
+ of_node_put(domain_id.np);
return domain_id.args[0];
}
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index c7876e9e024f..65fbb8e807b9 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -359,6 +359,16 @@ noinstr int cpuidle_enter_state(struct cpuidle_device *dev,
int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
bool *stop_tick)
{
+ /*
+ * If there is only a single idle state (or none), there is nothing
+ * meaningful for the governor to choose. Skip the governor and
+ * always use state 0 with the tick running.
+ */
+ if (drv->state_count <= 1) {
+ *stop_tick = false;
+ return 0;
+ }
+
return cpuidle_curr_governor->select(drv, dev, stop_tick);
}
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 64d6f7a1c776..ca863ba03d45 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -239,7 +239,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
/* Find the shortest expected idle interval. */
predicted_ns = get_typical_interval(data) * NSEC_PER_USEC;
- if (predicted_ns > RESIDENCY_THRESHOLD_NS) {
+ if (predicted_ns > RESIDENCY_THRESHOLD_NS || tick_nohz_tick_stopped()) {
unsigned int timer_us;
/* Determine the time till the closest timer. */
@@ -259,6 +259,16 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
RESOLUTION * DECAY * NSEC_PER_USEC);
/* Use the lowest expected idle interval to pick the idle state. */
predicted_ns = min((u64)timer_us * NSEC_PER_USEC, predicted_ns);
+ /*
+ * If the tick is already stopped, the cost of possible short
+ * idle duration misprediction is much higher, because the CPU
+ * may be stuck in a shallow idle state for a long time as a
+ * result of it. In that case, say we might mispredict and use
+ * the known time till the closest timer event for the idle
+ * state selection.
+ */
+ if (tick_nohz_tick_stopped() && predicted_ns < TICK_NSEC)
+ predicted_ns = data->next_timer_ns;
} else {
/*
* Because the next timer event is not going to be determined
@@ -284,16 +294,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
return 0;
}
- /*
- * If the tick is already stopped, the cost of possible short idle
- * duration misprediction is much higher, because the CPU may be stuck
- * in a shallow idle state for a long time as a result of it. In that
- * case, say we might mispredict and use the known time till the closest
- * timer event for the idle state selection.
- */
- if (tick_nohz_tick_stopped() && predicted_ns < TICK_NSEC)
- predicted_ns = data->next_timer_ns;
-
/*
* Find the idle state with the lowest power while satisfying
* our constraints.
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 107ccb2ade42..c6117c23eb25 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -4814,7 +4814,8 @@ static void dpaa2_dpseci_free(struct dpaa2_caam_priv *priv)
{
struct device *dev = priv->dev;
struct fsl_mc_device *ls_dev = to_fsl_mc_device(dev);
- int err;
+ struct dpaa2_caam_priv_per_cpu *ppriv;
+ int i, err;
if (DPSECI_VER(priv->major_ver, priv->minor_ver) > DPSECI_VER(5, 3)) {
err = dpseci_reset(priv->mc_io, 0, ls_dev->mc_handle);
@@ -4822,6 +4823,12 @@ static void dpaa2_dpseci_free(struct dpaa2_caam_priv *priv)
dev_err(dev, "dpseci_reset() failed\n");
}
+ for_each_cpu(i, priv->clean_mask) {
+ ppriv = per_cpu_ptr(priv->ppriv, i);
+ free_netdev(ppriv->net_dev);
+ }
+ free_cpumask_var(priv->clean_mask);
+
dpaa2_dpseci_congestion_free(priv);
dpseci_close(priv->mc_io, 0, ls_dev->mc_handle);
}
@@ -5007,16 +5014,15 @@ static int __cold dpaa2_dpseci_setup(struct fsl_mc_device *ls_dev)
struct device *dev = &ls_dev->dev;
struct dpaa2_caam_priv *priv;
struct dpaa2_caam_priv_per_cpu *ppriv;
- cpumask_var_t clean_mask;
int err, cpu;
u8 i;
err = -ENOMEM;
- if (!zalloc_cpumask_var(&clean_mask, GFP_KERNEL))
- goto err_cpumask;
-
priv = dev_get_drvdata(dev);
+ if (!zalloc_cpumask_var(&priv->clean_mask, GFP_KERNEL))
+ goto err_cpumask;
+
priv->dev = dev;
priv->dpsec_id = ls_dev->obj_desc.id;
@@ -5118,7 +5124,7 @@ static int __cold dpaa2_dpseci_setup(struct fsl_mc_device *ls_dev)
err = -ENOMEM;
goto err_alloc_netdev;
}
- cpumask_set_cpu(cpu, clean_mask);
+ cpumask_set_cpu(cpu, priv->clean_mask);
ppriv->net_dev->dev = *dev;
netif_napi_add_tx_weight(ppriv->net_dev, &ppriv->napi,
@@ -5126,18 +5132,16 @@ static int __cold dpaa2_dpseci_setup(struct fsl_mc_device *ls_dev)
DPAA2_CAAM_NAPI_WEIGHT);
}
- err = 0;
- goto free_cpumask;
+ return 0;
err_alloc_netdev:
- free_dpaa2_pcpu_netdev(priv, clean_mask);
+ free_dpaa2_pcpu_netdev(priv, priv->clean_mask);
err_get_rx_queue:
dpaa2_dpseci_congestion_free(priv);
err_get_vers:
dpseci_close(priv->mc_io, 0, ls_dev->mc_handle);
err_open:
-free_cpumask:
- free_cpumask_var(clean_mask);
+ free_cpumask_var(priv->clean_mask);
err_cpumask:
return err;
}
@@ -5182,7 +5186,6 @@ static int __cold dpaa2_dpseci_disable(struct dpaa2_caam_priv *priv)
ppriv = per_cpu_ptr(priv->ppriv, i);
napi_disable(&ppriv->napi);
netif_napi_del(&ppriv->napi);
- free_netdev(ppriv->net_dev);
}
return 0;
diff --git a/drivers/crypto/caam/caamalg_qi2.h b/drivers/crypto/caam/caamalg_qi2.h
index 61d1219a202f..8e65b4b28c7b 100644
--- a/drivers/crypto/caam/caamalg_qi2.h
+++ b/drivers/crypto/caam/caamalg_qi2.h
@@ -42,6 +42,7 @@
* @mc_io: pointer to MC portal's I/O object
* @domain: IOMMU domain
* @ppriv: per CPU pointers to privata data
+ * @clean_mask: CPU mask of CPUs that have allocated netdevs
*/
struct dpaa2_caam_priv {
int dpsec_id;
@@ -65,6 +66,7 @@ struct dpaa2_caam_priv {
struct dpaa2_caam_priv_per_cpu __percpu *ppriv;
struct dentry *dfs_root;
+ cpumask_var_t clean_mask;
};
/**
diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index c246920e6f54..bccd680c7f7e 100644
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -180,7 +180,8 @@ static void free_command_queues(struct cpt_vf *cptvf,
hlist_for_each_entry_safe(chunk, node, &cqinfo->queue[i].chead,
nextchunk) {
- dma_free_coherent(&pdev->dev, chunk->size,
+ dma_free_coherent(&pdev->dev,
+ chunk->size + CPT_NEXT_CHUNK_PTR_SIZE,
chunk->head,
chunk->dma_addr);
chunk->head = NULL;
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index d78865d9d5f0..d0412e584762 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -642,7 +642,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
struct ccp_data dst;
struct ccp_data aad;
struct ccp_op op;
- } *wa __cleanup(kfree) = kzalloc(sizeof *wa, GFP_KERNEL);
+ } *wa __free(kfree) = kzalloc(sizeof(*wa), GFP_KERNEL);
unsigned int dm_offset;
unsigned int authsize;
unsigned int jobid;
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index 9e21da0e298a..5c7f7e02a7d8 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -351,6 +351,17 @@ struct psp_device *psp_get_master_device(void)
return sp ? sp->psp_data : NULL;
}
+int psp_restore(struct sp_device *sp)
+{
+ struct psp_device *psp = sp->psp_data;
+ int ret = 0;
+
+ if (psp->tee_data)
+ ret = tee_restore(psp);
+
+ return ret;
+}
+
void psp_pci_init(void)
{
psp_master = psp_get_master_device();
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 956ea609d0cc..1cdadddb744e 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -127,13 +127,6 @@ static size_t sev_es_tmr_size = SEV_TMR_SIZE;
#define NV_LENGTH (32 * 1024)
static void *sev_init_ex_buffer;
-/*
- * SEV_DATA_RANGE_LIST:
- * Array containing range of pages that firmware transitions to HV-fixed
- * page state.
- */
-static struct sev_data_range_list *snp_range_list;
-
static void __sev_firmware_shutdown(struct sev_device *sev, bool panic);
static int snp_shutdown_on_panic(struct notifier_block *nb,
@@ -1361,6 +1354,7 @@ static int snp_filter_reserved_mem_regions(struct resource *rs, void *arg)
static int __sev_snp_init_locked(int *error, unsigned int max_snp_asid)
{
+ struct sev_data_range_list *snp_range_list __free(kfree) = NULL;
struct psp_device *psp = psp_master;
struct sev_data_snp_init_ex data;
struct sev_device *sev;
@@ -2378,11 +2372,10 @@ static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable)
static int sev_ioctl_do_snp_platform_status(struct sev_issue_cmd *argp)
{
struct sev_device *sev = psp_master->sev_data;
- bool shutdown_required = false;
struct sev_data_snp_addr buf;
struct page *status_page;
- int ret, error;
void *data;
+ int ret;
if (!argp->data)
return -EINVAL;
@@ -2393,31 +2386,35 @@ static int sev_ioctl_do_snp_platform_status(struct sev_issue_cmd *argp)
data = page_address(status_page);
- if (!sev->snp_initialized) {
- ret = snp_move_to_init_state(argp, &shutdown_required);
- if (ret)
- goto cleanup;
- }
-
/*
- * Firmware expects status page to be in firmware-owned state, otherwise
- * it will report firmware error code INVALID_PAGE_STATE (0x1A).
+ * SNP_PLATFORM_STATUS can be executed in any SNP state. But if executed
+ * when SNP has been initialized, the status page must be firmware-owned.
*/
- if (rmp_mark_pages_firmware(__pa(data), 1, true)) {
- ret = -EFAULT;
- goto cleanup;
+ if (sev->snp_initialized) {
+ /*
+ * Firmware expects the status page to be in Firmware state,
+ * otherwise it will report an error INVALID_PAGE_STATE.
+ */
+ if (rmp_mark_pages_firmware(__pa(data), 1, true)) {
+ ret = -EFAULT;
+ goto cleanup;
+ }
}
buf.address = __psp_pa(data);
ret = __sev_do_cmd_locked(SEV_CMD_SNP_PLATFORM_STATUS, &buf, &argp->error);
- /*
- * Status page will be transitioned to Reclaim state upon success, or
- * left in Firmware state in failure. Use snp_reclaim_pages() to
- * transition either case back to Hypervisor-owned state.
- */
- if (snp_reclaim_pages(__pa(data), 1, true))
- return -EFAULT;
+ if (sev->snp_initialized) {
+ /*
+ * The status page will be in Reclaim state on success, or left
+ * in Firmware state on failure. Use snp_reclaim_pages() to
+ * transition either case back to Hypervisor-owned state.
+ */
+ if (snp_reclaim_pages(__pa(data), 1, true)) {
+ snp_leak_pages(__page_to_pfn(status_page), 1);
+ return -EFAULT;
+ }
+ }
if (ret)
goto cleanup;
@@ -2427,9 +2424,6 @@ static int sev_ioctl_do_snp_platform_status(struct sev_issue_cmd *argp)
ret = -EFAULT;
cleanup:
- if (shutdown_required)
- __sev_snp_shutdown_locked(&error, false);
-
__free_pages(status_page, 0);
return ret;
}
@@ -2780,11 +2774,6 @@ static void __sev_firmware_shutdown(struct sev_device *sev, bool panic)
sev_init_ex_buffer = NULL;
}
- if (snp_range_list) {
- kfree(snp_range_list);
- snp_range_list = NULL;
- }
-
__sev_snp_shutdown_locked(&error, panic);
}
diff --git a/drivers/crypto/ccp/sp-dev.c b/drivers/crypto/ccp/sp-dev.c
index 3467f6db4f50..f204aa5df96e 100644
--- a/drivers/crypto/ccp/sp-dev.c
+++ b/drivers/crypto/ccp/sp-dev.c
@@ -230,6 +230,18 @@ int sp_resume(struct sp_device *sp)
return 0;
}
+int sp_restore(struct sp_device *sp)
+{
+ if (sp->psp_data) {
+ int ret = psp_restore(sp);
+
+ if (ret)
+ return ret;
+ }
+
+ return sp_resume(sp);
+}
+
struct sp_device *sp_get_psp_master_device(void)
{
struct sp_device *i, *ret = NULL;
diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
index 1335a83fe052..a83751cfd006 100644
--- a/drivers/crypto/ccp/sp-dev.h
+++ b/drivers/crypto/ccp/sp-dev.h
@@ -141,6 +141,7 @@ void sp_destroy(struct sp_device *sp);
int sp_suspend(struct sp_device *sp);
int sp_resume(struct sp_device *sp);
+int sp_restore(struct sp_device *sp);
int sp_request_ccp_irq(struct sp_device *sp, irq_handler_t handler,
const char *name, void *data);
void sp_free_ccp_irq(struct sp_device *sp, void *data);
@@ -174,6 +175,7 @@ int psp_dev_init(struct sp_device *sp);
void psp_pci_init(void);
void psp_dev_destroy(struct sp_device *sp);
void psp_pci_exit(void);
+int psp_restore(struct sp_device *sp);
#else /* !CONFIG_CRYPTO_DEV_SP_PSP */
@@ -181,6 +183,7 @@ static inline int psp_dev_init(struct sp_device *sp) { return 0; }
static inline void psp_pci_init(void) { }
static inline void psp_dev_destroy(struct sp_device *sp) { }
static inline void psp_pci_exit(void) { }
+static inline int psp_restore(struct sp_device *sp) { return 0; }
#endif /* CONFIG_CRYPTO_DEV_SP_PSP */
diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index 8891ceee1d7d..6ac805d99ccb 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -353,6 +353,13 @@ static int __maybe_unused sp_pci_resume(struct device *dev)
return sp_resume(sp);
}
+static int __maybe_unused sp_pci_restore(struct device *dev)
+{
+ struct sp_device *sp = dev_get_drvdata(dev);
+
+ return sp_restore(sp);
+}
+
#ifdef CONFIG_CRYPTO_DEV_SP_PSP
static const struct sev_vdata sevv1 = {
.cmdresp_reg = 0x10580, /* C2PMSG_32 */
@@ -563,7 +570,14 @@ static const struct pci_device_id sp_pci_table[] = {
};
MODULE_DEVICE_TABLE(pci, sp_pci_table);
-static SIMPLE_DEV_PM_OPS(sp_pci_pm_ops, sp_pci_suspend, sp_pci_resume);
+static const struct dev_pm_ops sp_pci_pm_ops = {
+ .suspend = pm_sleep_ptr(sp_pci_suspend),
+ .resume = pm_sleep_ptr(sp_pci_resume),
+ .freeze = pm_sleep_ptr(sp_pci_suspend),
+ .thaw = pm_sleep_ptr(sp_pci_resume),
+ .poweroff = pm_sleep_ptr(sp_pci_suspend),
+ .restore_early = pm_sleep_ptr(sp_pci_restore),
+};
static struct pci_driver sp_pci_driver = {
.name = "ccp",
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 5e1d80724678..92ffa412622a 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -86,10 +86,34 @@ static inline void tee_free_cmd_buffer(struct tee_init_ring_cmd *cmd)
kfree(cmd);
}
+static bool tee_send_destroy_cmd(struct psp_tee_device *tee)
+{
+ unsigned int reg;
+ int ret;
+
+ ret = psp_mailbox_command(tee->psp, PSP_CMD_TEE_RING_DESTROY, NULL,
+ TEE_DEFAULT_CMD_TIMEOUT, ®);
+ if (ret) {
+ dev_err(tee->dev, "tee: ring destroy command timed out, disabling TEE support\n");
+ psp_dead = true;
+ return false;
+ }
+
+ if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
+ dev_err(tee->dev, "tee: ring destroy command failed (%#010lx)\n",
+ FIELD_GET(PSP_CMDRESP_STS, reg));
+ psp_dead = true;
+ return false;
+ }
+
+ return true;
+}
+
static int tee_init_ring(struct psp_tee_device *tee)
{
int ring_size = MAX_RING_BUFFER_ENTRIES * sizeof(struct tee_ring_cmd);
struct tee_init_ring_cmd *cmd;
+ bool retry = false;
unsigned int reg;
int ret;
@@ -112,6 +136,7 @@ static int tee_init_ring(struct psp_tee_device *tee)
/* Send command buffer details to Trusted OS by writing to
* CPU-PSP message registers
*/
+retry_init:
ret = psp_mailbox_command(tee->psp, PSP_CMD_TEE_RING_INIT, cmd,
TEE_DEFAULT_CMD_TIMEOUT, ®);
if (ret) {
@@ -122,9 +147,22 @@ static int tee_init_ring(struct psp_tee_device *tee)
}
if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
+ /*
+ * During the hibernate resume sequence driver may have gotten loaded
+ * but the ring not properly destroyed. If the ring doesn't work, try
+ * to destroy and re-init once.
+ */
+ if (!retry && FIELD_GET(PSP_CMDRESP_STS, reg) == PSP_TEE_STS_RING_BUSY) {
+ dev_info(tee->dev, "tee: ring init command failed with busy status, retrying\n");
+ if (tee_send_destroy_cmd(tee)) {
+ retry = true;
+ goto retry_init;
+ }
+ }
dev_err(tee->dev, "tee: ring init command failed (%#010lx)\n",
FIELD_GET(PSP_CMDRESP_STS, reg));
tee_free_ring(tee);
+ psp_dead = true;
ret = -EIO;
}
@@ -136,24 +174,13 @@ static int tee_init_ring(struct psp_tee_device *tee)
static void tee_destroy_ring(struct psp_tee_device *tee)
{
- unsigned int reg;
- int ret;
-
if (!tee->rb_mgr.ring_start)
return;
if (psp_dead)
goto free_ring;
- ret = psp_mailbox_command(tee->psp, PSP_CMD_TEE_RING_DESTROY, NULL,
- TEE_DEFAULT_CMD_TIMEOUT, ®);
- if (ret) {
- dev_err(tee->dev, "tee: ring destroy command timed out, disabling TEE support\n");
- psp_dead = true;
- } else if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
- dev_err(tee->dev, "tee: ring destroy command failed (%#010lx)\n",
- FIELD_GET(PSP_CMDRESP_STS, reg));
- }
+ tee_send_destroy_cmd(tee);
free_ring:
tee_free_ring(tee);
@@ -365,3 +392,8 @@ int psp_check_tee_status(void)
return 0;
}
EXPORT_SYMBOL(psp_check_tee_status);
+
+int tee_restore(struct psp_device *psp)
+{
+ return tee_init_ring(psp->tee_data);
+}
diff --git a/drivers/crypto/ccp/tee-dev.h b/drivers/crypto/ccp/tee-dev.h
index ea9a2b7c05f5..c23416cb7bb3 100644
--- a/drivers/crypto/ccp/tee-dev.h
+++ b/drivers/crypto/ccp/tee-dev.h
@@ -111,5 +111,6 @@ struct tee_ring_cmd {
int tee_dev_init(struct psp_device *psp);
void tee_dev_destroy(struct psp_device *psp);
+int tee_restore(struct psp_device *psp);
#endif /* __TEE_DEV_H__ */
diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index 4835bdebdbb3..a0cb1a8186ac 100644
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -57,6 +57,7 @@ config CRYPTO_DEV_HISI_ZIP
depends on UACCE || UACCE=n
depends on ACPI
select CRYPTO_DEV_HISI_QM
+ select CRYPTO_DEFLATE
help
Support for HiSilicon ZIP Driver
diff --git a/drivers/crypto/hisilicon/hpre/hpre.h b/drivers/crypto/hisilicon/hpre/hpre.h
index 0f3ddbadbcf9..021dbd9a1d48 100644
--- a/drivers/crypto/hisilicon/hpre/hpre.h
+++ b/drivers/crypto/hisilicon/hpre/hpre.h
@@ -94,9 +94,8 @@ struct hpre_sqe {
__le64 key;
__le64 in;
__le64 out;
- __le16 tag;
- __le16 resv2;
-#define _HPRE_SQE_ALIGN_EXT 7
+ __le64 tag;
+#define _HPRE_SQE_ALIGN_EXT 6
__le32 rsvd1[_HPRE_SQE_ALIGN_EXT];
};
diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
index 21ccf879f70c..839c1f677143 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
@@ -93,6 +93,7 @@ struct hpre_dh_ctx {
char *g; /* m */
dma_addr_t dma_g;
+ struct crypto_kpp *soft_tfm;
};
struct hpre_ecdh_ctx {
@@ -103,17 +104,15 @@ struct hpre_ecdh_ctx {
/* low address: x->y */
unsigned char *g;
dma_addr_t dma_g;
+ struct crypto_kpp *soft_tfm;
};
struct hpre_ctx {
struct hisi_qp *qp;
struct device *dev;
- struct hpre_asym_request **req_list;
struct hpre *hpre;
- spinlock_t req_lock;
unsigned int key_sz;
bool crt_g2_mode;
- struct idr req_idr;
union {
struct hpre_rsa_ctx rsa;
struct hpre_dh_ctx dh;
@@ -123,6 +122,7 @@ struct hpre_ctx {
unsigned int curve_id;
/* for high performance core */
u8 enable_hpcore;
+ bool fallback;
};
struct hpre_asym_request {
@@ -136,7 +136,6 @@ struct hpre_asym_request {
struct kpp_request *ecdh;
} areq;
int err;
- int req_id;
hpre_cb cb;
struct timespec64 req_time;
};
@@ -151,79 +150,13 @@ static inline unsigned int hpre_align_pd(void)
return (hpre_align_sz() - 1) & ~(crypto_tfm_ctx_alignment() - 1);
}
-static int hpre_alloc_req_id(struct hpre_ctx *ctx)
+static void hpre_dfx_add_req_time(struct hpre_asym_request *hpre_req)
{
- unsigned long flags;
- int id;
-
- spin_lock_irqsave(&ctx->req_lock, flags);
- id = idr_alloc(&ctx->req_idr, NULL, 0, ctx->qp->sq_depth, GFP_ATOMIC);
- spin_unlock_irqrestore(&ctx->req_lock, flags);
-
- return id;
-}
-
-static void hpre_free_req_id(struct hpre_ctx *ctx, int req_id)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&ctx->req_lock, flags);
- idr_remove(&ctx->req_idr, req_id);
- spin_unlock_irqrestore(&ctx->req_lock, flags);
-}
-
-static int hpre_add_req_to_ctx(struct hpre_asym_request *hpre_req)
-{
- struct hpre_ctx *ctx;
- struct hpre_dfx *dfx;
- int id;
-
- ctx = hpre_req->ctx;
- id = hpre_alloc_req_id(ctx);
- if (unlikely(id < 0))
- return -EINVAL;
-
- ctx->req_list[id] = hpre_req;
- hpre_req->req_id = id;
+ struct hpre_ctx *ctx = hpre_req->ctx;
+ struct hpre_dfx *dfx = ctx->hpre->debug.dfx;
- dfx = ctx->hpre->debug.dfx;
if (atomic64_read(&dfx[HPRE_OVERTIME_THRHLD].value))
ktime_get_ts64(&hpre_req->req_time);
-
- return id;
-}
-
-static void hpre_rm_req_from_ctx(struct hpre_asym_request *hpre_req)
-{
- struct hpre_ctx *ctx = hpre_req->ctx;
- int id = hpre_req->req_id;
-
- if (hpre_req->req_id >= 0) {
- hpre_req->req_id = HPRE_INVLD_REQ_ID;
- ctx->req_list[id] = NULL;
- hpre_free_req_id(ctx, id);
- }
-}
-
-static struct hisi_qp *hpre_get_qp_and_start(u8 type)
-{
- struct hisi_qp *qp;
- int ret;
-
- qp = hpre_create_qp(type);
- if (!qp) {
- pr_err("Can not create hpre qp!\n");
- return ERR_PTR(-ENODEV);
- }
-
- ret = hisi_qm_start_qp(qp, 0);
- if (ret < 0) {
- hisi_qm_free_qps(&qp, 1);
- pci_err(qp->qm->pdev, "Can not start qp!\n");
- return ERR_PTR(-EINVAL);
- }
-
- return qp;
}
static int hpre_get_data_dma_addr(struct hpre_asym_request *hpre_req,
@@ -340,26 +273,19 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,
static int hpre_alg_res_post_hf(struct hpre_ctx *ctx, struct hpre_sqe *sqe,
void **kreq)
{
- struct hpre_asym_request *req;
unsigned int err, done, alg;
- int id;
#define HPRE_NO_HW_ERR 0
#define HPRE_HW_TASK_DONE 3
#define HREE_HW_ERR_MASK GENMASK(10, 0)
#define HREE_SQE_DONE_MASK GENMASK(1, 0)
#define HREE_ALG_TYPE_MASK GENMASK(4, 0)
- id = (int)le16_to_cpu(sqe->tag);
- req = ctx->req_list[id];
- hpre_rm_req_from_ctx(req);
- *kreq = req;
+ *kreq = (void *)le64_to_cpu(sqe->tag);
err = (le32_to_cpu(sqe->dw0) >> HPRE_SQE_ALG_BITS) &
HREE_HW_ERR_MASK;
-
done = (le32_to_cpu(sqe->dw0) >> HPRE_SQE_DONE_SHIFT) &
HREE_SQE_DONE_MASK;
-
if (likely(err == HPRE_NO_HW_ERR && done == HPRE_HW_TASK_DONE))
return 0;
@@ -370,36 +296,10 @@ static int hpre_alg_res_post_hf(struct hpre_ctx *ctx, struct hpre_sqe *sqe,
return -EINVAL;
}
-static int hpre_ctx_set(struct hpre_ctx *ctx, struct hisi_qp *qp, int qlen)
-{
- struct hpre *hpre;
-
- if (!ctx || !qp || qlen < 0)
- return -EINVAL;
-
- spin_lock_init(&ctx->req_lock);
- ctx->qp = qp;
- ctx->dev = &qp->qm->pdev->dev;
-
- hpre = container_of(ctx->qp->qm, struct hpre, qm);
- ctx->hpre = hpre;
- ctx->req_list = kcalloc(qlen, sizeof(void *), GFP_KERNEL);
- if (!ctx->req_list)
- return -ENOMEM;
- ctx->key_sz = 0;
- ctx->crt_g2_mode = false;
- idr_init(&ctx->req_idr);
-
- return 0;
-}
-
static void hpre_ctx_clear(struct hpre_ctx *ctx, bool is_clear_all)
{
- if (is_clear_all) {
- idr_destroy(&ctx->req_idr);
- kfree(ctx->req_list);
+ if (is_clear_all)
hisi_qm_free_qps(&ctx->qp, 1);
- }
ctx->crt_g2_mode = false;
ctx->key_sz = 0;
@@ -467,49 +367,44 @@ static void hpre_rsa_cb(struct hpre_ctx *ctx, void *resp)
static void hpre_alg_cb(struct hisi_qp *qp, void *resp)
{
- struct hpre_ctx *ctx = qp->qp_ctx;
- struct hpre_dfx *dfx = ctx->hpre->debug.dfx;
+ struct hpre_asym_request *h_req;
struct hpre_sqe *sqe = resp;
- struct hpre_asym_request *req = ctx->req_list[le16_to_cpu(sqe->tag)];
- if (unlikely(!req)) {
- atomic64_inc(&dfx[HPRE_INVALID_REQ_CNT].value);
+ h_req = (struct hpre_asym_request *)le64_to_cpu(sqe->tag);
+ if (unlikely(!h_req)) {
+ pr_err("Failed to get request, and qp_id is %u\n", qp->qp_id);
return;
}
- req->cb(ctx, resp);
-}
-
-static void hpre_stop_qp_and_put(struct hisi_qp *qp)
-{
- hisi_qm_stop_qp(qp);
- hisi_qm_free_qps(&qp, 1);
+ h_req->cb(h_req->ctx, resp);
}
static int hpre_ctx_init(struct hpre_ctx *ctx, u8 type)
{
struct hisi_qp *qp;
- int ret;
+ struct hpre *hpre;
- qp = hpre_get_qp_and_start(type);
- if (IS_ERR(qp))
- return PTR_ERR(qp);
+ qp = hpre_create_qp(type);
+ if (!qp) {
+ ctx->qp = NULL;
+ return -ENODEV;
+ }
- qp->qp_ctx = ctx;
qp->req_cb = hpre_alg_cb;
+ ctx->qp = qp;
+ ctx->dev = &qp->qm->pdev->dev;
+ hpre = container_of(ctx->qp->qm, struct hpre, qm);
+ ctx->hpre = hpre;
+ ctx->key_sz = 0;
+ ctx->crt_g2_mode = false;
- ret = hpre_ctx_set(ctx, qp, qp->sq_depth);
- if (ret)
- hpre_stop_qp_and_put(qp);
-
- return ret;
+ return 0;
}
static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa)
{
struct hpre_asym_request *h_req;
struct hpre_sqe *msg;
- int req_id;
void *tmp;
if (is_rsa) {
@@ -549,11 +444,8 @@ static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa)
msg->task_len1 = (ctx->key_sz >> HPRE_BITS_2_BYTES_SHIFT) - 1;
h_req->ctx = ctx;
- req_id = hpre_add_req_to_ctx(h_req);
- if (req_id < 0)
- return -EBUSY;
-
- msg->tag = cpu_to_le16((u16)req_id);
+ hpre_dfx_add_req_time(h_req);
+ msg->tag = cpu_to_le64((uintptr_t)h_req);
return 0;
}
@@ -566,9 +458,7 @@ static int hpre_send(struct hpre_ctx *ctx, struct hpre_sqe *msg)
do {
atomic64_inc(&dfx[HPRE_SEND_CNT].value);
- spin_lock_bh(&ctx->req_lock);
ret = hisi_qp_send(ctx->qp, msg);
- spin_unlock_bh(&ctx->req_lock);
if (ret != -EBUSY)
break;
atomic64_inc(&dfx[HPRE_SEND_BUSY_CNT].value);
@@ -619,12 +509,53 @@ static int hpre_dh_compute_value(struct kpp_request *req)
return -EINPROGRESS;
clear_all:
- hpre_rm_req_from_ctx(hpre_req);
hpre_hw_data_clr_all(ctx, hpre_req, req->dst, req->src);
return ret;
}
+static struct kpp_request *hpre_dh_prepare_fb_req(struct kpp_request *req)
+{
+ struct kpp_request *fb_req = kpp_request_ctx(req);
+ struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+
+ kpp_request_set_tfm(fb_req, ctx->dh.soft_tfm);
+ kpp_request_set_callback(fb_req, req->base.flags, req->base.complete, req->base.data);
+ kpp_request_set_input(fb_req, req->src, req->src_len);
+ kpp_request_set_output(fb_req, req->dst, req->dst_len);
+
+ return fb_req;
+}
+
+static int hpre_dh_generate_public_key(struct kpp_request *req)
+{
+ struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ struct kpp_request *fb_req;
+
+ if (ctx->fallback) {
+ fb_req = hpre_dh_prepare_fb_req(req);
+ return crypto_kpp_generate_public_key(fb_req);
+ }
+
+ return hpre_dh_compute_value(req);
+}
+
+static int hpre_dh_compute_shared_secret(struct kpp_request *req)
+{
+ struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ struct kpp_request *fb_req;
+
+ if (ctx->fallback) {
+ fb_req = hpre_dh_prepare_fb_req(req);
+ return crypto_kpp_compute_shared_secret(fb_req);
+ }
+
+ return hpre_dh_compute_value(req);
+}
+
static int hpre_is_dh_params_length_valid(unsigned int key_sz)
{
#define _HPRE_DH_GRP1 768
@@ -651,13 +582,6 @@ static int hpre_dh_set_params(struct hpre_ctx *ctx, struct dh *params)
struct device *dev = ctx->dev;
unsigned int sz;
- if (params->p_size > HPRE_DH_MAX_P_SZ)
- return -EINVAL;
-
- if (hpre_is_dh_params_length_valid(params->p_size <<
- HPRE_BITS_2_BYTES_SHIFT))
- return -EINVAL;
-
sz = ctx->key_sz = params->p_size;
ctx->dh.xa_p = dma_alloc_coherent(dev, sz << 1,
&ctx->dh.dma_xa_p, GFP_KERNEL);
@@ -690,8 +614,8 @@ static void hpre_dh_clear_ctx(struct hpre_ctx *ctx, bool is_clear_all)
struct device *dev = ctx->dev;
unsigned int sz = ctx->key_sz;
- if (is_clear_all)
- hisi_qm_stop_qp(ctx->qp);
+ if (!ctx->qp)
+ return;
if (ctx->dh.g) {
dma_free_coherent(dev, sz, ctx->dh.g, ctx->dh.dma_g);
@@ -718,6 +642,13 @@ static int hpre_dh_set_secret(struct crypto_kpp *tfm, const void *buf,
if (crypto_dh_decode_key(buf, len, ¶ms) < 0)
return -EINVAL;
+ if (!ctx->qp)
+ goto set_soft_secret;
+
+ if (hpre_is_dh_params_length_valid(params.p_size <<
+ HPRE_BITS_2_BYTES_SHIFT))
+ goto set_soft_secret;
+
/* Free old secret if any */
hpre_dh_clear_ctx(ctx, false);
@@ -728,27 +659,55 @@ static int hpre_dh_set_secret(struct crypto_kpp *tfm, const void *buf,
memcpy(ctx->dh.xa_p + (ctx->key_sz - params.key_size), params.key,
params.key_size);
+ ctx->fallback = false;
return 0;
err_clear_ctx:
hpre_dh_clear_ctx(ctx, false);
return ret;
+set_soft_secret:
+ ctx->fallback = true;
+ return crypto_kpp_set_secret(ctx->dh.soft_tfm, buf, len);
}
static unsigned int hpre_dh_max_size(struct crypto_kpp *tfm)
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ if (ctx->fallback)
+ return crypto_kpp_maxsize(ctx->dh.soft_tfm);
+
return ctx->key_sz;
}
static int hpre_dh_init_tfm(struct crypto_kpp *tfm)
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ const char *alg = kpp_alg_name(tfm);
+ unsigned int reqsize;
+ int ret;
+
+ ctx->dh.soft_tfm = crypto_alloc_kpp(alg, 0, CRYPTO_ALG_NEED_FALLBACK);
+ if (IS_ERR(ctx->dh.soft_tfm)) {
+ pr_err("Failed to alloc dh tfm!\n");
+ return PTR_ERR(ctx->dh.soft_tfm);
+ }
- kpp_set_reqsize(tfm, sizeof(struct hpre_asym_request) + hpre_align_pd());
+ crypto_kpp_set_flags(ctx->dh.soft_tfm, crypto_kpp_get_flags(tfm));
- return hpre_ctx_init(ctx, HPRE_V2_ALG_TYPE);
+ reqsize = max(sizeof(struct hpre_asym_request) + hpre_align_pd(),
+ sizeof(struct kpp_request) + crypto_kpp_reqsize(ctx->dh.soft_tfm));
+ kpp_set_reqsize(tfm, reqsize);
+
+ ret = hpre_ctx_init(ctx, HPRE_V2_ALG_TYPE);
+ if (ret && ret != -ENODEV) {
+ crypto_free_kpp(ctx->dh.soft_tfm);
+ return ret;
+ } else if (ret == -ENODEV) {
+ ctx->fallback = true;
+ }
+
+ return 0;
}
static void hpre_dh_exit_tfm(struct crypto_kpp *tfm)
@@ -756,6 +715,7 @@ static void hpre_dh_exit_tfm(struct crypto_kpp *tfm)
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
hpre_dh_clear_ctx(ctx, true);
+ crypto_free_kpp(ctx->dh.soft_tfm);
}
static void hpre_rsa_drop_leading_zeros(const char **ptr, size_t *len)
@@ -795,9 +755,8 @@ static int hpre_rsa_enc(struct akcipher_request *req)
struct hpre_sqe *msg = &hpre_req->req;
int ret;
- /* For 512 and 1536 bits key size, use soft tfm instead */
- if (ctx->key_sz == HPRE_RSA_512BITS_KSZ ||
- ctx->key_sz == HPRE_RSA_1536BITS_KSZ) {
+ /* For unsupported key size and unavailable devices, use soft tfm instead */
+ if (ctx->fallback) {
akcipher_request_set_tfm(req, ctx->rsa.soft_tfm);
ret = crypto_akcipher_encrypt(req);
akcipher_request_set_tfm(req, tfm);
@@ -828,7 +787,6 @@ static int hpre_rsa_enc(struct akcipher_request *req)
return -EINPROGRESS;
clear_all:
- hpre_rm_req_from_ctx(hpre_req);
hpre_hw_data_clr_all(ctx, hpre_req, req->dst, req->src);
return ret;
@@ -843,9 +801,8 @@ static int hpre_rsa_dec(struct akcipher_request *req)
struct hpre_sqe *msg = &hpre_req->req;
int ret;
- /* For 512 and 1536 bits key size, use soft tfm instead */
- if (ctx->key_sz == HPRE_RSA_512BITS_KSZ ||
- ctx->key_sz == HPRE_RSA_1536BITS_KSZ) {
+ /* For unsupported key size and unavailable devices, use soft tfm instead */
+ if (ctx->fallback) {
akcipher_request_set_tfm(req, ctx->rsa.soft_tfm);
ret = crypto_akcipher_decrypt(req);
akcipher_request_set_tfm(req, tfm);
@@ -883,7 +840,6 @@ static int hpre_rsa_dec(struct akcipher_request *req)
return -EINPROGRESS;
clear_all:
- hpre_rm_req_from_ctx(hpre_req);
hpre_hw_data_clr_all(ctx, hpre_req, req->dst, req->src);
return ret;
@@ -899,8 +855,10 @@ static int hpre_rsa_set_n(struct hpre_ctx *ctx, const char *value,
ctx->key_sz = vlen;
/* if invalid key size provided, we use software tfm */
- if (!hpre_rsa_key_size_is_support(ctx->key_sz))
+ if (!hpre_rsa_key_size_is_support(ctx->key_sz)) {
+ ctx->fallback = true;
return 0;
+ }
ctx->rsa.pubkey = dma_alloc_coherent(ctx->dev, vlen << 1,
&ctx->rsa.dma_pubkey,
@@ -1035,8 +993,8 @@ static void hpre_rsa_clear_ctx(struct hpre_ctx *ctx, bool is_clear_all)
unsigned int half_key_sz = ctx->key_sz >> 1;
struct device *dev = ctx->dev;
- if (is_clear_all)
- hisi_qm_stop_qp(ctx->qp);
+ if (!ctx->qp)
+ return;
if (ctx->rsa.pubkey) {
dma_free_coherent(dev, ctx->key_sz << 1,
@@ -1117,6 +1075,7 @@ static int hpre_rsa_setkey(struct hpre_ctx *ctx, const void *key,
goto free;
}
+ ctx->fallback = false;
return 0;
free:
@@ -1134,6 +1093,9 @@ static int hpre_rsa_setpubkey(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (!ctx->qp)
+ return 0;
+
return hpre_rsa_setkey(ctx, key, keylen, false);
}
@@ -1147,6 +1109,9 @@ static int hpre_rsa_setprivkey(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (!ctx->qp)
+ return 0;
+
return hpre_rsa_setkey(ctx, key, keylen, true);
}
@@ -1154,9 +1119,8 @@ static unsigned int hpre_rsa_max_size(struct crypto_akcipher *tfm)
{
struct hpre_ctx *ctx = akcipher_tfm_ctx(tfm);
- /* For 512 and 1536 bits key size, use soft tfm instead */
- if (ctx->key_sz == HPRE_RSA_512BITS_KSZ ||
- ctx->key_sz == HPRE_RSA_1536BITS_KSZ)
+ /* For unsupported key size and unavailable devices, use soft tfm instead */
+ if (ctx->fallback)
return crypto_akcipher_maxsize(ctx->rsa.soft_tfm);
return ctx->key_sz;
@@ -1177,10 +1141,14 @@ static int hpre_rsa_init_tfm(struct crypto_akcipher *tfm)
hpre_align_pd());
ret = hpre_ctx_init(ctx, HPRE_V2_ALG_TYPE);
- if (ret)
+ if (ret && ret != -ENODEV) {
crypto_free_akcipher(ctx->rsa.soft_tfm);
+ return ret;
+ } else if (ret == -ENODEV) {
+ ctx->fallback = true;
+ }
- return ret;
+ return 0;
}
static void hpre_rsa_exit_tfm(struct crypto_akcipher *tfm)
@@ -1207,9 +1175,6 @@ static void hpre_ecc_clear_ctx(struct hpre_ctx *ctx, bool is_clear_all)
unsigned int sz = ctx->key_sz;
unsigned int shift = sz << 1;
- if (is_clear_all)
- hisi_qm_stop_qp(ctx->qp);
-
if (ctx->ecdh.p) {
/* ecdh: p->a->k->b */
memzero_explicit(ctx->ecdh.p + shift, sz);
@@ -1346,7 +1311,7 @@ static int hpre_ecdh_set_param(struct hpre_ctx *ctx, struct ecdh *params)
return 0;
}
-static bool hpre_key_is_zero(char *key, unsigned short key_sz)
+static bool hpre_key_is_zero(const char *key, unsigned short key_sz)
{
int i;
@@ -1387,6 +1352,9 @@ static int hpre_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
struct ecdh params;
int ret;
+ if (ctx->fallback)
+ return crypto_kpp_set_secret(ctx->ecdh.soft_tfm, buf, len);
+
if (crypto_ecdh_decode_key(buf, len, ¶ms) < 0) {
dev_err(dev, "failed to decode ecdh key!\n");
return -EINVAL;
@@ -1488,7 +1456,6 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx,
{
struct hpre_asym_request *h_req;
struct hpre_sqe *msg;
- int req_id;
void *tmp;
if (req->dst_len < ctx->key_sz << 1) {
@@ -1510,11 +1477,8 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx,
msg->task_len1 = (ctx->key_sz >> HPRE_BITS_2_BYTES_SHIFT) - 1;
h_req->ctx = ctx;
- req_id = hpre_add_req_to_ctx(h_req);
- if (req_id < 0)
- return -EBUSY;
-
- msg->tag = cpu_to_le16((u16)req_id);
+ hpre_dfx_add_req_time(h_req);
+ msg->tag = cpu_to_le64((uintptr_t)h_req);
return 0;
}
@@ -1612,28 +1576,86 @@ static int hpre_ecdh_compute_value(struct kpp_request *req)
return -EINPROGRESS;
clear_all:
- hpre_rm_req_from_ctx(hpre_req);
hpre_ecdh_hw_data_clr_all(ctx, hpre_req, req->dst, req->src);
return ret;
}
+static int hpre_ecdh_generate_public_key(struct kpp_request *req)
+{
+ struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ int ret;
+
+ if (ctx->fallback) {
+ kpp_request_set_tfm(req, ctx->ecdh.soft_tfm);
+ ret = crypto_kpp_generate_public_key(req);
+ kpp_request_set_tfm(req, tfm);
+ return ret;
+ }
+
+ return hpre_ecdh_compute_value(req);
+}
+
+static int hpre_ecdh_compute_shared_secret(struct kpp_request *req)
+{
+ struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ int ret;
+
+ if (ctx->fallback) {
+ kpp_request_set_tfm(req, ctx->ecdh.soft_tfm);
+ ret = crypto_kpp_compute_shared_secret(req);
+ kpp_request_set_tfm(req, tfm);
+ return ret;
+ }
+
+ return hpre_ecdh_compute_value(req);
+}
+
static unsigned int hpre_ecdh_max_size(struct crypto_kpp *tfm)
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ if (ctx->fallback)
+ return crypto_kpp_maxsize(ctx->ecdh.soft_tfm);
+
/* max size is the pub_key_size, include x and y */
return ctx->key_sz << 1;
}
+static int hpre_ecdh_init_tfm(struct crypto_kpp *tfm)
+{
+ struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ const char *alg = kpp_alg_name(tfm);
+ int ret;
+
+ ret = hpre_ctx_init(ctx, HPRE_V3_ECC_ALG_TYPE);
+ if (!ret) {
+ kpp_set_reqsize(tfm, sizeof(struct hpre_asym_request) + hpre_align_pd());
+ return 0;
+ } else if (ret && ret != -ENODEV) {
+ return ret;
+ }
+
+ ctx->ecdh.soft_tfm = crypto_alloc_kpp(alg, 0, CRYPTO_ALG_NEED_FALLBACK);
+ if (IS_ERR(ctx->ecdh.soft_tfm)) {
+ pr_err("Failed to alloc %s tfm!\n", alg);
+ return PTR_ERR(ctx->ecdh.soft_tfm);
+ }
+
+ crypto_kpp_set_flags(ctx->ecdh.soft_tfm, crypto_kpp_get_flags(tfm));
+ ctx->fallback = true;
+
+ return 0;
+}
+
static int hpre_ecdh_nist_p192_init_tfm(struct crypto_kpp *tfm)
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
ctx->curve_id = ECC_CURVE_NIST_P192;
- kpp_set_reqsize(tfm, sizeof(struct hpre_asym_request) + hpre_align_pd());
-
- return hpre_ctx_init(ctx, HPRE_V3_ECC_ALG_TYPE);
+ return hpre_ecdh_init_tfm(tfm);
}
static int hpre_ecdh_nist_p256_init_tfm(struct crypto_kpp *tfm)
@@ -1643,9 +1665,7 @@ static int hpre_ecdh_nist_p256_init_tfm(struct crypto_kpp *tfm)
ctx->curve_id = ECC_CURVE_NIST_P256;
ctx->enable_hpcore = 1;
- kpp_set_reqsize(tfm, sizeof(struct hpre_asym_request) + hpre_align_pd());
-
- return hpre_ctx_init(ctx, HPRE_V3_ECC_ALG_TYPE);
+ return hpre_ecdh_init_tfm(tfm);
}
static int hpre_ecdh_nist_p384_init_tfm(struct crypto_kpp *tfm)
@@ -1654,15 +1674,18 @@ static int hpre_ecdh_nist_p384_init_tfm(struct crypto_kpp *tfm)
ctx->curve_id = ECC_CURVE_NIST_P384;
- kpp_set_reqsize(tfm, sizeof(struct hpre_asym_request) + hpre_align_pd());
-
- return hpre_ctx_init(ctx, HPRE_V3_ECC_ALG_TYPE);
+ return hpre_ecdh_init_tfm(tfm);
}
static void hpre_ecdh_exit_tfm(struct crypto_kpp *tfm)
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
+ if (ctx->fallback) {
+ crypto_free_kpp(ctx->ecdh.soft_tfm);
+ return;
+ }
+
hpre_ecc_clear_ctx(ctx, true);
}
@@ -1680,13 +1703,14 @@ static struct akcipher_alg rsa = {
.cra_name = "rsa",
.cra_driver_name = "hpre-rsa",
.cra_module = THIS_MODULE,
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
},
};
static struct kpp_alg dh = {
.set_secret = hpre_dh_set_secret,
- .generate_public_key = hpre_dh_compute_value,
- .compute_shared_secret = hpre_dh_compute_value,
+ .generate_public_key = hpre_dh_generate_public_key,
+ .compute_shared_secret = hpre_dh_compute_shared_secret,
.max_size = hpre_dh_max_size,
.init = hpre_dh_init_tfm,
.exit = hpre_dh_exit_tfm,
@@ -1696,14 +1720,15 @@ static struct kpp_alg dh = {
.cra_name = "dh",
.cra_driver_name = "hpre-dh",
.cra_module = THIS_MODULE,
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
},
};
static struct kpp_alg ecdh_curves[] = {
{
.set_secret = hpre_ecdh_set_secret,
- .generate_public_key = hpre_ecdh_compute_value,
- .compute_shared_secret = hpre_ecdh_compute_value,
+ .generate_public_key = hpre_ecdh_generate_public_key,
+ .compute_shared_secret = hpre_ecdh_compute_shared_secret,
.max_size = hpre_ecdh_max_size,
.init = hpre_ecdh_nist_p192_init_tfm,
.exit = hpre_ecdh_exit_tfm,
@@ -1713,11 +1738,12 @@ static struct kpp_alg ecdh_curves[] = {
.cra_name = "ecdh-nist-p192",
.cra_driver_name = "hpre-ecdh-nist-p192",
.cra_module = THIS_MODULE,
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
},
}, {
.set_secret = hpre_ecdh_set_secret,
- .generate_public_key = hpre_ecdh_compute_value,
- .compute_shared_secret = hpre_ecdh_compute_value,
+ .generate_public_key = hpre_ecdh_generate_public_key,
+ .compute_shared_secret = hpre_ecdh_compute_shared_secret,
.max_size = hpre_ecdh_max_size,
.init = hpre_ecdh_nist_p256_init_tfm,
.exit = hpre_ecdh_exit_tfm,
@@ -1727,11 +1753,12 @@ static struct kpp_alg ecdh_curves[] = {
.cra_name = "ecdh-nist-p256",
.cra_driver_name = "hpre-ecdh-nist-p256",
.cra_module = THIS_MODULE,
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
},
}, {
.set_secret = hpre_ecdh_set_secret,
- .generate_public_key = hpre_ecdh_compute_value,
- .compute_shared_secret = hpre_ecdh_compute_value,
+ .generate_public_key = hpre_ecdh_generate_public_key,
+ .compute_shared_secret = hpre_ecdh_compute_shared_secret,
.max_size = hpre_ecdh_max_size,
.init = hpre_ecdh_nist_p384_init_tfm,
.exit = hpre_ecdh_exit_tfm,
@@ -1741,6 +1768,7 @@ static struct kpp_alg ecdh_curves[] = {
.cra_name = "ecdh-nist-p384",
.cra_driver_name = "hpre-ecdh-nist-p384",
.cra_module = THIS_MODULE,
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
},
}
};
diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index b94fecd765ee..884d5d0afaf4 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -465,7 +465,7 @@ struct hisi_qp *hpre_create_qp(u8 type)
* type: 0 - RSA/DH. algorithm supported in V2,
* 1 - ECC algorithm in V3.
*/
- ret = hisi_qm_alloc_qps_node(&hpre_devices, 1, type, node, &qp);
+ ret = hisi_qm_alloc_qps_node(&hpre_devices, 1, &type, node, &qp);
if (!ret)
return qp;
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index d47bf06a90f7..b8e59f99f700 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -2219,6 +2219,7 @@ static void qp_stop_fail_cb(struct hisi_qp *qp)
for (i = 0; i < qp_used; i++) {
pos = (i + cur_head) % sq_depth;
qp->req_cb(qp, qp->sqe + (u32)(qm->sqe_size * pos));
+ qm_cq_head_update(qp);
atomic_dec(&qp->qp_status.used);
}
}
@@ -2368,25 +2369,33 @@ EXPORT_SYMBOL_GPL(hisi_qm_stop_qp);
int hisi_qp_send(struct hisi_qp *qp, const void *msg)
{
struct hisi_qp_status *qp_status = &qp->qp_status;
- u16 sq_tail = qp_status->sq_tail;
- u16 sq_tail_next = (sq_tail + 1) % qp->sq_depth;
- void *sqe = qm_get_avail_sqe(qp);
+ u16 sq_tail, sq_tail_next;
+ void *sqe;
+ spin_lock_bh(&qp->qp_lock);
if (unlikely(atomic_read(&qp->qp_status.flags) == QP_STOP ||
atomic_read(&qp->qm->status.flags) == QM_STOP ||
qp->is_resetting)) {
+ spin_unlock_bh(&qp->qp_lock);
dev_info_ratelimited(&qp->qm->pdev->dev, "QP is stopped or resetting\n");
return -EAGAIN;
}
- if (!sqe)
+ sqe = qm_get_avail_sqe(qp);
+ if (!sqe) {
+ spin_unlock_bh(&qp->qp_lock);
return -EBUSY;
+ }
+ sq_tail = qp_status->sq_tail;
+ sq_tail_next = (sq_tail + 1) % qp->sq_depth;
memcpy(sqe, msg, qp->qm->sqe_size);
+ qp->msg[sq_tail] = msg;
qm_db(qp->qm, qp->qp_id, QM_DOORBELL_CMD_SQ, sq_tail_next, 0);
atomic_inc(&qp->qp_status.used);
qp_status->sq_tail = sq_tail_next;
+ spin_unlock_bh(&qp->qp_lock);
return 0;
}
@@ -2919,12 +2928,13 @@ EXPORT_SYMBOL_GPL(hisi_qm_wait_task_finish);
static void hisi_qp_memory_uninit(struct hisi_qm *qm, int num)
{
struct device *dev = &qm->pdev->dev;
- struct qm_dma *qdma;
+ struct hisi_qp *qp;
int i;
for (i = num - 1; i >= 0; i--) {
- qdma = &qm->qp_array[i].qdma;
- dma_free_coherent(dev, qdma->size, qdma->va, qdma->dma);
+ qp = &qm->qp_array[i];
+ dma_free_coherent(dev, qp->qdma.size, qp->qdma.va, qp->qdma.dma);
+ kfree(qp->msg);
kfree(qm->poll_data[i].qp_finish_id);
}
@@ -2946,10 +2956,14 @@ static int hisi_qp_memory_init(struct hisi_qm *qm, size_t dma_size, int id,
return -ENOMEM;
qp = &qm->qp_array[id];
+ qp->msg = kmalloc_array(sq_depth, sizeof(void *), GFP_KERNEL);
+ if (!qp->msg)
+ goto err_free_qp_finish_id;
+
qp->qdma.va = dma_alloc_coherent(dev, dma_size, &qp->qdma.dma,
GFP_KERNEL);
if (!qp->qdma.va)
- goto err_free_qp_finish_id;
+ goto err_free_qp_msg;
qp->sqe = qp->qdma.va;
qp->sqe_dma = qp->qdma.dma;
@@ -2961,8 +2975,14 @@ static int hisi_qp_memory_init(struct hisi_qm *qm, size_t dma_size, int id,
qp->qm = qm;
qp->qp_id = id;
+ spin_lock_init(&qp->qp_lock);
+ spin_lock_init(&qp->backlog.lock);
+ INIT_LIST_HEAD(&qp->backlog.list);
+
return 0;
+err_free_qp_msg:
+ kfree(qp->msg);
err_free_qp_finish_id:
kfree(qm->poll_data[id].qp_finish_id);
return ret;
@@ -3533,6 +3553,14 @@ void hisi_qm_dev_err_uninit(struct hisi_qm *qm)
}
EXPORT_SYMBOL_GPL(hisi_qm_dev_err_uninit);
+static void qm_release_qp_nolock(struct hisi_qp *qp)
+{
+ struct hisi_qm *qm = qp->qm;
+
+ qm->qp_in_used--;
+ idr_remove(&qm->qp_idr, qp->qp_id);
+}
+
/**
* hisi_qm_free_qps() - free multiple queue pairs.
* @qps: The queue pairs need to be freed.
@@ -3545,8 +3573,15 @@ void hisi_qm_free_qps(struct hisi_qp **qps, int qp_num)
if (!qps || qp_num <= 0)
return;
- for (i = qp_num - 1; i >= 0; i--)
- hisi_qm_release_qp(qps[i]);
+ down_write(&qps[0]->qm->qps_lock);
+
+ for (i = qp_num - 1; i >= 0; i--) {
+ qm_stop_qp_nolock(qps[i]);
+ qm_release_qp_nolock(qps[i]);
+ }
+
+ up_write(&qps[0]->qm->qps_lock);
+ qm_pm_put_sync(qps[0]->qm);
}
EXPORT_SYMBOL_GPL(hisi_qm_free_qps);
@@ -3560,6 +3595,43 @@ static void free_list(struct list_head *head)
}
}
+static int qm_get_and_start_qp(struct hisi_qm *qm, int qp_num, struct hisi_qp **qps, u8 *alg_type)
+{
+ int i, ret;
+
+ ret = qm_pm_get_sync(qm);
+ if (ret)
+ return ret;
+
+ down_write(&qm->qps_lock);
+ for (i = 0; i < qp_num; i++) {
+ qps[i] = qm_create_qp_nolock(qm, alg_type[i]);
+ if (IS_ERR(qps[i])) {
+ ret = -ENODEV;
+ goto stop_and_free;
+ }
+
+ ret = qm_start_qp_nolock(qps[i], 0);
+ if (ret) {
+ qm_release_qp_nolock(qps[i]);
+ goto stop_and_free;
+ }
+ }
+ up_write(&qm->qps_lock);
+
+ return 0;
+
+stop_and_free:
+ for (i--; i >= 0; i--) {
+ qm_stop_qp_nolock(qps[i]);
+ qm_release_qp_nolock(qps[i]);
+ }
+ up_write(&qm->qps_lock);
+ qm_pm_put_sync(qm);
+
+ return ret;
+}
+
static int hisi_qm_sort_devices(int node, struct list_head *head,
struct hisi_qm_list *qm_list)
{
@@ -3608,12 +3680,11 @@ static int hisi_qm_sort_devices(int node, struct list_head *head,
* not meet the requirements will return error.
*/
int hisi_qm_alloc_qps_node(struct hisi_qm_list *qm_list, int qp_num,
- u8 alg_type, int node, struct hisi_qp **qps)
+ u8 *alg_type, int node, struct hisi_qp **qps)
{
struct hisi_qm_resource *tmp;
int ret = -ENODEV;
LIST_HEAD(head);
- int i;
if (!qps || !qm_list || qp_num <= 0)
return -EINVAL;
@@ -3625,24 +3696,15 @@ int hisi_qm_alloc_qps_node(struct hisi_qm_list *qm_list, int qp_num,
}
list_for_each_entry(tmp, &head, list) {
- for (i = 0; i < qp_num; i++) {
- qps[i] = hisi_qm_create_qp(tmp->qm, alg_type);
- if (IS_ERR(qps[i])) {
- hisi_qm_free_qps(qps, i);
- break;
- }
- }
-
- if (i == qp_num) {
- ret = 0;
+ ret = qm_get_and_start_qp(tmp->qm, qp_num, qps, alg_type);
+ if (!ret)
break;
- }
}
mutex_unlock(&qm_list->lock);
if (ret)
- pr_info("Failed to create qps, node[%d], alg[%u], qp[%d]!\n",
- node, alg_type, qp_num);
+ pr_info("Failed to create qps, node[%d], qp[%d]!\n",
+ node, qp_num);
err:
free_list(&head);
diff --git a/drivers/crypto/hisilicon/sec2/sec.h b/drivers/crypto/hisilicon/sec2/sec.h
index 81d0beda93b2..0710977861f3 100644
--- a/drivers/crypto/hisilicon/sec2/sec.h
+++ b/drivers/crypto/hisilicon/sec2/sec.h
@@ -82,11 +82,6 @@ struct sec_aead_req {
__u8 out_mac_buf[SEC_MAX_MAC_LEN];
};
-struct sec_instance_backlog {
- struct list_head list;
- spinlock_t lock;
-};
-
/* SEC request of Crypto */
struct sec_req {
union {
@@ -112,7 +107,6 @@ struct sec_req {
bool use_pbuf;
struct list_head list;
- struct sec_instance_backlog *backlog;
struct sec_request_buf buf;
};
@@ -172,7 +166,6 @@ struct sec_qp_ctx {
spinlock_t id_lock;
struct hisi_acc_sgl_pool *c_in_pool;
struct hisi_acc_sgl_pool *c_out_pool;
- struct sec_instance_backlog backlog;
u16 send_head;
};
diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
index 31590d01139a..c462b58d3034 100644
--- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
+++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
@@ -54,7 +54,6 @@
#define SEC_AUTH_CIPHER_V3 0x40
#define SEC_FLAG_OFFSET 7
#define SEC_FLAG_MASK 0x0780
-#define SEC_TYPE_MASK 0x0F
#define SEC_DONE_MASK 0x0001
#define SEC_ICV_MASK 0x000E
@@ -148,7 +147,7 @@ static void sec_free_req_id(struct sec_req *req)
spin_unlock_bh(&qp_ctx->id_lock);
}
-static u8 pre_parse_finished_bd(struct bd_status *status, void *resp)
+static void pre_parse_finished_bd(struct bd_status *status, void *resp)
{
struct sec_sqe *bd = resp;
@@ -158,11 +157,9 @@ static u8 pre_parse_finished_bd(struct bd_status *status, void *resp)
SEC_FLAG_MASK) >> SEC_FLAG_OFFSET;
status->tag = le16_to_cpu(bd->type2.tag);
status->err_type = bd->type2.error_type;
-
- return bd->type_cipher_auth & SEC_TYPE_MASK;
}
-static u8 pre_parse_finished_bd3(struct bd_status *status, void *resp)
+static void pre_parse_finished_bd3(struct bd_status *status, void *resp)
{
struct sec_sqe3 *bd3 = resp;
@@ -172,8 +169,6 @@ static u8 pre_parse_finished_bd3(struct bd_status *status, void *resp)
SEC_FLAG_MASK) >> SEC_FLAG_OFFSET;
status->tag = le64_to_cpu(bd3->tag);
status->err_type = bd3->error_type;
-
- return le32_to_cpu(bd3->bd_param) & SEC_TYPE_MASK;
}
static int sec_cb_status_check(struct sec_req *req,
@@ -244,7 +239,7 @@ static void sec_alg_send_backlog_soft(struct sec_ctx *ctx, struct sec_qp_ctx *qp
struct sec_req *req, *tmp;
int ret;
- list_for_each_entry_safe(req, tmp, &qp_ctx->backlog.list, list) {
+ list_for_each_entry_safe(req, tmp, &qp_ctx->qp->backlog.list, list) {
list_del(&req->list);
ctx->req_op->buf_unmap(ctx, req);
if (req->req_id >= 0)
@@ -265,11 +260,12 @@ static void sec_alg_send_backlog_soft(struct sec_ctx *ctx, struct sec_qp_ctx *qp
static void sec_alg_send_backlog(struct sec_ctx *ctx, struct sec_qp_ctx *qp_ctx)
{
+ struct hisi_qp *qp = qp_ctx->qp;
struct sec_req *req, *tmp;
int ret;
- spin_lock_bh(&qp_ctx->backlog.lock);
- list_for_each_entry_safe(req, tmp, &qp_ctx->backlog.list, list) {
+ spin_lock_bh(&qp->backlog.lock);
+ list_for_each_entry_safe(req, tmp, &qp->backlog.list, list) {
ret = qp_send_message(req);
switch (ret) {
case -EINPROGRESS:
@@ -287,42 +283,46 @@ static void sec_alg_send_backlog(struct sec_ctx *ctx, struct sec_qp_ctx *qp_ctx)
}
unlock:
- spin_unlock_bh(&qp_ctx->backlog.lock);
+ spin_unlock_bh(&qp->backlog.lock);
}
static void sec_req_cb(struct hisi_qp *qp, void *resp)
{
- struct sec_qp_ctx *qp_ctx = qp->qp_ctx;
- struct sec_dfx *dfx = &qp_ctx->ctx->sec->debug.dfx;
- u8 type_supported = qp_ctx->ctx->type_supported;
+ const struct sec_sqe *sqe = qp->msg[qp->qp_status.cq_head];
+ struct sec_req *req = container_of(sqe, struct sec_req, sec_sqe);
+ struct sec_ctx *ctx = req->ctx;
+ struct sec_dfx *dfx = &ctx->sec->debug.dfx;
struct bd_status status;
- struct sec_ctx *ctx;
- struct sec_req *req;
int err;
- u8 type;
- if (type_supported == SEC_BD_TYPE2) {
- type = pre_parse_finished_bd(&status, resp);
- req = qp_ctx->req_list[status.tag];
- } else {
- type = pre_parse_finished_bd3(&status, resp);
- req = (void *)(uintptr_t)status.tag;
- }
+ pre_parse_finished_bd(&status, resp);
- if (unlikely(type != type_supported)) {
- atomic64_inc(&dfx->err_bd_cnt);
- pr_err("err bd type [%u]\n", type);
- return;
- }
+ req->err_type = status.err_type;
+ err = sec_cb_status_check(req, &status);
+ if (err)
+ atomic64_inc(&dfx->done_flag_cnt);
- if (unlikely(!req)) {
- atomic64_inc(&dfx->invalid_req_cnt);
- atomic_inc(&qp->qp_status.used);
- return;
- }
+ atomic64_inc(&dfx->recv_cnt);
+ ctx->req_op->buf_unmap(ctx, req);
+ ctx->req_op->callback(ctx, req, err);
+}
+
+static void sec_req_cb3(struct hisi_qp *qp, void *resp)
+{
+ struct bd_status status;
+ struct sec_ctx *ctx;
+ struct sec_dfx *dfx;
+ struct sec_req *req;
+ int err;
+
+ pre_parse_finished_bd3(&status, resp);
+
+ req = (void *)(uintptr_t)status.tag;
req->err_type = status.err_type;
ctx = req->ctx;
+ dfx = &ctx->sec->debug.dfx;
+
err = sec_cb_status_check(req, &status);
if (err)
atomic64_inc(&dfx->done_flag_cnt);
@@ -330,7 +330,6 @@ static void sec_req_cb(struct hisi_qp *qp, void *resp)
atomic64_inc(&dfx->recv_cnt);
ctx->req_op->buf_unmap(ctx, req);
-
ctx->req_op->callback(ctx, req, err);
}
@@ -348,8 +347,10 @@ static int sec_alg_send_message_retry(struct sec_req *req)
static int sec_alg_try_enqueue(struct sec_req *req)
{
+ struct hisi_qp *qp = req->qp_ctx->qp;
+
/* Check if any request is already backlogged */
- if (!list_empty(&req->backlog->list))
+ if (!list_empty(&qp->backlog.list))
return -EBUSY;
/* Try to enqueue to HW ring */
@@ -359,17 +360,18 @@ static int sec_alg_try_enqueue(struct sec_req *req)
static int sec_alg_send_message_maybacklog(struct sec_req *req)
{
+ struct hisi_qp *qp = req->qp_ctx->qp;
int ret;
ret = sec_alg_try_enqueue(req);
if (ret != -EBUSY)
return ret;
- spin_lock_bh(&req->backlog->lock);
+ spin_lock_bh(&qp->backlog.lock);
ret = sec_alg_try_enqueue(req);
if (ret == -EBUSY)
- list_add_tail(&req->list, &req->backlog->list);
- spin_unlock_bh(&req->backlog->lock);
+ list_add_tail(&req->list, &qp->backlog.list);
+ spin_unlock_bh(&qp->backlog.lock);
return ret;
}
@@ -624,32 +626,25 @@ static int sec_create_qp_ctx(struct sec_ctx *ctx, int qp_ctx_id)
qp_ctx = &ctx->qp_ctx[qp_ctx_id];
qp = ctx->qps[qp_ctx_id];
- qp->req_type = 0;
- qp->qp_ctx = qp_ctx;
qp_ctx->qp = qp;
qp_ctx->ctx = ctx;
- qp->req_cb = sec_req_cb;
+ if (ctx->type_supported == SEC_BD_TYPE3)
+ qp->req_cb = sec_req_cb3;
+ else
+ qp->req_cb = sec_req_cb;
spin_lock_init(&qp_ctx->req_lock);
idr_init(&qp_ctx->req_idr);
- spin_lock_init(&qp_ctx->backlog.lock);
spin_lock_init(&qp_ctx->id_lock);
- INIT_LIST_HEAD(&qp_ctx->backlog.list);
qp_ctx->send_head = 0;
ret = sec_alloc_qp_ctx_resource(ctx, qp_ctx);
if (ret)
goto err_destroy_idr;
- ret = hisi_qm_start_qp(qp, 0);
- if (ret < 0)
- goto err_resource_free;
-
return 0;
-err_resource_free:
- sec_free_qp_ctx_resource(ctx, qp_ctx);
err_destroy_idr:
idr_destroy(&qp_ctx->req_idr);
return ret;
@@ -658,7 +653,6 @@ static int sec_create_qp_ctx(struct sec_ctx *ctx, int qp_ctx_id)
static void sec_release_qp_ctx(struct sec_ctx *ctx,
struct sec_qp_ctx *qp_ctx)
{
- hisi_qm_stop_qp(qp_ctx->qp);
sec_free_qp_ctx_resource(ctx, qp_ctx);
idr_destroy(&qp_ctx->req_idr);
}
@@ -669,10 +663,8 @@ static int sec_ctx_base_init(struct sec_ctx *ctx)
int i, ret;
ctx->qps = sec_create_qps();
- if (!ctx->qps) {
- pr_err("Can not create sec qps!\n");
+ if (!ctx->qps)
return -ENODEV;
- }
sec = container_of(ctx->qps[0]->qm, struct sec_dev, qm);
ctx->sec = sec;
@@ -708,6 +700,9 @@ static void sec_ctx_base_uninit(struct sec_ctx *ctx)
{
int i;
+ if (!ctx->qps)
+ return;
+
for (i = 0; i < ctx->sec->ctx_q_num; i++)
sec_release_qp_ctx(ctx, &ctx->qp_ctx[i]);
@@ -719,6 +714,9 @@ static int sec_cipher_init(struct sec_ctx *ctx)
{
struct sec_cipher_ctx *c_ctx = &ctx->c_ctx;
+ if (!ctx->qps)
+ return 0;
+
c_ctx->c_key = dma_alloc_coherent(ctx->dev, SEC_MAX_KEY_SIZE,
&c_ctx->c_key_dma, GFP_KERNEL);
if (!c_ctx->c_key)
@@ -731,6 +729,9 @@ static void sec_cipher_uninit(struct sec_ctx *ctx)
{
struct sec_cipher_ctx *c_ctx = &ctx->c_ctx;
+ if (!ctx->qps)
+ return;
+
memzero_explicit(c_ctx->c_key, SEC_MAX_KEY_SIZE);
dma_free_coherent(ctx->dev, SEC_MAX_KEY_SIZE,
c_ctx->c_key, c_ctx->c_key_dma);
@@ -752,6 +753,9 @@ static void sec_auth_uninit(struct sec_ctx *ctx)
{
struct sec_auth_ctx *a_ctx = &ctx->a_ctx;
+ if (!ctx->qps)
+ return;
+
memzero_explicit(a_ctx->a_key, SEC_MAX_AKEY_SIZE);
dma_free_coherent(ctx->dev, SEC_MAX_AKEY_SIZE,
a_ctx->a_key, a_ctx->a_key_dma);
@@ -789,7 +793,7 @@ static int sec_skcipher_init(struct crypto_skcipher *tfm)
}
ret = sec_ctx_base_init(ctx);
- if (ret)
+ if (ret && ret != -ENODEV)
return ret;
ret = sec_cipher_init(ctx);
@@ -898,6 +902,9 @@ static int sec_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,
struct device *dev = ctx->dev;
int ret;
+ if (!ctx->qps)
+ goto set_soft_key;
+
if (c_mode == SEC_CMODE_XTS) {
ret = xts_verify_key(tfm, key, keylen);
if (ret) {
@@ -928,13 +935,14 @@ static int sec_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,
}
memcpy(c_ctx->c_key, key, keylen);
- if (c_ctx->fbtfm) {
- ret = crypto_sync_skcipher_setkey(c_ctx->fbtfm, key, keylen);
- if (ret) {
- dev_err(dev, "failed to set fallback skcipher key!\n");
- return ret;
- }
+
+set_soft_key:
+ ret = crypto_sync_skcipher_setkey(c_ctx->fbtfm, key, keylen);
+ if (ret) {
+ dev_err(dev, "failed to set fallback skcipher key!\n");
+ return ret;
}
+
return 0;
}
@@ -1398,6 +1406,9 @@ static int sec_aead_setkey(struct crypto_aead *tfm, const u8 *key,
struct crypto_authenc_keys keys;
int ret;
+ if (!ctx->qps)
+ return sec_aead_fallback_setkey(a_ctx, tfm, key, keylen);
+
ctx->a_ctx.a_alg = a_alg;
ctx->c_ctx.c_alg = c_alg;
c_ctx->c_mode = c_mode;
@@ -1952,7 +1963,6 @@ static int sec_request_init(struct sec_ctx *ctx, struct sec_req *req)
} while (req->req_id < 0 && ++i < ctx->sec->ctx_q_num);
req->qp_ctx = qp_ctx;
- req->backlog = &qp_ctx->backlog;
return 0;
}
@@ -2055,6 +2065,9 @@ static int sec_skcipher_ctx_init(struct crypto_skcipher *tfm)
if (ret)
return ret;
+ if (!ctx->qps)
+ return 0;
+
if (ctx->sec->qm.ver < QM_HW_V3) {
ctx->type_supported = SEC_BD_TYPE2;
ctx->req_op = &sec_skcipher_req_ops;
@@ -2063,7 +2076,7 @@ static int sec_skcipher_ctx_init(struct crypto_skcipher *tfm)
ctx->req_op = &sec_skcipher_req_ops_v3;
}
- return ret;
+ return 0;
}
static void sec_skcipher_ctx_exit(struct crypto_skcipher *tfm)
@@ -2131,7 +2144,7 @@ static int sec_aead_ctx_init(struct crypto_aead *tfm, const char *hash_name)
int ret;
ret = sec_aead_init(tfm);
- if (ret) {
+ if (ret && ret != -ENODEV) {
pr_err("hisi_sec2: aead init error!\n");
return ret;
}
@@ -2173,7 +2186,7 @@ static int sec_aead_xcm_ctx_init(struct crypto_aead *tfm)
int ret;
ret = sec_aead_init(tfm);
- if (ret) {
+ if (ret && ret != -ENODEV) {
dev_err(ctx->dev, "hisi_sec2: aead xcm init error!\n");
return ret;
}
@@ -2318,6 +2331,9 @@ static int sec_skcipher_crypto(struct skcipher_request *sk_req, bool encrypt)
bool need_fallback = false;
int ret;
+ if (!ctx->qps)
+ goto soft_crypto;
+
if (!sk_req->cryptlen) {
if (ctx->c_ctx.c_mode == SEC_CMODE_XTS)
return -EINVAL;
@@ -2335,9 +2351,12 @@ static int sec_skcipher_crypto(struct skcipher_request *sk_req, bool encrypt)
return -EINVAL;
if (unlikely(ctx->c_ctx.fallback || need_fallback))
- return sec_skcipher_soft_crypto(ctx, sk_req, encrypt);
+ goto soft_crypto;
return ctx->req_op->process(ctx, req);
+
+soft_crypto:
+ return sec_skcipher_soft_crypto(ctx, sk_req, encrypt);
}
static int sec_skcipher_encrypt(struct skcipher_request *sk_req)
@@ -2545,6 +2564,9 @@ static int sec_aead_crypto(struct aead_request *a_req, bool encrypt)
bool need_fallback = false;
int ret;
+ if (!ctx->qps)
+ goto soft_crypto;
+
req->flag = a_req->base.flags;
req->aead_req.aead_req = a_req;
req->c_req.encrypt = encrypt;
@@ -2555,11 +2577,14 @@ static int sec_aead_crypto(struct aead_request *a_req, bool encrypt)
ret = sec_aead_param_check(ctx, req, &need_fallback);
if (unlikely(ret)) {
if (need_fallback)
- return sec_aead_soft_crypto(ctx, a_req, encrypt);
+ goto soft_crypto;
return -EINVAL;
}
return ctx->req_op->process(ctx, req);
+
+soft_crypto:
+ return sec_aead_soft_crypto(ctx, a_req, encrypt);
}
static int sec_aead_encrypt(struct aead_request *a_req)
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index 5eb2d6820742..7dd125f5f511 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -417,18 +417,29 @@ struct hisi_qp **sec_create_qps(void)
int node = cpu_to_node(raw_smp_processor_id());
u32 ctx_num = ctx_q_num;
struct hisi_qp **qps;
+ u8 *type;
int ret;
qps = kcalloc(ctx_num, sizeof(struct hisi_qp *), GFP_KERNEL);
if (!qps)
return NULL;
- ret = hisi_qm_alloc_qps_node(&sec_devices, ctx_num, 0, node, qps);
- if (!ret)
- return qps;
+ /* The type of SEC is all 0, so just allocated by kcalloc */
+ type = kcalloc(ctx_num, sizeof(u8), GFP_KERNEL);
+ if (!type) {
+ kfree(qps);
+ return NULL;
+ }
- kfree(qps);
- return NULL;
+ ret = hisi_qm_alloc_qps_node(&sec_devices, ctx_num, type, node, qps);
+ if (ret) {
+ kfree(type);
+ kfree(qps);
+ return NULL;
+ }
+
+ kfree(type);
+ return qps;
}
u64 sec_get_alg_bitmap(struct hisi_qm *qm, u32 high, u32 low)
diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c
index 24c7b6ab285b..d41b34405c21 100644
--- a/drivers/crypto/hisilicon/sgl.c
+++ b/drivers/crypto/hisilicon/sgl.c
@@ -260,7 +260,7 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev, struct scatterlist *sgl,
return curr_hw_sgl;
err_unmap:
- dma_unmap_sg(dev, sgl, sg_n, DMA_BIDIRECTIONAL);
+ dma_unmap_sg(dev, sgl, sg_n, dir);
return ERR_PTR(ret);
}
diff --git a/drivers/crypto/hisilicon/trng/trng.c b/drivers/crypto/hisilicon/trng/trng.c
index ac74df4a9471..5ca0b90859a8 100644
--- a/drivers/crypto/hisilicon/trng/trng.c
+++ b/drivers/crypto/hisilicon/trng/trng.c
@@ -40,6 +40,7 @@
#define SEED_SHIFT_24 24
#define SEED_SHIFT_16 16
#define SEED_SHIFT_8 8
+#define SW_MAX_RANDOM_BYTES 65520
struct hisi_trng_list {
struct mutex lock;
@@ -53,8 +54,10 @@ struct hisi_trng {
struct list_head list;
struct hwrng rng;
u32 ver;
- bool is_used;
- struct mutex mutex;
+ u32 ctx_num;
+ /* The bytes of the random number generated since the last seeding. */
+ u32 random_bytes;
+ struct mutex lock;
};
struct hisi_trng_ctx {
@@ -63,10 +66,14 @@ struct hisi_trng_ctx {
static atomic_t trng_active_devs;
static struct hisi_trng_list trng_devices;
+static int hisi_trng_read(struct hwrng *rng, void *buf, size_t max, bool wait);
-static void hisi_trng_set_seed(struct hisi_trng *trng, const u8 *seed)
+static int hisi_trng_set_seed(struct hisi_trng *trng, const u8 *seed)
{
u32 val, seed_reg, i;
+ int ret;
+
+ writel(0x0, trng->base + SW_DRBG_BLOCKS);
for (i = 0; i < SW_DRBG_SEED_SIZE;
i += SW_DRBG_SEED_SIZE / SW_DRBG_SEED_REGS_NUM) {
@@ -78,6 +85,20 @@ static void hisi_trng_set_seed(struct hisi_trng *trng, const u8 *seed)
seed_reg = (i >> SW_DRBG_NUM_SHIFT) % SW_DRBG_SEED_REGS_NUM;
writel(val, trng->base + SW_DRBG_SEED(seed_reg));
}
+
+ writel(SW_DRBG_BLOCKS_NUM | (0x1 << SW_DRBG_ENABLE_SHIFT),
+ trng->base + SW_DRBG_BLOCKS);
+ writel(0x1, trng->base + SW_DRBG_INIT);
+ ret = readl_relaxed_poll_timeout(trng->base + SW_DRBG_STATUS,
+ val, val & BIT(0), SLEEP_US, TIMEOUT_US);
+ if (ret) {
+ pr_err("failed to init trng(%d)\n", ret);
+ return -EIO;
+ }
+
+ trng->random_bytes = 0;
+
+ return 0;
}
static int hisi_trng_seed(struct crypto_rng *tfm, const u8 *seed,
@@ -85,8 +106,7 @@ static int hisi_trng_seed(struct crypto_rng *tfm, const u8 *seed,
{
struct hisi_trng_ctx *ctx = crypto_rng_ctx(tfm);
struct hisi_trng *trng = ctx->trng;
- u32 val = 0;
- int ret = 0;
+ int ret;
if (slen < SW_DRBG_SEED_SIZE) {
pr_err("slen(%u) is not matched with trng(%d)\n", slen,
@@ -94,43 +114,45 @@ static int hisi_trng_seed(struct crypto_rng *tfm, const u8 *seed,
return -EINVAL;
}
- writel(0x0, trng->base + SW_DRBG_BLOCKS);
- hisi_trng_set_seed(trng, seed);
+ mutex_lock(&trng->lock);
+ ret = hisi_trng_set_seed(trng, seed);
+ mutex_unlock(&trng->lock);
- writel(SW_DRBG_BLOCKS_NUM | (0x1 << SW_DRBG_ENABLE_SHIFT),
- trng->base + SW_DRBG_BLOCKS);
- writel(0x1, trng->base + SW_DRBG_INIT);
+ return ret;
+}
- ret = readl_relaxed_poll_timeout(trng->base + SW_DRBG_STATUS,
- val, val & BIT(0), SLEEP_US, TIMEOUT_US);
- if (ret)
- pr_err("fail to init trng(%d)\n", ret);
+static int hisi_trng_reseed(struct hisi_trng *trng)
+{
+ u8 seed[SW_DRBG_SEED_SIZE];
+ int size;
- return ret;
+ if (!trng->random_bytes)
+ return 0;
+
+ size = hisi_trng_read(&trng->rng, seed, SW_DRBG_SEED_SIZE, false);
+ if (size != SW_DRBG_SEED_SIZE)
+ return -EIO;
+
+ return hisi_trng_set_seed(trng, seed);
}
-static int hisi_trng_generate(struct crypto_rng *tfm, const u8 *src,
- unsigned int slen, u8 *dstn, unsigned int dlen)
+static int hisi_trng_get_bytes(struct hisi_trng *trng, u8 *dstn, unsigned int dlen)
{
- struct hisi_trng_ctx *ctx = crypto_rng_ctx(tfm);
- struct hisi_trng *trng = ctx->trng;
u32 data[SW_DRBG_DATA_NUM];
u32 currsize = 0;
u32 val = 0;
int ret;
u32 i;
- if (dlen > SW_DRBG_BLOCKS_NUM * SW_DRBG_BYTES || dlen == 0) {
- pr_err("dlen(%u) exceeds limit(%d)!\n", dlen,
- SW_DRBG_BLOCKS_NUM * SW_DRBG_BYTES);
- return -EINVAL;
- }
+ ret = hisi_trng_reseed(trng);
+ if (ret)
+ return ret;
do {
ret = readl_relaxed_poll_timeout(trng->base + SW_DRBG_STATUS,
- val, val & BIT(1), SLEEP_US, TIMEOUT_US);
+ val, val & BIT(1), SLEEP_US, TIMEOUT_US);
if (ret) {
- pr_err("fail to generate random number(%d)!\n", ret);
+ pr_err("failed to generate random number(%d)!\n", ret);
break;
}
@@ -145,30 +167,57 @@ static int hisi_trng_generate(struct crypto_rng *tfm, const u8 *src,
currsize = dlen;
}
+ trng->random_bytes += SW_DRBG_BYTES;
writel(0x1, trng->base + SW_DRBG_GEN);
} while (currsize < dlen);
return ret;
}
+static int hisi_trng_generate(struct crypto_rng *tfm, const u8 *src,
+ unsigned int slen, u8 *dstn, unsigned int dlen)
+{
+ struct hisi_trng_ctx *ctx = crypto_rng_ctx(tfm);
+ struct hisi_trng *trng = ctx->trng;
+ unsigned int currsize = 0;
+ unsigned int block_size;
+ int ret;
+
+ if (!dstn || !dlen) {
+ pr_err("output is error, dlen %u!\n", dlen);
+ return -EINVAL;
+ }
+
+ do {
+ block_size = min_t(unsigned int, dlen - currsize, SW_MAX_RANDOM_BYTES);
+ mutex_lock(&trng->lock);
+ ret = hisi_trng_get_bytes(trng, dstn + currsize, block_size);
+ mutex_unlock(&trng->lock);
+ if (ret)
+ return ret;
+ currsize += block_size;
+ } while (currsize < dlen);
+
+ return 0;
+}
+
static int hisi_trng_init(struct crypto_tfm *tfm)
{
struct hisi_trng_ctx *ctx = crypto_tfm_ctx(tfm);
struct hisi_trng *trng;
- int ret = -EBUSY;
+ u32 ctx_num = ~0;
mutex_lock(&trng_devices.lock);
list_for_each_entry(trng, &trng_devices.list, list) {
- if (!trng->is_used) {
- trng->is_used = true;
+ if (trng->ctx_num < ctx_num) {
+ ctx_num = trng->ctx_num;
ctx->trng = trng;
- ret = 0;
- break;
}
}
+ ctx->trng->ctx_num++;
mutex_unlock(&trng_devices.lock);
- return ret;
+ return 0;
}
static void hisi_trng_exit(struct crypto_tfm *tfm)
@@ -176,7 +225,7 @@ static void hisi_trng_exit(struct crypto_tfm *tfm)
struct hisi_trng_ctx *ctx = crypto_tfm_ctx(tfm);
mutex_lock(&trng_devices.lock);
- ctx->trng->is_used = false;
+ ctx->trng->ctx_num--;
mutex_unlock(&trng_devices.lock);
}
@@ -238,7 +287,7 @@ static int hisi_trng_del_from_list(struct hisi_trng *trng)
int ret = -EBUSY;
mutex_lock(&trng_devices.lock);
- if (!trng->is_used) {
+ if (!trng->ctx_num) {
list_del(&trng->list);
ret = 0;
}
@@ -262,7 +311,9 @@ static int hisi_trng_probe(struct platform_device *pdev)
if (IS_ERR(trng->base))
return PTR_ERR(trng->base);
- trng->is_used = false;
+ trng->ctx_num = 0;
+ trng->random_bytes = SW_MAX_RANDOM_BYTES;
+ mutex_init(&trng->lock);
trng->ver = readl(trng->base + HISI_TRNG_VERSION);
if (!trng_devices.is_init) {
INIT_LIST_HEAD(&trng_devices.list);
diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h
index 9fb2a9c01132..b83f228281ab 100644
--- a/drivers/crypto/hisilicon/zip/zip.h
+++ b/drivers/crypto/hisilicon/zip/zip.h
@@ -99,7 +99,7 @@ enum zip_cap_table_type {
ZIP_CORE5_BITMAP,
};
-int zip_create_qps(struct hisi_qp **qps, int qp_num, int node);
+int zip_create_qps(struct hisi_qp **qps, int qp_num, int node, u8 *alg_type);
int hisi_zip_register_to_crypto(struct hisi_qm *qm);
void hisi_zip_unregister_from_crypto(struct hisi_qm *qm);
bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg);
diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c
index b97513981a3b..e140d4f8afe0 100644
--- a/drivers/crypto/hisilicon/zip/zip_crypto.c
+++ b/drivers/crypto/hisilicon/zip/zip_crypto.c
@@ -39,6 +39,7 @@ enum {
HZIP_CTX_Q_NUM
};
+#define GET_REQ_FROM_SQE(sqe) ((u64)(sqe)->dw26 | (u64)(sqe)->dw27 << 32)
#define COMP_NAME_TO_TYPE(alg_name) \
(!strcmp((alg_name), "deflate") ? HZIP_ALG_TYPE_DEFLATE : 0)
@@ -48,6 +49,7 @@ struct hisi_zip_req {
struct hisi_acc_hw_sgl *hw_dst;
dma_addr_t dma_src;
dma_addr_t dma_dst;
+ struct hisi_zip_qp_ctx *qp_ctx;
u16 req_id;
};
@@ -64,6 +66,7 @@ struct hisi_zip_qp_ctx {
struct hisi_acc_sgl_pool *sgl_pool;
struct hisi_zip *zip_dev;
struct hisi_zip_ctx *ctx;
+ u8 req_type;
};
struct hisi_zip_sqe_ops {
@@ -74,7 +77,6 @@ struct hisi_zip_sqe_ops {
void (*fill_req_type)(struct hisi_zip_sqe *sqe, u8 req_type);
void (*fill_tag)(struct hisi_zip_sqe *sqe, struct hisi_zip_req *req);
void (*fill_sqe_type)(struct hisi_zip_sqe *sqe, u8 sqe_type);
- u32 (*get_tag)(struct hisi_zip_sqe *sqe);
u32 (*get_status)(struct hisi_zip_sqe *sqe);
u32 (*get_dstlen)(struct hisi_zip_sqe *sqe);
};
@@ -82,6 +84,7 @@ struct hisi_zip_sqe_ops {
struct hisi_zip_ctx {
struct hisi_zip_qp_ctx qp_ctx[HZIP_CTX_Q_NUM];
const struct hisi_zip_sqe_ops *ops;
+ bool fallback;
};
static int sgl_sge_nr_set(const char *val, const struct kernel_param *kp)
@@ -108,6 +111,24 @@ static u16 sgl_sge_nr = HZIP_SGL_SGE_NR;
module_param_cb(sgl_sge_nr, &sgl_sge_nr_ops, &sgl_sge_nr, 0444);
MODULE_PARM_DESC(sgl_sge_nr, "Number of sge in sgl(1-255)");
+static int hisi_zip_fallback_do_work(struct acomp_req *acomp_req, bool is_decompress)
+{
+ ACOMP_FBREQ_ON_STACK(fbreq, acomp_req);
+ int ret;
+
+ if (!is_decompress)
+ ret = crypto_acomp_compress(fbreq);
+ else
+ ret = crypto_acomp_decompress(fbreq);
+ if (ret) {
+ pr_err("failed to do fallback work, ret=%d\n", ret);
+ return ret;
+ }
+
+ acomp_req->dlen = fbreq->dlen;
+ return ret;
+}
+
static struct hisi_zip_req *hisi_zip_create_req(struct hisi_zip_qp_ctx *qp_ctx,
struct acomp_req *req)
{
@@ -131,6 +152,7 @@ static struct hisi_zip_req *hisi_zip_create_req(struct hisi_zip_qp_ctx *qp_ctx,
req_cache = q + req_id;
req_cache->req_id = req_id;
req_cache->req = req;
+ req_cache->qp_ctx = qp_ctx;
return req_cache;
}
@@ -181,7 +203,8 @@ static void hisi_zip_fill_req_type(struct hisi_zip_sqe *sqe, u8 req_type)
static void hisi_zip_fill_tag(struct hisi_zip_sqe *sqe, struct hisi_zip_req *req)
{
- sqe->dw26 = req->req_id;
+ sqe->dw26 = lower_32_bits((u64)req);
+ sqe->dw27 = upper_32_bits((u64)req);
}
static void hisi_zip_fill_sqe_type(struct hisi_zip_sqe *sqe, u8 sqe_type)
@@ -213,7 +236,6 @@ static int hisi_zip_do_work(struct hisi_zip_qp_ctx *qp_ctx,
{
struct hisi_acc_sgl_pool *pool = qp_ctx->sgl_pool;
struct hisi_zip_dfx *dfx = &qp_ctx->zip_dev->dfx;
- struct hisi_zip_req_q *req_q = &qp_ctx->req_q;
struct acomp_req *a_req = req->req;
struct hisi_qp *qp = qp_ctx->qp;
struct device *dev = &qp->qm->pdev->dev;
@@ -237,18 +259,16 @@ static int hisi_zip_do_work(struct hisi_zip_qp_ctx *qp_ctx,
&req->dma_dst, DMA_FROM_DEVICE);
if (IS_ERR(req->hw_dst)) {
ret = PTR_ERR(req->hw_dst);
- dev_err(dev, "failed to map the dst buffer to hw slg (%d)!\n",
+ dev_err(dev, "failed to map the dst buffer to hw sgl (%d)!\n",
ret);
goto err_unmap_input;
}
- hisi_zip_fill_sqe(qp_ctx->ctx, &zip_sqe, qp->req_type, req);
+ hisi_zip_fill_sqe(qp_ctx->ctx, &zip_sqe, qp_ctx->req_type, req);
/* send command to start a task */
atomic64_inc(&dfx->send_cnt);
- spin_lock_bh(&req_q->req_lock);
ret = hisi_qp_send(qp, &zip_sqe);
- spin_unlock_bh(&req_q->req_lock);
if (unlikely(ret < 0)) {
atomic64_inc(&dfx->send_busy_cnt);
ret = -EAGAIN;
@@ -265,11 +285,6 @@ static int hisi_zip_do_work(struct hisi_zip_qp_ctx *qp_ctx,
return ret;
}
-static u32 hisi_zip_get_tag(struct hisi_zip_sqe *sqe)
-{
- return sqe->dw26;
-}
-
static u32 hisi_zip_get_status(struct hisi_zip_sqe *sqe)
{
return sqe->dw3 & HZIP_BD_STATUS_M;
@@ -282,14 +297,12 @@ static u32 hisi_zip_get_dstlen(struct hisi_zip_sqe *sqe)
static void hisi_zip_acomp_cb(struct hisi_qp *qp, void *data)
{
- struct hisi_zip_qp_ctx *qp_ctx = qp->qp_ctx;
+ struct hisi_zip_sqe *sqe = data;
+ struct hisi_zip_req *req = (struct hisi_zip_req *)GET_REQ_FROM_SQE(sqe);
+ struct hisi_zip_qp_ctx *qp_ctx = req->qp_ctx;
const struct hisi_zip_sqe_ops *ops = qp_ctx->ctx->ops;
struct hisi_zip_dfx *dfx = &qp_ctx->zip_dev->dfx;
- struct hisi_zip_req_q *req_q = &qp_ctx->req_q;
struct device *dev = &qp->qm->pdev->dev;
- struct hisi_zip_sqe *sqe = data;
- u32 tag = ops->get_tag(sqe);
- struct hisi_zip_req *req = req_q->q + tag;
struct acomp_req *acomp_req = req->req;
int err = 0;
u32 status;
@@ -319,10 +332,15 @@ static int hisi_zip_acompress(struct acomp_req *acomp_req)
{
struct hisi_zip_ctx *ctx = crypto_tfm_ctx(acomp_req->base.tfm);
struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[HZIP_QPC_COMP];
- struct device *dev = &qp_ctx->qp->qm->pdev->dev;
struct hisi_zip_req *req;
+ struct device *dev;
int ret;
+ if (ctx->fallback)
+ return hisi_zip_fallback_do_work(acomp_req, 0);
+
+ dev = &qp_ctx->qp->qm->pdev->dev;
+
req = hisi_zip_create_req(qp_ctx, acomp_req);
if (IS_ERR(req))
return PTR_ERR(req);
@@ -340,10 +358,15 @@ static int hisi_zip_adecompress(struct acomp_req *acomp_req)
{
struct hisi_zip_ctx *ctx = crypto_tfm_ctx(acomp_req->base.tfm);
struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[HZIP_QPC_DECOMP];
- struct device *dev = &qp_ctx->qp->qm->pdev->dev;
struct hisi_zip_req *req;
+ struct device *dev;
int ret;
+ if (ctx->fallback)
+ return hisi_zip_fallback_do_work(acomp_req, 1);
+
+ dev = &qp_ctx->qp->qm->pdev->dev;
+
req = hisi_zip_create_req(qp_ctx, acomp_req);
if (IS_ERR(req))
return PTR_ERR(req);
@@ -358,33 +381,6 @@ static int hisi_zip_adecompress(struct acomp_req *acomp_req)
return ret;
}
-static int hisi_zip_start_qp(struct hisi_qp *qp, struct hisi_zip_qp_ctx *qp_ctx,
- int alg_type, int req_type)
-{
- struct device *dev = &qp->qm->pdev->dev;
- int ret;
-
- qp->req_type = req_type;
- qp->alg_type = alg_type;
- qp->qp_ctx = qp_ctx;
-
- ret = hisi_qm_start_qp(qp, 0);
- if (ret < 0) {
- dev_err(dev, "failed to start qp (%d)!\n", ret);
- return ret;
- }
-
- qp_ctx->qp = qp;
-
- return 0;
-}
-
-static void hisi_zip_release_qp(struct hisi_zip_qp_ctx *qp_ctx)
-{
- hisi_qm_stop_qp(qp_ctx->qp);
- hisi_qm_free_qps(&qp_ctx->qp, 1);
-}
-
static const struct hisi_zip_sqe_ops hisi_zip_ops = {
.sqe_type = 0x3,
.fill_addr = hisi_zip_fill_addr,
@@ -393,7 +389,6 @@ static const struct hisi_zip_sqe_ops hisi_zip_ops = {
.fill_req_type = hisi_zip_fill_req_type,
.fill_tag = hisi_zip_fill_tag,
.fill_sqe_type = hisi_zip_fill_sqe_type,
- .get_tag = hisi_zip_get_tag,
.get_status = hisi_zip_get_status,
.get_dstlen = hisi_zip_get_dstlen,
};
@@ -402,10 +397,15 @@ static int hisi_zip_ctx_init(struct hisi_zip_ctx *hisi_zip_ctx, u8 req_type, int
{
struct hisi_qp *qps[HZIP_CTX_Q_NUM] = { NULL };
struct hisi_zip_qp_ctx *qp_ctx;
+ u8 alg_type[HZIP_CTX_Q_NUM];
struct hisi_zip *hisi_zip;
- int ret, i, j;
+ int ret, i;
- ret = zip_create_qps(qps, HZIP_CTX_Q_NUM, node);
+ /* alg_type = 0 for compress, 1 for decompress in hw sqe */
+ for (i = 0; i < HZIP_CTX_Q_NUM; i++)
+ alg_type[i] = i;
+
+ ret = zip_create_qps(qps, HZIP_CTX_Q_NUM, node, alg_type);
if (ret) {
pr_err("failed to create zip qps (%d)!\n", ret);
return -ENODEV;
@@ -414,19 +414,11 @@ static int hisi_zip_ctx_init(struct hisi_zip_ctx *hisi_zip_ctx, u8 req_type, int
hisi_zip = container_of(qps[0]->qm, struct hisi_zip, qm);
for (i = 0; i < HZIP_CTX_Q_NUM; i++) {
- /* alg_type = 0 for compress, 1 for decompress in hw sqe */
qp_ctx = &hisi_zip_ctx->qp_ctx[i];
qp_ctx->ctx = hisi_zip_ctx;
- ret = hisi_zip_start_qp(qps[i], qp_ctx, i, req_type);
- if (ret) {
- for (j = i - 1; j >= 0; j--)
- hisi_qm_stop_qp(hisi_zip_ctx->qp_ctx[j].qp);
-
- hisi_qm_free_qps(qps, HZIP_CTX_Q_NUM);
- return ret;
- }
-
qp_ctx->zip_dev = hisi_zip;
+ qp_ctx->req_type = req_type;
+ qp_ctx->qp = qps[i];
}
hisi_zip_ctx->ops = &hisi_zip_ops;
@@ -436,10 +428,13 @@ static int hisi_zip_ctx_init(struct hisi_zip_ctx *hisi_zip_ctx, u8 req_type, int
static void hisi_zip_ctx_exit(struct hisi_zip_ctx *hisi_zip_ctx)
{
+ struct hisi_qp *qps[HZIP_CTX_Q_NUM] = { NULL };
int i;
for (i = 0; i < HZIP_CTX_Q_NUM; i++)
- hisi_zip_release_qp(&hisi_zip_ctx->qp_ctx[i]);
+ qps[i] = hisi_zip_ctx->qp_ctx[i].qp;
+
+ hisi_qm_free_qps(qps, HZIP_CTX_Q_NUM);
}
static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
@@ -549,7 +544,7 @@ static int hisi_zip_acomp_init(struct crypto_acomp *tfm)
ret = hisi_zip_ctx_init(ctx, COMP_NAME_TO_TYPE(alg_name), tfm->base.node);
if (ret) {
pr_err("failed to init ctx (%d)!\n", ret);
- return ret;
+ goto switch_to_soft;
}
dev = &ctx->qp_ctx[0].qp->qm->pdev->dev;
@@ -574,17 +569,20 @@ static int hisi_zip_acomp_init(struct crypto_acomp *tfm)
hisi_zip_release_req_q(ctx);
err_ctx_exit:
hisi_zip_ctx_exit(ctx);
- return ret;
+switch_to_soft:
+ ctx->fallback = true;
+ return 0;
}
static void hisi_zip_acomp_exit(struct crypto_acomp *tfm)
{
struct hisi_zip_ctx *ctx = crypto_tfm_ctx(&tfm->base);
- hisi_zip_set_acomp_cb(ctx, NULL);
- hisi_zip_release_sgl_pool(ctx);
- hisi_zip_release_req_q(ctx);
- hisi_zip_ctx_exit(ctx);
+ if (!ctx->fallback) {
+ hisi_zip_release_sgl_pool(ctx);
+ hisi_zip_release_req_q(ctx);
+ hisi_zip_ctx_exit(ctx);
+ }
}
static struct acomp_alg hisi_zip_acomp_deflate = {
@@ -595,7 +593,8 @@ static struct acomp_alg hisi_zip_acomp_deflate = {
.base = {
.cra_name = "deflate",
.cra_driver_name = "hisi-deflate-acomp",
- .cra_flags = CRYPTO_ALG_ASYNC,
+ .cra_flags = CRYPTO_ALG_ASYNC |
+ CRYPTO_ALG_NEED_FALLBACK,
.cra_module = THIS_MODULE,
.cra_priority = HZIP_ALG_PRIORITY,
.cra_ctxsize = sizeof(struct hisi_zip_ctx),
diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 4fcbe6bada06..85b26ef17548 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -446,12 +446,12 @@ static const struct pci_device_id hisi_zip_dev_ids[] = {
};
MODULE_DEVICE_TABLE(pci, hisi_zip_dev_ids);
-int zip_create_qps(struct hisi_qp **qps, int qp_num, int node)
+int zip_create_qps(struct hisi_qp **qps, int qp_num, int node, u8 *alg_type)
{
if (node == NUMA_NO_NODE)
node = cpu_to_node(raw_smp_processor_id());
- return hisi_qm_alloc_qps_node(&zip_devices, qp_num, 0, node, qps);
+ return hisi_qm_alloc_qps_node(&zip_devices, qp_num, alg_type, node, qps);
}
bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg)
diff --git a/drivers/crypto/inside-secure/eip93/eip93-main.c b/drivers/crypto/inside-secure/eip93/eip93-main.c
index 0b38a567da0e..b7fd9795062d 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-main.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-main.c
@@ -77,11 +77,44 @@ inline void eip93_irq_clear(struct eip93_device *eip93, u32 mask)
__raw_writel(mask, eip93->base + EIP93_REG_INT_CLR);
}
-static void eip93_unregister_algs(unsigned int i)
+static int eip93_algo_is_supported(u32 alg_flags, u32 supported_algo_flags)
+{
+ if ((IS_DES(alg_flags) || IS_3DES(alg_flags)) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_TDES))
+ return 0;
+
+ if (IS_AES(alg_flags) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_AES))
+ return 0;
+
+ if (IS_HASH_MD5(alg_flags) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_MD5))
+ return 0;
+
+ if (IS_HASH_SHA1(alg_flags) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_SHA_1))
+ return 0;
+
+ if (IS_HASH_SHA224(alg_flags) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_SHA_224))
+ return 0;
+
+ if (IS_HASH_SHA256(alg_flags) &&
+ !(supported_algo_flags & EIP93_PE_OPTION_SHA_256))
+ return 0;
+
+ return 1;
+}
+
+static void eip93_unregister_algs(u32 supported_algo_flags, unsigned int i)
{
unsigned int j;
for (j = 0; j < i; j++) {
+ if (!eip93_algo_is_supported(eip93_algs[j]->flags,
+ supported_algo_flags))
+ continue;
+
switch (eip93_algs[j]->type) {
case EIP93_ALG_TYPE_SKCIPHER:
crypto_unregister_skcipher(&eip93_algs[j]->alg.skcipher);
@@ -90,7 +123,7 @@ static void eip93_unregister_algs(unsigned int i)
crypto_unregister_aead(&eip93_algs[j]->alg.aead);
break;
case EIP93_ALG_TYPE_HASH:
- crypto_unregister_ahash(&eip93_algs[i]->alg.ahash);
+ crypto_unregister_ahash(&eip93_algs[j]->alg.ahash);
break;
}
}
@@ -106,49 +139,27 @@ static int eip93_register_algs(struct eip93_device *eip93, u32 supported_algo_fl
eip93_algs[i]->eip93 = eip93;
- if ((IS_DES(alg_flags) || IS_3DES(alg_flags)) &&
- !(supported_algo_flags & EIP93_PE_OPTION_TDES))
+ if (!eip93_algo_is_supported(alg_flags, supported_algo_flags))
continue;
- if (IS_AES(alg_flags)) {
- if (!(supported_algo_flags & EIP93_PE_OPTION_AES))
- continue;
+ if (IS_AES(alg_flags) && !IS_HMAC(alg_flags)) {
+ if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY128)
+ eip93_algs[i]->alg.skcipher.max_keysize =
+ AES_KEYSIZE_128;
- if (!IS_HMAC(alg_flags)) {
- if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY128)
- eip93_algs[i]->alg.skcipher.max_keysize =
- AES_KEYSIZE_128;
+ if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY192)
+ eip93_algs[i]->alg.skcipher.max_keysize =
+ AES_KEYSIZE_192;
- if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY192)
- eip93_algs[i]->alg.skcipher.max_keysize =
- AES_KEYSIZE_192;
+ if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY256)
+ eip93_algs[i]->alg.skcipher.max_keysize =
+ AES_KEYSIZE_256;
- if (supported_algo_flags & EIP93_PE_OPTION_AES_KEY256)
- eip93_algs[i]->alg.skcipher.max_keysize =
- AES_KEYSIZE_256;
-
- if (IS_RFC3686(alg_flags))
- eip93_algs[i]->alg.skcipher.max_keysize +=
- CTR_RFC3686_NONCE_SIZE;
- }
+ if (IS_RFC3686(alg_flags))
+ eip93_algs[i]->alg.skcipher.max_keysize +=
+ CTR_RFC3686_NONCE_SIZE;
}
- if (IS_HASH_MD5(alg_flags) &&
- !(supported_algo_flags & EIP93_PE_OPTION_MD5))
- continue;
-
- if (IS_HASH_SHA1(alg_flags) &&
- !(supported_algo_flags & EIP93_PE_OPTION_SHA_1))
- continue;
-
- if (IS_HASH_SHA224(alg_flags) &&
- !(supported_algo_flags & EIP93_PE_OPTION_SHA_224))
- continue;
-
- if (IS_HASH_SHA256(alg_flags) &&
- !(supported_algo_flags & EIP93_PE_OPTION_SHA_256))
- continue;
-
switch (eip93_algs[i]->type) {
case EIP93_ALG_TYPE_SKCIPHER:
ret = crypto_register_skcipher(&eip93_algs[i]->alg.skcipher);
@@ -167,7 +178,7 @@ static int eip93_register_algs(struct eip93_device *eip93, u32 supported_algo_fl
return 0;
fail:
- eip93_unregister_algs(i);
+ eip93_unregister_algs(supported_algo_flags, i);
return ret;
}
@@ -469,8 +480,11 @@ static int eip93_crypto_probe(struct platform_device *pdev)
static void eip93_crypto_remove(struct platform_device *pdev)
{
struct eip93_device *eip93 = platform_get_drvdata(pdev);
+ u32 algo_flags;
+
+ algo_flags = readl(eip93->base + EIP93_REG_PE_OPTION_1);
- eip93_unregister_algs(ARRAY_SIZE(eip93_algs));
+ eip93_unregister_algs(algo_flags, ARRAY_SIZE(eip93_algs));
eip93_cleanup(eip93);
}
diff --git a/drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c b/drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c
index b9b5e744a3f1..af8dbc7517cf 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c
@@ -148,6 +148,16 @@ static struct pfvf_message handle_blkmsg_req(struct adf_accel_vf_info *vf_info,
blk_byte = FIELD_GET(ADF_VF2PF_SMALL_BLOCK_BYTE_MASK, req.data);
byte_max = ADF_VF2PF_SMALL_BLOCK_BYTE_MAX;
break;
+ default:
+ dev_err(&GET_DEV(vf_info->accel_dev),
+ "Invalid BlockMsg type 0x%.4x received from VF%u\n",
+ req.type, vf_info->vf_nr);
+ resp.type = ADF_PF2VF_MSGTYPE_BLKMSG_RESP;
+ resp.data = FIELD_PREP(ADF_PF2VF_BLKMSG_RESP_TYPE_MASK,
+ ADF_PF2VF_BLKMSG_RESP_TYPE_ERROR) |
+ FIELD_PREP(ADF_PF2VF_BLKMSG_RESP_DATA_MASK,
+ ADF_PF2VF_UNSPECIFIED_ERROR);
+ return resp;
}
/* Is this a request for CRC or data? */
diff --git a/drivers/crypto/intel/qat/qat_common/qat_asym_algs.c b/drivers/crypto/intel/qat/qat_common/qat_asym_algs.c
index 85c682e248fb..e09b9edfce42 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_asym_algs.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_asym_algs.c
@@ -255,8 +255,8 @@ static int qat_dh_compute_value(struct kpp_request *req)
qat_req->areq.dh = req;
msg->pke_hdr.service_type = ICP_QAT_FW_COMN_REQ_CPM_FW_PKE;
msg->pke_hdr.comn_req_flags =
- ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_PTR_TYPE_FLAT,
- QAT_COMN_CD_FLD_TYPE_64BIT_ADR);
+ ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_CD_FLD_TYPE_64BIT_ADR,
+ QAT_COMN_PTR_TYPE_FLAT);
/*
* If no source is provided use g as base
@@ -731,8 +731,8 @@ static int qat_rsa_enc(struct akcipher_request *req)
qat_req->areq.rsa = req;
msg->pke_hdr.service_type = ICP_QAT_FW_COMN_REQ_CPM_FW_PKE;
msg->pke_hdr.comn_req_flags =
- ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_PTR_TYPE_FLAT,
- QAT_COMN_CD_FLD_TYPE_64BIT_ADR);
+ ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_CD_FLD_TYPE_64BIT_ADR,
+ QAT_COMN_PTR_TYPE_FLAT);
qat_req->in.rsa.enc.e = ctx->dma_e;
qat_req->in.rsa.enc.n = ctx->dma_n;
@@ -867,8 +867,8 @@ static int qat_rsa_dec(struct akcipher_request *req)
qat_req->areq.rsa = req;
msg->pke_hdr.service_type = ICP_QAT_FW_COMN_REQ_CPM_FW_PKE;
msg->pke_hdr.comn_req_flags =
- ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_PTR_TYPE_FLAT,
- QAT_COMN_CD_FLD_TYPE_64BIT_ADR);
+ ICP_QAT_FW_COMN_FLAGS_BUILD(QAT_COMN_CD_FLD_TYPE_64BIT_ADR,
+ QAT_COMN_PTR_TYPE_FLAT);
if (ctx->crt_mode) {
qat_req->in.rsa.dec_crt.p = ctx->dma_p;
diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
index 88a41d1ca5f6..6c0bfb3ea1c9 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
@@ -168,7 +168,8 @@ static void free_command_queues(struct otx_cptvf *cptvf,
chunk = list_first_entry(&cqinfo->queue[i].chead,
struct otx_cpt_cmd_chunk, nextchunk);
- dma_free_coherent(&pdev->dev, chunk->size,
+ dma_free_coherent(&pdev->dev,
+ chunk->size + OTX_CPT_NEXT_CHUNK_PTR_SIZE,
chunk->head,
chunk->dma_addr);
chunk->head = NULL;
diff --git a/drivers/crypto/starfive/jh7110-aes.c b/drivers/crypto/starfive/jh7110-aes.c
index 426b24889af8..01195664cc7c 100644
--- a/drivers/crypto/starfive/jh7110-aes.c
+++ b/drivers/crypto/starfive/jh7110-aes.c
@@ -669,8 +669,10 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq
return -ENOMEM;
if (sg_copy_to_buffer(req->src, sg_nents_for_len(req->src, cryp->assoclen),
- rctx->adata, cryp->assoclen) != cryp->assoclen)
+ rctx->adata, cryp->assoclen) != cryp->assoclen) {
+ kfree(rctx->adata);
return -EINVAL;
+ }
}
if (cryp->total_in)
@@ -681,8 +683,11 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq
ctx->rctx = rctx;
ret = starfive_aes_hw_init(ctx);
- if (ret)
+ if (ret) {
+ if (cryp->assoclen)
+ kfree(rctx->adata);
return ret;
+ }
if (!cryp->assoclen)
goto write_text;
diff --git a/drivers/cxl/core/edac.c b/drivers/cxl/core/edac.c
index 79994ca9bc9f..81160260e26b 100644
--- a/drivers/cxl/core/edac.c
+++ b/drivers/cxl/core/edac.c
@@ -1988,6 +1988,40 @@ static int cxl_memdev_soft_ppr_init(struct cxl_memdev *cxlmd,
return 0;
}
+static void err_rec_free(void *_cxlmd)
+{
+ struct cxl_memdev *cxlmd = _cxlmd;
+ struct cxl_mem_err_rec *array_rec = cxlmd->err_rec_array;
+ struct cxl_event_gen_media *rec_gen_media;
+ struct cxl_event_dram *rec_dram;
+ unsigned long index;
+
+ cxlmd->err_rec_array = NULL;
+ xa_for_each(&array_rec->rec_dram, index, rec_dram)
+ kfree(rec_dram);
+ xa_destroy(&array_rec->rec_dram);
+
+ xa_for_each(&array_rec->rec_gen_media, index, rec_gen_media)
+ kfree(rec_gen_media);
+ xa_destroy(&array_rec->rec_gen_media);
+ kfree(array_rec);
+}
+
+static int devm_cxl_memdev_setup_err_rec(struct cxl_memdev *cxlmd)
+{
+ struct cxl_mem_err_rec *array_rec =
+ kzalloc(sizeof(*array_rec), GFP_KERNEL);
+
+ if (!array_rec)
+ return -ENOMEM;
+
+ xa_init(&array_rec->rec_gen_media);
+ xa_init(&array_rec->rec_dram);
+ cxlmd->err_rec_array = array_rec;
+
+ return devm_add_action_or_reset(&cxlmd->dev, err_rec_free, cxlmd);
+}
+
int devm_cxl_memdev_edac_register(struct cxl_memdev *cxlmd)
{
struct edac_dev_feature ras_features[CXL_NR_EDAC_DEV_FEATURES];
@@ -2038,15 +2072,9 @@ int devm_cxl_memdev_edac_register(struct cxl_memdev *cxlmd)
}
if (repair_inst) {
- struct cxl_mem_err_rec *array_rec =
- devm_kzalloc(&cxlmd->dev, sizeof(*array_rec),
- GFP_KERNEL);
- if (!array_rec)
- return -ENOMEM;
-
- xa_init(&array_rec->rec_gen_media);
- xa_init(&array_rec->rec_dram);
- cxlmd->err_rec_array = array_rec;
+ rc = devm_cxl_memdev_setup_err_rec(cxlmd);
+ if (rc)
+ return rc;
}
}
@@ -2088,22 +2116,4 @@ int devm_cxl_region_edac_register(struct cxl_region *cxlr)
}
EXPORT_SYMBOL_NS_GPL(devm_cxl_region_edac_register, "CXL");
-void devm_cxl_memdev_edac_release(struct cxl_memdev *cxlmd)
-{
- struct cxl_mem_err_rec *array_rec = cxlmd->err_rec_array;
- struct cxl_event_gen_media *rec_gen_media;
- struct cxl_event_dram *rec_dram;
- unsigned long index;
-
- if (!IS_ENABLED(CONFIG_CXL_EDAC_MEM_REPAIR) || !array_rec)
- return;
-
- xa_for_each(&array_rec->rec_dram, index, rec_dram)
- kfree(rec_dram);
- xa_destroy(&array_rec->rec_dram);
- xa_for_each(&array_rec->rec_gen_media, index, rec_gen_media)
- kfree(rec_gen_media);
- xa_destroy(&array_rec->rec_gen_media);
-}
-EXPORT_SYMBOL_NS_GPL(devm_cxl_memdev_edac_release, "CXL");
diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
index eb5a3a7640c6..bc4b0c860725 100644
--- a/drivers/cxl/core/hdm.c
+++ b/drivers/cxl/core/hdm.c
@@ -844,14 +844,13 @@ static int cxl_decoder_commit(struct cxl_decoder *cxld)
scoped_guard(rwsem_read, &cxl_rwsem.dpa)
setup_hw_decoder(cxld, hdm);
- port->commit_end++;
rc = cxld_await_commit(hdm, cxld->id);
if (rc) {
dev_dbg(&port->dev, "%s: error %d committing decoder\n",
dev_name(&cxld->dev), rc);
- cxld->reset(cxld);
return rc;
}
+ port->commit_end++;
cxld->flags |= CXL_DECODER_F_ENABLE;
return 0;
@@ -966,7 +965,7 @@ static int cxl_setup_hdm_decoder_from_dvsec(
rc = devm_cxl_dpa_reserve(cxled, *dpa_base, len, 0);
if (rc) {
dev_err(&port->dev,
- "decoder%d.%d: Failed to reserve DPA range %#llx - %#llx\n (%d)",
+ "decoder%d.%d: Failed to reserve DPA range %#llx - %#llx: %d\n",
port->id, cxld->id, *dpa_base, *dpa_base + len - 1, rc);
return rc;
}
@@ -1117,7 +1116,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld,
rc = devm_cxl_dpa_reserve(cxled, *dpa_base + skip, dpa_size, skip);
if (rc) {
dev_err(&port->dev,
- "decoder%d.%d: Failed to reserve DPA range %#llx - %#llx\n (%d)",
+ "decoder%d.%d: Failed to reserve DPA range %#llx - %#llx: %d\n",
port->id, cxld->id, *dpa_base,
*dpa_base + dpa_size + skip - 1, rc);
return rc;
diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c
index e370d733e440..4dff7f44d908 100644
--- a/drivers/cxl/core/memdev.c
+++ b/drivers/cxl/core/memdev.c
@@ -27,7 +27,6 @@ static void cxl_memdev_release(struct device *dev)
struct cxl_memdev *cxlmd = to_cxl_memdev(dev);
ida_free(&cxl_memdev_ida, cxlmd->id);
- devm_cxl_memdev_edac_release(cxlmd);
kfree(cxlmd);
}
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index 3310dbfae9d6..4717dcff264b 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -822,16 +822,18 @@ DEFINE_DEBUGFS_ATTRIBUTE(cxl_einj_inject_fops, NULL, cxl_einj_inject,
static void cxl_debugfs_create_dport_dir(struct cxl_dport *dport)
{
+ struct cxl_port *parent = parent_port_of(dport->port);
struct dentry *dir;
if (!einj_cxl_is_initialized())
return;
/*
- * dport_dev needs to be a PCIe port for CXL 2.0+ ports because
- * EINJ expects a dport SBDF to be specified for 2.0 error injection.
+ * Protocol error injection is only available for CXL 2.0+ root ports
+ * and CXL 1.1 downstream ports
*/
- if (!dport->rch && !dev_is_pci(dport->dport_dev))
+ if (!dport->rch &&
+ !(dev_is_pci(dport->dport_dev) && parent && is_cxl_root(parent)))
return;
dir = cxl_debugfs_create_dir(dev_name(dport->dport_dev));
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index 434031a0c1f7..c12ab4fc9512 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -63,7 +63,7 @@ struct cxl_memdev {
int depth;
u8 scrub_cycle;
int scrub_region_id;
- void *err_rec_array;
+ struct cxl_mem_err_rec *err_rec_array;
};
static inline struct cxl_memdev *to_cxl_memdev(struct device *dev)
@@ -877,7 +877,6 @@ int devm_cxl_memdev_edac_register(struct cxl_memdev *cxlmd);
int devm_cxl_region_edac_register(struct cxl_region *cxlr);
int cxl_store_rec_gen_media(struct cxl_memdev *cxlmd, union cxl_event *evt);
int cxl_store_rec_dram(struct cxl_memdev *cxlmd, union cxl_event *evt);
-void devm_cxl_memdev_edac_release(struct cxl_memdev *cxlmd);
#else
static inline int devm_cxl_memdev_edac_register(struct cxl_memdev *cxlmd)
{ return 0; }
@@ -889,8 +888,6 @@ static inline int cxl_store_rec_gen_media(struct cxl_memdev *cxlmd,
static inline int cxl_store_rec_dram(struct cxl_memdev *cxlmd,
union cxl_event *evt)
{ return 0; }
-static inline void devm_cxl_memdev_edac_release(struct cxl_memdev *cxlmd)
-{ return; }
#endif
#ifdef CONFIG_CXL_SUSPEND
diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
index 5b06b0dc67ee..0f25f6d8ae71 100644
--- a/drivers/dma/dma-axi-dmac.c
+++ b/drivers/dma/dma-axi-dmac.c
@@ -233,11 +233,9 @@ static void axi_dmac_start_transfer(struct axi_dmac_chan *chan)
unsigned int flags = 0;
unsigned int val;
- if (!chan->hw_sg) {
- val = axi_dmac_read(dmac, AXI_DMAC_REG_START_TRANSFER);
- if (val) /* Queue is full, wait for the next SOT IRQ */
- return;
- }
+ val = axi_dmac_read(dmac, AXI_DMAC_REG_START_TRANSFER);
+ if (val) /* Queue is full, wait for the next SOT IRQ */
+ return;
desc = chan->next_desc;
@@ -247,6 +245,7 @@ static void axi_dmac_start_transfer(struct axi_dmac_chan *chan)
return;
list_move_tail(&vdesc->node, &chan->active_descs);
desc = to_axi_dmac_desc(vdesc);
+ chan->next_desc = desc;
}
sg = &desc->sg[desc->num_submitted];
@@ -265,8 +264,6 @@ static void axi_dmac_start_transfer(struct axi_dmac_chan *chan)
else
chan->next_desc = NULL;
flags |= AXI_DMAC_FLAG_LAST;
- } else {
- chan->next_desc = desc;
}
sg->hw->id = axi_dmac_read(dmac, AXI_DMAC_REG_TRANSFER_ID);
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index a753b7cbfa7a..dbcdd1e68319 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -915,7 +915,6 @@ static void fsl_edma_remove(struct platform_device *pdev)
of_dma_controller_free(np);
dma_async_device_unregister(&fsl_edma->dma_dev);
fsl_edma_cleanup_vchan(&fsl_edma->dma_dev);
- fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs);
}
static int fsl_edma_suspend_late(struct device *dev)
diff --git a/drivers/dma/mediatek/mtk-uart-apdma.c b/drivers/dma/mediatek/mtk-uart-apdma.c
index 08e15177427b..96c18c815f1d 100644
--- a/drivers/dma/mediatek/mtk-uart-apdma.c
+++ b/drivers/dma/mediatek/mtk-uart-apdma.c
@@ -41,7 +41,7 @@
#define VFF_STOP_CLR_B 0
#define VFF_EN_CLR_B 0
#define VFF_INT_EN_CLR_B 0
-#define VFF_4G_SUPPORT_CLR_B 0
+#define VFF_ADDR2_CLR_B 0
/*
* interrupt trigger level for tx
@@ -72,7 +72,7 @@
/* TX: the buffer size SW can write. RX: the buffer size HW can write. */
#define VFF_LEFT_SIZE 0x40
#define VFF_DEBUG_STATUS 0x50
-#define VFF_4G_SUPPORT 0x54
+#define VFF_ADDR2 0x54
struct mtk_uart_apdmadev {
struct dma_device ddev;
@@ -149,7 +149,7 @@ static void mtk_uart_apdma_start_tx(struct mtk_chan *c)
mtk_uart_apdma_write(c, VFF_INT_FLAG, VFF_TX_INT_CLR_B);
if (mtkd->support_33bits)
- mtk_uart_apdma_write(c, VFF_4G_SUPPORT, VFF_4G_EN_B);
+ mtk_uart_apdma_write(c, VFF_ADDR2, upper_32_bits(d->addr));
}
mtk_uart_apdma_write(c, VFF_EN, VFF_EN_B);
@@ -192,7 +192,7 @@ static void mtk_uart_apdma_start_rx(struct mtk_chan *c)
mtk_uart_apdma_write(c, VFF_INT_FLAG, VFF_RX_INT_CLR_B);
if (mtkd->support_33bits)
- mtk_uart_apdma_write(c, VFF_4G_SUPPORT, VFF_4G_EN_B);
+ mtk_uart_apdma_write(c, VFF_ADDR2, upper_32_bits(d->addr));
}
mtk_uart_apdma_write(c, VFF_INT_EN, VFF_RX_INT_EN_B);
@@ -298,7 +298,7 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)
}
if (mtkd->support_33bits)
- mtk_uart_apdma_write(c, VFF_4G_SUPPORT, VFF_4G_SUPPORT_CLR_B);
+ mtk_uart_apdma_write(c, VFF_ADDR2, VFF_ADDR2_CLR_B);
err_pm:
pm_runtime_put_noidle(mtkd->ddev.dev);
diff --git a/drivers/dpll/zl3073x/dpll.c b/drivers/dpll/zl3073x/dpll.c
index 9879d85d29af..a8001c976038 100644
--- a/drivers/dpll/zl3073x/dpll.c
+++ b/drivers/dpll/zl3073x/dpll.c
@@ -1039,10 +1039,8 @@ zl3073x_dpll_output_pin_phase_adjust_get(const struct dpll_pin *dpll_pin,
out_id = zl3073x_output_pin_out_get(pin->id);
out = zl3073x_out_state_get(zldev, out_id);
- /* Convert value to ps and reverse two's complement negation applied
- * during 'set'
- */
- *phase_adjust = -out->phase_comp * pin->phase_gran;
+ /* The value in the register is expressed in half synth clock cycles. */
+ *phase_adjust = out->phase_comp * pin->phase_gran;
return 0;
}
@@ -1064,10 +1062,8 @@ zl3073x_dpll_output_pin_phase_adjust_set(const struct dpll_pin *dpll_pin,
out_id = zl3073x_output_pin_out_get(pin->id);
out = *zl3073x_out_state_get(zldev, out_id);
- /* The value in the register is stored as two's complement negation
- * of requested value and expressed in half synth clock cycles.
- */
- out.phase_comp = -phase_adjust / pin->phase_gran;
+ /* The value in the register is expressed in half synth clock cycles. */
+ out.phase_comp = phase_adjust / pin->phase_gran;
/* Update output configuration from mailbox */
return zl3073x_out_state_set(zldev, out_id, &out);
diff --git a/drivers/dpll/zl3073x/ref.h b/drivers/dpll/zl3073x/ref.h
index efc7f59cd9f9..0d8618f5ce8d 100644
--- a/drivers/dpll/zl3073x/ref.h
+++ b/drivers/dpll/zl3073x/ref.h
@@ -91,6 +91,8 @@ zl3073x_ref_freq_set(struct zl3073x_ref *ref, u32 freq)
ref->freq_base = base;
ref->freq_mult = mult;
+ ref->freq_ratio_m = 1;
+ ref->freq_ratio_n = 1;
return 0;
}
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index 0c5b94e64ea1..4edd2088c2db 100644
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -1563,8 +1563,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
goto err_release_group_1;
}
rc = devm_request_irq(&altdev->ddev, altdev->sb_irq,
- prv->ecc_irq_handler,
- IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
+ prv->ecc_irq_handler, IRQF_TRIGGER_HIGH,
ecc_name, altdev);
if (rc) {
edac_printk(KERN_ERR, EDAC_DEVICE, "PortB SBERR IRQ error\n");
@@ -1587,8 +1586,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
goto err_release_group_1;
}
rc = devm_request_irq(&altdev->ddev, altdev->db_irq,
- prv->ecc_irq_handler,
- IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
+ prv->ecc_irq_handler, IRQF_TRIGGER_HIGH,
ecc_name, altdev);
if (rc) {
edac_printk(KERN_ERR, EDAC_DEVICE, "PortB DBERR IRQ error\n");
@@ -1970,8 +1968,7 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac,
goto err_release_group1;
}
rc = devm_request_irq(edac->dev, altdev->sb_irq, prv->ecc_irq_handler,
- IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
- ecc_name, altdev);
+ IRQF_TRIGGER_HIGH, ecc_name, altdev);
if (rc) {
edac_printk(KERN_ERR, EDAC_DEVICE, "No SBERR IRQ resource\n");
goto err_release_group1;
@@ -1993,7 +1990,7 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac,
goto err_release_group1;
}
rc = devm_request_irq(edac->dev, altdev->db_irq, prv->ecc_irq_handler,
- IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
+ IRQF_TRIGGER_HIGH,
ecc_name, altdev);
if (rc) {
edac_printk(KERN_ERR, EDAC_DEVICE, "No DBERR IRQ resource\n");
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 2391f3469961..63fca0ee2c23 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3911,7 +3911,7 @@ static int per_family_init(struct amd64_pvt *pvt)
}
if (tmp_name)
- scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name);
+ scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "%s", tmp_name);
else
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh",
pvt->fam, pvt->model);
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 4a1bebc1ff14..471b8540d18b 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1111,6 +1111,7 @@ static void calculate_dimm_size(struct i5000_pvt *pvt)
n = snprintf(p, space, " ");
p += n;
+ space -= n;
for (branch = 0; branch < MAX_BRANCHES; branch++) {
n = snprintf(p, space, " branch %d | ", branch);
p += n;
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index b5cf25905b05..fb49a1d1df11 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -1026,13 +1026,13 @@ static void calculate_dimm_size(struct i5400_pvt *pvt)
space -= n;
}
- space -= n;
edac_dbg(2, "%s\n", mem_buffer);
p = mem_buffer;
space = PAGE_SIZE;
n = snprintf(p, space, " ");
p += n;
+ space -= n;
for (branch = 0; branch < MAX_BRANCHES; branch++) {
n = snprintf(p, space, " branch %d | ", branch);
p += n;
diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index c72ee4756585..c501c3104b3a 100644
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -981,10 +981,27 @@ static void __do_sched_recv_cb(u16 part_id, u16 vcpu, bool is_per_vcpu)
}
}
+/*
+ * Map logical ID index to the u16 index within the packed ID list.
+ *
+ * For native responses (FF-A width == kernel word size), IDs are
+ * tightly packed: idx -> idx.
+ *
+ * For 32-bit responses on a 64-bit kernel, each 64-bit register
+ * contributes 4 x u16 values but only the lower 2 are defined; the
+ * upper 2 are garbage. This mapping skips those upper halves:
+ * 0,1,2,3,4,5,... -> 0,1,4,5,8,9,...
+ */
+static int list_idx_to_u16_idx(int idx, bool is_native_resp)
+{
+ return is_native_resp ? idx : idx + 2 * (idx >> 1);
+}
+
static void ffa_notification_info_get(void)
{
- int idx, list, max_ids, lists_cnt, ids_processed, ids_count[MAX_IDS_64];
- bool is_64b_resp;
+ int ids_processed, ids_count[MAX_IDS_64];
+ int idx, list, max_ids, lists_cnt;
+ bool is_64b_resp, is_native_resp;
ffa_value_t ret;
u64 id_list;
@@ -1001,6 +1018,7 @@ static void ffa_notification_info_get(void)
}
is_64b_resp = (ret.a0 == FFA_FN64_SUCCESS);
+ is_native_resp = (ret.a0 == FFA_FN_NATIVE(SUCCESS));
ids_processed = 0;
lists_cnt = FIELD_GET(NOTIFICATION_INFO_GET_ID_COUNT, ret.a2);
@@ -1017,12 +1035,16 @@ static void ffa_notification_info_get(void)
/* Process IDs */
for (list = 0; list < lists_cnt; list++) {
+ int u16_idx;
u16 vcpu_id, part_id, *packed_id_list = (u16 *)&ret.a3;
if (ids_processed >= max_ids - 1)
break;
- part_id = packed_id_list[ids_processed++];
+ u16_idx = list_idx_to_u16_idx(ids_processed,
+ is_native_resp);
+ part_id = packed_id_list[u16_idx];
+ ids_processed++;
if (ids_count[list] == 1) { /* Global Notification */
__do_sched_recv_cb(part_id, 0, false);
@@ -1034,7 +1056,10 @@ static void ffa_notification_info_get(void)
if (ids_processed >= max_ids - 1)
break;
- vcpu_id = packed_id_list[ids_processed++];
+ u16_idx = list_idx_to_u16_idx(ids_processed,
+ is_native_resp);
+ vcpu_id = packed_id_list[u16_idx];
+ ids_processed++;
__do_sched_recv_cb(part_id, vcpu_id, true);
}
diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c
index 73d201e7d992..abed96fa5853 100644
--- a/drivers/firmware/cirrus/cs_dsp.c
+++ b/drivers/firmware/cirrus/cs_dsp.c
@@ -412,18 +412,23 @@ static ssize_t cs_dsp_debugfs_string_read(struct cs_dsp *dsp,
size_t count, loff_t *ppos,
const char **pstr)
{
- const char *str __free(kfree) = NULL;
+ const char *str;
+ ssize_t ret = 0;
scoped_guard(mutex, &dsp->pwr_lock) {
- if (!*pstr)
- return 0;
-
- str = kasprintf(GFP_KERNEL, "%s\n", *pstr);
- if (!str)
- return -ENOMEM;
-
- return simple_read_from_buffer(user_buf, count, ppos, str, strlen(str));
+ if (*pstr) {
+ str = kasprintf(GFP_KERNEL, "%s\n", *pstr);
+ if (str) {
+ ret = simple_read_from_buffer(user_buf, count,
+ ppos, str, strlen(str));
+ kfree(str);
+ } else {
+ ret = -ENOMEM;
+ }
+ }
}
+
+ return ret;
}
static ssize_t cs_dsp_debugfs_wmfw_read(struct file *file,
@@ -1483,7 +1488,7 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware,
const struct wmfw_region *region;
const struct cs_dsp_region *mem;
const char *region_name;
- u8 *buf __free(kfree) = NULL;
+ u8 *buf = NULL;
size_t buf_len = 0;
size_t region_len;
unsigned int reg;
@@ -1638,6 +1643,8 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware,
ret = 0;
out_fw:
+ kfree(buf);
+
if (ret == -EOVERFLOW)
cs_dsp_err(dsp, "%s: file content overflows file data\n", file);
@@ -2169,7 +2176,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware
struct cs_dsp_alg_region *alg_region;
const char *region_name;
int ret, pos, blocks, type, offset, reg, version;
- u8 *buf __free(kfree) = NULL;
+ u8 *buf = NULL;
size_t buf_len = 0;
size_t region_len;
@@ -2348,6 +2355,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware
ret = 0;
out_fw:
+ kfree(buf);
+
if (ret == -EOVERFLOW)
cs_dsp_err(dsp, "%s: file content overflows file data\n", file);
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 17b5f3415465..92e91c3eb469 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -692,13 +692,13 @@ static __init int match_config_table(const efi_guid_t *guid,
static __init void reserve_unaccepted(struct efi_unaccepted_memory *unaccepted)
{
- phys_addr_t start, size;
+ phys_addr_t start, end;
start = PAGE_ALIGN_DOWN(efi.unaccepted);
- size = PAGE_ALIGN(sizeof(*unaccepted) + unaccepted->size);
+ end = PAGE_ALIGN(efi.unaccepted + sizeof(*unaccepted) + unaccepted->size);
- memblock_add(start, size);
- memblock_reserve(start, size);
+ memblock_add(start, end - start);
+ memblock_reserve(start, end - start);
}
int __init efi_config_parse_tables(const efi_config_table_t *config_tables,
diff --git a/drivers/gpib/common/iblib.c b/drivers/gpib/common/iblib.c
index 7cbb6a467177..b672dd6aad25 100644
--- a/drivers/gpib/common/iblib.c
+++ b/drivers/gpib/common/iblib.c
@@ -227,11 +227,10 @@ int ibonline(struct gpib_board *board)
#ifndef CONFIG_NIOS2
board->autospoll_task = kthread_run(&autospoll_thread, board,
"gpib%d_autospoll_kthread", board->minor);
- retval = IS_ERR(board->autospoll_task);
- if (retval) {
+ if (IS_ERR(board->autospoll_task)) {
dev_err(board->gpib_dev, "failed to create autospoll thread\n");
board->interface->detach(board);
- return retval;
+ return PTR_ERR(board->autospoll_task);
}
#endif
board->online = 1;
diff --git a/drivers/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_usb/ni_usb_gpib.c
index 1f8412de9fa3..b6fddb437f55 100644
--- a/drivers/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/gpib/ni_usb/ni_usb_gpib.c
@@ -566,7 +566,7 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
retval, bytes_read);
ni_usb_dump_raw_block(in_data, bytes_read);
kfree(in_data);
- return retval;
+ return retval ?: -EINVAL;
}
mutex_unlock(&ni_priv->addressed_transfer_lock);
@@ -1780,7 +1780,7 @@ static int ni_usb_setup_init(struct gpib_board *board, struct ni_usb_register *w
i++;
if (i > NUM_INIT_WRITES) {
dev_err(&usb_dev->dev, "bug!, buffer overrun, i=%i\n", i);
- return 0;
+ return -EINVAL;
}
return i;
}
@@ -1799,10 +1799,12 @@ static int ni_usb_init(struct gpib_board *board)
return -ENOMEM;
writes_len = ni_usb_setup_init(board, writes);
- if (writes_len)
- retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta);
- else
- return -EFAULT;
+ if (writes_len < 0) {
+ kfree(writes);
+ return writes_len;
+ }
+
+ retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta);
kfree(writes);
if (retval) {
dev_err(&usb_dev->dev, "register write failed, retval=%i\n", retval);
diff --git a/drivers/gpio/gpio-amd-fch.c b/drivers/gpio/gpio-amd-fch.c
index e6c6c3ec7656..9f329938202b 100644
--- a/drivers/gpio/gpio-amd-fch.c
+++ b/drivers/gpio/gpio-amd-fch.c
@@ -8,6 +8,7 @@
*
*/
+#include <linux/bitfield.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/kernel.h>
@@ -120,15 +121,15 @@ static int amd_fch_gpio_get(struct gpio_chip *gc,
unsigned int offset)
{
unsigned long flags;
- int ret;
+ u32 val;
struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc);
void __iomem *ptr = amd_fch_gpio_addr(priv, offset);
spin_lock_irqsave(&priv->lock, flags);
- ret = (readl_relaxed(ptr) & AMD_FCH_GPIO_FLAG_READ);
+ val = readl_relaxed(ptr);
spin_unlock_irqrestore(&priv->lock, flags);
- return ret;
+ return FIELD_GET(AMD_FCH_GPIO_FLAG_READ, val);
}
static int amd_fch_gpio_request(struct gpio_chip *chip,
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index 2adc3c070908..189127721e38 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -388,7 +388,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
fd_publish(fdf);
dev_dbg(&gdev->dev, "registered chardev handle for %d lines\n",
- lh->num_descs);
+ handlereq.lines);
return 0;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index d31460a9e958..7c9d8a6d0bfd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -1135,8 +1135,10 @@ static int amdgpu_acpi_enumerate_xcc(void)
if (!dev_info)
ret = amdgpu_acpi_dev_init(&dev_info, xcc_info, sbdf);
- if (ret == -ENOMEM)
+ if (ret == -ENOMEM) {
+ kfree(xcc_info);
return ret;
+ }
if (!dev_info) {
kfree(xcc_info);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index ecdfe6cb36cc..dac0b15823f2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -892,8 +892,10 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
struct amdgpu_bo *bo = e->bo;
e->range = amdgpu_hmm_range_alloc(NULL);
- if (unlikely(!e->range))
- return -ENOMEM;
+ if (unlikely(!e->range)) {
+ r = -ENOMEM;
+ goto out_free_user_pages;
+ }
r = amdgpu_ttm_tt_get_user_pages(bo, e->range);
if (r)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 39387da8586b..83567ade8429 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -3172,7 +3172,6 @@ static int __init amdgpu_init(void)
if (r)
goto error_fence;
- DRM_INFO("amdgpu kernel modesetting enabled.\n");
amdgpu_register_atpx_handler();
amdgpu_acpi_detect();
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 3e38c5db2987..5a93cbadc4f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -458,9 +458,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
/* always clear VRAM */
flags |= AMDGPU_GEM_CREATE_VRAM_CLEARED;
- if (args->in.domains & AMDGPU_GEM_DOMAIN_MMIO_REMAP)
- return -EINVAL;
-
/* create a gem object to contain this object in */
if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |
AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index d9c7ad297293..2b37398337af 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -1387,7 +1387,7 @@ int amdgpu_gmc_get_nps_memranges(struct amdgpu_device *adev,
if (!*exp_ranges)
*exp_ranges = range_cnt;
err:
- kfree(ranges);
+ kvfree(ranges);
return ret;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 44f230d67da2..bfa64cd7a62d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -229,7 +229,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,
r = amdgpu_vm_flush(ring, job, need_pipe_sync);
if (r) {
amdgpu_ring_undo(ring);
- return r;
+ goto free_fence;
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index e08f58de4b17..f51ad28d0cbd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -153,14 +153,6 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain)
c++;
}
- if (domain & AMDGPU_GEM_DOMAIN_MMIO_REMAP) {
- places[c].fpfn = 0;
- places[c].lpfn = 0;
- places[c].mem_type = AMDGPU_PL_MMIO_REMAP;
- places[c].flags = 0;
- c++;
- }
-
if (domain & AMDGPU_GEM_DOMAIN_GTT) {
places[c].fpfn = 0;
places[c].lpfn = 0;
@@ -1534,8 +1526,17 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo)
*/
uint32_t amdgpu_bo_mem_stats_placement(struct amdgpu_bo *bo)
{
- uint32_t domain = bo->preferred_domains & AMDGPU_GEM_DOMAIN_MASK;
+ u32 domain;
+ /*
+ * MMIO_REMAP is internal now, so it no longer maps from a userspace
+ * domain bit. Keep fdinfo/mem-stats visibility by checking the actual
+ * TTM placement.
+ */
+ if (bo->tbo.resource && bo->tbo.resource->mem_type == AMDGPU_PL_MMIO_REMAP)
+ return AMDGPU_PL_MMIO_REMAP;
+
+ domain = bo->preferred_domains & AMDGPU_GEM_DOMAIN_MASK;
if (!domain)
return TTM_PL_SYSTEM;
@@ -1554,8 +1555,6 @@ uint32_t amdgpu_bo_mem_stats_placement(struct amdgpu_bo *bo)
return AMDGPU_PL_OA;
case AMDGPU_GEM_DOMAIN_DOORBELL:
return AMDGPU_PL_DOORBELL;
- case AMDGPU_GEM_DOMAIN_MMIO_REMAP:
- return AMDGPU_PL_MMIO_REMAP;
default:
return TTM_PL_SYSTEM;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 52c2d1731aab..912c9afaf9e1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -168,8 +168,6 @@ static inline unsigned amdgpu_mem_type_to_domain(u32 mem_type)
return AMDGPU_GEM_DOMAIN_OA;
case AMDGPU_PL_DOORBELL:
return AMDGPU_GEM_DOMAIN_DOORBELL;
- case AMDGPU_PL_MMIO_REMAP:
- return AMDGPU_GEM_DOMAIN_MMIO_REMAP;
default:
break;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 2a6cf7963dde..8de9f68f7bea 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -4343,7 +4343,7 @@ int amdgpu_ras_init(struct amdgpu_device *adev)
* to handle fatal error */
r = amdgpu_nbio_ras_sw_init(adev);
if (r)
- return r;
+ goto release_con;
if (adev->nbio.ras &&
adev->nbio.ras->init_ras_controller_interrupt) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 2b931e855abd..c200d5dc7b6b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1812,10 +1812,10 @@ static void amdgpu_ttm_pools_fini(struct amdgpu_device *adev)
}
/**
- * amdgpu_ttm_mmio_remap_bo_init - Allocate the singleton 4K MMIO_REMAP BO
+ * amdgpu_ttm_mmio_remap_bo_init - Allocate the singleton MMIO_REMAP BO
* @adev: amdgpu device
*
- * Allocates a one-page (4K) GEM BO in AMDGPU_GEM_DOMAIN_MMIO_REMAP when the
+ * Allocates a global BO with backing AMDGPU_PL_MMIO_REMAP when the
* hardware exposes a remap base (adev->rmmio_remap.bus_addr) and the host
* PAGE_SIZE is <= AMDGPU_GPU_PAGE_SIZE (4K). The BO is created as a regular
* GEM object (amdgpu_bo_create).
@@ -1824,42 +1824,95 @@ static void amdgpu_ttm_pools_fini(struct amdgpu_device *adev)
* * 0 on success or intentional skip (feature not present/unsupported)
* * negative errno on allocation failure
*/
-static int amdgpu_ttm_mmio_remap_bo_init(struct amdgpu_device *adev)
+static int amdgpu_ttm_alloc_mmio_remap_bo(struct amdgpu_device *adev)
{
+ struct ttm_operation_ctx ctx = { false, false };
+ struct ttm_placement placement;
+ struct ttm_buffer_object *tbo;
+ struct ttm_place placements;
struct amdgpu_bo_param bp;
+ struct ttm_resource *tmp;
int r;
/* Skip if HW doesn't expose remap, or if PAGE_SIZE > AMDGPU_GPU_PAGE_SIZE (4K). */
if (!adev->rmmio_remap.bus_addr || PAGE_SIZE > AMDGPU_GPU_PAGE_SIZE)
return 0;
+ /*
+ * Allocate a BO first and then move it to AMDGPU_PL_MMIO_REMAP.
+ * The initial TTM resource assigned by amdgpu_bo_create() is
+ * replaced below with a fixed MMIO_REMAP placement.
+ */
memset(&bp, 0, sizeof(bp));
-
- /* Create exactly one GEM BO in the MMIO_REMAP domain. */
- bp.type = ttm_bo_type_device; /* userspace-mappable GEM */
- bp.size = AMDGPU_GPU_PAGE_SIZE; /* 4K */
+ bp.type = ttm_bo_type_device;
+ bp.size = AMDGPU_GPU_PAGE_SIZE;
bp.byte_align = AMDGPU_GPU_PAGE_SIZE;
- bp.domain = AMDGPU_GEM_DOMAIN_MMIO_REMAP;
+ bp.domain = 0;
bp.flags = 0;
bp.resv = NULL;
bp.bo_ptr_size = sizeof(struct amdgpu_bo);
-
r = amdgpu_bo_create(adev, &bp, &adev->rmmio_remap.bo);
if (r)
return r;
+ r = amdgpu_bo_reserve(adev->rmmio_remap.bo, true);
+ if (r)
+ goto err_unref;
+
+ tbo = &adev->rmmio_remap.bo->tbo;
+
+ /*
+ * MMIO_REMAP is a fixed I/O placement (AMDGPU_PL_MMIO_REMAP).
+ */
+ placement.num_placement = 1;
+ placement.placement = &placements;
+ placements.fpfn = 0;
+ placements.lpfn = 0;
+ placements.mem_type = AMDGPU_PL_MMIO_REMAP;
+ placements.flags = 0;
+ /* Force the BO into the fixed MMIO_REMAP placement */
+ r = ttm_bo_mem_space(tbo, &placement, &tmp, &ctx);
+ if (unlikely(r))
+ goto err_unlock;
+
+ ttm_resource_free(tbo, &tbo->resource);
+ ttm_bo_assign_mem(tbo, tmp);
+ ttm_bo_pin(tbo);
+
+ amdgpu_bo_unreserve(adev->rmmio_remap.bo);
return 0;
+
+err_unlock:
+ amdgpu_bo_unreserve(adev->rmmio_remap.bo);
+
+err_unref:
+ amdgpu_bo_unref(&adev->rmmio_remap.bo);
+ adev->rmmio_remap.bo = NULL;
+ return r;
}
/**
- * amdgpu_ttm_mmio_remap_bo_fini - Free the singleton MMIO_REMAP BO
+ * amdgpu_ttm_free_mmio_remap_bo - Free the singleton MMIO_REMAP BO
* @adev: amdgpu device
*
* Frees the kernel-owned MMIO_REMAP BO if it was allocated by
* amdgpu_ttm_mmio_remap_bo_init().
*/
-static void amdgpu_ttm_mmio_remap_bo_fini(struct amdgpu_device *adev)
+static void amdgpu_ttm_free_mmio_remap_bo(struct amdgpu_device *adev)
{
+ if (!adev->rmmio_remap.bo)
+ return;
+
+ if (!amdgpu_bo_reserve(adev->rmmio_remap.bo, true)) {
+ ttm_bo_unpin(&adev->rmmio_remap.bo->tbo);
+ amdgpu_bo_unreserve(adev->rmmio_remap.bo);
+ }
+
+ /*
+ * At this point we rely on normal DRM teardown ordering:
+ * no new user ioctls can access the global MMIO_REMAP BO
+ * once TTM teardown begins.
+ */
amdgpu_bo_unref(&adev->rmmio_remap.bo);
adev->rmmio_remap.bo = NULL;
}
@@ -2043,8 +2096,8 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
return r;
}
- /* Allocate the singleton MMIO_REMAP BO (4K) if supported */
- r = amdgpu_ttm_mmio_remap_bo_init(adev);
+ /* Allocate the singleton MMIO_REMAP BO if supported */
+ r = amdgpu_ttm_alloc_mmio_remap_bo(adev);
if (r)
return r;
@@ -2111,7 +2164,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,
&adev->mman.sdma_access_ptr);
- amdgpu_ttm_mmio_remap_bo_fini(adev);
+ amdgpu_ttm_free_mmio_remap_bo(adev);
amdgpu_ttm_fw_reserve_vram_fini(adev);
amdgpu_ttm_drv_reserve_vram_fini(adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 8ddc4df06a1f..45e2933214a8 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1424,18 +1424,9 @@ static int sdma_v5_0_sw_init(struct amdgpu_ip_block *ip_block)
adev->sdma.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
- switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
- case IP_VERSION(5, 0, 0):
- case IP_VERSION(5, 0, 2):
- case IP_VERSION(5, 0, 5):
- if ((adev->sdma.instance[0].fw_version >= 35) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- default:
- break;
- }
+ if (!amdgpu_sriov_vf(adev) &&
+ !adev->debug_disable_gpu_ring_reset)
+ adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
/* Allocate memory for SDMA IP Dump buffer */
ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index 51101b0aa2fa..82b1d34a6533 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1342,25 +1342,9 @@ static int sdma_v5_2_sw_init(struct amdgpu_ip_block *ip_block)
adev->sdma.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
- switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
- case IP_VERSION(5, 2, 0):
- case IP_VERSION(5, 2, 2):
- case IP_VERSION(5, 2, 3):
- case IP_VERSION(5, 2, 4):
- if ((adev->sdma.instance[0].fw_version >= 76) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- case IP_VERSION(5, 2, 5):
- if ((adev->sdma.instance[0].fw_version >= 34) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- default:
- break;
- }
+ if (!amdgpu_sriov_vf(adev) &&
+ !adev->debug_disable_gpu_ring_reset)
+ adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
/* Allocate memory for SDMA IP Dump buffer */
ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 217040044987..6809c6d4be5b 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1351,18 +1351,9 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
adev->sdma.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
- switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
- case IP_VERSION(6, 0, 0):
- case IP_VERSION(6, 0, 2):
- case IP_VERSION(6, 0, 3):
- if ((adev->sdma.instance[0].fw_version >= 21) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- default:
- break;
- }
+ if (!amdgpu_sriov_vf(adev) &&
+ !adev->debug_disable_gpu_ring_reset)
+ adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
if (amdgpu_sdma_ras_sw_init(adev)) {
dev_err(adev->dev, "Failed to initialize sdma ras block!\n");
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
index 8897dcc9c1a0..e35fae9cdaf6 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
@@ -1964,7 +1964,8 @@ static int vcn_v2_0_start_sriov(struct amdgpu_device *adev)
struct mmsch_v2_0_cmd_end end = { {0} };
struct mmsch_v2_0_init_header *header;
uint32_t *init_table = adev->virt.mm_table.cpu_addr;
- uint8_t i = 0;
+
+ /* This path only programs VCN instance 0. */
header = (struct mmsch_v2_0_init_header *)init_table;
direct_wt.cmd_header.command_type = MMSCH_COMMAND__DIRECT_REG_WRITE;
@@ -1983,93 +1984,93 @@ static int vcn_v2_0_start_sriov(struct amdgpu_device *adev)
size = AMDGPU_GPU_PAGE_ALIGN(adev->vcn.inst[0].fw->size + 4);
MMSCH_V2_0_INSERT_DIRECT_RD_MOD_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_STATUS),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_STATUS),
0xFFFFFFFF, 0x00000004);
/* mc resume*/
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].tmr_mc_addr_lo);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH),
adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].tmr_mc_addr_hi);
offset = 0;
} else {
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
lower_32_bits(adev->vcn.inst->gpu_addr));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH),
upper_32_bits(adev->vcn.inst->gpu_addr));
offset = size;
}
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_OFFSET0),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET0),
0);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_SIZE0),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE0),
size);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW),
lower_32_bits(adev->vcn.inst->gpu_addr + offset));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH),
upper_32_bits(adev->vcn.inst->gpu_addr + offset));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_OFFSET1),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET1),
0);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_SIZE1),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE1),
AMDGPU_VCN_STACK_SIZE);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW),
lower_32_bits(adev->vcn.inst->gpu_addr + offset +
AMDGPU_VCN_STACK_SIZE));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH),
upper_32_bits(adev->vcn.inst->gpu_addr + offset +
AMDGPU_VCN_STACK_SIZE));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_OFFSET2),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET2),
0);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_VCPU_CACHE_SIZE2),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE2),
AMDGPU_VCN_CONTEXT_SIZE);
for (r = 0; r < adev->vcn.inst[0].num_enc_rings; ++r) {
ring = &adev->vcn.inst->ring_enc[r];
ring->wptr = 0;
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_RB_BASE_LO),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_LO),
lower_32_bits(ring->gpu_addr));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_RB_BASE_HI),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_HI),
upper_32_bits(ring->gpu_addr));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_RB_SIZE),
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_SIZE),
ring->ring_size / 4);
}
ring = &adev->vcn.inst->ring_dec;
ring->wptr = 0;
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_RBC_RB_64BIT_BAR_LOW),
lower_32_bits(ring->gpu_addr));
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i,
+ SOC15_REG_OFFSET(UVD, 0,
mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH),
upper_32_bits(ring->gpu_addr));
/* force RBC into idle state */
@@ -2080,7 +2081,7 @@ static int vcn_v2_0_start_sriov(struct amdgpu_device *adev)
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_NO_UPDATE, 1);
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_RPTR_WR_EN, 1);
MMSCH_V2_0_INSERT_DIRECT_WT(
- SOC15_REG_OFFSET(UVD, i, mmUVD_RBC_RB_CNTL), tmp);
+ SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), tmp);
/* add end packet */
tmp = sizeof(struct mmsch_v2_0_cmd_end);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
index ba99e0f258ae..986cb297de8f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
@@ -401,27 +401,25 @@ static int kfd_dbg_get_dev_watch_id(struct kfd_process_device *pdd, int *watch_i
return -ENOMEM;
}
-static void kfd_dbg_clear_dev_watch_id(struct kfd_process_device *pdd, int watch_id)
+static void kfd_dbg_clear_dev_watch_id(struct kfd_process_device *pdd, u32 watch_id)
{
spin_lock(&pdd->dev->watch_points_lock);
/* process owns device watch point so safe to clear */
- if ((pdd->alloc_watch_ids >> watch_id) & 0x1) {
- pdd->alloc_watch_ids &= ~(0x1 << watch_id);
- pdd->dev->alloc_watch_ids &= ~(0x1 << watch_id);
+ if (pdd->alloc_watch_ids & BIT(watch_id)) {
+ pdd->alloc_watch_ids &= ~BIT(watch_id);
+ pdd->dev->alloc_watch_ids &= ~BIT(watch_id);
}
spin_unlock(&pdd->dev->watch_points_lock);
}
-static bool kfd_dbg_owns_dev_watch_id(struct kfd_process_device *pdd, int watch_id)
+static bool kfd_dbg_owns_dev_watch_id(struct kfd_process_device *pdd, u32 watch_id)
{
bool owns_watch_id = false;
spin_lock(&pdd->dev->watch_points_lock);
- owns_watch_id = watch_id < MAX_WATCH_ADDRESSES &&
- ((pdd->alloc_watch_ids >> watch_id) & 0x1);
-
+ owns_watch_id = pdd->alloc_watch_ids & BIT(watch_id);
spin_unlock(&pdd->dev->watch_points_lock);
return owns_watch_id;
@@ -432,6 +430,9 @@ int kfd_dbg_trap_clear_dev_address_watch(struct kfd_process_device *pdd,
{
int r;
+ if (watch_id >= MAX_WATCH_ADDRESSES)
+ return -EINVAL;
+
if (!kfd_dbg_owns_dev_watch_id(pdd, watch_id))
return -EINVAL;
@@ -469,6 +470,9 @@ int kfd_dbg_trap_set_dev_address_watch(struct kfd_process_device *pdd,
if (r)
return r;
+ if (*watch_id >= MAX_WATCH_ADDRESSES)
+ return -EINVAL;
+
if (!pdd->dev->kfd->shared_resources.enable_mes) {
r = debug_lock_and_unmap(pdd->dev->dqm);
if (r) {
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index a085faac9fe1..5c15168f4faf 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1996,7 +1996,7 @@ static int signal_eviction_fence(struct kfd_process *p)
ef = dma_fence_get_rcu_safe(&p->ef);
rcu_read_unlock();
if (!ef)
- return -EINVAL;
+ return true;
ret = dma_fence_signal(ef);
dma_fence_put(ef);
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a8a59126b2d2..62622aa62206 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7434,7 +7434,7 @@ amdgpu_dm_connector_poll(struct amdgpu_dm_connector *aconnector, bool force)
*
* Only allow to poll such a connector again when forcing.
*/
- if (!force && link->local_sink && link->type == dc_connection_dac_load)
+ if (!force && link->local_sink && link->type == dc_connection_analog_load)
return connector->status;
mutex_lock(&aconnector->hpd_lock);
@@ -12275,10 +12275,9 @@ static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev,
/* Overlay cursor not supported on HW before DCN
* DCN401 does not have the cursor-on-scaled-plane or cursor-on-yuv-plane restrictions
- * as previous DCN generations, so enable native mode on DCN401 in addition to DCE
+ * as previous DCN generations, so enable native mode on DCN401
*/
- if (amdgpu_ip_version(adev, DCE_HWIP, 0) == 0 ||
- amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 0, 1)) {
+ if (amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 0, 1)) {
*cursor_mode = DM_CURSOR_NATIVE_MODE;
return 0;
}
@@ -12598,6 +12597,12 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
* need to be added for DC to not disable a plane by mistake
*/
if (dm_new_crtc_state->cursor_mode == DM_CURSOR_OVERLAY_MODE) {
+ if (amdgpu_ip_version(adev, DCE_HWIP, 0) == 0) {
+ drm_dbg(dev, "Overlay cursor not supported on DCE\n");
+ ret = -EINVAL;
+ goto fail;
+ }
+
ret = drm_atomic_add_affected_planes(state, crtc);
if (ret)
goto fail;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index 1dcc79b35225..20a76d81d532 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -23,6 +23,9 @@
* Authors: AMD
*
*/
+
+#include <drm/drm_colorop.h>
+
#include "amdgpu.h"
#include "amdgpu_mode.h"
#include "amdgpu_dm.h"
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index e7b0928bd3db..5948e2a6219e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -919,16 +919,15 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
continue;
amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
+ dc_link = amdgpu_dm_connector->dc_link;
+ if (!dc_link)
+ continue;
/*
* Analog connectors may be hot-plugged unlike other connector
* types that don't support HPD. Only poll analog connectors.
*/
- use_polling |=
- amdgpu_dm_connector->dc_link &&
- dc_connector_supports_analog(amdgpu_dm_connector->dc_link->link_id.id);
-
- dc_link = amdgpu_dm_connector->dc_link;
+ use_polling |= dc_connector_supports_analog(dc_link->link_id.id);
/*
* Get a base driver irq reference for hpd ints for the lifetime
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index 7c4496fb4b9d..f0946e67aef9 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -1060,10 +1060,15 @@ static void amdgpu_dm_plane_get_min_max_dc_plane_scaling(struct drm_device *dev,
*min_downscale = plane_cap->max_downscale_factor.nv12;
break;
+ /* All 64 bpp formats have the same fp16 scaling limits */
case DRM_FORMAT_XRGB16161616F:
case DRM_FORMAT_ARGB16161616F:
case DRM_FORMAT_XBGR16161616F:
case DRM_FORMAT_ABGR16161616F:
+ case DRM_FORMAT_XRGB16161616:
+ case DRM_FORMAT_ARGB16161616:
+ case DRM_FORMAT_XBGR16161616:
+ case DRM_FORMAT_ABGR16161616:
*max_upscale = plane_cap->max_upscale_factor.fp16;
*min_downscale = plane_cap->max_downscale_factor.fp16;
break;
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
index 76a3559f0ddc..b692fa37402d 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
@@ -1874,8 +1874,7 @@ static void dac_encoder_control_prepare_params(
uint8_t dac_standard)
{
params->ucDacStandard = dac_standard;
- if (action == ENCODER_CONTROL_SETUP ||
- action == ENCODER_CONTROL_INIT)
+ if (action == ENCODER_CONTROL_INIT)
params->ucAction = ATOM_ENCODER_INIT;
else if (action == ENCODER_CONTROL_ENABLE)
params->ucAction = ATOM_ENABLE;
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 29edfa51ea2c..0a9758a04258 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -2793,7 +2793,7 @@ void dc_get_underflow_debug_data_for_otg(struct dc *dc, int primary_otg_inst, st
void dc_get_power_feature_status(struct dc *dc, int primary_otg_inst, struct power_features *out_data);
-/**
+/*
* Software state variables used to program register fields across the display pipeline
*/
struct dc_register_software_state {
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index f46039f64203..3e63d7bda166 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -354,7 +354,7 @@ enum dc_connection_type {
dc_connection_single,
dc_connection_mst_branch,
dc_connection_sst_branch,
- dc_connection_dac_load
+ dc_connection_analog_load
};
struct dc_csc_adjustments {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 87dbb8d7ed27..bec8dab156ee 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -102,6 +102,7 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = {
.enable_dp_output = dce110_link_encoder_enable_dp_output,
.enable_dp_mst_output = dce110_link_encoder_enable_dp_mst_output,
.enable_lvds_output = dce110_link_encoder_enable_lvds_output,
+ .enable_analog_output = dce110_link_encoder_enable_analog_output,
.disable_output = dce110_link_encoder_disable_output,
.dp_set_lane_settings = dce110_link_encoder_dp_set_lane_settings,
.dp_set_phy_pattern = dce110_link_encoder_dp_set_phy_pattern,
@@ -131,6 +132,21 @@ static enum bp_result link_transmitter_control(
return result;
}
+static enum bp_result link_dac_encoder_control(
+ struct dce110_link_encoder *link_enc,
+ enum bp_encoder_control_action action,
+ uint32_t pix_clk_100hz)
+{
+ struct dc_bios *bios = link_enc->base.ctx->dc_bios;
+ struct bp_encoder_control encoder_control = {0};
+
+ encoder_control.action = action;
+ encoder_control.engine_id = link_enc->base.analog_engine;
+ encoder_control.pixel_clock = pix_clk_100hz / 10;
+
+ return bios->funcs->encoder_control(bios, &encoder_control);
+}
+
static void enable_phy_bypass_mode(
struct dce110_link_encoder *enc110,
bool enable)
@@ -850,6 +866,7 @@ void dce110_link_encoder_construct(
enc110->base.funcs = &dce110_lnk_enc_funcs;
enc110->base.ctx = init_data->ctx;
enc110->base.id = init_data->encoder;
+ enc110->base.analog_id = init_data->analog_encoder;
enc110->base.hpd_source = init_data->hpd_source;
enc110->base.connector = init_data->connector;
@@ -1017,6 +1034,16 @@ void dce110_link_encoder_hw_init(
cntl.coherent = false;
cntl.hpd_sel = enc110->base.hpd_source;
+ if (enc110->base.analog_engine != ENGINE_ID_UNKNOWN) {
+ result = link_dac_encoder_control(enc110, ENCODER_CONTROL_INIT, 0);
+ if (result != BP_RESULT_OK) {
+ DC_LOG_ERROR("%s: Failed to execute VBIOS command table for DAC!\n",
+ __func__);
+ BREAK_TO_DEBUGGER();
+ return;
+ }
+ }
+
/* The code below is only applicable to encoders with a digital transmitter. */
if (enc110->base.transmitter == TRANSMITTER_UNKNOWN)
return;
@@ -1166,6 +1193,22 @@ void dce110_link_encoder_enable_lvds_output(
}
}
+void dce110_link_encoder_enable_analog_output(
+ struct link_encoder *enc,
+ uint32_t pixel_clock)
+{
+ struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
+ enum bp_result result;
+
+ result = link_dac_encoder_control(enc110, ENCODER_CONTROL_ENABLE, pixel_clock);
+
+ if (result != BP_RESULT_OK) {
+ DC_LOG_ERROR("%s: Failed to execute VBIOS command table!\n",
+ __func__);
+ BREAK_TO_DEBUGGER();
+ }
+}
+
/* enables DP PHY output */
void dce110_link_encoder_enable_dp_output(
struct link_encoder *enc,
@@ -1336,19 +1379,8 @@ void dce110_link_encoder_disable_output(
struct bp_transmitter_control cntl = { 0 };
enum bp_result result;
- switch (enc->analog_engine) {
- case ENGINE_ID_DACA:
- REG_UPDATE(DAC_ENABLE, DAC_ENABLE, 0);
- break;
- case ENGINE_ID_DACB:
- /* DACB doesn't seem to be present on DCE6+,
- * although there are references to it in the register file.
- */
- DC_LOG_ERROR("%s DACB is unsupported\n", __func__);
- break;
- default:
- break;
- }
+ if (enc->analog_engine != ENGINE_ID_UNKNOWN)
+ link_dac_encoder_control(enc110, ENCODER_CONTROL_DISABLE, 0);
/* The code below only applies to connectors that support digital signals. */
if (enc->transmitter == TRANSMITTER_UNKNOWN)
@@ -1761,6 +1793,7 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = {
.enable_dp_output = dce60_link_encoder_enable_dp_output,
.enable_dp_mst_output = dce60_link_encoder_enable_dp_mst_output,
.enable_lvds_output = dce110_link_encoder_enable_lvds_output,
+ .enable_analog_output = dce110_link_encoder_enable_analog_output,
.disable_output = dce110_link_encoder_disable_output,
.dp_set_lane_settings = dce110_link_encoder_dp_set_lane_settings,
.dp_set_phy_pattern = dce60_link_encoder_dp_set_phy_pattern,
@@ -1793,6 +1826,7 @@ void dce60_link_encoder_construct(
enc110->base.funcs = &dce60_lnk_enc_funcs;
enc110->base.ctx = init_data->ctx;
enc110->base.id = init_data->encoder;
+ enc110->base.analog_id = init_data->analog_encoder;
enc110->base.hpd_source = init_data->hpd_source;
enc110->base.connector = init_data->connector;
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
index c58b69bc319b..6870cb619d20 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
@@ -273,6 +273,11 @@ void dce110_link_encoder_enable_lvds_output(
enum clock_source_id clock_source,
uint32_t pixel_clock);
+/* enables analog output from the DAC */
+void dce110_link_encoder_enable_analog_output(
+ struct link_encoder *enc,
+ uint32_t pixel_clock);
+
/* disable PHY output */
void dce110_link_encoder_disable_output(
struct link_encoder *enc,
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index 574618d5d4a4..87c19f17c799 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -1498,7 +1498,10 @@ static void dig_connect_to_otg(
{
struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
- REG_UPDATE(DIG_FE_CNTL, DIG_SOURCE_SELECT, tg_inst);
+ if (enc->id == ENGINE_ID_DACA || enc->id == ENGINE_ID_DACB)
+ REG_UPDATE(DAC_SOURCE_SELECT, DAC_SOURCE_SELECT, tg_inst);
+ else
+ REG_UPDATE(DIG_FE_CNTL, DIG_SOURCE_SELECT, tg_inst);
}
static unsigned int dig_source_otg(
@@ -1507,7 +1510,10 @@ static unsigned int dig_source_otg(
uint32_t tg_inst = 0;
struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
- REG_GET(DIG_FE_CNTL, DIG_SOURCE_SELECT, &tg_inst);
+ if (enc->id == ENGINE_ID_DACA || enc->id == ENGINE_ID_DACB)
+ REG_GET(DAC_SOURCE_SELECT, DAC_SOURCE_SELECT, &tg_inst);
+ else
+ REG_GET(DIG_FE_CNTL, DIG_SOURCE_SELECT, &tg_inst);
return tg_inst;
}
@@ -1568,16 +1574,25 @@ void dce110_stream_encoder_construct(
enc110->se_mask = se_mask;
}
-static const struct stream_encoder_funcs dce110_an_str_enc_funcs = {};
+static const struct stream_encoder_funcs dce110_an_str_enc_funcs = {
+ .dig_connect_to_otg = dig_connect_to_otg,
+ .dig_source_otg = dig_source_otg,
+};
void dce110_analog_stream_encoder_construct(
struct dce110_stream_encoder *enc110,
struct dc_context *ctx,
struct dc_bios *bp,
- enum engine_id eng_id)
+ enum engine_id eng_id,
+ const struct dce110_stream_enc_registers *regs,
+ const struct dce_stream_encoder_shift *se_shift,
+ const struct dce_stream_encoder_mask *se_mask)
{
enc110->base.funcs = &dce110_an_str_enc_funcs;
enc110->base.ctx = ctx;
enc110->base.id = eng_id;
enc110->base.bp = bp;
+ enc110->regs = regs;
+ enc110->se_shift = se_shift;
+ enc110->se_mask = se_mask;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
index 068de1392121..342c0afe6a94 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
@@ -65,6 +65,7 @@
SRI(AFMT_60958_1, DIG, id), \
SRI(AFMT_60958_2, DIG, id), \
SRI(DIG_FE_CNTL, DIG, id), \
+ SR(DAC_SOURCE_SELECT), \
SRI(HDMI_CONTROL, DIG, id), \
SRI(HDMI_GC, DIG, id), \
SRI(HDMI_GENERIC_PACKET_CONTROL0, DIG, id), \
@@ -290,7 +291,8 @@
#define SE_COMMON_MASK_SH_LIST_DCE80_100(mask_sh)\
SE_COMMON_MASK_SH_LIST_DCE_COMMON(mask_sh),\
SE_SF(TMDS_CNTL, TMDS_PIXEL_ENCODING, mask_sh),\
- SE_SF(TMDS_CNTL, TMDS_COLOR_FORMAT, mask_sh)
+ SE_SF(TMDS_CNTL, TMDS_COLOR_FORMAT, mask_sh),\
+ SE_SF(DAC_SOURCE_SELECT, DAC_SOURCE_SELECT, mask_sh)
#define SE_COMMON_MASK_SH_LIST_DCE110(mask_sh)\
SE_COMMON_MASK_SH_LIST_DCE_COMMON(mask_sh),\
@@ -494,6 +496,7 @@ struct dce_stream_encoder_shift {
uint8_t DP_VID_N_MUL;
uint8_t DP_VID_M_DOUBLE_VALUE_EN;
uint8_t DIG_SOURCE_SELECT;
+ uint8_t DAC_SOURCE_SELECT;
};
struct dce_stream_encoder_mask {
@@ -626,6 +629,7 @@ struct dce_stream_encoder_mask {
uint32_t DP_VID_N_MUL;
uint32_t DP_VID_M_DOUBLE_VALUE_EN;
uint32_t DIG_SOURCE_SELECT;
+ uint32_t DAC_SOURCE_SELECT;
};
struct dce110_stream_enc_registers {
@@ -653,6 +657,7 @@ struct dce110_stream_enc_registers {
uint32_t AFMT_60958_1;
uint32_t AFMT_60958_2;
uint32_t DIG_FE_CNTL;
+ uint32_t DAC_SOURCE_SELECT;
uint32_t DP_MSE_RATE_CNTL;
uint32_t DP_MSE_RATE_UPDATE;
uint32_t DP_PIXEL_FORMAT;
@@ -712,7 +717,10 @@ void dce110_analog_stream_encoder_construct(
struct dce110_stream_encoder *enc110,
struct dc_context *ctx,
struct dc_bios *bp,
- enum engine_id eng_id);
+ enum engine_id eng_id,
+ const struct dce110_stream_enc_registers *regs,
+ const struct dce_stream_encoder_shift *se_shift,
+ const struct dce_stream_encoder_mask *se_mask);
void dce110_se_audio_mute_control(
struct stream_encoder *enc, bool mute);
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index ebd74b43e935..5896ce5511ab 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@ -659,20 +659,6 @@ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx)
}
}
-static void
-dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
-{
- struct dc_link *link = pipe_ctx->stream->link;
- struct dc_bios *bios = link->ctx->dc_bios;
- struct bp_encoder_control encoder_control = {0};
-
- encoder_control.action = enable ? ENCODER_CONTROL_ENABLE : ENCODER_CONTROL_DISABLE;
- encoder_control.engine_id = link->link_enc->analog_engine;
- encoder_control.pixel_clock = pipe_ctx->stream->timing.pix_clk_100hz / 10;
-
- bios->funcs->encoder_control(bios, &encoder_control);
-}
-
void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
{
enum dc_lane_count lane_count =
@@ -703,8 +689,6 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
tg->funcs->set_early_control(tg, early_control);
- if (dc_is_rgb_signal(pipe_ctx->stream->signal))
- dce110_dac_encoder_control(pipe_ctx, true);
}
static enum bp_result link_transmitter_control(
@@ -1218,9 +1202,6 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
dccg->funcs->disable_symclk_se(dccg, stream_enc->stream_enc_inst,
link_enc->transmitter - TRANSMITTER_UNIPHY_A);
}
-
- if (dc_is_rgb_signal(pipe_ctx->stream->signal))
- dce110_dac_encoder_control(pipe_ctx, false);
}
void dce110_unblank_stream(struct pipe_ctx *pipe_ctx,
@@ -1603,25 +1584,6 @@ static enum dc_status dce110_enable_stream_timing(
return DC_OK;
}
-static void
-dce110_select_crtc_source(struct pipe_ctx *pipe_ctx)
-{
- struct dc_link *link = pipe_ctx->stream->link;
- struct dc_bios *bios = link->ctx->dc_bios;
- struct bp_crtc_source_select crtc_source_select = {0};
- enum engine_id engine_id = link->link_enc->preferred_engine;
-
- if (dc_is_rgb_signal(pipe_ctx->stream->signal))
- engine_id = link->link_enc->analog_engine;
-
- crtc_source_select.controller_id = CONTROLLER_ID_D0 + pipe_ctx->stream_res.tg->inst;
- crtc_source_select.color_depth = pipe_ctx->stream->timing.display_color_depth;
- crtc_source_select.engine_id = engine_id;
- crtc_source_select.sink_signal = pipe_ctx->stream->signal;
-
- bios->funcs->select_crtc_source(bios, &crtc_source_select);
-}
-
enum dc_status dce110_apply_single_controller_ctx_to_hw(
struct pipe_ctx *pipe_ctx,
struct dc_state *context,
@@ -1641,10 +1603,6 @@ enum dc_status dce110_apply_single_controller_ctx_to_hw(
hws->funcs.disable_stream_gating(dc, pipe_ctx);
}
- if (pipe_ctx->stream->signal == SIGNAL_TYPE_RGB) {
- dce110_select_crtc_source(pipe_ctx);
- }
-
if (pipe_ctx->stream_res.audio != NULL) {
struct audio_output audio_output = {0};
@@ -1724,8 +1682,7 @@ enum dc_status dce110_apply_single_controller_ctx_to_hw(
pipe_ctx->stream_res.tg->funcs->set_static_screen_control(
pipe_ctx->stream_res.tg, event_triggers, 2);
- if (!dc_is_virtual_signal(pipe_ctx->stream->signal) &&
- !dc_is_rgb_signal(pipe_ctx->stream->signal))
+ if (!dc_is_virtual_signal(pipe_ctx->stream->signal))
pipe_ctx->stream_res.stream_enc->funcs->dig_connect_to_otg(
pipe_ctx->stream_res.stream_enc,
pipe_ctx->stream_res.tg->inst);
@@ -3312,6 +3269,15 @@ void dce110_enable_tmds_link_output(struct dc_link *link,
link->phy_state.symclk_state = SYMCLK_ON_TX_ON;
}
+static void dce110_enable_analog_link_output(
+ struct dc_link *link,
+ uint32_t pix_clk_100hz)
+{
+ link->link_enc->funcs->enable_analog_output(
+ link->link_enc,
+ pix_clk_100hz);
+}
+
void dce110_enable_dp_link_output(
struct dc_link *link,
const struct link_resource *link_res,
@@ -3449,6 +3415,7 @@ static const struct hw_sequencer_funcs dce110_funcs = {
.enable_lvds_link_output = dce110_enable_lvds_link_output,
.enable_tmds_link_output = dce110_enable_tmds_link_output,
.enable_dp_link_output = dce110_enable_dp_link_output,
+ .enable_analog_link_output = dce110_enable_analog_link_output,
.disable_link_output = dce110_disable_link_output,
};
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h
index 8ed9eea40c56..4f6bd365e055 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h
+++ b/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h
@@ -1184,6 +1184,8 @@ struct hw_sequencer_funcs {
const struct link_resource *link_res,
enum clock_source_id clock_source,
uint32_t pixel_clock);
+ void (*enable_analog_link_output)(struct dc_link *link,
+ uint32_t pixel_clock);
void (*disable_link_output)(struct dc_link *link,
const struct link_resource *link_res,
enum signal_type signal);
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
index df512920a9fa..b1a88618c5bf 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
@@ -47,6 +47,7 @@ struct encoder_init_data {
enum hpd_source_id hpd_source;
/* TODO: in DAL2, here was pointer to EventManagerInterface */
struct graphics_object_id encoder;
+ struct graphics_object_id analog_encoder;
enum engine_id analog_engine;
struct dc_context *ctx;
enum transmitter transmitter;
@@ -81,6 +82,7 @@ struct link_encoder {
int32_t aux_channel_offset;
struct dc_context *ctx;
struct graphics_object_id id;
+ struct graphics_object_id analog_id;
struct graphics_object_id connector;
uint32_t output_signals;
enum engine_id preferred_engine;
@@ -128,6 +130,8 @@ struct link_encoder_funcs {
void (*enable_lvds_output)(struct link_encoder *enc,
enum clock_source_id clock_source,
uint32_t pixel_clock);
+ void (*enable_analog_output)(struct link_encoder *enc,
+ uint32_t pixel_clock);
void (*disable_output)(struct link_encoder *link_enc,
enum signal_type signal);
void (*dp_set_lane_settings)(struct link_encoder *enc,
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index 7fa6bc97a919..f986b57381ba 100644
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -1173,11 +1173,10 @@ static bool detect_link_and_local_sink(struct dc_link *link,
* - cheap DVI-A cable or adapter that doesn't connect DDC
*/
if (dc_connector_supports_analog(link->link_id.id)) {
- /* If we didn't do DAC load detection yet, do it now
- * to verify there really is a display connected.
+ /* If we didn't already detect a display using
+ * DAC load detection, we know it isn't connected.
*/
- if (link->type != dc_connection_dac_load &&
- !link_detect_dac_load_detect(link)) {
+ if (link->type != dc_connection_analog_load) {
if (prev_sink)
dc_sink_release(prev_sink);
link_disconnect_sink(link);
@@ -1185,7 +1184,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
}
DC_LOG_INFO("%s detected analog display without EDID\n", __func__);
- link->type = dc_connection_dac_load;
+ link->type = dc_connection_analog_load;
sink->edid_caps.analog = true;
break;
}
@@ -1372,7 +1371,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
* @link: DC link to evaluate (must support analog signalling).
* @type: Updated with the detected connection type:
* dc_connection_single (analog via DDC),
- * dc_connection_dac_load (via load-detect),
+ * dc_connection_analog_load (via load-detect),
* or dc_connection_none.
*
* Return: true if detection completed.
@@ -1388,7 +1387,7 @@ static bool link_detect_analog(struct dc_link *link, enum dc_connection_type *ty
}
if (link_detect_dac_load_detect(link)) {
- *type = dc_connection_dac_load;
+ *type = dc_connection_analog_load;
return true;
}
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_dpms.c b/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
index 6ae134147617..635f614c0673 100644
--- a/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
@@ -2208,6 +2208,18 @@ static enum dc_status enable_link_dp_mst(
return enable_link_dp(state, pipe_ctx);
}
+static enum dc_status enable_link_analog(
+ struct dc_state *state,
+ struct pipe_ctx *pipe_ctx)
+{
+ struct dc_link *link = pipe_ctx->stream->link;
+
+ link->dc->hwss.enable_analog_link_output(
+ link, pipe_ctx->stream->timing.pix_clk_100hz);
+
+ return DC_OK;
+}
+
static enum dc_status enable_link_virtual(struct pipe_ctx *pipe_ctx)
{
struct dc_link *link = pipe_ctx->stream->link;
@@ -2263,7 +2275,7 @@ static enum dc_status enable_link(
status = DC_OK;
break;
case SIGNAL_TYPE_RGB:
- status = DC_OK;
+ status = enable_link_analog(state, pipe_ctx);
break;
case SIGNAL_TYPE_VIRTUAL:
status = enable_link_virtual(pipe_ctx);
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
index a6e2b0821969..9003e0d314e0 100644
--- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
@@ -350,24 +350,6 @@ static enum transmitter translate_encoder_to_transmitter(
return TRANSMITTER_UNKNOWN;
}
break;
- case ENCODER_ID_EXTERNAL_NUTMEG:
- switch (encoder.enum_id) {
- case ENUM_ID_1:
- return TRANSMITTER_NUTMEG_CRT;
- default:
- return TRANSMITTER_UNKNOWN;
- }
- break;
- case ENCODER_ID_EXTERNAL_TRAVIS:
- switch (encoder.enum_id) {
- case ENUM_ID_1:
- return TRANSMITTER_TRAVIS_CRT;
- case ENUM_ID_2:
- return TRANSMITTER_TRAVIS_LCD;
- default:
- return TRANSMITTER_UNKNOWN;
- }
- break;
default:
return TRANSMITTER_UNKNOWN;
}
@@ -451,20 +433,19 @@ static enum channel_id get_ddc_line(struct dc_link *link)
return channel;
}
-static enum engine_id find_analog_engine(struct dc_link *link)
+static enum engine_id find_analog_engine(struct dc_link *link, struct graphics_object_id *enc)
{
struct dc_bios *bp = link->ctx->dc_bios;
- struct graphics_object_id encoder = {0};
enum bp_result bp_result = BP_RESULT_OK;
int i;
for (i = 0; i < 3; i++) {
- bp_result = bp->funcs->get_src_obj(bp, link->link_id, i, &encoder);
+ bp_result = bp->funcs->get_src_obj(bp, link->link_id, i, enc);
if (bp_result != BP_RESULT_OK)
return ENGINE_ID_UNKNOWN;
- switch (encoder.id) {
+ switch (enc->id) {
case ENCODER_ID_INTERNAL_DAC1:
case ENCODER_ID_INTERNAL_KLDSCP_DAC1:
return ENGINE_ID_DACA;
@@ -474,17 +455,10 @@ static enum engine_id find_analog_engine(struct dc_link *link)
}
}
+ memset(enc, 0, sizeof(*enc));
return ENGINE_ID_UNKNOWN;
}
-static bool transmitter_supported(const enum transmitter transmitter)
-{
- return transmitter != TRANSMITTER_UNKNOWN &&
- transmitter != TRANSMITTER_NUTMEG_CRT &&
- transmitter != TRANSMITTER_TRAVIS_CRT &&
- transmitter != TRANSMITTER_TRAVIS_LCD;
-}
-
static bool analog_engine_supported(const enum engine_id engine_id)
{
return engine_id == ENGINE_ID_DACA ||
@@ -502,6 +476,9 @@ static bool construct_phy(struct dc_link *link,
struct dc_bios *bios = init_params->dc->ctx->dc_bios;
const struct dc_vbios_funcs *bp_funcs = bios->funcs;
struct bp_disp_connector_caps_info disp_connect_caps_info = { 0 };
+ struct graphics_object_id link_encoder = { 0 };
+ enum transmitter transmitter_from_encoder;
+ enum engine_id link_analog_engine;
DC_LOGGER_INIT(dc_ctx->logger);
@@ -522,21 +499,21 @@ static bool construct_phy(struct dc_link *link,
link->link_id =
bios->funcs->get_connector_id(bios, init_params->connector_index);
- /* Determine early if the link has any supported encoders,
- * so that we avoid initializing DDC and HPD, etc.
- */
- bp_funcs->get_src_obj(bios, link->link_id, 0, &enc_init_data.encoder);
- enc_init_data.transmitter = translate_encoder_to_transmitter(enc_init_data.encoder);
- enc_init_data.analog_engine = find_analog_engine(link);
-
link->ep_type = DISPLAY_ENDPOINT_PHY;
DC_LOG_DC("BIOS object table - link_id: %d", link->link_id.id);
- if (!transmitter_supported(enc_init_data.transmitter) &&
- !analog_engine_supported(enc_init_data.analog_engine)) {
+ /* Determine early if the link has any supported encoders,
+ * so that we avoid initializing DDC and HPD, etc.
+ */
+ bp_funcs->get_src_obj(bios, link->link_id, 0, &link_encoder);
+ transmitter_from_encoder = translate_encoder_to_transmitter(link_encoder);
+ link_analog_engine = find_analog_engine(link, &enc_init_data.analog_encoder);
+
+ if (transmitter_from_encoder == TRANSMITTER_UNKNOWN &&
+ !analog_engine_supported(link_analog_engine)) {
DC_LOG_WARNING("link_id %d has unsupported encoder\n", link->link_id.id);
- goto unsupported_fail;
+ goto create_fail;
}
if (bios->funcs->get_disp_connector_caps_info) {
@@ -670,6 +647,9 @@ static bool construct_phy(struct dc_link *link,
enc_init_data.connector = link->link_id;
enc_init_data.channel = get_ddc_line(link);
enc_init_data.hpd_source = get_hpd_line(link);
+ enc_init_data.transmitter = transmitter_from_encoder;
+ enc_init_data.encoder = link_encoder;
+ enc_init_data.analog_engine = link_analog_engine;
link->hpd_src = enc_init_data.hpd_source;
@@ -806,7 +786,6 @@ static bool construct_phy(struct dc_link *link,
link->hpd_gpio = NULL;
}
-unsupported_fail:
DC_LOG_DC("BIOS object table - %s failed.\n", __func__);
return false;
}
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
index d40d91ec2035..b78bb595d69e 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
@@ -242,7 +242,8 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {
stream_enc_regs(3),
stream_enc_regs(4),
stream_enc_regs(5),
- stream_enc_regs(6)
+ stream_enc_regs(6),
+ {SR(DAC_SOURCE_SELECT),} /* DACA */
};
static const struct dce_stream_encoder_shift se_shift = {
@@ -491,7 +492,8 @@ static struct stream_encoder *dce100_stream_encoder_create(
return NULL;
if (eng_id == ENGINE_ID_DACA || eng_id == ENGINE_ID_DACB) {
- dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id);
+ dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id], &se_shift, &se_mask);
return &enc110->base;
}
@@ -638,7 +640,8 @@ static struct link_encoder *dce100_link_encoder_create(
if (!enc110)
return NULL;
- if (enc_init_data->connector.id == CONNECTOR_ID_VGA) {
+ if (enc_init_data->connector.id == CONNECTOR_ID_VGA &&
+ enc_init_data->analog_engine != ENGINE_ID_UNKNOWN) {
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
@@ -978,7 +981,10 @@ struct stream_encoder *dce100_find_first_free_match_stream_enc_for_link(
struct dc_link *link = stream->link;
enum engine_id preferred_engine = link->link_enc->preferred_engine;
- if (dc_is_rgb_signal(stream->signal))
+ /* Prefer analog engine if the link encoder has one.
+ * Otherwise, it's an external encoder.
+ */
+ if (dc_is_rgb_signal(stream->signal) && link->link_enc->analog_engine != ENGINE_ID_UNKNOWN)
preferred_engine = link->link_enc->analog_engine;
for (i = 0; i < pool->stream_enc_count; i++) {
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
index cd54382c0af3..7c09825cd9bd 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
@@ -895,6 +895,8 @@ static void get_pixel_clock_parameters(
*/
pixel_clk_params->requested_pix_clk_100hz = stream->timing.pix_clk_100hz;
pixel_clk_params->encoder_object_id = stream->link->link_enc->id;
+ if (dc_is_rgb_signal(pipe_ctx->stream->signal))
+ pixel_clk_params->encoder_object_id = stream->link->link_enc->analog_id;
pixel_clk_params->signal_type = pipe_ctx->stream->signal;
pixel_clk_params->controller_id = pipe_ctx->stream_res.tg->inst + 1;
/* TODO: un-hardcode*/
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
index f0152933bee2..6cf2faffc961 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
@@ -258,7 +258,9 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {
stream_enc_regs(2),
stream_enc_regs(3),
stream_enc_regs(4),
- stream_enc_regs(5)
+ stream_enc_regs(5),
+ {0},
+ {SR(DAC_SOURCE_SELECT),} /* DACA */
};
static const struct dce_stream_encoder_shift se_shift = {
@@ -607,7 +609,8 @@ static struct stream_encoder *dce60_stream_encoder_create(
return NULL;
if (eng_id == ENGINE_ID_DACA || eng_id == ENGINE_ID_DACB) {
- dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id);
+ dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id], &se_shift, &se_mask);
return &enc110->base;
}
@@ -733,8 +736,9 @@ static struct link_encoder *dce60_link_encoder_create(
if (!enc110)
return NULL;
- if (enc_init_data->connector.id == CONNECTOR_ID_VGA) {
- dce110_link_encoder_construct(enc110,
+ if (enc_init_data->connector.id == CONNECTOR_ID_VGA &&
+ enc_init_data->analog_engine != ENGINE_ID_UNKNOWN) {
+ dce60_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
&link_enc_regs[ENGINE_ID_DACA],
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
index 8687104cabb7..066dbf8125a8 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
@@ -258,7 +258,8 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {
stream_enc_regs(3),
stream_enc_regs(4),
stream_enc_regs(5),
- stream_enc_regs(6)
+ stream_enc_regs(6),
+ {SR(DAC_SOURCE_SELECT),} /* DACA */
};
static const struct dce_stream_encoder_shift se_shift = {
@@ -614,7 +615,8 @@ static struct stream_encoder *dce80_stream_encoder_create(
return NULL;
if (eng_id == ENGINE_ID_DACA || eng_id == ENGINE_ID_DACB) {
- dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id);
+ dce110_analog_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,
+ &stream_enc_regs[eng_id], &se_shift, &se_mask);
return &enc110->base;
}
@@ -740,7 +742,8 @@ static struct link_encoder *dce80_link_encoder_create(
if (!enc110)
return NULL;
- if (enc_init_data->connector.id == CONNECTOR_ID_VGA) {
+ if (enc_init_data->connector.id == CONNECTOR_ID_VGA &&
+ enc_init_data->analog_engine != ENGINE_ID_UNKNOWN) {
dce110_link_encoder_construct(enc110,
enc_init_data,
&link_enc_feature,
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
index 4e962f522f1b..228ae665c789 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
@@ -1230,12 +1230,12 @@ static struct stream_encoder *dcn315_stream_encoder_create(
/*PHYB is wired off in HW, allow front end to remapping, otherwise needs more changes*/
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
index 5a95dd54cb42..45abf3b2eb2c 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
@@ -1223,12 +1223,12 @@ static struct stream_encoder *dcn316_stream_encoder_create(
int afmt_inst;
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
index b276fec3e479..d39a0f9c78c9 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
@@ -1211,12 +1211,12 @@ static struct stream_encoder *dcn32_stream_encoder_create(
int afmt_inst;
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn32_vpg_create(ctx, vpg_inst);
afmt = dcn32_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
index 3466ca34c93f..c72c6dbc0cb4 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
@@ -1192,12 +1192,12 @@ static struct stream_encoder *dcn321_stream_encoder_create(
int afmt_inst;
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn321_vpg_create(ctx, vpg_inst);
afmt = dcn321_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
index d056e5fd5458..9edabd8ceca9 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
@@ -1274,12 +1274,12 @@ static struct stream_encoder *dcn35_stream_encoder_create(
int afmt_inst;
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
index 9fab3169069c..43ece2bbcd64 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
@@ -1254,12 +1254,12 @@ static struct stream_encoder *dcn35_stream_encoder_create(
int afmt_inst;
/* Mapping of VPG, AFMT, DME register blocks to DIO block instance */
- if (eng_id <= ENGINE_ID_DIGF) {
- vpg_inst = eng_id;
- afmt_inst = eng_id;
- } else
+ if (eng_id < 0 || eng_id >= ARRAY_SIZE(stream_enc_regs))
return NULL;
+ vpg_inst = eng_id;
+ afmt_inst = eng_id;
+
enc1 = kzalloc(sizeof(struct dcn10_stream_encoder), GFP_KERNEL);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 17945094a138..ac2d3701e2bd 100644
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -89,6 +89,7 @@ enum amd_apu_flags {
* @AMD_IP_BLOCK_TYPE_VPE: Video Processing Engine
* @AMD_IP_BLOCK_TYPE_UMSCH_MM: User Mode Scheduler for Multimedia
* @AMD_IP_BLOCK_TYPE_ISP: Image Signal Processor
+* @AMD_IP_BLOCK_TYPE_RAS: Reliability, Availability, Serviceability
* @AMD_IP_BLOCK_TYPE_NUM: Total number of IP block types
*/
enum amd_ip_block_type {
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
index 302af1fb6901..9c9e96655c4b 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
@@ -1589,7 +1589,7 @@ int amdgpu_dpm_get_power_limit(struct amdgpu_device *adev,
int ret = 0;
if (!pp_funcs->get_power_limit)
- return -ENODATA;
+ return -EOPNOTSUPP;
mutex_lock(&adev->pm.mutex);
ret = pp_funcs->get_power_limit(adev->powerplay.pp_handle,
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
index 9e635f733fbf..370326ec65d9 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
@@ -922,7 +922,7 @@ void smu_v13_0_12_get_gpu_metrics(struct smu_context *smu, void **table,
gpu_metrics->gfx_below_host_limit_total_acc
[i] = SMUQ10_ROUND(
metrics->GfxclkBelowHostLimitTotalAcc[inst]);
- };
+ }
}
gpu_metrics->xgmi_link_width = metrics->XgmiWidth;
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 64e5c176d5cc..be749dcad3b5 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -4572,7 +4572,8 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
if (!payload->delete) {
payload->pbn = 0;
payload->delete = true;
- topology_state->payload_mask &= ~BIT(payload->vcpi - 1);
+ if (payload->vcpi > 0)
+ topology_state->payload_mask &= ~BIT(payload->vcpi - 1);
}
return 0;
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 67e095e398a3..06f0205664fc 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -641,6 +641,38 @@ drm_atomic_get_colorop_state(struct drm_atomic_state *state,
}
EXPORT_SYMBOL(drm_atomic_get_colorop_state);
+/**
+ * drm_atomic_get_old_colorop_state - get colorop state, if it exists
+ * @state: global atomic state object
+ * @colorop: colorop to grab
+ *
+ * This function returns the old colorop state for the given colorop, or
+ * NULL if the colorop is not part of the global atomic state.
+ */
+struct drm_colorop_state *
+drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,
+ struct drm_colorop *colorop)
+{
+ return state->colorops[drm_colorop_index(colorop)].old_state;
+}
+EXPORT_SYMBOL(drm_atomic_get_old_colorop_state);
+
+/**
+ * drm_atomic_get_new_colorop_state - get colorop state, if it exists
+ * @state: global atomic state object
+ * @colorop: colorop to grab
+ *
+ * This function returns the new colorop state for the given colorop, or
+ * NULL if the colorop is not part of the global atomic state.
+ */
+struct drm_colorop_state *
+drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,
+ struct drm_colorop *colorop)
+{
+ return state->colorops[drm_colorop_index(colorop)].new_state;
+}
+EXPORT_SYMBOL(drm_atomic_get_new_colorop_state);
+
static bool
plane_switching_crtc(const struct drm_plane_state *old_plane_state,
const struct drm_plane_state *new_plane_state)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 5beea645035f..cc1f0c102414 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -34,6 +34,7 @@
#include <drm/drm_atomic_uapi.h>
#include <drm/drm_blend.h>
#include <drm/drm_bridge.h>
+#include <drm/drm_colorop.h>
#include <drm/drm_damage_helper.h>
#include <drm/drm_device.h>
#include <drm/drm_drv.h>
diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c
index 2f279b46bd2c..8308116058cc 100644
--- a/drivers/gpu/drm/drm_buddy.c
+++ b/drivers/gpu/drm/drm_buddy.c
@@ -420,6 +420,7 @@ void drm_buddy_fini(struct drm_buddy *mm)
for_each_free_tree(i)
kfree(mm->free_trees[i]);
+ kfree(mm->free_trees);
kfree(mm->roots);
}
EXPORT_SYMBOL(drm_buddy_fini);
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index b143589717e6..bed2562bf911 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -1867,9 +1867,9 @@ int drm_plane_create_color_pipeline_property(struct drm_plane *plane,
prop = drm_property_create_enum(plane->dev, DRM_MODE_PROP_ATOMIC,
"COLOR_PIPELINE",
all_pipelines, len);
- if (IS_ERR(prop)) {
+ if (!prop) {
kfree(all_pipelines);
- return PTR_ERR(prop);
+ return -ENOMEM;
}
drm_object_attach_property(&plane->base, prop, 0);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 23646e55f142..06c29ff2aac0 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -199,6 +199,7 @@ struct drm_exynos_file_private {
struct exynos_drm_private {
struct device *g2d_dev;
struct device *dma_dev;
+ struct device *vidi_dev;
void *mapping;
/* for atomic commit */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index aa255a7ddd85..67bbf9b8bc0e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -232,9 +232,14 @@ ATTRIBUTE_GROUPS(vidi);
int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
struct drm_file *file_priv)
{
- struct vidi_context *ctx = dev_get_drvdata(drm_dev->dev);
+ struct exynos_drm_private *priv = drm_dev->dev_private;
+ struct device *dev = priv ? priv->vidi_dev : NULL;
+ struct vidi_context *ctx = dev ? dev_get_drvdata(dev) : NULL;
struct drm_exynos_vidi_connection *vidi = data;
+ if (!ctx)
+ return -ENODEV;
+
if (!vidi) {
DRM_DEV_DEBUG_KMS(ctx->dev,
"user data for vidi is null.\n");
@@ -258,13 +263,27 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
if (vidi->connection) {
const struct drm_edid *drm_edid;
- const struct edid *raw_edid;
+ const void __user *edid_userptr = u64_to_user_ptr(vidi->edid);
+ void *edid_buf;
+ struct edid hdr;
size_t size;
- raw_edid = (const struct edid *)(unsigned long)vidi->edid;
- size = (raw_edid->extensions + 1) * EDID_LENGTH;
+ if (copy_from_user(&hdr, edid_userptr, sizeof(hdr)))
+ return -EFAULT;
+
+ size = (hdr.extensions + 1) * EDID_LENGTH;
+
+ edid_buf = kmalloc(size, GFP_KERNEL);
+ if (!edid_buf)
+ return -ENOMEM;
+
+ if (copy_from_user(edid_buf, edid_userptr, size)) {
+ kfree(edid_buf);
+ return -EFAULT;
+ }
- drm_edid = drm_edid_alloc(raw_edid, size);
+ drm_edid = drm_edid_alloc(edid_buf, size);
+ kfree(edid_buf);
if (!drm_edid)
return -ENOMEM;
@@ -394,6 +413,7 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
{
struct vidi_context *ctx = dev_get_drvdata(dev);
struct drm_device *drm_dev = data;
+ struct exynos_drm_private *priv = drm_dev->dev_private;
struct drm_encoder *encoder = &ctx->encoder;
struct exynos_drm_plane *exynos_plane;
struct exynos_drm_plane_config plane_config = { 0 };
@@ -401,6 +421,8 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
int ret;
ctx->drm_dev = drm_dev;
+ if (priv)
+ priv->vidi_dev = dev;
plane_config.pixel_formats = formats;
plane_config.num_pixel_formats = ARRAY_SIZE(formats);
@@ -446,8 +468,12 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
static void vidi_unbind(struct device *dev, struct device *master, void *data)
{
struct vidi_context *ctx = dev_get_drvdata(dev);
+ struct drm_device *drm_dev = data;
+ struct exynos_drm_private *priv = drm_dev->dev_private;
timer_delete_sync(&ctx->timer);
+ if (priv)
+ priv->vidi_dev = NULL;
}
static const struct component_ops vidi_component_ops = {
diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h
index 4add05c7f161..f9ee7ebfec55 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h
@@ -40,6 +40,10 @@ struct hibmc_dp_dev {
struct mutex lock; /* protects concurrent RW in hibmc_dp_reg_write_field() */
struct hibmc_dp_link link;
u8 dpcd[DP_RECEIVER_CAP_SIZE];
+ u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
+ struct drm_dp_desc desc;
+ bool is_branch;
+ int hpd_status;
void __iomem *serdes_base;
};
diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
index 08f9e1caf7fc..efb30a758475 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
@@ -17,5 +17,7 @@
#define HIBMC_DP_LINK_RATE_CAL 27
#define HIBMC_DP_SYNC_DELAY(lanes) ((lanes) == 0x2 ? 86 : 46)
#define HIBMC_DP_INT_ENABLE 0xc
+/* HIBMC_DP_LINK_RATE_CAL * 10000 * 80% = 216000 */
+#define DP_MODE_VALI_CAL 216000
#endif
diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
index 8f0daec7d174..d5bd3c45649b 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
@@ -2,6 +2,7 @@
// Copyright (c) 2024 Hisilicon Limited.
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/delay.h>
#include "dp_config.h"
#include "dp_comm.h"
@@ -176,13 +177,18 @@ int hibmc_dp_hw_init(struct hibmc_dp *dp)
dp_dev->link.cap.lanes = 0x2;
dp_dev->link.cap.link_rate = DP_LINK_BW_8_1;
- /* hdcp data */
- writel(HIBMC_DP_HDCP, dp_dev->base + HIBMC_DP_HDCP_CFG);
/* int init */
writel(0, dp_dev->base + HIBMC_DP_INTR_ENABLE);
writel(HIBMC_DP_INT_RST, dp_dev->base + HIBMC_DP_INTR_ORIGINAL_STATUS);
+ /* clr colorbar */
+ writel(0, dp_dev->base + HIBMC_DP_COLOR_BAR_CTRL);
/* rst */
+ writel(0, dp_dev->base + HIBMC_DP_DPTX_RST_CTRL);
+ usleep_range(30, 50);
+ /* de-rst */
writel(HIBMC_DP_DPTX_RST, dp_dev->base + HIBMC_DP_DPTX_RST_CTRL);
+ /* hdcp data */
+ writel(HIBMC_DP_HDCP, dp_dev->base + HIBMC_DP_HDCP_CFG);
/* clock enable */
writel(HIBMC_DP_CLK_EN, dp_dev->base + HIBMC_DP_DPTX_CLK_CTRL);
@@ -263,6 +269,16 @@ void hibmc_dp_reset_link(struct hibmc_dp *dp)
dp->dp_dev->link.status.channel_equalized = false;
}
+u8 hibmc_dp_get_link_rate(struct hibmc_dp *dp)
+{
+ return dp->dp_dev->link.cap.link_rate;
+}
+
+u8 hibmc_dp_get_lanes(struct hibmc_dp *dp)
+{
+ return dp->dp_dev->link.cap.lanes;
+}
+
static const struct hibmc_dp_color_raw g_rgb_raw[] = {
{CBAR_COLOR_BAR, 0x000, 0x000, 0x000},
{CBAR_WHITE, 0xfff, 0xfff, 0xfff},
@@ -305,3 +321,21 @@ void hibmc_dp_set_cbar(struct hibmc_dp *dp, const struct hibmc_dp_cbar_cfg *cfg)
hibmc_dp_reg_write_field(dp_dev, HIBMC_DP_COLOR_BAR_CTRL, BIT(0), cfg->enable);
writel(HIBMC_DP_SYNC_EN_MASK, dp_dev->base + HIBMC_DP_TIMING_SYNC_CTRL);
}
+
+bool hibmc_dp_check_hpd_status(struct hibmc_dp *dp, int exp_status)
+{
+ u32 status;
+ int ret;
+
+ ret = readl_poll_timeout(dp->dp_dev->base + HIBMC_DP_HPD_STATUS, status,
+ FIELD_GET(HIBMC_DP_HPD_CUR_STATE, status) == exp_status,
+ 1000, 100000); /* DP spec says 100ms */
+ if (ret) {
+ drm_dbg_dp(dp->drm_dev, "wait hpd status timeout");
+ return false;
+ }
+
+ dp->dp_dev->hpd_status = exp_status;
+
+ return true;
+}
diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
index 665f5b166dfb..31316fe1ea8d 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
@@ -14,6 +14,11 @@
struct hibmc_dp_dev;
+enum hibmc_hpd_status {
+ HIBMC_HPD_OUT,
+ HIBMC_HPD_IN,
+};
+
enum hibmc_dp_cbar_pattern {
CBAR_COLOR_BAR,
CBAR_WHITE,
@@ -60,5 +65,8 @@ void hibmc_dp_reset_link(struct hibmc_dp *dp);
void hibmc_dp_hpd_cfg(struct hibmc_dp *dp);
void hibmc_dp_enable_int(struct hibmc_dp *dp);
void hibmc_dp_disable_int(struct hibmc_dp *dp);
+bool hibmc_dp_check_hpd_status(struct hibmc_dp *dp, int exp_status);
+u8 hibmc_dp_get_link_rate(struct hibmc_dp *dp);
+u8 hibmc_dp_get_lanes(struct hibmc_dp *dp);
#endif
diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h
index 394b1e933c3a..64306abcd986 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h
@@ -24,6 +24,9 @@
#define HIBMC_DP_CFG_AUX_READY_DATA_BYTE GENMASK(16, 12)
#define HIBMC_DP_CFG_AUX GENMASK(24, 17)
+#define HIBMC_DP_HPD_STATUS 0x98
+#define HIBMC_DP_HPD_CUR_STATE GENMASK(7, 4)
+
#define HIBMC_DP_PHYIF_CTRL0 0xa0
#define HIBMC_DP_CFG_SCRAMBLE_EN BIT(0)
#define HIBMC_DP_CFG_PAT_SEL GENMASK(7, 4)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
index d06832e62e96..616821e3c933 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
@@ -12,6 +12,8 @@
#include "hibmc_drm_drv.h"
#include "dp/dp_hw.h"
+#include "dp/dp_comm.h"
+#include "dp/dp_config.h"
#define DP_MASKED_SINK_HPD_PLUG_INT BIT(2)
@@ -31,17 +33,76 @@ static int hibmc_dp_connector_get_modes(struct drm_connector *connector)
return count;
}
+static bool hibmc_dp_get_dpcd(struct hibmc_dp_dev *dp_dev)
+{
+ int ret;
+
+ ret = drm_dp_read_dpcd_caps(dp_dev->aux, dp_dev->dpcd);
+ if (ret)
+ return false;
+
+ dp_dev->is_branch = drm_dp_is_branch(dp_dev->dpcd);
+
+ ret = drm_dp_read_desc(dp_dev->aux, &dp_dev->desc, dp_dev->is_branch);
+ if (ret)
+ return false;
+
+ ret = drm_dp_read_downstream_info(dp_dev->aux, dp_dev->dpcd, dp_dev->downstream_ports);
+ if (ret)
+ return false;
+
+ return true;
+}
+
static int hibmc_dp_detect(struct drm_connector *connector,
struct drm_modeset_acquire_ctx *ctx, bool force)
{
- mdelay(200);
+ struct hibmc_dp *dp = to_hibmc_dp(connector);
+ struct hibmc_dp_dev *dp_dev = dp->dp_dev;
+ int ret;
+
+ if (dp->irq_status) {
+ if (dp_dev->hpd_status != HIBMC_HPD_IN)
+ return connector_status_disconnected;
+ }
+
+ if (!hibmc_dp_get_dpcd(dp_dev))
+ return connector_status_disconnected;
+
+ if (!dp_dev->is_branch)
+ return connector_status_connected;
+
+ if (drm_dp_read_sink_count_cap(connector, dp_dev->dpcd, &dp_dev->desc) &&
+ dp_dev->downstream_ports[0] & DP_DS_PORT_HPD) {
+ ret = drm_dp_read_sink_count(dp_dev->aux);
+ if (ret > 0)
+ return connector_status_connected;
+ }
+
+ return connector_status_disconnected;
+}
+
+static int hibmc_dp_mode_valid(struct drm_connector *connector,
+ const struct drm_display_mode *mode,
+ struct drm_modeset_acquire_ctx *ctx,
+ enum drm_mode_status *status)
+{
+ struct hibmc_dp *dp = to_hibmc_dp(connector);
+ u64 cur_val, max_val;
- return drm_connector_helper_detect_from_ddc(connector, ctx, force);
+ /* check DP link BW */
+ cur_val = (u64)mode->clock * HIBMC_DP_BPP;
+ max_val = (u64)hibmc_dp_get_link_rate(dp) * DP_MODE_VALI_CAL * hibmc_dp_get_lanes(dp);
+
+ *status = cur_val > max_val ? MODE_CLOCK_HIGH : MODE_OK;
+
+ return 0;
}
static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = {
.get_modes = hibmc_dp_connector_get_modes,
.detect_ctx = hibmc_dp_detect,
+ .mode_valid_ctx = hibmc_dp_mode_valid,
};
static int hibmc_dp_late_register(struct drm_connector *connector)
@@ -115,7 +176,7 @@ irqreturn_t hibmc_dp_hpd_isr(int irq, void *arg)
{
struct drm_device *dev = (struct drm_device *)arg;
struct hibmc_drm_private *priv = to_hibmc_drm_private(dev);
- int idx;
+ int idx, exp_status;
if (!drm_dev_enter(dev, &idx))
return -ENODEV;
@@ -123,12 +184,14 @@ irqreturn_t hibmc_dp_hpd_isr(int irq, void *arg)
if (priv->dp.irq_status & DP_MASKED_SINK_HPD_PLUG_INT) {
drm_dbg_dp(&priv->dev, "HPD IN isr occur!\n");
hibmc_dp_hpd_cfg(&priv->dp);
+ exp_status = HIBMC_HPD_IN;
} else {
drm_dbg_dp(&priv->dev, "HPD OUT isr occur!\n");
hibmc_dp_reset_link(&priv->dp);
+ exp_status = HIBMC_HPD_OUT;
}
- if (dev->registered)
+ if (hibmc_dp_check_hpd_status(&priv->dp, exp_status))
drm_connector_helper_hpd_irq_event(&priv->dp.connector);
drm_dev_exit(idx);
diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c
index 68c01932f7b4..e06f324027be 100644
--- a/drivers/gpu/drm/i915/display/intel_acpi.c
+++ b/drivers/gpu/drm/i915/display/intel_acpi.c
@@ -96,6 +96,7 @@ static void intel_dsm_platform_mux_info(acpi_handle dhandle)
if (!pkg->package.count) {
DRM_DEBUG_DRIVER("no connection in _DSM\n");
+ ACPI_FREE(pkg);
return;
}
diff --git a/drivers/gpu/drm/i915/display/intel_colorop.c b/drivers/gpu/drm/i915/display/intel_colorop.c
index f2fc0d8780ce..1d84933f05aa 100644
--- a/drivers/gpu/drm/i915/display/intel_colorop.c
+++ b/drivers/gpu/drm/i915/display/intel_colorop.c
@@ -2,7 +2,9 @@
/*
* Copyright © 2025 Intel Corporation
*/
+
#include "intel_colorop.h"
+#include "intel_display_types.h"
struct intel_colorop *to_intel_colorop(struct drm_colorop *colorop)
{
diff --git a/drivers/gpu/drm/i915/display/intel_colorop.h b/drivers/gpu/drm/i915/display/intel_colorop.h
index 21d58eb9f3d0..9276eee6e75a 100644
--- a/drivers/gpu/drm/i915/display/intel_colorop.h
+++ b/drivers/gpu/drm/i915/display/intel_colorop.h
@@ -6,7 +6,9 @@
#ifndef __INTEL_COLOROP_H__
#define __INTEL_COLOROP_H__
-#include "intel_display_types.h"
+enum intel_color_block;
+struct drm_colorop;
+struct intel_colorop;
struct intel_colorop *to_intel_colorop(struct drm_colorop *colorop);
struct intel_colorop *intel_colorop_alloc(void);
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index b559ef43d547..6944d081f0ad 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -189,6 +189,7 @@ struct intel_display_platforms {
#define HAS_MSO(__display) (DISPLAY_VER(__display) >= 12)
#define HAS_OVERLAY(__display) (DISPLAY_INFO(__display)->has_overlay)
#define HAS_PIPEDMC(__display) (DISPLAY_VER(__display) >= 12)
+#define HAS_PIXEL_NORMALIZER(__display) (DISPLAY_VER(__display) >= 35)
#define HAS_PSR(__display) (DISPLAY_INFO(__display)->has_psr)
#define HAS_PSR_HW_TRACKING(__display) (DISPLAY_INFO(__display)->has_psr_hw_tracking)
#define HAS_PSR2_SEL_FETCH(__display) (DISPLAY_VER(__display) >= 12)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 06bf8f7c0989..6e26751e8d0e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -34,6 +34,7 @@
#include <drm/display/drm_dp_tunnel.h>
#include <drm/display/drm_dsc.h>
#include <drm/drm_atomic.h>
+#include <drm/drm_colorop.h>
#include <drm/drm_crtc.h>
#include <drm/drm_encoder.h>
#include <drm/drm_framebuffer.h>
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 437d2fda20a7..8d387709f25c 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1120,13 +1120,15 @@ static bool xe3p_lpd_fbc_pixel_format_is_valid(const struct intel_plane_state *p
}
}
-bool
-intel_fbc_is_enable_pixel_normalizer(const struct intel_plane_state *plane_state)
+bool intel_fbc_need_pixel_normalizer(const struct intel_plane_state *plane_state)
{
struct intel_display *display = to_intel_display(plane_state);
- return DISPLAY_VER(display) >= 35 &&
- xe3p_lpd_fbc_fp16_format_is_valid(plane_state);
+ if (HAS_PIXEL_NORMALIZER(display) &&
+ xe3p_lpd_fbc_fp16_format_is_valid(plane_state))
+ return true;
+
+ return false;
}
static bool pixel_format_is_valid(const struct intel_plane_state *plane_state)
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.h b/drivers/gpu/drm/i915/display/intel_fbc.h
index 91424563206a..7e2416b29a0e 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.h
+++ b/drivers/gpu/drm/i915/display/intel_fbc.h
@@ -53,7 +53,6 @@ void intel_fbc_prepare_dirty_rect(struct intel_atomic_state *state,
struct intel_crtc *crtc);
void intel_fbc_dirty_rect_update_noarm(struct intel_dsb *dsb,
struct intel_plane *plane);
-bool
-intel_fbc_is_enable_pixel_normalizer(const struct intel_plane_state *plane_state);
+bool intel_fbc_need_pixel_normalizer(const struct intel_plane_state *plane_state);
#endif /* __INTEL_FBC_H__ */
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index ee8e24497d2c..ed14b9ea2ad2 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -892,23 +892,20 @@ static void icl_plane_disable_sel_fetch_arm(struct intel_dsb *dsb,
intel_de_write_dsb(display, dsb, SEL_FETCH_PLANE_CTL(pipe, plane->id), 0);
}
-static void x3p_lpd_plane_update_pixel_normalizer(struct intel_dsb *dsb,
- struct intel_plane *plane,
- bool enable)
+static bool plane_has_normalizer(struct intel_plane *plane)
{
struct intel_display *display = to_intel_display(plane);
- enum intel_fbc_id fbc_id = skl_fbc_id_for_pipe(plane->pipe);
- u32 val;
- /* Only HDR planes have pixel normalizer and don't matter if no FBC */
- if (!skl_plane_has_fbc(display, fbc_id, plane->id))
- return;
+ return HAS_PIXEL_NORMALIZER(display) && icl_is_hdr_plane(display, plane->id);
+}
- val = enable ? PLANE_PIXEL_NORMALIZE_NORM_FACTOR(PLANE_PIXEL_NORMALIZE_NORM_FACTOR_1_0) |
- PLANE_PIXEL_NORMALIZE_ENABLE : 0;
+static u32 pixel_normalizer_value(const struct intel_plane_state *plane_state)
+{
+ if (!intel_fbc_need_pixel_normalizer(plane_state))
+ return 0;
- intel_de_write_dsb(display, dsb,
- PLANE_PIXEL_NORMALIZE(plane->pipe, plane->id), val);
+ return PLANE_PIXEL_NORMALIZE_ENABLE |
+ PLANE_PIXEL_NORMALIZE_NORM_FACTOR(PLANE_PIXEL_NORMALIZE_NORM_FACTOR_1_0);
}
static void
@@ -927,8 +924,9 @@ icl_plane_disable_arm(struct intel_dsb *dsb,
icl_plane_disable_sel_fetch_arm(dsb, plane, crtc_state);
- if (DISPLAY_VER(display) >= 35)
- x3p_lpd_plane_update_pixel_normalizer(dsb, plane, false);
+ if (plane_has_normalizer(plane))
+ intel_de_write_dsb(display, dsb,
+ PLANE_PIXEL_NORMALIZE(plane->pipe, plane->id), 0);
intel_de_write_dsb(display, dsb, PLANE_CTL(pipe, plane_id), 0);
intel_de_write_dsb(display, dsb, PLANE_SURF(pipe, plane_id), 0);
@@ -1677,11 +1675,13 @@ icl_plane_update_arm(struct intel_dsb *dsb,
/*
* In order to have FBC for fp16 formats pixel normalizer block must be
- * active. Check if pixel normalizer block need to be enabled for FBC.
- * If needed, use normalization factor as 1.0 and enable the block.
+ * active. For FP16 formats, use normalization factor as 1.0 and enable
+ * the block.
*/
- if (intel_fbc_is_enable_pixel_normalizer(plane_state))
- x3p_lpd_plane_update_pixel_normalizer(dsb, plane, true);
+ if (plane_has_normalizer(plane))
+ intel_de_write_dsb(display, dsb,
+ PLANE_PIXEL_NORMALIZE(plane->pipe, plane->id),
+ pixel_normalizer_value(plane_state));
/*
* The control register self-arms if the plane was previously
diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
index 1b1ee14b65cf..f6e48bb8cc69 100644
--- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
@@ -77,7 +77,10 @@ static bool a2xx_me_init(struct msm_gpu *gpu)
/* Vertex and Pixel Shader Start Addresses in instructions
* (3 DWORDS per instruction) */
- OUT_RING(ring, 0x80000180);
+ if (adreno_is_a225(adreno_gpu))
+ OUT_RING(ring, 0x80000300);
+ else
+ OUT_RING(ring, 0x80000180);
/* Maximum Contexts */
OUT_RING(ring, 0x00000001);
/* Write Confirm Interval and The CP will wait the
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
index 4c042133261c..550a53a7865e 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
@@ -1689,7 +1689,7 @@ static const struct adreno_reglist_pipe x285_nonctxt_regs[] = {
{ REG_A7XX_SP_READ_SEL, 0x0001ff00, BIT(PIPE_NONE) },
{ REG_A6XX_TPL1_DBG_ECO_CNTL, 0x10000000, BIT(PIPE_NONE) },
/* BIT(26): Disable final clamp for bicubic filtering */
- { REG_A6XX_TPL1_DBG_ECO_CNTL1, 0x00000720, BIT(PIPE_NONE) },
+ { REG_A6XX_TPL1_DBG_ECO_CNTL1, 0x04000720, BIT(PIPE_NONE) },
{ REG_A6XX_UCHE_MODE_CNTL, 0x80080000, BIT(PIPE_NONE) },
{ REG_A8XX_UCHE_CCHE_MODE_CNTL, 0x00001000, BIT(PIPE_NONE) },
{ REG_A8XX_UCHE_CCHE_CACHE_WAYS, 0x00000800, BIT(PIPE_NONE) },
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 1c80909e63ca..d5fe6f6f0dec 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -376,8 +376,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,
*value = adreno_gpu->info->gmem;
return 0;
case MSM_PARAM_GMEM_BASE:
- if (adreno_is_a650_family(adreno_gpu) ||
- adreno_is_a740_family(adreno_gpu))
+ if (adreno_gpu->info->family >= ADRENO_6XX_GEN4)
*value = 0;
else
*value = 0x100000;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
index f91220496082..b1b03d8b30fa 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
@@ -42,24 +42,19 @@ static const struct dpu_ctl_cfg msm8998_ctl[] = {
.name = "ctl_0", .id = CTL_0,
.base = 0x1000, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9),
}, {
.name = "ctl_1", .id = CTL_1,
.base = 0x1200, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10),
}, {
.name = "ctl_2", .id = CTL_2,
.base = 0x1400, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11),
}, {
.name = "ctl_3", .id = CTL_3,
.base = 0x1600, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12),
}, {
.name = "ctl_4", .id = CTL_4,
.base = 0x1800, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13),
},
};
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
index 8f9a097147c0..64df4e80ea43 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
@@ -37,24 +37,19 @@ static const struct dpu_ctl_cfg sdm660_ctl[] = {
.name = "ctl_0", .id = CTL_0,
.base = 0x1000, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9),
}, {
.name = "ctl_1", .id = CTL_1,
.base = 0x1200, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10),
}, {
.name = "ctl_2", .id = CTL_2,
.base = 0x1400, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11),
}, {
.name = "ctl_3", .id = CTL_3,
.base = 0x1600, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12),
}, {
.name = "ctl_4", .id = CTL_4,
.base = 0x1800, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13),
},
};
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
index 0ad18bd273ff..b409af899918 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
@@ -36,24 +36,19 @@ static const struct dpu_ctl_cfg sdm630_ctl[] = {
.name = "ctl_0", .id = CTL_0,
.base = 0x1000, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9),
}, {
.name = "ctl_1", .id = CTL_1,
.base = 0x1200, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10),
}, {
.name = "ctl_2", .id = CTL_2,
.base = 0x1400, .len = 0x94,
.features = BIT(DPU_CTL_SPLIT_DISPLAY),
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11),
}, {
.name = "ctl_3", .id = CTL_3,
.base = 0x1600, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12),
}, {
.name = "ctl_4", .id = CTL_4,
.base = 0x1800, .len = 0x94,
- .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13),
},
};
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
index 8f978b9c3452..2f8688224f34 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
@@ -13,6 +13,7 @@ static const struct dpu_caps sc7280_dpu_caps = {
.has_dim_layer = true,
.has_idle_pc = true,
.max_linewidth = 2400,
+ .has_3d_merge = true,
.pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE,
};
@@ -134,17 +135,24 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
.name = "pingpong_2", .id = PINGPONG_2,
.base = 0x6b000, .len = 0,
.sblk = &sc7280_pp_sblk,
- .merge_3d = 0,
+ .merge_3d = MERGE_3D_1,
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
}, {
.name = "pingpong_3", .id = PINGPONG_3,
.base = 0x6c000, .len = 0,
.sblk = &sc7280_pp_sblk,
- .merge_3d = 0,
+ .merge_3d = MERGE_3D_1,
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
},
};
+static const struct dpu_merge_3d_cfg sc7280_merge_3d[] = {
+ {
+ .name = "merge_3d_1", .id = MERGE_3D_1,
+ .base = 0x4f000, .len = 0x8,
+ },
+};
+
/* NOTE: sc7280 only has one DSC hard slice encoder */
static const struct dpu_dsc_cfg sc7280_dsc[] = {
{
@@ -247,6 +255,8 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg = {
.mixer = sc7280_lm,
.pingpong_count = ARRAY_SIZE(sc7280_pp),
.pingpong = sc7280_pp,
+ .merge_3d_count = ARRAY_SIZE(sc7280_merge_3d),
+ .merge_3d = sc7280_merge_3d,
.dsc_count = ARRAY_SIZE(sc7280_dsc),
.dsc = sc7280_dsc,
.wb_count = ARRAY_SIZE(sc7280_wb),
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 9f3957f24c6a..eba1d52211f6 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -785,24 +785,24 @@ static void _dpu_encoder_update_vsync_source(struct dpu_encoder_virt *dpu_enc,
return;
}
+ vsync_cfg.vsync_source = disp_info->vsync_source;
+ vsync_cfg.frame_rate = drm_mode_vrefresh(&dpu_enc->base.crtc->state->adjusted_mode);
+
if (hw_mdptop->ops.setup_vsync_source) {
for (i = 0; i < dpu_enc->num_phys_encs; i++)
vsync_cfg.ppnumber[i] = dpu_enc->hw_pp[i]->idx;
vsync_cfg.pp_count = dpu_enc->num_phys_encs;
- vsync_cfg.frame_rate = drm_mode_vrefresh(&dpu_enc->base.crtc->state->adjusted_mode);
-
- vsync_cfg.vsync_source = disp_info->vsync_source;
hw_mdptop->ops.setup_vsync_source(hw_mdptop, &vsync_cfg);
+ }
- for (i = 0; i < dpu_enc->num_phys_encs; i++) {
- phys_enc = dpu_enc->phys_encs[i];
+ for (i = 0; i < dpu_enc->num_phys_encs; i++) {
+ phys_enc = dpu_enc->phys_encs[i];
- if (phys_enc->has_intf_te && phys_enc->hw_intf->ops.vsync_sel)
- phys_enc->hw_intf->ops.vsync_sel(phys_enc->hw_intf,
- vsync_cfg.vsync_source);
- }
+ if (phys_enc->has_intf_te && phys_enc->hw_intf->ops.vsync_sel)
+ phys_enc->hw_intf->ops.vsync_sel(phys_enc->hw_intf,
+ &vsync_cfg);
}
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 0ec6d67c7c70..93db1484f606 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -681,10 +681,11 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(
if (!dpu_encoder_phys_cmd_is_master(phys_enc))
return 0;
- if (phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl))
- return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
+ if (phys_enc->irq[INTR_IDX_CTL_START] &&
+ !phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl))
+ return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
- return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
+ return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
}
static void dpu_encoder_phys_cmd_handle_post_kickoff(
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
index a80ac82a9625..7e620f590984 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
@@ -67,6 +67,10 @@
#define INTF_MISR_CTRL 0x180
#define INTF_MISR_SIGNATURE 0x184
+#define INTF_WD_TIMER_0_CTL 0x230
+#define INTF_WD_TIMER_0_CTL2 0x234
+#define INTF_WD_TIMER_0_LOAD_VALUE 0x238
+
#define INTF_MUX 0x25C
#define INTF_STATUS 0x26C
#define INTF_AVR_CONTROL 0x270
@@ -475,7 +479,20 @@ static int dpu_hw_intf_get_vsync_info(struct dpu_hw_intf *intf,
}
static void dpu_hw_intf_vsync_sel(struct dpu_hw_intf *intf,
- enum dpu_vsync_source vsync_source)
+ struct dpu_vsync_source_cfg *cfg)
+{
+ struct dpu_hw_blk_reg_map *c;
+
+ if (!intf)
+ return;
+
+ c = &intf->hw;
+
+ DPU_REG_WRITE(c, INTF_TEAR_MDP_VSYNC_SEL, (cfg->vsync_source & 0xf));
+}
+
+static void dpu_hw_intf_vsync_sel_v8(struct dpu_hw_intf *intf,
+ struct dpu_vsync_source_cfg *cfg)
{
struct dpu_hw_blk_reg_map *c;
@@ -484,7 +501,30 @@ static void dpu_hw_intf_vsync_sel(struct dpu_hw_intf *intf,
c = &intf->hw;
- DPU_REG_WRITE(c, INTF_TEAR_MDP_VSYNC_SEL, (vsync_source & 0xf));
+ if (cfg->vsync_source >= DPU_VSYNC_SOURCE_WD_TIMER_4 &&
+ cfg->vsync_source <= DPU_VSYNC_SOURCE_WD_TIMER_1) {
+ pr_warn_once("DPU 8.x supports only GPIOs and timer0 as TE sources\n");
+ return;
+ }
+
+ if (cfg->vsync_source == DPU_VSYNC_SOURCE_WD_TIMER_0) {
+ u32 reg;
+
+ DPU_REG_WRITE(c, INTF_WD_TIMER_0_LOAD_VALUE,
+ CALCULATE_WD_LOAD_VALUE(cfg->frame_rate));
+
+ DPU_REG_WRITE(c, INTF_WD_TIMER_0_CTL, BIT(0)); /* clear timer */
+
+ reg = BIT(8); /* enable heartbeat timer */
+ reg |= BIT(0); /* enable WD timer */
+ reg |= BIT(1); /* select default 16 clock ticks */
+ DPU_REG_WRITE(c, INTF_WD_TIMER_0_CTL2, reg);
+
+ /* make sure that timers are enabled/disabled for vsync state */
+ wmb();
+ }
+
+ dpu_hw_intf_vsync_sel(intf, cfg);
}
static void dpu_hw_intf_disable_autorefresh(struct dpu_hw_intf *intf,
@@ -598,7 +638,10 @@ struct dpu_hw_intf *dpu_hw_intf_init(struct drm_device *dev,
c->ops.enable_tearcheck = dpu_hw_intf_enable_te;
c->ops.disable_tearcheck = dpu_hw_intf_disable_te;
c->ops.connect_external_te = dpu_hw_intf_connect_external_te;
- c->ops.vsync_sel = dpu_hw_intf_vsync_sel;
+ if (mdss_rev->core_major_ver >= 8)
+ c->ops.vsync_sel = dpu_hw_intf_vsync_sel_v8;
+ else
+ c->ops.vsync_sel = dpu_hw_intf_vsync_sel;
c->ops.disable_autorefresh = dpu_hw_intf_disable_autorefresh;
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
index 5a19cd74fa94..f6ef2c21b66d 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
@@ -12,6 +12,7 @@
#include "dpu_hw_util.h"
struct dpu_hw_intf;
+struct dpu_vsync_source_cfg;
/* intf timing settings */
struct dpu_hw_intf_timing_params {
@@ -104,7 +105,7 @@ struct dpu_hw_intf_ops {
int (*connect_external_te)(struct dpu_hw_intf *intf, bool enable_external_te);
- void (*vsync_sel)(struct dpu_hw_intf *intf, enum dpu_vsync_source vsync_source);
+ void (*vsync_sel)(struct dpu_hw_intf *intf, struct dpu_vsync_source_cfg *cfg);
void (*disable_autorefresh)(struct dpu_hw_intf *intf, uint32_t encoder_id, u16 vdisplay);
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
index 6f1fc790ad6d..f275b14da4ff 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -72,6 +72,8 @@
#define SSPP_EXCL_REC_XY_REC1 0x188
#define SSPP_EXCL_REC_SIZE 0x1B4
#define SSPP_EXCL_REC_XY 0x1B8
+#define SSPP_UBWC_STATIC_CTRL_REC1 0x1c0
+#define SSPP_UBWC_ERROR_STATUS_REC1 0x1c8
#define SSPP_CLK_CTRL 0x330
/* SSPP_SRC_OP_MODE & OP_MODE_REC1 */
@@ -215,7 +217,7 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
u32 chroma_samp, unpack, src_format;
u32 opmode = 0;
u32 fast_clear = 0;
- u32 op_mode_off, unpack_pat_off, format_off;
+ u32 op_mode_off, unpack_pat_off, format_off, ubwc_ctrl_off, ubwc_error_off;
if (!ctx || !fmt)
return;
@@ -225,10 +227,21 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
op_mode_off = SSPP_SRC_OP_MODE;
unpack_pat_off = SSPP_SRC_UNPACK_PATTERN;
format_off = SSPP_SRC_FORMAT;
+ ubwc_ctrl_off = SSPP_UBWC_STATIC_CTRL;
+ ubwc_error_off = SSPP_UBWC_ERROR_STATUS;
} else {
op_mode_off = SSPP_SRC_OP_MODE_REC1;
unpack_pat_off = SSPP_SRC_UNPACK_PATTERN_REC1;
format_off = SSPP_SRC_FORMAT_REC1;
+
+ /* reg wasn't present before DPU 8.0 */
+ if (ctx->mdss_ver->core_major_ver >= 8) {
+ ubwc_ctrl_off = SSPP_UBWC_STATIC_CTRL_REC1;
+ ubwc_error_off = SSPP_UBWC_ERROR_STATUS_REC1;
+ } else {
+ ubwc_ctrl_off = SSPP_UBWC_STATIC_CTRL;
+ ubwc_error_off = SSPP_UBWC_ERROR_STATUS;
+ }
}
c = &ctx->hw;
@@ -270,36 +283,41 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
((fmt->bpp - 1) << 9);
if (fmt->fetch_mode != MDP_FETCH_LINEAR) {
+ u32 hbb = ctx->ubwc->highest_bank_bit - 13;
+ u32 ctrl_val;
+
if (MSM_FORMAT_IS_UBWC(fmt))
opmode |= MDSS_MDP_OP_BWC_EN;
src_format |= (fmt->fetch_mode & 3) << 30; /*FRAME_FORMAT */
DPU_REG_WRITE(c, SSPP_FETCH_CONFIG,
DPU_FETCH_CONFIG_RESET_VALUE |
- ctx->ubwc->highest_bank_bit << 18);
- switch (ctx->ubwc->ubwc_enc_version) {
- case UBWC_1_0:
+ hbb << 18);
+
+ if (ctx->ubwc->ubwc_enc_version == UBWC_1_0) {
fast_clear = fmt->alpha_enable ? BIT(31) : 0;
- DPU_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
- fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
- BIT(8) |
- (ctx->ubwc->highest_bank_bit << 4));
- break;
- case UBWC_2_0:
+ ctrl_val = fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
+ BIT(8) | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_2_0) {
fast_clear = fmt->alpha_enable ? BIT(31) : 0;
- DPU_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
- fast_clear | (ctx->ubwc->ubwc_swizzle) |
- (ctx->ubwc->highest_bank_bit << 4));
- break;
- case UBWC_3_0:
- DPU_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
- BIT(30) | (ctx->ubwc->ubwc_swizzle) |
- (ctx->ubwc->highest_bank_bit << 4));
- break;
- case UBWC_4_0:
- DPU_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
- MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30));
- break;
+ ctrl_val = fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_3_0) {
+ ctrl_val = BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_4_0) {
+ ctrl_val = MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30);
+ } else if (ctx->ubwc->ubwc_enc_version <= UBWC_6_0) {
+ if (MSM_FORMAT_IS_YUV(fmt))
+ ctrl_val = 0;
+ else if (MSM_FORMAT_IS_DX(fmt)) /* or FP16, but it's unsupported */
+ ctrl_val = BIT(30);
+ else
+ ctrl_val = BIT(30) | BIT(31);
+ /* SDE also sets bits for lossy formats, but we don't support them yet */
+ } else {
+ DRM_WARN_ONCE("Unsupported UBWC version %x\n", ctx->ubwc->ubwc_enc_version);
+ ctrl_val = 0;
}
+
+ DPU_REG_WRITE(c, ubwc_ctrl_off, ctrl_val);
}
opmode |= MDSS_MDP_OP_PE_OVERRIDE;
@@ -325,7 +343,7 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
DPU_REG_WRITE(c, op_mode_off, opmode);
/* clear previous UBWC error */
- DPU_REG_WRITE(c, SSPP_UBWC_ERROR_STATUS, BIT(31));
+ DPU_REG_WRITE(c, ubwc_error_off, BIT(31));
}
static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_sspp *ctx,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
index 96dc10589bee..1ebd75d4f9be 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
@@ -22,13 +22,6 @@
#define TRAFFIC_SHAPER_WR_CLIENT(num) (0x060 + (num * 4))
#define TRAFFIC_SHAPER_FIXPOINT_FACTOR 4
-#define MDP_TICK_COUNT 16
-#define XO_CLK_RATE 19200
-#define MS_TICKS_IN_SEC 1000
-
-#define CALCULATE_WD_LOAD_VALUE(fps) \
- ((uint32_t)((MS_TICKS_IN_SEC * XO_CLK_RATE)/(MDP_TICK_COUNT * fps)))
-
static void dpu_hw_setup_split_pipe(struct dpu_hw_mdp *mdp,
struct split_pipe_cfg *cfg)
{
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
index 67b08e99335d..6fe65bc3bff4 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
@@ -21,6 +21,13 @@
#define TO_S15D16(_x_)((_x_) << 7)
+#define MDP_TICK_COUNT 16
+#define XO_CLK_RATE 19200
+#define MS_TICKS_IN_SEC 1000
+
+#define CALCULATE_WD_LOAD_VALUE(fps) \
+ ((uint32_t)((MS_TICKS_IN_SEC * XO_CLK_RATE)/(MDP_TICK_COUNT * fps)))
+
extern const struct dpu_csc_cfg dpu_csc_YUV2RGB_601L;
extern const struct dpu_csc_cfg dpu_csc10_YUV2RGB_601L;
extern const struct dpu_csc_cfg dpu_csc10_rgb2yuv_601l;
diff --git a/drivers/gpu/drm/msm/disp/mdp_format.c b/drivers/gpu/drm/msm/disp/mdp_format.c
index 426782d50cb4..eebedb1a2636 100644
--- a/drivers/gpu/drm/msm/disp/mdp_format.c
+++ b/drivers/gpu/drm/msm/disp/mdp_format.c
@@ -479,25 +479,25 @@ static const struct msm_format mdp_formats[] = {
0, BPC8, BPC8, BPC8,
C2_R_Cr, C0_G_Y, C1_B_Cb, C0_G_Y,
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
- MDP_FETCH_LINEAR, 2),
+ MDP_FETCH_LINEAR, 1),
INTERLEAVED_YUV_FMT(UYVY,
0, BPC8, BPC8, BPC8,
C1_B_Cb, C0_G_Y, C2_R_Cr, C0_G_Y,
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
- MDP_FETCH_LINEAR, 2),
+ MDP_FETCH_LINEAR, 1),
INTERLEAVED_YUV_FMT(YUYV,
0, BPC8, BPC8, BPC8,
C0_G_Y, C1_B_Cb, C0_G_Y, C2_R_Cr,
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
- MDP_FETCH_LINEAR, 2),
+ MDP_FETCH_LINEAR, 1),
INTERLEAVED_YUV_FMT(YVYU,
0, BPC8, BPC8, BPC8,
C0_G_Y, C2_R_Cr, C0_G_Y, C1_B_Cb,
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
- MDP_FETCH_LINEAR, 2),
+ MDP_FETCH_LINEAR, 1),
/* 3 plane YUV */
PLANAR_YUV_FMT(YUV420,
diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index cbcc7c2f0ffc..94411870a5e0 100644
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -2395,20 +2395,32 @@ static void msm_dp_ctrl_config_msa(struct msm_dp_ctrl_private *ctrl,
bool is_ycbcr_420)
{
u32 pixel_m, pixel_n;
- u32 mvid, nvid, pixel_div = 0, dispcc_input_rate;
+ u32 mvid, nvid, pixel_div, dispcc_input_rate;
u32 const nvid_fixed = DP_LINK_CONSTANT_N_VALUE;
u32 const link_rate_hbr2 = 540000;
u32 const link_rate_hbr3 = 810000;
unsigned long den, num;
- if (rate == link_rate_hbr3)
+ switch (rate) {
+ case link_rate_hbr3:
pixel_div = 6;
- else if (rate == 162000 || rate == 270000)
- pixel_div = 2;
- else if (rate == link_rate_hbr2)
+ break;
+ case link_rate_hbr2:
pixel_div = 4;
- else
+ break;
+ case 162000:
+ case 270000:
+ pixel_div = 2;
+ break;
+ default:
+ /*
+ * This cannot be reached but the compiler is not able to know
+ * that statically so return early to avoid a possibly invalid
+ * division.
+ */
DRM_ERROR("Invalid pixel mux divider\n");
+ return;
+ }
dispcc_input_rate = (rate * 10) / pixel_div;
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 9bd9cd5c1e03..a082f4d3ebe2 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -141,8 +141,8 @@ static const struct msm_dp_desc msm_dp_desc_glymur[] = {
static const struct msm_dp_desc msm_dp_desc_sa8775p[] = {
{ .io_start = 0x0af54000, .id = MSM_DP_CONTROLLER_0, .wide_bus_supported = true },
{ .io_start = 0x0af5c000, .id = MSM_DP_CONTROLLER_1, .wide_bus_supported = true },
- { .io_start = 0x22154000, .id = MSM_DP_CONTROLLER_2, .wide_bus_supported = true },
- { .io_start = 0x2215c000, .id = MSM_DP_CONTROLLER_3, .wide_bus_supported = true },
+ { .io_start = 0x22154000, .id = MSM_DP_CONTROLLER_0, .wide_bus_supported = true },
+ { .io_start = 0x2215c000, .id = MSM_DP_CONTROLLER_1, .wide_bus_supported = true },
{}
};
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
index fdefcbd9c284..a156c7e7cea8 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
@@ -628,12 +628,7 @@ static int dsi_pll_14nm_postdiv_determine_rate(struct clk_hw *hw,
DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, req->rate);
- req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
- NULL,
- postdiv->width,
- postdiv->flags);
-
- return 0;
+ return divider_determine_rate(hw, req, NULL, postdiv->width, postdiv->flags);
}
static int dsi_pll_14nm_postdiv_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c
index bf9a33e925ac..910242f5a71f 100644
--- a/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@ -229,7 +229,7 @@ static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss *msm_mdss)
{
const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data;
u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) |
- MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit);
+ MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13);
if (data->ubwc_bank_spread)
value |= MDSS_UBWC_STATIC_UBWC_BANK_SPREAD;
diff --git a/drivers/gpu/drm/panel/panel-lg-sw43408.c b/drivers/gpu/drm/panel/panel-lg-sw43408.c
index 46a56ea92ad9..6e307fba658f 100644
--- a/drivers/gpu/drm/panel/panel-lg-sw43408.c
+++ b/drivers/gpu/drm/panel/panel-lg-sw43408.c
@@ -294,10 +294,6 @@ static void sw43408_remove(struct mipi_dsi_device *dsi)
struct sw43408_panel *ctx = mipi_dsi_get_drvdata(dsi);
int ret;
- ret = sw43408_unprepare(&ctx->base);
- if (ret < 0)
- dev_err(&dsi->dev, "failed to unprepare panel: %d\n", ret);
-
ret = mipi_dsi_detach(dsi);
if (ret < 0)
dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c
index 1a5e3c1a27fb..9533b1a31820 100644
--- a/drivers/gpu/drm/panthor/panthor_fw.c
+++ b/drivers/gpu/drm/panthor/panthor_fw.c
@@ -1187,7 +1187,6 @@ void panthor_fw_pre_reset(struct panthor_device *ptdev, bool on_hang)
else
ptdev->reset.fast = true;
}
- panthor_fw_stop(ptdev);
panthor_job_irq_suspend(&ptdev->fw->irq);
panthor_fw_stop(ptdev);
@@ -1261,10 +1260,6 @@ void panthor_fw_unplug(struct panthor_device *ptdev)
if (ptdev->fw->irq.irq)
panthor_job_irq_suspend(&ptdev->fw->irq);
- panthor_fw_halt_mcu(ptdev);
- if (!panthor_fw_wait_mcu_halted(ptdev))
- drm_warn(&ptdev->base, "Failed to halt MCU on unplug");
-
panthor_fw_stop(ptdev);
}
diff --git a/drivers/gpu/drm/panthor/panthor_gpu.c b/drivers/gpu/drm/panthor/panthor_gpu.c
index 06b231b2460a..ff5231269518 100644
--- a/drivers/gpu/drm/panthor/panthor_gpu.c
+++ b/drivers/gpu/drm/panthor/panthor_gpu.c
@@ -51,7 +51,7 @@ struct panthor_gpu {
static void panthor_gpu_coherency_set(struct panthor_device *ptdev)
{
gpu_write(ptdev, GPU_COHERENCY_PROTOCOL,
- ptdev->coherent ? GPU_COHERENCY_PROT_BIT(ACE_LITE) : GPU_COHERENCY_NONE);
+ ptdev->coherent ? GPU_COHERENCY_ACE_LITE : GPU_COHERENCY_NONE);
}
static void panthor_gpu_l2_config_set(struct panthor_device *ptdev)
@@ -289,38 +289,42 @@ int panthor_gpu_l2_power_on(struct panthor_device *ptdev)
int panthor_gpu_flush_caches(struct panthor_device *ptdev,
u32 l2, u32 lsc, u32 other)
{
- bool timedout = false;
unsigned long flags;
+ int ret = 0;
/* Serialize cache flush operations. */
guard(mutex)(&ptdev->gpu->cache_flush_lock);
spin_lock_irqsave(&ptdev->gpu->reqs_lock, flags);
- if (!drm_WARN_ON(&ptdev->base,
- ptdev->gpu->pending_reqs & GPU_IRQ_CLEAN_CACHES_COMPLETED)) {
+ if (!(ptdev->gpu->pending_reqs & GPU_IRQ_CLEAN_CACHES_COMPLETED)) {
ptdev->gpu->pending_reqs |= GPU_IRQ_CLEAN_CACHES_COMPLETED;
gpu_write(ptdev, GPU_CMD, GPU_FLUSH_CACHES(l2, lsc, other));
+ } else {
+ ret = -EIO;
}
spin_unlock_irqrestore(&ptdev->gpu->reqs_lock, flags);
+ if (ret)
+ return ret;
+
if (!wait_event_timeout(ptdev->gpu->reqs_acked,
!(ptdev->gpu->pending_reqs & GPU_IRQ_CLEAN_CACHES_COMPLETED),
msecs_to_jiffies(100))) {
spin_lock_irqsave(&ptdev->gpu->reqs_lock, flags);
if ((ptdev->gpu->pending_reqs & GPU_IRQ_CLEAN_CACHES_COMPLETED) != 0 &&
!(gpu_read(ptdev, GPU_INT_RAWSTAT) & GPU_IRQ_CLEAN_CACHES_COMPLETED))
- timedout = true;
+ ret = -ETIMEDOUT;
else
ptdev->gpu->pending_reqs &= ~GPU_IRQ_CLEAN_CACHES_COMPLETED;
spin_unlock_irqrestore(&ptdev->gpu->reqs_lock, flags);
}
- if (timedout) {
+ if (ret) {
+ panthor_device_schedule_reset(ptdev);
drm_err(&ptdev->base, "Flush caches timeout");
- return -ETIMEDOUT;
}
- return 0;
+ return ret;
}
/**
@@ -360,6 +364,7 @@ int panthor_gpu_soft_reset(struct panthor_device *ptdev)
return -ETIMEDOUT;
}
+ ptdev->gpu->pending_reqs = 0;
return 0;
}
diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
index f6339963e496..9194bad4b619 100644
--- a/drivers/gpu/drm/panthor/panthor_mmu.c
+++ b/drivers/gpu/drm/panthor/panthor_mmu.c
@@ -1503,6 +1503,10 @@ static void panthor_vm_destroy(struct panthor_vm *vm)
vm->destroyed = true;
+ /* Tell scheduler to stop all GPU work related to this VM */
+ if (refcount_read(&vm->as.active_cnt) > 0)
+ panthor_sched_prepare_for_vm_destruction(vm->ptdev);
+
mutex_lock(&vm->heaps.lock);
panthor_heap_pool_destroy(vm->heaps.pool);
vm->heaps.pool = NULL;
diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
index a6b8024e1a3c..bd397d773d72 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.c
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
@@ -1072,18 +1072,6 @@ group_is_idle(struct panthor_group *group)
return hweight32(inactive_queues) == group->queue_count;
}
-static void
-queue_reset_timeout_locked(struct panthor_queue *queue)
-{
- lockdep_assert_held(&queue->fence_ctx.lock);
-
- if (queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT) {
- mod_delayed_work(queue->scheduler.timeout_wq,
- &queue->timeout.work,
- msecs_to_jiffies(JOB_TIMEOUT_MS));
- }
-}
-
static bool
group_can_run(struct panthor_group *group)
{
@@ -1100,6 +1088,18 @@ queue_timeout_is_suspended(struct panthor_queue *queue)
return queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT;
}
+static void
+queue_reset_timeout_locked(struct panthor_queue *queue)
+{
+ lockdep_assert_held(&queue->fence_ctx.lock);
+
+ if (!queue_timeout_is_suspended(queue)) {
+ mod_delayed_work(queue->scheduler.timeout_wq,
+ &queue->timeout.work,
+ msecs_to_jiffies(JOB_TIMEOUT_MS));
+ }
+}
+
static void
queue_suspend_timeout_locked(struct panthor_queue *queue)
{
@@ -2020,10 +2020,10 @@ struct panthor_sched_tick_ctx {
struct list_head groups[PANTHOR_CSG_PRIORITY_COUNT];
u32 idle_group_count;
u32 group_count;
- enum panthor_csg_priority min_priority;
struct panthor_vm *vms[MAX_CS_PER_CSG];
u32 as_count;
bool immediate_tick;
+ bool stop_tick;
u32 csg_upd_failed_mask;
};
@@ -2066,17 +2066,21 @@ tick_ctx_pick_groups_from_list(const struct panthor_scheduler *sched,
if (!owned_by_tick_ctx)
group_get(group);
- list_move_tail(&group->run_node, &ctx->groups[group->priority]);
ctx->group_count++;
+
+ /* If we have more than one active group with the same priority,
+ * we need to keep ticking to rotate the CSG priority.
+ */
if (group_is_idle(group))
ctx->idle_group_count++;
+ else if (!list_empty(&ctx->groups[group->priority]))
+ ctx->stop_tick = false;
+
+ list_move_tail(&group->run_node, &ctx->groups[group->priority]);
if (i == ctx->as_count)
ctx->vms[ctx->as_count++] = group->vm;
- if (ctx->min_priority > group->priority)
- ctx->min_priority = group->priority;
-
if (tick_ctx_is_full(sched, ctx))
return;
}
@@ -2085,31 +2089,22 @@ tick_ctx_pick_groups_from_list(const struct panthor_scheduler *sched,
static void
tick_ctx_insert_old_group(struct panthor_scheduler *sched,
struct panthor_sched_tick_ctx *ctx,
- struct panthor_group *group,
- bool full_tick)
+ struct panthor_group *group)
{
struct panthor_csg_slot *csg_slot = &sched->csg_slots[group->csg_id];
struct panthor_group *other_group;
- if (!full_tick) {
- list_add_tail(&group->run_node, &ctx->old_groups[group->priority]);
- return;
- }
-
- /* Rotate to make sure groups with lower CSG slot
- * priorities have a chance to get a higher CSG slot
- * priority next time they get picked. This priority
- * has an impact on resource request ordering, so it's
- * important to make sure we don't let one group starve
- * all other groups with the same group priority.
- */
+ /* Class groups in descending priority order so we can easily rotate. */
list_for_each_entry(other_group,
&ctx->old_groups[csg_slot->group->priority],
run_node) {
struct panthor_csg_slot *other_csg_slot = &sched->csg_slots[other_group->csg_id];
- if (other_csg_slot->priority > csg_slot->priority) {
- list_add_tail(&csg_slot->group->run_node, &other_group->run_node);
+ /* Our group has a higher prio than the one we're testing against,
+ * place it just before.
+ */
+ if (csg_slot->priority > other_csg_slot->priority) {
+ list_add_tail(&group->run_node, &other_group->run_node);
return;
}
}
@@ -2119,8 +2114,7 @@ tick_ctx_insert_old_group(struct panthor_scheduler *sched,
static void
tick_ctx_init(struct panthor_scheduler *sched,
- struct panthor_sched_tick_ctx *ctx,
- bool full_tick)
+ struct panthor_sched_tick_ctx *ctx)
{
struct panthor_device *ptdev = sched->ptdev;
struct panthor_csg_slots_upd_ctx upd_ctx;
@@ -2130,7 +2124,7 @@ tick_ctx_init(struct panthor_scheduler *sched,
memset(ctx, 0, sizeof(*ctx));
csgs_upd_ctx_init(&upd_ctx);
- ctx->min_priority = PANTHOR_CSG_PRIORITY_COUNT;
+ ctx->stop_tick = true;
for (i = 0; i < ARRAY_SIZE(ctx->groups); i++) {
INIT_LIST_HEAD(&ctx->groups[i]);
INIT_LIST_HEAD(&ctx->old_groups[i]);
@@ -2158,7 +2152,7 @@ tick_ctx_init(struct panthor_scheduler *sched,
group->fatal_queues |= GENMASK(group->queue_count - 1, 0);
}
- tick_ctx_insert_old_group(sched, ctx, group, full_tick);
+ tick_ctx_insert_old_group(sched, ctx, group);
csgs_upd_ctx_queue_reqs(ptdev, &upd_ctx, i,
csg_iface->output->ack ^ CSG_STATUS_UPDATE,
CSG_STATUS_UPDATE);
@@ -2442,32 +2436,18 @@ static u64
tick_ctx_update_resched_target(struct panthor_scheduler *sched,
const struct panthor_sched_tick_ctx *ctx)
{
- /* We had space left, no need to reschedule until some external event happens. */
- if (!tick_ctx_is_full(sched, ctx))
- goto no_tick;
-
- /* If idle groups were scheduled, no need to wake up until some external
- * event happens (group unblocked, new job submitted, ...).
- */
- if (ctx->idle_group_count)
- goto no_tick;
+ u64 resched_target;
- if (drm_WARN_ON(&sched->ptdev->base, ctx->min_priority >= PANTHOR_CSG_PRIORITY_COUNT))
+ if (ctx->stop_tick)
goto no_tick;
- /* If there are groups of the same priority waiting, we need to
- * keep the scheduler ticking, otherwise, we'll just wait for
- * new groups with higher priority to be queued.
- */
- if (!list_empty(&sched->groups.runnable[ctx->min_priority])) {
- u64 resched_target = sched->last_tick + sched->tick_period;
+ resched_target = sched->last_tick + sched->tick_period;
- if (time_before64(sched->resched_target, sched->last_tick) ||
- time_before64(resched_target, sched->resched_target))
- sched->resched_target = resched_target;
+ if (time_before64(sched->resched_target, sched->last_tick) ||
+ time_before64(resched_target, sched->resched_target))
+ sched->resched_target = resched_target;
- return sched->resched_target - sched->last_tick;
- }
+ return sched->resched_target - sched->last_tick;
no_tick:
sched->resched_target = U64_MAX;
@@ -2480,9 +2460,11 @@ static void tick_work(struct work_struct *work)
tick_work.work);
struct panthor_device *ptdev = sched->ptdev;
struct panthor_sched_tick_ctx ctx;
+ u64 resched_target = sched->resched_target;
u64 remaining_jiffies = 0, resched_delay;
u64 now = get_jiffies_64();
int prio, ret, cookie;
+ bool full_tick;
if (!drm_dev_enter(&ptdev->base, &cookie))
return;
@@ -2491,18 +2473,24 @@ static void tick_work(struct work_struct *work)
if (drm_WARN_ON(&ptdev->base, ret))
goto out_dev_exit;
- if (time_before64(now, sched->resched_target))
- remaining_jiffies = sched->resched_target - now;
+ /* If the tick is stopped, calculate when the next tick would be */
+ if (resched_target == U64_MAX)
+ resched_target = sched->last_tick + sched->tick_period;
+
+ if (time_before64(now, resched_target))
+ remaining_jiffies = resched_target - now;
+
+ full_tick = remaining_jiffies == 0;
mutex_lock(&sched->lock);
if (panthor_device_reset_is_pending(sched->ptdev))
goto out_unlock;
- tick_ctx_init(sched, &ctx, remaining_jiffies != 0);
+ tick_ctx_init(sched, &ctx);
if (ctx.csg_upd_failed_mask)
goto out_cleanup_ctx;
- if (remaining_jiffies) {
+ if (!full_tick) {
/* Scheduling forced in the middle of a tick. Only RT groups
* can preempt non-RT ones. Currently running RT groups can't be
* preempted.
@@ -2524,9 +2512,29 @@ static void tick_work(struct work_struct *work)
for (prio = PANTHOR_CSG_PRIORITY_COUNT - 1;
prio >= 0 && !tick_ctx_is_full(sched, &ctx);
prio--) {
+ struct panthor_group *old_highest_prio_group =
+ list_first_entry_or_null(&ctx.old_groups[prio],
+ struct panthor_group, run_node);
+
+ /* Pull out the group with the highest prio for rotation. */
+ if (old_highest_prio_group)
+ list_del(&old_highest_prio_group->run_node);
+
+ /* Re-insert old active groups so they get a chance to run with higher prio. */
+ tick_ctx_pick_groups_from_list(sched, &ctx, &ctx.old_groups[prio], true, true);
+
+ /* Fill the remaining slots with runnable groups. */
tick_ctx_pick_groups_from_list(sched, &ctx, &sched->groups.runnable[prio],
true, false);
- tick_ctx_pick_groups_from_list(sched, &ctx, &ctx.old_groups[prio], true, true);
+
+ /* Re-insert the old group with the highest prio, and give it a chance to be
+ * scheduled again (but with a lower prio) if there's room left.
+ */
+ if (old_highest_prio_group) {
+ list_add_tail(&old_highest_prio_group->run_node, &ctx.old_groups[prio]);
+ tick_ctx_pick_groups_from_list(sched, &ctx, &ctx.old_groups[prio],
+ true, true);
+ }
}
/* If we have free CSG slots left, pick idle groups */
@@ -2651,14 +2659,33 @@ static void sync_upd_work(struct work_struct *work)
sched_queue_delayed_work(sched, tick, 0);
}
+static void sched_resume_tick(struct panthor_device *ptdev)
+{
+ struct panthor_scheduler *sched = ptdev->scheduler;
+ u64 delay_jiffies, now;
+
+ drm_WARN_ON(&ptdev->base, sched->resched_target != U64_MAX);
+
+ /* Scheduler tick was off, recalculate the resched_target based on the
+ * last tick event, and queue the scheduler work.
+ */
+ now = get_jiffies_64();
+ sched->resched_target = sched->last_tick + sched->tick_period;
+ if (sched->used_csg_slot_count == sched->csg_slot_count &&
+ time_before64(now, sched->resched_target))
+ delay_jiffies = min_t(unsigned long, sched->resched_target - now, ULONG_MAX);
+ else
+ delay_jiffies = 0;
+
+ sched_queue_delayed_work(sched, tick, delay_jiffies);
+}
+
static void group_schedule_locked(struct panthor_group *group, u32 queue_mask)
{
struct panthor_device *ptdev = group->ptdev;
struct panthor_scheduler *sched = ptdev->scheduler;
struct list_head *queue = &sched->groups.runnable[group->priority];
- u64 delay_jiffies = 0;
bool was_idle;
- u64 now;
if (!group_can_run(group))
return;
@@ -2703,13 +2730,7 @@ static void group_schedule_locked(struct panthor_group *group, u32 queue_mask)
/* Scheduler tick was off, recalculate the resched_target based on the
* last tick event, and queue the scheduler work.
*/
- now = get_jiffies_64();
- sched->resched_target = sched->last_tick + sched->tick_period;
- if (sched->used_csg_slot_count == sched->csg_slot_count &&
- time_before64(now, sched->resched_target))
- delay_jiffies = min_t(unsigned long, sched->resched_target - now, ULONG_MAX);
-
- sched_queue_delayed_work(sched, tick, delay_jiffies);
+ sched_resume_tick(ptdev);
}
static void queue_stop(struct panthor_queue *queue,
@@ -2784,6 +2805,20 @@ void panthor_sched_report_mmu_fault(struct panthor_device *ptdev)
panthor_sched_immediate_tick(ptdev);
}
+void panthor_sched_prepare_for_vm_destruction(struct panthor_device *ptdev)
+{
+ /* FW can write out internal state, like the heap context, during CSG
+ * suspend. It is therefore important that the scheduler has fully
+ * evicted any pending and related groups before VM destruction can
+ * safely continue. Failure to do so can lead to GPU page faults.
+ * A controlled termination of a Panthor instance involves destroying
+ * the group(s) before the VM. This means any relevant group eviction
+ * has already been initiated by this point, and we just need to
+ * ensure that any pending tick_work() has been completed.
+ */
+ flush_work(&ptdev->scheduler->tick_work.work);
+}
+
void panthor_sched_resume(struct panthor_device *ptdev)
{
/* Force a tick to re-evaluate after a resume. */
@@ -3343,6 +3378,18 @@ queue_run_job(struct drm_sched_job *sched_job)
if (group->csg_id < 0) {
group_schedule_locked(group, BIT(job->queue_idx));
} else {
+ u32 queue_mask = BIT(job->queue_idx);
+ bool resume_tick = group_is_idle(group) &&
+ (group->idle_queues & queue_mask) &&
+ !(group->blocked_queues & queue_mask) &&
+ sched->resched_target == U64_MAX;
+
+ /* We just added something to the queue, so it's no longer idle. */
+ group->idle_queues &= ~queue_mask;
+
+ if (resume_tick)
+ sched_resume_tick(ptdev);
+
gpu_write(ptdev, CSF_DOORBELL(queue->doorbell_id), 1);
if (!sched->pm.has_ref &&
!(group->blocked_queues & BIT(job->queue_idx))) {
diff --git a/drivers/gpu/drm/panthor/panthor_sched.h b/drivers/gpu/drm/panthor/panthor_sched.h
index f4a475aa34c0..9a8692de8ade 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.h
+++ b/drivers/gpu/drm/panthor/panthor_sched.h
@@ -50,6 +50,7 @@ void panthor_sched_suspend(struct panthor_device *ptdev);
void panthor_sched_resume(struct panthor_device *ptdev);
void panthor_sched_report_mmu_fault(struct panthor_device *ptdev);
+void panthor_sched_prepare_for_vm_destruction(struct panthor_device *ptdev);
void panthor_sched_report_fw_events(struct panthor_device *ptdev, u32 events);
void panthor_fdinfo_gather_group_samples(struct panthor_file *pfile);
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
index 8604342f9943..c7158b1b8c59 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
@@ -280,12 +280,7 @@ static irqreturn_t dw_hdmi_qp_rk3576_hardirq(int irq, void *dev_id)
static irqreturn_t dw_hdmi_qp_rk3576_irq(int irq, void *dev_id)
{
struct rockchip_hdmi_qp *hdmi = dev_id;
- u32 intr_stat, val;
-
- regmap_read(hdmi->regmap, RK3576_IOC_HDMI_HPD_STATUS, &intr_stat);
-
- if (!intr_stat)
- return IRQ_NONE;
+ u32 val;
val = FIELD_PREP_WM16(RK3576_HDMI_HPD_INT_CLR, 1);
regmap_write(hdmi->regmap, RK3576_IOC_MISC_CON0, val);
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 3cf3f26e0d8e..cd85de4ffd03 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -5,6 +5,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_blend.h>
+#include <drm/drm_colorop.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_fixed.h>
#include <drm/drm_gem_framebuffer_helper.h>
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index dd1402f43773..434c295f44ba 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -17,6 +17,7 @@
#include <drm/drm_gem.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_colorop.h>
#include <drm/drm_drv.h>
#include <drm/drm_fbdev_shmem.h>
#include <drm/drm_file.h>
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 71acd45aa33b..579e98dec749 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -1942,7 +1942,7 @@ static vm_fault_t xe_bo_cpu_fault(struct vm_fault *vmf)
int err = 0;
int idx;
- if (!drm_dev_enter(&xe->drm, &idx))
+ if (xe_device_wedged(xe) || !drm_dev_enter(&xe->drm, &idx))
return ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
ret = xe_bo_cpu_fault_fastpath(vmf, xe, bo, needs_rpm);
diff --git a/drivers/gpu/drm/xe/xe_configfs.h b/drivers/gpu/drm/xe/xe_configfs.h
index fed57be0b90e..f3683bc7eb90 100644
--- a/drivers/gpu/drm/xe/xe_configfs.h
+++ b/drivers/gpu/drm/xe/xe_configfs.h
@@ -21,9 +21,11 @@ bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev);
bool xe_configfs_media_gt_allowed(struct pci_dev *pdev);
u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev);
bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev);
-u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class,
+u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev,
+ enum xe_engine_class class,
const u32 **cs);
-u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class,
+u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev,
+ enum xe_engine_class class,
const u32 **cs);
#ifdef CONFIG_PCI_IOV
unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev);
@@ -37,9 +39,11 @@ static inline bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev) { return
static inline bool xe_configfs_media_gt_allowed(struct pci_dev *pdev) { return true; }
static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; }
static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; }
-static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class,
+static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev,
+ enum xe_engine_class class,
const u32 **cs) { return 0; }
-static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class,
+static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev,
+ enum xe_engine_class class,
const u32 **cs) { return 0; }
static inline unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev) { return UINT_MAX; }
#endif
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 9a6d49fcd8e4..ef5acef32f41 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -976,6 +976,7 @@ int xe_device_probe(struct xe_device *xe)
err_unregister_display:
xe_display_unregister(xe);
+ drm_dev_unregister(&xe->drm);
return err;
}
diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 951a49fb1d3e..7f09cf0e495f 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -1214,6 +1214,36 @@ int xe_guc_pc_set_power_profile(struct xe_guc_pc *pc, const char *buf)
return ret;
}
+static int pc_action_set_dcc(struct xe_guc_pc *pc, bool enable)
+{
+ int ret;
+
+ ret = pc_action_set_param(pc,
+ SLPC_PARAM_TASK_ENABLE_DCC,
+ enable);
+ if (!ret)
+ return pc_action_set_param(pc,
+ SLPC_PARAM_TASK_DISABLE_DCC,
+ !enable);
+ else
+ return ret;
+}
+
+static int pc_modify_defaults(struct xe_guc_pc *pc)
+{
+ struct xe_device *xe = pc_to_xe(pc);
+ struct xe_gt *gt = pc_to_gt(pc);
+ int ret = 0;
+
+ if (xe->info.platform == XE_PANTHERLAKE) {
+ ret = pc_action_set_dcc(pc, false);
+ if (unlikely(ret))
+ xe_gt_err(gt, "Failed to modify DCC default: %pe\n", ERR_PTR(ret));
+ }
+
+ return ret;
+}
+
/**
* xe_guc_pc_start - Start GuC's Power Conservation component
* @pc: Xe_GuC_PC instance
@@ -1271,6 +1301,10 @@ int xe_guc_pc_start(struct xe_guc_pc *pc)
ktime_ms_delta(ktime_get(), earlier));
}
+ ret = pc_modify_defaults(pc);
+ if (ret)
+ return ret;
+
ret = pc_init_freqs(pc);
if (ret)
goto out;
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
index 350dca1f0925..3d59440ec44d 100644
--- a/drivers/gpu/drm/xe/xe_mmio.c
+++ b/drivers/gpu/drm/xe/xe_mmio.c
@@ -260,11 +260,11 @@ u64 xe_mmio_read64_2x32(struct xe_mmio *mmio, struct xe_reg reg)
struct xe_reg reg_udw = { .addr = reg.addr + 0x4 };
u32 ldw, udw, oldudw, retries;
- reg.addr = xe_mmio_adjusted_addr(mmio, reg.addr);
- reg_udw.addr = xe_mmio_adjusted_addr(mmio, reg_udw.addr);
-
- /* we shouldn't adjust just one register address */
- xe_tile_assert(mmio->tile, reg_udw.addr == reg.addr + 0x4);
+ /*
+ * The two dwords of a 64-bit register can never straddle the offset
+ * adjustment cutoff.
+ */
+ xe_tile_assert(mmio->tile, !in_range(mmio->adj_limit, reg.addr + 1, 7));
oldudw = xe_mmio_read32(mmio, reg_udw);
for (retries = 5; retries; --retries) {
diff --git a/drivers/gpu/drm/xe/xe_module.h b/drivers/gpu/drm/xe/xe_module.h
index 5a3bfea8b7b4..b66849539270 100644
--- a/drivers/gpu/drm/xe/xe_module.h
+++ b/drivers/gpu/drm/xe/xe_module.h
@@ -12,7 +12,7 @@
struct xe_modparam {
bool force_execlist;
bool probe_display;
- u32 force_vram_bar_size;
+ int force_vram_bar_size;
int guc_log_level;
char *guc_firmware_path;
char *huc_firmware_path;
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 2aa883f5ef79..38ea9d7dad09 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -533,6 +533,12 @@ static int read_gmdid(struct xe_device *xe, enum xe_gmdid_type type, u32 *ver, u
struct xe_gt *gt __free(kfree) = NULL;
int err;
+ /* Don't try to read media ver if media GT is not allowed */
+ if (type == GMDID_MEDIA && !xe_configfs_media_gt_allowed(to_pci_dev(xe->drm.dev))) {
+ *ver = *revid = 0;
+ return 0;
+ }
+
gt = kzalloc(sizeof(*gt), GFP_KERNEL);
if (!gt)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
index c0b767ac735c..d1c1f6c29566 100644
--- a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
@@ -349,18 +349,33 @@ static const struct attribute_group *xe_sriov_vf_attr_groups[] = {
/* no user serviceable parts below */
-static struct kobject *create_xe_sriov_kobj(struct xe_device *xe, unsigned int vfid)
+static void action_put_kobject(void *arg)
+{
+ struct kobject *kobj = arg;
+
+ kobject_put(kobj);
+}
+
+static struct kobject *create_xe_sriov_kobj(struct xe_device *xe, unsigned int vfid,
+ const struct kobj_type *ktype)
{
struct xe_sriov_kobj *vkobj;
+ int err;
xe_sriov_pf_assert_vfid(xe, vfid);
vkobj = kzalloc(sizeof(*vkobj), GFP_KERNEL);
if (!vkobj)
- return NULL;
+ return ERR_PTR(-ENOMEM);
vkobj->xe = xe;
vkobj->vfid = vfid;
+ kobject_init(&vkobj->base, ktype);
+
+ err = devm_add_action_or_reset(xe->drm.dev, action_put_kobject, &vkobj->base);
+ if (err)
+ return ERR_PTR(err);
+
return &vkobj->base;
}
@@ -471,28 +486,17 @@ static void pf_sysfs_note(struct xe_device *xe, int err, const char *what)
xe_sriov_dbg(xe, "Failed to setup sysfs %s (%pe)\n", what, ERR_PTR(err));
}
-static void action_put_kobject(void *arg)
-{
- struct kobject *kobj = arg;
-
- kobject_put(kobj);
-}
-
static int pf_setup_root(struct xe_device *xe)
{
struct kobject *parent = &xe->drm.dev->kobj;
struct kobject *root;
int err;
- root = create_xe_sriov_kobj(xe, PFID);
- if (!root)
- return pf_sysfs_error(xe, -ENOMEM, "root obj");
-
- err = devm_add_action_or_reset(xe->drm.dev, action_put_kobject, root);
- if (err)
- return pf_sysfs_error(xe, err, "root action");
+ root = create_xe_sriov_kobj(xe, PFID, &xe_sriov_dev_ktype);
+ if (IS_ERR(root))
+ return pf_sysfs_error(xe, PTR_ERR(root), "root obj");
- err = kobject_init_and_add(root, &xe_sriov_dev_ktype, parent, "sriov_admin");
+ err = kobject_add(root, parent, "sriov_admin");
if (err)
return pf_sysfs_error(xe, err, "root init");
@@ -513,20 +517,14 @@ static int pf_setup_tree(struct xe_device *xe)
root = xe->sriov.pf.sysfs.root;
for (n = 0; n <= totalvfs; n++) {
- kobj = create_xe_sriov_kobj(xe, VFID(n));
- if (!kobj)
- return pf_sysfs_error(xe, -ENOMEM, "tree obj");
-
- err = devm_add_action_or_reset(xe->drm.dev, action_put_kobject, root);
- if (err)
- return pf_sysfs_error(xe, err, "tree action");
+ kobj = create_xe_sriov_kobj(xe, VFID(n), &xe_sriov_vf_ktype);
+ if (IS_ERR(kobj))
+ return pf_sysfs_error(xe, PTR_ERR(kobj), "tree obj");
if (n)
- err = kobject_init_and_add(kobj, &xe_sriov_vf_ktype,
- root, "vf%u", n);
+ err = kobject_add(kobj, root, "vf%u", n);
else
- err = kobject_init_and_add(kobj, &xe_sriov_vf_ktype,
- root, "pf");
+ err = kobject_add(kobj, root, "pf");
if (err)
return pf_sysfs_error(xe, err, "tree init");
diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
index e32dd2fde6f1..c7eab0c4af7a 100644
--- a/drivers/gpu/drm/xe/xe_wa.c
+++ b/drivers/gpu/drm/xe/xe_wa.c
@@ -567,16 +567,6 @@ static const struct xe_rtp_entry_sr engine_was[] = {
FUNC(xe_rtp_match_first_render_or_compute)),
XE_RTP_ACTIONS(SET(ROW_CHICKEN, EARLY_EOT_DIS))
},
- { XE_RTP_NAME("14019988906"),
- XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
- FUNC(xe_rtp_match_first_render_or_compute)),
- XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FLSH_IGNORES_PSD))
- },
- { XE_RTP_NAME("14019877138"),
- XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
- FUNC(xe_rtp_match_first_render_or_compute)),
- XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FD_END_COLLECT))
- },
{ XE_RTP_NAME("14020338487"),
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
FUNC(xe_rtp_match_first_render_or_compute)),
@@ -873,6 +863,14 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
XE_RTP_RULES(GRAPHICS_VERSION(2001), ENGINE_CLASS(RENDER)),
XE_RTP_ACTIONS(SET(WM_CHICKEN3, HIZ_PLANE_COMPRESSION_DIS))
},
+ { XE_RTP_NAME("14019988906"),
+ XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002), ENGINE_CLASS(RENDER)),
+ XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FLSH_IGNORES_PSD))
+ },
+ { XE_RTP_NAME("14019877138"),
+ XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002), ENGINE_CLASS(RENDER)),
+ XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FD_END_COLLECT))
+ },
{ XE_RTP_NAME("14021490052"),
XE_RTP_RULES(GRAPHICS_VERSION(2001), ENGINE_CLASS(RENDER)),
XE_RTP_ACTIONS(SET(FF_MODE,
diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs
index 82c661aef594..3ab33ea36d9c 100644
--- a/drivers/gpu/nova-core/falcon.rs
+++ b/drivers/gpu/nova-core/falcon.rs
@@ -8,7 +8,10 @@
use kernel::{
device,
- dma::DmaAddress,
+ dma::{
+ DmaAddress,
+ DmaMask, //
+ },
io::poll::read_poll_timeout,
prelude::*,
sync::aref::ARef,
@@ -472,6 +475,12 @@ fn dma_wr<F: FalconFirmware<Target = E>>(
return Err(EINVAL);
}
+ // The DMATRFBASE/1 register pair only supports a 49-bit address.
+ if dma_start > DmaMask::new::<49>().value() {
+ dev_err!(self.dev, "DMA address {:#x} exceeds 49 bits\n", dma_start);
+ return Err(ERANGE);
+ }
+
// DMA transfers can only be done in units of 256 bytes. Compute how many such transfers we
// need to perform.
let num_transfers = load_offsets.len.div_ceil(DMA_LEN);
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index e4dfcf26b04e..2ec6d4445e84 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -774,7 +774,9 @@ ps_gamepad_create(struct hid_device *hdev,
#if IS_ENABLED(CONFIG_PLAYSTATION_FF)
if (play_effect) {
input_set_capability(gamepad, EV_FF, FF_RUMBLE);
- input_ff_create_memless(gamepad, NULL, play_effect);
+ ret = input_ff_create_memless(gamepad, NULL, play_effect);
+ if (ret)
+ return ERR_PTR(ret);
}
#endif
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c
index c3915f3a060e..b890fbf97a75 100644
--- a/drivers/hid/intel-ish-hid/ishtp/bus.c
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.c
@@ -730,7 +730,7 @@ void ishtp_bus_remove_all_clients(struct ishtp_device *ishtp_dev,
spin_lock_irqsave(&ishtp_dev->cl_list_lock, flags);
list_for_each_entry(cl, &ishtp_dev->cl_list, link) {
cl->state = ISHTP_CL_DISCONNECTED;
- if (warm_reset && cl->device->reference_count)
+ if (warm_reset && cl->device && cl->device->reference_count)
continue;
/*
diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
index 7e220a4c5ded..d8e195189e4b 100644
--- a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
+++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
@@ -1597,6 +1597,7 @@ int thc_i2c_set_rx_max_size(struct thc_device *dev, u32 max_rx_size)
if (ret)
return ret;
+ val = val & ~THC_M_PRT_SPI_ICRRD_OPCODE_I2C_MAX_SIZE;
val |= FIELD_PREP(THC_M_PRT_SPI_ICRRD_OPCODE_I2C_MAX_SIZE, max_rx_size);
ret = regmap_write(dev->thc_regmap, THC_M_PRT_SPI_ICRRD_OPCODE_OFFSET, val);
@@ -1667,6 +1668,7 @@ int thc_i2c_set_rx_int_delay(struct thc_device *dev, u32 delay_us)
return ret;
/* THC hardware counts at 10us unit */
+ val = val & ~THC_M_PRT_SPI_ICRRD_OPCODE_I2C_INTERVAL;
val |= FIELD_PREP(THC_M_PRT_SPI_ICRRD_OPCODE_I2C_INTERVAL, DIV_ROUND_UP(delay_us, 10));
ret = regmap_write(dev->thc_regmap, THC_M_PRT_SPI_ICRRD_OPCODE_OFFSET, val);
diff --git a/drivers/hv/mshv_eventfd.c b/drivers/hv/mshv_eventfd.c
index 0b75ff1edb73..6d176ed8ae51 100644
--- a/drivers/hv/mshv_eventfd.c
+++ b/drivers/hv/mshv_eventfd.c
@@ -87,8 +87,9 @@ static void mshv_irqfd_resampler_ack(struct mshv_irq_ack_notifier *mian)
idx = srcu_read_lock(&partition->pt_irq_srcu);
- hlist_for_each_entry_rcu(irqfd, &resampler->rsmplr_irqfd_list,
- irqfd_resampler_hnode) {
+ hlist_for_each_entry_srcu(irqfd, &resampler->rsmplr_irqfd_list,
+ irqfd_resampler_hnode,
+ srcu_read_lock_held(&partition->pt_irq_srcu)) {
if (hv_should_clear_interrupt(irqfd->irqfd_lapic_irq.lapic_control.interrupt_type))
hv_call_clear_virtual_interrupt(partition->pt_id);
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a53af6fe81a6..1d5cba142828 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -25,6 +25,7 @@
#include <linux/cpu.h>
#include <linux/sched/isolation.h>
#include <linux/sched/task_stack.h>
+#include <linux/smpboot.h>
#include <linux/delay.h>
#include <linux/panic_notifier.h>
@@ -1350,7 +1351,7 @@ static void vmbus_message_sched(struct hv_per_cpu_context *hv_cpu, void *message
}
}
-void vmbus_isr(void)
+static void __vmbus_isr(void)
{
struct hv_per_cpu_context *hv_cpu
= this_cpu_ptr(hv_context.cpu_context);
@@ -1363,6 +1364,53 @@ void vmbus_isr(void)
add_interrupt_randomness(vmbus_interrupt);
}
+
+static DEFINE_PER_CPU(bool, vmbus_irq_pending);
+static DEFINE_PER_CPU(struct task_struct *, vmbus_irqd);
+
+static void vmbus_irqd_wake(void)
+{
+ struct task_struct *tsk = __this_cpu_read(vmbus_irqd);
+
+ __this_cpu_write(vmbus_irq_pending, true);
+ wake_up_process(tsk);
+}
+
+static void vmbus_irqd_setup(unsigned int cpu)
+{
+ sched_set_fifo(current);
+}
+
+static int vmbus_irqd_should_run(unsigned int cpu)
+{
+ return __this_cpu_read(vmbus_irq_pending);
+}
+
+static void run_vmbus_irqd(unsigned int cpu)
+{
+ __this_cpu_write(vmbus_irq_pending, false);
+ __vmbus_isr();
+}
+
+static bool vmbus_irq_initialized;
+
+static struct smp_hotplug_thread vmbus_irq_threads = {
+ .store = &vmbus_irqd,
+ .setup = vmbus_irqd_setup,
+ .thread_should_run = vmbus_irqd_should_run,
+ .thread_fn = run_vmbus_irqd,
+ .thread_comm = "vmbus_irq/%u",
+};
+
+void vmbus_isr(void)
+{
+ if (IS_ENABLED(CONFIG_PREEMPT_RT)) {
+ vmbus_irqd_wake();
+ } else {
+ lockdep_hardirq_threaded();
+ __vmbus_isr();
+ }
+}
EXPORT_SYMBOL_FOR_MODULES(vmbus_isr, "mshv_vtl");
static irqreturn_t vmbus_percpu_isr(int irq, void *dev_id)
@@ -1462,6 +1510,13 @@ static int vmbus_bus_init(void)
* the VMbus interrupt handler.
*/
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && !vmbus_irq_initialized) {
+ ret = smpboot_register_percpu_thread(&vmbus_irq_threads);
+ if (ret)
+ goto err_kthread;
+ vmbus_irq_initialized = true;
+ }
+
if (vmbus_irq == -1) {
hv_setup_vmbus_handler(vmbus_isr);
} else {
@@ -1507,6 +1562,11 @@ static int vmbus_bus_init(void)
free_percpu(vmbus_evt);
}
err_setup:
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && vmbus_irq_initialized) {
+ smpboot_unregister_percpu_thread(&vmbus_irq_threads);
+ vmbus_irq_initialized = false;
+ }
+err_kthread:
bus_unregister(&hv_bus);
return ret;
}
@@ -2976,6 +3036,10 @@ static void __exit vmbus_exit(void)
free_percpu_irq(vmbus_irq, vmbus_evt);
free_percpu(vmbus_evt);
}
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && vmbus_irq_initialized) {
+ smpboot_unregister_percpu_thread(&vmbus_irq_threads);
+ vmbus_irq_initialized = false;
+ }
for_each_online_cpu(cpu) {
struct hv_per_cpu_context *hv_cpu
= per_cpu_ptr(hv_context.cpu_context, cpu);
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index 129f3a9e8fe9..228c5f6c6f38 100644
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -277,9 +277,6 @@ static ssize_t ibmpex_high_low_store(struct device *dev,
{
struct ibmpex_bmc_data *data = dev_get_drvdata(dev);
- if (!data)
- return -ENODEV;
-
ibmpex_reset_high_low_data(data);
return count;
@@ -511,9 +508,6 @@ static void ibmpex_bmc_delete(struct ibmpex_bmc_data *data)
{
int i, j;
- hwmon_device_unregister(data->hwmon_dev);
- dev_set_drvdata(data->bmc_device, NULL);
-
device_remove_file(data->bmc_device,
&sensor_dev_attr_reset_high_low.dev_attr);
device_remove_file(data->bmc_device, &dev_attr_name.attr);
@@ -527,7 +521,8 @@ static void ibmpex_bmc_delete(struct ibmpex_bmc_data *data)
}
list_del(&data->list);
-
+ dev_set_drvdata(data->bmc_device, NULL);
+ hwmon_device_unregister(data->hwmon_dev);
ipmi_destroy_user(data->user);
kfree(data->sensors);
kfree(data);
diff --git a/drivers/hwmon/pmbus/mpq8785.c b/drivers/hwmon/pmbus/mpq8785.c
index 1f56aaf4dde8..87bd039c77b9 100644
--- a/drivers/hwmon/pmbus/mpq8785.c
+++ b/drivers/hwmon/pmbus/mpq8785.c
@@ -47,6 +47,33 @@ static int mpq8785_identify(struct i2c_client *client,
return 0;
};
+static int mpq8785_read_byte_data(struct i2c_client *client, int page, int reg)
+{
+ int ret;
+
+ switch (reg) {
+ case PMBUS_VOUT_MODE:
+ ret = pmbus_read_byte_data(client, page, reg);
+ if (ret < 0)
+ return ret;
+
+ if ((ret >> 5) == 1) {
+ /*
+ * The MPQ8785 chip reports VOUT_MODE as VID mode, but the driver
+ * treats VID as direct mode. Without this, identification would fail
+ * due to mode mismatch.
+ * This override ensures the reported mode matches the driver
+ * configuration, allowing successful initialization.
+ */
+ return PB_VOUT_MODE_DIRECT;
+ }
+
+ return ret;
+ default:
+ return -ENODATA;
+ }
+}
+
static int mpm82504_read_word_data(struct i2c_client *client, int page,
int phase, int reg)
{
@@ -129,6 +156,7 @@ static int mpq8785_probe(struct i2c_client *client)
break;
case mpq8785:
info->identify = mpq8785_identify;
+ info->read_byte_data = mpq8785_read_byte_data;
break;
default:
return -ENODEV;
diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index 27b47b8623c0..2d8de835bc24 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -88,7 +88,9 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
* make sure the module is enabled and clocked before reading
* the module SYSSTATUS register
*/
- devm_pm_runtime_enable(&pdev->dev);
+ ret = devm_pm_runtime_enable(&pdev->dev);
+ if (ret)
+ return ret;
ret = pm_runtime_resume_and_get(&pdev->dev);
if (ret < 0)
return ret;
diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c
index a5e809589d3e..0c011b704169 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c
@@ -795,16 +795,16 @@ static int __init etm_hp_setup(void)
{
int ret;
- ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING,
- "arm/coresight:starting",
- etm_starting_cpu, etm_dying_cpu);
+ ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING,
+ "arm/coresight:starting",
+ etm_starting_cpu, etm_dying_cpu);
if (ret)
return ret;
- ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN,
- "arm/coresight:online",
- etm_online_cpu, NULL);
+ ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+ "arm/coresight:online",
+ etm_online_cpu, NULL);
/* HP dyn state ID returned in ret on success */
if (ret > 0) {
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index e0d83ee01b77..fc0a946053dd 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -1306,6 +1306,19 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
raw_spin_lock_irqsave(&drvdata->spinlock, flags);
+ /*
+ * Since the sysfs buffer allocation and the hardware enablement is not
+ * in the same critical region, it's possible to race with the perf.
+ */
+ if (coresight_get_mode(csdev) == CS_MODE_PERF) {
+ drvdata->sysfs_buf = NULL;
+ raw_spin_unlock_irqrestore(&drvdata->spinlock, flags);
+
+ /* Free allocated memory out side of the spinlock */
+ tmc_etr_free_sysfs_buf(sysfs_buf);
+ return -EBUSY;
+ }
+
/*
* In sysFS mode we can have multiple writers per sink. Since this
* sink is already enabled no memory is needed and the HW need not be
diff --git a/drivers/hwtracing/stm/Kconfig b/drivers/hwtracing/stm/Kconfig
index eda6b11d40a1..cd7f0b0f3fbe 100644
--- a/drivers/hwtracing/stm/Kconfig
+++ b/drivers/hwtracing/stm/Kconfig
@@ -13,7 +13,7 @@ if STM
config STM_PROTO_BASIC
tristate "Basic STM framing protocol driver"
- default CONFIG_STM
+ default STM
help
This is a simple framing protocol for sending data over STM
devices. This was the protocol that the STM framework used
@@ -28,7 +28,7 @@ config STM_PROTO_BASIC
config STM_PROTO_SYS_T
tristate "MIPI SyS-T STM framing protocol driver"
- default CONFIG_STM
+ default STM
help
This is an implementation of MIPI SyS-T protocol to be used
over the STP transport. In addition to the data payload, it
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 7f606c871648..5408332861a1 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -618,7 +618,8 @@ static int i3c_set_hotjoin(struct i3c_master_controller *master, bool enable)
else
ret = master->ops->disable_hotjoin(master);
- master->hotjoin = enable;
+ if (!ret)
+ master->hotjoin = enable;
i3c_bus_normaluse_unlock(&master->bus);
@@ -2881,7 +2882,6 @@ int i3c_master_register(struct i3c_master_controller *master,
INIT_LIST_HEAD(&master->boardinfo.i3c);
device_initialize(&master->dev);
- dev_set_name(&master->dev, "i3c-%d", i3cbus->id);
master->dev.dma_mask = parent->dma_mask;
master->dev.coherent_dma_mask = parent->coherent_dma_mask;
@@ -2891,6 +2891,8 @@ int i3c_master_register(struct i3c_master_controller *master,
if (ret)
goto err_put_dev;
+ dev_set_name(&master->dev, "i3c-%d", i3cbus->id);
+
ret = of_populate_i3c_bus(master);
if (ret)
goto err_put_dev;
diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index 889e2ed5bc83..4033bc16677f 100644
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1099,6 +1099,7 @@ static int dw_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,
dev_err(master->dev,
"<%s> cannot resume i3c bus master, err: %d\n",
__func__, ret);
+ dw_i3c_master_free_xfer(xfer);
return ret;
}
@@ -1570,6 +1571,8 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
spin_lock_init(&master->xferqueue.lock);
INIT_LIST_HEAD(&master->xferqueue.list);
+ spin_lock_init(&master->devs_lock);
+
writel(INTR_ALL, master->regs + INTR_STATUS);
irq = platform_get_irq(pdev, 0);
ret = devm_request_irq(&pdev->dev, irq,
diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index bfa8a3f5a92f..9ef4d6e27466 100644
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -1489,7 +1489,11 @@ static int sca3000_probe(struct spi_device *spi)
if (ret)
goto error_free_irq;
- return iio_device_register(indio_dev);
+ ret = iio_device_register(indio_dev);
+ if (ret)
+ goto error_free_irq;
+
+ return 0;
error_free_irq:
if (spi->irq)
diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index 67ae7d1012bc..ee2fcd20545d 100644
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -1162,10 +1162,8 @@ int mpu3050_common_probe(struct device *dev,
mpu3050->regs[1].supply = mpu3050_reg_vlogic;
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(mpu3050->regs),
mpu3050->regs);
- if (ret) {
- dev_err(dev, "Cannot get regulators\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "Cannot get regulators\n");
ret = mpu3050_power_up(mpu3050);
if (ret)
diff --git a/drivers/iio/pressure/mprls0025pa.c b/drivers/iio/pressure/mprls0025pa.c
index 2336f2760eae..d4133fef91fa 100644
--- a/drivers/iio/pressure/mprls0025pa.c
+++ b/drivers/iio/pressure/mprls0025pa.c
@@ -59,7 +59,7 @@
*
* Values given to the userspace in sysfs interface:
* * raw - press_cnt
- * * offset - (-1 * outputmin) - pmin / scale
+ * * offset - (-1 * outputmin) + pmin / scale
* note: With all sensors from the datasheet pmin = 0
* which reduces the offset to (-1 * outputmin)
*/
@@ -160,8 +160,8 @@ static const struct iio_chan_spec mpr_channels[] = {
BIT(IIO_CHAN_INFO_OFFSET),
.scan_index = 0,
.scan_type = {
- .sign = 's',
- .realbits = 32,
+ .sign = 'u',
+ .realbits = 24,
.storagebits = 32,
.endianness = IIO_CPU,
},
@@ -313,8 +313,7 @@ static int mpr_read_raw(struct iio_dev *indio_dev,
return IIO_VAL_INT_PLUS_NANO;
case IIO_CHAN_INFO_OFFSET:
*val = data->offset;
- *val2 = data->offset2;
- return IIO_VAL_INT_PLUS_NANO;
+ return IIO_VAL_INT;
default:
return -EINVAL;
}
@@ -330,8 +329,9 @@ int mpr_common_probe(struct device *dev, const struct mpr_ops *ops, int irq)
struct mpr_data *data;
struct iio_dev *indio_dev;
const char *triplet;
- s64 scale, offset;
+ s64 odelta, pdelta;
u32 func;
+ s32 tmp;
indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
if (!indio_dev)
@@ -405,23 +405,17 @@ int mpr_common_probe(struct device *dev, const struct mpr_ops *ops, int irq)
data->outmin = mpr_func_spec[data->function].output_min;
data->outmax = mpr_func_spec[data->function].output_max;
- /* use 64 bit calculation for preserving a reasonable precision */
- scale = div_s64(((s64)(data->pmax - data->pmin)) * NANO,
- data->outmax - data->outmin);
- data->scale = div_s64_rem(scale, NANO, &data->scale2);
- /*
- * multiply with NANO before dividing by scale and later divide by NANO
- * again.
- */
- offset = ((-1LL) * (s64)data->outmin) * NANO -
- div_s64(div_s64((s64)data->pmin * NANO, scale), NANO);
- data->offset = div_s64_rem(offset, NANO, &data->offset2);
+ odelta = data->outmax - data->outmin;
+ pdelta = data->pmax - data->pmin;
+
+ data->scale = div_s64_rem(div_s64(pdelta * NANO, odelta), NANO, &tmp);
+ data->scale2 = tmp;
+
+ data->offset = div_s64(odelta * data->pmin, pdelta) - data->outmin;
if (data->irq > 0) {
- ret = devm_request_irq(dev, data->irq, mpr_eoc_handler,
- IRQF_TRIGGER_RISING,
- dev_name(dev),
- data);
+ ret = devm_request_irq(dev, data->irq, mpr_eoc_handler, 0,
+ dev_name(dev), data);
if (ret)
return dev_err_probe(dev, ret,
"request irq %d failed\n", data->irq);
diff --git a/drivers/iio/pressure/mprls0025pa.h b/drivers/iio/pressure/mprls0025pa.h
index d62a018eaff3..b6944b305126 100644
--- a/drivers/iio/pressure/mprls0025pa.h
+++ b/drivers/iio/pressure/mprls0025pa.h
@@ -53,7 +53,6 @@ enum mpr_func_id {
* @scale: pressure scale
* @scale2: pressure scale, decimal number
* @offset: pressure offset
- * @offset2: pressure offset, decimal number
* @gpiod_reset: reset
* @irq: end of conversion irq. used to distinguish between irq mode and
* reading in a loop until data is ready
@@ -75,7 +74,6 @@ struct mpr_data {
int scale;
int scale2;
int offset;
- int offset2;
struct gpio_desc *gpiod_reset;
int irq;
struct completion completion;
diff --git a/drivers/iio/pressure/mprls0025pa_spi.c b/drivers/iio/pressure/mprls0025pa_spi.c
index d04102f8a4a0..cf17eb2e7208 100644
--- a/drivers/iio/pressure/mprls0025pa_spi.c
+++ b/drivers/iio/pressure/mprls0025pa_spi.c
@@ -8,6 +8,7 @@
* https://prod-edam.honeywell.com/content/dam/honeywell-edam/sps/siot/en-us/products/sensors/pressure-sensors/board-mount-pressure-sensors/micropressure-mpr-series/documents/sps-siot-mpr-series-datasheet-32332628-ciid-172626.pdf
*/
+#include <linux/array_size.h>
#include <linux/device.h>
#include <linux/errno.h>
#include <linux/mod_devicetable.h>
@@ -40,17 +41,25 @@ static int mpr_spi_xfer(struct mpr_data *data, const u8 cmd, const u8 pkt_len)
{
struct spi_device *spi = to_spi_device(data->dev);
struct mpr_spi_buf *buf = spi_get_drvdata(spi);
- struct spi_transfer xfer;
+ struct spi_transfer xfers[2] = { };
if (pkt_len > MPR_MEASUREMENT_RD_SIZE)
return -EOVERFLOW;
buf->tx[0] = cmd;
- xfer.tx_buf = buf->tx;
- xfer.rx_buf = data->buffer;
- xfer.len = pkt_len;
- return spi_sync_transfer(spi, &xfer, 1);
+ /*
+ * Dummy transfer with no data, just cause a 2.5us+ delay between the CS assert
+ * and the first clock edge as per the datasheet tHDSS timing requirement.
+ */
+ xfers[0].delay.value = 2500;
+ xfers[0].delay.unit = SPI_DELAY_UNIT_NSECS;
+
+ xfers[1].tx_buf = buf->tx;
+ xfers[1].rx_buf = data->buffer;
+ xfers[1].len = pkt_len;
+
+ return spi_sync_transfer(spi, xfers, ARRAY_SIZE(xfers));
}
static const struct mpr_ops mpr_spi_ops = {
diff --git a/drivers/iio/test/Kconfig b/drivers/iio/test/Kconfig
index 6e65e929791c..4fc17dd0dcd7 100644
--- a/drivers/iio/test/Kconfig
+++ b/drivers/iio/test/Kconfig
@@ -8,7 +8,6 @@ config IIO_GTS_KUNIT_TEST
tristate "Test IIO gain-time-scale helpers" if !KUNIT_ALL_TESTS
depends on KUNIT
select IIO_GTS_HELPER
- select TEST_KUNIT_DEVICE_HELPERS
default KUNIT_ALL_TESTS
help
build unit tests for the IIO light sensor gain-time-scale helpers.
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 81cf3c902e81..0fc1c5bce2f0 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1537,7 +1537,8 @@ static void ib_cache_event_task(struct work_struct *_work)
* the cache.
*/
ret = ib_cache_update(work->event.device, work->event.element.port_num,
- work->event.event == IB_EVENT_GID_CHANGE,
+ work->event.event == IB_EVENT_GID_CHANGE ||
+ work->event.event == IB_EVENT_CLIENT_REREGISTER,
work->event.event == IB_EVENT_PKEY_CHANGE,
work->enforce_security);
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 62410578dec3..eb942ab9c405 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -95,7 +95,6 @@ static struct workqueue_struct *iwcm_wq;
struct iwcm_work {
struct work_struct work;
struct iwcm_id_private *cm_id;
- struct list_head list;
struct iw_cm_event event;
struct list_head free_list;
};
@@ -178,7 +177,6 @@ static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count)
return -ENOMEM;
}
work->cm_id = cm_id_priv;
- INIT_LIST_HEAD(&work->list);
put_work(work);
}
return 0;
@@ -213,7 +211,6 @@ static void free_cm_id(struct iwcm_id_private *cm_id_priv)
static bool iwcm_deref_id(struct iwcm_id_private *cm_id_priv)
{
if (refcount_dec_and_test(&cm_id_priv->refcount)) {
- BUG_ON(!list_empty(&cm_id_priv->work_list));
free_cm_id(cm_id_priv);
return true;
}
@@ -260,7 +257,6 @@ struct iw_cm_id *iw_create_cm_id(struct ib_device *device,
refcount_set(&cm_id_priv->refcount, 1);
init_waitqueue_head(&cm_id_priv->connect_wait);
init_completion(&cm_id_priv->destroy_comp);
- INIT_LIST_HEAD(&cm_id_priv->work_list);
INIT_LIST_HEAD(&cm_id_priv->work_free_list);
return &cm_id_priv->id;
@@ -1007,13 +1003,13 @@ static int process_event(struct iwcm_id_private *cm_id_priv,
}
/*
- * Process events on the work_list for the cm_id. If the callback
- * function requests that the cm_id be deleted, a flag is set in the
- * cm_id flags to indicate that when the last reference is
- * removed, the cm_id is to be destroyed. This is necessary to
- * distinguish between an object that will be destroyed by the app
- * thread asleep on the destroy_comp list vs. an object destroyed
- * here synchronously when the last reference is removed.
+ * Process events for the cm_id. If the callback function requests
+ * that the cm_id be deleted, a flag is set in the cm_id flags to
+ * indicate that when the last reference is removed, the cm_id is
+ * to be destroyed. This is necessary to distinguish between an
+ * object that will be destroyed by the app thread asleep on the
+ * destroy_comp list vs. an object destroyed here synchronously
+ * when the last reference is removed.
*/
static void cm_work_handler(struct work_struct *_work)
{
@@ -1024,35 +1020,26 @@ static void cm_work_handler(struct work_struct *_work)
int ret = 0;
spin_lock_irqsave(&cm_id_priv->lock, flags);
- while (!list_empty(&cm_id_priv->work_list)) {
- work = list_first_entry(&cm_id_priv->work_list,
- struct iwcm_work, list);
- list_del_init(&work->list);
- levent = work->event;
- put_work(work);
- spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-
- if (!test_bit(IWCM_F_DROP_EVENTS, &cm_id_priv->flags)) {
- ret = process_event(cm_id_priv, &levent);
- if (ret) {
- destroy_cm_id(&cm_id_priv->id);
- WARN_ON_ONCE(iwcm_deref_id(cm_id_priv));
- }
- } else
- pr_debug("dropping event %d\n", levent.event);
- if (iwcm_deref_id(cm_id_priv))
- return;
- spin_lock_irqsave(&cm_id_priv->lock, flags);
- }
+ levent = work->event;
+ put_work(work);
spin_unlock_irqrestore(&cm_id_priv->lock, flags);
+
+ if (!test_bit(IWCM_F_DROP_EVENTS, &cm_id_priv->flags)) {
+ ret = process_event(cm_id_priv, &levent);
+ if (ret) {
+ destroy_cm_id(&cm_id_priv->id);
+ WARN_ON_ONCE(iwcm_deref_id(cm_id_priv));
+ }
+ } else
+ pr_debug("dropping event %d\n", levent.event);
+ if (iwcm_deref_id(cm_id_priv))
+ return;
}
/*
* This function is called on interrupt context. Schedule events on
* the iwcm_wq thread to allow callback functions to downcall into
- * the CM and/or block. Events are queued to a per-CM_ID
- * work_list. If this is the first event on the work_list, the work
- * element is also queued on the iwcm_wq thread.
+ * the CM and/or block.
*
* Each event holds a reference on the cm_id. Until the last posted
* event has been delivered and processed, the cm_id cannot be
@@ -1094,7 +1081,6 @@ static int cm_event_handler(struct iw_cm_id *cm_id,
}
refcount_inc(&cm_id_priv->refcount);
- list_add_tail(&work->list, &cm_id_priv->work_list);
queue_work(iwcm_wq, &work->work);
out:
spin_unlock_irqrestore(&cm_id_priv->lock, flags);
diff --git a/drivers/infiniband/core/iwcm.h b/drivers/infiniband/core/iwcm.h
index bf74639be128..b56fb12edece 100644
--- a/drivers/infiniband/core/iwcm.h
+++ b/drivers/infiniband/core/iwcm.h
@@ -50,7 +50,6 @@ struct iwcm_id_private {
struct ib_qp *qp;
struct completion destroy_comp;
wait_queue_head_t connect_wait;
- struct list_head work_list;
spinlock_t lock;
refcount_t refcount;
struct list_head work_free_list;
diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c
index 6354ddf2a274..2522ff1cc462 100644
--- a/drivers/infiniband/core/rw.c
+++ b/drivers/infiniband/core/rw.c
@@ -651,34 +651,57 @@ unsigned int rdma_rw_mr_factor(struct ib_device *device, u32 port_num,
}
EXPORT_SYMBOL(rdma_rw_mr_factor);
+/**
+ * rdma_rw_max_send_wr - compute max Send WRs needed for RDMA R/W contexts
+ * @dev: RDMA device
+ * @port_num: port number
+ * @max_rdma_ctxs: number of rdma_rw_ctx structures
+ * @create_flags: QP create flags (pass IB_QP_CREATE_INTEGRITY_EN if
+ * data integrity will be enabled on the QP)
+ *
+ * Returns the total number of Send Queue entries needed for
+ * @max_rdma_ctxs. The result accounts for memory registration and
+ * invalidation work requests when the device requires them.
+ *
+ * ULPs use this to size Send Queues and Send CQs before creating a
+ * Queue Pair.
+ */
+unsigned int rdma_rw_max_send_wr(struct ib_device *dev, u32 port_num,
+ unsigned int max_rdma_ctxs, u32 create_flags)
+{
+ unsigned int factor = 1;
+ unsigned int result;
+
+ if (create_flags & IB_QP_CREATE_INTEGRITY_EN ||
+ rdma_rw_can_use_mr(dev, port_num))
+ factor += 2; /* reg + inv */
+
+ if (check_mul_overflow(factor, max_rdma_ctxs, &result))
+ return UINT_MAX;
+ return result;
+}
+EXPORT_SYMBOL(rdma_rw_max_send_wr);
+
void rdma_rw_init_qp(struct ib_device *dev, struct ib_qp_init_attr *attr)
{
- u32 factor;
+ unsigned int factor = 1;
WARN_ON_ONCE(attr->port_num == 0);
/*
- * Each context needs at least one RDMA READ or WRITE WR.
- *
- * For some hardware we might need more, eventually we should ask the
- * HCA driver for a multiplier here.
- */
- factor = 1;
-
- /*
- * If the device needs MRs to perform RDMA READ or WRITE operations,
- * we'll need two additional MRs for the registrations and the
- * invalidation.
+ * If the device uses MRs to perform RDMA READ or WRITE operations,
+ * or if data integrity is enabled, account for registration and
+ * invalidation work requests.
*/
if (attr->create_flags & IB_QP_CREATE_INTEGRITY_EN ||
rdma_rw_can_use_mr(dev, attr->port_num))
- factor += 2; /* inv + reg */
+ factor += 2; /* reg + inv */
attr->cap.max_send_wr += factor * attr->cap.max_rdma_ctxs;
/*
- * But maybe we were just too high in the sky and the device doesn't
- * even support all we need, and we'll have to live with what we get..
+ * The device might not support all we need, and we'll have to
+ * live with what we get.
*/
attr->cap.max_send_wr =
min_t(u32, attr->cap.max_send_wr, dev->attrs.max_qp_wr);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index fd67fc9fe85a..2f7e3c4483fc 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -514,7 +514,8 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
struct rdma_ah_attr ah_attr;
struct ib_ah *ah;
__be64 *tid;
- int ret, data_len, hdr_len, copy_offset, rmpp_active;
+ int ret, hdr_len, copy_offset, rmpp_active;
+ size_t data_len;
u8 base_version;
if (count < hdr_size(file) + IB_MGMT_RMPP_HDR)
@@ -588,7 +589,10 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
}
base_version = ((struct ib_mad_hdr *)&packet->mad.data)->base_version;
- data_len = count - hdr_size(file) - hdr_len;
+ if (check_sub_overflow(count, hdr_size(file) + hdr_len, &data_len)) {
+ ret = -EINVAL;
+ goto err_ah;
+ }
packet->msg = ib_create_send_mad(agent,
be32_to_cpu(packet->mad.hdr.qpn),
packet->mad.hdr.pkey_index, rmpp_active,
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index ce16404cdfb8..f4616deeca54 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2049,7 +2049,10 @@ static int ib_uverbs_post_send(struct uverbs_attr_bundle *attrs)
if (ret)
return ret;
- user_wr = kmalloc(cmd.wqe_size, GFP_KERNEL);
+ if (cmd.wqe_size < sizeof(struct ib_uverbs_send_wr))
+ return -EINVAL;
+
+ user_wr = kmalloc(cmd.wqe_size, GFP_KERNEL | __GFP_NOWARN);
if (!user_wr)
return -ENOMEM;
@@ -2239,7 +2242,7 @@ ib_uverbs_unmarshall_recv(struct uverbs_req_iter *iter, u32 wr_count,
if (ret)
return ERR_PTR(ret);
- user_wr = kmalloc(wqe_size, GFP_KERNEL);
+ user_wr = kmalloc(wqe_size, GFP_KERNEL | __GFP_NOWARN);
if (!user_wr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/hns/hns_roce_ah.c b/drivers/infiniband/hw/hns/hns_roce_ah.c
index 0c1c32d23c88..8a605da8a93c 100644
--- a/drivers/infiniband/hw/hns/hns_roce_ah.c
+++ b/drivers/infiniband/hw/hns/hns_roce_ah.c
@@ -60,7 +60,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
u8 tclass = get_tclass(grh);
u8 priority = 0;
u8 tc_mode = 0;
- int ret;
+ int ret = 0;
if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08 && udata) {
ret = -EOPNOTSUPP;
@@ -77,19 +77,18 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
ah->av.flowlabel = grh->flow_label;
ah->av.udp_sport = get_ah_udp_sport(ah_attr);
ah->av.tclass = tclass;
+ ah->av.sl = rdma_ah_get_sl(ah_attr);
- ret = hr_dev->hw->get_dscp(hr_dev, tclass, &tc_mode, &priority);
- if (ret == -EOPNOTSUPP)
- ret = 0;
-
- if (ret && grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
- goto err_out;
+ if (grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
+ ret = hr_dev->hw->get_dscp(hr_dev, tclass, &tc_mode, &priority);
+ if (ret == -EOPNOTSUPP)
+ ret = 0;
+ else if (ret)
+ goto err_out;
- if (tc_mode == HNAE3_TC_MAP_MODE_DSCP &&
- grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
- ah->av.sl = priority;
- else
- ah->av.sl = rdma_ah_get_sl(ah_attr);
+ if (tc_mode == HNAE3_TC_MAP_MODE_DSCP)
+ ah->av.sl = priority;
+ }
if (!check_sl_valid(hr_dev, ah->av.sl)) {
ret = -EINVAL;
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 2d6ae89e525b..a2ae4f33e459 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -3739,6 +3739,23 @@ static void hns_roce_v2_write_cqc(struct hns_roce_dev *hr_dev,
HNS_ROCE_V2_CQ_DEFAULT_INTERVAL);
}
+static bool left_sw_wc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)
+{
+ struct hns_roce_qp *hr_qp;
+
+ list_for_each_entry(hr_qp, &hr_cq->sq_list, sq_node) {
+ if (hr_qp->sq.head != hr_qp->sq.tail)
+ return true;
+ }
+
+ list_for_each_entry(hr_qp, &hr_cq->rq_list, rq_node) {
+ if (hr_qp->rq.head != hr_qp->rq.tail)
+ return true;
+ }
+
+ return false;
+}
+
static int hns_roce_v2_req_notify_cq(struct ib_cq *ibcq,
enum ib_cq_notify_flags flags)
{
@@ -3747,6 +3764,12 @@ static int hns_roce_v2_req_notify_cq(struct ib_cq *ibcq,
struct hns_roce_v2_db cq_db = {};
u32 notify_flag;
+ if (hr_dev->state >= HNS_ROCE_DEVICE_STATE_RST_DOWN) {
+ if ((flags & IB_CQ_REPORT_MISSED_EVENTS) &&
+ left_sw_wc(hr_dev, hr_cq))
+ return 1;
+ return 0;
+ }
/*
* flags = 0, then notify_flag : next
* flags = 1, then notify flag : solocited
@@ -5053,20 +5076,22 @@ static int hns_roce_set_sl(struct ib_qp *ibqp,
struct ib_device *ibdev = &hr_dev->ib_dev;
int ret;
- ret = hns_roce_hw_v2_get_dscp(hr_dev, get_tclass(&attr->ah_attr.grh),
- &hr_qp->tc_mode, &hr_qp->priority);
- if (ret && ret != -EOPNOTSUPP &&
- grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
- ibdev_err_ratelimited(ibdev,
- "failed to get dscp, ret = %d.\n", ret);
- return ret;
- }
+ hr_qp->sl = rdma_ah_get_sl(&attr->ah_attr);
- if (hr_qp->tc_mode == HNAE3_TC_MAP_MODE_DSCP &&
- grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
- hr_qp->sl = hr_qp->priority;
- else
- hr_qp->sl = rdma_ah_get_sl(&attr->ah_attr);
+ if (grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
+ ret = hns_roce_hw_v2_get_dscp(hr_dev,
+ get_tclass(&attr->ah_attr.grh),
+ &hr_qp->tc_mode, &hr_qp->priority);
+ if (ret && ret != -EOPNOTSUPP) {
+ ibdev_err_ratelimited(ibdev,
+ "failed to get dscp, ret = %d.\n",
+ ret);
+ return ret;
+ }
+
+ if (hr_qp->tc_mode == HNAE3_TC_MAP_MODE_DSCP)
+ hr_qp->sl = hr_qp->priority;
+ }
if (!check_sl_valid(hr_dev, hr_qp->sl))
return -EINVAL;
@@ -6956,7 +6981,8 @@ static int hns_roce_v2_init_eq_table(struct hns_roce_dev *hr_dev)
INIT_WORK(&hr_dev->ecc_work, fmea_ram_ecc_work);
- hr_dev->irq_workq = alloc_ordered_workqueue("hns_roce_irq_workq", 0);
+ hr_dev->irq_workq = alloc_ordered_workqueue("hns_roce_irq_workq",
+ WQ_MEM_RECLAIM);
if (!hr_dev->irq_workq) {
dev_err(dev, "failed to create irq workqueue.\n");
ret = -ENOMEM;
diff --git a/drivers/infiniband/hw/hns/hns_roce_restrack.c b/drivers/infiniband/hw/hns/hns_roce_restrack.c
index 230187dda6a0..085791cc617c 100644
--- a/drivers/infiniband/hw/hns/hns_roce_restrack.c
+++ b/drivers/infiniband/hw/hns/hns_roce_restrack.c
@@ -51,7 +51,7 @@ int hns_roce_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ib_cq)
ret = hr_dev->hw->query_cqc(hr_dev, hr_cq->cqn, &context);
if (ret)
- return -EINVAL;
+ return ret;
ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, sizeof(context), &context);
@@ -177,7 +177,7 @@ int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr)
ret = hr_dev->hw->query_mpt(hr_dev, hr_mr->key, &context);
if (ret)
- return -EINVAL;
+ return ret;
ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, sizeof(context), &context);
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 40284bbb45d6..999747941000 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -561,12 +561,20 @@ static int mlx5_query_port_roce(struct ib_device *device, u32 port_num,
* of an error it will still be zeroed out.
* Use native port in case of reps
*/
- if (dev->is_rep)
- err = mlx5_query_port_ptys(mdev, out, sizeof(out), MLX5_PTYS_EN,
- 1, 0);
- else
- err = mlx5_query_port_ptys(mdev, out, sizeof(out), MLX5_PTYS_EN,
- mdev_port_num, 0);
+ if (dev->is_rep) {
+ struct mlx5_eswitch_rep *rep;
+
+ rep = dev->port[port_num - 1].rep;
+ if (rep) {
+ mdev = mlx5_eswitch_get_core_dev(rep->esw);
+ WARN_ON(!mdev);
+ }
+ mdev_port_num = 1;
+ }
+
+ err = mlx5_query_port_ptys(mdev, out, sizeof(out), MLX5_PTYS_EN,
+ mdev_port_num, 0);
+
if (err)
goto out;
ext = !!MLX5_GET_ETH_PROTO(ptys_reg, out, true, eth_proto_capability);
@@ -2878,7 +2886,6 @@ static void mlx5_ib_handle_event(struct work_struct *_work)
container_of(_work, struct mlx5_ib_event_work, work);
struct mlx5_ib_dev *ibdev;
struct ib_event ibev;
- bool fatal = false;
if (work->is_slave) {
ibdev = mlx5_ib_get_ibdev_from_mpi(work->mpi);
@@ -2889,12 +2896,6 @@ static void mlx5_ib_handle_event(struct work_struct *_work)
}
switch (work->event) {
- case MLX5_DEV_EVENT_SYS_ERROR:
- ibev.event = IB_EVENT_DEVICE_FATAL;
- mlx5_ib_handle_internal_error(ibdev);
- ibev.element.port_num = (u8)(unsigned long)work->param;
- fatal = true;
- break;
case MLX5_EVENT_TYPE_PORT_CHANGE:
if (handle_port_change(ibdev, work->param, &ibev))
goto out;
@@ -2916,8 +2917,6 @@ static void mlx5_ib_handle_event(struct work_struct *_work)
if (ibdev->ib_active)
ib_dispatch_event(&ibev);
- if (fatal)
- ibdev->ib_active = false;
out:
kfree(work);
}
@@ -2961,6 +2960,66 @@ static int mlx5_ib_event_slave_port(struct notifier_block *nb,
return NOTIFY_OK;
}
+static void mlx5_ib_handle_sys_error_event(struct work_struct *_work)
+{
+ struct mlx5_ib_event_work *work =
+ container_of(_work, struct mlx5_ib_event_work, work);
+ struct mlx5_ib_dev *ibdev = work->dev;
+ struct ib_event ibev;
+
+ ibev.event = IB_EVENT_DEVICE_FATAL;
+ mlx5_ib_handle_internal_error(ibdev);
+ ibev.element.port_num = (u8)(unsigned long)work->param;
+ ibev.device = &ibdev->ib_dev;
+
+ if (!rdma_is_port_valid(&ibdev->ib_dev, ibev.element.port_num)) {
+ mlx5_ib_warn(ibdev, "warning: event on port %d\n", ibev.element.port_num);
+ goto out;
+ }
+
+ if (ibdev->ib_active)
+ ib_dispatch_event(&ibev);
+
+ ibdev->ib_active = false;
+out:
+ kfree(work);
+}
+
+static int mlx5_ib_sys_error_event(struct notifier_block *nb,
+ unsigned long event, void *param)
+{
+ struct mlx5_ib_event_work *work;
+
+ if (event != MLX5_DEV_EVENT_SYS_ERROR)
+ return NOTIFY_DONE;
+
+ work = kmalloc(sizeof(*work), GFP_ATOMIC);
+ if (!work)
+ return NOTIFY_DONE;
+
+ INIT_WORK(&work->work, mlx5_ib_handle_sys_error_event);
+ work->dev = container_of(nb, struct mlx5_ib_dev, sys_error_events);
+ work->is_slave = false;
+ work->param = param;
+ work->event = event;
+
+ queue_work(mlx5_ib_event_wq, &work->work);
+
+ return NOTIFY_OK;
+}
+
+static int mlx5_ib_stage_sys_error_notifier_init(struct mlx5_ib_dev *dev)
+{
+ dev->sys_error_events.notifier_call = mlx5_ib_sys_error_event;
+ mlx5_notifier_register(dev->mdev, &dev->sys_error_events);
+ return 0;
+}
+
+static void mlx5_ib_stage_sys_error_notifier_cleanup(struct mlx5_ib_dev *dev)
+{
+ mlx5_notifier_unregister(dev->mdev, &dev->sys_error_events);
+}
+
static int mlx5_ib_get_plane_num(struct mlx5_core_dev *mdev, u8 *num_plane)
{
struct mlx5_hca_vport_context vport_ctx;
@@ -4466,12 +4525,16 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL) {
err = mlx5_ib_init_ucaps(dev);
if (err)
- return err;
+ goto err_ucaps;
}
dev->ib_dev.use_cq_dim = true;
return 0;
+
+err_ucaps:
+ bitmap_free(dev->var_table.bitmap);
+ return err;
}
static const struct ib_device_ops mlx5_ib_dev_port_ops = {
@@ -4807,6 +4870,9 @@ static const struct mlx5_ib_profile pf_profile = {
STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
mlx5_ib_devx_init,
mlx5_ib_devx_cleanup),
+ STAGE_CREATE(MLX5_IB_STAGE_SYS_ERROR_NOTIFIER,
+ mlx5_ib_stage_sys_error_notifier_init,
+ mlx5_ib_stage_sys_error_notifier_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
mlx5_ib_stage_ib_reg_init,
mlx5_ib_stage_ib_reg_cleanup),
@@ -4864,6 +4930,9 @@ const struct mlx5_ib_profile raw_eth_profile = {
STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
mlx5_ib_devx_init,
mlx5_ib_devx_cleanup),
+ STAGE_CREATE(MLX5_IB_STAGE_SYS_ERROR_NOTIFIER,
+ mlx5_ib_stage_sys_error_notifier_init,
+ mlx5_ib_stage_sys_error_notifier_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
mlx5_ib_stage_ib_reg_init,
mlx5_ib_stage_ib_reg_cleanup),
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 09d82d5f95e3..fbccb0362590 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1007,6 +1007,7 @@ enum mlx5_ib_stages {
MLX5_IB_STAGE_BFREG,
MLX5_IB_STAGE_PRE_IB_REG_UMR,
MLX5_IB_STAGE_WHITELIST_UID,
+ MLX5_IB_STAGE_SYS_ERROR_NOTIFIER,
MLX5_IB_STAGE_IB_REG,
MLX5_IB_STAGE_DEVICE_NOTIFIER,
MLX5_IB_STAGE_POST_IB_REG_UMR,
@@ -1165,6 +1166,7 @@ struct mlx5_ib_dev {
/* protect accessing data_direct_dev */
struct mutex data_direct_lock;
struct notifier_block mdev_events;
+ struct notifier_block sys_error_events;
struct notifier_block lag_events;
int num_ports;
/* serialize update of capability mask
diff --git a/drivers/infiniband/hw/mlx5/std_types.c b/drivers/infiniband/hw/mlx5/std_types.c
index 2fcf553044e1..1ee31611b4b3 100644
--- a/drivers/infiniband/hw/mlx5/std_types.c
+++ b/drivers/infiniband/hw/mlx5/std_types.c
@@ -195,7 +195,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_GET_DATA_DIRECT_SYSFS_PATH)(
int out_len = uverbs_attr_get_len(attrs,
MLX5_IB_ATTR_GET_DATA_DIRECT_SYSFS_PATH);
u32 dev_path_len;
- char *dev_path;
+ char *dev_path = NULL;
int ret;
c = to_mucontext(ib_uverbs_get_ucontext(attrs));
@@ -223,9 +223,9 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_GET_DATA_DIRECT_SYSFS_PATH)(
ret = uverbs_copy_to(attrs, MLX5_IB_ATTR_GET_DATA_DIRECT_SYSFS_PATH, dev_path,
dev_path_len);
- kfree(dev_path);
end:
+ kfree(dev_path);
mutex_unlock(&dev->data_direct_lock);
return ret;
}
diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c
index a5b2b62f596b..1390e861bd1d 100644
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@ -119,12 +119,15 @@ void retransmit_timer(struct timer_list *t)
rxe_dbg_qp(qp, "retransmit timer fired\n");
+ if (!rxe_get(qp))
+ return;
spin_lock_irqsave(&qp->state_lock, flags);
if (qp->valid) {
qp->comp.timeout = 1;
rxe_sched_task(&qp->send_task);
}
spin_unlock_irqrestore(&qp->state_lock, flags);
+ rxe_put(qp);
}
void rxe_comp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb)
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index b1df05238848..8116cf0fa6da 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -72,14 +72,46 @@ void rxe_mr_init_dma(int access, struct rxe_mr *mr)
mr->ibmr.type = IB_MR_TYPE_DMA;
}
+/*
+ * Convert iova to page_info index. The page_info stores pages of size
+ * PAGE_SIZE, but MRs can have different page sizes. This function
+ * handles the conversion for all cases:
+ *
+ * 1. mr->page_size > PAGE_SIZE:
+ * The MR's iova may not be aligned to mr->page_size. We use the
+ * aligned base (iova & page_mask) as reference, then calculate
+ * which PAGE_SIZE sub-page the iova falls into.
+ *
+ * 2. mr->page_size <= PAGE_SIZE:
+ * Use simple shift arithmetic since each page_info entry corresponds
+ * to one or more MR pages.
+ */
static unsigned long rxe_mr_iova_to_index(struct rxe_mr *mr, u64 iova)
{
- return (iova >> mr->page_shift) - (mr->ibmr.iova >> mr->page_shift);
+ int idx;
+
+ if (mr_page_size(mr) > PAGE_SIZE)
+ idx = (iova - (mr->ibmr.iova & mr->page_mask)) >> PAGE_SHIFT;
+ else
+ idx = (iova >> mr->page_shift) -
+ (mr->ibmr.iova >> mr->page_shift);
+
+ WARN_ON(idx >= mr->nbuf);
+ return idx;
}
+/*
+ * Convert iova to offset within the page_info entry.
+ *
+ * For mr_page_size > PAGE_SIZE, the offset is within the system page.
+ * For mr_page_size <= PAGE_SIZE, the offset is within the MR page size.
+ */
static unsigned long rxe_mr_iova_to_page_offset(struct rxe_mr *mr, u64 iova)
{
- return iova & (mr_page_size(mr) - 1);
+ if (mr_page_size(mr) > PAGE_SIZE)
+ return iova & (PAGE_SIZE - 1);
+ else
+ return iova & (mr_page_size(mr) - 1);
}
static bool is_pmem_page(struct page *pg)
@@ -93,37 +125,69 @@ static bool is_pmem_page(struct page *pg)
static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
{
- XA_STATE(xas, &mr->page_list, 0);
struct sg_page_iter sg_iter;
struct page *page;
bool persistent = !!(mr->access & IB_ACCESS_FLUSH_PERSISTENT);
+ WARN_ON(mr_page_size(mr) != PAGE_SIZE);
+
__sg_page_iter_start(&sg_iter, sgt->sgl, sgt->orig_nents, 0);
if (!__sg_page_iter_next(&sg_iter))
return 0;
- do {
- xas_lock(&xas);
- while (true) {
- page = sg_page_iter_page(&sg_iter);
-
- if (persistent && !is_pmem_page(page)) {
- rxe_dbg_mr(mr, "Page can't be persistent\n");
- xas_set_err(&xas, -EINVAL);
- break;
- }
+ while (true) {
+ page = sg_page_iter_page(&sg_iter);
- xas_store(&xas, page);
- if (xas_error(&xas))
- break;
- xas_next(&xas);
- if (!__sg_page_iter_next(&sg_iter))
- break;
+ if (persistent && !is_pmem_page(page)) {
+ rxe_dbg_mr(mr, "Page can't be persistent\n");
+ return -EINVAL;
}
- xas_unlock(&xas);
- } while (xas_nomem(&xas, GFP_KERNEL));
- return xas_error(&xas);
+ mr->page_info[mr->nbuf].page = page;
+ mr->page_info[mr->nbuf].offset = 0;
+ mr->nbuf++;
+
+ if (!__sg_page_iter_next(&sg_iter))
+ break;
+ }
+
+ return 0;
+}
+
+static int __alloc_mr_page_info(struct rxe_mr *mr, int num_pages)
+{
+ mr->page_info = kcalloc(num_pages, sizeof(struct rxe_mr_page),
+ GFP_KERNEL);
+ if (!mr->page_info)
+ return -ENOMEM;
+
+ mr->max_allowed_buf = num_pages;
+ mr->nbuf = 0;
+
+ return 0;
+}
+
+static int alloc_mr_page_info(struct rxe_mr *mr, int num_pages)
+{
+ int ret;
+
+ WARN_ON(mr->num_buf);
+ ret = __alloc_mr_page_info(mr, num_pages);
+ if (ret)
+ return ret;
+
+ mr->num_buf = num_pages;
+
+ return 0;
+}
+
+static void free_mr_page_info(struct rxe_mr *mr)
+{
+ if (!mr->page_info)
+ return;
+
+ kfree(mr->page_info);
+ mr->page_info = NULL;
}
int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
@@ -134,8 +198,6 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
rxe_mr_init(access, mr);
- xa_init(&mr->page_list);
-
umem = ib_umem_get(&rxe->ib_dev, start, length, access);
if (IS_ERR(umem)) {
rxe_dbg_mr(mr, "Unable to pin memory region err = %d\n",
@@ -143,46 +205,24 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
return PTR_ERR(umem);
}
+ err = alloc_mr_page_info(mr, ib_umem_num_pages(umem));
+ if (err)
+ goto err2;
+
err = rxe_mr_fill_pages_from_sgt(mr, &umem->sgt_append.sgt);
- if (err) {
- ib_umem_release(umem);
- return err;
- }
+ if (err)
+ goto err1;
mr->umem = umem;
mr->ibmr.type = IB_MR_TYPE_USER;
mr->state = RXE_MR_STATE_VALID;
return 0;
-}
-
-static int rxe_mr_alloc(struct rxe_mr *mr, int num_buf)
-{
- XA_STATE(xas, &mr->page_list, 0);
- int i = 0;
- int err;
-
- xa_init(&mr->page_list);
-
- do {
- xas_lock(&xas);
- while (i != num_buf) {
- xas_store(&xas, XA_ZERO_ENTRY);
- if (xas_error(&xas))
- break;
- xas_next(&xas);
- i++;
- }
- xas_unlock(&xas);
- } while (xas_nomem(&xas, GFP_KERNEL));
-
- err = xas_error(&xas);
- if (err)
- return err;
-
- mr->num_buf = num_buf;
-
- return 0;
+err1:
+ free_mr_page_info(mr);
+err2:
+ ib_umem_release(umem);
+ return err;
}
int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr)
@@ -192,7 +232,7 @@ int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr)
/* always allow remote access for FMRs */
rxe_mr_init(RXE_ACCESS_REMOTE, mr);
- err = rxe_mr_alloc(mr, max_pages);
+ err = alloc_mr_page_info(mr, max_pages);
if (err)
goto err1;
@@ -205,26 +245,43 @@ int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr)
return err;
}
+/*
+ * I) MRs with page_size >= PAGE_SIZE,
+ * Split a large MR page (mr->page_size) into multiple PAGE_SIZE
+ * sub-pages and store them in page_info, offset is always 0.
+ *
+ * Called when mr->page_size > PAGE_SIZE. Each call to rxe_set_page()
+ * represents one mr->page_size region, which we must split into
+ * (mr->page_size >> PAGE_SHIFT) individual pages.
+ *
+ * II) MRs with page_size < PAGE_SIZE,
+ * Save each PAGE_SIZE page and its offset within the system page in page_info.
+ */
static int rxe_set_page(struct ib_mr *ibmr, u64 dma_addr)
{
struct rxe_mr *mr = to_rmr(ibmr);
- struct page *page = ib_virt_dma_to_page(dma_addr);
bool persistent = !!(mr->access & IB_ACCESS_FLUSH_PERSISTENT);
- int err;
+ u32 i, pages_per_mr = mr_page_size(mr) >> PAGE_SHIFT;
- if (persistent && !is_pmem_page(page)) {
- rxe_dbg_mr(mr, "Page cannot be persistent\n");
- return -EINVAL;
- }
+ pages_per_mr = MAX(1, pages_per_mr);
- if (unlikely(mr->nbuf == mr->num_buf))
- return -ENOMEM;
+ for (i = 0; i < pages_per_mr; i++) {
+ u64 addr = dma_addr + i * PAGE_SIZE;
+ struct page *sub_page = ib_virt_dma_to_page(addr);
- err = xa_err(xa_store(&mr->page_list, mr->nbuf, page, GFP_KERNEL));
- if (err)
- return err;
+ if (unlikely(mr->nbuf >= mr->max_allowed_buf))
+ return -ENOMEM;
+
+ if (persistent && !is_pmem_page(sub_page)) {
+ rxe_dbg_mr(mr, "Page cannot be persistent\n");
+ return -EINVAL;
+ }
+
+ mr->page_info[mr->nbuf].page = sub_page;
+ mr->page_info[mr->nbuf].offset = addr & (PAGE_SIZE - 1);
+ mr->nbuf++;
+ }
- mr->nbuf++;
return 0;
}
@@ -234,6 +291,31 @@ int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sgl,
struct rxe_mr *mr = to_rmr(ibmr);
unsigned int page_size = mr_page_size(mr);
+ /*
+ * Ensure page_size and PAGE_SIZE are compatible for mapping.
+ * We require one to be a multiple of the other for correct
+ * iova-to-page conversion.
+ */
+ if (!IS_ALIGNED(page_size, PAGE_SIZE) &&
+ !IS_ALIGNED(PAGE_SIZE, page_size)) {
+ rxe_dbg_mr(mr, "MR page size %u must be compatible with PAGE_SIZE %lu\n",
+ page_size, PAGE_SIZE);
+ return -EINVAL;
+ }
+
+ if (mr_page_size(mr) > PAGE_SIZE) {
+ /* resize page_info if needed */
+ u32 map_mr_pages = (page_size >> PAGE_SHIFT) * mr->num_buf;
+
+ if (map_mr_pages > mr->max_allowed_buf) {
+ rxe_dbg_mr(mr, "requested pages %u exceed max %u\n",
+ map_mr_pages, mr->max_allowed_buf);
+ free_mr_page_info(mr);
+ if (__alloc_mr_page_info(mr, map_mr_pages))
+ return -ENOMEM;
+ }
+ }
+
mr->nbuf = 0;
mr->page_shift = ilog2(page_size);
mr->page_mask = ~((u64)page_size - 1);
@@ -245,30 +327,30 @@ int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sgl,
static int rxe_mr_copy_xarray(struct rxe_mr *mr, u64 iova, void *addr,
unsigned int length, enum rxe_mr_copy_dir dir)
{
- unsigned int page_offset = rxe_mr_iova_to_page_offset(mr, iova);
- unsigned long index = rxe_mr_iova_to_index(mr, iova);
unsigned int bytes;
- struct page *page;
- void *va;
+ u8 *va;
while (length) {
- page = xa_load(&mr->page_list, index);
- if (!page)
+ unsigned long index = rxe_mr_iova_to_index(mr, iova);
+ struct rxe_mr_page *info = &mr->page_info[index];
+ unsigned int page_offset = rxe_mr_iova_to_page_offset(mr, iova);
+
+ if (!info->page)
return -EFAULT;
- bytes = min_t(unsigned int, length,
- mr_page_size(mr) - page_offset);
- va = kmap_local_page(page);
+ page_offset += info->offset;
+ bytes = min_t(unsigned int, length, PAGE_SIZE - page_offset);
+ va = kmap_local_page(info->page);
+
if (dir == RXE_FROM_MR_OBJ)
memcpy(addr, va + page_offset, bytes);
else
memcpy(va + page_offset, addr, bytes);
kunmap_local(va);
- page_offset = 0;
addr += bytes;
+ iova += bytes;
length -= bytes;
- index++;
}
return 0;
@@ -426,9 +508,6 @@ int copy_data(
static int rxe_mr_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length)
{
- unsigned int page_offset;
- unsigned long index;
- struct page *page;
unsigned int bytes;
int err;
u8 *va;
@@ -438,15 +517,17 @@ static int rxe_mr_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int leng
return err;
while (length > 0) {
- index = rxe_mr_iova_to_index(mr, iova);
- page = xa_load(&mr->page_list, index);
- page_offset = rxe_mr_iova_to_page_offset(mr, iova);
- if (!page)
+ unsigned long index = rxe_mr_iova_to_index(mr, iova);
+ struct rxe_mr_page *info = &mr->page_info[index];
+ unsigned int page_offset = rxe_mr_iova_to_page_offset(mr, iova);
+
+ if (!info->page)
return -EFAULT;
- bytes = min_t(unsigned int, length,
- mr_page_size(mr) - page_offset);
- va = kmap_local_page(page);
+ page_offset += info->offset;
+ bytes = min_t(unsigned int, length, PAGE_SIZE - page_offset);
+
+ va = kmap_local_page(info->page);
arch_wb_cache_pmem(va + page_offset, bytes);
kunmap_local(va);
@@ -501,6 +582,7 @@ enum resp_states rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,
} else {
unsigned long index;
int err;
+ struct rxe_mr_page *info;
err = mr_check_range(mr, iova, sizeof(value));
if (err) {
@@ -509,9 +591,12 @@ enum resp_states rxe_mr_do_atomic_op(struct rxe_mr *mr, u64 iova, int opcode,
}
page_offset = rxe_mr_iova_to_page_offset(mr, iova);
index = rxe_mr_iova_to_index(mr, iova);
- page = xa_load(&mr->page_list, index);
- if (!page)
+ info = &mr->page_info[index];
+ if (!info->page)
return RESPST_ERR_RKEY_VIOLATION;
+
+ page_offset += info->offset;
+ page = info->page;
}
if (unlikely(page_offset & 0x7)) {
@@ -550,6 +635,7 @@ enum resp_states rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)
} else {
unsigned long index;
int err;
+ struct rxe_mr_page *info;
/* See IBA oA19-28 */
err = mr_check_range(mr, iova, sizeof(value));
@@ -559,9 +645,12 @@ enum resp_states rxe_mr_do_atomic_write(struct rxe_mr *mr, u64 iova, u64 value)
}
page_offset = rxe_mr_iova_to_page_offset(mr, iova);
index = rxe_mr_iova_to_index(mr, iova);
- page = xa_load(&mr->page_list, index);
- if (!page)
+ info = &mr->page_info[index];
+ if (!info->page)
return RESPST_ERR_RKEY_VIOLATION;
+
+ page_offset += info->offset;
+ page = info->page;
}
/* See IBA A19.4.2 */
@@ -725,5 +814,5 @@ void rxe_mr_cleanup(struct rxe_pool_elem *elem)
ib_umem_release(mr->umem);
if (mr->ibmr.type != IB_MR_TYPE_DMA)
- xa_destroy(&mr->page_list);
+ free_mr_page_info(mr);
}
diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
index 373b03f223be..12d03f390b09 100644
--- a/drivers/infiniband/sw/rxe/rxe_req.c
+++ b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -102,6 +102,8 @@ void rnr_nak_timer(struct timer_list *t)
rxe_dbg_qp(qp, "nak timer fired\n");
+ if (!rxe_get(qp))
+ return;
spin_lock_irqsave(&qp->state_lock, flags);
if (qp->valid) {
/* request a send queue retry */
@@ -110,6 +112,7 @@ void rnr_nak_timer(struct timer_list *t)
rxe_sched_task(&qp->send_task);
}
spin_unlock_irqrestore(&qp->state_lock, flags);
+ rxe_put(qp);
}
static void req_check_sq_drain_done(struct rxe_qp *qp)
diff --git a/drivers/infiniband/sw/rxe/rxe_srq.c b/drivers/infiniband/sw/rxe/rxe_srq.c
index 2a234f26ac10..c9a7cd38953d 100644
--- a/drivers/infiniband/sw/rxe/rxe_srq.c
+++ b/drivers/infiniband/sw/rxe/rxe_srq.c
@@ -77,9 +77,6 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq,
goto err_free;
}
- srq->rq.queue = q;
- init->attr.max_wr = srq->rq.max_wr;
-
if (uresp) {
if (copy_to_user(&uresp->srq_num, &srq->srq_num,
sizeof(uresp->srq_num))) {
@@ -88,6 +85,9 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq,
}
}
+ srq->rq.queue = q;
+ init->attr.max_wr = srq->rq.max_wr;
+
return 0;
err_free:
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index fd48075810dd..1b8ed1031bd5 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -335,6 +335,11 @@ static inline int rkey_is_mw(u32 rkey)
return (index >= RXE_MIN_MW_INDEX) && (index <= RXE_MAX_MW_INDEX);
}
+struct rxe_mr_page {
+ struct page *page;
+ unsigned int offset; /* offset in system page */
+};
+
struct rxe_mr {
struct rxe_pool_elem elem;
struct ib_mr ibmr;
@@ -351,10 +356,13 @@ struct rxe_mr {
unsigned int page_shift;
u64 page_mask;
+ /* size of page_info when mr allocated */
u32 num_buf;
+ /* real size of page_info */
+ u32 max_allowed_buf;
u32 nbuf;
- struct xarray page_list;
+ struct rxe_mr_page *page_info;
};
static inline unsigned int mr_page_size(struct rxe_mr *mr)
diff --git a/drivers/infiniband/sw/siw/siw_qp_rx.c b/drivers/infiniband/sw/siw/siw_qp_rx.c
index a10820e33887..e8a88b378d51 100644
--- a/drivers/infiniband/sw/siw/siw_qp_rx.c
+++ b/drivers/infiniband/sw/siw/siw_qp_rx.c
@@ -1435,7 +1435,8 @@ int siw_tcp_rx_data(read_descriptor_t *rd_desc, struct sk_buff *skb,
}
if (unlikely(rv != 0 && rv != -EAGAIN)) {
if ((srx->state > SIW_GET_HDR ||
- qp->rx_fpdu->more_ddp_segs) && run_completion)
+ (qp->rx_fpdu && qp->rx_fpdu->more_ddp_segs)) &&
+ run_completion)
siw_rdmap_complete(qp, rv);
siw_dbg_qp(qp, "rx error %d, rx state %d\n", rv,
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 9ecc6343455d..adb798e2a54a 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -208,7 +208,6 @@ static int rdma_write_sg(struct rtrs_srv_op *id)
size_t sg_cnt;
int err, offset;
bool need_inval;
- u32 rkey = 0;
struct ib_reg_wr rwr;
struct ib_sge *plist;
struct ib_sge list;
@@ -240,11 +239,6 @@ static int rdma_write_sg(struct rtrs_srv_op *id)
wr->wr.num_sge = 1;
wr->remote_addr = le64_to_cpu(id->rd_msg->desc[0].addr);
wr->rkey = le32_to_cpu(id->rd_msg->desc[0].key);
- if (rkey == 0)
- rkey = wr->rkey;
- else
- /* Only one key is actually used */
- WARN_ON_ONCE(rkey != wr->rkey);
wr->wr.opcode = IB_WR_RDMA_WRITE;
wr->wr.wr_cqe = &io_comp_cqe;
@@ -277,7 +271,7 @@ static int rdma_write_sg(struct rtrs_srv_op *id)
inv_wr.opcode = IB_WR_SEND_WITH_INV;
inv_wr.wr_cqe = &io_comp_cqe;
inv_wr.send_flags = 0;
- inv_wr.ex.invalidate_rkey = rkey;
+ inv_wr.ex.invalidate_rkey = wr->rkey;
}
imm_wr.wr.next = NULL;
@@ -601,7 +595,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)
srv_path->mrs_num++) {
struct rtrs_srv_mr *srv_mr = &srv_path->mrs[srv_path->mrs_num];
struct scatterlist *s;
- int nr, nr_sgt, chunks;
+ int nr, nr_sgt, chunks, ind;
sgt = &srv_mr->sgt;
chunks = chunks_per_mr * srv_path->mrs_num;
@@ -631,7 +625,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)
}
nr = ib_map_mr_sg(mr, sgt->sgl, nr_sgt,
NULL, max_chunk_size);
- if (nr != nr_sgt) {
+ if (nr < nr_sgt) {
err = nr < 0 ? nr : -EINVAL;
goto dereg_mr;
}
@@ -647,9 +641,24 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)
goto dereg_mr;
}
}
- /* Eventually dma addr for each chunk can be cached */
- for_each_sg(sgt->sgl, s, nr_sgt, i)
- srv_path->dma_addr[chunks + i] = sg_dma_address(s);
+
+ /*
+ * Cache DMA addresses by traversing sg entries. If
+ * regions were merged, an inner loop is required to
+ * populate the DMA address array by traversing larger
+ * regions.
+ */
+ ind = chunks;
+ for_each_sg(sgt->sgl, s, nr_sgt, i) {
+ unsigned int dma_len = sg_dma_len(s);
+ u64 dma_addr = sg_dma_address(s);
+ u64 dma_addr_end = dma_addr + dma_len;
+
+ do {
+ srv_path->dma_addr[ind++] = dma_addr;
+ dma_addr += max_chunk_size;
+ } while (dma_addr < dma_addr_end);
+ }
ib_update_fast_reg_key(mr, ib_inc_rkey(mr->rkey));
srv_mr->mr = mr;
diff --git a/drivers/interconnect/mediatek/icc-emi.c b/drivers/interconnect/mediatek/icc-emi.c
index 7da740b5fa8d..dfa3a9cd9399 100644
--- a/drivers/interconnect/mediatek/icc-emi.c
+++ b/drivers/interconnect/mediatek/icc-emi.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h>
+#include <linux/overflow.h>
#include <linux/platform_device.h>
#include <linux/soc/mediatek/dvfsrc.h>
@@ -22,7 +23,9 @@ static int mtk_emi_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,
{
struct mtk_icc_node *in = node->data;
- *agg_avg += avg_bw;
+ if (check_add_overflow(*agg_avg, avg_bw, agg_avg))
+ *agg_avg = U32_MAX;
+
*agg_peak = max_t(u32, *agg_peak, peak_bw);
in->sum_avg = *agg_avg;
@@ -40,7 +43,7 @@ static int mtk_emi_icc_set(struct icc_node *src, struct icc_node *dst)
if (unlikely(!src->provider))
return -EINVAL;
- dev = src->provider->dev;
+ dev = src->provider->dev->parent;
switch (node->ep) {
case 0:
@@ -97,7 +100,7 @@ int mtk_emi_icc_probe(struct platform_device *pdev)
if (!data)
return -ENOMEM;
- provider->dev = pdev->dev.parent;
+ provider->dev = dev;
provider->set = mtk_emi_icc_set;
provider->aggregate = mtk_emi_icc_aggregate;
provider->xlate = of_icc_xlate_onecell;
diff --git a/drivers/interconnect/qcom/qcs8300.c b/drivers/interconnect/qcom/qcs8300.c
index 70a377bbcf29..bc403a9bf68c 100644
--- a/drivers/interconnect/qcom/qcs8300.c
+++ b/drivers/interconnect/qcom/qcs8300.c
@@ -629,7 +629,7 @@ static struct qcom_icc_node qxm_nsp = {
.name = "qxm_nsp",
.channels = 2,
.buswidth = 32,
- .num_links = 1,
+ .num_links = 2,
.link_nodes = { &qns_hcp, &qns_nsp_gemnoc },
};
diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index b742ef1adb35..df1c238dc888 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -15,7 +15,6 @@ irqreturn_t amd_iommu_int_thread(int irq, void *data);
irqreturn_t amd_iommu_int_thread_evtlog(int irq, void *data);
irqreturn_t amd_iommu_int_thread_pprlog(int irq, void *data);
irqreturn_t amd_iommu_int_thread_galog(int irq, void *data);
-irqreturn_t amd_iommu_int_handler(int irq, void *data);
void amd_iommu_restart_log(struct amd_iommu *iommu, const char *evt_type,
u8 cntrl_intr, u8 cntrl_log,
u32 status_run_mask, u32 status_overflow_mask);
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 384c90b4f90a..62a7a718acf8 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -2356,12 +2356,8 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
if (r)
return r;
- r = request_threaded_irq(iommu->dev->irq,
- amd_iommu_int_handler,
- amd_iommu_int_thread,
- 0, "AMD-Vi",
- iommu);
-
+ r = request_threaded_irq(iommu->dev->irq, NULL, amd_iommu_int_thread,
+ IRQF_ONESHOT, "AMD-Vi", iommu);
if (r) {
pci_disable_msi(iommu->dev);
return r;
@@ -2535,8 +2531,8 @@ static int __iommu_setup_intcapxt(struct amd_iommu *iommu, const char *devname,
return irq;
}
- ret = request_threaded_irq(irq, amd_iommu_int_handler,
- thread_fn, 0, devname, iommu);
+ ret = request_threaded_irq(irq, NULL, thread_fn, IRQF_ONESHOT, devname,
+ iommu);
if (ret) {
irq_domain_free_irqs(irq, 1);
irq_domain_remove(domain);
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 7c12be1b247f..0f9045ce93af 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1151,11 +1151,6 @@ irqreturn_t amd_iommu_int_thread(int irq, void *data)
return IRQ_HANDLED;
}
-irqreturn_t amd_iommu_int_handler(int irq, void *data)
-{
- return IRQ_WAKE_THREAD;
-}
-
/****************************************************************************
*
* IOMMU command queuing functions
diff --git a/drivers/iommu/generic_pt/fmt/amdv1.h b/drivers/iommu/generic_pt/fmt/amdv1.h
index aa8e1a8ec95f..3b2c41d9654d 100644
--- a/drivers/iommu/generic_pt/fmt/amdv1.h
+++ b/drivers/iommu/generic_pt/fmt/amdv1.h
@@ -354,7 +354,8 @@ static inline int amdv1pt_iommu_set_prot(struct pt_common *common,
* Ideally we'd have an IOMMU_ENCRYPTED flag set by higher levels to
* control this. For now if the tables use sme_set then so do the ptes.
*/
- if (pt_feature(common, PT_FEAT_AMDV1_ENCRYPT_TABLES))
+ if (pt_feature(common, PT_FEAT_AMDV1_ENCRYPT_TABLES) &&
+ !(iommu_prot & IOMMU_MMIO))
pte = __sme_set(pte);
attrs->descriptor_bits = pte;
diff --git a/drivers/iommu/generic_pt/fmt/x86_64.h b/drivers/iommu/generic_pt/fmt/x86_64.h
index 210748d9d6e8..ed9a47cbb6e0 100644
--- a/drivers/iommu/generic_pt/fmt/x86_64.h
+++ b/drivers/iommu/generic_pt/fmt/x86_64.h
@@ -227,7 +227,8 @@ static inline int x86_64_pt_iommu_set_prot(struct pt_common *common,
* Ideally we'd have an IOMMU_ENCRYPTED flag set by higher levels to
* control this. For now if the tables use sme_set then so do the ptes.
*/
- if (pt_feature(common, PT_FEAT_X86_64_AMD_ENCRYPT_TABLES))
+ if (pt_feature(common, PT_FEAT_X86_64_AMD_ENCRYPT_TABLES) &&
+ !(iommu_prot & IOMMU_MMIO))
pte = __sme_set(pte);
attrs->descriptor_bits = pte;
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 134302fbcd92..705828b06e32 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1240,22 +1240,22 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8
}
did = context_domain_id(context);
- context_clear_entry(context);
+ context_clear_present(context);
__iommu_flush_cache(iommu, context, sizeof(*context));
spin_unlock(&iommu->lock);
intel_context_flush_no_pasid(info, context, did);
+ context_clear_entry(context);
+ __iommu_flush_cache(iommu, context, sizeof(*context));
}
int __domain_setup_first_level(struct intel_iommu *iommu, struct device *dev,
ioasid_t pasid, u16 did, phys_addr_t fsptptr,
int flags, struct iommu_domain *old)
{
- if (!old)
- return intel_pasid_setup_first_level(iommu, dev, fsptptr, pasid,
- did, flags);
- return intel_pasid_replace_first_level(iommu, dev, fsptptr, pasid, did,
- iommu_domain_did(old, iommu),
- flags);
+ if (old)
+ intel_pasid_tear_down_entry(iommu, dev, pasid, false);
+
+ return intel_pasid_setup_first_level(iommu, dev, fsptptr, pasid, did, flags);
}
static int domain_setup_second_level(struct intel_iommu *iommu,
@@ -1263,23 +1263,20 @@ static int domain_setup_second_level(struct intel_iommu *iommu,
struct device *dev, ioasid_t pasid,
struct iommu_domain *old)
{
- if (!old)
- return intel_pasid_setup_second_level(iommu, domain,
- dev, pasid);
- return intel_pasid_replace_second_level(iommu, domain, dev,
- iommu_domain_did(old, iommu),
- pasid);
+ if (old)
+ intel_pasid_tear_down_entry(iommu, dev, pasid, false);
+
+ return intel_pasid_setup_second_level(iommu, domain, dev, pasid);
}
static int domain_setup_passthrough(struct intel_iommu *iommu,
struct device *dev, ioasid_t pasid,
struct iommu_domain *old)
{
- if (!old)
- return intel_pasid_setup_pass_through(iommu, dev, pasid);
- return intel_pasid_replace_pass_through(iommu, dev,
- iommu_domain_did(old, iommu),
- pasid);
+ if (old)
+ intel_pasid_tear_down_entry(iommu, dev, pasid, false);
+
+ return intel_pasid_setup_pass_through(iommu, dev, pasid);
}
static int domain_setup_first_level(struct intel_iommu *iommu,
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 25c5e22096d4..599913fb65d5 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -900,7 +900,26 @@ static inline int pfn_level_offset(u64 pfn, int level)
static inline void context_set_present(struct context_entry *context)
{
- context->lo |= 1;
+ u64 val;
+
+ dma_wmb();
+ val = READ_ONCE(context->lo) | 1;
+ WRITE_ONCE(context->lo, val);
+}
+
+/*
+ * Clear the Present (P) bit (bit 0) of a context table entry. This initiates
+ * the transition of the entry's ownership from hardware to software. The
+ * caller is responsible for fulfilling the invalidation handshake recommended
+ * by the VT-d spec, Section 6.5.3.3 (Guidance to Software for Invalidations).
+ */
+static inline void context_clear_present(struct context_entry *context)
+{
+ u64 val;
+
+ val = READ_ONCE(context->lo) & GENMASK_ULL(63, 1);
+ WRITE_ONCE(context->lo, val);
+ dma_wmb();
}
static inline void context_set_fault_enable(struct context_entry *context)
diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c
index a3fb8c193ca6..e9a440e9c960 100644
--- a/drivers/iommu/intel/nested.c
+++ b/drivers/iommu/intel/nested.c
@@ -136,11 +136,10 @@ static int domain_setup_nested(struct intel_iommu *iommu,
struct device *dev, ioasid_t pasid,
struct iommu_domain *old)
{
- if (!old)
- return intel_pasid_setup_nested(iommu, dev, pasid, domain);
- return intel_pasid_replace_nested(iommu, dev, pasid,
- iommu_domain_did(old, iommu),
- domain);
+ if (old)
+ intel_pasid_tear_down_entry(iommu, dev, pasid, false);
+
+ return intel_pasid_setup_nested(iommu, dev, pasid, domain);
}
static int intel_nested_set_dev_pasid(struct iommu_domain *domain,
diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c
index 3e2255057079..34b209b88be2 100644
--- a/drivers/iommu/intel/pasid.c
+++ b/drivers/iommu/intel/pasid.c
@@ -153,6 +153,9 @@ static struct pasid_entry *intel_pasid_get_entry(struct device *dev, u32 pasid)
if (!entries)
return NULL;
+ if (!ecap_coherent(info->iommu->ecap))
+ clflush_cache_range(entries, VTD_PAGE_SIZE);
+
/*
* The pasid directory table entry won't be freed after
* allocation. No worry about the race with free and
@@ -165,10 +168,8 @@ static struct pasid_entry *intel_pasid_get_entry(struct device *dev, u32 pasid)
iommu_free_pages(entries);
goto retry;
}
- if (!ecap_coherent(info->iommu->ecap)) {
- clflush_cache_range(entries, VTD_PAGE_SIZE);
+ if (!ecap_coherent(info->iommu->ecap))
clflush_cache_range(&dir[dir_index].val, sizeof(*dir));
- }
}
return &entries[index];
@@ -272,7 +273,7 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,
did = pasid_get_domain_id(pte);
pgtt = pasid_pte_get_pgtt(pte);
- intel_pasid_clear_entry(dev, pasid, fault_ignore);
+ pasid_clear_present(pte);
spin_unlock(&iommu->lock);
if (!ecap_coherent(iommu->ecap))
@@ -286,6 +287,10 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,
iommu->flush.flush_iotlb(iommu, did, 0, 0, DMA_TLB_DSI_FLUSH);
devtlb_invalidation_with_pasid(iommu, dev, pasid);
+ intel_pasid_clear_entry(dev, pasid, fault_ignore);
+ if (!ecap_coherent(iommu->ecap))
+ clflush_cache_range(pte, sizeof(*pte));
+
if (!fault_ignore)
intel_iommu_drain_pasid_prq(dev, pasid);
}
@@ -412,50 +417,6 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, struct device *dev,
return 0;
}
-int intel_pasid_replace_first_level(struct intel_iommu *iommu,
- struct device *dev, phys_addr_t fsptptr,
- u32 pasid, u16 did, u16 old_did,
- int flags)
-{
- struct pasid_entry *pte, new_pte;
-
- if (!ecap_flts(iommu->ecap)) {
- pr_err("No first level translation support on %s\n",
- iommu->name);
- return -EINVAL;
- }
-
- if ((flags & PASID_FLAG_FL5LP) && !cap_fl5lp_support(iommu->cap)) {
- pr_err("No 5-level paging support for first-level on %s\n",
- iommu->name);
- return -EINVAL;
- }
-
- pasid_pte_config_first_level(iommu, &new_pte, fsptptr, did, flags);
-
- spin_lock(&iommu->lock);
- pte = intel_pasid_get_entry(dev, pasid);
- if (!pte) {
- spin_unlock(&iommu->lock);
- return -ENODEV;
- }
-
- if (!pasid_pte_is_present(pte)) {
- spin_unlock(&iommu->lock);
- return -EINVAL;
- }
-
- WARN_ON(old_did != pasid_get_domain_id(pte));
-
- *pte = new_pte;
- spin_unlock(&iommu->lock);
-
- intel_pasid_flush_present(iommu, dev, pasid, old_did, pte);
- intel_iommu_drain_pasid_prq(dev, pasid);
-
- return 0;
-}
-
/*
* Set up the scalable mode pasid entry for second only translation type.
*/
@@ -522,51 +483,6 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,
return 0;
}
-int intel_pasid_replace_second_level(struct intel_iommu *iommu,
- struct dmar_domain *domain,
- struct device *dev, u16 old_did,
- u32 pasid)
-{
- struct pasid_entry *pte, new_pte;
- u16 did;
-
- /*
- * If hardware advertises no support for second level
- * translation, return directly.
- */
- if (!ecap_slts(iommu->ecap)) {
- pr_err("No second level translation support on %s\n",
- iommu->name);
- return -EINVAL;
- }
-
- did = domain_id_iommu(domain, iommu);
-
- pasid_pte_config_second_level(iommu, &new_pte, domain, did);
-
- spin_lock(&iommu->lock);
- pte = intel_pasid_get_entry(dev, pasid);
- if (!pte) {
- spin_unlock(&iommu->lock);
- return -ENODEV;
- }
-
- if (!pasid_pte_is_present(pte)) {
- spin_unlock(&iommu->lock);
- return -EINVAL;
- }
-
- WARN_ON(old_did != pasid_get_domain_id(pte));
-
- *pte = new_pte;
- spin_unlock(&iommu->lock);
-
- intel_pasid_flush_present(iommu, dev, pasid, old_did, pte);
- intel_iommu_drain_pasid_prq(dev, pasid);
-
- return 0;
-}
-
/*
* Set up dirty tracking on a second only or nested translation type.
*/
@@ -679,38 +595,6 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,
return 0;
}
-int intel_pasid_replace_pass_through(struct intel_iommu *iommu,
- struct device *dev, u16 old_did,
- u32 pasid)
-{
- struct pasid_entry *pte, new_pte;
- u16 did = FLPT_DEFAULT_DID;
-
- pasid_pte_config_pass_through(iommu, &new_pte, did);
-
- spin_lock(&iommu->lock);
- pte = intel_pasid_get_entry(dev, pasid);
- if (!pte) {
- spin_unlock(&iommu->lock);
- return -ENODEV;
- }
-
- if (!pasid_pte_is_present(pte)) {
- spin_unlock(&iommu->lock);
- return -EINVAL;
- }
-
- WARN_ON(old_did != pasid_get_domain_id(pte));
-
- *pte = new_pte;
- spin_unlock(&iommu->lock);
-
- intel_pasid_flush_present(iommu, dev, pasid, old_did, pte);
- intel_iommu_drain_pasid_prq(dev, pasid);
-
- return 0;
-}
-
/*
* Set the page snoop control for a pasid entry which has been set up.
*/
@@ -844,69 +728,6 @@ int intel_pasid_setup_nested(struct intel_iommu *iommu, struct device *dev,
return 0;
}
-int intel_pasid_replace_nested(struct intel_iommu *iommu,
- struct device *dev, u32 pasid,
- u16 old_did, struct dmar_domain *domain)
-{
- struct iommu_hwpt_vtd_s1 *s1_cfg = &domain->s1_cfg;
- struct dmar_domain *s2_domain = domain->s2_domain;
- u16 did = domain_id_iommu(domain, iommu);
- struct pasid_entry *pte, new_pte;
-
- /* Address width should match the address width supported by hardware */
- switch (s1_cfg->addr_width) {
- case ADDR_WIDTH_4LEVEL:
- break;
- case ADDR_WIDTH_5LEVEL:
- if (!cap_fl5lp_support(iommu->cap)) {
- dev_err_ratelimited(dev,
- "5-level paging not supported\n");
- return -EINVAL;
- }
- break;
- default:
- dev_err_ratelimited(dev, "Invalid stage-1 address width %d\n",
- s1_cfg->addr_width);
- return -EINVAL;
- }
-
- if ((s1_cfg->flags & IOMMU_VTD_S1_SRE) && !ecap_srs(iommu->ecap)) {
- pr_err_ratelimited("No supervisor request support on %s\n",
- iommu->name);
- return -EINVAL;
- }
-
- if ((s1_cfg->flags & IOMMU_VTD_S1_EAFE) && !ecap_eafs(iommu->ecap)) {
- pr_err_ratelimited("No extended access flag support on %s\n",
- iommu->name);
- return -EINVAL;
- }
-
- pasid_pte_config_nestd(iommu, &new_pte, s1_cfg, s2_domain, did);
-
- spin_lock(&iommu->lock);
- pte = intel_pasid_get_entry(dev, pasid);
- if (!pte) {
- spin_unlock(&iommu->lock);
- return -ENODEV;
- }
-
- if (!pasid_pte_is_present(pte)) {
- spin_unlock(&iommu->lock);
- return -EINVAL;
- }
-
- WARN_ON(old_did != pasid_get_domain_id(pte));
-
- *pte = new_pte;
- spin_unlock(&iommu->lock);
-
- intel_pasid_flush_present(iommu, dev, pasid, old_did, pte);
- intel_iommu_drain_pasid_prq(dev, pasid);
-
- return 0;
-}
-
/*
* Interfaces to setup or teardown a pasid table to the scalable-mode
* context table entry:
@@ -1019,7 +840,7 @@ static int device_pasid_table_setup(struct device *dev, u8 bus, u8 devfn)
}
if (context_copied(iommu, bus, devfn)) {
- context_clear_entry(context);
+ context_clear_present(context);
__iommu_flush_cache(iommu, context, sizeof(*context));
/*
@@ -1039,6 +860,9 @@ static int device_pasid_table_setup(struct device *dev, u8 bus, u8 devfn)
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
devtlb_invalidation_with_pasid(iommu, dev, IOMMU_NO_PASID);
+ context_clear_entry(context);
+ __iommu_flush_cache(iommu, context, sizeof(*context));
+
/*
* At this point, the device is supposed to finish reset at
* its driver probe stage, so no in-flight DMA will exist,
diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h
index 3809793e0259..48d3bb6b68de 100644
--- a/drivers/iommu/intel/pasid.h
+++ b/drivers/iommu/intel/pasid.h
@@ -234,9 +234,23 @@ static inline void pasid_set_wpe(struct pasid_entry *pe)
*/
static inline void pasid_set_present(struct pasid_entry *pe)
{
+ dma_wmb();
pasid_set_bits(&pe->val[0], 1 << 0, 1);
}
+/*
+ * Clear the Present (P) bit (bit 0) of a scalable-mode PASID table entry.
+ * This initiates the transition of the entry's ownership from hardware
+ * to software. The caller is responsible for fulfilling the invalidation
+ * handshake recommended by the VT-d spec, Section 6.5.3.3 (Guidance to
+ * Software for Invalidations).
+ */
+static inline void pasid_clear_present(struct pasid_entry *pe)
+{
+ pasid_set_bits(&pe->val[0], 1 << 0, 0);
+ dma_wmb();
+}
+
/*
* Setup Page Walk Snoop bit (Bit 87) of a scalable mode PASID
* entry.
@@ -302,20 +316,6 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,
struct device *dev, u32 pasid);
int intel_pasid_setup_nested(struct intel_iommu *iommu, struct device *dev,
u32 pasid, struct dmar_domain *domain);
-int intel_pasid_replace_first_level(struct intel_iommu *iommu,
- struct device *dev, phys_addr_t fsptptr,
- u32 pasid, u16 did, u16 old_did, int flags);
-int intel_pasid_replace_second_level(struct intel_iommu *iommu,
- struct dmar_domain *domain,
- struct device *dev, u16 old_did,
- u32 pasid);
-int intel_pasid_replace_pass_through(struct intel_iommu *iommu,
- struct device *dev, u16 old_did,
- u32 pasid);
-int intel_pasid_replace_nested(struct intel_iommu *iommu,
- struct device *dev, u32 pasid,
- u16 old_did, struct dmar_domain *domain);
-
void intel_pasid_tear_down_entry(struct intel_iommu *iommu,
struct device *dev, u32 pasid,
bool fault_ignore);
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 210a57959637..60fd8f91762b 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -68,15 +68,17 @@
#define PLIC_QUIRK_CP100_CLAIM_REGISTER_ERRATUM 1
struct plic_priv {
- struct fwnode_handle *fwnode;
- struct cpumask lmask;
- struct irq_domain *irqdomain;
- void __iomem *regs;
- unsigned long plic_quirks;
- unsigned int nr_irqs;
- unsigned long *prio_save;
- u32 gsi_base;
- int acpi_plic_id;
+ struct fwnode_handle *fwnode;
+ struct cpumask lmask;
+ struct irq_domain *irqdomain;
+ void __iomem *regs;
+ unsigned long plic_quirks;
+ /* device interrupts + 1 to compensate for the reserved hwirq 0 */
+ unsigned int __private total_irqs;
+ unsigned int irq_groups;
+ unsigned long *prio_save;
+ u32 gsi_base;
+ int acpi_plic_id;
};
struct plic_handler {
@@ -91,6 +93,12 @@ struct plic_handler {
u32 *enable_save;
struct plic_priv *priv;
};
+
+/*
+ * Macro to deal with the insanity of hardware interrupt 0 being reserved */
+#define for_each_device_irq(iter, priv) \
+ for (unsigned int iter = 1; iter < ACCESS_PRIVATE(priv, total_irqs); iter++)
+
static int plic_parent_irq __ro_after_init;
static bool plic_global_setup_done __ro_after_init;
static DEFINE_PER_CPU(struct plic_handler, plic_handlers);
@@ -257,14 +265,11 @@ static int plic_irq_set_type(struct irq_data *d, unsigned int type)
static int plic_irq_suspend(void *data)
{
- struct plic_priv *priv;
-
- priv = per_cpu_ptr(&plic_handlers, smp_processor_id())->priv;
+ struct plic_priv *priv = this_cpu_ptr(&plic_handlers)->priv;
- /* irq ID 0 is reserved */
- for (unsigned int i = 1; i < priv->nr_irqs; i++) {
- __assign_bit(i, priv->prio_save,
- readl(priv->regs + PRIORITY_BASE + i * PRIORITY_PER_ID));
+ for_each_device_irq(irq, priv) {
+ __assign_bit(irq, priv->prio_save,
+ readl(priv->regs + PRIORITY_BASE + irq * PRIORITY_PER_ID));
}
return 0;
@@ -272,18 +277,15 @@ static int plic_irq_suspend(void *data)
static void plic_irq_resume(void *data)
{
- unsigned int i, index, cpu;
+ struct plic_priv *priv = this_cpu_ptr(&plic_handlers)->priv;
+ unsigned int index, cpu;
unsigned long flags;
u32 __iomem *reg;
- struct plic_priv *priv;
-
- priv = per_cpu_ptr(&plic_handlers, smp_processor_id())->priv;
- /* irq ID 0 is reserved */
- for (i = 1; i < priv->nr_irqs; i++) {
- index = BIT_WORD(i);
- writel((priv->prio_save[index] & BIT_MASK(i)) ? 1 : 0,
- priv->regs + PRIORITY_BASE + i * PRIORITY_PER_ID);
+ for_each_device_irq(irq, priv) {
+ index = BIT_WORD(irq);
+ writel((priv->prio_save[index] & BIT_MASK(irq)) ? 1 : 0,
+ priv->regs + PRIORITY_BASE + irq * PRIORITY_PER_ID);
}
for_each_present_cpu(cpu) {
@@ -293,7 +295,7 @@ static void plic_irq_resume(void *data)
continue;
raw_spin_lock_irqsave(&handler->enable_lock, flags);
- for (i = 0; i < DIV_ROUND_UP(priv->nr_irqs, 32); i++) {
+ for (unsigned int i = 0; i < priv->irq_groups; i++) {
reg = handler->enable_base + i * sizeof(u32);
writel(handler->enable_save[i], reg);
}
@@ -431,7 +433,7 @@ static u32 cp100_isolate_pending_irq(int nr_irq_groups, struct plic_handler *han
static irq_hw_number_t cp100_get_hwirq(struct plic_handler *handler, void __iomem *claim)
{
- int nr_irq_groups = DIV_ROUND_UP(handler->priv->nr_irqs, 32);
+ int nr_irq_groups = handler->priv->irq_groups;
u32 __iomem *enable = handler->enable_base;
irq_hw_number_t hwirq = 0;
u32 iso_mask;
@@ -614,7 +616,6 @@ static int plic_probe(struct fwnode_handle *fwnode)
struct plic_handler *handler;
u32 nr_irqs, parent_hwirq;
struct plic_priv *priv;
- irq_hw_number_t hwirq;
void __iomem *regs;
int id, context_id;
u32 gsi_base;
@@ -647,7 +648,16 @@ static int plic_probe(struct fwnode_handle *fwnode)
priv->fwnode = fwnode;
priv->plic_quirks = plic_quirks;
- priv->nr_irqs = nr_irqs;
+ /*
+ * The firmware provides the number of device interrupts. As
+ * hardware interrupt 0 is reserved, the number of total interrupts
+ * is nr_irqs + 1.
+ */
+ nr_irqs++;
+ ACCESS_PRIVATE(priv, total_irqs) = nr_irqs;
+ /* Precalculate the number of register groups */
+ priv->irq_groups = DIV_ROUND_UP(nr_irqs, 32);
+
priv->regs = regs;
priv->gsi_base = gsi_base;
priv->acpi_plic_id = id;
@@ -686,7 +696,7 @@ static int plic_probe(struct fwnode_handle *fwnode)
u32 __iomem *enable_base = priv->regs + CONTEXT_ENABLE_BASE +
i * CONTEXT_ENABLE_SIZE;
- for (int j = 0; j <= nr_irqs / 32; j++)
+ for (int j = 0; j < priv->irq_groups; j++)
writel(0, enable_base + j);
}
continue;
@@ -718,23 +728,21 @@ static int plic_probe(struct fwnode_handle *fwnode)
context_id * CONTEXT_ENABLE_SIZE;
handler->priv = priv;
- handler->enable_save = kcalloc(DIV_ROUND_UP(nr_irqs, 32),
- sizeof(*handler->enable_save), GFP_KERNEL);
+ handler->enable_save = kcalloc(priv->irq_groups, sizeof(*handler->enable_save),
+ GFP_KERNEL);
if (!handler->enable_save) {
error = -ENOMEM;
goto fail_cleanup_contexts;
}
done:
- for (hwirq = 1; hwirq <= nr_irqs; hwirq++) {
+ for_each_device_irq(hwirq, priv) {
plic_toggle(handler, hwirq, 0);
- writel(1, priv->regs + PRIORITY_BASE +
- hwirq * PRIORITY_PER_ID);
+ writel(1, priv->regs + PRIORITY_BASE + hwirq * PRIORITY_PER_ID);
}
nr_handlers++;
}
- priv->irqdomain = irq_domain_create_linear(fwnode, nr_irqs + 1,
- &plic_irqdomain_ops, priv);
+ priv->irqdomain = irq_domain_create_linear(fwnode, nr_irqs, &plic_irqdomain_ops, priv);
if (WARN_ON(!priv->irqdomain)) {
error = -ENOMEM;
goto fail_cleanup_contexts;
diff --git a/drivers/leds/leds-expresswire.c b/drivers/leds/leds-expresswire.c
index bb69be228a6d..25c6b159a6ee 100644
--- a/drivers/leds/leds-expresswire.c
+++ b/drivers/leds/leds-expresswire.c
@@ -9,6 +9,7 @@
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/gpio/consumer.h>
+#include <linux/irqflags.h>
#include <linux/types.h>
#include <linux/leds-expresswire.h>
@@ -16,37 +17,41 @@
void expresswire_power_off(struct expresswire_common_props *props)
{
gpiod_set_value_cansleep(props->ctrl_gpio, 0);
- usleep_range(props->timing.poweroff_us, props->timing.poweroff_us * 2);
+ fsleep(props->timing.poweroff_us);
}
EXPORT_SYMBOL_NS_GPL(expresswire_power_off, "EXPRESSWIRE");
void expresswire_enable(struct expresswire_common_props *props)
{
+ unsigned long flags;
+
+ local_irq_save(flags);
+
gpiod_set_value(props->ctrl_gpio, 1);
udelay(props->timing.detect_delay_us);
gpiod_set_value(props->ctrl_gpio, 0);
udelay(props->timing.detect_us);
gpiod_set_value(props->ctrl_gpio, 1);
+
+ local_irq_restore(flags);
}
EXPORT_SYMBOL_NS_GPL(expresswire_enable, "EXPRESSWIRE");
-void expresswire_start(struct expresswire_common_props *props)
+static void expresswire_start(struct expresswire_common_props *props)
{
gpiod_set_value(props->ctrl_gpio, 1);
udelay(props->timing.data_start_us);
}
-EXPORT_SYMBOL_NS_GPL(expresswire_start, "EXPRESSWIRE");
-void expresswire_end(struct expresswire_common_props *props)
+static void expresswire_end(struct expresswire_common_props *props)
{
gpiod_set_value(props->ctrl_gpio, 0);
udelay(props->timing.end_of_data_low_us);
gpiod_set_value(props->ctrl_gpio, 1);
udelay(props->timing.end_of_data_high_us);
}
-EXPORT_SYMBOL_NS_GPL(expresswire_end, "EXPRESSWIRE");
-void expresswire_set_bit(struct expresswire_common_props *props, bool bit)
+static void expresswire_set_bit(struct expresswire_common_props *props, bool bit)
{
if (bit) {
gpiod_set_value(props->ctrl_gpio, 0);
@@ -60,13 +65,18 @@ void expresswire_set_bit(struct expresswire_common_props *props, bool bit)
udelay(props->timing.short_bitset_us);
}
}
-EXPORT_SYMBOL_NS_GPL(expresswire_set_bit, "EXPRESSWIRE");
void expresswire_write_u8(struct expresswire_common_props *props, u8 val)
{
+ unsigned long flags;
+
+ local_irq_save(flags);
+
expresswire_start(props);
for (int i = 7; i >= 0; i--)
expresswire_set_bit(props, val & BIT(i));
expresswire_end(props);
+
+ local_irq_restore(flags);
}
EXPORT_SYMBOL_NS_GPL(expresswire_write_u8, "EXPRESSWIRE");
diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c
index 72da0bf469ad..f54851dfb42f 100644
--- a/drivers/leds/rgb/leds-qcom-lpg.c
+++ b/drivers/leds/rgb/leds-qcom-lpg.c
@@ -369,7 +369,7 @@ static int lpg_lut_store(struct lpg *lpg, struct led_pattern *pattern,
{
unsigned int idx;
u16 val;
- int i;
+ int i, ret;
idx = bitmap_find_next_zero_area(lpg->lut_bitmap, lpg->lut_size,
0, len, 0);
@@ -379,8 +379,10 @@ static int lpg_lut_store(struct lpg *lpg, struct led_pattern *pattern,
for (i = 0; i < len; i++) {
val = pattern[i].brightness;
- regmap_bulk_write(lpg->map, lpg->lut_base + LPG_LUT_REG(idx + i),
- &val, sizeof(val));
+ ret = regmap_bulk_write(lpg->map, lpg->lut_base + LPG_LUT_REG(idx + i),
+ &val, sizeof(val));
+ if (ret)
+ return ret;
}
bitmap_set(lpg->lut_bitmap, idx, len);
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index ff292b9e0be9..0e0a66359d4c 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -305,22 +305,6 @@ static void pcc_chan_acknowledge(struct pcc_chan_info *pchan)
pcc_chan_reg_read_modify_write(&pchan->db);
}
-static void *write_response(struct pcc_chan_info *pchan)
-{
- struct pcc_header pcc_header;
- void *buffer;
- int data_len;
-
- memcpy_fromio(&pcc_header, pchan->chan.shmem,
- sizeof(pcc_header));
- data_len = pcc_header.length - sizeof(u32) + sizeof(struct pcc_header);
-
- buffer = pchan->chan.rx_alloc(pchan->chan.mchan->cl, data_len);
- if (buffer != NULL)
- memcpy_fromio(buffer, pchan->chan.shmem, data_len);
- return buffer;
-}
-
/**
* pcc_mbox_irq - PCC mailbox interrupt handler
* @irq: interrupt number
@@ -332,8 +316,6 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)
{
struct pcc_chan_info *pchan;
struct mbox_chan *chan = p;
- struct pcc_header *pcc_header = chan->active_req;
- void *handle = NULL;
pchan = chan->con_priv;
@@ -357,17 +339,7 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)
* required to avoid any possible race in updatation of this flag.
*/
pchan->chan_in_use = false;
-
- if (pchan->chan.rx_alloc)
- handle = write_response(pchan);
-
- if (chan->active_req) {
- pcc_header = chan->active_req;
- if (pcc_header->flags & PCC_CMD_COMPLETION_NOTIFY)
- mbox_chan_txdone(chan, 0);
- }
-
- mbox_chan_received_data(chan, handle);
+ mbox_chan_received_data(chan, NULL);
pcc_chan_acknowledge(pchan);
@@ -411,24 +383,9 @@ pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id)
pcc_mchan = &pchan->chan;
pcc_mchan->shmem = acpi_os_ioremap(pcc_mchan->shmem_base_addr,
pcc_mchan->shmem_size);
- if (!pcc_mchan->shmem)
- goto err;
-
- pcc_mchan->manage_writes = false;
-
- /* This indicates that the channel is ready to accept messages.
- * This needs to happen after the channel has registered
- * its callback. There is no access point to do that in
- * the mailbox API. That implies that the mailbox client must
- * have set the allocate callback function prior to
- * sending any messages.
- */
- if (pchan->type == ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE)
- pcc_chan_reg_read_modify_write(&pchan->cmd_update);
-
- return pcc_mchan;
+ if (pcc_mchan->shmem)
+ return pcc_mchan;
-err:
mbox_free_channel(chan);
return ERR_PTR(-ENXIO);
}
@@ -459,38 +416,8 @@ void pcc_mbox_free_channel(struct pcc_mbox_chan *pchan)
}
EXPORT_SYMBOL_GPL(pcc_mbox_free_channel);
-static int pcc_write_to_buffer(struct mbox_chan *chan, void *data)
-{
- struct pcc_chan_info *pchan = chan->con_priv;
- struct pcc_mbox_chan *pcc_mbox_chan = &pchan->chan;
- struct pcc_header *pcc_header = data;
-
- if (!pchan->chan.manage_writes)
- return 0;
-
- /* The PCC header length includes the command field
- * but not the other values from the header.
- */
- int len = pcc_header->length - sizeof(u32) + sizeof(struct pcc_header);
- u64 val;
-
- pcc_chan_reg_read(&pchan->cmd_complete, &val);
- if (!val) {
- pr_info("%s pchan->cmd_complete not set", __func__);
- return -1;
- }
- memcpy_toio(pcc_mbox_chan->shmem, data, len);
- return 0;
-}
-
-
/**
- * pcc_send_data - Called from Mailbox Controller code. If
- * pchan->chan.rx_alloc is set, then the command complete
- * flag is checked and the data is written to the shared
- * buffer io memory.
- *
- * If pchan->chan.rx_alloc is not set, then it is used
+ * pcc_send_data - Called from Mailbox Controller code. Used
* here only to ring the channel doorbell. The PCC client
* specific read/write is done in the client driver in
* order to maintain atomicity over PCC channel once
@@ -506,37 +433,17 @@ static int pcc_send_data(struct mbox_chan *chan, void *data)
int ret;
struct pcc_chan_info *pchan = chan->con_priv;
- ret = pcc_write_to_buffer(chan, data);
- if (ret)
- return ret;
-
ret = pcc_chan_reg_read_modify_write(&pchan->cmd_update);
if (ret)
return ret;
ret = pcc_chan_reg_read_modify_write(&pchan->db);
-
if (!ret && pchan->plat_irq > 0)
pchan->chan_in_use = true;
return ret;
}
-
-static bool pcc_last_tx_done(struct mbox_chan *chan)
-{
- struct pcc_chan_info *pchan = chan->con_priv;
- u64 val;
-
- pcc_chan_reg_read(&pchan->cmd_complete, &val);
- if (!val)
- return false;
- else
- return true;
-}
-
-
-
/**
* pcc_startup - Called from Mailbox Controller code. Used here
* to request the interrupt.
@@ -582,7 +489,6 @@ static const struct mbox_chan_ops pcc_chan_ops = {
.send_data = pcc_send_data,
.startup = pcc_startup,
.shutdown = pcc_shutdown,
- .last_tx_done = pcc_last_tx_done,
};
/**
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index c1367223e71a..3d487d75c483 100644
--- a/drivers/mcb/mcb-core.c
+++ b/drivers/mcb/mcb-core.c
@@ -85,7 +85,8 @@ static void mcb_remove(struct device *dev)
struct mcb_device *mdev = to_mcb_device(dev);
struct module *carrier_mod;
- mdrv->remove(mdev);
+ if (mdrv->remove)
+ mdrv->remove(mdev);
carrier_mod = mdev->dev.parent->driver->owner;
module_put(carrier_mod);
@@ -176,13 +177,13 @@ static const struct device_type mcb_carrier_device_type = {
* @owner: The @mcb_driver's module
* @mod_name: The name of the @mcb_driver's module
*
- * Register a @mcb_driver at the system. Perform some sanity checks, if
- * the .probe and .remove methods are provided by the driver.
+ * Register a @mcb_driver at the system. Perform a sanity check, if
+ * .probe method is provided by the driver.
*/
int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
const char *mod_name)
{
- if (!drv->probe || !drv->remove)
+ if (!drv->probe)
return -EINVAL;
drv->driver.owner = owner;
diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
index c95e417194b3..f29acf64429a 100644
--- a/drivers/md/dm-zone.c
+++ b/drivers/md/dm-zone.c
@@ -50,7 +50,7 @@ int dm_blk_report_zones(struct gendisk *disk, sector_t sector,
{
struct mapped_device *md = disk->private_data;
struct dm_table *map;
- struct dm_table *zone_revalidate_map = md->zone_revalidate_map;
+ struct dm_table *zone_revalidate_map = READ_ONCE(md->zone_revalidate_map);
int srcu_idx, ret = -EIO;
bool put_table = false;
@@ -60,11 +60,13 @@ int dm_blk_report_zones(struct gendisk *disk, sector_t sector,
* Zone revalidation during __bind() is in progress, but this
* call is from a different process
*/
- if (dm_suspended_md(md))
- return -EAGAIN;
-
map = dm_get_live_table(md, &srcu_idx);
put_table = true;
+
+ if (dm_suspended_md(md)) {
+ ret = -EAGAIN;
+ goto do_put_table;
+ }
} else {
/* Zone revalidation during __bind() */
map = zone_revalidate_map;
@@ -79,6 +81,7 @@ int dm_blk_report_zones(struct gendisk *disk, sector_t sector,
ret = dm_blk_do_report_zones(md, map, nr_zones, &dm_args);
}
+do_put_table:
if (put_table)
dm_put_live_table(md, srcu_idx);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index b63279202260..8e029f6289c1 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1364,6 +1364,8 @@ void dm_submit_bio_remap(struct bio *clone, struct bio *tgt_clone)
if (!tgt_clone)
tgt_clone = clone;
+ bio_clone_blkg_association(tgt_clone, io->orig_bio);
+
/*
* Account io->origin_bio to DM dev on behalf of target
* that took ownership of IO with DM_MAPIO_SUBMITTED.
diff --git a/drivers/md/md-llbitmap.c b/drivers/md/md-llbitmap.c
index 9c1ade19b774..cd713a7dc270 100644
--- a/drivers/md/md-llbitmap.c
+++ b/drivers/md/md-llbitmap.c
@@ -712,8 +712,10 @@ static int llbitmap_suspend_timeout(struct llbitmap *llbitmap, int page_idx)
percpu_ref_kill(&pctl->active);
if (!wait_event_timeout(pctl->wait, percpu_ref_is_zero(&pctl->active),
- llbitmap->mddev->bitmap_info.daemon_sleep * HZ))
+ llbitmap->mddev->bitmap_info.daemon_sleep * HZ)) {
+ percpu_ref_resurrect(&pctl->active);
return -ETIMEDOUT;
+ }
return 0;
}
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 6985f2829bbd..3bfbee595156 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -737,8 +737,8 @@ static inline int mddev_trylock(struct mddev *mddev)
int ret;
ret = mutex_trylock(&mddev->reconfig_mutex);
- if (!ret && test_bit(MD_DELETED, &mddev->flags)) {
- ret = -ENODEV;
+ if (ret && test_bit(MD_DELETED, &mddev->flags)) {
+ ret = 0;
mutex_unlock(&mddev->reconfig_mutex);
}
return ret;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 57d50465eed1..cc9914bd15c1 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3254,6 +3254,7 @@ static int raid1_run(struct mddev *mddev)
if (!mddev_is_dm(mddev)) {
ret = raid1_set_limits(mddev);
if (ret) {
+ md_unregister_thread(mddev, &conf->thread);
if (!mddev->private)
raid1_free(mddev, conf);
return ret;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 84be4cc7e873..3a591e60a144 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3402,7 +3402,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
!test_bit(In_sync, &rdev->flags))
continue;
/* This is where we read from */
- any_working = 1;
sector = r10_bio->devs[j].addr;
if (is_badblock(rdev, sector, max_sync,
@@ -3417,6 +3416,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
continue;
}
}
+ any_working = 1;
bio = r10_bio->devs[0].bio;
bio->bi_next = biolist;
biolist = bio;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 8dc98f545969..bdf248db1330 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3751,9 +3751,14 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s,
struct r5dev *dev = &sh->dev[disk_idx];
struct r5dev *fdev[2] = { &sh->dev[s->failed_num[0]],
&sh->dev[s->failed_num[1]] };
+ struct mddev *mddev = sh->raid_conf->mddev;
+ bool force_rcw = false;
int i;
- bool force_rcw = (sh->raid_conf->rmw_level == PARITY_DISABLE_RMW);
+ if (sh->raid_conf->rmw_level == PARITY_DISABLE_RMW ||
+ (mddev->bitmap_ops && mddev->bitmap_ops->blocks_synced &&
+ !mddev->bitmap_ops->blocks_synced(mddev, sh->sector)))
+ force_rcw = true;
if (test_bit(R5_LOCKED, &dev->flags) ||
test_bit(R5_UPTODATE, &dev->flags))
@@ -8057,7 +8062,8 @@ static int raid5_run(struct mddev *mddev)
goto abort;
}
- if (log_init(conf, journal_dev, raid5_has_ppl(conf)))
+ ret = log_init(conf, journal_dev, raid5_has_ppl(conf));
+ if (ret)
goto abort;
return 0;
diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index f8523140784c..43f7d515bab6 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -3425,7 +3425,21 @@ static int ccs_probe(struct i2c_client *client)
sensor->scale_m = CCS_LIM(sensor, SCALER_N_MIN);
/* prepare PLL configuration input values */
- sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_DPHY;
+ switch (sensor->hwcfg.csi_signalling_mode) {
+ case CCS_CSI_SIGNALING_MODE_CSI_2_CPHY:
+ sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_CPHY;
+ break;
+ case CCS_CSI_SIGNALING_MODE_CSI_2_DPHY:
+ case SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK:
+ case SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE:
+ sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_DPHY;
+ break;
+ default:
+ dev_err(&client->dev, "unsupported signalling mode %u\n",
+ sensor->hwcfg.csi_signalling_mode);
+ rval = -EINVAL;
+ goto out_cleanup;
+ }
sensor->pll.csi2.lanes = sensor->hwcfg.lanes;
if (CCS_LIM(sensor, CLOCK_CALCULATION) &
CCS_CLOCK_CALCULATION_LANE_SPEED) {
diff --git a/drivers/media/pci/mgb4/mgb4_trigger.c b/drivers/media/pci/mgb4/mgb4_trigger.c
index 4f9a35904b41..70cad324df60 100644
--- a/drivers/media/pci/mgb4/mgb4_trigger.c
+++ b/drivers/media/pci/mgb4/mgb4_trigger.c
@@ -115,7 +115,7 @@ static int probe_trigger(struct iio_dev *indio_dev, int irq)
if (!st->trig)
return -ENOMEM;
- ret = request_irq(irq, &iio_trigger_generic_data_rdy_poll, 0,
+ ret = request_irq(irq, &iio_trigger_generic_data_rdy_poll, IRQF_NO_THREAD,
"mgb4-trigger", st->trig);
if (ret)
goto error_free_trig;
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
index e3038c18ca36..a4387ed58cac 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
@@ -1753,8 +1753,10 @@ static int wave5_vpu_open_dec(struct file *filp)
spin_lock_init(&inst->state_spinlock);
inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);
- if (!inst->codec_info)
+ if (!inst->codec_info) {
+ kfree(inst);
return -ENOMEM;
+ }
v4l2_fh_init(&inst->v4l2_fh, vdev);
v4l2_fh_add(&inst->v4l2_fh, filp);
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
index 9bfaa9fb3ceb..94fb5d7c8702 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
@@ -1578,8 +1578,10 @@ static int wave5_vpu_open_enc(struct file *filp)
inst->ops = &wave5_vpu_enc_inst_ops;
inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);
- if (!inst->codec_info)
+ if (!inst->codec_info) {
+ kfree(inst);
return -ENOMEM;
+ }
v4l2_fh_init(&inst->v4l2_fh, vdev);
v4l2_fh_add(&inst->v4l2_fh, filp);
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 2094e059d7d3..ec76595f3c4b 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1812,7 +1812,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
npackets = UVC_MAX_PACKETS;
/* Retry allocations until one succeed. */
- for (; npackets > 1; npackets /= 2) {
+ for (; npackets > 0; npackets /= 2) {
stream->urb_size = psize * npackets;
for (i = 0; i < UVC_URBS; ++i) {
@@ -1837,6 +1837,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
uvc_dbg(stream->dev, VIDEO,
"Failed to allocate URB buffers (%u bytes per packet)\n",
psize);
+ stream->urb_size = 0;
return 0;
}
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index aace5766b38a..f7f12a0428aa 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -407,6 +407,17 @@ config MFD_CS47L92
help
Support for Cirrus Logic CS42L92, CS47L92 and CS47L93 Smart Codecs
+config MFD_TN48M_CPLD
+ tristate "Delta Networks TN48M switch CPLD driver"
+ depends on I2C
+ depends on ARCH_MVEBU || COMPILE_TEST
+ select MFD_SIMPLE_MFD_I2C
+ help
+ Select this option to enable support for Delta Networks TN48M switch
+ CPLD. It consists of reset and GPIO drivers. CPLD provides GPIOS-s
+ for the SFP slots as well as power supply related information.
+ SFP support depends on the GPIO driver being selected.
+
config PMIC_DA903X
bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
depends on I2C=y
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 85ff8717d850..91975536d14d 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -1100,7 +1100,7 @@ int arizona_dev_init(struct arizona *arizona)
} else if (val & 0x01) {
ret = wm5102_clear_write_sequencer(arizona);
if (ret)
- return ret;
+ goto err_reset;
}
break;
default:
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 74ac70002d1f..ff2671186e89 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -198,6 +198,7 @@ static const struct regmap_irq_chip s2mpg10_irq_chip = {
static const struct regmap_irq_chip s2mpg10_irq_chip_pmic = {
.name = "s2mpg10-pmic",
+ .domain_suffix = "pmic",
.status_base = S2MPG10_PMIC_INT1,
.mask_base = S2MPG10_PMIC_INT1M,
.num_regs = 6,
diff --git a/drivers/mfd/simple-mfd-i2c.c b/drivers/mfd/simple-mfd-i2c.c
index 8b751d8e3b5a..7315fad618e4 100644
--- a/drivers/mfd/simple-mfd-i2c.c
+++ b/drivers/mfd/simple-mfd-i2c.c
@@ -116,6 +116,7 @@ static const struct simple_mfd_data spacemit_p1 = {
};
static const struct of_device_id simple_mfd_i2c_of_match[] = {
+ { .compatible = "delta,tn48m-cpld" },
{ .compatible = "fsl,ls1028aqds-fpga" },
{ .compatible = "fsl,lx2160aqds-fpga" },
{ .compatible = "fsl,lx2160ardb-fpga" },
diff --git a/drivers/mtd/devices/mtd_intel_dg.c b/drivers/mtd/devices/mtd_intel_dg.c
index 2bab30dcd35f..7f751c48a76d 100644
--- a/drivers/mtd/devices/mtd_intel_dg.c
+++ b/drivers/mtd/devices/mtd_intel_dg.c
@@ -770,6 +770,7 @@ static int intel_dg_mtd_probe(struct auxiliary_device *aux_dev,
kref_init(&nvm->refcnt);
mutex_init(&nvm->lock);
+ nvm->nregions = nregions;
for (n = 0, i = 0; i < INTEL_DG_NVM_REGIONS; i++) {
if (!invm->regions[i].name)
@@ -777,13 +778,15 @@ static int intel_dg_mtd_probe(struct auxiliary_device *aux_dev,
char *name = kasprintf(GFP_KERNEL, "%s.%s",
dev_name(&aux_dev->dev), invm->regions[i].name);
- if (!name)
- continue;
+ if (!name) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
nvm->regions[n].name = name;
nvm->regions[n].id = i;
n++;
}
- nvm->nregions = n; /* in case where kasprintf fail */
ret = devm_pm_runtime_enable(device);
if (ret < 0) {
diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 5f037753f78c..99135ec23010 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -1066,7 +1066,7 @@ static int cadence_nand_cdma_send(struct cdns_nand_ctrl *cdns_ctrl,
}
/* Send SDMA command and wait for finish. */
-static u32
+static int
cadence_nand_cdma_send_and_wait(struct cdns_nand_ctrl *cdns_ctrl,
u8 thread)
{
diff --git a/drivers/mtd/parsers/ofpart_core.c b/drivers/mtd/parsers/ofpart_core.c
index abfa68798918..09961c6f3949 100644
--- a/drivers/mtd/parsers/ofpart_core.c
+++ b/drivers/mtd/parsers/ofpart_core.c
@@ -77,6 +77,7 @@ static int parse_fixed_partitions(struct mtd_info *master,
of_id = of_match_node(parse_ofpart_match_table, ofpart_node);
if (dedicated && !of_id) {
/* The 'partitions' subnode might be used by another parser */
+ of_node_put(ofpart_node);
return 0;
}
@@ -91,12 +92,18 @@ static int parse_fixed_partitions(struct mtd_info *master,
nr_parts++;
}
- if (nr_parts == 0)
+ if (nr_parts == 0) {
+ if (dedicated)
+ of_node_put(ofpart_node);
return 0;
+ }
parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
- if (!parts)
+ if (!parts) {
+ if (dedicated)
+ of_node_put(ofpart_node);
return -ENOMEM;
+ }
i = 0;
for_each_child_of_node(ofpart_node, pp) {
@@ -175,6 +182,9 @@ static int parse_fixed_partitions(struct mtd_info *master,
if (quirks && quirks->post_parse)
quirks->post_parse(master, parts, nr_parts);
+ if (dedicated)
+ of_node_put(ofpart_node);
+
*pparts = parts;
return nr_parts;
@@ -183,6 +193,8 @@ static int parse_fixed_partitions(struct mtd_info *master,
master->name, pp, mtd_node);
ret = -EINVAL;
ofpart_none:
+ if (dedicated)
+ of_node_put(ofpart_node);
of_node_put(pp);
kfree(parts);
return ret;
diff --git a/drivers/mtd/parsers/tplink_safeloader.c b/drivers/mtd/parsers/tplink_safeloader.c
index e358a029dc70..4fcaf92d22e4 100644
--- a/drivers/mtd/parsers/tplink_safeloader.c
+++ b/drivers/mtd/parsers/tplink_safeloader.c
@@ -116,6 +116,7 @@ static int mtd_parser_tplink_safeloader_parse(struct mtd_info *mtd,
return idx;
err_free:
+ kfree(buf);
for (idx -= 1; idx >= 0; idx--)
kfree(parts[idx].name);
err_free_parts:
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 45bd2bb102ff..4c58d1dafcac 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -791,26 +791,29 @@ static int bond_update_speed_duplex(struct slave *slave)
struct ethtool_link_ksettings ecmd;
int res;
- slave->speed = SPEED_UNKNOWN;
- slave->duplex = DUPLEX_UNKNOWN;
-
res = __ethtool_get_link_ksettings(slave_dev, &ecmd);
if (res < 0)
- return 1;
+ goto speed_duplex_unknown;
if (ecmd.base.speed == 0 || ecmd.base.speed == ((__u32)-1))
- return 1;
+ goto speed_duplex_unknown;
switch (ecmd.base.duplex) {
case DUPLEX_FULL:
case DUPLEX_HALF:
break;
default:
- return 1;
+ goto speed_duplex_unknown;
}
slave->speed = ecmd.base.speed;
slave->duplex = ecmd.base.duplex;
return 0;
+
+speed_duplex_unknown:
+ slave->speed = SPEED_UNKNOWN;
+ slave->duplex = DUPLEX_UNKNOWN;
+
+ return 1;
}
const char *bond_slave_link_status(s8 link)
@@ -4311,9 +4314,13 @@ static int bond_close(struct net_device *bond_dev)
bond_work_cancel_all(bond);
bond->send_peer_notif = 0;
+ WRITE_ONCE(bond->recv_probe, NULL);
+
+ /* Wait for any in-flight RX handlers */
+ synchronize_net();
+
if (bond_is_lb(bond))
bond_alb_deinitialize(bond);
- bond->recv_probe = NULL;
if (BOND_MODE(bond) == BOND_MODE_8023AD &&
bond->params.broadcast_neighbor)
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index c398ac42eae9..b90890030751 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -284,6 +284,7 @@ static void ser_release(struct work_struct *work)
{
struct list_head list;
struct ser_device *ser, *tmp;
+ struct tty_struct *tty;
spin_lock(&ser_lock);
list_replace_init(&ser_release_list, &list);
@@ -292,9 +293,11 @@ static void ser_release(struct work_struct *work)
if (!list_empty(&list)) {
rtnl_lock();
list_for_each_entry_safe(ser, tmp, &list, node) {
+ tty = ser->tty;
dev_close(ser->dev);
unregister_netdevice(ser->dev);
debugfs_deinit(ser);
+ tty_kref_put(tty);
}
rtnl_unlock();
}
@@ -355,8 +358,6 @@ static void ldisc_close(struct tty_struct *tty)
{
struct ser_device *ser = tty->disc_data;
- tty_kref_put(ser->tty);
-
spin_lock(&ser_lock);
list_move(&ser->node, &ser_release_list);
spin_unlock(&ser_lock);
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index d54dca3074eb..45e8d698781c 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -165,7 +165,7 @@ config AMD_XGBE
select CRC32
select PHYLIB
select AMD_XGBE_HAVE_ECC if X86
- select NET_SELFTESTS
+ imply NET_SELFTESTS
help
This driver supports the AMD 10GbE Ethernet device found on an
AMD SoC.
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
index 198f49b40dbf..2994f10446a6 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
@@ -442,7 +442,7 @@ __bnge_hwrm_reserve_pf_rings(struct bnge_dev *bd, struct bnge_hw_rings *hwr)
struct hwrm_func_cfg_input *req;
u32 enables = 0;
- if (bnge_hwrm_req_init(bd, req, HWRM_FUNC_QCFG))
+ if (bnge_hwrm_req_init(bd, req, HWRM_FUNC_CFG))
return NULL;
req->fid = cpu_to_le16(0xffff);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 7a9573dcab74..e879b04e21b0 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1048,13 +1048,13 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)
int order;
if (!alloc_size)
- return;
+ goto not_init;
order = get_order(alloc_size);
if (order > MAX_PAGE_ORDER) {
if (net_ratelimit())
dev_warn(ring_to_dev(ring), "failed to allocate tx spare buffer, exceed to max order\n");
- return;
+ goto not_init;
}
tx_spare = devm_kzalloc(ring_to_dev(ring), sizeof(*tx_spare),
@@ -1092,6 +1092,13 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)
devm_kfree(ring_to_dev(ring), tx_spare);
devm_kzalloc_error:
ring->tqp->handle->kinfo.tx_spare_buf_size = 0;
+not_init:
+ /* When driver init or reset_init, the ring->tx_spare is always NULL;
+ * but when called from hns3_set_ringparam, it's usually not NULL, and
+ * will be restored if hns3_init_all_ring() failed. So it's safe to set
+ * ring->tx_spare to NULL here.
+ */
+ ring->tx_spare = NULL;
}
/* Use hns3_tx_spare_space() to make sure there is enough buffer
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c b/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c
index b5805969404f..01e82d0b6b2c 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c
@@ -307,7 +307,7 @@ static void octep_setup_iq_regs_cn93_pf(struct octep_device *oct, int iq_no)
}
/* Setup registers for a hardware Rx Queue */
-static void octep_setup_oq_regs_cn93_pf(struct octep_device *oct, int oq_no)
+static int octep_setup_oq_regs_cn93_pf(struct octep_device *oct, int oq_no)
{
u64 reg_val;
u64 oq_ctl = 0ULL;
@@ -355,6 +355,7 @@ static void octep_setup_oq_regs_cn93_pf(struct octep_device *oct, int oq_no)
reg_val = ((u64)time_threshold << 32) |
CFG_GET_OQ_INTR_PKT(oct->conf);
octep_write_csr64(oct, CN93_SDP_R_OUT_INT_LEVELS(oq_no), reg_val);
+ return 0;
}
/* Setup registers for a PF mailbox */
@@ -696,14 +697,26 @@ static void octep_enable_interrupts_cn93_pf(struct octep_device *oct)
/* Disable all interrupts */
static void octep_disable_interrupts_cn93_pf(struct octep_device *oct)
{
- u64 intr_mask = 0ULL;
+ u64 reg_val, intr_mask = 0ULL;
int srn, num_rings, i;
srn = CFG_GET_PORTS_PF_SRN(oct->conf);
num_rings = CFG_GET_PORTS_ACTIVE_IO_RINGS(oct->conf);
- for (i = 0; i < num_rings; i++)
- intr_mask |= (0x1ULL << (srn + i));
+ for (i = 0; i < num_rings; i++) {
+ intr_mask |= BIT_ULL(srn + i);
+ reg_val = octep_read_csr64(oct,
+ CN93_SDP_R_IN_INT_LEVELS(srn + i));
+ reg_val &= ~CN93_INT_ENA_BIT;
+ octep_write_csr64(oct,
+ CN93_SDP_R_IN_INT_LEVELS(srn + i), reg_val);
+
+ reg_val = octep_read_csr64(oct,
+ CN93_SDP_R_OUT_INT_LEVELS(srn + i));
+ reg_val &= ~CN93_INT_ENA_BIT;
+ octep_write_csr64(oct,
+ CN93_SDP_R_OUT_INT_LEVELS(srn + i), reg_val);
+ }
octep_write_csr64(oct, CN93_SDP_EPF_IRERR_RINT_ENA_W1C, intr_mask);
octep_write_csr64(oct, CN93_SDP_EPF_ORERR_RINT_ENA_W1C, intr_mask);
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c b/drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c
index 5de0b5ecbc5f..09a3f1d0645b 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c
@@ -8,6 +8,7 @@
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
+#include <linux/jiffies.h>
#include "octep_config.h"
#include "octep_main.h"
@@ -327,12 +328,14 @@ static void octep_setup_iq_regs_cnxk_pf(struct octep_device *oct, int iq_no)
}
/* Setup registers for a hardware Rx Queue */
-static void octep_setup_oq_regs_cnxk_pf(struct octep_device *oct, int oq_no)
+static int octep_setup_oq_regs_cnxk_pf(struct octep_device *oct, int oq_no)
{
- u64 reg_val;
- u64 oq_ctl = 0ULL;
- u32 time_threshold = 0;
struct octep_oq *oq = oct->oq[oq_no];
+ unsigned long t_out_jiffies;
+ u32 time_threshold = 0;
+ u64 oq_ctl = 0ULL;
+ u64 reg_ba_val;
+ u64 reg_val;
oq_no += CFG_GET_PORTS_PF_SRN(oct->conf);
reg_val = octep_read_csr64(oct, CNXK_SDP_R_OUT_CONTROL(oq_no));
@@ -343,6 +346,36 @@ static void octep_setup_oq_regs_cnxk_pf(struct octep_device *oct, int oq_no)
reg_val = octep_read_csr64(oct, CNXK_SDP_R_OUT_CONTROL(oq_no));
} while (!(reg_val & CNXK_R_OUT_CTL_IDLE));
}
+ octep_write_csr64(oct, CNXK_SDP_R_OUT_WMARK(oq_no), oq->max_count);
+ /* Wait for WMARK to get applied */
+ usleep_range(10, 15);
+
+ octep_write_csr64(oct, CNXK_SDP_R_OUT_SLIST_BADDR(oq_no),
+ oq->desc_ring_dma);
+ octep_write_csr64(oct, CNXK_SDP_R_OUT_SLIST_RSIZE(oq_no),
+ oq->max_count);
+ reg_ba_val = octep_read_csr64(oct, CNXK_SDP_R_OUT_SLIST_BADDR(oq_no));
+
+ if (reg_ba_val != oq->desc_ring_dma) {
+ t_out_jiffies = jiffies + 10 * HZ;
+ do {
+ if (reg_ba_val == ULLONG_MAX)
+ return -EFAULT;
+ octep_write_csr64(oct,
+ CNXK_SDP_R_OUT_SLIST_BADDR(oq_no),
+ oq->desc_ring_dma);
+ octep_write_csr64(oct,
+ CNXK_SDP_R_OUT_SLIST_RSIZE(oq_no),
+ oq->max_count);
+ reg_ba_val =
+ octep_read_csr64(oct,
+ CNXK_SDP_R_OUT_SLIST_BADDR(oq_no));
+ } while ((reg_ba_val != oq->desc_ring_dma) &&
+ time_before(jiffies, t_out_jiffies));
+
+ if (reg_ba_val != oq->desc_ring_dma)
+ return -EAGAIN;
+ }
reg_val &= ~(CNXK_R_OUT_CTL_IMODE);
reg_val &= ~(CNXK_R_OUT_CTL_ROR_P);
@@ -356,10 +389,6 @@ static void octep_setup_oq_regs_cnxk_pf(struct octep_device *oct, int oq_no)
reg_val |= (CNXK_R_OUT_CTL_ES_P);
octep_write_csr64(oct, CNXK_SDP_R_OUT_CONTROL(oq_no), reg_val);
- octep_write_csr64(oct, CNXK_SDP_R_OUT_SLIST_BADDR(oq_no),
- oq->desc_ring_dma);
- octep_write_csr64(oct, CNXK_SDP_R_OUT_SLIST_RSIZE(oq_no),
- oq->max_count);
oq_ctl = octep_read_csr64(oct, CNXK_SDP_R_OUT_CONTROL(oq_no));
@@ -385,6 +414,7 @@ static void octep_setup_oq_regs_cnxk_pf(struct octep_device *oct, int oq_no)
reg_val &= ~0xFFFFFFFFULL;
reg_val |= CFG_GET_OQ_WMARK(oct->conf);
octep_write_csr64(oct, CNXK_SDP_R_OUT_WMARK(oq_no), reg_val);
+ return 0;
}
/* Setup registers for a PF mailbox */
@@ -720,14 +750,26 @@ static void octep_enable_interrupts_cnxk_pf(struct octep_device *oct)
/* Disable all interrupts */
static void octep_disable_interrupts_cnxk_pf(struct octep_device *oct)
{
- u64 intr_mask = 0ULL;
+ u64 reg_val, intr_mask = 0ULL;
int srn, num_rings, i;
srn = CFG_GET_PORTS_PF_SRN(oct->conf);
num_rings = CFG_GET_PORTS_ACTIVE_IO_RINGS(oct->conf);
- for (i = 0; i < num_rings; i++)
- intr_mask |= (0x1ULL << (srn + i));
+ for (i = 0; i < num_rings; i++) {
+ intr_mask |= BIT_ULL(srn + i);
+ reg_val = octep_read_csr64(oct,
+ CNXK_SDP_R_IN_INT_LEVELS(srn + i));
+ reg_val &= ~CNXK_INT_ENA_BIT;
+ octep_write_csr64(oct,
+ CNXK_SDP_R_IN_INT_LEVELS(srn + i), reg_val);
+
+ reg_val = octep_read_csr64(oct,
+ CNXK_SDP_R_OUT_INT_LEVELS(srn + i));
+ reg_val &= ~CNXK_INT_ENA_BIT;
+ octep_write_csr64(oct,
+ CNXK_SDP_R_OUT_INT_LEVELS(srn + i), reg_val);
+ }
octep_write_csr64(oct, CNXK_SDP_EPF_IRERR_RINT_ENA_W1C, intr_mask);
octep_write_csr64(oct, CNXK_SDP_EPF_ORERR_RINT_ENA_W1C, intr_mask);
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h
index 81ac4267811c..35d0ff289a70 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h
@@ -77,7 +77,7 @@ struct octep_pci_win_regs {
struct octep_hw_ops {
void (*setup_iq_regs)(struct octep_device *oct, int q);
- void (*setup_oq_regs)(struct octep_device *oct, int q);
+ int (*setup_oq_regs)(struct octep_device *oct, int q);
void (*setup_mbox_regs)(struct octep_device *oct, int mbox);
irqreturn_t (*mbox_intr_handler)(void *ioq_vector);
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h
index ca473502d7a0..95f1dfff90cc 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h
@@ -386,5 +386,6 @@
#define CN93_PEM_BAR4_INDEX 7
#define CN93_PEM_BAR4_INDEX_SIZE 0x400000ULL
#define CN93_PEM_BAR4_INDEX_OFFSET (CN93_PEM_BAR4_INDEX * CN93_PEM_BAR4_INDEX_SIZE)
+#define CN93_INT_ENA_BIT BIT_ULL(62)
#endif /* _OCTEP_REGS_CN9K_PF_H_ */
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h
index e637d7c8224d..4d172a552f80 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h
@@ -412,5 +412,6 @@
#define CNXK_PEM_BAR4_INDEX 7
#define CNXK_PEM_BAR4_INDEX_SIZE 0x400000ULL
#define CNXK_PEM_BAR4_INDEX_OFFSET (CNXK_PEM_BAR4_INDEX * CNXK_PEM_BAR4_INDEX_SIZE)
+#define CNXK_INT_ENA_BIT BIT_ULL(62)
#endif /* _OCTEP_REGS_CNXK_PF_H_ */
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
index 82b6b19e76b4..f2a7c6a76c74 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
@@ -12,6 +12,8 @@
#include "octep_config.h"
#include "octep_main.h"
+static void octep_oq_free_ring_buffers(struct octep_oq *oq);
+
static void octep_oq_reset_indices(struct octep_oq *oq)
{
oq->host_read_idx = 0;
@@ -170,11 +172,15 @@ static int octep_setup_oq(struct octep_device *oct, int q_no)
goto oq_fill_buff_err;
octep_oq_reset_indices(oq);
- oct->hw_ops.setup_oq_regs(oct, q_no);
+ if (oct->hw_ops.setup_oq_regs(oct, q_no))
+ goto oq_setup_err;
+
oct->num_oqs++;
return 0;
+oq_setup_err:
+ octep_oq_free_ring_buffers(oq);
oq_fill_buff_err:
vfree(oq->buff_info);
oq->buff_info = NULL;
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c
index 88937fce75f1..4c769b27c278 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c
@@ -196,7 +196,7 @@ static void octep_vf_setup_iq_regs_cn93(struct octep_vf_device *oct, int iq_no)
}
/* Setup registers for a hardware Rx Queue */
-static void octep_vf_setup_oq_regs_cn93(struct octep_vf_device *oct, int oq_no)
+static int octep_vf_setup_oq_regs_cn93(struct octep_vf_device *oct, int oq_no)
{
struct octep_vf_oq *oq = oct->oq[oq_no];
u32 time_threshold = 0;
@@ -239,6 +239,7 @@ static void octep_vf_setup_oq_regs_cn93(struct octep_vf_device *oct, int oq_no)
time_threshold = CFG_GET_OQ_INTR_TIME(oct->conf);
reg_val = ((u64)time_threshold << 32) | CFG_GET_OQ_INTR_PKT(oct->conf);
octep_vf_write_csr64(oct, CN93_VF_SDP_R_OUT_INT_LEVELS(oq_no), reg_val);
+ return 0;
}
/* Setup registers for a VF mailbox */
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c
index 1f79dfad42c6..a968b93a6794 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c
@@ -199,11 +199,13 @@ static void octep_vf_setup_iq_regs_cnxk(struct octep_vf_device *oct, int iq_no)
}
/* Setup registers for a hardware Rx Queue */
-static void octep_vf_setup_oq_regs_cnxk(struct octep_vf_device *oct, int oq_no)
+static int octep_vf_setup_oq_regs_cnxk(struct octep_vf_device *oct, int oq_no)
{
struct octep_vf_oq *oq = oct->oq[oq_no];
+ unsigned long t_out_jiffies;
u32 time_threshold = 0;
u64 oq_ctl = ULL(0);
+ u64 reg_ba_val;
u64 reg_val;
reg_val = octep_vf_read_csr64(oct, CNXK_VF_SDP_R_OUT_CONTROL(oq_no));
@@ -214,6 +216,38 @@ static void octep_vf_setup_oq_regs_cnxk(struct octep_vf_device *oct, int oq_no)
reg_val = octep_vf_read_csr64(oct, CNXK_VF_SDP_R_OUT_CONTROL(oq_no));
} while (!(reg_val & CNXK_VF_R_OUT_CTL_IDLE));
}
+ octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_WMARK(oq_no),
+ oq->max_count);
+ /* Wait for WMARK to get applied */
+ usleep_range(10, 15);
+
+ octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_SLIST_BADDR(oq_no),
+ oq->desc_ring_dma);
+ octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_SLIST_RSIZE(oq_no),
+ oq->max_count);
+ reg_ba_val = octep_vf_read_csr64(oct,
+ CNXK_VF_SDP_R_OUT_SLIST_BADDR(oq_no));
+ if (reg_ba_val != oq->desc_ring_dma) {
+ t_out_jiffies = jiffies + 10 * HZ;
+ do {
+ if (reg_ba_val == ULLONG_MAX)
+ return -EFAULT;
+ octep_vf_write_csr64(oct,
+ CNXK_VF_SDP_R_OUT_SLIST_BADDR
+ (oq_no), oq->desc_ring_dma);
+ octep_vf_write_csr64(oct,
+ CNXK_VF_SDP_R_OUT_SLIST_RSIZE
+ (oq_no), oq->max_count);
+ reg_ba_val =
+ octep_vf_read_csr64(oct,
+ CNXK_VF_SDP_R_OUT_SLIST_BADDR
+ (oq_no));
+ } while ((reg_ba_val != oq->desc_ring_dma) &&
+ time_before(jiffies, t_out_jiffies));
+
+ if (reg_ba_val != oq->desc_ring_dma)
+ return -EAGAIN;
+ }
reg_val &= ~(CNXK_VF_R_OUT_CTL_IMODE);
reg_val &= ~(CNXK_VF_R_OUT_CTL_ROR_P);
@@ -227,8 +261,6 @@ static void octep_vf_setup_oq_regs_cnxk(struct octep_vf_device *oct, int oq_no)
reg_val |= (CNXK_VF_R_OUT_CTL_ES_P);
octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_CONTROL(oq_no), reg_val);
- octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_SLIST_BADDR(oq_no), oq->desc_ring_dma);
- octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_SLIST_RSIZE(oq_no), oq->max_count);
oq_ctl = octep_vf_read_csr64(oct, CNXK_VF_SDP_R_OUT_CONTROL(oq_no));
/* Clear the ISIZE and BSIZE (22-0) */
@@ -250,6 +282,7 @@ static void octep_vf_setup_oq_regs_cnxk(struct octep_vf_device *oct, int oq_no)
reg_val &= ~GENMASK_ULL(31, 0);
reg_val |= CFG_GET_OQ_WMARK(oct->conf);
octep_vf_write_csr64(oct, CNXK_VF_SDP_R_OUT_WMARK(oq_no), reg_val);
+ return 0;
}
/* Setup registers for a VF mailbox */
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h
index b9f13506f462..c74cd2369e90 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h
@@ -55,7 +55,7 @@ struct octep_vf_mmio {
struct octep_vf_hw_ops {
void (*setup_iq_regs)(struct octep_vf_device *oct, int q);
- void (*setup_oq_regs)(struct octep_vf_device *oct, int q);
+ int (*setup_oq_regs)(struct octep_vf_device *oct, int q);
void (*setup_mbox_regs)(struct octep_vf_device *oct, int mbox);
irqreturn_t (*non_ioq_intr_handler)(void *ioq_vector);
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c
index d70c8be3cfc4..6f865dbbba6c 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c
@@ -12,6 +12,8 @@
#include "octep_vf_config.h"
#include "octep_vf_main.h"
+static void octep_vf_oq_free_ring_buffers(struct octep_vf_oq *oq);
+
static void octep_vf_oq_reset_indices(struct octep_vf_oq *oq)
{
oq->host_read_idx = 0;
@@ -171,11 +173,15 @@ static int octep_vf_setup_oq(struct octep_vf_device *oct, int q_no)
goto oq_fill_buff_err;
octep_vf_oq_reset_indices(oq);
- oct->hw_ops.setup_oq_regs(oct, q_no);
+ if (oct->hw_ops.setup_oq_regs(oct, q_no))
+ goto oq_setup_err;
+
oct->num_oqs++;
return 0;
+oq_setup_err:
+ octep_vf_oq_free_ring_buffers(oq);
oq_fill_buff_err:
vfree(oq->buff_info);
oq->buff_info = NULL;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index 747fbdf2a908..8530df8b3fda 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -3632,11 +3632,22 @@ static void rvu_remove(struct pci_dev *pdev)
devm_kfree(&pdev->dev, rvu);
}
+static void rvu_shutdown(struct pci_dev *pdev)
+{
+ struct rvu *rvu = pci_get_drvdata(pdev);
+
+ if (!rvu)
+ return;
+
+ rvu_clear_rvum_blk_revid(rvu);
+}
+
static struct pci_driver rvu_driver = {
.name = DRV_NAME,
.id_table = rvu_id_table,
.probe = rvu_probe,
.remove = rvu_remove,
+ .shutdown = rvu_shutdown,
};
static int __init rvu_init_module(void)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index c7c70429eb6c..8658cb2143df 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -1042,32 +1042,35 @@ void rvu_npc_update_flowkey_alg_idx(struct rvu *rvu, u16 pcifunc, int nixlf,
rvu_write64(rvu, blkaddr,
NPC_AF_MCAMEX_BANKX_ACTION(index, bank), *(u64 *)&action);
- /* update the VF flow rule action with the VF default entry action */
- if (mcam_index < 0)
- npc_update_vf_flow_entry(rvu, mcam, blkaddr, pcifunc,
- *(u64 *)&action);
-
/* update the action change in default rule */
pfvf = rvu_get_pfvf(rvu, pcifunc);
if (pfvf->def_ucast_rule)
pfvf->def_ucast_rule->rx_action = action;
- index = npc_get_nixlf_mcam_index(mcam, pcifunc,
- nixlf, NIXLF_PROMISC_ENTRY);
+ if (mcam_index < 0) {
+ /* update the VF flow rule action with the VF default
+ * entry action
+ */
+ npc_update_vf_flow_entry(rvu, mcam, blkaddr, pcifunc,
+ *(u64 *)&action);
- /* If PF's promiscuous entry is enabled,
- * Set RSS action for that entry as well
- */
- npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index, blkaddr,
- alg_idx);
+ index = npc_get_nixlf_mcam_index(mcam, pcifunc,
+ nixlf, NIXLF_PROMISC_ENTRY);
- index = npc_get_nixlf_mcam_index(mcam, pcifunc,
- nixlf, NIXLF_ALLMULTI_ENTRY);
- /* If PF's allmulti entry is enabled,
- * Set RSS action for that entry as well
- */
- npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index, blkaddr,
- alg_idx);
+ /* If PF's promiscuous entry is enabled,
+ * Set RSS action for that entry as well
+ */
+ npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
+ blkaddr, alg_idx);
+
+ index = npc_get_nixlf_mcam_index(mcam, pcifunc,
+ nixlf, NIXLF_ALLMULTI_ENTRY);
+ /* If PF's allmulti entry is enabled,
+ * Set RSS action for that entry as well
+ */
+ npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
+ blkaddr, alg_idx);
+ }
}
void npc_enadis_default_mce_entry(struct rvu *rvu, u16 pcifunc,
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index 6b2d8559f0eb..444bb67494ab 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -3315,6 +3315,7 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_sriov_cleannup:
otx2_sriov_vfcfg_cleanup(pf);
err_pf_sriov_init:
+ otx2_unregister_dl(pf);
otx2_shutdown_tc(pf);
err_mcam_flow_del:
otx2_mcam_flow_del(pf);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index ff4ab4691baf..a06d08576fd4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -179,7 +179,8 @@ static inline u16 mlx5_min_rx_wqes(int wq_type, u32 wq_size)
}
/* Use this function to get max num channels (rxqs/txqs) only to create netdev */
-static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev)
+static inline unsigned int
+mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev)
{
return is_kdump_kernel() ?
MLX5E_MIN_NUM_CHANNELS :
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
index 424f8a2728a3..74660e7fe674 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
@@ -457,22 +457,8 @@ static void mlx5e_ptpsq_unhealthy_work(struct work_struct *work)
{
struct mlx5e_ptpsq *ptpsq =
container_of(work, struct mlx5e_ptpsq, report_unhealthy_work);
- struct mlx5e_txqsq *sq = &ptpsq->txqsq;
-
- /* Recovering the PTP SQ means re-enabling NAPI, which requires the
- * netdev instance lock. However, SQ closing has to wait for this work
- * task to finish while also holding the same lock. So either get the
- * lock or find that the SQ is no longer enabled and thus this work is
- * not relevant anymore.
- */
- while (!netdev_trylock(sq->netdev)) {
- if (!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state))
- return;
- msleep(20);
- }
mlx5e_reporter_tx_ptpsq_unhealthy(ptpsq);
- netdev_unlock(sq->netdev);
}
static int mlx5e_ptp_open_txqsq(struct mlx5e_ptp *c, u32 tisn,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index 0686fbdd5a05..6efb626b5506 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2019 Mellanox Technologies.
+#include <net/netdev_lock.h>
+
#include "health.h"
#include "params.h"
#include "txrx.h"
@@ -177,6 +179,16 @@ static int mlx5e_rx_reporter_timeout_recover(void *ctx)
rq = ctx;
priv = rq->priv;
+ /* Acquire netdev instance lock to synchronize with channel close and
+ * reopen flows. Either successfully obtain the lock, or detect that
+ * channels are closing for another reason, making this work no longer
+ * necessary.
+ */
+ while (!netdev_trylock(rq->netdev)) {
+ if (!test_bit(MLX5E_STATE_CHANNELS_ACTIVE, &rq->priv->state))
+ return 0;
+ msleep(20);
+ }
mutex_lock(&priv->state_lock);
eq = rq->cq.mcq.eq;
@@ -186,6 +198,7 @@ static int mlx5e_rx_reporter_timeout_recover(void *ctx)
clear_bit(MLX5E_SQ_STATE_ENABLED, &rq->icosq->state);
mutex_unlock(&priv->state_lock);
+ netdev_unlock(rq->netdev);
return err;
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index 9e2cf191ed30..9f6454102cf7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -1,6 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (c) 2019 Mellanox Technologies. */
+#include <net/netdev_lock.h>
+
#include "health.h"
#include "en/ptp.h"
#include "en/devlink.h"
@@ -78,6 +80,18 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx)
if (!test_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state))
return 0;
+ /* Recovering queues means re-enabling NAPI, which requires the netdev
+ * instance lock. However, SQ closing flows have to wait for work tasks
+ * to finish while also holding the netdev instance lock. So either get
+ * the lock or find that the SQ is no longer enabled and thus this work
+ * is not relevant anymore.
+ */
+ while (!netdev_trylock(dev)) {
+ if (!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state))
+ return 0;
+ msleep(20);
+ }
+
err = mlx5_core_query_sq_state(mdev, sq->sqn, &state);
if (err) {
netdev_err(dev, "Failed to query SQ 0x%x state. err = %d\n",
@@ -113,9 +127,11 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx)
else
mlx5e_trigger_napi_sched(sq->cq.napi);
+ netdev_unlock(dev);
return 0;
out:
clear_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state);
+ netdev_unlock(dev);
return err;
}
@@ -136,10 +152,24 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx)
sq = to_ctx->sq;
eq = sq->cq.mcq.eq;
priv = sq->priv;
+
+ /* Recovering the TX queues implies re-enabling NAPI, which requires
+ * the netdev instance lock.
+ * However, channel closing flows have to wait for this work to finish
+ * while holding the same lock. So either get the lock or find that
+ * channels are being closed for other reason and this work is not
+ * relevant anymore.
+ */
+ while (!netdev_trylock(sq->netdev)) {
+ if (!test_bit(MLX5E_STATE_CHANNELS_ACTIVE, &priv->state))
+ return 0;
+ msleep(20);
+ }
+
err = mlx5e_health_channel_eq_recover(sq->netdev, eq, sq->cq.ch_stats);
if (!err) {
to_ctx->status = 0; /* this sq recovered */
- return err;
+ goto out;
}
mutex_lock(&priv->state_lock);
@@ -147,7 +177,7 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx)
mutex_unlock(&priv->state_lock);
if (!err) {
to_ctx->status = 1; /* all channels recovered */
- return err;
+ goto out;
}
to_ctx->status = err;
@@ -155,7 +185,8 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx)
netdev_err(priv->netdev,
"mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n",
err);
-
+out:
+ netdev_unlock(sq->netdev);
return err;
}
@@ -172,10 +203,22 @@ static int mlx5e_tx_reporter_ptpsq_unhealthy_recover(void *ctx)
return 0;
priv = ptpsq->txqsq.priv;
+ netdev = priv->netdev;
+
+ /* Recovering the PTP SQ means re-enabling NAPI, which requires the
+ * netdev instance lock. However, SQ closing has to wait for this work
+ * task to finish while also holding the same lock. So either get the
+ * lock or find that the SQ is no longer enabled and thus this work is
+ * not relevant anymore.
+ */
+ while (!netdev_trylock(netdev)) {
+ if (!test_bit(MLX5E_SQ_STATE_ENABLED, &ptpsq->txqsq.state))
+ return 0;
+ msleep(20);
+ }
mutex_lock(&priv->state_lock);
chs = &priv->channels;
- netdev = priv->netdev;
carrier_ok = netif_carrier_ok(netdev);
netif_carrier_off(netdev);
@@ -192,6 +235,7 @@ static int mlx5e_tx_reporter_ptpsq_unhealthy_recover(void *ctx)
netif_carrier_on(netdev);
mutex_unlock(&priv->state_lock);
+ netdev_unlock(netdev);
return err;
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
index 7819fb297280..d5d9146efca6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
// Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#include <linux/iopoll.h>
#include <linux/math64.h>
#include "lib/aso.h"
#include "en/tc/post_act.h"
@@ -115,7 +116,6 @@ mlx5e_tc_meter_modify(struct mlx5_core_dev *mdev,
struct mlx5e_flow_meters *flow_meters;
u8 cir_man, cir_exp, cbs_man, cbs_exp;
struct mlx5_aso_wqe *aso_wqe;
- unsigned long expires;
struct mlx5_aso *aso;
u64 rate, burst;
u8 ds_cnt;
@@ -187,12 +187,8 @@ mlx5e_tc_meter_modify(struct mlx5_core_dev *mdev,
mlx5_aso_post_wqe(aso, true, &aso_wqe->ctrl);
/* With newer FW, the wait for the first ASO WQE is more than 2us, put the wait 10ms. */
- expires = jiffies + msecs_to_jiffies(10);
- do {
- err = mlx5_aso_poll_cq(aso, true);
- if (err)
- usleep_range(2, 10);
- } while (err && time_is_after_jiffies(expires));
+ read_poll_timeout(mlx5_aso_poll_cq, err, !err, 10, 10 * USEC_PER_MSEC,
+ false, aso, true);
mutex_unlock(&flow_meters->aso_lock);
return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
index 528b04d4de41..90b3bc5f9166 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
@@ -5,6 +5,7 @@
#include <linux/mlx5/mlx5_ifc.h>
#include <linux/xarray.h>
#include <linux/if_vlan.h>
+#include <linux/iopoll.h>
#include "en.h"
#include "lib/aso.h"
@@ -1385,7 +1386,8 @@ static int macsec_aso_set_arm_event(struct mlx5_core_dev *mdev, struct mlx5e_mac
MLX5_ACCESS_ASO_OPC_MOD_MACSEC);
macsec_aso_build_ctrl(aso, &aso_wqe->aso_ctrl, in);
mlx5_aso_post_wqe(maso, false, &aso_wqe->ctrl);
- err = mlx5_aso_poll_cq(maso, false);
+ read_poll_timeout(mlx5_aso_poll_cq, err, !err, 10, 10 * USEC_PER_MSEC,
+ false, maso, false);
mutex_unlock(&aso->aso_lock);
return err;
@@ -1397,7 +1399,6 @@ static int macsec_aso_query(struct mlx5_core_dev *mdev, struct mlx5e_macsec *mac
struct mlx5e_macsec_aso *aso;
struct mlx5_aso_wqe *aso_wqe;
struct mlx5_aso *maso;
- unsigned long expires;
int err;
aso = &macsec->aso;
@@ -1411,12 +1412,8 @@ static int macsec_aso_query(struct mlx5_core_dev *mdev, struct mlx5e_macsec *mac
macsec_aso_build_wqe_ctrl_seg(aso, &aso_wqe->aso_ctrl, NULL);
mlx5_aso_post_wqe(maso, false, &aso_wqe->ctrl);
- expires = jiffies + msecs_to_jiffies(10);
- do {
- err = mlx5_aso_poll_cq(maso, false);
- if (err)
- usleep_range(2, 10);
- } while (err && time_is_after_jiffies(expires));
+ read_poll_timeout(mlx5_aso_poll_cq, err, !err, 10, 10 * USEC_PER_MSEC,
+ false, maso, false);
if (err)
goto err_out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 4b2963bbe7ff..e15e6fb4cd8e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -688,19 +688,7 @@ static void mlx5e_rq_timeout_work(struct work_struct *timeout_work)
struct mlx5e_rq,
rx_timeout_work);
- /* Acquire netdev instance lock to synchronize with channel close and
- * reopen flows. Either successfully obtain the lock, or detect that
- * channels are closing for another reason, making this work no longer
- * necessary.
- */
- while (!netdev_trylock(rq->netdev)) {
- if (!test_bit(MLX5E_STATE_CHANNELS_ACTIVE, &rq->priv->state))
- return;
- msleep(20);
- }
-
mlx5e_reporter_rx_timeout(rq);
- netdev_unlock(rq->netdev);
}
static int mlx5e_alloc_mpwqe_rq_drop_page(struct mlx5e_rq *rq)
@@ -1997,20 +1985,7 @@ void mlx5e_tx_err_cqe_work(struct work_struct *recover_work)
struct mlx5e_txqsq *sq = container_of(recover_work, struct mlx5e_txqsq,
recover_work);
- /* Recovering queues means re-enabling NAPI, which requires the netdev
- * instance lock. However, SQ closing flows have to wait for work tasks
- * to finish while also holding the netdev instance lock. So either get
- * the lock or find that the SQ is no longer enabled and thus this work
- * is not relevant anymore.
- */
- while (!netdev_trylock(sq->netdev)) {
- if (!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state))
- return;
- msleep(20);
- }
-
mlx5e_reporter_tx_err_cqe(sq);
- netdev_unlock(sq->netdev);
}
static struct dim_cq_moder mlx5e_get_def_tx_moderation(u8 cq_period_mode)
@@ -5121,19 +5096,6 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)
struct net_device *netdev = priv->netdev;
int i;
- /* Recovering the TX queues implies re-enabling NAPI, which requires
- * the netdev instance lock.
- * However, channel closing flows have to wait for this work to finish
- * while holding the same lock. So either get the lock or find that
- * channels are being closed for other reason and this work is not
- * relevant anymore.
- */
- while (!netdev_trylock(netdev)) {
- if (!test_bit(MLX5E_STATE_CHANNELS_ACTIVE, &priv->state))
- return;
- msleep(20);
- }
-
for (i = 0; i < netdev->real_num_tx_queues; i++) {
struct netdev_queue *dev_queue =
netdev_get_tx_queue(netdev, i);
@@ -5146,8 +5108,6 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)
/* break if tried to reopened channels */
break;
}
-
- netdev_unlock(netdev);
}
static void mlx5e_tx_timeout(struct net_device *dev, unsigned int txqueue)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wc.c b/drivers/net/ethernet/mellanox/mlx5/core/wc.c
index 815a7c97d6b0..04d03be1bb77 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wc.c
@@ -2,6 +2,7 @@
// Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/mlx5/transobj.h>
#include "lib/clock.h"
#include "mlx5_core.h"
@@ -15,7 +16,7 @@
#define TEST_WC_NUM_WQES 255
#define TEST_WC_LOG_CQ_SZ (order_base_2(TEST_WC_NUM_WQES))
#define TEST_WC_SQ_LOG_WQ_SZ TEST_WC_LOG_CQ_SZ
-#define TEST_WC_POLLING_MAX_TIME_JIFFIES msecs_to_jiffies(100)
+#define TEST_WC_POLLING_MAX_TIME_USEC (100 * USEC_PER_MSEC)
struct mlx5_wc_cq {
/* data path - accessed per cqe */
@@ -359,7 +360,6 @@ static int mlx5_wc_poll_cq(struct mlx5_wc_sq *sq)
static void mlx5_core_test_wc(struct mlx5_core_dev *mdev)
{
unsigned int offset = 0;
- unsigned long expires;
struct mlx5_wc_sq *sq;
int i, err;
@@ -389,13 +389,9 @@ static void mlx5_core_test_wc(struct mlx5_core_dev *mdev)
mlx5_wc_post_nop(sq, &offset, true);
- expires = jiffies + TEST_WC_POLLING_MAX_TIME_JIFFIES;
- do {
- err = mlx5_wc_poll_cq(sq);
- if (err)
- usleep_range(2, 10);
- } while (mdev->wc_state == MLX5_WC_STATE_UNINITIALIZED &&
- time_is_after_jiffies(expires));
+ poll_timeout_us(mlx5_wc_poll_cq(sq),
+ mdev->wc_state != MLX5_WC_STATE_UNINITIALIZED, 10,
+ TEST_WC_POLLING_MAX_TIME_USEC, false);
mlx5_wc_destroy_sq(sq);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
index 693ebdf38705..5edc28ba2955 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
@@ -1142,6 +1142,9 @@ static int fbnic_set_cls_rule_ins(struct fbnic_net *fbn,
return -EINVAL;
}
+ dest |= FIELD_PREP(FBNIC_RPC_ACT_TBL0_DMA_HINT,
+ FBNIC_RCD_HDR_AL_DMA_HINT_L4);
+
/* Write action table values */
act_tcam->dest = dest;
act_tcam->rss_en_mask = fbnic_flow_hash_2_rss_en_mask(fbn, hash_idx);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c
index 85a883dba385..d8a9a7d7c237 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c
@@ -51,8 +51,6 @@ int fbnic_fw_log_init(struct fbnic_dev *fbd)
log->data_start = data;
log->data_end = data + FBNIC_FW_LOG_SIZE;
- fbnic_fw_log_enable(fbd, true);
-
return 0;
}
@@ -63,7 +61,6 @@ void fbnic_fw_log_free(struct fbnic_dev *fbd)
if (!fbnic_fw_log_ready(fbd))
return;
- fbnic_fw_log_disable(fbd);
INIT_LIST_HEAD(&log->entries);
log->size = 0;
vfree(log->data_start);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
index 81c9d5c9a4b2..b4b396ca9bce 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
@@ -262,6 +262,23 @@ static int fbnic_set_mac(struct net_device *netdev, void *p)
return 0;
}
+static int fbnic_change_mtu(struct net_device *dev, int new_mtu)
+{
+ struct fbnic_net *fbn = netdev_priv(dev);
+
+ if (fbnic_check_split_frames(fbn->xdp_prog, new_mtu, fbn->hds_thresh)) {
+ dev_err(&dev->dev,
+ "MTU %d is larger than HDS threshold %d in XDP mode\n",
+ new_mtu, fbn->hds_thresh);
+
+ return -EINVAL;
+ }
+
+ WRITE_ONCE(dev->mtu, new_mtu);
+
+ return 0;
+}
+
void fbnic_clear_rx_mode(struct fbnic_dev *fbd)
{
struct net_device *netdev = fbd->netdev;
@@ -533,6 +550,7 @@ static const struct net_device_ops fbnic_netdev_ops = {
.ndo_start_xmit = fbnic_xmit_frame,
.ndo_features_check = fbnic_features_check,
.ndo_set_mac_address = fbnic_set_mac,
+ .ndo_change_mtu = fbnic_change_mtu,
.ndo_set_rx_mode = fbnic_set_rx_mode,
.ndo_get_stats64 = fbnic_get_stats64,
.ndo_bpf = fbnic_bpf,
@@ -787,6 +805,8 @@ struct net_device *fbnic_netdev_alloc(struct fbnic_dev *fbd)
netdev->hw_enc_features |= netdev->features;
netdev->features |= NETIF_F_NTUPLE;
+ netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_RX_SG;
+
netdev->min_mtu = IPV6_MIN_MTU;
netdev->max_mtu = FBNIC_MAX_JUMBO_FRAME_SIZE - ETH_HLEN;
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
index 9240673c7533..e92187bc1c0f 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
@@ -307,11 +307,17 @@ static int fbnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto free_irqs;
}
+ err = fbnic_fw_log_init(fbd);
+ if (err)
+ dev_warn(fbd->dev,
+ "Unable to initialize firmware log buffer: %d\n",
+ err);
+
err = fbnic_fw_request_mbx(fbd);
if (err) {
dev_err(&pdev->dev,
"Firmware mailbox initialization failure\n");
- goto free_irqs;
+ goto free_fw_log;
}
/* Send the request to enable the FW logging to host. Note if this
@@ -319,11 +325,7 @@ static int fbnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* possible the FW is just too old to support the logging and needs
* to be updated.
*/
- err = fbnic_fw_log_init(fbd);
- if (err)
- dev_warn(fbd->dev,
- "Unable to initialize firmware log buffer: %d\n",
- err);
+ fbnic_fw_log_enable(fbd, true);
fbnic_devlink_register(fbd);
fbnic_devlink_otp_check(fbd, "error detected during probe");
@@ -370,6 +372,8 @@ static int fbnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* firmware updates for fixes.
*/
return 0;
+free_fw_log:
+ fbnic_fw_log_free(fbd);
free_irqs:
fbnic_free_irqs(fbd);
err_destroy_health:
@@ -404,8 +408,9 @@ static void fbnic_remove(struct pci_dev *pdev)
fbnic_hwmon_unregister(fbd);
fbnic_dbg_fbd_exit(fbd);
fbnic_devlink_unregister(fbd);
- fbnic_fw_log_free(fbd);
+ fbnic_fw_log_disable(fbd);
fbnic_fw_free_mbx(fbd);
+ fbnic_fw_log_free(fbd);
fbnic_free_irqs(fbd);
fbnic_devlink_health_destroy(fbd);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
index 7f31e890031c..42a186db43ea 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
@@ -338,9 +338,8 @@ void fbnic_rss_reinit(struct fbnic_dev *fbd, struct fbnic_net *fbn)
else if (tstamp_mask & (1u << flow_type))
dest |= FBNIC_RPC_ACT_TBL0_TS_ENA;
- if (act1_value[flow_type] & FBNIC_RPC_TCAM_ACT1_L4_VALID)
- dest |= FIELD_PREP(FBNIC_RPC_ACT_TBL0_DMA_HINT,
- FBNIC_RCD_HDR_AL_DMA_HINT_L4);
+ dest |= FIELD_PREP(FBNIC_RPC_ACT_TBL0_DMA_HINT,
+ FBNIC_RCD_HDR_AL_DMA_HINT_L4);
rss_en_mask = fbnic_flow_hash_2_rss_en_mask(fbn, flow_type);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
index 13d508ce637f..e119526fce14 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
@@ -2575,7 +2575,8 @@ static void fbnic_enable_bdq(struct fbnic_ring *hpq, struct fbnic_ring *ppq)
}
static void fbnic_config_drop_mode_rcq(struct fbnic_napi_vector *nv,
- struct fbnic_ring *rcq, bool tx_pause)
+ struct fbnic_ring *rcq, bool tx_pause,
+ bool hdr_split)
{
struct fbnic_net *fbn = netdev_priv(nv->napi.dev);
u32 drop_mode, rcq_ctl;
@@ -2588,22 +2589,26 @@ static void fbnic_config_drop_mode_rcq(struct fbnic_napi_vector *nv,
/* Specify packet layout */
rcq_ctl = FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_DROP_MODE_MASK, drop_mode) |
FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_HROOM_MASK, FBNIC_RX_HROOM) |
- FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_TROOM_MASK, FBNIC_RX_TROOM);
+ FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_TROOM_MASK, FBNIC_RX_TROOM) |
+ FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT, hdr_split);
fbnic_ring_wr32(rcq, FBNIC_QUEUE_RDE_CTL0, rcq_ctl);
}
-void fbnic_config_drop_mode(struct fbnic_net *fbn, bool tx_pause)
+void fbnic_config_drop_mode(struct fbnic_net *fbn, bool txp)
{
+ bool hds;
int i, t;
+ hds = fbn->hds_thresh < FBNIC_HDR_BYTES_MIN;
+
for (i = 0; i < fbn->num_napi; i++) {
struct fbnic_napi_vector *nv = fbn->napi[i];
for (t = 0; t < nv->rxt_count; t++) {
struct fbnic_q_triad *qt = &nv->qt[nv->txt_count + t];
- fbnic_config_drop_mode_rcq(nv, &qt->cmpl, tx_pause);
+ fbnic_config_drop_mode_rcq(nv, &qt->cmpl, txp, hds);
}
}
}
@@ -2654,20 +2659,18 @@ static void fbnic_enable_rcq(struct fbnic_napi_vector *nv,
{
struct fbnic_net *fbn = netdev_priv(nv->napi.dev);
u32 log_size = fls(rcq->size_mask);
- u32 hds_thresh = fbn->hds_thresh;
u32 rcq_ctl = 0;
-
- fbnic_config_drop_mode_rcq(nv, rcq, fbn->tx_pause);
+ bool hdr_split;
+ u32 hds_thresh;
/* Force lower bound on MAX_HEADER_BYTES. Below this, all frames should
* be split at L4. It would also result in the frames being split at
* L2/L3 depending on the frame size.
*/
- if (fbn->hds_thresh < FBNIC_HDR_BYTES_MIN) {
- rcq_ctl = FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT;
- hds_thresh = FBNIC_HDR_BYTES_MIN;
- }
+ hdr_split = fbn->hds_thresh < FBNIC_HDR_BYTES_MIN;
+ fbnic_config_drop_mode_rcq(nv, rcq, fbn->tx_pause, hdr_split);
+ hds_thresh = max(fbn->hds_thresh, FBNIC_HDR_BYTES_MIN);
rcq_ctl |= FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_PADLEN_MASK, FBNIC_RX_PAD) |
FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_MAX_HDR_MASK, hds_thresh) |
FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_PAYLD_OFF_MASK,
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.h b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.h
index 27776e844e29..51a98f27d5d9 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.h
@@ -66,7 +66,7 @@ struct fbnic_net;
(4096 - FBNIC_RX_HROOM - FBNIC_RX_TROOM - FBNIC_RX_PAD)
#define FBNIC_HDS_THRESH_DEFAULT \
(1536 - FBNIC_RX_PAD)
-#define FBNIC_HDR_BYTES_MIN 128
+#define FBNIC_HDR_BYTES_MIN 256
struct fbnic_pkt_buff {
struct xdp_buff buff;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
index 2f168700f63c..8b2e07821a95 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
@@ -576,7 +576,7 @@ static int sparx5_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
static struct ptp_clock_info sparx5_ptp_clock_info = {
.owner = THIS_MODULE,
.name = "sparx5 ptp",
- .max_adj = 200000,
+ .max_adj = 10000000,
.gettime64 = sparx5_ptp_gettime64,
.settime64 = sparx5_ptp_settime64,
.adjtime = sparx5_ptp_adjtime,
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.h b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.h
index 1231a80335d7..04f76f1e23f6 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.h
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.h
@@ -35,7 +35,7 @@
#define SPX5_SE_BURST_UNIT 4096
/* Dwrr */
-#define SPX5_DWRR_COST_MAX 63
+#define SPX5_DWRR_COST_MAX 31
struct sparx5_shaper {
u32 mode;
diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 469784d3a1a6..1b8269320464 100644
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -551,44 +551,81 @@ static int ocelot_port_stop(struct net_device *dev)
return 0;
}
-static netdev_tx_t ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev)
+static bool ocelot_xmit_timestamp(struct ocelot *ocelot, int port,
+ struct sk_buff *skb, u32 *rew_op)
{
- struct ocelot_port_private *priv = netdev_priv(dev);
- struct ocelot_port *ocelot_port = &priv->port;
- struct ocelot *ocelot = ocelot_port->ocelot;
- int port = priv->port.index;
- u32 rew_op = 0;
-
- if (!static_branch_unlikely(&ocelot_fdma_enabled) &&
- !ocelot_can_inject(ocelot, 0))
- return NETDEV_TX_BUSY;
-
- /* Check if timestamping is needed */
if (ocelot->ptp && (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
struct sk_buff *clone = NULL;
if (ocelot_port_txtstamp_request(ocelot, port, skb, &clone)) {
kfree_skb(skb);
- return NETDEV_TX_OK;
+ return false;
}
if (clone)
OCELOT_SKB_CB(skb)->clone = clone;
- rew_op = ocelot_ptp_rew_op(skb);
+ *rew_op = ocelot_ptp_rew_op(skb);
}
- if (static_branch_unlikely(&ocelot_fdma_enabled)) {
- ocelot_fdma_inject_frame(ocelot, port, rew_op, skb, dev);
- } else {
- ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb);
+ return true;
+}
+
+static netdev_tx_t ocelot_port_xmit_fdma(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ struct ocelot_port_private *priv = netdev_priv(dev);
+ struct ocelot_port *ocelot_port = &priv->port;
+ struct ocelot *ocelot = ocelot_port->ocelot;
+ int port = priv->port.index;
+ u32 rew_op = 0;
+
+ if (!ocelot_xmit_timestamp(ocelot, port, skb, &rew_op))
+ return NETDEV_TX_OK;
+
+ ocelot_fdma_inject_frame(ocelot, port, rew_op, skb, dev);
+
+ return NETDEV_TX_OK;
+}
- consume_skb(skb);
+static netdev_tx_t ocelot_port_xmit_inj(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ struct ocelot_port_private *priv = netdev_priv(dev);
+ struct ocelot_port *ocelot_port = &priv->port;
+ struct ocelot *ocelot = ocelot_port->ocelot;
+ int port = priv->port.index;
+ u32 rew_op = 0;
+
+ ocelot_lock_inj_grp(ocelot, 0);
+
+ if (!ocelot_can_inject(ocelot, 0)) {
+ ocelot_unlock_inj_grp(ocelot, 0);
+ return NETDEV_TX_BUSY;
}
+ if (!ocelot_xmit_timestamp(ocelot, port, skb, &rew_op)) {
+ ocelot_unlock_inj_grp(ocelot, 0);
+ return NETDEV_TX_OK;
+ }
+
+ ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb);
+
+ ocelot_unlock_inj_grp(ocelot, 0);
+
+ consume_skb(skb);
+
return NETDEV_TX_OK;
}
+static netdev_tx_t ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ if (static_branch_unlikely(&ocelot_fdma_enabled))
+ return ocelot_port_xmit_fdma(skb, dev);
+
+ return ocelot_port_xmit_inj(skb, dev);
+}
+
enum ocelot_action_type {
OCELOT_MACT_LEARN,
OCELOT_MACT_FORGET,
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
index 2d9efadb5d2a..347b0aff100b 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
@@ -263,9 +263,10 @@ static int ionic_get_link_ksettings(struct net_device *netdev,
/* This means there's no module plugged in */
break;
default:
- dev_info(lif->ionic->dev, "unknown xcvr type pid=%d / 0x%x\n",
- idev->port_info->status.xcvr.pid,
- idev->port_info->status.xcvr.pid);
+ dev_dbg_ratelimited(lif->ionic->dev,
+ "unknown xcvr type pid=%d / 0x%x\n",
+ idev->port_info->status.xcvr.pid,
+ idev->port_info->status.xcvr.pid);
break;
}
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index 4a69ec77d69c..9433cd8adced 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/* Renesas Ethernet Switch device driver
*
- * Copyright (C) 2025 Renesas Electronics Corporation
+ * Copyright (C) 2025 - 2026 Renesas Electronics Corporation
*/
#include <linux/err.h>
@@ -60,6 +60,7 @@ static void rswitch_update_l2_hw_learning(struct rswitch_private *priv)
static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
{
struct rswitch_device *rdev;
+ bool new_forwarding_offload;
unsigned int fwd_mask;
/* calculate fwd_mask with zeroes in bits corresponding to ports that
@@ -73,8 +74,9 @@ static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
}
rswitch_for_all_ports(priv, rdev) {
- if ((rdev_for_l2_offload(rdev) && rdev->forwarding_requested) ||
- rdev->forwarding_offloaded) {
+ new_forwarding_offload = (rdev_for_l2_offload(rdev) && rdev->forwarding_requested);
+
+ if (new_forwarding_offload || rdev->forwarding_offloaded) {
/* Update allowed offload destinations even for ports
* with L2 offload enabled earlier.
*
@@ -84,13 +86,10 @@ static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
priv->addr + FWPC2(rdev->port));
}
- if (rdev_for_l2_offload(rdev) &&
- rdev->forwarding_requested &&
- !rdev->forwarding_offloaded) {
+ if (new_forwarding_offload && !rdev->forwarding_offloaded)
rswitch_change_l2_hw_offloading(rdev, true, false);
- } else if (rdev->forwarding_offloaded) {
+ else if (!new_forwarding_offload && rdev->forwarding_offloaded)
rswitch_change_l2_hw_offloading(rdev, false, false);
- }
}
}
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 107a7c84ace8..c05e3e7a539c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -91,8 +91,8 @@ static void loongson_default_data(struct pci_dev *pdev,
/* Get bus_id, this can be overwritten later */
plat->bus_id = pci_dev_id(pdev);
- /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
- plat->clk_csr = STMMAC_CSR_20_35M;
+ /* clk_csr_i = 100-150MHz & MDC = clk_csr_i/62 */
+ plat->clk_csr = STMMAC_CSR_100_150M;
plat->core_type = DWMAC_CORE_GMAC;
plat->force_sf_dma_mode = 1;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a379221b96a3..f98fd254315f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5023,13 +5023,27 @@ static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
if (!priv->sph_active)
return 0;
- /* Not last descriptor */
- if (status & rx_not_ls)
+ /* For GMAC4, when split header is enabled, in some rare cases, the
+ * hardware does not fill buf2 of the first descriptor with payload.
+ * Thus we cannot assume buf2 is always fully filled if it is not
+ * the last descriptor. Otherwise, the length of buf2 of the second
+ * descriptor will be calculated wrong and cause an oops.
+ *
+ * If this is the last descriptor, 'plen' is the length of the
+ * received packet that was transferred to system memory.
+ * Otherwise, it is the accumulated number of bytes that have been
+ * transferred for the current packet.
+ *
+ * Thus 'plen - len' always gives the correct length of buf2.
+ */
+
+ /* Not GMAC4 and not last descriptor */
+ if (priv->plat->core_type != DWMAC_CORE_GMAC4 && (status & rx_not_ls))
return priv->dma_conf.dma_buf_sz;
+ /* GMAC4 or last descriptor */
plen = stmmac_get_rx_frame_len(priv, p, coe);
- /* Last descriptor */
return plen - len;
}
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 48f0a96c0e9e..666998082998 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2551,6 +2551,9 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
goto err_out_clear_quattro;
}
+ /* BIGMAC may have bogus sizes */
+ if ((op->resource[3].end - op->resource[3].start) >= BMAC_REG_SIZE)
+ op->resource[3].end = op->resource[3].start + BMAC_REG_SIZE - 1;
hp->bigmacregs = devm_platform_ioremap_resource(op, 3);
if (IS_ERR(hp->bigmacregs)) {
dev_err(&op->dev, "Cannot map BIGMAC registers.\n");
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index c509228be84d..4433b8e95b6a 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1572,6 +1572,11 @@ int macvlan_common_newlink(struct net_device *dev,
if (create)
macvlan_port_destroy(port->dev);
}
+ /* @dev might have been made visible before an error was detected.
+ * Make sure to observe an RCU grace period before our caller
+ * (rtnl_newlink()) frees it.
+ */
+ synchronize_net();
return err;
}
EXPORT_SYMBOL_GPL(macvlan_common_newlink);
diff --git a/drivers/net/mctp/mctp-i2c.c b/drivers/net/mctp/mctp-i2c.c
index f782d93f826e..8043b57bdf25 100644
--- a/drivers/net/mctp/mctp-i2c.c
+++ b/drivers/net/mctp/mctp-i2c.c
@@ -242,6 +242,12 @@ static int mctp_i2c_slave_cb(struct i2c_client *client,
return 0;
switch (event) {
+ case I2C_SLAVE_READ_REQUESTED:
+ case I2C_SLAVE_READ_PROCESSED:
+ /* MCTP I2C transport only uses writes */
+ midev->rx_pos = 0;
+ *val = 0xff;
+ break;
case I2C_SLAVE_WRITE_RECEIVED:
if (midev->rx_pos < MCTP_I2C_BUFSZ) {
midev->rx_buffer[midev->rx_pos] = *val;
@@ -279,6 +285,9 @@ static int mctp_i2c_recv(struct mctp_i2c_dev *midev)
size_t recvlen;
int status;
+ if (midev->rx_pos == 0)
+ return 0;
+
/* + 1 for the PEC */
if (midev->rx_pos < MCTP_I2C_MINLEN + 1) {
ndev->stats.rx_length_errors++;
diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c
index 3e9e7f8444b3..955c9a37e1f8 100644
--- a/drivers/net/ovpn/io.c
+++ b/drivers/net/ovpn/io.c
@@ -355,6 +355,7 @@ netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev)
struct ovpn_priv *ovpn = netdev_priv(dev);
struct sk_buff *segments, *curr, *next;
struct sk_buff_head skb_list;
+ unsigned int tx_bytes = 0;
struct ovpn_peer *peer;
__be16 proto;
int ret;
@@ -365,7 +366,27 @@ netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev)
/* verify IP header size in network packet */
proto = ovpn_ip_check_protocol(skb);
if (unlikely(!proto || skb->protocol != proto))
- goto drop;
+ goto drop_no_peer;
+
+ /* retrieve peer serving the destination IP of this packet */
+ peer = ovpn_peer_get_by_dst(ovpn, skb);
+ if (unlikely(!peer)) {
+ switch (skb->protocol) {
+ case htons(ETH_P_IP):
+ net_dbg_ratelimited("%s: no peer to send data to dst=%pI4\n",
+ netdev_name(ovpn->dev),
+ &ip_hdr(skb)->daddr);
+ break;
+ case htons(ETH_P_IPV6):
+ net_dbg_ratelimited("%s: no peer to send data to dst=%pI6c\n",
+ netdev_name(ovpn->dev),
+ &ipv6_hdr(skb)->daddr);
+ break;
+ }
+ goto drop_no_peer;
+ }
+ /* dst was needed for peer selection - it can now be dropped */
+ skb_dst_drop(skb);
if (skb_is_gso(skb)) {
segments = skb_gso_segment(skb, 0);
@@ -394,36 +415,28 @@ netdev_tx_t ovpn_net_xmit(struct sk_buff *skb, struct net_device *dev)
continue;
}
+ /* only count what we actually send */
+ tx_bytes += curr->len;
__skb_queue_tail(&skb_list, curr);
}
- skb_list.prev->next = NULL;
- /* retrieve peer serving the destination IP of this packet */
- peer = ovpn_peer_get_by_dst(ovpn, skb);
- if (unlikely(!peer)) {
- switch (skb->protocol) {
- case htons(ETH_P_IP):
- net_dbg_ratelimited("%s: no peer to send data to dst=%pI4\n",
- netdev_name(ovpn->dev),
- &ip_hdr(skb)->daddr);
- break;
- case htons(ETH_P_IPV6):
- net_dbg_ratelimited("%s: no peer to send data to dst=%pI6c\n",
- netdev_name(ovpn->dev),
- &ipv6_hdr(skb)->daddr);
- break;
- }
- goto drop;
+ /* no segments survived: don't jump to 'drop' because we already
+ * incremented the counter for each failure in the loop
+ */
+ if (unlikely(skb_queue_empty(&skb_list))) {
+ ovpn_peer_put(peer);
+ return NETDEV_TX_OK;
}
- /* dst was needed for peer selection - it can now be dropped */
- skb_dst_drop(skb);
+ skb_list.prev->next = NULL;
- ovpn_peer_stats_increment_tx(&peer->vpn_stats, skb->len);
+ ovpn_peer_stats_increment_tx(&peer->vpn_stats, tx_bytes);
ovpn_send(ovpn, skb_list.next, peer);
return NETDEV_TX_OK;
drop:
+ ovpn_peer_put(peer);
+drop_no_peer:
dev_dstats_tx_dropped(ovpn->dev);
skb_tx_error(skb);
kfree_skb_list(skb);
diff --git a/drivers/net/ovpn/socket.c b/drivers/net/ovpn/socket.c
index 9750871ab65c..448cee3b3f9f 100644
--- a/drivers/net/ovpn/socket.c
+++ b/drivers/net/ovpn/socket.c
@@ -200,6 +200,22 @@ struct ovpn_socket *ovpn_socket_new(struct socket *sock, struct ovpn_peer *peer)
ovpn_sock->sk = sk;
kref_init(&ovpn_sock->refcount);
+ /* TCP sockets are per-peer, therefore they are linked to their unique
+ * peer
+ */
+ if (sk->sk_protocol == IPPROTO_TCP) {
+ INIT_WORK(&ovpn_sock->tcp_tx_work, ovpn_tcp_tx_work);
+ ovpn_sock->peer = peer;
+ ovpn_peer_hold(peer);
+ } else if (sk->sk_protocol == IPPROTO_UDP) {
+ /* in UDP we only link the ovpn instance since the socket is
+ * shared among multiple peers
+ */
+ ovpn_sock->ovpn = peer->ovpn;
+ netdev_hold(peer->ovpn->dev, &ovpn_sock->dev_tracker,
+ GFP_KERNEL);
+ }
+
/* the newly created ovpn_socket is holding reference to sk,
* therefore we increase its refcounter.
*
@@ -212,29 +228,16 @@ struct ovpn_socket *ovpn_socket_new(struct socket *sock, struct ovpn_peer *peer)
ret = ovpn_socket_attach(ovpn_sock, sock, peer);
if (ret < 0) {
+ if (sk->sk_protocol == IPPROTO_TCP)
+ ovpn_peer_put(peer);
+ else if (sk->sk_protocol == IPPROTO_UDP)
+ netdev_put(peer->ovpn->dev, &ovpn_sock->dev_tracker);
+
sock_put(sk);
kfree(ovpn_sock);
ovpn_sock = ERR_PTR(ret);
- goto sock_release;
- }
-
- /* TCP sockets are per-peer, therefore they are linked to their unique
- * peer
- */
- if (sk->sk_protocol == IPPROTO_TCP) {
- INIT_WORK(&ovpn_sock->tcp_tx_work, ovpn_tcp_tx_work);
- ovpn_sock->peer = peer;
- ovpn_peer_hold(peer);
- } else if (sk->sk_protocol == IPPROTO_UDP) {
- /* in UDP we only link the ovpn instance since the socket is
- * shared among multiple peers
- */
- ovpn_sock->ovpn = peer->ovpn;
- netdev_hold(peer->ovpn->dev, &ovpn_sock->dev_tracker,
- GFP_KERNEL);
}
- rcu_assign_sk_user_data(sk, ovpn_sock);
sock_release:
release_sock(sk);
return ovpn_sock;
diff --git a/drivers/net/ovpn/tcp.c b/drivers/net/ovpn/tcp.c
index 0d7f30360d87..ec2bbc28c196 100644
--- a/drivers/net/ovpn/tcp.c
+++ b/drivers/net/ovpn/tcp.c
@@ -199,7 +199,19 @@ void ovpn_tcp_socket_detach(struct ovpn_socket *ovpn_sock)
sk->sk_data_ready = peer->tcp.sk_cb.sk_data_ready;
sk->sk_write_space = peer->tcp.sk_cb.sk_write_space;
sk->sk_prot = peer->tcp.sk_cb.prot;
- sk->sk_socket->ops = peer->tcp.sk_cb.ops;
+
+ /* tcp_close() may race this function and could set
+ * sk->sk_socket to NULL. It does so by invoking
+ * sock_orphan(), which holds sk_callback_lock before
+ * doing the assignment.
+ *
+ * For this reason we acquire the same lock to avoid
+ * sk_socket to disappear under our feet
+ */
+ write_lock_bh(&sk->sk_callback_lock);
+ if (sk->sk_socket)
+ sk->sk_socket->ops = peer->tcp.sk_cb.ops;
+ write_unlock_bh(&sk->sk_callback_lock);
rcu_assign_sk_user_data(sk, NULL);
}
@@ -487,6 +499,7 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock,
/* make sure no pre-existing encapsulation handler exists */
if (ovpn_sock->sk->sk_user_data)
return -EBUSY;
+ rcu_assign_sk_user_data(ovpn_sock->sk, ovpn_sock);
/* only a fully connected socket is expected. Connection should be
* handled in userspace
@@ -495,13 +508,14 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock,
net_err_ratelimited("%s: provided TCP socket is not in ESTABLISHED state: %d\n",
netdev_name(peer->ovpn->dev),
ovpn_sock->sk->sk_state);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err;
}
ret = strp_init(&peer->tcp.strp, ovpn_sock->sk, &cb);
if (ret < 0) {
DEBUG_NET_WARN_ON_ONCE(1);
- return ret;
+ goto err;
}
INIT_WORK(&peer->tcp.defer_del_work, ovpn_tcp_peer_del_work);
@@ -536,6 +550,9 @@ int ovpn_tcp_socket_attach(struct ovpn_socket *ovpn_sock,
strp_check_rcv(&peer->tcp.strp);
return 0;
+err:
+ rcu_assign_sk_user_data(ovpn_sock->sk, NULL);
+ return ret;
}
static void ovpn_tcp_close(struct sock *sk, long timeout)
diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c
index d6a0f7a0b75d..272b535ecaad 100644
--- a/drivers/net/ovpn/udp.c
+++ b/drivers/net/ovpn/udp.c
@@ -386,6 +386,7 @@ int ovpn_udp_socket_attach(struct ovpn_socket *ovpn_sock, struct socket *sock,
struct ovpn_priv *ovpn)
{
struct udp_tunnel_sock_cfg cfg = {
+ .sk_user_data = ovpn_sock,
.encap_type = UDP_ENCAP_OVPNINUDP,
.encap_rcv = ovpn_udp_encap_recv,
.encap_destroy = ovpn_udp_encap_destroy,
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 6759388692f8..3c824340ffb0 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -64,6 +64,16 @@ static const char driver_name[] = "catc";
#define CTRL_QUEUE 16 /* Max control requests in flight (power of two) */
#define RX_PKT_SZ 1600 /* Max size of receive packet for F5U011 */
+/*
+ * USB endpoints.
+ */
+
+enum catc_usb_ep {
+ CATC_USB_EP_CONTROL = 0,
+ CATC_USB_EP_BULK = 1,
+ CATC_USB_EP_INT_IN = 2,
+};
+
/*
* Control requests.
*/
@@ -772,6 +782,13 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
u8 broadcast[ETH_ALEN];
u8 *macbuf;
int pktsz, ret = -ENOMEM;
+ static const u8 bulk_ep_addr[] = {
+ CATC_USB_EP_BULK | USB_DIR_OUT,
+ CATC_USB_EP_BULK | USB_DIR_IN,
+ 0};
+ static const u8 int_ep_addr[] = {
+ CATC_USB_EP_INT_IN | USB_DIR_IN,
+ 0};
macbuf = kmalloc(ETH_ALEN, GFP_KERNEL);
if (!macbuf)
@@ -784,6 +801,14 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
goto fail_mem;
}
+ /* Verify that all required endpoints are present */
+ if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) ||
+ !usb_check_int_endpoints(intf, int_ep_addr)) {
+ dev_err(dev, "Missing or invalid endpoints\n");
+ ret = -ENODEV;
+ goto fail_mem;
+ }
+
netdev = alloc_etherdev(sizeof(struct catc));
if (!netdev)
goto fail_mem;
@@ -828,14 +853,14 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
usb_fill_control_urb(catc->ctrl_urb, usbdev, usb_sndctrlpipe(usbdev, 0),
NULL, NULL, 0, catc_ctrl_done, catc);
- usb_fill_bulk_urb(catc->tx_urb, usbdev, usb_sndbulkpipe(usbdev, 1),
- NULL, 0, catc_tx_done, catc);
+ usb_fill_bulk_urb(catc->tx_urb, usbdev, usb_sndbulkpipe(usbdev, CATC_USB_EP_BULK),
+ NULL, 0, catc_tx_done, catc);
- usb_fill_bulk_urb(catc->rx_urb, usbdev, usb_rcvbulkpipe(usbdev, 1),
- catc->rx_buf, pktsz, catc_rx_done, catc);
+ usb_fill_bulk_urb(catc->rx_urb, usbdev, usb_rcvbulkpipe(usbdev, CATC_USB_EP_BULK),
+ catc->rx_buf, pktsz, catc_rx_done, catc);
- usb_fill_int_urb(catc->irq_urb, usbdev, usb_rcvintpipe(usbdev, 2),
- catc->irq_buf, 2, catc_irq_done, catc, 1);
+ usb_fill_int_urb(catc->irq_urb, usbdev, usb_rcvintpipe(usbdev, CATC_USB_EP_INT_IN),
+ catc->irq_buf, 2, catc_irq_done, catc, 1);
if (!catc->is_f5u011) {
u32 *buf;
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index c06d50db40b8..00d0556dafef 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -2487,7 +2487,11 @@ void ath10k_sdio_fw_crashed_dump(struct ath10k *ar)
if (fast_dump)
ath10k_bmi_start(ar);
+ mutex_lock(&ar->dump_mutex);
+
+ spin_lock_bh(&ar->data_lock);
ar->stats.fw_crash_counter++;
+ spin_unlock_bh(&ar->data_lock);
ath10k_sdio_disable_intrs(ar);
@@ -2505,6 +2509,8 @@ void ath10k_sdio_fw_crashed_dump(struct ath10k *ar)
ath10k_sdio_enable_intrs(ar);
+ mutex_unlock(&ar->dump_mutex);
+
ath10k_core_start_recovery(ar);
}
diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 812686173ac8..06b4df2370e9 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -997,6 +997,33 @@ static const struct dmi_system_id ath11k_pm_quirk_table[] = {
{}
};
+static const struct __ath11k_core_usecase_firmware_table {
+ u32 hw_rev;
+ const char *compatible;
+ const char *firmware_name;
+} ath11k_core_usecase_firmware_table[] = {
+ { ATH11K_HW_WCN6855_HW21, "qcom,lemans-evk", "nfa765"},
+ { ATH11K_HW_WCN6855_HW21, "qcom,monaco-evk", "nfa765"},
+ { ATH11K_HW_WCN6855_HW21, "qcom,hamoa-iot-evk", "nfa765"},
+ { /* Sentinel */ }
+};
+
+const char *ath11k_core_get_usecase_firmware(struct ath11k_base *ab)
+{
+ const struct __ath11k_core_usecase_firmware_table *entry = NULL;
+
+ entry = ath11k_core_usecase_firmware_table;
+ while (entry->compatible) {
+ if (ab->hw_rev == entry->hw_rev &&
+ of_machine_is_compatible(entry->compatible))
+ return entry->firmware_name;
+ entry++;
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL(ath11k_core_get_usecase_firmware);
+
void ath11k_fw_stats_pdevs_free(struct list_head *head)
{
struct ath11k_fw_stats_pdev *i, *tmp;
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index e8780b05ce11..834988dad591 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -1275,6 +1275,7 @@ bool ath11k_core_coldboot_cal_support(struct ath11k_base *ab);
const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,
const char *filename);
+const char *ath11k_core_get_usecase_firmware(struct ath11k_base *ab);
static inline const char *ath11k_scan_state_str(enum ath11k_scan_state state)
{
@@ -1329,6 +1330,9 @@ static inline void ath11k_core_create_firmware_path(struct ath11k_base *ab,
of_property_read_string(ab->dev->of_node, "firmware-name", &fw_name);
+ if (!fw_name)
+ fw_name = ath11k_core_get_usecase_firmware(ab);
+
if (fw_name && strncmp(filename, "board", 5))
snprintf(buf, buf_len, "%s/%s/%s/%s", ATH11K_FW_DIR,
ab->hw_params.fw.dir, fw_name, filename);
diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
index 48b010a1b756..4f749d473d0e 100644
--- a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
+++ b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause-Clear
/*
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/
#include <linux/vmalloc.h>
@@ -29,8 +29,10 @@ print_array_to_buf_index(u8 *buf, u32 offset, const char *header, u32 stats_inde
" %u:%u,", stats_index++, le32_to_cpu(array[i]));
}
/* To overwrite the last trailing comma */
- index--;
- *(buf + offset + index) = '\0';
+ if (array_len > 0) {
+ index--;
+ *(buf + offset + index) = '\0';
+ }
if (footer) {
index += scnprintf(buf + offset + index,
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index e0e49f782bf8..63684ff9332d 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -4175,8 +4175,10 @@ ath12k_mac_op_change_vif_links(struct ieee80211_hw *hw,
if (WARN_ON(!arvif))
return -EINVAL;
- if (!arvif->is_created)
+ if (!arvif->is_created) {
+ ath12k_mac_unassign_link_vif(arvif);
continue;
+ }
if (WARN_ON(!arvif->ar))
return -EINVAL;
diff --git a/drivers/net/wireless/ath/ath12k/wow.c b/drivers/net/wireless/ath/ath12k/wow.c
index e8481626f194..c78aa95d4979 100644
--- a/drivers/net/wireless/ath/ath12k/wow.c
+++ b/drivers/net/wireless/ath/ath12k/wow.c
@@ -135,6 +135,9 @@ static int ath12k_wow_cleanup(struct ath12k *ar)
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
list_for_each_entry(arvif, &ar->arvifs, list) {
+ if (arvif != &arvif->ahvif->deflink)
+ continue;
+
ret = ath12k_wow_vif_cleanup(arvif);
if (ret) {
ath12k_warn(ar->ab, "failed to clean wow wakeups on vdev %i: %d\n",
@@ -479,8 +482,12 @@ static int ath12k_wow_set_wakeups(struct ath12k *ar,
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
list_for_each_entry(arvif, &ar->arvifs, list) {
+ if (arvif != &arvif->ahvif->deflink)
+ continue;
+
if (ath12k_wow_is_p2p_vdev(arvif->ahvif))
continue;
+
ret = ath12k_wow_vif_set_wakeups(arvif, wowlan);
if (ret) {
ath12k_warn(ar->ab, "failed to set wow wakeups on vdev %i: %d\n",
@@ -538,6 +545,9 @@ static int ath12k_wow_nlo_cleanup(struct ath12k *ar)
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
list_for_each_entry(arvif, &ar->arvifs, list) {
+ if (arvif != &arvif->ahvif->deflink)
+ continue;
+
if (ath12k_wow_is_p2p_vdev(arvif->ahvif))
continue;
@@ -745,6 +755,9 @@ static int ath12k_wow_arp_ns_offload(struct ath12k *ar, bool enable)
list_for_each_entry(arvif, &ar->arvifs, list) {
ahvif = arvif->ahvif;
+ if (arvif != &ahvif->deflink)
+ continue;
+
if (ahvif->vdev_type != WMI_VDEV_TYPE_STA)
continue;
@@ -776,6 +789,9 @@ static int ath12k_gtk_rekey_offload(struct ath12k *ar, bool enable)
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
list_for_each_entry(arvif, &ar->arvifs, list) {
+ if (arvif != &arvif->ahvif->deflink)
+ continue;
+
if (arvif->ahvif->vdev_type != WMI_VDEV_TYPE_STA ||
!arvif->is_up ||
!arvif->rekey_data.enable_offload)
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index 0c47be06c153..47d570a5ca6a 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -47,7 +47,7 @@ config ATH9K_PCI
config ATH9K_AHB
bool "Atheros ath9k AHB bus support"
- depends on ATH9K
+ depends on ATH9K && OF
default n
help
This option enables the AHB bus support in ath9k.
diff --git a/drivers/net/wireless/ath/ath9k/common-debug.h b/drivers/net/wireless/ath/ath9k/common-debug.h
index 2938b5b96b07..97948af97682 100644
--- a/drivers/net/wireless/ath/ath9k/common-debug.h
+++ b/drivers/net/wireless/ath/ath9k/common-debug.h
@@ -19,14 +19,14 @@
/**
* struct ath_rx_stats - RX Statistics
* @rx_pkts_all: No. of total frames received, including ones that
- may have had errors.
+ * may have had errors.
* @rx_bytes_all: No. of total bytes received, including ones that
- may have had errors.
+ * may have had errors.
* @crc_err: No. of frames with incorrect CRC value
* @decrypt_crc_err: No. of frames whose CRC check failed after
- decryption process completed
+ * decryption process completed
* @phy_err: No. of frames whose reception failed because the PHY
- encountered an error
+ * encountered an error
* @mic_err: No. of frames with incorrect TKIP MIC verification failure
* @pre_delim_crc_err: Pre-Frame delimiter CRC error detections
* @post_delim_crc_err: Post-Frame delimiter CRC error detections
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index cb3e75969875..804e2a0a0c20 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -142,11 +142,12 @@ struct ath_interrupt_stats {
/**
* struct ath_tx_stats - Statistics about TX
* @tx_pkts_all: No. of total frames transmitted, including ones that
- may have had errors.
+ * may have had errors.
* @tx_bytes_all: No. of total bytes transmitted, including ones that
- may have had errors.
+ * may have had errors.
* @queued: Total MPDUs (non-aggr) queued
* @completed: Total MPDUs (non-aggr) completed
+ * @xretries: Total MPDUs with xretries
* @a_aggr: Total no. of aggregates queued
* @a_queued_hw: Total AMPDUs queued to hardware
* @a_completed: Total AMPDUs completed
@@ -154,14 +155,14 @@ struct ath_interrupt_stats {
* @a_xretries: No. of AMPDUs dropped due to xretries
* @txerr_filtered: No. of frames with TXERR_FILT flag set.
* @fifo_underrun: FIFO underrun occurrences
- Valid only for:
- - non-aggregate condition.
- - first packet of aggregate.
+ * Valid only for:
+ * - non-aggregate condition.
+ * - first packet of aggregate.
* @xtxop: No. of frames filtered because of TXOP limit
* @timer_exp: Transmit timer expiry
* @desc_cfg_err: Descriptor configuration errors
- * @data_urn: TX data underrun errors
- * @delim_urn: TX delimiter underrun errors
+ * @data_underrun: TX data underrun errors
+ * @delim_underrun: TX delimiter underrun errors
* @puttxbuf: Number of times hardware was given txbuf to write.
* @txstart: Number of times hardware was told to start tx.
* @txprocdesc: Number of times tx descriptor was processed
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 0824940c91ae..53d32f3137eb 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -1207,7 +1207,7 @@ rtw89_core_tx_update_desc_info(struct rtw89_dev *rtwdev,
if (addr_cam->valid && desc_info->mlo)
upd_wlan_hdr = true;
- if (rtw89_is_tx_rpt_skb(rtwdev, tx_req->skb))
+ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS || tx_req->with_wait)
rtw89_tx_rpt_init(rtwdev, tx_req);
is_bmc = (is_broadcast_ether_addr(hdr->addr1) ||
@@ -1342,13 +1342,15 @@ static int rtw89_core_tx_write_link(struct rtw89_dev *rtwdev,
tx_req.rtwvif_link = rtwvif_link;
tx_req.rtwsta_link = rtwsta_link;
tx_req.desc_info.sw_mld = sw_mld;
- rcu_assign_pointer(skb_data->wait, wait);
+ tx_req.with_wait = !!wait;
rtw89_traffic_stats_accu(rtwdev, rtwvif, skb, true, true);
rtw89_wow_parse_akm(rtwdev, skb);
rtw89_core_tx_update_desc_info(rtwdev, &tx_req);
rtw89_core_tx_wake(rtwdev, &tx_req);
+ rcu_assign_pointer(skb_data->wait, wait);
+
ret = rtw89_hci_tx_write(rtwdev, &tx_req);
if (ret) {
rtw89_err(rtwdev, "failed to transmit skb to HCI\n");
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index a9cb47ea0b93..92636cfc5ca5 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -1211,6 +1211,8 @@ struct rtw89_core_tx_request {
struct rtw89_vif_link *rtwvif_link;
struct rtw89_sta_link *rtwsta_link;
struct rtw89_tx_desc_info desc_info;
+
+ bool with_wait;
};
struct rtw89_txq {
diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
index 1264c2f82600..987eef8170f2 100644
--- a/drivers/net/wireless/realtek/rtw89/debug.c
+++ b/drivers/net/wireless/realtek/rtw89/debug.c
@@ -825,10 +825,6 @@ static ssize_t __print_txpwr_map(struct rtw89_dev *rtwdev, char *buf, size_t buf
s8 *bufp, tmp;
int ret;
- bufp = vzalloc(map->addr_to - map->addr_from + 4);
- if (!bufp)
- return -ENOMEM;
-
if (path_num == 1)
max_valid_addr = map->addr_to_1ss;
else
@@ -837,6 +833,10 @@ static ssize_t __print_txpwr_map(struct rtw89_dev *rtwdev, char *buf, size_t buf
if (max_valid_addr == 0)
return -EOPNOTSUPP;
+ bufp = vzalloc(map->addr_to - map->addr_from + 4);
+ if (!bufp)
+ return -ENOMEM;
+
for (addr = map->addr_from; addr <= max_valid_addr; addr += 4) {
ret = rtw89_mac_txpwr_read32(rtwdev, RTW89_PHY_0, addr, &val);
if (ret)
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index a78a25b87240..61b547aab286 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -735,10 +735,11 @@ static void connect(struct backend_info *be)
*/
requested_num_queues = xenbus_read_unsigned(dev->otherend,
"multi-queue-num-queues", 1);
- if (requested_num_queues > xenvif_max_queues) {
+ if (requested_num_queues > xenvif_max_queues ||
+ requested_num_queues == 0) {
/* buggy or malicious guest */
xenbus_dev_fatal(dev, -EINVAL,
- "guest requested %u queues, exceeding the maximum of %u.",
+ "guest requested %u queues, but valid range is 1 - %u.",
requested_num_queues, xenvif_max_queues);
return;
}
diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c
index c3f07be4aa22..af82385be7c6 100644
--- a/drivers/nvdimm/nd_virtio.c
+++ b/drivers/nvdimm/nd_virtio.c
@@ -44,6 +44,8 @@ static int virtio_pmem_flush(struct nd_region *nd_region)
unsigned long flags;
int err, err1;
+ guard(mutex)(&vpmem->flush_lock);
+
/*
* Don't bother to submit the request to the device if the device is
* not activated.
@@ -53,7 +55,6 @@ static int virtio_pmem_flush(struct nd_region *nd_region)
return -EIO;
}
- might_sleep();
req_data = kmalloc(sizeof(*req_data), GFP_KERNEL);
if (!req_data)
return -ENOMEM;
diff --git a/drivers/nvdimm/virtio_pmem.c b/drivers/nvdimm/virtio_pmem.c
index 2396d19ce549..77b196661905 100644
--- a/drivers/nvdimm/virtio_pmem.c
+++ b/drivers/nvdimm/virtio_pmem.c
@@ -64,6 +64,7 @@ static int virtio_pmem_probe(struct virtio_device *vdev)
goto out_err;
}
+ mutex_init(&vpmem->flush_lock);
vpmem->vdev = vdev;
vdev->priv = vpmem;
err = init_vq(vpmem);
diff --git a/drivers/nvdimm/virtio_pmem.h b/drivers/nvdimm/virtio_pmem.h
index 0dddefe594c4..f72cf17f9518 100644
--- a/drivers/nvdimm/virtio_pmem.h
+++ b/drivers/nvdimm/virtio_pmem.h
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <uapi/linux/virtio_pmem.h>
#include <linux/libnvdimm.h>
+#include <linux/mutex.h>
#include <linux/spinlock.h>
struct virtio_pmem_request {
@@ -35,6 +36,9 @@ struct virtio_pmem {
/* Virtio pmem request queue */
struct virtqueue *req_vq;
+ /* Serialize flush requests to the device. */
+ struct mutex flush_lock;
+
/* nvdimm bus registers virtio pmem device */
struct nvdimm_bus *nvdimm_bus;
struct nvdimm_bus_descriptor nd_desc;
diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index bf47a982cf62..74ddbd0f79b0 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -30,7 +30,7 @@ source "drivers/nvmem/layouts/Kconfig"
config NVMEM_AN8855_EFUSE
tristate "Airoha AN8855 eFuse support"
- depends on MFD_AIROHA_AN8855 || COMPILE_TEST
+ depends on COMPILE_TEST
help
Say y here to enable support for reading eFuses on Airoha AN8855
Switch. These are e.g. used to store factory programmed
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 3b773aaf9d05..9c184e93f50c 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -804,11 +804,13 @@ static void __init of_unittest_property_copy(void)
new = __of_prop_dup(&p1, GFP_KERNEL);
unittest(new && propcmp(&p1, new), "empty property didn't copy correctly\n");
- __of_prop_free(new);
+ if (new)
+ __of_prop_free(new);
new = __of_prop_dup(&p2, GFP_KERNEL);
unittest(new && propcmp(&p2, new), "non-empty property didn't copy correctly\n");
- __of_prop_free(new);
+ if (new)
+ __of_prop_free(new);
#endif
}
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index dbebb8c829bc..ae43c656f108 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -241,7 +241,7 @@ unsigned int dev_pm_opp_get_level(struct dev_pm_opp *opp)
{
if (IS_ERR_OR_NULL(opp) || !opp->available) {
pr_err("%s: Invalid parameters\n", __func__);
- return 0;
+ return U32_MAX;
}
return opp->level;
diff --git a/drivers/pci/controller/cadence/pcie-cadence.c b/drivers/pci/controller/cadence/pcie-cadence.c
index e6f1a4ac0fb7..a1eada56edba 100644
--- a/drivers/pci/controller/cadence/pcie-cadence.c
+++ b/drivers/pci/controller/cadence/pcie-cadence.c
@@ -13,13 +13,13 @@
u8 cdns_pcie_find_capability(struct cdns_pcie *pcie, u8 cap)
{
return PCI_FIND_NEXT_CAP(cdns_pcie_read_cfg, PCI_CAPABILITY_LIST,
- cap, pcie);
+ cap, NULL, pcie);
}
EXPORT_SYMBOL_GPL(cdns_pcie_find_capability);
u16 cdns_pcie_find_ext_capability(struct cdns_pcie *pcie, u8 cap)
{
- return PCI_FIND_NEXT_EXT_CAP(cdns_pcie_read_cfg, 0, cap, pcie);
+ return PCI_FIND_NEXT_EXT_CAP(cdns_pcie_read_cfg, 0, cap, NULL, pcie);
}
EXPORT_SYMBOL_GPL(cdns_pcie_find_ext_capability);
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index 01cfd9aeb0b8..d5d26229063f 100644
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -424,6 +424,7 @@ static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features dra7xx_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = true,
.msi_capable = true,
};
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 4668fc9648bf..f28e335bbbfa 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1387,6 +1387,7 @@ static int imx_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features imx8m_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.bar[BAR_1] = { .type = BAR_RESERVED, },
.bar[BAR_3] = { .type = BAR_RESERVED, },
@@ -1396,6 +1397,7 @@ static const struct pci_epc_features imx8m_pcie_epc_features = {
};
static const struct pci_epc_features imx8q_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.bar[BAR_1] = { .type = BAR_RESERVED, },
.bar[BAR_3] = { .type = BAR_RESERVED, },
@@ -1416,6 +1418,7 @@ static const struct pci_epc_features imx8q_pcie_epc_features = {
* BAR5 | Enable | 32-bit | 64 KB | Programmable Size
*/
static const struct pci_epc_features imx95_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.bar[BAR_1] = { .type = BAR_FIXED, .fixed_size = SZ_64K, },
.align = SZ_4K,
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index f86d9111f863..20fa4dadb82a 100644
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -930,6 +930,7 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features ks_pcie_am654_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.msix_capable = true,
.bar[BAR_0] = { .type = BAR_RESERVED, },
diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index f4a136ee2daf..e994b75986c3 100644
--- a/drivers/pci/controller/dwc/pcie-artpec6.c
+++ b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -370,6 +370,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features artpec6_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
};
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 19571ac2b961..59fd6ebf0148 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -72,47 +72,15 @@ EXPORT_SYMBOL_GPL(dw_pcie_ep_reset_bar);
static u8 dw_pcie_ep_find_capability(struct dw_pcie_ep *ep, u8 func_no, u8 cap)
{
return PCI_FIND_NEXT_CAP(dw_pcie_ep_read_cfg, PCI_CAPABILITY_LIST,
- cap, ep, func_no);
+ cap, NULL, ep, func_no);
}
-/**
- * dw_pcie_ep_hide_ext_capability - Hide a capability from the linked list
- * @pci: DWC PCI device
- * @prev_cap: Capability preceding the capability that should be hidden
- * @cap: Capability that should be hidden
- *
- * Return: 0 if success, errno otherwise.
- */
-int dw_pcie_ep_hide_ext_capability(struct dw_pcie *pci, u8 prev_cap, u8 cap)
+static u16 dw_pcie_ep_find_ext_capability(struct dw_pcie_ep *ep,
+ u8 func_no, u8 cap)
{
- u16 prev_cap_offset, cap_offset;
- u32 prev_cap_header, cap_header;
-
- prev_cap_offset = dw_pcie_find_ext_capability(pci, prev_cap);
- if (!prev_cap_offset)
- return -EINVAL;
-
- prev_cap_header = dw_pcie_readl_dbi(pci, prev_cap_offset);
- cap_offset = PCI_EXT_CAP_NEXT(prev_cap_header);
- cap_header = dw_pcie_readl_dbi(pci, cap_offset);
-
- /* cap must immediately follow prev_cap. */
- if (PCI_EXT_CAP_ID(cap_header) != cap)
- return -EINVAL;
-
- /* Clear next ptr. */
- prev_cap_header &= ~GENMASK(31, 20);
-
- /* Set next ptr to next ptr of cap. */
- prev_cap_header |= cap_header & GENMASK(31, 20);
-
- dw_pcie_dbi_ro_wr_en(pci);
- dw_pcie_writel_dbi(pci, prev_cap_offset, prev_cap_header);
- dw_pcie_dbi_ro_wr_dis(pci);
-
- return 0;
+ return PCI_FIND_NEXT_EXT_CAP(dw_pcie_ep_read_cfg, 0,
+ cap, NULL, ep, func_no);
}
-EXPORT_SYMBOL_GPL(dw_pcie_ep_hide_ext_capability);
static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
struct pci_epf_header *hdr)
@@ -139,18 +107,23 @@ static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
return 0;
}
-static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type,
- dma_addr_t parent_bus_addr, enum pci_barno bar,
- size_t size)
+/* BAR Match Mode inbound iATU mapping */
+static int dw_pcie_ep_ib_atu_bar(struct dw_pcie_ep *ep, u8 func_no, int type,
+ dma_addr_t parent_bus_addr, enum pci_barno bar,
+ size_t size)
{
int ret;
u32 free_win;
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
- if (!ep->bar_to_atu[bar])
+ if (!ep_func)
+ return -EINVAL;
+
+ if (!ep_func->bar_to_atu[bar])
free_win = find_first_zero_bit(ep->ib_window_map, pci->num_ib_windows);
else
- free_win = ep->bar_to_atu[bar] - 1;
+ free_win = ep_func->bar_to_atu[bar] - 1;
if (free_win >= pci->num_ib_windows) {
dev_err(pci->dev, "No free inbound window\n");
@@ -168,12 +141,190 @@ static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type,
* Always increment free_win before assignment, since value 0 is used to identify
* unallocated mapping.
*/
- ep->bar_to_atu[bar] = free_win + 1;
+ ep_func->bar_to_atu[bar] = free_win + 1;
set_bit(free_win, ep->ib_window_map);
return 0;
}
+static void dw_pcie_ep_clear_ib_maps(struct dw_pcie_ep *ep, u8 func_no, enum pci_barno bar)
+{
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
+ struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ struct device *dev = pci->dev;
+ unsigned int i, num;
+ u32 atu_index;
+ u32 *indexes;
+
+ if (!ep_func)
+ return;
+
+ /* Tear down the BAR Match Mode mapping, if any. */
+ if (ep_func->bar_to_atu[bar]) {
+ atu_index = ep_func->bar_to_atu[bar] - 1;
+ dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_IB, atu_index);
+ clear_bit(atu_index, ep->ib_window_map);
+ ep_func->bar_to_atu[bar] = 0;
+ }
+
+ /* Tear down all Address Match Mode mappings, if any. */
+ indexes = ep_func->ib_atu_indexes[bar];
+ num = ep_func->num_ib_atu_indexes[bar];
+ ep_func->ib_atu_indexes[bar] = NULL;
+ ep_func->num_ib_atu_indexes[bar] = 0;
+ if (!indexes)
+ return;
+ for (i = 0; i < num; i++) {
+ dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_IB, indexes[i]);
+ clear_bit(indexes[i], ep->ib_window_map);
+ }
+ devm_kfree(dev, indexes);
+}
+
+static u64 dw_pcie_ep_read_bar_assigned(struct dw_pcie_ep *ep, u8 func_no,
+ enum pci_barno bar, int flags)
+{
+ u32 reg = PCI_BASE_ADDRESS_0 + (4 * bar);
+ u32 lo, hi;
+ u64 addr;
+
+ lo = dw_pcie_ep_readl_dbi(ep, func_no, reg);
+
+ if (flags & PCI_BASE_ADDRESS_SPACE)
+ return lo & PCI_BASE_ADDRESS_IO_MASK;
+
+ addr = lo & PCI_BASE_ADDRESS_MEM_MASK;
+ if (!(flags & PCI_BASE_ADDRESS_MEM_TYPE_64))
+ return addr;
+
+ hi = dw_pcie_ep_readl_dbi(ep, func_no, reg + 4);
+ return addr | ((u64)hi << 32);
+}
+
+static int dw_pcie_ep_validate_submap(struct dw_pcie_ep *ep,
+ const struct pci_epf_bar_submap *submap,
+ unsigned int num_submap, size_t bar_size)
+{
+ struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ u32 align = pci->region_align;
+ size_t off = 0;
+ unsigned int i;
+ size_t size;
+
+ if (!align || !IS_ALIGNED(bar_size, align))
+ return -EINVAL;
+
+ /*
+ * The submap array order defines the BAR layout (submap[0] starts
+ * at offset 0 and each entry immediately follows the previous
+ * one). Here, validate that it forms a strict, gapless
+ * decomposition of the BAR:
+ * - each entry has a non-zero size
+ * - sizes, implicit offsets and phys_addr are aligned to
+ * pci->region_align
+ * - each entry lies within the BAR range
+ * - the entries exactly cover the whole BAR
+ *
+ * Note: dw_pcie_prog_inbound_atu() also checks alignment for the
+ * PCI address and the target phys_addr, but validating up-front
+ * avoids partially programming iATU windows in vain.
+ */
+ for (i = 0; i < num_submap; i++) {
+ size = submap[i].size;
+
+ if (!size)
+ return -EINVAL;
+
+ if (!IS_ALIGNED(size, align) || !IS_ALIGNED(off, align))
+ return -EINVAL;
+
+ if (!IS_ALIGNED(submap[i].phys_addr, align))
+ return -EINVAL;
+
+ if (off > bar_size || size > bar_size - off)
+ return -EINVAL;
+
+ off += size;
+ }
+ if (off != bar_size)
+ return -EINVAL;
+
+ return 0;
+}
+
+/* Address Match Mode inbound iATU mapping */
+static int dw_pcie_ep_ib_atu_addr(struct dw_pcie_ep *ep, u8 func_no, int type,
+ const struct pci_epf_bar *epf_bar)
+{
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
+ const struct pci_epf_bar_submap *submap = epf_bar->submap;
+ struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ enum pci_barno bar = epf_bar->barno;
+ struct device *dev = pci->dev;
+ u64 pci_addr, parent_bus_addr;
+ u64 size, base, off = 0;
+ int free_win, ret;
+ unsigned int i;
+ u32 *indexes;
+
+ if (!ep_func || !epf_bar->num_submap || !submap || !epf_bar->size)
+ return -EINVAL;
+
+ ret = dw_pcie_ep_validate_submap(ep, submap, epf_bar->num_submap,
+ epf_bar->size);
+ if (ret)
+ return ret;
+
+ base = dw_pcie_ep_read_bar_assigned(ep, func_no, bar, epf_bar->flags);
+ if (!base) {
+ dev_err(dev,
+ "BAR%u not assigned, cannot set up sub-range mappings\n",
+ bar);
+ return -EINVAL;
+ }
+
+ indexes = devm_kcalloc(dev, epf_bar->num_submap, sizeof(*indexes),
+ GFP_KERNEL);
+ if (!indexes)
+ return -ENOMEM;
+
+ ep_func->ib_atu_indexes[bar] = indexes;
+ ep_func->num_ib_atu_indexes[bar] = 0;
+
+ for (i = 0; i < epf_bar->num_submap; i++) {
+ size = submap[i].size;
+ parent_bus_addr = submap[i].phys_addr;
+
+ if (off > (~0ULL) - base) {
+ ret = -EINVAL;
+ goto err;
+ }
+
+ pci_addr = base + off;
+ off += size;
+
+ free_win = find_first_zero_bit(ep->ib_window_map,
+ pci->num_ib_windows);
+ if (free_win >= pci->num_ib_windows) {
+ ret = -ENOSPC;
+ goto err;
+ }
+
+ ret = dw_pcie_prog_inbound_atu(pci, free_win, type,
+ parent_bus_addr, pci_addr, size);
+ if (ret)
+ goto err;
+
+ set_bit(free_win, ep->ib_window_map);
+ indexes[i] = free_win;
+ ep_func->num_ib_atu_indexes[bar] = i + 1;
+ }
+ return 0;
+err:
+ dw_pcie_ep_clear_ib_maps(ep, func_no, bar);
+ return ret;
+}
+
static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep,
struct dw_pcie_ob_atu_cfg *atu)
{
@@ -204,35 +355,34 @@ static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
enum pci_barno bar = epf_bar->barno;
- u32 atu_index = ep->bar_to_atu[bar] - 1;
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
- if (!ep->bar_to_atu[bar])
+ if (!ep_func || !ep_func->epf_bar[bar])
return;
__dw_pcie_ep_reset_bar(pci, func_no, bar, epf_bar->flags);
- dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_IB, atu_index);
- clear_bit(atu_index, ep->ib_window_map);
- ep->epf_bar[bar] = NULL;
- ep->bar_to_atu[bar] = 0;
+ dw_pcie_ep_clear_ib_maps(ep, func_no, bar);
+
+ ep_func->epf_bar[bar] = NULL;
}
-static unsigned int dw_pcie_ep_get_rebar_offset(struct dw_pcie *pci,
+static unsigned int dw_pcie_ep_get_rebar_offset(struct dw_pcie_ep *ep, u8 func_no,
enum pci_barno bar)
{
u32 reg, bar_index;
unsigned int offset, nbars;
int i;
- offset = dw_pcie_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+ offset = dw_pcie_ep_find_ext_capability(ep, func_no, PCI_EXT_CAP_ID_REBAR);
if (!offset)
return offset;
- reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);
+ reg = dw_pcie_ep_readl_dbi(ep, func_no, offset + PCI_REBAR_CTRL);
nbars = FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, reg);
for (i = 0; i < nbars; i++, offset += PCI_REBAR_CTRL) {
- reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);
+ reg = dw_pcie_ep_readl_dbi(ep, func_no, offset + PCI_REBAR_CTRL);
bar_index = FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, reg);
if (bar_index == bar)
return offset;
@@ -253,7 +403,7 @@ static int dw_pcie_ep_set_bar_resizable(struct dw_pcie_ep *ep, u8 func_no,
u32 rebar_cap, rebar_ctrl;
int ret;
- rebar_offset = dw_pcie_ep_get_rebar_offset(pci, bar);
+ rebar_offset = dw_pcie_ep_get_rebar_offset(ep, func_no, bar);
if (!rebar_offset)
return -EINVAL;
@@ -283,16 +433,16 @@ static int dw_pcie_ep_set_bar_resizable(struct dw_pcie_ep *ep, u8 func_no,
* 1 MB to 128 TB. Bits 31:16 in PCI_REBAR_CTRL define "supported sizes"
* bits for sizes 256 TB to 8 EB. Disallow sizes 256 TB to 8 EB.
*/
- rebar_ctrl = dw_pcie_readl_dbi(pci, rebar_offset + PCI_REBAR_CTRL);
+ rebar_ctrl = dw_pcie_ep_readl_dbi(ep, func_no, rebar_offset + PCI_REBAR_CTRL);
rebar_ctrl &= ~GENMASK(31, 16);
- dw_pcie_writel_dbi(pci, rebar_offset + PCI_REBAR_CTRL, rebar_ctrl);
+ dw_pcie_ep_writel_dbi(ep, func_no, rebar_offset + PCI_REBAR_CTRL, rebar_ctrl);
/*
* The "selected size" (bits 13:8) in PCI_REBAR_CTRL are automatically
* updated when writing PCI_REBAR_CAP, see "Figure 3-26 Resizable BAR
* Example for 32-bit Memory BAR0" in DWC EP databook 5.96a.
*/
- dw_pcie_writel_dbi(pci, rebar_offset + PCI_REBAR_CAP, rebar_cap);
+ dw_pcie_ep_writel_dbi(ep, func_no, rebar_offset + PCI_REBAR_CAP, rebar_cap);
dw_pcie_dbi_ro_wr_dis(pci);
@@ -341,12 +491,16 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
{
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
enum pci_barno bar = epf_bar->barno;
size_t size = epf_bar->size;
enum pci_epc_bar_type bar_type;
int flags = epf_bar->flags;
int ret, type;
+ if (!ep_func)
+ return -EINVAL;
+
/*
* DWC does not allow BAR pairs to overlap, e.g. you cannot combine BARs
* 1 and 2 to form a 64-bit BAR.
@@ -360,21 +514,46 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
* calling clear_bar() would clear the BAR's PCI address assigned by the
* host).
*/
- if (ep->epf_bar[bar]) {
+ if (ep_func->epf_bar[bar]) {
/*
* We can only dynamically change a BAR if the new BAR size and
* BAR flags do not differ from the existing configuration.
+ *
+ * Note: this safety check only works when the caller uses
+ * a new struct pci_epf_bar in the second set_bar() call.
+ * If the same instance is updated in place and passed in,
+ * we cannot reliably detect invalid barno/size/flags
+ * changes here.
*/
- if (ep->epf_bar[bar]->barno != bar ||
- ep->epf_bar[bar]->size != size ||
- ep->epf_bar[bar]->flags != flags)
+ if (ep_func->epf_bar[bar]->barno != bar ||
+ ep_func->epf_bar[bar]->size != size ||
+ ep_func->epf_bar[bar]->flags != flags)
return -EINVAL;
+ /*
+ * When dynamically changing a BAR, tear down any existing
+ * mappings before re-programming. This is redundant when
+ * both the old and new mappings are BAR Match Mode, but
+ * required to handle in-place updates and match-mode
+ * changes reliably.
+ */
+ dw_pcie_ep_clear_ib_maps(ep, func_no, bar);
+
/*
* When dynamically changing a BAR, skip writing the BAR reg, as
* that would clear the BAR's PCI address assigned by the host.
*/
goto config_atu;
+ } else {
+ /*
+ * Subrange mapping is an update-only operation. The BAR
+ * must have been configured once without submaps so that
+ * subsequent set_bar() calls can update inbound mappings
+ * without touching the BAR register (and clobbering the
+ * host-assigned address).
+ */
+ if (epf_bar->num_submap)
+ return -EINVAL;
}
bar_type = dw_pcie_ep_get_bar_type(ep, bar);
@@ -408,12 +587,16 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
else
type = PCIE_ATU_TYPE_IO;
- ret = dw_pcie_ep_inbound_atu(ep, func_no, type, epf_bar->phys_addr, bar,
- size);
+ if (epf_bar->num_submap)
+ ret = dw_pcie_ep_ib_atu_addr(ep, func_no, type, epf_bar);
+ else
+ ret = dw_pcie_ep_ib_atu_bar(ep, func_no, type,
+ epf_bar->phys_addr, bar, size);
+
if (ret)
return ret;
- ep->epf_bar[bar] = epf_bar;
+ ep_func->epf_bar[bar] = epf_bar;
return 0;
}
@@ -601,6 +784,16 @@ static void dw_pcie_ep_stop(struct pci_epc *epc)
struct dw_pcie_ep *ep = epc_get_drvdata(epc);
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ /*
+ * Tear down the dedicated outbound window used for MSI
+ * generation. This avoids leaking an iATU window across
+ * endpoint stop/start cycles.
+ */
+ if (ep->msi_iatu_mapped) {
+ dw_pcie_ep_unmap_addr(epc, 0, 0, ep->msi_mem_phys);
+ ep->msi_iatu_mapped = false;
+ }
+
dw_pcie_stop_link(pci);
}
@@ -702,14 +895,37 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
msg_addr = ((u64)msg_addr_upper) << 32 | msg_addr_lower;
msg_addr = dw_pcie_ep_align_addr(epc, msg_addr, &map_size, &offset);
- ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr,
- map_size);
- if (ret)
- return ret;
- writel(msg_data | (interrupt_num - 1), ep->msi_mem + offset);
+ /*
+ * Program the outbound iATU once and keep it enabled.
+ *
+ * The spec warns that updating iATU registers while there are
+ * operations in flight on the AXI bridge interface is not
+ * supported, so we avoid reprogramming the region on every MSI,
+ * specifically unmapping immediately after writel().
+ */
+ if (!ep->msi_iatu_mapped) {
+ ret = dw_pcie_ep_map_addr(epc, func_no, 0,
+ ep->msi_mem_phys, msg_addr,
+ map_size);
+ if (ret)
+ return ret;
+
+ ep->msi_iatu_mapped = true;
+ ep->msi_msg_addr = msg_addr;
+ ep->msi_map_size = map_size;
+ } else if (WARN_ON_ONCE(ep->msi_msg_addr != msg_addr ||
+ ep->msi_map_size != map_size)) {
+ /*
+ * The host changed the MSI target address or the required
+ * mapping size changed. Reprogramming the iATU at runtime is
+ * unsafe on this controller, so bail out instead of trying to
+ * update the existing region.
+ */
+ return -EINVAL;
+ }
- dw_pcie_ep_unmap_addr(epc, func_no, 0, ep->msi_mem_phys);
+ writel(msg_data | (interrupt_num - 1), ep->msi_mem + offset);
return 0;
}
@@ -775,7 +991,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
bir = FIELD_GET(PCI_MSIX_TABLE_BIR, tbl_offset);
tbl_offset &= PCI_MSIX_TABLE_OFFSET;
- msix_tbl = ep->epf_bar[bir]->addr + tbl_offset;
+ msix_tbl = ep_func->epf_bar[bir]->addr + tbl_offset;
msg_addr = msix_tbl[(interrupt_num - 1)].msg_addr;
msg_data = msix_tbl[(interrupt_num - 1)].msg_data;
vec_ctrl = msix_tbl[(interrupt_num - 1)].vector_ctrl;
@@ -836,20 +1052,20 @@ void dw_pcie_ep_deinit(struct dw_pcie_ep *ep)
}
EXPORT_SYMBOL_GPL(dw_pcie_ep_deinit);
-static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci)
+static void dw_pcie_ep_init_rebar_registers(struct dw_pcie_ep *ep, u8 func_no)
{
- struct dw_pcie_ep *ep = &pci->ep;
- unsigned int offset;
- unsigned int nbars;
+ struct dw_pcie_ep_func *ep_func = dw_pcie_ep_get_func_from_ep(ep, func_no);
+ unsigned int offset, nbars;
enum pci_barno bar;
u32 reg, i, val;
- offset = dw_pcie_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+ if (!ep_func)
+ return;
- dw_pcie_dbi_ro_wr_en(pci);
+ offset = dw_pcie_ep_find_ext_capability(ep, func_no, PCI_EXT_CAP_ID_REBAR);
if (offset) {
- reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);
+ reg = dw_pcie_ep_readl_dbi(ep, func_no, offset + PCI_REBAR_CTRL);
nbars = FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, reg);
/*
@@ -870,16 +1086,28 @@ static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci)
* the controller when RESBAR_CAP_REG is written, which
* is why RESBAR_CAP_REG is written here.
*/
- val = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);
+ val = dw_pcie_ep_readl_dbi(ep, func_no, offset + PCI_REBAR_CTRL);
bar = FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, val);
- if (ep->epf_bar[bar])
- pci_epc_bar_size_to_rebar_cap(ep->epf_bar[bar]->size, &val);
+ if (ep_func->epf_bar[bar])
+ pci_epc_bar_size_to_rebar_cap(ep_func->epf_bar[bar]->size, &val);
else
val = BIT(4);
- dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, val);
+ dw_pcie_ep_writel_dbi(ep, func_no, offset + PCI_REBAR_CAP, val);
}
}
+}
+
+static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci)
+{
+ struct dw_pcie_ep *ep = &pci->ep;
+ u8 funcs = ep->epc->max_functions;
+ u8 func_no;
+
+ dw_pcie_dbi_ro_wr_en(pci);
+
+ for (func_no = 0; func_no < funcs; func_no++)
+ dw_pcie_ep_init_rebar_registers(ep, func_no);
dw_pcie_setup(pci);
dw_pcie_dbi_ro_wr_dis(pci);
@@ -1087,6 +1315,9 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
struct device *dev = pci->dev;
INIT_LIST_HEAD(&ep->func_list);
+ ep->msi_iatu_mapped = false;
+ ep->msi_msg_addr = 0;
+ ep->msi_map_size = 0;
epc = devm_pci_epc_create(dev, &epc_ops);
if (IS_ERR(epc)) {
diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
index 12f41886c65d..8530746ec5cb 100644
--- a/drivers/pci/controller/dwc/pcie-designware-plat.c
+++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
@@ -61,6 +61,7 @@ static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features dw_plat_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.msix_capable = true,
};
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 75fc8b767fcc..345365ea97c7 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -226,16 +226,69 @@ void dw_pcie_version_detect(struct dw_pcie *pci)
u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap)
{
return PCI_FIND_NEXT_CAP(dw_pcie_read_cfg, PCI_CAPABILITY_LIST, cap,
- pci);
+ NULL, pci);
}
EXPORT_SYMBOL_GPL(dw_pcie_find_capability);
u16 dw_pcie_find_ext_capability(struct dw_pcie *pci, u8 cap)
{
- return PCI_FIND_NEXT_EXT_CAP(dw_pcie_read_cfg, 0, cap, pci);
+ return PCI_FIND_NEXT_EXT_CAP(dw_pcie_read_cfg, 0, cap, NULL, pci);
}
EXPORT_SYMBOL_GPL(dw_pcie_find_ext_capability);
+void dw_pcie_remove_capability(struct dw_pcie *pci, u8 cap)
+{
+ u8 cap_pos, pre_pos, next_pos;
+ u16 reg;
+
+ cap_pos = PCI_FIND_NEXT_CAP(dw_pcie_read_cfg, PCI_CAPABILITY_LIST, cap,
+ &pre_pos, pci);
+ if (!cap_pos)
+ return;
+
+ reg = dw_pcie_readw_dbi(pci, cap_pos);
+ next_pos = (reg & 0xff00) >> 8;
+
+ dw_pcie_dbi_ro_wr_en(pci);
+ if (pre_pos == PCI_CAPABILITY_LIST)
+ dw_pcie_writeb_dbi(pci, PCI_CAPABILITY_LIST, next_pos);
+ else
+ dw_pcie_writeb_dbi(pci, pre_pos + 1, next_pos);
+ dw_pcie_dbi_ro_wr_dis(pci);
+}
+EXPORT_SYMBOL_GPL(dw_pcie_remove_capability);
+
+void dw_pcie_remove_ext_capability(struct dw_pcie *pci, u8 cap)
+{
+ int cap_pos, next_pos, pre_pos;
+ u32 pre_header, header;
+
+ cap_pos = PCI_FIND_NEXT_EXT_CAP(dw_pcie_read_cfg, 0, cap, &pre_pos, pci);
+ if (!cap_pos)
+ return;
+
+ header = dw_pcie_readl_dbi(pci, cap_pos);
+ /*
+ * If the first cap at offset PCI_CFG_SPACE_SIZE is removed,
+ * only set it's capid to zero as it cannot be skipped.
+ */
+ if (cap_pos == PCI_CFG_SPACE_SIZE) {
+ dw_pcie_dbi_ro_wr_en(pci);
+ dw_pcie_writel_dbi(pci, cap_pos, header & 0xffff0000);
+ dw_pcie_dbi_ro_wr_dis(pci);
+ return;
+ }
+
+ pre_header = dw_pcie_readl_dbi(pci, pre_pos);
+ next_pos = PCI_EXT_CAP_NEXT(header);
+
+ dw_pcie_dbi_ro_wr_en(pci);
+ dw_pcie_writel_dbi(pci, pre_pos,
+ (pre_header & 0xfffff) | (next_pos << 20));
+ dw_pcie_dbi_ro_wr_dis(pci);
+}
+EXPORT_SYMBOL_GPL(dw_pcie_remove_ext_capability);
+
static u16 __dw_pcie_find_vsec_capability(struct dw_pcie *pci, u16 vendor_id,
u16 vsec_id)
{
@@ -246,7 +299,7 @@ static u16 __dw_pcie_find_vsec_capability(struct dw_pcie *pci, u16 vendor_id,
return 0;
while ((vsec = PCI_FIND_NEXT_EXT_CAP(dw_pcie_read_cfg, vsec,
- PCI_EXT_CAP_ID_VNDR, pci))) {
+ PCI_EXT_CAP_ID_VNDR, NULL, pci))) {
header = dw_pcie_readl_dbi(pci, vsec + PCI_VNDR_HEADER);
if (PCI_VNDR_HEADER_ID(header) == vsec_id)
return vsec;
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 31685951a080..5c429b62cb08 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -305,6 +305,10 @@
/* Default eDMA LLP memory size */
#define DMA_LLP_MEM_SIZE PAGE_SIZE
+/* Common struct pci_epc_feature bits among DWC EP glue drivers */
+#define DWC_EPC_COMMON_FEATURES .dynamic_inbound_mapping = true, \
+ .subrange_mapping = true
+
struct dw_pcie;
struct dw_pcie_rp;
struct dw_pcie_ep;
@@ -463,6 +467,12 @@ struct dw_pcie_ep_func {
u8 func_no;
u8 msi_cap; /* MSI capability offset */
u8 msix_cap; /* MSI-X capability offset */
+ u8 bar_to_atu[PCI_STD_NUM_BARS];
+ struct pci_epf_bar *epf_bar[PCI_STD_NUM_BARS];
+
+ /* Only for Address Match Mode inbound iATU */
+ u32 *ib_atu_indexes[PCI_STD_NUM_BARS];
+ unsigned int num_ib_atu_indexes[PCI_STD_NUM_BARS];
};
struct dw_pcie_ep {
@@ -472,13 +482,16 @@ struct dw_pcie_ep {
phys_addr_t phys_base;
size_t addr_size;
size_t page_size;
- u8 bar_to_atu[PCI_STD_NUM_BARS];
phys_addr_t *outbound_addr;
unsigned long *ib_window_map;
unsigned long *ob_window_map;
void __iomem *msi_mem;
phys_addr_t msi_mem_phys;
- struct pci_epf_bar *epf_bar[PCI_STD_NUM_BARS];
+
+ /* MSI outbound iATU state */
+ bool msi_iatu_mapped;
+ u64 msi_msg_addr;
+ size_t msi_map_size;
};
struct dw_pcie_ops {
@@ -562,6 +575,8 @@ void dw_pcie_version_detect(struct dw_pcie *pci);
u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap);
u16 dw_pcie_find_ext_capability(struct dw_pcie *pci, u8 cap);
+void dw_pcie_remove_capability(struct dw_pcie *pci, u8 cap);
+void dw_pcie_remove_ext_capability(struct dw_pcie *pci, u8 cap);
u16 dw_pcie_find_rasdes_capability(struct dw_pcie *pci);
u16 dw_pcie_find_ptm_capability(struct dw_pcie *pci);
@@ -899,7 +914,6 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
int dw_pcie_ep_raise_msix_irq_doorbell(struct dw_pcie_ep *ep, u8 func_no,
u16 interrupt_num);
void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar);
-int dw_pcie_ep_hide_ext_capability(struct dw_pcie *pci, u8 prev_cap, u8 cap);
struct dw_pcie_ep_func *
dw_pcie_ep_get_func_from_ep(struct dw_pcie_ep *ep, u8 func_no);
#else
@@ -957,12 +971,6 @@ static inline void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)
{
}
-static inline int dw_pcie_ep_hide_ext_capability(struct dw_pcie *pci,
- u8 prev_cap, u8 cap)
-{
- return 0;
-}
-
static inline struct dw_pcie_ep_func *
dw_pcie_ep_get_func_from_ep(struct dw_pcie_ep *ep, u8 func_no)
{
diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
index f8605fe61a41..bf8ec3ca6f68 100644
--- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c
+++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
@@ -327,9 +327,7 @@ static void rockchip_pcie_ep_hide_broken_ats_cap_rk3588(struct dw_pcie_ep *ep)
if (!of_device_is_compatible(dev->of_node, "rockchip,rk3588-pcie-ep"))
return;
- if (dw_pcie_ep_hide_ext_capability(pci, PCI_EXT_CAP_ID_SECPCI,
- PCI_EXT_CAP_ID_ATS))
- dev_err(dev, "failed to hide ATS capability\n");
+ dw_pcie_remove_ext_capability(pci, PCI_EXT_CAP_ID_ATS);
}
static void rockchip_pcie_ep_init(struct dw_pcie_ep *ep)
@@ -364,6 +362,7 @@ static int rockchip_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features rockchip_pcie_epc_features_rk3568 = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = true,
.msi_capable = true,
.msix_capable = true,
@@ -384,6 +383,7 @@ static const struct pci_epc_features rockchip_pcie_epc_features_rk3568 = {
* BARs) would be overwritten, resulting in (all other BARs) no longer working.
*/
static const struct pci_epc_features rockchip_pcie_epc_features_rk3588 = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = true,
.msi_capable = true,
.msix_capable = true,
diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
index 60e74ac782af..2666a9c3d67e 100644
--- a/drivers/pci/controller/dwc/pcie-keembay.c
+++ b/drivers/pci/controller/dwc/pcie-keembay.c
@@ -309,6 +309,7 @@ static int keembay_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features keembay_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.msix_capable = true,
.bar[BAR_0] = { .only_64bit = true, },
diff --git a/drivers/pci/controller/dwc/pcie-nxp-s32g.c b/drivers/pci/controller/dwc/pcie-nxp-s32g.c
index 47745749f75c..b3ec38099fa3 100644
--- a/drivers/pci/controller/dwc/pcie-nxp-s32g.c
+++ b/drivers/pci/controller/dwc/pcie-nxp-s32g.c
@@ -282,12 +282,12 @@ static int s32g_pcie_parse_ports(struct device *dev, struct s32g_pcie *s32g_pp)
ret = s32g_pcie_parse_port(s32g_pp, of_port);
if (ret)
- goto err_port;
+ break;
}
-err_port:
- list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
- list_del(&port->list);
+ if (ret)
+ list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
+ list_del(&port->list);
return ret;
}
diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
index f1bc0ac81a92..5e990c7a5879 100644
--- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
+++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
@@ -820,6 +820,7 @@ static void qcom_pcie_ep_init_debugfs(struct qcom_pcie_ep *pcie_ep)
}
static const struct pci_epc_features qcom_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = true,
.msi_capable = true,
.align = SZ_4K,
diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
index 80778917d2dd..a6912e85e4dd 100644
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -420,6 +420,7 @@ static int rcar_gen4_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features rcar_gen4_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.bar[BAR_1] = { .type = BAR_RESERVED, },
.bar[BAR_3] = { .type = BAR_RESERVED, },
diff --git a/drivers/pci/controller/dwc/pcie-sophgo.c b/drivers/pci/controller/dwc/pcie-sophgo.c
index ad4baaa34ffa..044088898819 100644
--- a/drivers/pci/controller/dwc/pcie-sophgo.c
+++ b/drivers/pci/controller/dwc/pcie-sophgo.c
@@ -161,6 +161,22 @@ static void sophgo_pcie_msi_enable(struct dw_pcie_rp *pp)
raw_spin_unlock_irqrestore(&pp->lock, flags);
}
+static void sophgo_pcie_disable_l0s_l1(struct dw_pcie_rp *pp)
+{
+ struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+ u32 offset, val;
+
+ offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
+
+ dw_pcie_dbi_ro_wr_en(pci);
+
+ val = dw_pcie_readl_dbi(pci, PCI_EXP_LNKCAP + offset);
+ val &= ~(PCI_EXP_LNKCAP_ASPM_L0S | PCI_EXP_LNKCAP_ASPM_L1);
+ dw_pcie_writel_dbi(pci, PCI_EXP_LNKCAP + offset, val);
+
+ dw_pcie_dbi_ro_wr_dis(pci);
+}
+
static int sophgo_pcie_host_init(struct dw_pcie_rp *pp)
{
int irq;
@@ -171,6 +187,8 @@ static int sophgo_pcie_host_init(struct dw_pcie_rp *pp)
irq_set_chained_handler_and_data(irq, sophgo_pcie_intx_handler, pp);
+ sophgo_pcie_disable_l0s_l1(pp);
+
sophgo_pcie_msi_enable(pp);
return 0;
diff --git a/drivers/pci/controller/dwc/pcie-stm32-ep.c b/drivers/pci/controller/dwc/pcie-stm32-ep.c
index 2cecf32d2b0f..c1944b40ce02 100644
--- a/drivers/pci/controller/dwc/pcie-stm32-ep.c
+++ b/drivers/pci/controller/dwc/pcie-stm32-ep.c
@@ -70,6 +70,7 @@ static int stm32_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features stm32_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.msi_capable = true,
.align = SZ_64K,
};
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index 0ddeef70726d..06571d806ab3 100644
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1988,6 +1988,7 @@ static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
}
static const struct pci_epc_features tegra_pcie_epc_features = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = true,
.msi_capable = true,
.bar[BAR_0] = { .type = BAR_FIXED, .fixed_size = SZ_1M,
diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
index d6e73811216e..d52753060970 100644
--- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
@@ -420,6 +420,7 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = {
.init = uniphier_pcie_pro5_init_ep,
.wait = NULL,
.features = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = false,
.msi_capable = true,
.msix_capable = false,
@@ -438,6 +439,7 @@ static const struct uniphier_pcie_ep_soc_data uniphier_nx1_data = {
.init = uniphier_pcie_nx1_init_ep,
.wait = uniphier_pcie_nx1_wait_ep,
.features = {
+ DWC_EPC_COMMON_FEATURES,
.linkup_notifier = false,
.msi_capable = true,
.msix_capable = false,
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 4b78b6528f9f..5defa5cc4c2b 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -585,8 +585,10 @@ static int mtk_pcie_init_irq_domain(struct mtk_pcie_port *port,
if (IS_ENABLED(CONFIG_PCI_MSI)) {
ret = mtk_pcie_allocate_msi_domains(port);
- if (ret)
+ if (ret) {
+ irq_domain_remove(port->irq_domain);
return ret;
+ }
}
return 0;
diff --git a/drivers/pci/controller/pcie-rzg3s-host.c b/drivers/pci/controller/pcie-rzg3s-host.c
index 83ec66a70823..1bea8360f894 100644
--- a/drivers/pci/controller/pcie-rzg3s-host.c
+++ b/drivers/pci/controller/pcie-rzg3s-host.c
@@ -439,28 +439,9 @@ static void __iomem *rzg3s_pcie_root_map_bus(struct pci_bus *bus,
return host->pcie + where;
}
-/* Serialized by 'pci_lock' */
-static int rzg3s_pcie_root_write(struct pci_bus *bus, unsigned int devfn,
- int where, int size, u32 val)
-{
- struct rzg3s_pcie_host *host = bus->sysdata;
- int ret;
-
- /* Enable access control to the CFGU */
- writel_relaxed(RZG3S_PCI_PERM_CFG_HWINIT_EN,
- host->axi + RZG3S_PCI_PERM);
-
- ret = pci_generic_config_write(bus, devfn, where, size, val);
-
- /* Disable access control to the CFGU */
- writel_relaxed(0, host->axi + RZG3S_PCI_PERM);
-
- return ret;
-}
-
static struct pci_ops rzg3s_pcie_root_ops = {
.read = pci_generic_config_read,
- .write = rzg3s_pcie_root_write,
+ .write = pci_generic_config_write,
.map_bus = rzg3s_pcie_root_map_bus,
};
@@ -1065,14 +1046,14 @@ static int rzg3s_pcie_config_init(struct rzg3s_pcie_host *host)
writel_relaxed(0xffffffff, host->pcie + RZG3S_PCI_CFG_BARMSK00L);
writel_relaxed(0xffffffff, host->pcie + RZG3S_PCI_CFG_BARMSK00U);
+ /* Disable access control to the CFGU */
+ writel_relaxed(0, host->axi + RZG3S_PCI_PERM);
+
/* Update bus info */
writeb_relaxed(primary_bus, host->pcie + PCI_PRIMARY_BUS);
writeb_relaxed(secondary_bus, host->pcie + PCI_SECONDARY_BUS);
writeb_relaxed(subordinate_bus, host->pcie + PCI_SUBORDINATE_BUS);
- /* Disable access control to the CFGU */
- writel_relaxed(0, host->axi + RZG3S_PCI_PERM);
-
return 0;
}
@@ -1162,7 +1143,8 @@ static int rzg3s_pcie_resets_prepare_and_get(struct rzg3s_pcie_host *host)
static int rzg3s_pcie_host_parse_port(struct rzg3s_pcie_host *host)
{
- struct device_node *of_port = of_get_next_child(host->dev->of_node, NULL);
+ struct device_node *of_port __free(device_node) =
+ of_get_next_child(host->dev->of_node, NULL);
struct rzg3s_pcie_port *port = &host->port;
int ret;
diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
index 937ea6ae1ac4..4aa139abac16 100644
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -302,9 +302,10 @@ static int xilinx_allocate_msi_domains(struct xilinx_pcie *pcie)
return 0;
}
-static void xilinx_free_msi_domains(struct xilinx_pcie *pcie)
+static void xilinx_free_irq_domains(struct xilinx_pcie *pcie)
{
irq_domain_remove(pcie->msi_domain);
+ irq_domain_remove(pcie->leg_domain);
}
/* INTx Functions */
@@ -480,8 +481,10 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie *pcie)
phys_addr_t pa = ALIGN_DOWN(virt_to_phys(pcie), SZ_4K);
ret = xilinx_allocate_msi_domains(pcie);
- if (ret)
+ if (ret) {
+ irq_domain_remove(pcie->leg_domain);
return ret;
+ }
pcie_write(pcie, upper_32_bits(pa), XILINX_PCIE_REG_MSIBASE1);
pcie_write(pcie, lower_32_bits(pa), XILINX_PCIE_REG_MSIBASE2);
@@ -600,7 +603,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
err = pci_host_probe(bridge);
if (err)
- xilinx_free_msi_domains(pcie);
+ xilinx_free_irq_domains(pcie);
return err;
}
diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c
index 6643a88c7a0c..27de533f0571 100644
--- a/drivers/pci/endpoint/functions/pci-epf-mhi.c
+++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c
@@ -686,7 +686,7 @@ static int pci_epf_mhi_dma_init(struct pci_epf_mhi *epf_mhi)
goto err_release_tx;
}
- epf_mhi->dma_wq = alloc_workqueue("pci_epf_mhi_dma_wq", 0, 0);
+ epf_mhi->dma_wq = alloc_workqueue("pci_epf_mhi_dma_wq", WQ_PERCPU, 0);
if (!epf_mhi->dma_wq) {
ret = -ENOMEM;
goto err_release_rx;
diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c
index e01a98e74d21..a3a588e522e7 100644
--- a/drivers/pci/endpoint/functions/pci-epf-ntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c
@@ -2124,8 +2124,13 @@ static int __init epf_ntb_init(void)
{
int ret;
- kpcintb_workqueue = alloc_workqueue("kpcintb", WQ_MEM_RECLAIM |
- WQ_HIGHPRI, 0);
+ kpcintb_workqueue = alloc_workqueue("kpcintb",
+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_PERCPU, 0);
+ if (!kpcintb_workqueue) {
+ pr_err("Failed to allocate kpcintb workqueue\n");
+ return -ENOMEM;
+ }
+
ret = pci_epf_register_driver(&epf_ntb_driver);
if (ret) {
destroy_workqueue(kpcintb_workqueue);
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index debd235253c5..62804120cd79 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -1188,7 +1188,7 @@ static int __init pci_epf_test_init(void)
int ret;
kpcitest_workqueue = alloc_workqueue("kpcitest",
- WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_PERCPU, 0);
if (!kpcitest_workqueue) {
pr_err("Failed to allocate the kpcitest work queue\n");
return -ENOMEM;
diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 3ecc5059f92b..20a400e83439 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -1651,8 +1651,13 @@ static int __init epf_ntb_init(void)
{
int ret;
- kpcintb_workqueue = alloc_workqueue("kpcintb", WQ_MEM_RECLAIM |
- WQ_HIGHPRI, 0);
+ kpcintb_workqueue = alloc_workqueue("kpcintb",
+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_PERCPU, 0);
+ if (!kpcintb_workqueue) {
+ pr_err("Failed to allocate kpcintb workqueue\n");
+ return -ENOMEM;
+ }
+
ret = pci_epf_register_driver(&epf_ntb_driver);
if (ret) {
destroy_workqueue(kpcintb_workqueue);
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index ca7f19cc973a..068155819c57 100644
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -596,6 +596,14 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
if (!epc_features)
return -EINVAL;
+ if (epf_bar->num_submap && !epf_bar->submap)
+ return -EINVAL;
+
+ if (epf_bar->num_submap &&
+ !(epc_features->dynamic_inbound_mapping &&
+ epc_features->subrange_mapping))
+ return -EINVAL;
+
if (epc_features->bar[bar].type == BAR_RESIZABLE &&
(epf_bar->size < SZ_1M || (u64)epf_bar->size > (SZ_128G * 1024)))
return -EINVAL;
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index c5345bff9a55..35f1758126c6 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -802,7 +802,7 @@ static struct pnv_php_slot *pnv_php_alloc_slot(struct device_node *dn)
}
/* Allocate workqueue for this slot's interrupt handling */
- php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name);
+ php_slot->wq = alloc_workqueue("pciehp-%s", WQ_PERCPU, 0, php_slot->name);
if (!php_slot->wq) {
SLOT_WARN(php_slot, "Cannot alloc workqueue\n");
kfree(php_slot->name);
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 0c341453afc6..56308515ecba 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -80,7 +80,8 @@ static int init_slots(struct controller *ctrl)
slot->device = ctrl->slot_device_offset + i;
slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
- slot->wq = alloc_workqueue("shpchp-%d", 0, 0, slot->number);
+ slot->wq = alloc_workqueue("shpchp-%d", WQ_PERCPU, 0,
+ slot->number);
if (!slot->wq) {
retval = -ENOMEM;
goto error_slot;
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 4a2fc7ab42c3..79a414fd6623 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -147,11 +147,19 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj,
* we have just allocated the page no one else should be
* using it.
*/
- VM_WARN_ON_ONCE_PAGE(!page_ref_count(page), page);
+ VM_WARN_ON_ONCE_PAGE(page_ref_count(page), page);
set_page_count(page, 1);
ret = vm_insert_page(vma, vaddr, page);
if (ret) {
gen_pool_free(p2pdma->pool, (uintptr_t)kaddr, len);
+
+ /*
+ * Reset the page count. We don't use put_page()
+ * because we don't want to trigger the
+ * p2pdma_folio_free() path.
+ */
+ set_page_count(page, 0);
+ percpu_ref_put(ref);
return ret;
}
percpu_ref_get(ref);
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 9369377725fa..0162acfb5789 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -271,21 +271,6 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record,
return AE_OK;
}
-static bool pcie_root_rcb_set(struct pci_dev *dev)
-{
- struct pci_dev *rp = pcie_find_root_port(dev);
- u16 lnkctl;
-
- if (!rp)
- return false;
-
- pcie_capability_read_word(rp, PCI_EXP_LNKCTL, &lnkctl);
- if (lnkctl & PCI_EXP_LNKCTL_RCB)
- return true;
-
- return false;
-}
-
/* _HPX PCI Express Setting Record (Type 2) */
struct hpx_type2 {
u32 revision;
@@ -311,6 +296,7 @@ static void program_hpx_type2(struct pci_dev *dev, struct hpx_type2 *hpx)
{
int pos;
u32 reg32;
+ const struct pci_host_bridge *host;
if (!hpx)
return;
@@ -318,6 +304,15 @@ static void program_hpx_type2(struct pci_dev *dev, struct hpx_type2 *hpx)
if (!pci_is_pcie(dev))
return;
+ host = pci_find_host_bridge(dev->bus);
+
+ /*
+ * Only do the _HPX Type 2 programming if OS owns PCIe native
+ * hotplug but not AER.
+ */
+ if (!host->native_pcie_hotplug || host->native_aer)
+ return;
+
if (hpx->revision > 1) {
pci_warn(dev, "PCIe settings rev %d not supported\n",
hpx->revision);
@@ -325,33 +320,27 @@ static void program_hpx_type2(struct pci_dev *dev, struct hpx_type2 *hpx)
}
/*
- * Don't allow _HPX to change MPS or MRRS settings. We manage
- * those to make sure they're consistent with the rest of the
- * platform.
+ * We only allow _HPX to program DEVCTL bits related to AER, namely
+ * PCI_EXP_DEVCTL_CERE, PCI_EXP_DEVCTL_NFERE, PCI_EXP_DEVCTL_FERE,
+ * and PCI_EXP_DEVCTL_URRE.
+ *
+ * The rest of DEVCTL is managed by the OS to make sure it's
+ * consistent with the rest of the platform.
*/
- hpx->pci_exp_devctl_and |= PCI_EXP_DEVCTL_PAYLOAD |
- PCI_EXP_DEVCTL_READRQ;
- hpx->pci_exp_devctl_or &= ~(PCI_EXP_DEVCTL_PAYLOAD |
- PCI_EXP_DEVCTL_READRQ);
+ hpx->pci_exp_devctl_and |= ~PCI_EXP_AER_FLAGS;
+ hpx->pci_exp_devctl_or &= PCI_EXP_AER_FLAGS;
/* Initialize Device Control Register */
pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL,
~hpx->pci_exp_devctl_and, hpx->pci_exp_devctl_or);
- /* Initialize Link Control Register */
+ /* Log if _HPX attempts to modify Link Control Register */
if (pcie_cap_has_lnkctl(dev)) {
-
- /*
- * If the Root Port supports Read Completion Boundary of
- * 128, set RCB to 128. Otherwise, clear it.
- */
- hpx->pci_exp_lnkctl_and |= PCI_EXP_LNKCTL_RCB;
- hpx->pci_exp_lnkctl_or &= ~PCI_EXP_LNKCTL_RCB;
- if (pcie_root_rcb_set(dev))
- hpx->pci_exp_lnkctl_or |= PCI_EXP_LNKCTL_RCB;
-
- pcie_capability_clear_and_set_word(dev, PCI_EXP_LNKCTL,
- ~hpx->pci_exp_lnkctl_and, hpx->pci_exp_lnkctl_or);
+ if (hpx->pci_exp_lnkctl_and != 0xffff ||
+ hpx->pci_exp_lnkctl_or != 0)
+ pci_info(dev, "_HPX attempts Link Control setting (AND %#06x OR %#06x)\n",
+ hpx->pci_exp_lnkctl_and,
+ hpx->pci_exp_lnkctl_or);
}
/* Find Advanced Error Reporting Enhanced Capability */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 13dbb405dc31..a05978f5cf2c 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -426,7 +426,7 @@ static int pci_dev_str_match(struct pci_dev *dev, const char *p,
static u8 __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn,
u8 pos, int cap)
{
- return PCI_FIND_NEXT_CAP(pci_bus_read_config, pos, cap, bus, devfn);
+ return PCI_FIND_NEXT_CAP(pci_bus_read_config, pos, cap, NULL, bus, devfn);
}
u8 pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
@@ -531,7 +531,7 @@ u16 pci_find_next_ext_capability(struct pci_dev *dev, u16 start, int cap)
return 0;
return PCI_FIND_NEXT_EXT_CAP(pci_bus_read_config, start, cap,
- dev->bus, dev->devfn);
+ NULL, dev->bus, dev->devfn);
}
EXPORT_SYMBOL_GPL(pci_find_next_ext_capability);
@@ -600,7 +600,7 @@ static u8 __pci_find_next_ht_cap(struct pci_dev *dev, u8 pos, int ht_cap)
mask = HT_5BIT_CAP_MASK;
pos = PCI_FIND_NEXT_CAP(pci_bus_read_config, pos,
- PCI_CAP_ID_HT, dev->bus, dev->devfn);
+ PCI_CAP_ID_HT, NULL, dev->bus, dev->devfn);
while (pos) {
rc = pci_read_config_byte(dev, pos + 3, &cap);
if (rc != PCIBIOS_SUCCESSFUL)
@@ -611,7 +611,7 @@ static u8 __pci_find_next_ht_cap(struct pci_dev *dev, u8 pos, int ht_cap)
pos = PCI_FIND_NEXT_CAP(pci_bus_read_config,
pos + PCI_CAP_LIST_NEXT,
- PCI_CAP_ID_HT, dev->bus,
+ PCI_CAP_ID_HT, NULL, dev->bus,
dev->devfn);
}
@@ -1488,6 +1488,9 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state, bool
|| (state == PCI_D2 && !dev->d2_support))
return -EIO;
+ if (dev->current_state == state)
+ return 0;
+
pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
if (PCI_POSSIBLE_ERROR(pmcsr)) {
pci_err(dev, "Unable to change power state from %s to %s, device inaccessible\n",
@@ -6591,7 +6594,7 @@ static void of_pci_bus_release_domain_nr(struct device *parent, int domain_nr)
return;
/* Release domain from IDA where it was allocated. */
- if (of_get_pci_domain_nr(parent->of_node) == domain_nr)
+ if (parent && of_get_pci_domain_nr(parent->of_node) == domain_nr)
ida_free(&pci_domain_nr_static_ida, domain_nr);
else
ida_free(&pci_domain_nr_dynamic_ida, domain_nr);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 0e67014aa001..36f32b8af6ab 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -88,6 +88,9 @@ struct pcie_tlp_log;
#define PCI_BUS_BRIDGE_MEM_WINDOW 1
#define PCI_BUS_BRIDGE_PREF_MEM_WINDOW 2
+#define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE | \
+ PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE)
+
extern const unsigned char pcie_link_speed[];
extern bool pci_early_dump;
@@ -103,17 +106,21 @@ bool pcie_cap_has_rtctl(const struct pci_dev *dev);
* @read_cfg: Function pointer for reading PCI config space
* @start: Starting position to begin search
* @cap: Capability ID to find
+ * @prev_ptr: Pointer to store position of preceding capability (optional)
* @args: Arguments to pass to read_cfg function
*
- * Search the capability list in PCI config space to find @cap.
+ * Search the capability list in PCI config space to find @cap. If
+ * found, update *prev_ptr with the position of the preceding capability
+ * (if prev_ptr != NULL)
* Implements TTL (time-to-live) protection against infinite loops.
*
* Return: Position of the capability if found, 0 otherwise.
*/
-#define PCI_FIND_NEXT_CAP(read_cfg, start, cap, args...) \
+#define PCI_FIND_NEXT_CAP(read_cfg, start, cap, prev_ptr, args...) \
({ \
int __ttl = PCI_FIND_CAP_TTL; \
- u8 __id, __found_pos = 0; \
+ u8 __id, __found_pos = 0; \
+ u8 __prev_pos = (start); \
u8 __pos = (start); \
u16 __ent; \
\
@@ -132,9 +139,12 @@ bool pcie_cap_has_rtctl(const struct pci_dev *dev);
\
if (__id == (cap)) { \
__found_pos = __pos; \
+ if (prev_ptr != NULL) \
+ *(u8 *)prev_ptr = __prev_pos; \
break; \
} \
\
+ __prev_pos = __pos; \
__pos = FIELD_GET(PCI_CAP_LIST_NEXT_MASK, __ent); \
} \
__found_pos; \
@@ -146,21 +156,26 @@ bool pcie_cap_has_rtctl(const struct pci_dev *dev);
* @read_cfg: Function pointer for reading PCI config space
* @start: Starting position to begin search (0 for initial search)
* @cap: Extended capability ID to find
+ * @prev_ptr: Pointer to store position of preceding capability (optional)
* @args: Arguments to pass to read_cfg function
*
* Search the extended capability list in PCI config space to find @cap.
+ * If found, update *prev_ptr with the position of the preceding capability
+ * (if prev_ptr != NULL)
* Implements TTL protection against infinite loops using a calculated
* maximum search count.
*
* Return: Position of the capability if found, 0 otherwise.
*/
-#define PCI_FIND_NEXT_EXT_CAP(read_cfg, start, cap, args...) \
+#define PCI_FIND_NEXT_EXT_CAP(read_cfg, start, cap, prev_ptr, args...) \
({ \
u16 __pos = (start) ?: PCI_CFG_SPACE_SIZE; \
u16 __found_pos = 0; \
+ u16 __prev_pos; \
int __ttl, __ret; \
u32 __header; \
\
+ __prev_pos = __pos; \
__ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; \
while (__ttl-- > 0 && __pos >= PCI_CFG_SPACE_SIZE) { \
__ret = read_cfg##_dword(args, __pos, &__header); \
@@ -172,9 +187,12 @@ bool pcie_cap_has_rtctl(const struct pci_dev *dev);
\
if (PCI_EXT_CAP_ID(__header) == (cap) && __pos != start) {\
__found_pos = __pos; \
+ if (prev_ptr != NULL) \
+ *(u16 *)prev_ptr = __prev_pos; \
break; \
} \
\
+ __prev_pos = __pos; \
__pos = PCI_EXT_CAP_NEXT(__header); \
} \
__found_pos; \
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index e0bcaa896803..9472d86cef55 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -239,9 +239,6 @@ void pcie_ecrc_get_policy(char *str)
}
#endif /* CONFIG_PCIE_ECRC */
-#define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE | \
- PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE)
-
int pcie_aer_is_native(struct pci_dev *dev)
{
struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
diff --git a/drivers/pci/pcie/portdrv.c b/drivers/pci/pcie/portdrv.c
index 38a41ccf79b9..a0991da48213 100644
--- a/drivers/pci/pcie/portdrv.c
+++ b/drivers/pci/pcie/portdrv.c
@@ -557,10 +557,10 @@ static int pcie_port_remove_service(struct device *dev)
pciedev = to_pcie_device(dev);
driver = to_service_driver(dev->driver);
- if (driver && driver->remove) {
+ if (driver && driver->remove)
driver->remove(pciedev);
- put_device(dev);
- }
+
+ put_device(dev);
return 0;
}
diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c
index ed0f9691e7d1..c7c61869bc9c 100644
--- a/drivers/pci/pcie/ptm.c
+++ b/drivers/pci/pcie/ptm.c
@@ -542,8 +542,10 @@ struct pci_ptm_debugfs *pcie_ptm_create_debugfs(struct device *dev, void *pdata,
return NULL;
dirname = devm_kasprintf(dev, GFP_KERNEL, "pcie_ptm_%s", dev_name(dev));
- if (!dirname)
+ if (!dirname) {
+ kfree(ptm_debugfs);
return NULL;
+ }
ptm_debugfs->debugfs = debugfs_create_dir(dirname, NULL);
ptm_debugfs->pdata = pdata;
@@ -574,6 +576,7 @@ void pcie_ptm_destroy_debugfs(struct pci_ptm_debugfs *ptm_debugfs)
mutex_destroy(&ptm_debugfs->lock);
debugfs_remove_recursive(ptm_debugfs->debugfs);
+ kfree(ptm_debugfs);
}
EXPORT_SYMBOL_GPL(pcie_ptm_destroy_debugfs);
#endif
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 41183aed8f5d..c791bca2891f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2270,7 +2270,8 @@ int pci_configure_extended_tags(struct pci_dev *dev, void *ign)
u16 ctl;
int ret;
- if (!pci_is_pcie(dev))
+ /* PCI_EXP_DEVCTL_EXT_TAG is RsvdP in VFs */
+ if (!pci_is_pcie(dev) || dev->is_virtfn)
return 0;
ret = pcie_capability_read_dword(dev, PCI_EXP_DEVCAP, &cap);
@@ -2410,6 +2411,37 @@ static void pci_configure_serr(struct pci_dev *dev)
}
}
+static void pci_configure_rcb(struct pci_dev *dev)
+{
+ struct pci_dev *rp;
+ u16 rp_lnkctl;
+
+ /*
+ * Per PCIe r7.0, sec 7.5.3.7, RCB is only meaningful in Root Ports
+ * (where it is read-only), Endpoints, and Bridges. It may only be
+ * set for Endpoints and Bridges if it is set in the Root Port. For
+ * Endpoints, it is 'RsvdP' for Virtual Functions.
+ */
+ if (!pci_is_pcie(dev) ||
+ pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT ||
+ pci_pcie_type(dev) == PCI_EXP_TYPE_UPSTREAM ||
+ pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM ||
+ pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC ||
+ dev->is_virtfn)
+ return;
+
+ /* Root Port often not visible to virtualized guests */
+ rp = pcie_find_root_port(dev);
+ if (!rp)
+ return;
+
+ pcie_capability_read_word(rp, PCI_EXP_LNKCTL, &rp_lnkctl);
+ pcie_capability_clear_and_set_word(dev, PCI_EXP_LNKCTL,
+ PCI_EXP_LNKCTL_RCB,
+ (rp_lnkctl & PCI_EXP_LNKCTL_RCB) ?
+ PCI_EXP_LNKCTL_RCB : 0);
+}
+
static void pci_configure_device(struct pci_dev *dev)
{
pci_configure_mps(dev);
@@ -2419,6 +2451,7 @@ static void pci_configure_device(struct pci_dev *dev)
pci_configure_aspm_l1ss(dev);
pci_configure_eetlp_prefix(dev);
pci_configure_serr(dev);
+ pci_configure_rcb(dev);
pci_acpi_program_hp_params(dev);
}
diff --git a/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c b/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
index ec423432ac65..0a63add84d09 100644
--- a/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
@@ -533,7 +533,7 @@ static int tc9563_pwrctrl_probe(struct platform_device *pdev)
ctx->client = i2c_new_dummy_device(ctx->adapter, addr);
if (IS_ERR(ctx->client)) {
dev_err(dev, "Failed to create I2C client\n");
- i2c_put_adapter(ctx->adapter);
+ put_device(&ctx->adapter->dev);
return PTR_ERR(ctx->client);
}
@@ -613,7 +613,7 @@ static int tc9563_pwrctrl_probe(struct platform_device *pdev)
tc9563_pwrctrl_power_off(ctx);
remove_i2c:
i2c_unregister_device(ctx->client);
- i2c_put_adapter(ctx->adapter);
+ put_device(&ctx->adapter->dev);
return ret;
}
@@ -623,7 +623,7 @@ static void tc9563_pwrctrl_remove(struct platform_device *pdev)
tc9563_pwrctrl_power_off(ctx);
i2c_unregister_device(ctx->client);
- i2c_put_adapter(ctx->adapter);
+ put_device(&ctx->adapter->dev);
}
static const struct of_device_id tc9563_pwrctrl_of_match[] = {
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 280cd50d693b..6df78efd7f6d 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5581,6 +5581,7 @@ static void quirk_no_ext_tags(struct pci_dev *pdev)
pci_walk_bus(bridge->bus, pci_configure_extended_tags, NULL);
}
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_3WARE, 0x1004, quirk_no_ext_tags);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_3WARE, 0x1005, quirk_no_ext_tags);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0132, quirk_no_ext_tags);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0140, quirk_no_ext_tags);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0141, quirk_no_ext_tags);
@@ -6188,6 +6189,10 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_PERICOM, 0x2303,
pci_fixup_pericom_acs_store_forward);
DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_PERICOM, 0x2303,
pci_fixup_pericom_acs_store_forward);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_PERICOM, 0xb404,
+ pci_fixup_pericom_acs_store_forward);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_PERICOM, 0xb404,
+ pci_fixup_pericom_acs_store_forward);
static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)
{
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index a61d38777cdc..09a28cfcd5b8 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -225,14 +225,21 @@ static struct resource *pbus_select_window_for_type(struct pci_bus *bus,
switch (iores_type) {
case IORESOURCE_IO:
- return pci_bus_resource_n(bus, PCI_BUS_BRIDGE_IO_WINDOW);
+ win = pci_bus_resource_n(bus, PCI_BUS_BRIDGE_IO_WINDOW);
+ if (win && (win->flags & IORESOURCE_IO))
+ return win;
+ return NULL;
case IORESOURCE_MEM:
mmio = pci_bus_resource_n(bus, PCI_BUS_BRIDGE_MEM_WINDOW);
mmio_pref = pci_bus_resource_n(bus, PCI_BUS_BRIDGE_PREF_MEM_WINDOW);
- if (!(type & IORESOURCE_PREFETCH) ||
- !(mmio_pref->flags & IORESOURCE_MEM))
+ if (mmio && !(mmio->flags & IORESOURCE_MEM))
+ mmio = NULL;
+ if (mmio_pref && !(mmio_pref->flags & IORESOURCE_MEM))
+ mmio_pref = NULL;
+
+ if (!(type & IORESOURCE_PREFETCH) || !mmio_pref)
return mmio;
if ((type & IORESOURCE_MEM_64) ||
@@ -1070,16 +1077,13 @@ static resource_size_t calculate_memsize(resource_size_t size,
resource_size_t min_size,
resource_size_t add_size,
resource_size_t children_add_size,
- resource_size_t old_size,
resource_size_t align)
{
if (size < min_size)
size = min_size;
- if (old_size == 1)
- old_size = 0;
size = max(size, add_size) + children_add_size;
- return ALIGN(max(size, old_size), align);
+ return ALIGN(size, align);
}
resource_size_t __weak pcibios_window_alignment(struct pci_bus *bus,
@@ -1227,66 +1231,43 @@ static inline resource_size_t calculate_mem_align(resource_size_t *aligns,
return min_align;
}
-/**
- * pbus_upstream_space_available - Check no upstream resource limits allocation
- * @bus: The bus
- * @res: The resource to help select the correct bridge window
- * @size: The size required from the bridge window
- * @align: Required alignment for the resource
- *
- * Check that @size can fit inside the upstream bridge resources that are
- * already assigned. Select the upstream bridge window based on the type of
- * @res.
- *
- * Return: %true if enough space is available on all assigned upstream
+/*
+ * Calculate bridge window head alignment that leaves no gaps in between
* resources.
*/
-static bool pbus_upstream_space_available(struct pci_bus *bus,
- struct resource *res,
- resource_size_t size,
- resource_size_t align)
-{
- struct resource_constraint constraint = {
- .max = RESOURCE_SIZE_MAX,
- .align = align,
- };
- struct pci_bus *downstream = bus;
-
- while ((bus = bus->parent)) {
- if (pci_is_root_bus(bus))
- break;
+static resource_size_t calculate_head_align(resource_size_t *aligns,
+ int max_order)
+{
+ resource_size_t head_align = 1;
+ resource_size_t remainder = 0;
+ int order;
- res = pbus_select_window(bus, res);
- if (!res)
- return false;
- if (!res->parent)
- continue;
+ /* Take the largest alignment as the starting point. */
+ head_align <<= max_order + __ffs(SZ_1M);
- if (resource_size(res) >= size) {
- struct resource gap = {};
+ for (order = max_order - 1; order >= 0; order--) {
+ resource_size_t align1 = 1;
- if (find_resource_space(res, &gap, size, &constraint) == 0) {
- gap.flags = res->flags;
- pci_dbg(bus->self,
- "Assigned bridge window %pR to %pR free space at %pR\n",
- res, &bus->busn_res, &gap);
- return true;
- }
- }
+ align1 <<= order + __ffs(SZ_1M);
- if (bus->self) {
- pci_info(bus->self,
- "Assigned bridge window %pR to %pR cannot fit 0x%llx required for %s bridging to %pR\n",
- res, &bus->busn_res,
- (unsigned long long)size,
- pci_name(downstream->self),
- &downstream->busn_res);
- }
+ /*
+ * Account smaller resources with alignment < max_order that
+ * could be used to fill head room if alignment less than
+ * max_order is used.
+ */
+ remainder += aligns[order];
- return false;
+ /*
+ * Test if head fill is enough to satisfy the alignment of
+ * the larger resources after reducing the alignment.
+ */
+ while ((head_align > align1) && (remainder >= head_align / 2)) {
+ head_align /= 2;
+ remainder -= head_align;
+ }
}
- return true;
+ return head_align;
}
/**
@@ -1314,14 +1295,12 @@ static void pbus_size_mem(struct pci_bus *bus, unsigned long type,
{
struct pci_dev *dev;
resource_size_t min_align, win_align, align, size, size0, size1 = 0;
- resource_size_t aligns[28]; /* Alignments from 1MB to 128TB */
+ resource_size_t aligns[28] = {}; /* Alignments from 1MB to 128TB */
int order, max_order;
struct resource *b_res = pbus_select_window_for_type(bus, type);
resource_size_t children_add_size = 0;
resource_size_t children_add_align = 0;
resource_size_t add_align = 0;
- resource_size_t relaxed_align;
- resource_size_t old_size;
if (!b_res)
return;
@@ -1330,7 +1309,6 @@ static void pbus_size_mem(struct pci_bus *bus, unsigned long type,
if (b_res->parent)
return;
- memset(aligns, 0, sizeof(aligns));
max_order = 0;
size = 0;
@@ -1375,12 +1353,8 @@ static void pbus_size_mem(struct pci_bus *bus, unsigned long type,
continue;
}
size += max(r_size, align);
- /*
- * Exclude ranges with size > align from calculation of
- * the alignment.
- */
- if (r_size <= align)
- aligns[order] += align;
+
+ aligns[order] += align;
if (order > max_order)
max_order = order;
@@ -1392,44 +1366,20 @@ static void pbus_size_mem(struct pci_bus *bus, unsigned long type,
}
}
- old_size = resource_size(b_res);
win_align = window_alignment(bus, b_res->flags);
- min_align = calculate_mem_align(aligns, max_order);
+ min_align = calculate_head_align(aligns, max_order);
min_align = max(min_align, win_align);
- size0 = calculate_memsize(size, min_size, 0, 0, old_size, min_align);
+ size0 = calculate_memsize(size, min_size, 0, 0, win_align);
if (size0) {
resource_set_range(b_res, min_align, size0);
b_res->flags &= ~IORESOURCE_DISABLED;
}
- if (bus->self && size0 &&
- !pbus_upstream_space_available(bus, b_res, size0, min_align)) {
- relaxed_align = 1ULL << (max_order + __ffs(SZ_1M));
- relaxed_align = max(relaxed_align, win_align);
- min_align = min(min_align, relaxed_align);
- size0 = calculate_memsize(size, min_size, 0, 0, old_size, win_align);
- resource_set_range(b_res, min_align, size0);
- pci_info(bus->self, "bridge window %pR to %pR requires relaxed alignment rules\n",
- b_res, &bus->busn_res);
- }
-
if (realloc_head && (add_size > 0 || children_add_size > 0)) {
add_align = max(min_align, add_align);
size1 = calculate_memsize(size, min_size, add_size, children_add_size,
- old_size, add_align);
-
- if (bus->self && size1 &&
- !pbus_upstream_space_available(bus, b_res, size1, add_align)) {
- relaxed_align = 1ULL << (max_order + __ffs(SZ_1M));
- relaxed_align = max(relaxed_align, win_align);
- min_align = min(min_align, relaxed_align);
- size1 = calculate_memsize(size, min_size, add_size, children_add_size,
- old_size, win_align);
- pci_info(bus->self,
- "bridge window %pR to %pR requires relaxed alignment rules\n",
- b_res, &bus->busn_res);
- }
+ win_align);
}
if (!size0 && !size1) {
diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
index 4801115f2b54..5410fb7428d0 100644
--- a/drivers/perf/arm_spe_pmu.c
+++ b/drivers/perf/arm_spe_pmu.c
@@ -106,6 +106,8 @@ struct arm_spe_pmu {
/* Keep track of our dynamic hotplug state */
static enum cpuhp_state arm_spe_pmu_online;
+static void arm_spe_pmu_stop(struct perf_event *event, int flags);
+
enum arm_spe_pmu_buf_fault_action {
SPE_PMU_BUF_FAULT_ACT_SPURIOUS,
SPE_PMU_BUF_FAULT_ACT_FATAL,
@@ -607,8 +609,8 @@ static u64 arm_spe_pmu_next_off(struct perf_output_handle *handle)
return limit;
}
-static void arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
- struct perf_event *event)
+static int arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
+ struct perf_event *event)
{
u64 base, limit;
struct arm_spe_pmu_buf *buf;
@@ -622,7 +624,6 @@ static void arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
/* Start a new aux session */
buf = perf_aux_output_begin(handle, event);
if (!buf) {
- event->hw.state |= PERF_HES_STOPPED;
/*
* We still need to clear the limit pointer, since the
* profiler might only be disabled by virtue of a fault.
@@ -642,6 +643,7 @@ static void arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
out_write_limit:
write_sysreg_s(limit, SYS_PMBLIMITR_EL1);
+ return (limit & PMBLIMITR_EL1_E) ? 0 : -EIO;
}
static void arm_spe_perf_aux_output_end(struct perf_output_handle *handle)
@@ -781,7 +783,10 @@ static irqreturn_t arm_spe_pmu_irq_handler(int irq, void *dev)
* when we get to it.
*/
if (!(handle->aux_flags & PERF_AUX_FLAG_TRUNCATED)) {
- arm_spe_perf_aux_output_begin(handle, event);
+ if (arm_spe_perf_aux_output_begin(handle, event)) {
+ arm_spe_pmu_stop(event, PERF_EF_UPDATE);
+ break;
+ }
isb();
}
break;
@@ -880,9 +885,10 @@ static void arm_spe_pmu_start(struct perf_event *event, int flags)
struct perf_output_handle *handle = this_cpu_ptr(spe_pmu->handle);
hwc->state = 0;
- arm_spe_perf_aux_output_begin(handle, event);
- if (hwc->state)
+ if (arm_spe_perf_aux_output_begin(handle, event)) {
+ arm_spe_pmu_stop(event, 0);
return;
+ }
reg = arm_spe_event_to_pmsfcr(event);
write_sysreg_s(reg, SYS_PMSFCR_EL1);
diff --git a/drivers/phy/freescale/phy-fsl-imx8qm-hsio.c b/drivers/phy/freescale/phy-fsl-imx8qm-hsio.c
index 977d21d753a5..279b8ac7822d 100644
--- a/drivers/phy/freescale/phy-fsl-imx8qm-hsio.c
+++ b/drivers/phy/freescale/phy-fsl-imx8qm-hsio.c
@@ -251,7 +251,7 @@ static void imx_hsio_configure_clk_pad(struct phy *phy)
struct imx_hsio_lane *lane = phy_get_drvdata(phy);
struct imx_hsio_priv *priv = lane->priv;
- if (strncmp(priv->refclk_pad, "output", 6) == 0) {
+ if (priv->refclk_pad && strncmp(priv->refclk_pad, "output", 6) == 0) {
pll = true;
regmap_update_bits(priv->misc, HSIO_CTRL0,
HSIO_IOB_A_0_TXOE | HSIO_IOB_A_0_M1M0_MASK,
diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
index 29de2f7bdae8..cafa618d70fd 100644
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -414,6 +414,8 @@ struct rk_hdptx_phy {
static const struct ropll_config ropll_tmds_cfg[] = {
{ 594000000ULL, 124, 124, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
+ { 461101250ULL, 97, 97, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 71, 1, 53, 2, 6,
+ 35, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
{ 371250000ULL, 155, 155, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
{ 297000000ULL, 124, 124, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
diff --git a/drivers/pinctrl/meson/pinctrl-amlogic-a4.c b/drivers/pinctrl/meson/pinctrl-amlogic-a4.c
index d9e3a8d5932a..f05d8261624a 100644
--- a/drivers/pinctrl/meson/pinctrl-amlogic-a4.c
+++ b/drivers/pinctrl/meson/pinctrl-amlogic-a4.c
@@ -725,8 +725,9 @@ static u32 aml_bank_pins(struct device_node *np)
if (of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3,
0, &of_args))
return 0;
- else
- return of_args.args[2];
+
+ of_node_put(of_args.np);
+ return of_args.args[2];
}
static int aml_bank_number(struct device_node *np)
@@ -736,8 +737,9 @@ static int aml_bank_number(struct device_node *np)
if (of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3,
0, &of_args))
return -EINVAL;
- else
- return of_args.args[1] >> 8;
+
+ of_node_put(of_args.np);
+ return of_args.args[1] >> 8;
}
static unsigned int aml_count_pins(struct device_node *np)
diff --git a/drivers/pinctrl/pinctrl-equilibrium.c b/drivers/pinctrl/pinctrl-equilibrium.c
index 2d04829b29c9..48b55c5bf8d4 100644
--- a/drivers/pinctrl/pinctrl-equilibrium.c
+++ b/drivers/pinctrl/pinctrl-equilibrium.c
@@ -846,6 +846,7 @@ static int pinbank_init(struct device_node *np,
bank->pin_base = spec.args[1];
bank->nr_pins = spec.args[2];
+ of_node_put(spec.np);
bank->aval_pinmap = readl(bank->membase + REG_AVAIL);
bank->id = id;
diff --git a/drivers/pinctrl/pinctrl-k230.c b/drivers/pinctrl/pinctrl-k230.c
index d716f23d837f..20f7c0f70eb7 100644
--- a/drivers/pinctrl/pinctrl-k230.c
+++ b/drivers/pinctrl/pinctrl-k230.c
@@ -65,6 +65,7 @@ struct k230_pmx_func {
};
struct k230_pinctrl {
+ struct device *dev;
struct pinctrl_desc pctl;
struct pinctrl_dev *pctl_dev;
struct regmap *regmap_base;
@@ -470,7 +471,7 @@ static int k230_pinctrl_parse_groups(struct device_node *np,
struct k230_pinctrl *info,
unsigned int index)
{
- struct device *dev = info->pctl_dev->dev;
+ struct device *dev = info->dev;
const __be32 *list;
int size, i, ret;
@@ -511,7 +512,7 @@ static int k230_pinctrl_parse_functions(struct device_node *np,
struct k230_pinctrl *info,
unsigned int index)
{
- struct device *dev = info->pctl_dev->dev;
+ struct device *dev = info->dev;
struct k230_pmx_func *func;
struct k230_pin_group *grp;
static unsigned int idx, i;
@@ -596,6 +597,8 @@ static int k230_pinctrl_probe(struct platform_device *pdev)
if (!info)
return -ENOMEM;
+ info->dev = dev;
+
pctl = &info->pctl;
pctl->name = "k230-pinctrl";
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 998f23d6c317..d85e6c1f6321 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1359,6 +1359,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
}
range = devm_kzalloc(pcs->dev, sizeof(*range), GFP_KERNEL);
if (!range) {
+ of_node_put(gpiospec.np);
ret = -ENOMEM;
break;
}
@@ -1368,6 +1369,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
mutex_lock(&pcs->mutex);
list_add_tail(&range->node, &pcs->gpiofuncs);
mutex_unlock(&pcs->mutex);
+ of_node_put(gpiospec.np);
}
return ret;
}
diff --git a/drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c
index 64494a86490e..c27452eece3e 100644
--- a/drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c
@@ -73,7 +73,7 @@ static const char * const i2s1_ws_groups[] = { "gpio7" };
static const char * const i2s1_data_groups[] = { "gpio8", "gpio9" };
static const char * const wsa_swr_clk_groups[] = { "gpio10" };
static const char * const wsa_swr_data_groups[] = { "gpio11" };
-static const char * const i2s2_data_groups[] = { "gpio12", "gpio12" };
+static const char * const i2s2_data_groups[] = { "gpio12", "gpio13" };
static const struct lpi_pingroup sm8250_groups[] = {
LPI_PINGROUP(0, 0, swr_tx_clk, qua_mi2s_sclk, _, _),
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index 8352e9732791..3702baff5d4f 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -126,7 +126,7 @@ static int get_lightbar_version(struct cros_ec_dev *ec,
param = (struct ec_params_lightbar *)msg->data;
param->cmd = LIGHTBAR_CMD_VERSION;
msg->outsize = sizeof(param->cmd);
- msg->result = sizeof(resp->version);
+ msg->insize = sizeof(resp->version);
ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
if (ret < 0 && ret != -EINVAL) {
ret = 0;
diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c
index 8d7c34abb0a1..d8a28d4e51a8 100644
--- a/drivers/platform/chrome/cros_typec_switch.c
+++ b/drivers/platform/chrome/cros_typec_switch.c
@@ -230,20 +230,20 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)
adev = to_acpi_device_node(fwnode);
if (!adev) {
- dev_err(fwnode->dev, "Couldn't get ACPI device handle\n");
+ dev_err(dev, "Couldn't get ACPI device handle for %pfwP\n", fwnode);
ret = -ENODEV;
goto err_switch;
}
ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
if (ACPI_FAILURE(ret)) {
- dev_err(fwnode->dev, "_ADR wasn't evaluated\n");
+ dev_err(dev, "_ADR wasn't evaluated for %pfwP\n", fwnode);
ret = -ENODATA;
goto err_switch;
}
if (index >= EC_USB_PD_MAX_PORTS) {
- dev_err(fwnode->dev, "Invalid port index number: %llu\n", index);
+ dev_err(dev, "%pfwP: Invalid port index number: %llu\n", fwnode, index);
ret = -EINVAL;
goto err_switch;
}
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 8fc293c9c538..15c27edfb6d8 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -314,6 +314,61 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev)
return 0;
}
+static int amd_pmf_reinit_ta(struct amd_pmf_dev *pdev)
+{
+ bool status;
+ int ret, i;
+
+ for (i = 0; i < ARRAY_SIZE(amd_pmf_ta_uuid); i++) {
+ ret = amd_pmf_tee_init(pdev, &amd_pmf_ta_uuid[i]);
+ if (ret) {
+ dev_err(pdev->dev, "TEE init failed for UUID[%d] ret: %d\n", i, ret);
+ return ret;
+ }
+
+ ret = amd_pmf_start_policy_engine(pdev);
+ dev_dbg(pdev->dev, "start policy engine ret: %d (UUID idx: %d)\n", ret, i);
+ status = ret == TA_PMF_TYPE_SUCCESS;
+ if (status)
+ break;
+ amd_pmf_tee_deinit(pdev);
+ }
+
+ return 0;
+}
+
+static int amd_pmf_restore_handler(struct device *dev)
+{
+ struct amd_pmf_dev *pdev = dev_get_drvdata(dev);
+ int ret;
+
+ if (pdev->buf) {
+ ret = amd_pmf_set_dram_addr(pdev, false);
+ if (ret)
+ return ret;
+ }
+
+ if (pdev->smart_pc_enabled)
+ amd_pmf_reinit_ta(pdev);
+
+ return 0;
+}
+
+static int amd_pmf_freeze_handler(struct device *dev)
+{
+ struct amd_pmf_dev *pdev = dev_get_drvdata(dev);
+
+ if (!pdev->smart_pc_enabled)
+ return 0;
+
+ cancel_delayed_work_sync(&pdev->pb_work);
+ /* Clear all TEE resources */
+ amd_pmf_tee_deinit(pdev);
+ pdev->session_id = 0;
+
+ return 0;
+}
+
static int amd_pmf_suspend_handler(struct device *dev)
{
struct amd_pmf_dev *pdev = dev_get_drvdata(dev);
@@ -347,7 +402,12 @@ static int amd_pmf_resume_handler(struct device *dev)
return 0;
}
-static DEFINE_SIMPLE_DEV_PM_OPS(amd_pmf_pm, amd_pmf_suspend_handler, amd_pmf_resume_handler);
+static const struct dev_pm_ops amd_pmf_pm = {
+ .suspend = amd_pmf_suspend_handler,
+ .resume = amd_pmf_resume_handler,
+ .freeze = amd_pmf_freeze_handler,
+ .restore = amd_pmf_restore_handler,
+};
static void amd_pmf_init_features(struct amd_pmf_dev *dev)
{
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index 9144c8c3bbaf..513a6309ce13 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -129,6 +129,12 @@ struct cookie_header {
typedef void (*apmf_event_handler_t)(acpi_handle handle, u32 event, void *data);
+static const uuid_t amd_pmf_ta_uuid[] __used = { UUID_INIT(0xd9b39bf2, 0x66bd, 0x4154, 0xaf, 0xb8,
+ 0x8a, 0xcc, 0x2b, 0x2b, 0x60, 0xd6),
+ UUID_INIT(0x6fd93b77, 0x3fb8, 0x524d, 0xb1, 0x2d,
+ 0xc5, 0x29, 0xb1, 0x3d, 0x85, 0x43),
+ };
+
/* APTS PMF BIOS Interface */
struct amd_pmf_apts_output {
u16 table_version;
@@ -895,4 +901,8 @@ void amd_pmf_populate_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_tab
void amd_pmf_dump_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in);
int amd_pmf_invoke_cmd_enact(struct amd_pmf_dev *dev);
+int amd_pmf_tee_init(struct amd_pmf_dev *dev, const uuid_t *uuid);
+void amd_pmf_tee_deinit(struct amd_pmf_dev *dev);
+int amd_pmf_start_policy_engine(struct amd_pmf_dev *dev);
+
#endif /* PMF_H */
diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c
index 0abce76f89ff..95ceb906a5f3 100644
--- a/drivers/platform/x86/amd/pmf/tee-if.c
+++ b/drivers/platform/x86/amd/pmf/tee-if.c
@@ -27,12 +27,6 @@ module_param(pb_side_load, bool, 0444);
MODULE_PARM_DESC(pb_side_load, "Sideload policy binaries debug policy failures");
#endif
-static const uuid_t amd_pmf_ta_uuid[] = { UUID_INIT(0xd9b39bf2, 0x66bd, 0x4154, 0xaf, 0xb8, 0x8a,
- 0xcc, 0x2b, 0x2b, 0x60, 0xd6),
- UUID_INIT(0x6fd93b77, 0x3fb8, 0x524d, 0xb1, 0x2d, 0xc5,
- 0x29, 0xb1, 0x3d, 0x85, 0x43),
- };
-
static const char *amd_pmf_uevent_as_str(unsigned int state)
{
switch (state) {
@@ -324,7 +318,7 @@ static void amd_pmf_invoke_cmd(struct work_struct *work)
schedule_delayed_work(&dev->pb_work, msecs_to_jiffies(pb_actions_ms));
}
-static int amd_pmf_start_policy_engine(struct amd_pmf_dev *dev)
+int amd_pmf_start_policy_engine(struct amd_pmf_dev *dev)
{
struct cookie_header *header;
int res;
@@ -480,7 +474,7 @@ static int amd_pmf_register_input_device(struct amd_pmf_dev *dev)
return 0;
}
-static int amd_pmf_tee_init(struct amd_pmf_dev *dev, const uuid_t *uuid)
+int amd_pmf_tee_init(struct amd_pmf_dev *dev, const uuid_t *uuid)
{
u32 size;
int ret;
@@ -528,7 +522,7 @@ static int amd_pmf_tee_init(struct amd_pmf_dev *dev, const uuid_t *uuid)
return ret;
}
-static void amd_pmf_tee_deinit(struct amd_pmf_dev *dev)
+void amd_pmf_tee_deinit(struct amd_pmf_dev *dev)
{
if (!dev->tee_ctx)
return;
diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
index f4ea1ea05997..24d065ddfc6a 100644
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@ -53,6 +53,66 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45E9-BE91-3D44E2C707E4");
#define zero_if_sup(tmp) (zero_insize_support?0:sizeof(tmp)) // use when zero insize is required
+enum hp_thermal_profile_omen_v0 {
+ HP_OMEN_V0_THERMAL_PROFILE_DEFAULT = 0x00,
+ HP_OMEN_V0_THERMAL_PROFILE_PERFORMANCE = 0x01,
+ HP_OMEN_V0_THERMAL_PROFILE_COOL = 0x02,
+};
+
+enum hp_thermal_profile_omen_v1 {
+ HP_OMEN_V1_THERMAL_PROFILE_DEFAULT = 0x30,
+ HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE = 0x31,
+ HP_OMEN_V1_THERMAL_PROFILE_COOL = 0x50,
+};
+
+enum hp_thermal_profile_omen_flags {
+ HP_OMEN_EC_FLAGS_TURBO = 0x04,
+ HP_OMEN_EC_FLAGS_NOTIMER = 0x02,
+ HP_OMEN_EC_FLAGS_JUSTSET = 0x01,
+};
+
+enum hp_thermal_profile_victus {
+ HP_VICTUS_THERMAL_PROFILE_DEFAULT = 0x00,
+ HP_VICTUS_THERMAL_PROFILE_PERFORMANCE = 0x01,
+ HP_VICTUS_THERMAL_PROFILE_QUIET = 0x03,
+};
+
+enum hp_thermal_profile_victus_s {
+ HP_VICTUS_S_THERMAL_PROFILE_DEFAULT = 0x00,
+ HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE = 0x01,
+};
+
+enum hp_thermal_profile {
+ HP_THERMAL_PROFILE_PERFORMANCE = 0x00,
+ HP_THERMAL_PROFILE_DEFAULT = 0x01,
+ HP_THERMAL_PROFILE_COOL = 0x02,
+ HP_THERMAL_PROFILE_QUIET = 0x03,
+};
+
+struct thermal_profile_params {
+ u8 performance;
+ u8 balanced;
+ u8 low_power;
+};
+
+static const struct thermal_profile_params victus_s_thermal_params = {
+ .performance = HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE,
+ .balanced = HP_VICTUS_S_THERMAL_PROFILE_DEFAULT,
+ .low_power = HP_VICTUS_S_THERMAL_PROFILE_DEFAULT,
+};
+
+static const struct thermal_profile_params omen_v1_thermal_params = {
+ .performance = HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE,
+ .balanced = HP_OMEN_V1_THERMAL_PROFILE_DEFAULT,
+ .low_power = HP_OMEN_V1_THERMAL_PROFILE_DEFAULT,
+};
+
+/*
+ * A generic pointer for the currently-active board's thermal profile
+ * parameters.
+ */
+static struct thermal_profile_params *active_thermal_profile_params;
+
/* DMI board names of devices that should use the omen specific path for
* thermal profiles.
* This was obtained by taking a look in the windows omen command center
@@ -99,12 +159,40 @@ static const char * const victus_thermal_profile_boards[] = {
};
/* DMI Board names of Victus 16-r and Victus 16-s laptops */
-static const char * const victus_s_thermal_profile_boards[] = {
- "8BBE", "8BD4", "8BD5",
- "8C78", "8C99", "8C9C",
- "8D41",
+static const struct dmi_system_id victus_s_thermal_profile_boards[] __initconst = {
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8BBE") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8BD4") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8BD5") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8C78") },
+ .driver_data = (void *)&omen_v1_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8C99") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8C9C") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {
+ .matches = { DMI_MATCH(DMI_BOARD_NAME, "8D41") },
+ .driver_data = (void *)&victus_s_thermal_params,
+ },
+ {},
};
+static bool is_victus_s_board;
+
enum hp_wmi_radio {
HPWMI_WIFI = 0x0,
HPWMI_BLUETOOTH = 0x1,
@@ -225,42 +313,6 @@ enum hp_wireless2_bits {
HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD,
};
-enum hp_thermal_profile_omen_v0 {
- HP_OMEN_V0_THERMAL_PROFILE_DEFAULT = 0x00,
- HP_OMEN_V0_THERMAL_PROFILE_PERFORMANCE = 0x01,
- HP_OMEN_V0_THERMAL_PROFILE_COOL = 0x02,
-};
-
-enum hp_thermal_profile_omen_v1 {
- HP_OMEN_V1_THERMAL_PROFILE_DEFAULT = 0x30,
- HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE = 0x31,
- HP_OMEN_V1_THERMAL_PROFILE_COOL = 0x50,
-};
-
-enum hp_thermal_profile_omen_flags {
- HP_OMEN_EC_FLAGS_TURBO = 0x04,
- HP_OMEN_EC_FLAGS_NOTIMER = 0x02,
- HP_OMEN_EC_FLAGS_JUSTSET = 0x01,
-};
-
-enum hp_thermal_profile_victus {
- HP_VICTUS_THERMAL_PROFILE_DEFAULT = 0x00,
- HP_VICTUS_THERMAL_PROFILE_PERFORMANCE = 0x01,
- HP_VICTUS_THERMAL_PROFILE_QUIET = 0x03,
-};
-
-enum hp_thermal_profile_victus_s {
- HP_VICTUS_S_THERMAL_PROFILE_DEFAULT = 0x00,
- HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE = 0x01,
-};
-
-enum hp_thermal_profile {
- HP_THERMAL_PROFILE_PERFORMANCE = 0x00,
- HP_THERMAL_PROFILE_DEFAULT = 0x01,
- HP_THERMAL_PROFILE_COOL = 0x02,
- HP_THERMAL_PROFILE_QUIET = 0x03,
-};
-
#define IS_HWBLOCKED(x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)
#define IS_SWBLOCKED(x) !(x & HPWMI_POWER_SOFT)
@@ -1581,15 +1633,8 @@ static int platform_profile_victus_set_ec(enum platform_profile_option profile)
static bool is_victus_s_thermal_profile(void)
{
- const char *board_name;
-
- board_name = dmi_get_system_info(DMI_BOARD_NAME);
- if (!board_name)
- return false;
-
- return match_string(victus_s_thermal_profile_boards,
- ARRAY_SIZE(victus_s_thermal_profile_boards),
- board_name) >= 0;
+ /* Initialised in driver init, hence safe to use here */
+ return is_victus_s_board;
}
static int victus_s_gpu_thermal_profile_get(bool *ctgp_enable,
@@ -1672,25 +1717,30 @@ static int victus_s_set_cpu_pl1_pl2(u8 pl1, u8 pl2)
static int platform_profile_victus_s_set_ec(enum platform_profile_option profile)
{
+ struct thermal_profile_params *params;
bool gpu_ctgp_enable, gpu_ppab_enable;
u8 gpu_dstate; /* Test shows 1 = 100%, 2 = 50%, 3 = 25%, 4 = 12.5% */
int err, tp;
+ params = active_thermal_profile_params;
+ if (!params)
+ return -ENODEV;
+
switch (profile) {
case PLATFORM_PROFILE_PERFORMANCE:
- tp = HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE;
+ tp = params->performance;
gpu_ctgp_enable = true;
gpu_ppab_enable = true;
gpu_dstate = 1;
break;
case PLATFORM_PROFILE_BALANCED:
- tp = HP_VICTUS_S_THERMAL_PROFILE_DEFAULT;
+ tp = params->balanced;
gpu_ctgp_enable = false;
gpu_ppab_enable = true;
gpu_dstate = 1;
break;
case PLATFORM_PROFILE_LOW_POWER:
- tp = HP_VICTUS_S_THERMAL_PROFILE_DEFAULT;
+ tp = params->low_power;
gpu_ctgp_enable = false;
gpu_ppab_enable = false;
gpu_dstate = 1;
@@ -2227,6 +2277,26 @@ static int hp_wmi_hwmon_init(void)
return 0;
}
+static void __init setup_active_thermal_profile_params(void)
+{
+ const struct dmi_system_id *id;
+
+ /*
+ * Currently only victus_s devices use the
+ * active_thermal_profile_params
+ */
+ id = dmi_first_match(victus_s_thermal_profile_boards);
+ if (id) {
+ /*
+ * Marking this boolean is required to ensure that
+ * is_victus_s_thermal_profile() behaves like a valid
+ * wrapper.
+ */
+ is_victus_s_board = true;
+ active_thermal_profile_params = id->driver_data;
+ }
+}
+
static int __init hp_wmi_init(void)
{
int event_capable = wmi_has_guid(HPWMI_EVENT_GUID);
@@ -2254,6 +2324,11 @@ static int __init hp_wmi_init(void)
goto err_destroy_input;
}
+ /*
+ * Setup active board's thermal profile parameters before
+ * starting platform driver probe.
+ */
+ setup_active_thermal_profile_params();
err = platform_driver_probe(&hp_wmi_driver, hp_wmi_bios_setup);
if (err)
goto err_unregister_device;
diff --git a/drivers/platform/x86/intel/int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
index 6f5629dc3f8d..562e88025643 100644
--- a/drivers/platform/x86/intel/int0002_vgpio.c
+++ b/drivers/platform/x86/intel/int0002_vgpio.c
@@ -206,8 +206,8 @@ static int int0002_probe(struct platform_device *pdev)
* FIXME: augment this if we managed to pull handling of shared
* IRQs into gpiolib.
*/
- ret = devm_request_irq(dev, irq, int0002_irq,
- IRQF_ONESHOT | IRQF_SHARED, "INT0002", chip);
+ ret = devm_request_irq(dev, irq, int0002_irq, IRQF_SHARED, "INT0002",
+ chip);
if (ret) {
dev_err(dev, "Error requesting IRQ %d: %d\n", irq, ret);
return ret;
diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/nvmem-reboot-mode.c
index 41530b70cfc4..d260715fccf6 100644
--- a/drivers/power/reset/nvmem-reboot-mode.c
+++ b/drivers/power/reset/nvmem-reboot-mode.c
@@ -10,6 +10,7 @@
#include <linux/nvmem-consumer.h>
#include <linux/platform_device.h>
#include <linux/reboot-mode.h>
+#include <linux/slab.h>
struct nvmem_reboot_mode {
struct reboot_mode_driver reboot;
@@ -19,12 +20,22 @@ struct nvmem_reboot_mode {
static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot,
unsigned int magic)
{
- int ret;
struct nvmem_reboot_mode *nvmem_rbm;
+ size_t buf_len;
+ void *buf;
+ int ret;
nvmem_rbm = container_of(reboot, struct nvmem_reboot_mode, reboot);
- ret = nvmem_cell_write(nvmem_rbm->cell, &magic, sizeof(magic));
+ buf = nvmem_cell_read(nvmem_rbm->cell, &buf_len);
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
+ kfree(buf);
+
+ if (buf_len > sizeof(magic))
+ return -EINVAL;
+
+ ret = nvmem_cell_write(nvmem_rbm->cell, &magic, buf_len);
if (ret < 0)
dev_err(reboot->dev, "update reboot mode bits failed\n");
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index 5f4537766e5b..1813fbdfa1c1 100644
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -3466,26 +3466,6 @@ static int ab8500_charger_probe(struct platform_device *pdev)
return ret;
}
- /* Request interrupts */
- for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) {
- irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
- if (irq < 0)
- return irq;
-
- ret = devm_request_threaded_irq(dev,
- irq, NULL, ab8500_charger_irq[i].isr,
- IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
- ab8500_charger_irq[i].name, di);
-
- if (ret != 0) {
- dev_err(dev, "failed to request %s IRQ %d: %d\n"
- , ab8500_charger_irq[i].name, irq, ret);
- return ret;
- }
- dev_dbg(dev, "Requested %s IRQ %d: %d\n",
- ab8500_charger_irq[i].name, irq, ret);
- }
-
/* initialize lock */
spin_lock_init(&di->usb_state.usb_lock);
mutex_init(&di->usb_ipt_crnt_lock);
@@ -3614,6 +3594,26 @@ static int ab8500_charger_probe(struct platform_device *pdev)
return PTR_ERR(di->usb_chg.psy);
}
+ /* Request interrupts */
+ for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) {
+ irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
+ if (irq < 0)
+ return irq;
+
+ ret = devm_request_threaded_irq(dev,
+ irq, NULL, ab8500_charger_irq[i].isr,
+ IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
+ ab8500_charger_irq[i].name, di);
+
+ if (ret != 0) {
+ dev_err(dev, "failed to request %s IRQ %d: %d\n"
+ , ab8500_charger_irq[i].name, irq, ret);
+ return ret;
+ }
+ dev_dbg(dev, "Requested %s IRQ %d: %d\n",
+ ab8500_charger_irq[i].name, irq, ret);
+ }
+
/*
* Check what battery we have, since we always have the USB
* psy, use that as a handle.
diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c
index 3901a02f326a..9dec4486b143 100644
--- a/drivers/power/supply/act8945a_charger.c
+++ b/drivers/power/supply/act8945a_charger.c
@@ -597,14 +597,6 @@ static int act8945a_charger_probe(struct platform_device *pdev)
return irq ?: -ENXIO;
}
- ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed,
- IRQF_TRIGGER_FALLING, "act8945a_interrupt",
- charger);
- if (ret) {
- dev_err(&pdev->dev, "failed to request nIRQ pin IRQ\n");
- return ret;
- }
-
charger->desc.name = "act8945a-charger";
charger->desc.get_property = act8945a_charger_get_property;
charger->desc.properties = act8945a_charger_props;
@@ -625,6 +617,14 @@ static int act8945a_charger_probe(struct platform_device *pdev)
return PTR_ERR(charger->psy);
}
+ ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed,
+ IRQF_TRIGGER_FALLING, "act8945a_interrupt",
+ charger);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to request nIRQ pin IRQ\n");
+ return ret;
+ }
+
platform_set_drvdata(pdev, charger);
INIT_WORK(&charger->work, act8945a_work);
diff --git a/drivers/power/supply/bq256xx_charger.c b/drivers/power/supply/bq256xx_charger.c
index ae14162f017a..d3de4f8b80db 100644
--- a/drivers/power/supply/bq256xx_charger.c
+++ b/drivers/power/supply/bq256xx_charger.c
@@ -1741,6 +1741,12 @@ static int bq256xx_probe(struct i2c_client *client)
usb_register_notifier(bq->usb3_phy, &bq->usb_nb);
}
+ ret = bq256xx_power_supply_init(bq, &psy_cfg, dev);
+ if (ret) {
+ dev_err(dev, "Failed to register power supply\n");
+ return ret;
+ }
+
if (client->irq) {
ret = devm_request_threaded_irq(dev, client->irq, NULL,
bq256xx_irq_handler_thread,
@@ -1753,12 +1759,6 @@ static int bq256xx_probe(struct i2c_client *client)
}
}
- ret = bq256xx_power_supply_init(bq, &psy_cfg, dev);
- if (ret) {
- dev_err(dev, "Failed to register power supply\n");
- return ret;
- }
-
ret = bq256xx_hw_init(bq);
if (ret) {
dev_err(dev, "Cannot initialize the chip.\n");
diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
index 723858d62d14..73f06f09f134 100644
--- a/drivers/power/supply/bq25980_charger.c
+++ b/drivers/power/supply/bq25980_charger.c
@@ -1241,6 +1241,12 @@ static int bq25980_probe(struct i2c_client *client)
return ret;
}
+ ret = bq25980_power_supply_init(bq, dev);
+ if (ret) {
+ dev_err(dev, "Failed to register power supply\n");
+ return ret;
+ }
+
if (client->irq) {
ret = devm_request_threaded_irq(dev, client->irq, NULL,
bq25980_irq_handler_thread,
@@ -1251,12 +1257,6 @@ static int bq25980_probe(struct i2c_client *client)
return ret;
}
- ret = bq25980_power_supply_init(bq, dev);
- if (ret) {
- dev_err(dev, "Failed to register power supply\n");
- return ret;
- }
-
ret = bq25980_hw_init(bq);
if (ret) {
dev_err(dev, "Cannot initialize the chip.\n");
diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index 19445e39651c..45f0e39b8c2d 100644
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -1172,7 +1172,7 @@ static inline int bq27xxx_write(struct bq27xxx_device_info *di, int reg_index,
return -EINVAL;
if (!di->bus.write)
- return -EPERM;
+ return -EOPNOTSUPP;
ret = di->bus.write(di, di->regs[reg_index], value, single);
if (ret < 0)
@@ -1191,7 +1191,7 @@ static inline int bq27xxx_read_block(struct bq27xxx_device_info *di, int reg_ind
return -EINVAL;
if (!di->bus.read_bulk)
- return -EPERM;
+ return -EOPNOTSUPP;
ret = di->bus.read_bulk(di, di->regs[reg_index], data, len);
if (ret < 0)
@@ -1210,7 +1210,7 @@ static inline int bq27xxx_write_block(struct bq27xxx_device_info *di, int reg_in
return -EINVAL;
if (!di->bus.write_bulk)
- return -EPERM;
+ return -EOPNOTSUPP;
ret = di->bus.write_bulk(di, di->regs[reg_index], data, len);
if (ret < 0)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 8106d1edcbc2..507fdc1c866d 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -1122,10 +1122,6 @@ static int cpcap_battery_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
- error = cpcap_battery_init_interrupts(pdev, ddata);
- if (error)
- return error;
-
error = cpcap_battery_init_iio(ddata);
if (error)
return error;
@@ -1142,6 +1138,10 @@ static int cpcap_battery_probe(struct platform_device *pdev)
return error;
}
+ error = cpcap_battery_init_interrupts(pdev, ddata);
+ if (error)
+ return error;
+
atomic_set(&ddata->active, 1);
error = cpcap_battery_calibrate(ddata);
diff --git a/drivers/power/supply/goldfish_battery.c b/drivers/power/supply/goldfish_battery.c
index 479195e35d73..5aa24e4dc445 100644
--- a/drivers/power/supply/goldfish_battery.c
+++ b/drivers/power/supply/goldfish_battery.c
@@ -224,12 +224,6 @@ static int goldfish_battery_probe(struct platform_device *pdev)
if (data->irq < 0)
return -ENODEV;
- ret = devm_request_irq(&pdev->dev, data->irq,
- goldfish_battery_interrupt,
- IRQF_SHARED, pdev->name, data);
- if (ret)
- return ret;
-
psy_cfg.drv_data = data;
data->ac = devm_power_supply_register(&pdev->dev,
@@ -244,6 +238,12 @@ static int goldfish_battery_probe(struct platform_device *pdev)
if (IS_ERR(data->battery))
return PTR_ERR(data->battery);
+ ret = devm_request_irq(&pdev->dev, data->irq,
+ goldfish_battery_interrupt,
+ IRQF_SHARED, pdev->name, data);
+ if (ret)
+ return ret;
+
GOLDFISH_BATTERY_WRITE(data, BATTERY_INT_ENABLE, BATTERY_INT_MASK);
return 0;
}
diff --git a/drivers/power/supply/pf1550-charger.c b/drivers/power/supply/pf1550-charger.c
index 98f1ee8eca3b..a457862ef461 100644
--- a/drivers/power/supply/pf1550-charger.c
+++ b/drivers/power/supply/pf1550-charger.c
@@ -584,22 +584,6 @@ static int pf1550_charger_probe(struct platform_device *pdev)
return dev_err_probe(chg->dev, ret,
"failed to add battery sense work\n");
- for (i = 0; i < PF1550_CHARGER_IRQ_NR; i++) {
- irq = platform_get_irq(pdev, i);
- if (irq < 0)
- return irq;
-
- chg->virqs[i] = irq;
-
- ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
- pf1550_charger_irq_handler,
- IRQF_NO_SUSPEND,
- "pf1550-charger", chg);
- if (ret)
- return dev_err_probe(&pdev->dev, ret,
- "failed irq request\n");
- }
-
psy_cfg.drv_data = chg;
chg->charger = devm_power_supply_register(&pdev->dev,
@@ -616,6 +600,22 @@ static int pf1550_charger_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(chg->battery),
"failed: power supply register\n");
+ for (i = 0; i < PF1550_CHARGER_IRQ_NR; i++) {
+ irq = platform_get_irq(pdev, i);
+ if (irq < 0)
+ return irq;
+
+ chg->virqs[i] = irq;
+
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+ pf1550_charger_irq_handler,
+ IRQF_NO_SUSPEND,
+ "pf1550-charger", chg);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret,
+ "failed irq request\n");
+ }
+
pf1550_dt_parse_dev_info(chg);
return pf1550_reg_init(chg);
diff --git a/drivers/power/supply/pm8916_bms_vm.c b/drivers/power/supply/pm8916_bms_vm.c
index 5120be086e6f..de5d571c03e2 100644
--- a/drivers/power/supply/pm8916_bms_vm.c
+++ b/drivers/power/supply/pm8916_bms_vm.c
@@ -167,15 +167,6 @@ static int pm8916_bms_vm_battery_probe(struct platform_device *pdev)
if (ret < 0)
return -EINVAL;
- irq = platform_get_irq_byname(pdev, "fifo");
- if (irq < 0)
- return irq;
-
- ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_bms_vm_fifo_update_done_irq,
- IRQF_ONESHOT, "pm8916_vm_bms", bat);
- if (ret)
- return ret;
-
ret = regmap_bulk_read(bat->regmap, bat->reg + PM8916_PERPH_TYPE, &tmp, 2);
if (ret)
goto comm_error;
@@ -220,6 +211,15 @@ static int pm8916_bms_vm_battery_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "Unable to get battery info\n");
+ irq = platform_get_irq_byname(pdev, "fifo");
+ if (irq < 0)
+ return irq;
+
+ ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_bms_vm_fifo_update_done_irq,
+ IRQF_ONESHOT, "pm8916_vm_bms", bat);
+ if (ret)
+ return ret;
+
platform_set_drvdata(pdev, bat);
return 0;
diff --git a/drivers/power/supply/pm8916_lbc.c b/drivers/power/supply/pm8916_lbc.c
index c74b75b1b267..6b631012a795 100644
--- a/drivers/power/supply/pm8916_lbc.c
+++ b/drivers/power/supply/pm8916_lbc.c
@@ -274,15 +274,6 @@ static int pm8916_lbc_charger_probe(struct platform_device *pdev)
return dev_err_probe(dev, -EINVAL,
"Wrong amount of reg values: %d (4 expected)\n", len);
- irq = platform_get_irq_byname(pdev, "usb_vbus");
- if (irq < 0)
- return irq;
-
- ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_lbc_charger_state_changed_irq,
- IRQF_ONESHOT, "pm8916_lbc", chg);
- if (ret)
- return ret;
-
ret = device_property_read_u32_array(dev, "reg", chg->reg, len);
if (ret)
return ret;
@@ -332,6 +323,10 @@ static int pm8916_lbc_charger_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "Unable to get battery info\n");
+ irq = platform_get_irq_byname(pdev, "usb_vbus");
+ if (irq < 0)
+ return irq;
+
chg->edev = devm_extcon_dev_allocate(dev, pm8916_lbc_charger_cable);
if (IS_ERR(chg->edev))
return PTR_ERR(chg->edev);
@@ -340,6 +335,11 @@ static int pm8916_lbc_charger_probe(struct platform_device *pdev)
if (ret < 0)
return dev_err_probe(dev, ret, "failed to register extcon device\n");
+ ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_lbc_charger_state_changed_irq,
+ IRQF_ONESHOT, "pm8916_lbc", chg);
+ if (ret)
+ return ret;
+
ret = regmap_read(chg->regmap, chg->reg[LBC_USB] + PM8916_INT_RT_STS, &tmp);
if (ret)
goto comm_error;
diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c
index c8028606bba0..80572ee945b4 100644
--- a/drivers/power/supply/qcom_battmgr.c
+++ b/drivers/power/supply/qcom_battmgr.c
@@ -1240,7 +1240,8 @@ static unsigned int qcom_battmgr_sc8280xp_parse_technology(const char *chemistry
if ((!strncmp(chemistry, "LIO", BATTMGR_CHEMISTRY_LEN)) ||
(!strncmp(chemistry, "OOI", BATTMGR_CHEMISTRY_LEN)))
return POWER_SUPPLY_TECHNOLOGY_LION;
- if (!strncmp(chemistry, "LIP", BATTMGR_CHEMISTRY_LEN))
+ if (!strncmp(chemistry, "LIP", BATTMGR_CHEMISTRY_LEN) ||
+ !strncmp(chemistry, "LiP", BATTMGR_CHEMISTRY_LEN))
return POWER_SUPPLY_TECHNOLOGY_LIPO;
pr_err("Unknown battery technology '%s'\n", chemistry);
diff --git a/drivers/power/supply/rt9455_charger.c b/drivers/power/supply/rt9455_charger.c
index 1ffe7f02932f..5130d2395e88 100644
--- a/drivers/power/supply/rt9455_charger.c
+++ b/drivers/power/supply/rt9455_charger.c
@@ -1663,6 +1663,15 @@ static int rt9455_probe(struct i2c_client *client)
rt9455_charger_config.supplied_to = rt9455_charger_supplied_to;
rt9455_charger_config.num_supplicants =
ARRAY_SIZE(rt9455_charger_supplied_to);
+
+ info->charger = devm_power_supply_register(dev, &rt9455_charger_desc,
+ &rt9455_charger_config);
+ if (IS_ERR(info->charger)) {
+ dev_err(dev, "Failed to register charger\n");
+ ret = PTR_ERR(info->charger);
+ goto put_usb_notifier;
+ }
+
ret = devm_request_threaded_irq(dev, client->irq, NULL,
rt9455_irq_handler_thread,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
@@ -1678,14 +1687,6 @@ static int rt9455_probe(struct i2c_client *client)
goto put_usb_notifier;
}
- info->charger = devm_power_supply_register(dev, &rt9455_charger_desc,
- &rt9455_charger_config);
- if (IS_ERR(info->charger)) {
- dev_err(dev, "Failed to register charger\n");
- ret = PTR_ERR(info->charger);
- goto put_usb_notifier;
- }
-
return 0;
put_usb_notifier:
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index 943c82ee978f..43c48196c167 100644
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -1174,24 +1174,6 @@ static int sbs_probe(struct i2c_client *client)
i2c_set_clientdata(client, chip);
- if (!chip->gpio_detect)
- goto skip_gpio;
-
- irq = gpiod_to_irq(chip->gpio_detect);
- if (irq <= 0) {
- dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq);
- goto skip_gpio;
- }
-
- rc = devm_request_threaded_irq(&client->dev, irq, NULL, sbs_irq,
- IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- dev_name(&client->dev), chip);
- if (rc) {
- dev_warn(&client->dev, "Failed to request irq: %d\n", rc);
- goto skip_gpio;
- }
-
-skip_gpio:
/*
* Before we register, we might need to make sure we can actually talk
* to the battery.
@@ -1217,6 +1199,24 @@ static int sbs_probe(struct i2c_client *client)
return dev_err_probe(&client->dev, PTR_ERR(chip->power_supply),
"Failed to register power supply\n");
+ if (!chip->gpio_detect)
+ goto out;
+
+ irq = gpiod_to_irq(chip->gpio_detect);
+ if (irq <= 0) {
+ dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq);
+ goto out;
+ }
+
+ rc = devm_request_threaded_irq(&client->dev, irq, NULL, sbs_irq,
+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+ dev_name(&client->dev), chip);
+ if (rc) {
+ dev_warn(&client->dev, "Failed to request irq: %d\n", rc);
+ goto out;
+ }
+
+out:
dev_info(&client->dev,
"%s: battery gas gauge device registered\n", client->name);
diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/wm97xx_battery.c
index b3b0c37a9dd2..f00722c88c6f 100644
--- a/drivers/power/supply/wm97xx_battery.c
+++ b/drivers/power/supply/wm97xx_battery.c
@@ -178,12 +178,6 @@ static int wm97xx_bat_probe(struct platform_device *dev)
"failed to get charge GPIO\n");
if (charge_gpiod) {
gpiod_set_consumer_name(charge_gpiod, "BATT CHRG");
- ret = request_irq(gpiod_to_irq(charge_gpiod),
- wm97xx_chrg_irq, 0,
- "AC Detect", dev);
- if (ret)
- return dev_err_probe(&dev->dev, ret,
- "failed to request GPIO irq\n");
props++; /* POWER_SUPPLY_PROP_STATUS */
}
@@ -199,10 +193,8 @@ static int wm97xx_bat_probe(struct platform_device *dev)
props++; /* POWER_SUPPLY_PROP_VOLTAGE_MIN */
prop = kcalloc(props, sizeof(*prop), GFP_KERNEL);
- if (!prop) {
- ret = -ENOMEM;
- goto err3;
- }
+ if (!prop)
+ return -ENOMEM;
prop[i++] = POWER_SUPPLY_PROP_PRESENT;
if (charge_gpiod)
@@ -236,15 +228,27 @@ static int wm97xx_bat_probe(struct platform_device *dev)
schedule_work(&bat_work);
} else {
ret = PTR_ERR(bat_psy);
- goto err4;
+ goto free;
+ }
+
+ if (charge_gpiod) {
+ ret = request_irq(gpiod_to_irq(charge_gpiod), wm97xx_chrg_irq,
+ 0, "AC Detect", dev);
+ if (ret) {
+ dev_err_probe(&dev->dev, ret,
+ "failed to request GPIO irq\n");
+ goto unregister;
+ }
}
return 0;
-err4:
+
+unregister:
+ power_supply_unregister(bat_psy);
+
+free:
kfree(prop);
-err3:
- if (charge_gpiod)
- free_irq(gpiod_to_irq(charge_gpiod), dev);
+
return ret;
}
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 3ff6da3bf4e6..3705d0608a0f 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -254,7 +254,7 @@ static void rapl_init_domains(struct rapl_package *rp);
static int rapl_read_data_raw(struct rapl_domain *rd,
enum rapl_primitives prim,
bool xlate, u64 *data,
- bool atomic);
+ bool pmu_ctx);
static int rapl_write_data_raw(struct rapl_domain *rd,
enum rapl_primitives prim,
unsigned long long value);
@@ -832,7 +832,7 @@ prim_fixups(struct rapl_domain *rd, enum rapl_primitives prim)
*/
static int rapl_read_data_raw(struct rapl_domain *rd,
enum rapl_primitives prim, bool xlate, u64 *data,
- bool atomic)
+ bool pmu_ctx)
{
u64 value;
enum rapl_primitives prim_fixed = prim_fixups(rd, prim);
@@ -854,7 +854,7 @@ static int rapl_read_data_raw(struct rapl_domain *rd,
ra.mask = rpi->mask;
- if (rd->rp->priv->read_raw(get_rid(rd->rp), &ra, atomic)) {
+ if (rd->rp->priv->read_raw(get_rid(rd->rp), &ra, pmu_ctx)) {
pr_debug("failed to read reg 0x%llx for %s:%s\n", ra.reg.val, rd->rp->name, rd->name);
return -EIO;
}
diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c
index 9a7e150b3536..152893dca565 100644
--- a/drivers/powercap/intel_rapl_msr.c
+++ b/drivers/powercap/intel_rapl_msr.c
@@ -110,16 +110,14 @@ static int rapl_cpu_down_prep(unsigned int cpu)
return 0;
}
-static int rapl_msr_read_raw(int cpu, struct reg_action *ra, bool atomic)
+static int rapl_msr_read_raw(int cpu, struct reg_action *ra, bool pmu_ctx)
{
/*
- * When called from atomic-context (eg PMU event handler)
- * perform MSR read directly using rdmsrq().
+ * When called from PMU context, perform MSR read directly using
+ * rdmsrq() without IPI overhead. Package-scoped MSRs are readable
+ * from any CPU in the package.
*/
- if (atomic) {
- if (unlikely(smp_processor_id() != cpu))
- return -EIO;
-
+ if (pmu_ctx) {
rdmsrq(ra->reg.msr, ra->value);
goto out;
}
diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
index 0a0b85f4528b..0f8abdc592bc 100644
--- a/drivers/powercap/intel_rapl_tpmi.c
+++ b/drivers/powercap/intel_rapl_tpmi.c
@@ -157,7 +157,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
tpmi_domain_flags = tpmi_domain_header >> 32 & 0xffff;
if (tpmi_domain_version == TPMI_VERSION_INVALID) {
- pr_warn(FW_BUG "Invalid version\n");
+ pr_debug("Invalid version, other instances may be valid\n");
return -ENODEV;
}
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 7a86cb090f76..2533c95b0ba9 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -237,8 +237,6 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
if (period_cycles < 1)
period_cycles = 1;
- pm_runtime_get_sync(pwmchip_parent(chip));
-
/* Update clock prescaler values */
ehrpwm_modify(pc->mmio_base, TBCTL, TBCTL_CLKDIV_MASK, tb_divval);
@@ -290,8 +288,6 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
if (!(duty_cycles > period_cycles))
ehrpwm_write(pc->mmio_base, cmp_reg, duty_cycles);
- pm_runtime_put_sync(pwmchip_parent(chip));
-
return 0;
}
@@ -378,6 +374,8 @@ static int ehrpwm_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
int err;
bool enabled = pwm->state.enabled;
+ guard(pm_runtime_active)(pwmchip_parent(chip));
+
if (state->polarity != pwm->state.polarity) {
if (enabled) {
ehrpwm_pwm_disable(chip, pwm);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 4b6182cde859..8ee33b777f6c 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1444,6 +1444,33 @@ static int set_machine_constraints(struct regulator_dev *rdev)
int ret = 0;
const struct regulator_ops *ops = rdev->desc->ops;
+ /*
+ * If there is no mechanism for controlling the regulator then
+ * flag it as always_on so we don't end up duplicating checks
+ * for this so much. Note that we could control the state of
+ * a supply to control the output on a regulator that has no
+ * direct control.
+ */
+ if (!rdev->ena_pin && !ops->enable) {
+ if (rdev->supply_name && !rdev->supply)
+ return -EPROBE_DEFER;
+
+ if (rdev->supply)
+ rdev->constraints->always_on =
+ rdev->supply->rdev->constraints->always_on;
+ else
+ rdev->constraints->always_on = true;
+ }
+
+ /*
+ * If we want to enable this regulator, make sure that we know the
+ * supplying regulator.
+ */
+ if (rdev->constraints->always_on || rdev->constraints->boot_on) {
+ if (rdev->supply_name && !rdev->supply)
+ return -EPROBE_DEFER;
+ }
+
ret = machine_constraints_voltage(rdev, rdev->constraints);
if (ret != 0)
return ret;
@@ -1609,37 +1636,15 @@ static int set_machine_constraints(struct regulator_dev *rdev)
}
}
- /*
- * If there is no mechanism for controlling the regulator then
- * flag it as always_on so we don't end up duplicating checks
- * for this so much. Note that we could control the state of
- * a supply to control the output on a regulator that has no
- * direct control.
- */
- if (!rdev->ena_pin && !ops->enable) {
- if (rdev->supply_name && !rdev->supply)
- return -EPROBE_DEFER;
-
- if (rdev->supply)
- rdev->constraints->always_on =
- rdev->supply->rdev->constraints->always_on;
- else
- rdev->constraints->always_on = true;
- }
-
/* If the constraints say the regulator should be on at this point
* and we have control then make sure it is enabled.
*/
if (rdev->constraints->always_on || rdev->constraints->boot_on) {
bool supply_enabled = false;
- /* If we want to enable this regulator, make sure that we know
- * the supplying regulator.
- */
- if (rdev->supply_name && !rdev->supply)
- return -EPROBE_DEFER;
-
- /* If supplying regulator has already been enabled,
+ /* We have ensured a potential supply has been resolved above.
+ *
+ * If supplying regulator has already been enabled,
* it's not intended to have use_count increment
* when rdev is only boot-on.
*/
@@ -2268,10 +2273,21 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
* under-voltage.
*/
ret = register_regulator_event_forwarding(rdev);
- if (ret < 0)
+ if (ret < 0) {
+ struct regulator *supply;
+
rdev_warn(rdev, "Failed to register event forwarding: %pe\n",
ERR_PTR(ret));
+ supply = rdev->supply;
+ rdev->supply = NULL;
+
+ regulator_unlock_two(rdev, supply->rdev, &ww_ctx);
+
+ regulator_put(supply);
+ goto out;
+ }
+
regulator_unlock_two(rdev, r, &ww_ctx);
/* rdev->supply was created in set_supply() */
@@ -2285,8 +2301,16 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
if (rdev->use_count) {
ret = regulator_enable(rdev->supply);
if (ret < 0) {
- _regulator_put(rdev->supply);
+ struct regulator *supply;
+
+ regulator_lock_two(rdev, rdev->supply->rdev, &ww_ctx);
+
+ supply = rdev->supply;
rdev->supply = NULL;
+
+ regulator_unlock_two(rdev, supply->rdev, &ww_ctx);
+
+ regulator_put(supply);
goto out;
}
}
diff --git a/drivers/regulator/mt6363-regulator.c b/drivers/regulator/mt6363-regulator.c
index e0fbf92e7685..03af5fa53600 100644
--- a/drivers/regulator/mt6363-regulator.c
+++ b/drivers/regulator/mt6363-regulator.c
@@ -861,7 +861,7 @@ static int mt6363_regulator_probe(struct platform_device *pdev)
struct irq_domain *domain;
struct irq_fwspec fwspec;
struct spmi_device *sdev;
- int i, ret;
+ int i, ret, val;
config.regmap = mt6363_spmi_register_regmap(dev);
if (IS_ERR(config.regmap))
@@ -870,6 +870,13 @@ static int mt6363_regulator_probe(struct platform_device *pdev)
config.dev = dev;
sdev = to_spmi_device(dev->parent);
+ /*
+ * The first read may fail if the bootloader sets sleep mode: wake up
+ * this PMIC with W/R on the SPMI bus and ignore the first result.
+ * This matches the MT6373 driver behavior.
+ */
+ regmap_read(config.regmap, MT6363_TOP_TRAP, &val);
+
interrupt_parent = of_irq_find_parent(dev->of_node);
if (!interrupt_parent)
return dev_err_probe(dev, -EINVAL, "Cannot find IRQ parent\n");
diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 5130a35214c9..5a9a8fa031f6 100644
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -644,6 +644,32 @@ static void imx_dsp_rproc_free_mbox(struct imx_dsp_rproc *priv)
mbox_free_channel(priv->rxdb_ch);
}
+static int imx_dsp_rproc_mem_alloc(struct rproc *rproc,
+ struct rproc_mem_entry *mem)
+{
+ struct device *dev = rproc->dev.parent;
+ void *va;
+
+ va = ioremap_wc(mem->dma, mem->len);
+ if (!va) {
+ dev_err(dev, "Unable to map memory region: %pa+%zx\n",
+ &mem->dma, mem->len);
+ return -ENOMEM;
+ }
+
+ mem->va = va;
+
+ return 0;
+}
+
+static int imx_dsp_rproc_mem_release(struct rproc *rproc,
+ struct rproc_mem_entry *mem)
+{
+ iounmap(mem->va);
+
+ return 0;
+}
+
/**
* imx_dsp_rproc_add_carveout() - request mailbox channels
* @priv: private data pointer
@@ -659,7 +685,6 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
struct device *dev = rproc->dev.parent;
struct device_node *np = dev->of_node;
struct rproc_mem_entry *mem;
- void __iomem *cpu_addr;
int a, i = 0;
u64 da;
@@ -673,15 +698,10 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
if (imx_dsp_rproc_sys_to_da(priv, att->sa, att->size, &da))
return -EINVAL;
- cpu_addr = devm_ioremap_wc(dev, att->sa, att->size);
- if (!cpu_addr) {
- dev_err(dev, "failed to map memory %p\n", &att->sa);
- return -ENOMEM;
- }
-
/* Register memory region */
- mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)att->sa,
- att->size, da, NULL, NULL, "dsp_mem");
+ mem = rproc_mem_entry_init(dev, NULL, (dma_addr_t)att->sa,
+ att->size, da, imx_dsp_rproc_mem_alloc,
+ imx_dsp_rproc_mem_release, "dsp_mem");
if (mem)
rproc_coredump_add_segment(rproc, da, att->size);
@@ -709,15 +729,11 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
if (imx_dsp_rproc_sys_to_da(priv, res.start, resource_size(&res), &da))
return -EINVAL;
- cpu_addr = devm_ioremap_resource_wc(dev, &res);
- if (IS_ERR(cpu_addr)) {
- dev_err(dev, "failed to map memory %pR\n", &res);
- return PTR_ERR(cpu_addr);
- }
-
/* Register memory region */
- mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)res.start,
- resource_size(&res), da, NULL, NULL,
+ mem = rproc_mem_entry_init(dev, NULL, (dma_addr_t)res.start,
+ resource_size(&res), da,
+ imx_dsp_rproc_mem_alloc,
+ imx_dsp_rproc_mem_release,
"%.*s", strchrnul(res.name, '@') - res.name, res.name);
if (!mem)
return -ENOMEM;
@@ -984,9 +1000,11 @@ static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
* Clear buffers after pm rumtime for internal ocram is not
* accessible if power and clock are not enabled.
*/
- list_for_each_entry(carveout, &rproc->carveouts, node) {
- if (carveout->va)
- memset(carveout->va, 0, carveout->len);
+ if (rproc->state == RPROC_OFFLINE) {
+ list_for_each_entry(carveout, &rproc->carveouts, node) {
+ if (carveout->va)
+ memset(carveout->va, 0, carveout->len);
+ }
}
ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 3be8790c14a2..33f21ab24c92 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -694,7 +694,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
}
priv->mem[b].sys_addr = res.start;
priv->mem[b].size = resource_size(&res);
- if (!strcmp(res.name, "rsc-table"))
+ if (strstarts(res.name, "rsc-table"))
priv->rsc_table = priv->mem[b].cpu_addr;
b++;
}
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 6e5d6deffa7d..52ee102621ee 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -161,7 +161,7 @@ config RESET_K210
config RESET_K230
tristate "Reset controller driver for Canaan Kendryte K230 SoC"
depends on ARCH_CANAAN || COMPILE_TEST
- depends on OF
+ default ARCH_CANAAN
help
Support for the Canaan Kendryte K230 RISC-V SoC reset controller.
Say Y if you want to control reset signals provided by this
diff --git a/drivers/rtc/rtc-amlogic-a4.c b/drivers/rtc/rtc-amlogic-a4.c
index 123fb372fc9f..50938c35af36 100644
--- a/drivers/rtc/rtc-amlogic-a4.c
+++ b/drivers/rtc/rtc-amlogic-a4.c
@@ -369,7 +369,7 @@ static int aml_rtc_probe(struct platform_device *pdev)
return PTR_ERR(rtc->rtc_dev);
ret = devm_request_irq(dev, rtc->irq, aml_rtc_handler,
- IRQF_ONESHOT, "aml-rtc alarm", rtc);
+ 0, "aml-rtc alarm", rtc);
if (ret) {
dev_err_probe(dev, ret, "IRQ%d request failed, ret = %d\n",
rtc->irq, ret);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 4c85df7a548e..ac24e019020e 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -235,7 +235,7 @@ struct subchannel *css_alloc_subchannel(struct subchannel_id schid,
return sch;
err:
- kfree(sch);
+ put_device(&sch->dev);
return ERR_PTR(ret);
}
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 34bde6650fae..356a7c577ec3 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2074,7 +2074,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)
struct csio_scsi_level_data sld;
if (!rn)
- goto fail;
+ goto fail_ret;
csio_dbg(hw, "Request to reset LUN:%llu (ssni:0x%x tgtid:%d)\n",
cmnd->device->lun, rn->flowid, rn->scsi_id);
@@ -2220,6 +2220,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)
csio_put_scsi_ioreq_lock(hw, scsim, ioreq);
fail:
CSIO_INC_STATS(rn, n_lun_rst_fail);
+fail_ret:
return FAILED;
}
diff --git a/drivers/scsi/elx/efct/efct_driver.c b/drivers/scsi/elx/efct/efct_driver.c
index 1bd42f7db177..528399f725d4 100644
--- a/drivers/scsi/elx/efct/efct_driver.c
+++ b/drivers/scsi/elx/efct/efct_driver.c
@@ -415,12 +415,6 @@ efct_intr_thread(int irq, void *handle)
return IRQ_HANDLED;
}
-static irqreturn_t
-efct_intr_msix(int irq, void *handle)
-{
- return IRQ_WAKE_THREAD;
-}
-
static int
efct_setup_msix(struct efct *efct, u32 num_intrs)
{
@@ -450,7 +444,7 @@ efct_setup_msix(struct efct *efct, u32 num_intrs)
intr_ctx->index = i;
rc = request_threaded_irq(pci_irq_vector(efct->pci, i),
- efct_intr_msix, efct_intr_thread, 0,
+ NULL, efct_intr_thread, IRQF_ONESHOT,
EFCT_DRIVER_NAME, intr_ctx);
if (rc) {
dev_err(&efct->pci->dev,
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index fe549e2b7c94..c829d9590558 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -1241,7 +1241,8 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b
dev_err(&ctrl_info->pci_dev->dev,
"RPL returned unsupported data format %u\n",
rpl_response_format);
- return -EINVAL;
+ rc = -EINVAL;
+ goto out_free_rpl_list;
} else {
dev_warn(&ctrl_info->pci_dev->dev,
"RPL returned extended format 2 instead of 4\n");
@@ -1253,8 +1254,10 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b
rpl_16byte_wwid_list = kmalloc(struct_size(rpl_16byte_wwid_list, lun_entries,
num_physicals), GFP_KERNEL);
- if (!rpl_16byte_wwid_list)
- return -ENOMEM;
+ if (!rpl_16byte_wwid_list) {
+ rc = -ENOMEM;
+ goto out_free_rpl_list;
+ }
put_unaligned_be32(num_physicals * sizeof(struct report_phys_lun_16byte_wwid),
&rpl_16byte_wwid_list->header.list_length);
@@ -1275,6 +1278,10 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b
*buffer = rpl_16byte_wwid_list;
return 0;
+
+out_free_rpl_list:
+ kfree(rpl_list);
+ return rc;
}
static inline int pqi_report_logical_luns(struct pqi_ctrl_info *ctrl_info, void **buffer)
diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index f45537546553..99edecb204f2 100644
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -9,6 +9,7 @@
#include <linux/bits.h>
#include <linux/clk.h>
#include <linux/completion.h>
+#include <linux/cleanup.h>
#include <linux/cpu.h>
#include <linux/cpuidle.h>
#include <linux/debugfs.h>
@@ -789,7 +790,7 @@ static ssize_t svs_enable_debug_write(struct file *filp,
struct svs_bank *svsb = file_inode(filp)->i_private;
struct svs_platform *svsp = dev_get_drvdata(svsb->dev);
int enabled, ret;
- char *buf = NULL;
+ char *buf __free(kfree) = NULL;
if (count >= PAGE_SIZE)
return -EINVAL;
@@ -807,8 +808,6 @@ static ssize_t svs_enable_debug_write(struct file *filp,
svsb->mode_support = SVSB_MODE_ALL_DISABLE;
}
- kfree(buf);
-
return count;
}
diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c
index ae66c2623d25..84a75d8c4b70 100644
--- a/drivers/soc/qcom/cmd-db.c
+++ b/drivers/soc/qcom/cmd-db.c
@@ -349,15 +349,16 @@ static int cmd_db_dev_probe(struct platform_device *pdev)
return -EINVAL;
}
- cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WC);
- if (!cmd_db_header) {
- ret = -ENOMEM;
+ cmd_db_header = devm_memremap(&pdev->dev, rmem->base, rmem->size, MEMREMAP_WC);
+ if (IS_ERR(cmd_db_header)) {
+ ret = PTR_ERR(cmd_db_header);
cmd_db_header = NULL;
return ret;
}
if (!cmd_db_magic_matches(cmd_db_header)) {
dev_err(&pdev->dev, "Invalid Command DB Magic\n");
+ cmd_db_header = NULL;
return -EINVAL;
}
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index c18a0c946f76..d5c94b47f431 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -1219,7 +1219,9 @@ static int qcom_smem_probe(struct platform_device *pdev)
smem->item_count = qcom_smem_get_item_count(smem);
break;
case SMEM_GLOBAL_HEAP_VERSION:
- qcom_smem_map_global(smem, size);
+ ret = qcom_smem_map_global(smem, size);
+ if (ret < 0)
+ return ret;
smem->item_count = SMEM_ITEM_COUNT;
break;
default:
diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig
index ad56393e4c93..196a7daaabdb 100644
--- a/drivers/soundwire/Kconfig
+++ b/drivers/soundwire/Kconfig
@@ -40,6 +40,7 @@ config SOUNDWIRE_INTEL
select AUXILIARY_BUS
depends on ACPI && SND_SOC
depends on SND_SOC_SOF_HDA_MLINK || !SND_SOC_SOF_HDA_MLINK
+ depends on SND_HDA_CORE || !SND_HDA_ALIGNED_MMIO
help
SoundWire Intel Master driver.
If you have an Intel platform which has a SoundWire Master then
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 965b4cea3388..b9a560c75c5c 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -2012,10 +2012,8 @@ static int cqspi_probe(struct platform_device *pdev)
goto probe_setup_failed;
}
- if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM))) {
- pm_runtime_mark_last_busy(dev);
+ if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM)))
pm_runtime_put_autosuspend(dev);
- }
return 0;
probe_setup_failed:
diff --git a/drivers/spi/spi-microchip-core-spi.c b/drivers/spi/spi-microchip-core-spi.c
index 89e40fc45d73..c8ebb58e0369 100644
--- a/drivers/spi/spi-microchip-core-spi.c
+++ b/drivers/spi/spi-microchip-core-spi.c
@@ -161,7 +161,7 @@ static int mchp_corespi_setup(struct spi_device *spi)
return -EOPNOTSUPP;
}
- if (spi->mode & SPI_MODE_X_MASK & ~spi->controller->mode_bits) {
+ if ((spi->mode ^ spi->controller->mode_bits) & SPI_MODE_X_MASK) {
dev_err(&spi->dev, "incompatible CPOL/CPHA, must match controller's Motorola mode\n");
return -EINVAL;
}
diff --git a/drivers/spi/spi-wpcm-fiu.c b/drivers/spi/spi-wpcm-fiu.c
index a9aee2a6c7dc..c47b56f0933f 100644
--- a/drivers/spi/spi-wpcm-fiu.c
+++ b/drivers/spi/spi-wpcm-fiu.c
@@ -459,11 +459,11 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
fiu->memory = devm_ioremap_resource(dev, res);
- fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
if (IS_ERR(fiu->memory))
return dev_err_probe(dev, PTR_ERR(fiu->memory),
"Failed to map flash memory window\n");
+ fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");
wpcm_fiu_hw_init(fiu);
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index e509fdc715db..38c233a706c4 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -1008,14 +1008,18 @@ static int gb_lights_light_config(struct gb_lights *glights, u8 id)
if (!strlen(conf.name))
return -EINVAL;
- light->channels_count = conf.channel_count;
light->name = kstrndup(conf.name, NAMES_MAX, GFP_KERNEL);
if (!light->name)
return -ENOMEM;
- light->channels = kcalloc(light->channels_count,
+ light->channels = kcalloc(conf.channel_count,
sizeof(struct gb_channel), GFP_KERNEL);
if (!light->channels)
return -ENOMEM;
+ /*
+ * Publish channels_count only after channels allocation so cleanup
+ * doesn't walk a NULL channels pointer on allocation failure.
+ */
+ light->channels_count = conf.channel_count;
/* First we collect all the configurations for all channels */
for (i = 0; i < light->channels_count; i++) {
diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index 3fc679b6f11b..aab5f9fca9c3 100644
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -128,6 +128,9 @@ sys_set_trip_temp(struct thermal_zone_device *tzd,
u32 l, h, mask, shift, intr;
int tj_max, val, ret;
+ if (temp == THERMAL_TEMP_INVALID)
+ temp = 0;
+
tj_max = intel_tcc_get_tjmax(zonedev->cpu);
if (tj_max < 0)
return tj_max;
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 1a51a4d240ff..b6d0c92f5522 100644
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -280,10 +280,10 @@ static bool thermal_of_cm_lookup(struct device_node *cm_np,
struct cooling_spec *c)
{
for_each_child_of_node_scoped(cm_np, child) {
- struct device_node *tr_np;
int count, i;
- tr_np = of_parse_phandle(child, "trip", 0);
+ struct device_node *tr_np __free(device_node) =
+ of_parse_phandle(child, "trip", 0);
if (tr_np != trip->priv)
continue;
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 59221cce0028..3d06c65c2f49 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -486,14 +486,14 @@ config SERIAL_IMX
can enable its onboard serial port by enabling this option.
config SERIAL_IMX_CONSOLE
- tristate "Console on IMX serial port"
+ bool "Console on IMX serial port"
depends on SERIAL_IMX
select SERIAL_CORE_CONSOLE
help
If you have enabled the serial port on the Freescale IMX
- CPU you can make it the console by answering Y/M to this option.
+ CPU you can make it the console by answering Y to this option.
- Even if you say Y/M here, the currently visible virtual console
+ Even if you say Y here, the currently visible virtual console
(/dev/tty0) will still be used as the system console by default, but
you can alter that using a kernel command line option such as
"console=ttymxc0". (Try "man bootparam" or see the documentation of
@@ -671,7 +671,7 @@ config SERIAL_SH_SCI_EARLYCON
default ARCH_RENESAS
config SERIAL_SH_SCI_DMA
- bool "DMA support" if EXPERT
+ bool "Support for DMA on SuperH SCI(F)" if EXPERT
depends on SERIAL_SH_SCI && DMA_ENGINE
default ARCH_RENESAS
diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
index 7d5117b2dab4..964ae70e7390 100644
--- a/drivers/ufs/host/Kconfig
+++ b/drivers/ufs/host/Kconfig
@@ -72,6 +72,7 @@ config SCSI_UFS_QCOM
config SCSI_UFS_MEDIATEK
tristate "Mediatek specific hooks to UFS controller platform driver"
depends on SCSI_UFSHCD_PLATFORM && ARCH_MEDIATEK
+ depends on PM
depends on RESET_CONTROLLER
select PHY_MTK_UFS
select RESET_TI_SYSCON
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 66b11cc0703b..b3daaa07e925 100644
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -2437,7 +2437,6 @@ static void ufs_mtk_remove(struct platform_device *pdev)
ufshcd_pltfrm_remove(pdev);
}
-#ifdef CONFIG_PM_SLEEP
static int ufs_mtk_system_suspend(struct device *dev)
{
struct ufs_hba *hba = dev_get_drvdata(dev);
@@ -2484,9 +2483,7 @@ static int ufs_mtk_system_resume(struct device *dev)
return ret;
}
-#endif
-#ifdef CONFIG_PM
static int ufs_mtk_runtime_suspend(struct device *dev)
{
struct ufs_hba *hba = dev_get_drvdata(dev);
@@ -2525,13 +2522,10 @@ static int ufs_mtk_runtime_resume(struct device *dev)
return ufshcd_runtime_resume(dev);
}
-#endif
static const struct dev_pm_ops ufs_mtk_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(ufs_mtk_system_suspend,
- ufs_mtk_system_resume)
- SET_RUNTIME_PM_OPS(ufs_mtk_runtime_suspend,
- ufs_mtk_runtime_resume, NULL)
+ SYSTEM_SLEEP_PM_OPS(ufs_mtk_system_suspend, ufs_mtk_system_resume)
+ RUNTIME_PM_OPS(ufs_mtk_runtime_suspend, ufs_mtk_runtime_resume, NULL)
.prepare = ufshcd_suspend_prepare,
.complete = ufshcd_resume_complete,
};
@@ -2541,7 +2535,7 @@ static struct platform_driver ufs_mtk_pltform = {
.remove = ufs_mtk_remove,
.driver = {
.name = "ufshcd-mtk",
- .pm = &ufs_mtk_pm_ops,
+ .pm = pm_ptr(&ufs_mtk_pm_ops),
.of_match_table = ufs_mtk_of_match,
},
};
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 1243a5cea91b..f0e32227c0b7 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -551,7 +551,7 @@ int cdns_resume(struct cdns *cdns)
}
}
- if (cdns->roles[cdns->role]->resume)
+ if (!role_changed && cdns->roles[cdns->role]->resume)
cdns->roles[cdns->role]->resume(cdns, power_lost);
return 0;
diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
index 5c3d8b64c0e7..f47aac078f6b 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_core.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
@@ -35,8 +35,8 @@ static int poll_oip(struct bdc *bdc, u32 usec)
u32 status;
int ret;
- ret = readl_poll_timeout(bdc->regs + BDC_BDCSC, status,
- (BDC_CSTS(status) != BDC_OIP), 10, usec);
+ ret = readl_poll_timeout_atomic(bdc->regs + BDC_BDCSC, status,
+ (BDC_CSTS(status) != BDC_OIP), 10, usec);
if (ret)
dev_err(bdc->dev, "operation timedout BDCSC: 0x%08x\n", status);
else
diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
index 870a71f953f6..19ff8217818e 100644
--- a/drivers/usb/typec/tcpm/fusb302.c
+++ b/drivers/usb/typec/tcpm/fusb302.c
@@ -1756,8 +1756,7 @@ static int fusb302_probe(struct i2c_client *client)
}
ret = request_irq(chip->gpio_int_n_irq, fusb302_irq_intn,
- IRQF_ONESHOT | IRQF_TRIGGER_LOW,
- "fsc_interrupt_int_n", chip);
+ IRQF_TRIGGER_LOW, "fsc_interrupt_int_n", chip);
if (ret < 0) {
dev_err(dev, "cannot request IRQ for GPIO Int_N, ret=%d", ret);
goto tcpm_unregister_port;
diff --git a/drivers/usb/typec/ucsi/Kconfig b/drivers/usb/typec/ucsi/Kconfig
index b812be4d0e67..87dd992a4b9e 100644
--- a/drivers/usb/typec/ucsi/Kconfig
+++ b/drivers/usb/typec/ucsi/Kconfig
@@ -73,7 +73,6 @@ config CROS_EC_UCSI
tristate "UCSI Driver for ChromeOS EC"
depends on MFD_CROS_EC_DEV
depends on CROS_USBPD_NOTIFY
- depends on !EXTCON_TCSS_CROS_EC
default MFD_CROS_EC_DEV
help
This driver enables UCSI support for a ChromeOS EC. The EC is
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index cf45f6370c36..d1e8053640a9 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -1188,9 +1188,32 @@ hisi_acc_vfio_pci_get_device_state(struct vfio_device *vdev,
return 0;
}
+static void hisi_acc_vf_pci_reset_prepare(struct pci_dev *pdev)
+{
+ struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev);
+ struct hisi_qm *qm = hisi_acc_vdev->pf_qm;
+ struct device *dev = &qm->pdev->dev;
+ u32 delay = 0;
+
+ /* All reset requests need to be queued for processing */
+ while (test_and_set_bit(QM_RESETTING, &qm->misc_ctl)) {
+ msleep(1);
+ if (++delay > QM_RESET_WAIT_TIMEOUT) {
+ dev_err(dev, "reset prepare failed\n");
+ return;
+ }
+ }
+
+ hisi_acc_vdev->set_reset_flag = true;
+}
+
static void hisi_acc_vf_pci_aer_reset_done(struct pci_dev *pdev)
{
struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev);
+ struct hisi_qm *qm = hisi_acc_vdev->pf_qm;
+
+ if (hisi_acc_vdev->set_reset_flag)
+ clear_bit(QM_RESETTING, &qm->misc_ctl);
if (hisi_acc_vdev->core_device.vdev.migration_flags !=
VFIO_MIGRATION_STOP_COPY)
@@ -1734,6 +1757,7 @@ static const struct pci_device_id hisi_acc_vfio_pci_table[] = {
MODULE_DEVICE_TABLE(pci, hisi_acc_vfio_pci_table);
static const struct pci_error_handlers hisi_acc_vf_err_handlers = {
+ .reset_prepare = hisi_acc_vf_pci_reset_prepare,
.reset_done = hisi_acc_vf_pci_aer_reset_done,
.error_detected = vfio_pci_core_aer_err_detected,
};
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
index cd55eba64dfb..a3d91a31e3d8 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
@@ -27,6 +27,7 @@
#define ERROR_CHECK_TIMEOUT 100
#define CHECK_DELAY_TIME 100
+#define QM_RESET_WAIT_TIMEOUT 60000
#define QM_SQC_VFT_BASE_SHIFT_V2 28
#define QM_SQC_VFT_BASE_MASK_V2 GENMASK(15, 0)
@@ -128,6 +129,7 @@ struct hisi_acc_vf_migration_file {
struct hisi_acc_vf_core_device {
struct vfio_pci_core_device core_device;
u8 match_done;
+ bool set_reset_flag;
/*
* io_base is only valid when dev_opened is true,
* which is protected by open_mutex.
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index 3a11e6f450f7..72c33b399800 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -588,6 +588,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_enable);
void vfio_pci_core_disable(struct vfio_pci_core_device *vdev)
{
+ struct pci_dev *bridge;
struct pci_dev *pdev = vdev->pdev;
struct vfio_pci_dummy_resource *dummy_res, *tmp;
struct vfio_pci_ioeventfd *ioeventfd, *ioeventfd_tmp;
@@ -694,12 +695,20 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev)
* We can not use the "try" reset interface here, which will
* overwrite the previously restored configuration information.
*/
- if (vdev->reset_works && pci_dev_trylock(pdev)) {
- if (!__pci_reset_function_locked(pdev))
- vdev->needs_reset = false;
- pci_dev_unlock(pdev);
+ if (vdev->reset_works) {
+ bridge = pci_upstream_bridge(pdev);
+ if (bridge && !pci_dev_trylock(bridge))
+ goto out_restore_state;
+ if (pci_dev_trylock(pdev)) {
+ if (!__pci_reset_function_locked(pdev))
+ vdev->needs_reset = false;
+ pci_dev_unlock(pdev);
+ }
+ if (bridge)
+ pci_dev_unlock(bridge);
}
+out_restore_state:
pci_restore_state(pdev);
out:
pci_disable_device(pdev);
diff --git a/drivers/video/backlight/aw99706.c b/drivers/video/backlight/aw99706.c
index df5b23b2f753..938f352aaab7 100644
--- a/drivers/video/backlight/aw99706.c
+++ b/drivers/video/backlight/aw99706.c
@@ -12,7 +12,7 @@
#include <linux/backlight.h>
#include <linux/bitfield.h>
#include <linux/delay.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/i2c.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
index a63bb42c8f8b..8054e4787725 100644
--- a/drivers/video/backlight/qcom-wled.c
+++ b/drivers/video/backlight/qcom-wled.c
@@ -1244,6 +1244,15 @@ static const struct wled_var_cfg wled4_ovp_cfg = {
.size = ARRAY_SIZE(wled4_ovp_values),
};
+static const u32 pmi8994_wled_ovp_values[] = {
+ 31000, 29500, 19400, 17800,
+};
+
+static const struct wled_var_cfg pmi8994_wled_ovp_cfg = {
+ .values = pmi8994_wled_ovp_values,
+ .size = ARRAY_SIZE(pmi8994_wled_ovp_values),
+};
+
static inline u32 wled5_ovp_values_fn(u32 idx)
{
/*
@@ -1357,6 +1366,29 @@ static int wled_configure(struct wled *wled)
},
};
+ const struct wled_u32_opts pmi8994_wled_opts[] = {
+ {
+ .name = "qcom,current-boost-limit",
+ .val_ptr = &cfg->boost_i_limit,
+ .cfg = &wled4_boost_i_limit_cfg,
+ },
+ {
+ .name = "qcom,current-limit-microamp",
+ .val_ptr = &cfg->string_i_limit,
+ .cfg = &wled4_string_i_limit_cfg,
+ },
+ {
+ .name = "qcom,ovp-millivolt",
+ .val_ptr = &cfg->ovp,
+ .cfg = &pmi8994_wled_ovp_cfg,
+ },
+ {
+ .name = "qcom,switching-freq",
+ .val_ptr = &cfg->switch_freq,
+ .cfg = &wled3_switch_freq_cfg,
+ },
+ };
+
const struct wled_u32_opts wled5_opts[] = {
{
.name = "qcom,current-boost-limit",
@@ -1423,8 +1455,14 @@ static int wled_configure(struct wled *wled)
break;
case 4:
- u32_opts = wled4_opts;
- size = ARRAY_SIZE(wled4_opts);
+ if (of_device_is_compatible(dev->of_node, "qcom,pmi8950-wled") ||
+ of_device_is_compatible(dev->of_node, "qcom,pmi8994-wled")) {
+ u32_opts = pmi8994_wled_opts;
+ size = ARRAY_SIZE(pmi8994_wled_opts);
+ } else {
+ u32_opts = wled4_opts;
+ size = ARRAY_SIZE(wled4_opts);
+ }
*cfg = wled4_config_defaults;
wled->wled_set_brightness = wled4_set_brightness;
wled->wled_sync_toggle = wled3_sync_toggle;
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index ed770222660b..685e629e7e16 100644
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -1724,8 +1724,10 @@ static int au1200fb_drv_probe(struct platform_device *dev)
/* Now hook interrupt too */
irq = platform_get_irq(dev, 0);
- if (irq < 0)
- return irq;
+ if (irq < 0) {
+ ret = irq;
+ goto failed;
+ }
ret = request_irq(irq, au1200fb_handle_irq,
IRQF_SHARED, "lcd", (void *)dev);
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index bebd371c6b93..a4cd446ac5a5 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -195,7 +195,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
disp->num_timings = 0;
disp->native_mode = 0;
- for_each_child_of_node(timings_np, entry) {
+ for_each_child_of_node_scoped(timings_np, child) {
struct display_timing *dt;
int r;
@@ -206,7 +206,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
goto timingfail;
}
- r = of_parse_display_timing(entry, dt);
+ r = of_parse_display_timing(child, dt);
if (r) {
/*
* to not encourage wrong devicetrees, fail in case of
@@ -218,7 +218,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
goto timingfail;
}
- if (native_mode == entry)
+ if (native_mode == child)
disp->native_mode = disp->num_timings;
disp->timings[disp->num_timings] = dt;
diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index ed71d3960a0f..af55adc4a3c6 100644
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -446,7 +446,7 @@ static int starfive_wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, wdt);
pm_runtime_enable(&pdev->dev);
if (pm_runtime_enabled(&pdev->dev)) {
- ret = pm_runtime_get_sync(&pdev->dev);
+ ret = pm_runtime_resume_and_get(&pdev->dev);
if (ret < 0)
return ret;
} else {
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 49c3f9926394..8c44a25a7d2b 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -724,6 +724,7 @@ static int __init balloon_add_regions(void)
static int __init balloon_init(void)
{
struct task_struct *task;
+ unsigned long current_pages;
int rc;
if (!xen_domain())
@@ -731,12 +732,18 @@ static int __init balloon_init(void)
pr_info("Initialising balloon driver\n");
- if (xen_released_pages >= get_num_physpages()) {
- WARN(1, "Released pages underflow current target");
- return -ERANGE;
+ if (xen_pv_domain()) {
+ if (xen_released_pages >= xen_start_info->nr_pages)
+ goto underflow;
+ current_pages = min(xen_start_info->nr_pages -
+ xen_released_pages, max_pfn);
+ } else {
+ if (xen_unpopulated_pages >= get_num_physpages())
+ goto underflow;
+ current_pages = get_num_physpages() - xen_unpopulated_pages;
}
- balloon_stats.current_pages = get_num_physpages() - xen_released_pages;
+ balloon_stats.current_pages = current_pages;
balloon_stats.target_pages = balloon_stats.current_pages;
balloon_stats.balloon_low = 0;
balloon_stats.balloon_high = 0;
@@ -767,6 +774,10 @@ static int __init balloon_init(void)
xen_balloon_init();
return 0;
+
+ underflow:
+ WARN(1, "Released pages underflow current target");
+ return -ERANGE;
}
subsys_initcall(balloon_init);
diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c
index 14077d23f2a1..c2603e700178 100644
--- a/drivers/xen/grant-dma-ops.c
+++ b/drivers/xen/grant-dma-ops.c
@@ -366,7 +366,8 @@ static int xen_grant_init_backend_domid(struct device *dev,
if (np) {
ret = xen_dt_grant_init_backend_domid(dev, np, backend_domid);
of_node_put(np);
- } else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT) || xen_pv_domain()) {
+ } else if (!xen_initial_domain() &&
+ (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT) || xen_pv_domain())) {
dev_info(dev, "Using dom0 as backend\n");
*backend_domid = 0;
ret = 0;
diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c
index d6fc2aefe264..1dc0b495c8e5 100644
--- a/drivers/xen/unpopulated-alloc.c
+++ b/drivers/xen/unpopulated-alloc.c
@@ -18,6 +18,9 @@ static unsigned int list_count;
static struct resource *target_resource;
+/* Pages to subtract from the memory count when setting balloon target. */
+unsigned long xen_unpopulated_pages __initdata;
+
/*
* If arch is not happy with system "iomem_resource" being used for
* the region allocation it can provide it's own view by creating specific
diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index fa1d321a2fb8..e4d382d3a7ae 100644
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -480,6 +480,8 @@ static void btrfs_clone_write_end_io(struct bio *bio)
static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)
{
+ u64 physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
+
if (!dev || !dev->bdev ||
test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) ||
(btrfs_op(bio) == BTRFS_MAP_WRITE &&
@@ -494,12 +496,13 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)
* For zone append writing, bi_sector must point the beginning of the
* zone
*/
- if (bio_op(bio) == REQ_OP_ZONE_APPEND) {
- u64 physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
+ if (btrfs_bio(bio)->can_use_append && btrfs_dev_is_sequential(dev, physical)) {
u64 zone_start = round_down(physical, dev->fs_info->zone_size);
ASSERT(btrfs_dev_is_sequential(dev, physical));
bio->bi_iter.bi_sector = zone_start >> SECTOR_SHIFT;
+ bio->bi_opf &= ~REQ_OP_WRITE;
+ bio->bi_opf |= REQ_OP_ZONE_APPEND;
}
btrfs_debug(dev->fs_info,
"%s: rw %d 0x%x, sector=%llu, dev=%lu (%s id %llu), size=%u",
@@ -747,7 +750,6 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
u64 logical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
u64 length = bio->bi_iter.bi_size;
u64 map_length = length;
- bool use_append = btrfs_use_zone_append(bbio);
struct btrfs_io_context *bioc = NULL;
struct btrfs_io_stripe smap;
blk_status_t status;
@@ -775,8 +777,10 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
if (bio_op(bio) == REQ_OP_WRITE && is_data_bbio(bbio))
bbio->orig_logical = logical;
+ bbio->can_use_append = btrfs_use_zone_append(bbio);
+
map_length = min(map_length, length);
- if (use_append)
+ if (bbio->can_use_append)
map_length = btrfs_append_map_length(bbio, map_length);
if (map_length < length) {
@@ -805,11 +809,6 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
}
if (btrfs_op(bio) == BTRFS_MAP_WRITE) {
- if (use_append) {
- bio->bi_opf &= ~REQ_OP_WRITE;
- bio->bi_opf |= REQ_OP_ZONE_APPEND;
- }
-
if (is_data_bbio(bbio) && bioc && bioc->use_rst) {
/*
* No locking for the list update, as we only add to
@@ -836,7 +835,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
status = errno_to_blk_status(ret);
if (status)
goto fail;
- } else if (use_append ||
+ } else if (bbio->can_use_append ||
(btrfs_is_zoned(fs_info) && inode &&
inode->flags & BTRFS_INODE_NODATASUM)) {
ret = btrfs_alloc_dummy_sum(bbio);
diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h
index 1be74209f0b8..246c7519dff3 100644
--- a/fs/btrfs/bio.h
+++ b/fs/btrfs/bio.h
@@ -92,6 +92,9 @@ struct btrfs_bio {
/* Whether the csum generation for data write is async. */
bool async_csum;
+ /* Whether the bio is written using zone append. */
+ bool can_use_append;
+
/*
* This member must come last, bio_alloc_bioset will allocate enough
* bytes for entire btrfs_bio but relies on bio being last.
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 08b14449fabe..c7be37bcbc48 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -3675,6 +3675,14 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans)
return ret;
}
+static void btrfs_maybe_reset_size_class(struct btrfs_block_group *bg)
+{
+ lockdep_assert_held(&bg->lock);
+ if (btrfs_block_group_should_use_size_class(bg) &&
+ bg->used == 0 && bg->reserved == 0)
+ bg->size_class = BTRFS_BG_SZ_NONE;
+}
+
int btrfs_update_block_group(struct btrfs_trans_handle *trans,
u64 bytenr, u64 num_bytes, bool alloc)
{
@@ -3739,6 +3747,7 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,
old_val -= num_bytes;
cache->used = old_val;
cache->pinned += num_bytes;
+ btrfs_maybe_reset_size_class(cache);
btrfs_space_info_update_bytes_pinned(space_info, num_bytes);
space_info->bytes_used -= num_bytes;
space_info->disk_used -= num_bytes * factor;
@@ -3867,6 +3876,7 @@ void btrfs_free_reserved_bytes(struct btrfs_block_group *cache, u64 num_bytes,
spin_lock(&cache->lock);
bg_ro = cache->ro;
cache->reserved -= num_bytes;
+ btrfs_maybe_reset_size_class(cache);
if (is_delalloc)
cache->delalloc_bytes -= num_bytes;
spin_unlock(&cache->lock);
diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 96cf7a162987..52fb7d942591 100644
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -276,10 +276,11 @@ u64 btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *target = NULL;
/*
- * If we are a delayed block reserve then push to the global rsv,
- * otherwise dump into the global delayed reserve if it is not full.
+ * If we are a delayed refs block reserve then push to the global
+ * reserve, otherwise dump into the global delayed refs reserve if it is
+ * not full.
*/
- if (block_rsv->type == BTRFS_BLOCK_RSV_DELOPS)
+ if (block_rsv->type == BTRFS_BLOCK_RSV_DELREFS)
target = global_rsv;
else if (block_rsv != global_rsv && !btrfs_block_rsv_full(delayed_rsv))
target = delayed_rsv;
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 206587820fec..bed9d1c11c67 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1137,11 +1137,14 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,
}
if (ret > 0) {
/*
- * Shouldn't happen, but in case it does we
- * don't need to do the btrfs_next_item, just
- * continue.
+ * Shouldn't happen because the key should still
+ * be there (return 0), but in case it does it
+ * means we have reached the end of the tree -
+ * there are no more leaves with items that have
+ * a key greater than or equals to @found_key,
+ * so just stop the search loop.
*/
- continue;
+ break;
}
}
ret = btrfs_next_item(tree_root, path);
@@ -1607,8 +1610,10 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
if (ret < 0 && ret != -ENOENT)
goto out;
ret2 = del_qgroup_relation_item(trans, dst, src);
- if (ret2 < 0 && ret2 != -ENOENT)
+ if (ret2 < 0 && ret2 != -ENOENT) {
+ ret = ret2;
goto out;
+ }
/* At least one deletion succeeded, return 0 */
if (!ret || !ret2)
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index bd03f465e2d3..d3e1ba257b9c 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -726,7 +726,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
h->type = type;
INIT_LIST_HEAD(&h->new_bgs);
- btrfs_init_metadata_block_rsv(fs_info, &h->delayed_rsv, BTRFS_BLOCK_RSV_DELOPS);
+ btrfs_init_metadata_block_rsv(fs_info, &h->delayed_rsv, BTRFS_BLOCK_RSV_DELREFS);
smp_mb();
if (cur_trans->state >= TRANS_STATE_COMMIT_START &&
@@ -2500,13 +2500,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
list_add_tail(&fs_info->chunk_root->dirty_list,
&cur_trans->switch_commits);
- if (btrfs_fs_incompat(fs_info, EXTENT_TREE_V2)) {
- btrfs_set_root_node(&fs_info->block_group_root->root_item,
- fs_info->block_group_root->node);
- list_add_tail(&fs_info->block_group_root->dirty_list,
- &cur_trans->switch_commits);
- }
-
switch_commit_roots(trans);
ASSERT(list_empty(&cur_trans->dirty_bgs));
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 8a08412f3529..99e167a697ba 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1505,30 +1505,158 @@ struct btrfs_device *btrfs_scan_one_device(const char *path,
}
/*
- * Try to find a chunk that intersects [start, start + len] range and when one
- * such is found, record the end of it in *start
+ * Find the first pending extent intersecting a range.
+ *
+ * @device: the device to search
+ * @start: start of the range to check
+ * @len: length of the range to check
+ * @pending_start: output pointer for the start of the found pending extent
+ * @pending_end: output pointer for the end of the found pending extent (inclusive)
+ *
+ * Search for a pending chunk allocation that intersects the half-open range
+ * [start, start + len).
+ *
+ * Return: true if a pending extent was found, false otherwise.
+ * If the return value is true, store the first pending extent in
+ * [*pending_start, *pending_end]. Otherwise, the two output variables
+ * may still be modified, to something outside the range and should not
+ * be used.
*/
-static bool contains_pending_extent(struct btrfs_device *device, u64 *start,
- u64 len)
+static bool first_pending_extent(struct btrfs_device *device, u64 start, u64 len,
+ u64 *pending_start, u64 *pending_end)
{
- u64 physical_start, physical_end;
-
lockdep_assert_held(&device->fs_info->chunk_mutex);
- if (btrfs_find_first_extent_bit(&device->alloc_state, *start,
- &physical_start, &physical_end,
+ if (btrfs_find_first_extent_bit(&device->alloc_state, start,
+ pending_start, pending_end,
CHUNK_ALLOCATED, NULL)) {
- if (in_range(physical_start, *start, len) ||
- in_range(*start, physical_start,
- physical_end + 1 - physical_start)) {
- *start = physical_end + 1;
+ if (in_range(*pending_start, start, len) ||
+ in_range(start, *pending_start, *pending_end + 1 - *pending_start)) {
return true;
}
}
return false;
}
+/*
+ * Find the first real hole accounting for pending extents.
+ *
+ * @device: the device containing the candidate hole
+ * @start: input/output pointer for the hole start position
+ * @len: input/output pointer for the hole length
+ * @min_hole_size: the size of hole we are looking for
+ *
+ * Given a potential hole specified by [*start, *start + *len), check for pending
+ * chunk allocations within that range. If pending extents are found, the hole is
+ * adjusted to represent the first true free space that is large enough when
+ * accounting for pending chunks.
+ *
+ * Note that this function must handle various cases involving non consecutive
+ * pending extents.
+ *
+ * Returns: true if a suitable hole was found and false otherwise.
+ * If the return value is true, then *start and *len are set to represent the hole.
+ * If the return value is false, then *start is set to the largest hole we
+ * found and *len is set to its length.
+ * If there are no holes at all, then *start is set to the end of the range and
+ * *len is set to 0.
+ */
+static bool find_hole_in_pending_extents(struct btrfs_device *device, u64 *start,
+ u64 *len, u64 min_hole_size)
+{
+ u64 pending_start, pending_end;
+ u64 end;
+ u64 max_hole_start = 0;
+ u64 max_hole_len = 0;
+
+ lockdep_assert_held(&device->fs_info->chunk_mutex);
+
+ if (*len == 0)
+ return false;
+
+ end = *start + *len - 1;
+
+ /*
+ * Loop until we either see a large enough hole or check every pending
+ * extent overlapping the candidate hole.
+ * At every hole that we observe, record it if it is the new max.
+ * At the end of the iteration, set the output variables to the max hole.
+ */
+ while (true) {
+ if (first_pending_extent(device, *start, *len, &pending_start, &pending_end)) {
+ /*
+ * Case 1: the pending extent overlaps the start of
+ * candidate hole. That means the true hole is after the
+ * pending extent, but we need to find the next pending
+ * extent to properly size the hole. In the next loop,
+ * we will reduce to case 2 or 3.
+ * e.g.,
+ *
+ * |----pending A----| real hole |----pending B----|
+ * | candidate hole |
+ * *start end
+ */
+ if (pending_start <= *start) {
+ *start = pending_end + 1;
+ goto next;
+ }
+ /*
+ * Case 2: The pending extent starts after *start (and overlaps
+ * [*start, end), so the first hole just goes up to the start
+ * of the pending extent.
+ * e.g.,
+ *
+ * | real hole |----pending A----|
+ * | candidate hole |
+ * *start end
+ */
+ *len = pending_start - *start;
+ if (*len > max_hole_len) {
+ max_hole_start = *start;
+ max_hole_len = *len;
+ }
+ if (*len >= min_hole_size)
+ break;
+ /*
+ * If the hole wasn't big enough, then we advance past
+ * the pending extent and keep looking.
+ */
+ *start = pending_end + 1;
+ goto next;
+ } else {
+ /*
+ * Case 3: There is no pending extent overlapping the
+ * range [*start, *start + *len - 1], so the only remaining
+ * hole is the remaining range.
+ * e.g.,
+ *
+ * | candidate hole |
+ * | real hole |
+ * *start end
+ */
+
+ if (*len > max_hole_len) {
+ max_hole_start = *start;
+ max_hole_len = *len;
+ }
+ break;
+ }
+next:
+ if (*start > end)
+ break;
+ *len = end - *start + 1;
+ }
+ if (max_hole_len) {
+ *start = max_hole_start;
+ *len = max_hole_len;
+ } else {
+ *start = end + 1;
+ *len = 0;
+ }
+ return max_hole_len >= min_hole_size;
+}
+
static u64 dev_extent_search_start(struct btrfs_device *device)
{
switch (device->fs_devices->chunk_alloc_policy) {
@@ -1593,59 +1721,57 @@ static bool dev_extent_hole_check_zoned(struct btrfs_device *device,
}
/*
- * Check if specified hole is suitable for allocation.
+ * Validate and adjust a hole for chunk allocation
+ *
+ * @device: the device containing the candidate hole
+ * @hole_start: input/output pointer for the hole start position
+ * @hole_size: input/output pointer for the hole size
+ * @num_bytes: minimum allocation size required
*
- * @device: the device which we have the hole
- * @hole_start: starting position of the hole
- * @hole_size: the size of the hole
- * @num_bytes: the size of the free space that we need
+ * Check if the specified hole is suitable for allocation and adjust it if
+ * necessary. The hole may be modified to skip over pending chunk allocations
+ * and to satisfy stricter zoned requirements on zoned filesystems.
*
- * This function may modify @hole_start and @hole_size to reflect the suitable
- * position for allocation. Returns 1 if hole position is updated, 0 otherwise.
+ * For regular (non-zoned) allocation, if the hole after adjustment is smaller
+ * than @num_bytes, the search continues past additional pending extents until
+ * either a sufficiently large hole is found or no more pending extents exist.
+ *
+ * Return: true if a suitable hole was found and false otherwise.
+ * If the return value is true, then *hole_start and *hole_size are set to
+ * represent the hole we found.
+ * If the return value is false, then *hole_start is set to the largest
+ * hole we found and *hole_size is set to its length.
+ * If there are no holes at all, then *hole_start is set to the end of the range
+ * and *hole_size is set to 0.
*/
static bool dev_extent_hole_check(struct btrfs_device *device, u64 *hole_start,
u64 *hole_size, u64 num_bytes)
{
- bool changed = false;
- u64 hole_end = *hole_start + *hole_size;
+ bool found = false;
+ const u64 hole_end = *hole_start + *hole_size - 1;
- for (;;) {
- /*
- * Check before we set max_hole_start, otherwise we could end up
- * sending back this offset anyway.
- */
- if (contains_pending_extent(device, hole_start, *hole_size)) {
- if (hole_end >= *hole_start)
- *hole_size = hole_end - *hole_start;
- else
- *hole_size = 0;
- changed = true;
- }
+ ASSERT(*hole_size > 0);
- switch (device->fs_devices->chunk_alloc_policy) {
- default:
- btrfs_warn_unknown_chunk_allocation(device->fs_devices->chunk_alloc_policy);
- fallthrough;
- case BTRFS_CHUNK_ALLOC_REGULAR:
- /* No extra check */
- break;
- case BTRFS_CHUNK_ALLOC_ZONED:
- if (dev_extent_hole_check_zoned(device, hole_start,
- hole_size, num_bytes)) {
- changed = true;
- /*
- * The changed hole can contain pending extent.
- * Loop again to check that.
- */
- continue;
- }
- break;
- }
+again:
+ *hole_size = hole_end - *hole_start + 1;
+ found = find_hole_in_pending_extents(device, hole_start, hole_size, num_bytes);
+ if (!found)
+ return found;
+ ASSERT(*hole_size >= num_bytes);
+ switch (device->fs_devices->chunk_alloc_policy) {
+ default:
+ btrfs_warn_unknown_chunk_allocation(device->fs_devices->chunk_alloc_policy);
+ fallthrough;
+ case BTRFS_CHUNK_ALLOC_REGULAR:
+ return found;
+ case BTRFS_CHUNK_ALLOC_ZONED:
+ if (dev_extent_hole_check_zoned(device, hole_start, hole_size, num_bytes))
+ goto again;
break;
}
- return changed;
+ return found;
}
/*
@@ -1704,7 +1830,7 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
ret = -ENOMEM;
goto out;
}
-again:
+
if (search_start >= search_end ||
test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {
ret = -ENOSPC;
@@ -1791,11 +1917,7 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
*/
if (search_end > search_start) {
hole_size = search_end - search_start;
- if (dev_extent_hole_check(device, &search_start, &hole_size,
- num_bytes)) {
- btrfs_release_path(path);
- goto again;
- }
+ dev_extent_hole_check(device, &search_start, &hole_size, num_bytes);
if (hole_size > max_hole_size) {
max_hole_start = search_start;
@@ -4844,6 +4966,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
u64 diff;
u64 start;
u64 free_diff = 0;
+ u64 pending_start, pending_end;
new_size = round_down(new_size, fs_info->sectorsize);
start = new_size;
@@ -4889,7 +5012,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
* in-memory chunks are synced to disk so that the loop below sees them
* and relocates them accordingly.
*/
- if (contains_pending_extent(device, &start, diff)) {
+ if (first_pending_extent(device, start, diff, &pending_start, &pending_end)) {
mutex_unlock(&fs_info->chunk_mutex);
ret = btrfs_commit_transaction(trans);
if (ret)
diff --git a/fs/erofs/fileio.c b/fs/erofs/fileio.c
index 1673c5416fba..2a778a02681a 100644
--- a/fs/erofs/fileio.c
+++ b/fs/erofs/fileio.c
@@ -25,21 +25,17 @@ static void erofs_fileio_ki_complete(struct kiocb *iocb, long ret)
container_of(iocb, struct erofs_fileio_rq, iocb);
struct folio_iter fi;
- if (ret > 0) {
- if (ret != rq->bio.bi_iter.bi_size) {
- bio_advance(&rq->bio, ret);
- zero_fill_bio(&rq->bio);
- }
- ret = 0;
+ if (ret >= 0 && ret != rq->bio.bi_iter.bi_size) {
+ bio_advance(&rq->bio, ret);
+ zero_fill_bio(&rq->bio);
}
- if (rq->bio.bi_end_io) {
- if (ret < 0 && !rq->bio.bi_status)
- rq->bio.bi_status = errno_to_blk_status(ret);
- } else {
+ if (!rq->bio.bi_end_io) {
bio_for_each_folio_all(fi, &rq->bio) {
DBG_BUGON(folio_test_uptodate(fi.folio));
- erofs_onlinefolio_end(fi.folio, ret, false);
+ erofs_onlinefolio_end(fi.folio, ret < 0, false);
}
+ } else if (ret < 0 && !rq->bio.bi_status) {
+ rq->bio.bi_status = errno_to_blk_status(ret);
}
bio_endio(&rq->bio);
bio_uninit(&rq->bio);
@@ -50,7 +46,7 @@ static void erofs_fileio_ki_complete(struct kiocb *iocb, long ret)
static void erofs_fileio_rq_submit(struct erofs_fileio_rq *rq)
{
struct iov_iter iter;
- int ret;
+ ssize_t ret;
if (!rq)
return;
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 3d31f7840ca0..b71fcf4be484 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -805,14 +805,26 @@ static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe)
struct erofs_map_blocks *map = &fe->map;
struct super_block *sb = fe->inode->i_sb;
struct z_erofs_pcluster *pcl = NULL;
- void *ptr;
+ void *ptr = NULL;
int ret;
DBG_BUGON(fe->pcl);
/* must be Z_EROFS_PCLUSTER_TAIL or pointed to previous pcluster */
DBG_BUGON(!fe->head);
- if (!(map->m_flags & EROFS_MAP_META)) {
+ if (map->m_flags & EROFS_MAP_META) {
+ ret = erofs_init_metabuf(&map->buf, sb,
+ erofs_inode_in_metabox(fe->inode));
+ if (ret)
+ return ret;
+ ptr = erofs_bread(&map->buf, map->m_pa, false);
+ if (IS_ERR(ptr)) {
+ erofs_err(sb, "failed to read inline data %pe @ pa %llu of nid %llu",
+ ptr, map->m_pa, EROFS_I(fe->inode)->nid);
+ return PTR_ERR(ptr);
+ }
+ ptr = map->buf.page;
+ } else {
while (1) {
rcu_read_lock();
pcl = xa_load(&EROFS_SB(sb)->managed_pslots, map->m_pa);
@@ -852,18 +864,8 @@ static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe)
/* bind cache first when cached decompression is preferred */
z_erofs_bind_cache(fe);
} else {
- ret = erofs_init_metabuf(&map->buf, sb,
- erofs_inode_in_metabox(fe->inode));
- if (ret)
- return ret;
- ptr = erofs_bread(&map->buf, map->m_pa, false);
- if (IS_ERR(ptr)) {
- ret = PTR_ERR(ptr);
- erofs_err(sb, "failed to get inline folio %d", ret);
- return ret;
- }
- folio_get(page_folio(map->buf.page));
- WRITE_ONCE(fe->pcl->compressed_bvecs[0].page, map->buf.page);
+ folio_get(page_folio((struct page *)ptr));
+ WRITE_ONCE(fe->pcl->compressed_bvecs[0].page, ptr);
fe->pcl->pageofs_in = map->m_pa & ~PAGE_MASK;
fe->mode = Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE;
}
@@ -1324,9 +1326,10 @@ static int z_erofs_decompress_pcluster(struct z_erofs_backend *be, bool eio)
GFP_NOWAIT | __GFP_NORETRY
}, be->pagepool);
if (IS_ERR(reason)) {
- erofs_err(be->sb, "failed to decompress (%s) %ld @ pa %llu size %u => %u",
- alg->name, PTR_ERR(reason), pcl->pos,
- pcl->pclustersize, pcl->length);
+ if (pcl->besteffort || reason != ERR_PTR(-ENOMEM))
+ erofs_err(be->sb, "failed to decompress (%s) %pe @ pa %llu size %u => %u",
+ alg->name, reason, pcl->pos,
+ pcl->pclustersize, pcl->length);
err = PTR_ERR(reason);
} else if (unlikely(reason)) {
erofs_err(be->sb, "failed to decompress (%s) %s @ pa %llu size %u => %u",
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 56112f201cac..1524276aeac7 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1795,6 +1795,10 @@ struct ext4_sb_info {
* Main fast commit lock. This lock protects accesses to the
* following fields:
* ei->i_fc_list, s_fc_dentry_q, s_fc_q, s_fc_bytes, s_fc_bh.
+ *
+ * s_fc_lock can be taken from reclaim context (inode eviction) and is
+ * thus reclaim unsafe. Use ext4_fc_lock()/ext4_fc_unlock() helpers
+ * when acquiring / releasing the lock.
*/
struct mutex s_fc_lock;
struct buffer_head *s_fc_bh;
@@ -1839,6 +1843,18 @@ static inline void ext4_writepages_up_write(struct super_block *sb, int ctx)
percpu_up_write(&EXT4_SB(sb)->s_writepages_rwsem);
}
+static inline int ext4_fc_lock(struct super_block *sb)
+{
+ mutex_lock(&EXT4_SB(sb)->s_fc_lock);
+ return memalloc_nofs_save();
+}
+
+static inline void ext4_fc_unlock(struct super_block *sb, int ctx)
+{
+ memalloc_nofs_restore(ctx);
+ mutex_unlock(&EXT4_SB(sb)->s_fc_lock);
+}
+
static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
{
return ino == EXT4_ROOT_INO ||
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 2cf5759ba689..18b39eed7526 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -43,8 +43,13 @@
#define EXT4_EXT_MARK_UNWRIT1 0x2 /* mark first half unwritten */
#define EXT4_EXT_MARK_UNWRIT2 0x4 /* mark second half unwritten */
-#define EXT4_EXT_DATA_VALID1 0x8 /* first half contains valid data */
-#define EXT4_EXT_DATA_VALID2 0x10 /* second half contains valid data */
+/* first half contains valid data */
+#define EXT4_EXT_DATA_ENTIRE_VALID1 0x8 /* has entirely valid data */
+#define EXT4_EXT_DATA_PARTIAL_VALID1 0x10 /* has partially valid data */
+#define EXT4_EXT_DATA_VALID1 (EXT4_EXT_DATA_ENTIRE_VALID1 | \
+ EXT4_EXT_DATA_PARTIAL_VALID1)
+
+#define EXT4_EXT_DATA_VALID2 0x20 /* second half contains valid data */
static __le32 ext4_extent_block_csum(struct inode *inode,
struct ext4_extent_header *eh)
@@ -3190,8 +3195,12 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
unsigned int ee_len, depth;
int err = 0;
- BUG_ON((split_flag & (EXT4_EXT_DATA_VALID1 | EXT4_EXT_DATA_VALID2)) ==
- (EXT4_EXT_DATA_VALID1 | EXT4_EXT_DATA_VALID2));
+ BUG_ON((split_flag & EXT4_EXT_DATA_VALID1) == EXT4_EXT_DATA_VALID1);
+ BUG_ON((split_flag & EXT4_EXT_DATA_VALID1) &&
+ (split_flag & EXT4_EXT_DATA_VALID2));
+
+ /* Do not cache extents that are in the process of being modified. */
+ flags |= EXT4_EX_NOCACHE;
ext_debug(inode, "logical block %llu\n", (unsigned long long)split);
@@ -3258,7 +3267,7 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
err = PTR_ERR(path);
if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
- return path;
+ goto out_path;
/*
* Get a new path to try to zeroout or fix the extent length.
@@ -3272,7 +3281,7 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
if (IS_ERR(path)) {
EXT4_ERROR_INODE(inode, "Failed split extent on %u, err %ld",
split, PTR_ERR(path));
- return path;
+ goto out_path;
}
depth = ext_depth(inode);
ex = path[depth].p_ext;
@@ -3304,6 +3313,23 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
}
if (!err) {
+ /*
+ * The first half contains partially valid data, the
+ * splitting of this extent has not been completed, fix
+ * extent length and ext4_split_extent() split will the
+ * first half again.
+ */
+ if (split_flag & EXT4_EXT_DATA_PARTIAL_VALID1) {
+ /*
+ * Drop extent cache to prevent stale unwritten
+ * extents remaining after zeroing out.
+ */
+ ext4_es_remove_extent(inode,
+ le32_to_cpu(zero_ex.ee_block),
+ ext4_ext_get_actual_len(&zero_ex));
+ goto fix_extent_len;
+ }
+
/* update the extent length and mark as initialized */
ex->ee_len = cpu_to_le16(ee_len);
ext4_ext_try_to_merge(handle, inode, path, ex);
@@ -3332,6 +3358,10 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
ext4_free_ext_path(path);
path = ERR_PTR(err);
}
+out_path:
+ if (IS_ERR(path))
+ /* Remove all remaining potentially stale extents. */
+ ext4_es_remove_extent(inode, ee_block, ee_len);
ext4_ext_show_leaf(inode, path);
return path;
}
@@ -3366,6 +3396,9 @@ static struct ext4_ext_path *ext4_split_extent(handle_t *handle,
ee_len = ext4_ext_get_actual_len(ex);
unwritten = ext4_ext_is_unwritten(ex);
+ /* Do not cache extents that are in the process of being modified. */
+ flags |= EXT4_EX_NOCACHE;
+
if (map->m_lblk + map->m_len < ee_block + ee_len) {
split_flag1 = split_flag & EXT4_EXT_MAY_ZEROOUT;
flags1 = flags | EXT4_GET_BLOCKS_SPLIT_NOMERGE;
@@ -3373,7 +3406,9 @@ static struct ext4_ext_path *ext4_split_extent(handle_t *handle,
split_flag1 |= EXT4_EXT_MARK_UNWRIT1 |
EXT4_EXT_MARK_UNWRIT2;
if (split_flag & EXT4_EXT_DATA_VALID2)
- split_flag1 |= EXT4_EXT_DATA_VALID1;
+ split_flag1 |= map->m_lblk > ee_block ?
+ EXT4_EXT_DATA_PARTIAL_VALID1 :
+ EXT4_EXT_DATA_ENTIRE_VALID1;
path = ext4_split_extent_at(handle, inode, path,
map->m_lblk + map->m_len, split_flag1, flags1);
if (IS_ERR(path))
@@ -3728,16 +3763,20 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle,
/* Convert to unwritten */
if (flags & EXT4_GET_BLOCKS_CONVERT_UNWRITTEN) {
- split_flag |= EXT4_EXT_DATA_VALID1;
- /* Convert to initialized */
- } else if (flags & EXT4_GET_BLOCKS_CONVERT) {
+ split_flag |= EXT4_EXT_DATA_ENTIRE_VALID1;
+ /* Split the existing unwritten extent */
+ } else if (flags & (EXT4_GET_BLOCKS_UNWRIT_EXT |
+ EXT4_GET_BLOCKS_CONVERT)) {
/*
* It is safe to convert extent to initialized via explicit
* zeroout only if extent is fully inside i_size or new_size.
*/
split_flag |= ee_block + ee_len <= eof_block ?
EXT4_EXT_MAY_ZEROOUT : 0;
- split_flag |= (EXT4_EXT_MARK_UNWRIT2 | EXT4_EXT_DATA_VALID2);
+ split_flag |= EXT4_EXT_MARK_UNWRIT2;
+ /* Convert to initialized */
+ if (flags & EXT4_GET_BLOCKS_CONVERT)
+ split_flag |= EXT4_EXT_DATA_VALID2;
}
flags |= EXT4_GET_BLOCKS_SPLIT_NOMERGE;
return ext4_split_extent(handle, inode, path, map, split_flag, flags,
@@ -3913,7 +3952,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
/* get_block() before submitting IO, split the extent */
if (flags & EXT4_GET_BLOCKS_SPLIT_NOMERGE) {
path = ext4_split_convert_extents(handle, inode, map, path,
- flags | EXT4_GET_BLOCKS_CONVERT, allocated);
+ flags, allocated);
if (IS_ERR(path))
return path;
/*
@@ -5375,7 +5414,8 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
if (!extent) {
EXT4_ERROR_INODE(inode, "unexpected hole at %lu",
(unsigned long) *iterator);
- return -EFSCORRUPTED;
+ ret = -EFSCORRUPTED;
+ goto out;
}
if (SHIFT == SHIFT_LEFT && *iterator >
le32_to_cpu(extent->ee_block)) {
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index fa66b08de999..5bd57d7f921b 100644
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -231,16 +231,16 @@ static bool ext4_fc_disabled(struct super_block *sb)
void ext4_fc_del(struct inode *inode)
{
struct ext4_inode_info *ei = EXT4_I(inode);
- struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
struct ext4_fc_dentry_update *fc_dentry;
wait_queue_head_t *wq;
+ int alloc_ctx;
if (ext4_fc_disabled(inode->i_sb))
return;
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(inode->i_sb);
if (list_empty(&ei->i_fc_list) && list_empty(&ei->i_fc_dilist)) {
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(inode->i_sb, alloc_ctx);
return;
}
@@ -275,9 +275,9 @@ void ext4_fc_del(struct inode *inode)
#endif
prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);
if (ext4_test_inode_state(inode, EXT4_STATE_FC_FLUSHING_DATA)) {
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(inode->i_sb, alloc_ctx);
schedule();
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(inode->i_sb);
}
finish_wait(wq, &wait.wq_entry);
}
@@ -288,7 +288,7 @@ void ext4_fc_del(struct inode *inode)
* dentry create references, since it is not needed to log it anyways.
*/
if (list_empty(&ei->i_fc_dilist)) {
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(inode->i_sb, alloc_ctx);
return;
}
@@ -298,7 +298,7 @@ void ext4_fc_del(struct inode *inode)
list_del_init(&fc_dentry->fcd_dilist);
WARN_ON(!list_empty(&ei->i_fc_dilist));
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(inode->i_sb, alloc_ctx);
release_dentry_name_snapshot(&fc_dentry->fcd_name);
kmem_cache_free(ext4_fc_dentry_cachep, fc_dentry);
@@ -315,6 +315,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
tid_t tid;
bool has_transaction = true;
bool is_ineligible;
+ int alloc_ctx;
if (ext4_fc_disabled(sb))
return;
@@ -329,12 +330,12 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
has_transaction = false;
read_unlock(&sbi->s_journal->j_state_lock);
}
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
if (has_transaction && (!is_ineligible || tid_gt(tid, sbi->s_fc_ineligible_tid)))
sbi->s_fc_ineligible_tid = tid;
ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
WARN_ON(reason >= EXT4_FC_REASON_MAX);
sbi->s_fc_stats.fc_ineligible_reason_count[reason]++;
}
@@ -358,6 +359,7 @@ static int ext4_fc_track_template(
struct ext4_inode_info *ei = EXT4_I(inode);
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
tid_t tid = 0;
+ int alloc_ctx;
int ret;
tid = handle->h_transaction->t_tid;
@@ -373,14 +375,14 @@ static int ext4_fc_track_template(
if (!enqueue)
return ret;
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(inode->i_sb);
if (list_empty(&EXT4_I(inode)->i_fc_list))
list_add_tail(&EXT4_I(inode)->i_fc_list,
(sbi->s_journal->j_flags & JBD2_FULL_COMMIT_ONGOING ||
sbi->s_journal->j_flags & JBD2_FAST_COMMIT_ONGOING) ?
&sbi->s_fc_q[FC_Q_STAGING] :
&sbi->s_fc_q[FC_Q_MAIN]);
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(inode->i_sb, alloc_ctx);
return ret;
}
@@ -402,6 +404,7 @@ static int __track_dentry_update(handle_t *handle, struct inode *inode,
struct inode *dir = dentry->d_parent->d_inode;
struct super_block *sb = inode->i_sb;
struct ext4_sb_info *sbi = EXT4_SB(sb);
+ int alloc_ctx;
spin_unlock(&ei->i_fc_lock);
@@ -425,7 +428,7 @@ static int __track_dentry_update(handle_t *handle, struct inode *inode,
take_dentry_name_snapshot(&node->fcd_name, dentry);
INIT_LIST_HEAD(&node->fcd_dilist);
INIT_LIST_HEAD(&node->fcd_list);
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
if (sbi->s_journal->j_flags & JBD2_FULL_COMMIT_ONGOING ||
sbi->s_journal->j_flags & JBD2_FAST_COMMIT_ONGOING)
list_add_tail(&node->fcd_list,
@@ -446,7 +449,7 @@ static int __track_dentry_update(handle_t *handle, struct inode *inode,
WARN_ON(!list_empty(&ei->i_fc_dilist));
list_add_tail(&node->fcd_dilist, &ei->i_fc_dilist);
}
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
spin_lock(&ei->i_fc_lock);
return 0;
@@ -1046,18 +1049,19 @@ static int ext4_fc_perform_commit(journal_t *journal)
struct blk_plug plug;
int ret = 0;
u32 crc = 0;
+ int alloc_ctx;
/*
* Step 1: Mark all inodes on s_fc_q[MAIN] with
* EXT4_STATE_FC_FLUSHING_DATA. This prevents these inodes from being
* freed until the data flush is over.
*/
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
list_for_each_entry(iter, &sbi->s_fc_q[FC_Q_MAIN], i_fc_list) {
ext4_set_inode_state(&iter->vfs_inode,
EXT4_STATE_FC_FLUSHING_DATA);
}
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
/* Step 2: Flush data for all the eligible inodes. */
ret = ext4_fc_flush_data(journal);
@@ -1067,7 +1071,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
* any error from step 2. This ensures that waiters waiting on
* EXT4_STATE_FC_FLUSHING_DATA can resume.
*/
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
list_for_each_entry(iter, &sbi->s_fc_q[FC_Q_MAIN], i_fc_list) {
ext4_clear_inode_state(&iter->vfs_inode,
EXT4_STATE_FC_FLUSHING_DATA);
@@ -1084,7 +1088,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
* prepare_to_wait() in ext4_fc_del().
*/
smp_mb();
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
/*
* If we encountered error in Step 2, return it now after clearing
@@ -1101,12 +1105,12 @@ static int ext4_fc_perform_commit(journal_t *journal)
* previous handles are now drained. We now mark the inodes on the
* commit queue as being committed.
*/
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
list_for_each_entry(iter, &sbi->s_fc_q[FC_Q_MAIN], i_fc_list) {
ext4_set_inode_state(&iter->vfs_inode,
EXT4_STATE_FC_COMMITTING);
}
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
jbd2_journal_unlock_updates(journal);
/*
@@ -1117,6 +1121,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
blkdev_issue_flush(journal->j_fs_dev);
blk_start_plug(&plug);
+ alloc_ctx = ext4_fc_lock(sb);
/* Step 6: Write fast commit blocks to disk. */
if (sbi->s_fc_bytes == 0) {
/*
@@ -1134,7 +1139,6 @@ static int ext4_fc_perform_commit(journal_t *journal)
}
/* Step 6.2: Now write all the dentry updates. */
- mutex_lock(&sbi->s_fc_lock);
ret = ext4_fc_commit_dentry_updates(journal, &crc);
if (ret)
goto out;
@@ -1156,7 +1160,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
ret = ext4_fc_write_tail(sb, crc);
out:
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
blk_finish_plug(&plug);
return ret;
}
@@ -1290,6 +1294,7 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)
struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_inode_info *ei;
struct ext4_fc_dentry_update *fc_dentry;
+ int alloc_ctx;
if (full && sbi->s_fc_bh)
sbi->s_fc_bh = NULL;
@@ -1297,7 +1302,7 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)
trace_ext4_fc_cleanup(journal, full, tid);
jbd2_fc_release_bufs(journal);
- mutex_lock(&sbi->s_fc_lock);
+ alloc_ctx = ext4_fc_lock(sb);
while (!list_empty(&sbi->s_fc_q[FC_Q_MAIN])) {
ei = list_first_entry(&sbi->s_fc_q[FC_Q_MAIN],
struct ext4_inode_info,
@@ -1356,7 +1361,7 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)
if (full)
sbi->s_fc_bytes = 0;
- mutex_unlock(&sbi->s_fc_lock);
+ ext4_fc_unlock(sb, alloc_ctx);
trace_ext4_fc_stats(sb);
}
diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c
index a9416b20ff64..4abb40d4561c 100644
--- a/fs/ext4/mballoc-test.c
+++ b/fs/ext4/mballoc-test.c
@@ -567,7 +567,7 @@ test_mark_diskspace_used_range(struct kunit *test,
bitmap = mbt_ctx_bitmap(sb, TEST_GOAL_GROUP);
memset(bitmap, 0, sb->s_blocksize);
- ret = ext4_mb_mark_diskspace_used(ac, NULL, 0);
+ ret = ext4_mb_mark_diskspace_used(ac, NULL);
KUNIT_ASSERT_EQ(test, ret, 0);
max = EXT4_CLUSTERS_PER_GROUP(sb);
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 56d50fd3310b..dbc82b65f810 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -892,6 +892,21 @@ mb_update_avg_fragment_size(struct super_block *sb, struct ext4_group_info *grp)
}
}
+static ext4_group_t ext4_get_allocation_groups_count(
+ struct ext4_allocation_context *ac)
+{
+ ext4_group_t ngroups = ext4_get_groups_count(ac->ac_sb);
+
+ /* non-extent files are limited to low blocks/groups */
+ if (!(ext4_test_inode_flag(ac->ac_inode, EXT4_INODE_EXTENTS)))
+ ngroups = EXT4_SB(ac->ac_sb)->s_blockfile_groups;
+
+ /* Pairs with smp_wmb() in ext4_update_super() */
+ smp_rmb();
+
+ return ngroups;
+}
+
static int ext4_mb_scan_groups_xa_range(struct ext4_allocation_context *ac,
struct xarray *xa,
ext4_group_t start, ext4_group_t end)
@@ -899,7 +914,7 @@ static int ext4_mb_scan_groups_xa_range(struct ext4_allocation_context *ac,
struct super_block *sb = ac->ac_sb;
struct ext4_sb_info *sbi = EXT4_SB(sb);
enum criteria cr = ac->ac_criteria;
- ext4_group_t ngroups = ext4_get_groups_count(sb);
+ ext4_group_t ngroups = ext4_get_allocation_groups_count(ac);
unsigned long group = start;
struct ext4_group_info *grp;
@@ -951,7 +966,7 @@ static int ext4_mb_scan_groups_p2_aligned(struct ext4_allocation_context *ac,
ext4_group_t start, end;
start = group;
- end = ext4_get_groups_count(ac->ac_sb);
+ end = ext4_get_allocation_groups_count(ac);
wrap_around:
for (i = ac->ac_2order; i < MB_NUM_ORDERS(ac->ac_sb); i++) {
ret = ext4_mb_scan_groups_largest_free_order_range(ac, i,
@@ -1001,7 +1016,7 @@ static int ext4_mb_scan_groups_goal_fast(struct ext4_allocation_context *ac,
ext4_group_t start, end;
start = group;
- end = ext4_get_groups_count(ac->ac_sb);
+ end = ext4_get_allocation_groups_count(ac);
wrap_around:
i = mb_avg_fragment_size_order(ac->ac_sb, ac->ac_g_ex.fe_len);
for (; i < MB_NUM_ORDERS(ac->ac_sb); i++) {
@@ -1083,7 +1098,7 @@ static int ext4_mb_scan_groups_best_avail(struct ext4_allocation_context *ac,
min_order = fls(ac->ac_o_ex.fe_len);
start = group;
- end = ext4_get_groups_count(ac->ac_sb);
+ end = ext4_get_allocation_groups_count(ac);
wrap_around:
for (i = order; i >= min_order; i--) {
int frag_order;
@@ -1133,8 +1148,6 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac)
return 0;
if (ac->ac_criteria >= CR_GOAL_LEN_SLOW)
return 0;
- if (!ext4_test_inode_flag(ac->ac_inode, EXT4_INODE_EXTENTS))
- return 0;
return 1;
}
@@ -1182,11 +1195,7 @@ static int ext4_mb_scan_groups(struct ext4_allocation_context *ac)
int ret = 0;
ext4_group_t start;
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
- ext4_group_t ngroups = ext4_get_groups_count(ac->ac_sb);
-
- /* non-extent files are limited to low blocks/groups */
- if (!(ext4_test_inode_flag(ac->ac_inode, EXT4_INODE_EXTENTS)))
- ngroups = sbi->s_blockfile_groups;
+ ext4_group_t ngroups = ext4_get_allocation_groups_count(ac);
/* searching for the right group start from the goal value specified */
start = ac->ac_g_ex.fe_group;
@@ -1706,16 +1715,17 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,
/* Avoid locking the folio in the fast path ... */
folio = __filemap_get_folio(inode->i_mapping, pnum, FGP_ACCESSED, 0);
- if (IS_ERR(folio) || !folio_test_uptodate(folio)) {
+ if (IS_ERR(folio) || !folio_test_uptodate(folio) || folio_test_locked(folio)) {
+ /*
+ * folio_test_locked is employed to detect ongoing folio
+ * migrations, since concurrent migrations can lead to
+ * bitmap inconsistency. And if we are not uptodate that
+ * implies somebody just created the folio but is yet to
+ * initialize it. We can drop the folio reference and
+ * try to get the folio with lock in both cases to avoid
+ * concurrency.
+ */
if (!IS_ERR(folio))
- /*
- * drop the folio reference and try
- * to get the folio with lock. If we
- * are not uptodate that implies
- * somebody just created the folio but
- * is yet to initialize it. So
- * wait for it to initialize.
- */
folio_put(folio);
folio = __filemap_get_folio(inode->i_mapping, pnum,
FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);
@@ -1764,7 +1774,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,
/* we need another folio for the buddy */
folio = __filemap_get_folio(inode->i_mapping, pnum, FGP_ACCESSED, 0);
- if (IS_ERR(folio) || !folio_test_uptodate(folio)) {
+ if (IS_ERR(folio) || !folio_test_uptodate(folio) || folio_test_locked(folio)) {
if (!IS_ERR(folio))
folio_put(folio);
folio = __filemap_get_folio(inode->i_mapping, pnum,
@@ -4185,8 +4195,7 @@ ext4_mb_mark_context(handle_t *handle, struct super_block *sb, bool state,
* Returns 0 if success or error code
*/
static noinline_for_stack int
-ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
- handle_t *handle, unsigned int reserv_clstrs)
+ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, handle_t *handle)
{
struct ext4_group_desc *gdp;
struct ext4_sb_info *sbi;
@@ -4241,13 +4250,6 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
BUG_ON(changed != ac->ac_b_ex.fe_len);
#endif
percpu_counter_sub(&sbi->s_freeclusters_counter, ac->ac_b_ex.fe_len);
- /*
- * Now reduce the dirty block count also. Should not go negative
- */
- if (!(ac->ac_flags & EXT4_MB_DELALLOC_RESERVED))
- /* release all the reserved blocks if non delalloc */
- percpu_counter_sub(&sbi->s_dirtyclusters_counter,
- reserv_clstrs);
return err;
}
@@ -6332,7 +6334,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
ext4_mb_pa_put_free(ac);
}
if (likely(ac->ac_status == AC_STATUS_FOUND)) {
- *errp = ext4_mb_mark_diskspace_used(ac, handle, reserv_clstrs);
+ *errp = ext4_mb_mark_diskspace_used(ac, handle);
if (*errp) {
ext4_discard_allocated_blocks(ac);
goto errout;
@@ -6363,12 +6365,9 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
out:
if (inquota && ar->len < inquota)
dquot_free_block(ar->inode, EXT4_C2B(sbi, inquota - ar->len));
- if (!ar->len) {
- if ((ar->flags & EXT4_MB_DELALLOC_RESERVED) == 0)
- /* release all the reserved blocks if non delalloc */
- percpu_counter_sub(&sbi->s_dirtyclusters_counter,
- reserv_clstrs);
- }
+ /* release any reserved blocks */
+ if (reserv_clstrs)
+ percpu_counter_sub(&sbi->s_dirtyclusters_counter, reserv_clstrs);
trace_ext4_allocate_blocks(ar, (unsigned long long)block);
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index 0b920ee40a7f..262ec1b790b5 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -325,7 +325,12 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
err = fat_remove_entries(dir, &sinfo); /* and releases bh */
if (err)
goto out;
- drop_nlink(dir);
+ if (dir->i_nlink >= 3)
+ drop_nlink(dir);
+ else {
+ fat_fs_error(sb, "parent dir link count too low (%u)",
+ dir->i_nlink);
+ }
clear_nlink(inode);
fat_truncate_time(inode, NULL, S_CTIME);
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 5dbc4cbb8fce..47ff083cfc7e 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -803,7 +803,12 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
err = fat_remove_entries(dir, &sinfo); /* and releases bh */
if (err)
goto out;
- drop_nlink(dir);
+ if (dir->i_nlink >= 3)
+ drop_nlink(dir);
+ else {
+ fat_fs_error(sb, "parent dir link count too low (%u)",
+ dir->i_nlink);
+ }
clear_nlink(inode);
fat_truncate_time(inode, NULL, S_ATIME|S_MTIME);
diff --git a/fs/file_table.c b/fs/file_table.c
index cd4a3db4659a..34244fccf2ed 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -176,6 +176,11 @@ static int init_file(struct file *f, int flags, const struct cred *cred)
f->f_flags = flags;
f->f_mode = OPEN_FMODE(flags);
+ /*
+ * Disable permission and pre-content events for all files by default.
+ * They may be enabled later by fsnotify_open_perm_and_set_mode().
+ */
+ file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);
f->f_op = NULL;
f->f_mapping = NULL;
@@ -197,11 +202,6 @@ static int init_file(struct file *f, int flags, const struct cred *cred)
* refcount bumps we should reinitialize the reused file first.
*/
file_ref_init(&f->f_ref, 1);
- /*
- * Disable permission and pre-content events for all files by default.
- * They may be enabled later by fsnotify_open_perm_and_set_mode().
- */
- file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);
return 0;
}
diff --git a/fs/fs_struct.c b/fs/fs_struct.c
index b8c46c5a38a0..394875d06fd6 100644
--- a/fs/fs_struct.c
+++ b/fs/fs_struct.c
@@ -6,6 +6,7 @@
#include <linux/path.h>
#include <linux/slab.h>
#include <linux/fs_struct.h>
+#include <linux/init_task.h>
#include "internal.h"
/*
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 131091520de6..fdcac8e3f2ba 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1127,10 +1127,18 @@ static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
goto out_unlock;
break;
default:
- goto out_unlock;
+ goto out;
}
ret = gfs2_iomap_begin_write(inode, pos, length, flags, iomap, &mp);
+ if (ret)
+ goto out_unlock;
+
+out:
+ if (iomap->type == IOMAP_INLINE) {
+ iomap->private = metapath_dibh(&mp);
+ get_bh(iomap->private);
+ }
out_unlock:
release_metapath(&mp);
@@ -1144,6 +1152,9 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length,
struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_sbd *sdp = GFS2_SB(inode);
+ if (iomap->private)
+ brelse(iomap->private);
+
switch (flags & (IOMAP_WRITE | IOMAP_ZERO)) {
case IOMAP_WRITE:
if (flags & IOMAP_DIRECT)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 92e029104d8a..289851d70130 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1284,31 +1284,45 @@ static int glocks_pending(unsigned int num_gh, struct gfs2_holder *ghs)
* gfs2_glock_async_wait - wait on multiple asynchronous glock acquisitions
* @num_gh: the number of holders in the array
* @ghs: the glock holder array
+ * @retries: number of retries attempted so far
*
* Returns: 0 on success, meaning all glocks have been granted and are held.
* -ESTALE if the request timed out, meaning all glocks were released,
* and the caller should retry the operation.
*/
-int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs)
+int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs,
+ unsigned int retries)
{
struct gfs2_sbd *sdp = ghs[0].gh_gl->gl_name.ln_sbd;
- int i, ret = 0, timeout = 0;
unsigned long start_time = jiffies;
+ int i, ret = 0;
+ long timeout;
might_sleep();
- /*
- * Total up the (minimum hold time * 2) of all glocks and use that to
- * determine the max amount of time we should wait.
- */
- for (i = 0; i < num_gh; i++)
- timeout += ghs[i].gh_gl->gl_hold_time << 1;
- if (!wait_event_timeout(sdp->sd_async_glock_wait,
+ timeout = GL_GLOCK_MIN_HOLD;
+ if (retries) {
+ unsigned int max_shift;
+ long incr;
+
+ /* Add a random delay and increase the timeout exponentially. */
+ max_shift = BITS_PER_LONG - 2 - __fls(GL_GLOCK_HOLD_INCR);
+ incr = min(GL_GLOCK_HOLD_INCR << min(retries - 1, max_shift),
+ 10 * HZ - GL_GLOCK_MIN_HOLD);
+ schedule_timeout_interruptible(get_random_long() % (incr / 3));
+ if (signal_pending(current))
+ goto interrupted;
+ timeout += (incr / 3) + get_random_long() % (incr / 3);
+ }
+
+ if (!wait_event_interruptible_timeout(sdp->sd_async_glock_wait,
!glocks_pending(num_gh, ghs), timeout)) {
ret = -ESTALE; /* request timed out. */
goto out;
}
+ if (signal_pending(current))
+ goto interrupted;
for (i = 0; i < num_gh; i++) {
struct gfs2_holder *gh = &ghs[i];
@@ -1332,6 +1346,10 @@ int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs)
}
}
return ret;
+
+interrupted:
+ ret = -EINTR;
+ goto out;
}
/**
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 55d5985f32a0..dccbf36b8cb1 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -204,7 +204,8 @@ int gfs2_glock_poll(struct gfs2_holder *gh);
int gfs2_instantiate(struct gfs2_holder *gh);
int gfs2_glock_holder_ready(struct gfs2_holder *gh);
int gfs2_glock_wait(struct gfs2_holder *gh);
-int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs);
+int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs,
+ unsigned int retries);
void gfs2_glock_dq(struct gfs2_holder *gh);
void gfs2_glock_dq_wait(struct gfs2_holder *gh);
void gfs2_glock_dq_uninit(struct gfs2_holder *gh);
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 36618e353199..b6ed069b3487 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1495,7 +1495,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
unsigned int num_gh;
int dir_rename = 0;
struct gfs2_diradd da = { .nr_blocks = 0, .save_loc = 0, };
- unsigned int x;
+ unsigned int retries = 0, x;
int error;
gfs2_holder_mark_uninitialized(&r_gh);
@@ -1545,12 +1545,17 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
num_gh++;
}
+again:
for (x = 0; x < num_gh; x++) {
error = gfs2_glock_nq(ghs + x);
if (error)
goto out_gunlock;
}
- error = gfs2_glock_async_wait(num_gh, ghs);
+ error = gfs2_glock_async_wait(num_gh, ghs, retries);
+ if (error == -ESTALE) {
+ retries++;
+ goto again;
+ }
if (error)
goto out_gunlock;
@@ -1739,7 +1744,7 @@ static int gfs2_exchange(struct inode *odir, struct dentry *odentry,
struct gfs2_sbd *sdp = GFS2_SB(odir);
struct gfs2_holder ghs[4], r_gh;
unsigned int num_gh;
- unsigned int x;
+ unsigned int retries = 0, x;
umode_t old_mode = oip->i_inode.i_mode;
umode_t new_mode = nip->i_inode.i_mode;
int error;
@@ -1783,13 +1788,18 @@ static int gfs2_exchange(struct inode *odir, struct dentry *odentry,
gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, GL_ASYNC, ghs + num_gh);
num_gh++;
+again:
for (x = 0; x < num_gh; x++) {
error = gfs2_glock_nq(ghs + x);
if (error)
goto out_gunlock;
}
- error = gfs2_glock_async_wait(num_gh, ghs);
+ error = gfs2_glock_async_wait(num_gh, ghs, retries);
+ if (error == -ESTALE) {
+ retries++;
+ goto again;
+ }
if (error)
goto out_gunlock;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 8312cd2cdae4..347df29d610e 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -888,8 +888,9 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
sb->s_blocksize - LH_V1_SIZE - 4);
lh->lh_crc = cpu_to_be32(crc);
- gfs2_log_write(sdp, jd, page, sb->s_blocksize, 0, dblock);
- gfs2_log_submit_bio(&jd->jd_log_bio, REQ_OP_WRITE | op_flags);
+ gfs2_log_write(sdp, jd, page, sb->s_blocksize, 0, dblock,
+ REQ_OP_WRITE | op_flags);
+ gfs2_log_submit_write(&jd->jd_log_bio);
}
/**
@@ -1096,7 +1097,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)
if (gfs2_withdrawn(sdp))
goto out_withdraw;
if (sdp->sd_jdesc)
- gfs2_log_submit_bio(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE);
+ gfs2_log_submit_write(&sdp->sd_jdesc->jd_log_bio);
if (gfs2_withdrawn(sdp))
goto out_withdraw;
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index d27a0b1080a9..c3317432a25b 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -229,21 +229,19 @@ static void gfs2_end_log_write(struct bio *bio)
}
/**
- * gfs2_log_submit_bio - Submit any pending log bio
+ * gfs2_log_submit_write - Submit a pending log write bio
* @biop: Address of the bio pointer
- * @opf: REQ_OP | op_flags
*
* Submit any pending part-built or full bio to the block device. If
* there is no pending bio, then this is a no-op.
*/
-void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf)
+void gfs2_log_submit_write(struct bio **biop)
{
struct bio *bio = *biop;
if (bio) {
struct gfs2_sbd *sdp = bio->bi_private;
atomic_inc(&sdp->sd_log_in_flight);
- bio->bi_opf = opf;
submit_bio(bio);
*biop = NULL;
}
@@ -254,6 +252,7 @@ void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf)
* @sdp: The super block
* @blkno: The device block number we want to write to
* @end_io: The bi_end_io callback
+ * @opf: REQ_OP | op_flags
*
* Allocate a new bio, initialize it with the given parameters and return it.
*
@@ -261,10 +260,10 @@ void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf)
*/
static struct bio *gfs2_log_alloc_bio(struct gfs2_sbd *sdp, u64 blkno,
- bio_end_io_t *end_io)
+ bio_end_io_t *end_io, blk_opf_t opf)
{
struct super_block *sb = sdp->sd_vfs;
- struct bio *bio = bio_alloc(sb->s_bdev, BIO_MAX_VECS, 0, GFP_NOIO);
+ struct bio *bio = bio_alloc(sb->s_bdev, BIO_MAX_VECS, opf, GFP_NOIO);
bio->bi_iter.bi_sector = blkno << sdp->sd_fsb2bb_shift;
bio->bi_end_io = end_io;
@@ -303,10 +302,10 @@ static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno,
nblk >>= sdp->sd_fsb2bb_shift;
if (blkno == nblk && !flush)
return bio;
- gfs2_log_submit_bio(biop, op);
+ gfs2_log_submit_write(biop);
}
- *biop = gfs2_log_alloc_bio(sdp, blkno, end_io);
+ *biop = gfs2_log_alloc_bio(sdp, blkno, end_io, op);
return *biop;
}
@@ -318,6 +317,7 @@ static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno,
* @size: the size of the data to write
* @offset: the offset within the page
* @blkno: block number of the log entry
+ * @opf: REQ_OP | op_flags
*
* Try and add the page segment to the current bio. If that fails,
* submit the current bio to the device and create a new one, and
@@ -326,17 +326,17 @@ static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno,
void gfs2_log_write(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
struct page *page, unsigned size, unsigned offset,
- u64 blkno)
+ u64 blkno, blk_opf_t opf)
{
struct bio *bio;
int ret;
- bio = gfs2_log_get_bio(sdp, blkno, &jd->jd_log_bio, REQ_OP_WRITE,
+ bio = gfs2_log_get_bio(sdp, blkno, &jd->jd_log_bio, opf,
gfs2_end_log_write, false);
ret = bio_add_page(bio, page, size, offset);
if (ret == 0) {
bio = gfs2_log_get_bio(sdp, blkno, &jd->jd_log_bio,
- REQ_OP_WRITE, gfs2_end_log_write, true);
+ opf, gfs2_end_log_write, true);
ret = bio_add_page(bio, page, size, offset);
WARN_ON(ret == 0);
}
@@ -359,7 +359,7 @@ static void gfs2_log_write_bh(struct gfs2_sbd *sdp, struct buffer_head *bh)
dblock = gfs2_log_bmap(sdp->sd_jdesc, sdp->sd_log_flush_head);
gfs2_log_incr_head(sdp);
gfs2_log_write(sdp, sdp->sd_jdesc, folio_page(bh->b_folio, 0),
- bh->b_size, bh_offset(bh), dblock);
+ bh->b_size, bh_offset(bh), dblock, REQ_OP_WRITE);
}
/**
@@ -380,7 +380,8 @@ static void gfs2_log_write_page(struct gfs2_sbd *sdp, struct page *page)
dblock = gfs2_log_bmap(sdp->sd_jdesc, sdp->sd_log_flush_head);
gfs2_log_incr_head(sdp);
- gfs2_log_write(sdp, sdp->sd_jdesc, page, sb->s_blocksize, 0, dblock);
+ gfs2_log_write(sdp, sdp->sd_jdesc, page, sb->s_blocksize, 0, dblock,
+ REQ_OP_WRITE);
}
/**
@@ -477,11 +478,12 @@ static void gfs2_jhead_process_page(struct gfs2_jdesc *jd, unsigned long index,
folio_put_refs(folio, 2);
}
-static struct bio *gfs2_chain_bio(struct bio *prev, unsigned int nr_iovecs)
+static struct bio *gfs2_chain_bio(struct bio *prev, unsigned int nr_iovecs,
+ blk_opf_t opf)
{
struct bio *new;
- new = bio_alloc(prev->bi_bdev, nr_iovecs, prev->bi_opf, GFP_NOIO);
+ new = bio_alloc(prev->bi_bdev, nr_iovecs, opf, GFP_NOIO);
bio_clone_blkg_association(new, prev);
new->bi_iter.bi_sector = bio_end_sector(prev);
bio_chain(new, prev);
@@ -546,7 +548,8 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)
unsigned int blocks =
(PAGE_SIZE - off) >> bsize_shift;
- bio = gfs2_chain_bio(bio, blocks);
+ bio = gfs2_chain_bio(bio, blocks,
+ REQ_OP_READ);
goto add_block_to_new_bio;
}
}
@@ -556,8 +559,8 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)
submit_bio(bio);
}
- bio = gfs2_log_alloc_bio(sdp, dblock, gfs2_end_log_read);
- bio->bi_opf = REQ_OP_READ;
+ bio = gfs2_log_alloc_bio(sdp, dblock, gfs2_end_log_read,
+ REQ_OP_READ);
add_block_to_new_bio:
bio_add_folio_nofail(bio, folio, bsize, off);
block_added:
diff --git a/fs/gfs2/lops.h b/fs/gfs2/lops.h
index be740bf33666..772557b63b48 100644
--- a/fs/gfs2/lops.h
+++ b/fs/gfs2/lops.h
@@ -16,8 +16,8 @@ void gfs2_log_incr_head(struct gfs2_sbd *sdp);
u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lbn);
void gfs2_log_write(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
struct page *page, unsigned size, unsigned offset,
- u64 blkno);
-void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf);
+ u64 blkno, blk_opf_t opf);
+void gfs2_log_submit_write(struct bio **biop);
void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);
int gfs2_find_jhead(struct gfs2_jdesc *jd,
struct gfs2_log_header_host *head);
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index e7a88b717991..c7d57de7c8f0 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1276,7 +1276,6 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
if (error) {
gfs2_freeze_unlock(sdp);
- gfs2_destroy_threads(sdp);
fs_err(sdp, "can't make FS RW: %d\n", error);
goto fail_per_node;
}
@@ -1286,6 +1285,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
fail_per_node:
init_per_node(sdp, UNDO);
+ gfs2_destroy_threads(sdp);
fail_inodes:
init_inodes(sdp, UNDO);
fail_sb:
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index b1692f12a602..2b499b554e87 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -334,6 +334,7 @@ static void qd_put(struct gfs2_quota_data *qd)
lockref_mark_dead(&qd->qd_lockref);
spin_unlock(&qd->qd_lockref.lock);
+ list_lru_del_obj(&gfs2_qd_lru, &qd->qd_lru);
gfs2_qd_dispose(qd);
return;
}
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f6cd907b3ec6..d96160636161 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -147,8 +147,10 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
}
error = gfs2_quota_init(sdp);
- if (!error && gfs2_withdrawn(sdp))
+ if (!error && gfs2_withdrawn(sdp)) {
+ gfs2_quota_cleanup(sdp);
error = -EIO;
+ }
if (!error)
set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);
return error;
diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index 191661af9677..250a226336ea 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -629,7 +629,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
if (node) {
pr_crit("new node %u already hashed?\n", num);
WARN_ON(1);
- return node;
+ return ERR_PTR(-EEXIST);
}
node = __hfs_bnode_create(tree, num);
if (!node)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 6beb876658c0..e3bedcbb5f1e 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -409,8 +409,6 @@ static void iomap_read_init(struct folio *folio)
struct iomap_folio_state *ifs = folio->private;
if (ifs) {
- size_t len = folio_size(folio);
-
/*
* ifs->read_bytes_pending is used to track how many bytes are
* read in asynchronously by the IO helper. We need to track
@@ -418,23 +416,19 @@ static void iomap_read_init(struct folio *folio)
* reading in all the necessary ranges of the folio and can end
* the read.
*
- * Increase ->read_bytes_pending by the folio size to start, and
- * add a +1 bias. We'll subtract the bias and any uptodate /
- * zeroed ranges that did not require IO in iomap_read_end()
- * after we're done processing the folio.
+ * Increase ->read_bytes_pending by the folio size to start.
+ * We'll subtract any uptodate / zeroed ranges that did not
+ * require IO in iomap_read_end() after we're done processing
+ * the folio.
*
* We do this because otherwise, we would have to increment
* ifs->read_bytes_pending every time a range in the folio needs
* to be read in, which can get expensive since the spinlock
* needs to be held whenever modifying ifs->read_bytes_pending.
- *
- * We add the bias to ensure the read has not been ended on the
- * folio when iomap_read_end() is called, even if the IO helper
- * has already finished reading in the entire folio.
*/
spin_lock_irq(&ifs->state_lock);
WARN_ON_ONCE(ifs->read_bytes_pending != 0);
- ifs->read_bytes_pending = len + 1;
+ ifs->read_bytes_pending = folio_size(folio);
spin_unlock_irq(&ifs->state_lock);
}
}
@@ -465,11 +459,9 @@ static void iomap_read_end(struct folio *folio, size_t bytes_submitted)
/*
* Subtract any bytes that were initially accounted to
- * read_bytes_pending but skipped for IO. The +1 accounts for
- * the bias we added in iomap_read_init().
+ * read_bytes_pending but skipped for IO.
*/
- ifs->read_bytes_pending -=
- (folio_size(folio) + 1 - bytes_submitted);
+ ifs->read_bytes_pending -= folio_size(folio) - bytes_submitted;
/*
* If !ifs->read_bytes_pending, this means all pending reads by
@@ -483,14 +475,16 @@ static void iomap_read_end(struct folio *folio, size_t bytes_submitted)
spin_unlock_irq(&ifs->state_lock);
if (end_read)
folio_end_read(folio, uptodate);
- } else if (!bytes_submitted) {
+ } else {
/*
- * If there were no bytes submitted, this means we are
- * responsible for unlocking the folio here, since no IO helper
- * has taken ownership of it. If there were bytes submitted,
- * then the IO helper will end the read via
- * iomap_finish_folio_read().
+ * If a folio without an ifs is submitted to the IO helper, the
+ * read must be on the entire folio and the IO helper takes
+ * ownership of the folio. This means we should only enter
+ * iomap_read_end() for the !ifs case if no bytes were submitted
+ * to the IO helper, in which case we are responsible for
+ * unlocking the folio here.
*/
+ WARN_ON_ONCE(bytes_submitted);
folio_unlock(folio);
}
}
@@ -502,6 +496,7 @@ static int iomap_read_folio_iter(struct iomap_iter *iter,
loff_t pos = iter->pos;
loff_t length = iomap_length(iter);
struct folio *folio = ctx->cur_folio;
+ size_t folio_len = folio_size(folio);
size_t poff, plen;
loff_t pos_diff;
int ret;
@@ -515,8 +510,7 @@ static int iomap_read_folio_iter(struct iomap_iter *iter,
ifs_alloc(iter->inode, folio, iter->flags);
- length = min_t(loff_t, length,
- folio_size(folio) - offset_in_folio(folio, pos));
+ length = min_t(loff_t, length, folio_len - offset_in_folio(folio, pos));
while (length) {
iomap_adjust_read_range(iter->inode, folio, &pos, length, &poff,
&plen);
@@ -542,7 +536,15 @@ static int iomap_read_folio_iter(struct iomap_iter *iter,
ret = ctx->ops->read_folio_range(iter, ctx, plen);
if (ret)
return ret;
+
*bytes_submitted += plen;
+ /*
+ * If the entire folio has been read in by the IO
+ * helper, then the helper owns the folio and will end
+ * the read on it.
+ */
+ if (*bytes_submitted == folio_len)
+ ctx->cur_folio = NULL;
}
ret = iomap_iter_advance(iter, plen);
@@ -575,7 +577,8 @@ void iomap_read_folio(const struct iomap_ops *ops,
if (ctx->ops->submit_read)
ctx->ops->submit_read(ctx);
- iomap_read_end(folio, bytes_submitted);
+ if (ctx->cur_folio)
+ iomap_read_end(ctx->cur_folio, bytes_submitted);
}
EXPORT_SYMBOL_GPL(iomap_read_folio);
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 8e273408453a..6ec4940e019c 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -442,9 +442,13 @@ static int iomap_dio_bio_iter(struct iomap_iter *iter, struct iomap_dio *dio)
nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter, BIO_MAX_VECS);
do {
size_t n;
- if (dio->error) {
- iov_iter_revert(dio->submit.iter, copied);
- copied = ret = 0;
+
+ /*
+ * If completions already occurred and reported errors, give up now and
+ * don't bother submitting more bios.
+ */
+ if (unlikely(data_race(dio->error))) {
+ ret = 0;
goto out;
}
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 0ab83bb7bbdf..9ab3f2fc61d1 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -2903,7 +2903,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)
stbl = DT_GETSTBL(p);
for (i = index; i < p->header.nextindex; i++) {
- if (stbl[i] < 0 || stbl[i] >= DTPAGEMAXSLOT) {
+ if (stbl[i] < 0) {
jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld",
i, stbl[i], (long)ip->i_ino, (long long)bn);
free_page(dirent_buf);
@@ -3108,7 +3108,7 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack)
/* get the leftmost entry */
stbl = DT_GETSTBL(p);
- if (stbl[0] < 0 || stbl[0] >= DTPAGEMAXSLOT) {
+ if (stbl[0] < 0) {
DT_PUTPAGE(mp);
jfs_error(ip->i_sb, "stbl[0] out of bound\n");
return -EIO;
diff --git a/fs/netfs/write_retry.c b/fs/netfs/write_retry.c
index fc9c3e0d34d8..29489a23a220 100644
--- a/fs/netfs/write_retry.c
+++ b/fs/netfs/write_retry.c
@@ -98,7 +98,6 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq,
subreq->start = start;
subreq->len = len;
__clear_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);
- subreq->retry_count++;
trace_netfs_sreq(subreq, netfs_sreq_trace_retry);
/* Renegotiate max_len (wsize) */
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index e3654f4a1b9a..571bb40880b2 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -73,7 +73,7 @@ const struct address_space_operations nfs_dir_aops = {
.free_folio = nfs_readdir_clear_array,
};
-#define NFS_INIT_DTSIZE PAGE_SIZE
+#define NFS_INIT_DTSIZE SZ_64K
static struct nfs_open_dir_context *
alloc_nfs_open_dir_context(struct inode *dir)
@@ -84,7 +84,7 @@ alloc_nfs_open_dir_context(struct inode *dir)
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL_ACCOUNT);
if (ctx != NULL) {
ctx->attr_gencount = nfsi->attr_gencount;
- ctx->dtsize = NFS_INIT_DTSIZE;
+ ctx->dtsize = min(NFS_SERVER(dir)->dtsize, NFS_INIT_DTSIZE);
spin_lock(&dir->i_lock);
if (list_empty(&nfsi->open_files) &&
(nfsi->cache_validity & NFS_INO_DATA_INVAL_DEFER))
diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
index 41fbcb3f9167..3bd4f28c8afc 100644
--- a/fs/nfs/localio.c
+++ b/fs/nfs/localio.c
@@ -58,6 +58,11 @@ struct nfs_local_fsync_ctx {
static bool localio_enabled __read_mostly = true;
module_param(localio_enabled, bool, 0644);
+static int nfs_local_do_read(struct nfs_local_kiocb *iocb,
+ const struct rpc_call_ops *call_ops);
+static int nfs_local_do_write(struct nfs_local_kiocb *iocb,
+ const struct rpc_call_ops *call_ops);
+
static inline bool nfs_client_is_local(const struct nfs_client *clp)
{
return !!rcu_access_pointer(clp->cl_uuid.net);
@@ -286,6 +291,18 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,
}
EXPORT_SYMBOL_GPL(nfs_local_open_fh);
+/*
+ * Ensure all page cache allocations are done from GFP_NOFS context to
+ * prevent direct reclaim recursion back into NFS via nfs_writepages.
+ */
+static void
+nfs_local_mapping_set_gfp_nofs_context(struct address_space *m)
+{
+ gfp_t gfp_mask = mapping_gfp_mask(m);
+
+ mapping_set_gfp_mask(m, (gfp_mask & ~(__GFP_FS)));
+}
+
static void
nfs_local_iocb_free(struct nfs_local_kiocb *iocb)
{
@@ -310,6 +327,7 @@ nfs_local_iocb_alloc(struct nfs_pgio_header *hdr,
return NULL;
}
+ nfs_local_mapping_set_gfp_nofs_context(file->f_mapping);
init_sync_kiocb(&iocb->kiocb, file);
iocb->hdr = hdr;
@@ -542,13 +560,50 @@ nfs_local_iocb_release(struct nfs_local_kiocb *iocb)
nfs_local_iocb_free(iocb);
}
-static void
-nfs_local_pgio_release(struct nfs_local_kiocb *iocb)
+static void nfs_local_pgio_restart(struct nfs_local_kiocb *iocb,
+ struct nfs_pgio_header *hdr)
+{
+ int status = 0;
+
+ iocb->kiocb.ki_pos = hdr->args.offset;
+ iocb->kiocb.ki_flags &= ~(IOCB_DSYNC | IOCB_SYNC | IOCB_DIRECT);
+ iocb->kiocb.ki_complete = NULL;
+ iocb->aio_complete_work = NULL;
+ iocb->end_iter_index = -1;
+
+ switch (hdr->rw_mode) {
+ case FMODE_READ:
+ nfs_local_iters_init(iocb, ITER_DEST);
+ status = nfs_local_do_read(iocb, hdr->task.tk_ops);
+ break;
+ case FMODE_WRITE:
+ nfs_local_iters_init(iocb, ITER_SOURCE);
+ status = nfs_local_do_write(iocb, hdr->task.tk_ops);
+ break;
+ default:
+ status = -EOPNOTSUPP;
+ }
+
+ if (status != 0) {
+ nfs_local_iocb_release(iocb);
+ hdr->task.tk_status = status;
+ nfs_local_hdr_release(hdr, hdr->task.tk_ops);
+ }
+}
+
+static void nfs_local_pgio_release(struct nfs_local_kiocb *iocb)
{
struct nfs_pgio_header *hdr = iocb->hdr;
+ struct rpc_task *task = &hdr->task;
+
+ task->tk_action = NULL;
+ task->tk_ops->rpc_call_done(task, hdr);
- nfs_local_iocb_release(iocb);
- nfs_local_hdr_release(hdr, hdr->task.tk_ops);
+ if (task->tk_action == NULL) {
+ nfs_local_iocb_release(iocb);
+ task->tk_ops->rpc_release(hdr);
+ } else
+ nfs_local_pgio_restart(iocb, hdr);
}
/*
@@ -773,19 +828,7 @@ static void nfs_local_write_done(struct nfs_local_kiocb *iocb)
pr_info_ratelimited("nfs: Unexpected direct I/O write alignment failure\n");
}
- /* Handle short writes as if they are ENOSPC */
- status = hdr->res.count;
- if (status > 0 && status < hdr->args.count) {
- hdr->mds_offset += status;
- hdr->args.offset += status;
- hdr->args.pgbase += status;
- hdr->args.count -= status;
- nfs_set_pgio_error(hdr, -ENOSPC, hdr->args.offset);
- status = -ENOSPC;
- /* record -ENOSPC in terms of nfs_local_pgio_done */
- (void) nfs_local_pgio_done(iocb, status, true);
- }
- if (hdr->task.tk_status < 0)
+ if (status < 0)
nfs_reset_boot_verifier(hdr->inode);
}
@@ -946,8 +989,6 @@ int nfs_local_doio(struct nfs_client *clp, struct nfsd_file *localio,
}
if (status != 0) {
- if (status == -EAGAIN)
- nfs_localio_disable_client(clp);
nfs_local_iocb_release(iocb);
hdr->task.tk_status = status;
nfs_local_hdr_release(hdr, call_ops);
@@ -974,6 +1015,8 @@ nfs_local_run_commit(struct file *filp, struct nfs_commit_data *data)
end = LLONG_MAX;
}
+ nfs_local_mapping_set_gfp_nofs_context(filp->f_mapping);
+
dprintk("%s: commit %llu - %llu\n", __func__, start, end);
return vfs_fsync_range(filp, start, end, 0);
}
@@ -1015,17 +1058,22 @@ nfs_local_fsync_ctx_free(struct nfs_local_fsync_ctx *ctx)
static void
nfs_local_fsync_work(struct work_struct *work)
{
+ unsigned long old_flags = current->flags;
struct nfs_local_fsync_ctx *ctx;
int status;
ctx = container_of(work, struct nfs_local_fsync_ctx, work);
+ current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO;
+
status = nfs_local_run_commit(nfs_to->nfsd_file_file(ctx->localio),
ctx->data);
nfs_local_commit_done(ctx->data, status);
if (ctx->done != NULL)
complete(ctx->done);
nfs_local_fsync_ctx_free(ctx);
+
+ current->flags = old_flags;
}
static struct nfs_local_fsync_ctx *
@@ -1049,7 +1097,7 @@ int nfs_local_commit(struct nfsd_file *localio,
{
struct nfs_local_fsync_ctx *ctx;
- ctx = nfs_local_fsync_ctx_alloc(data, localio, GFP_KERNEL);
+ ctx = nfs_local_fsync_ctx_alloc(data, localio, GFP_NOIO);
if (!ctx) {
nfs_local_commit_done(data, -ENOMEM);
nfs_local_release_commit_data(localio, data, call_ops);
@@ -1061,10 +1109,10 @@ int nfs_local_commit(struct nfsd_file *localio,
if (how & FLUSH_SYNC) {
DECLARE_COMPLETION_ONSTACK(done);
ctx->done = &done;
- queue_work(nfsiod_workqueue, &ctx->work);
+ queue_work(nfslocaliod_workqueue, &ctx->work);
wait_for_completion(&done);
} else
- queue_work(nfsiod_workqueue, &ctx->work);
+ queue_work(nfslocaliod_workqueue, &ctx->work);
return 0;
}
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index cff225721d1c..ff8483d3373a 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -463,7 +463,8 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo,
};
struct pnfs_layout_segment *lseg, *next;
- set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);
+ if (test_and_set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags))
+ return !list_empty(&lo->plh_segs);
clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(lo->plh_inode)->flags);
list_for_each_entry_safe(lseg, next, &lo->plh_segs, pls_list)
pnfs_clear_lseg_state(lseg, lseg_list);
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 2a1499f2ad19..09fe268fe2c7 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -427,7 +427,8 @@ static int check_export(const struct path *path, int *flags, unsigned char *uuid
* either a device number (so FS_REQUIRES_DEV needed)
* or an FSID number (so NFSEXP_FSID or ->uuid is needed).
* 2: We must be able to find an inode from a filehandle.
- * This means that s_export_op must be set.
+ * This means that s_export_op must be set and comply with
+ * the requirements for remote filesystem export.
* 3: We must not currently be on an idmapped mount.
*/
if (!(inode->i_sb->s_type->fs_flags & FS_REQUIRES_DEV) &&
@@ -437,8 +438,9 @@ static int check_export(const struct path *path, int *flags, unsigned char *uuid
return -EINVAL;
}
- if (!exportfs_can_decode_fh(inode->i_sb->s_export_op)) {
- dprintk("exp_export: export of invalid fs type.\n");
+ if (!exportfs_may_export(inode->i_sb->s_export_op)) {
+ dprintk("exp_export: export of invalid fs type (%s).\n",
+ inode->i_sb->s_type->name);
return -EINVAL;
}
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 5fb202acb0fd..0ac538c76180 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -45,7 +45,7 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst *rqstp)
inode = d_inode(fh->fh_dentry);
if (argp->mask & ~NFS_ACL_MASK) {
- resp->status = nfserr_inval;
+ resp->status = nfserr_io;
goto out;
}
resp->mask = argp->mask;
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 8cca1329f348..b5b3d45979c9 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -643,13 +643,31 @@ static __be32 encode_name_from_id(struct xdr_stream *xdr,
return idmap_id_to_name(xdr, rqstp, type, id);
}
-__be32
-nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name, size_t namelen,
- kuid_t *uid)
+/**
+ * nfsd_map_name_to_uid - Map user@domain to local UID
+ * @rqstp: RPC execution context
+ * @name: user@domain name to be mapped
+ * @namelen: length of name, in bytes
+ * @uid: OUT: mapped local UID value
+ *
+ * Returns nfs_ok on success or an NFSv4 status code on failure.
+ */
+__be32 nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name,
+ size_t namelen, kuid_t *uid)
{
__be32 status;
u32 id = -1;
+ /*
+ * The idmap lookup below triggers an upcall that invokes
+ * cache_check(). RQ_USEDEFERRAL must be clear to prevent
+ * cache_check() from setting RQ_DROPME via svc_defer().
+ * NFSv4 servers are not permitted to drop requests. Also
+ * RQ_DROPME will force NFSv4.1 session slot processing to
+ * be skipped.
+ */
+ WARN_ON_ONCE(test_bit(RQ_USEDEFERRAL, &rqstp->rq_flags));
+
if (name == NULL || namelen == 0)
return nfserr_inval;
@@ -660,13 +678,31 @@ nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name, size_t namelen,
return status;
}
-__be32
-nfsd_map_name_to_gid(struct svc_rqst *rqstp, const char *name, size_t namelen,
- kgid_t *gid)
+/**
+ * nfsd_map_name_to_gid - Map user@domain to local GID
+ * @rqstp: RPC execution context
+ * @name: user@domain name to be mapped
+ * @namelen: length of name, in bytes
+ * @gid: OUT: mapped local GID value
+ *
+ * Returns nfs_ok on success or an NFSv4 status code on failure.
+ */
+__be32 nfsd_map_name_to_gid(struct svc_rqst *rqstp, const char *name,
+ size_t namelen, kgid_t *gid)
{
__be32 status;
u32 id = -1;
+ /*
+ * The idmap lookup below triggers an upcall that invokes
+ * cache_check(). RQ_USEDEFERRAL must be clear to prevent
+ * cache_check() from setting RQ_DROPME via svc_defer().
+ * NFSv4 servers are not permitted to drop requests. Also
+ * RQ_DROPME will force NFSv4.1 session slot processing to
+ * be skipped.
+ */
+ WARN_ON_ONCE(test_bit(RQ_USEDEFERRAL, &rqstp->rq_flags));
+
if (name == NULL || namelen == 0)
return nfserr_inval;
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 9ec08dd4fe82..f780024f9a08 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3011,8 +3011,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)
BUG_ON(cstate->replay_owner);
out:
cstate->status = status;
- /* Reset deferral mechanism for RPC deferrals */
- set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
return rpc_success;
}
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 51ef97c25456..5065727204b9 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -6013,6 +6013,22 @@ nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
args->ops = args->iops;
args->rqstp = rqstp;
+ /*
+ * NFSv4 operation decoders can invoke svc cache lookups
+ * that trigger svc_defer() when RQ_USEDEFERRAL is set,
+ * setting RQ_DROPME. This creates two problems:
+ *
+ * 1. Non-idempotency: Compounds make it too hard to avoid
+ * problems if a request is deferred and replayed.
+ *
+ * 2. Session slot leakage (NFSv4.1+): If RQ_DROPME is set
+ * during decode but SEQUENCE executes successfully, the
+ * session slot will be marked INUSE. The request is then
+ * dropped before encoding, so the slot is never released,
+ * rendering it permanently unusable by the client.
+ */
+ clear_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
+
return nfsd4_decode_compound(args);
}
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 481e789a7697..8873033d1e82 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -33,7 +33,7 @@ static __be32 nfsd_map_status(__be32 status)
break;
case nfserr_symlink:
case nfserr_wrong_type:
- status = nfserr_inval;
+ status = nfserr_io;
break;
}
return status;
diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 2e7b2e566ebe..5120bd785169 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -995,7 +995,7 @@ static int ntfs_get_frame_pages(struct address_space *mapping, pgoff_t index,
folio = __filemap_get_folio(mapping, index,
FGP_LOCK | FGP_ACCESSED | FGP_CREAT,
- gfp_mask);
+ gfp_mask | __GFP_ZERO);
if (IS_ERR(folio)) {
while (npages--) {
folio = page_folio(pages[npages]);
@@ -1077,8 +1077,12 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
goto out;
if (lcn == SPARSE_LCN) {
- ni->i_valid = valid =
- frame_vbo + ((u64)clen << sbi->cluster_bits);
+ valid = frame_vbo + ((u64)clen << sbi->cluster_bits);
+ if (ni->i_valid == valid) {
+ err = -EINVAL;
+ goto out;
+ }
+ ni->i_valid = valid;
continue;
}
diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 641ddaf8d4a0..d5bbd47e1ee9 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -2046,18 +2046,18 @@ static struct page *ntfs_lock_new_page(struct address_space *mapping,
}
/*
- * ni_readpage_cmpr
+ * ni_read_folio_cmpr
*
* When decompressing, we typically obtain more than one page per reference.
* We inject the additional pages into the page cache.
*/
-int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio)
+int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio)
{
int err;
struct ntfs_sb_info *sbi = ni->mi.sbi;
struct address_space *mapping = folio->mapping;
- pgoff_t index = folio->index;
- u64 frame_vbo, vbo = (u64)index << PAGE_SHIFT;
+ pgoff_t index;
+ u64 frame_vbo, vbo = folio_pos(folio);
struct page **pages = NULL; /* Array of at most 16 pages. stack? */
u8 frame_bits;
CLST frame;
@@ -2107,7 +2107,9 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio)
pages[i] = pg;
}
+ ni_lock(ni);
err = ni_read_frame(ni, frame_vbo, pages, pages_per_frame, 0);
+ ni_unlock(ni);
out1:
for (i = 0; i < pages_per_frame; i++) {
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 38934e6978ec..28bd611f580d 100644
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -3429,6 +3429,9 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,
e1 = Add2Ptr(attr, le16_to_cpu(lrh->attr_off));
esize = le16_to_cpu(e1->size);
+ if (PtrOffset(e1, Add2Ptr(hdr, used)) < esize)
+ goto dirty_vol;
+
e2 = Add2Ptr(e1, esize);
memmove(e1, e2, PtrOffset(e2, Add2Ptr(hdr, used)));
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 0a9ac5efeb67..ec8e954f4426 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -735,9 +735,8 @@ static int ntfs_read_folio(struct file *file, struct folio *folio)
}
if (is_compressed(ni)) {
- ni_lock(ni);
- err = ni_readpage_cmpr(ni, folio);
- ni_unlock(ni);
+ /* ni_lock is taken inside ni_read_folio_cmpr after page locks */
+ err = ni_read_folio_cmpr(ni, folio);
return err;
}
diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index a4559c9f64e6..7b619bb151ce 100644
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -568,7 +568,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint);
#define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)
int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
__u64 vbo, __u64 len);
-int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio);
+int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio);
int ni_decompress_file(struct ntfs_inode *ni);
int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
u32 pages_per_frame, int copy);
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 8b0cf0ed4f72..0567a3b224ed 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -705,9 +705,7 @@ static void ntfs_put_super(struct super_block *sb)
ntfs_set_state(sbi, NTFS_DIRTY_CLEAR);
if (sbi->options) {
- unload_nls(sbi->options->nls);
- kfree(sbi->options->nls_name);
- kfree(sbi->options);
+ put_mount_options(sbi->options);
sbi->options = NULL;
}
@@ -1253,7 +1251,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
}
}
sbi->options = options;
- fc->fs_private = NULL;
sb->s_flags |= SB_NODIRATIME;
sb->s_magic = 0x7366746e; // "ntfs"
sb->s_op = &ntfs_sops;
@@ -1679,9 +1676,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
out:
/* sbi->options == options */
if (options) {
- unload_nls(options->nls);
- kfree(options->nls_name);
- kfree(options);
+ put_mount_options(sbi->options);
sbi->options = NULL;
}
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 160960bb0ad0..724ec9d93fc8 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -755,7 +755,7 @@ static bool ovl_fill_real(struct dir_context *ctx, const char *name,
struct dir_context *orig_ctx = rdt->orig_ctx;
bool res;
- if (rdt->parent_ino && strcmp(name, "..") == 0) {
+ if (rdt->parent_ino && namelen == 2 && !strncmp(name, "..", 2)) {
ino = rdt->parent_ino;
} else if (rdt->cache) {
struct ovl_cache_entry *p;
diff --git a/fs/pidfs.c b/fs/pidfs.c
index 1e20e36e0ed5..d18c51513f6c 100644
--- a/fs/pidfs.c
+++ b/fs/pidfs.c
@@ -329,7 +329,7 @@ static long pidfd_info(struct file *file, unsigned int cmd, unsigned long arg)
* namespace hierarchy.
*/
if (!pid_in_current_pidns(pid))
- return -ESRCH;
+ return -EREMOTE;
attr = READ_ONCE(pid->attr);
if (mask & PIDFD_INFO_EXIT) {
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 42932f88141a..5571177e0435 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -528,7 +528,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
}
sid = task_session_nr_ns(task, ns);
- ppid = task_tgid_nr_ns(task->real_parent, ns);
+ ppid = task_ppid_nr_ns(task, ns);
pgid = task_pgrp_nr_ns(task, ns);
unlock_task_sighand(task, &flags);
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index f1848cdd6d34..c9eaacdec37e 100644
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -298,6 +298,17 @@ void persistent_ram_save_old(struct persistent_ram_zone *prz)
if (!size)
return;
+ /*
+ * If the existing buffer is differently sized, free it so a new
+ * one is allocated. This can happen when persistent_ram_save_old()
+ * is called early in boot and later for a timer-triggered
+ * survivable crash when the crash dumps don't match in size
+ * (which would be extremely unlikely given kmsg buffers usually
+ * exceed prz buffer sizes).
+ */
+ if (prz->old_log && prz->old_log_size != size)
+ persistent_ram_free_old(prz);
+
if (!prz->old_log) {
persistent_ram_ecc_old(prz);
prz->old_log = kvzalloc(size, GFP_KERNEL);
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 7c2b75a44485..de4379a9c792 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -899,6 +899,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
sb_start_write(sb);
sb_end_write(sb);
put_super(sb);
+ cond_resched();
goto retry;
}
return sb;
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index d4291d3a9a48..2527d2d29f19 100644
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -826,9 +826,7 @@ static int smb3_fs_context_parse_monolithic(struct fs_context *fc,
if (ret < 0)
break;
}
- ret = smb3_handle_conflicting_options(fc);
-
- return ret;
+ return ret ?: smb3_handle_conflicting_options(fc);
}
/*
diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c
index 2dd08388ea87..1f7f284a7844 100644
--- a/fs/smb/client/smb2file.c
+++ b/fs/smb/client/smb2file.c
@@ -179,6 +179,8 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
&err_buftype);
if (rc == -EACCES && retry_without_read_attributes) {
free_rsp_buf(err_buftype, err_iov.iov_base);
+ memset(&err_iov, 0, sizeof(err_iov));
+ err_buftype = CIFS_NO_BUFFER;
oparms->desired_access &= ~FILE_READ_ATTRIBUTES;
rc = SMB2_open(xid, oparms, smb2_path, &smb2_oplock, smb2_data, NULL, &err_iov,
&err_buftype);
diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index 01d55bcc6d0f..c8cef098d480 100644
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -101,8 +101,23 @@ int smbd_send_credit_target = 255;
/* The maximum single message size can be sent to remote peer */
int smbd_max_send_size = 1364;
-/* The maximum fragmented upper-layer payload receive size supported */
-int smbd_max_fragmented_recv_size = 1024 * 1024;
+/*
+ * The maximum fragmented upper-layer payload receive size supported
+ *
+ * Assume max_payload_per_credit is
+ * smbd_max_receive_size - 24 = 1340
+ *
+ * The maximum number would be
+ * smbd_receive_credit_max * max_payload_per_credit
+ *
+ * 1340 * 255 = 341700 (0x536C4)
+ *
+ * The minimum value from the spec is 131072 (0x20000)
+ *
+ * For now we use the logic we used in ksmbd before:
+ * (1364 * 255) / 2 = 173910 (0x2A756)
+ */
+int smbd_max_fragmented_recv_size = (1364 * 255) / 2;
/* The maximum single-message size which can be received */
int smbd_max_receive_size = 1364;
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 4c361c6c566e..1022d794bd23 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -6114,14 +6114,14 @@ static int smb2_create_link(struct ksmbd_work *work,
rc = -EINVAL;
ksmbd_debug(SMB, "cannot delete %s\n",
link_name);
- goto out;
}
} else {
rc = -EEXIST;
ksmbd_debug(SMB, "link already exists\n");
- goto out;
}
ksmbd_vfs_kern_path_end_removing(&path);
+ if (rc)
+ goto out;
}
rc = ksmbd_vfs_link(work, target_name, link_name);
if (rc)
diff --git a/fs/tests/exec_kunit.c b/fs/tests/exec_kunit.c
index 7c77d039680b..f412d1a0f6bb 100644
--- a/fs/tests/exec_kunit.c
+++ b/fs/tests/exec_kunit.c
@@ -87,9 +87,6 @@ static const struct bprm_stack_limits_result bprm_stack_limits_results[] = {
.argc = 0, .envc = ARG_MAX / sizeof(void *) - 1 },
.expected_argmin = ULONG_MAX - sizeof(void *) },
/* Raising rlim_stack / 4 to _STK_LIM / 4 * 3 will see more space. */
- { { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * (_STK_LIM / 4 * 3),
- .argc = 0, .envc = 0 },
- .expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * (_STK_LIM / 4 * 3),
.argc = 0, .envc = 0 },
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
@@ -103,9 +100,6 @@ static const struct bprm_stack_limits_result bprm_stack_limits_results[] = {
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * _STK_LIM,
.argc = 0, .envc = 0 },
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
- { { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * _STK_LIM,
- .argc = 0, .envc = 0 },
- .expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
};
static void exec_test_bprm_stack_limits(struct kunit *test)
diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h
index 9af3b502f839..840bfc95bae3 100644
--- a/include/acpi/pcc.h
+++ b/include/acpi/pcc.h
@@ -17,35 +17,6 @@ struct pcc_mbox_chan {
u32 latency;
u32 max_access_rate;
u16 min_turnaround_time;
-
- /* Set to true to indicate that the mailbox should manage
- * writing the dat to the shared buffer. This differs from
- * the case where the drivesr are writing to the buffer and
- * using send_data only to ring the doorbell. If this flag
- * is set, then the void * data parameter of send_data must
- * point to a kernel-memory buffer formatted in accordance with
- * the PCC specification.
- *
- * The active buffer management will include reading the
- * notify_on_completion flag, and will then
- * call mbox_chan_txdone when the acknowledgment interrupt is
- * received.
- */
- bool manage_writes;
-
- /* Optional callback that allows the driver
- * to allocate the memory used for receiving
- * messages. The return value is the location
- * inside the buffer where the mailbox should write the data.
- */
- void *(*rx_alloc)(struct mbox_client *cl, int size);
-};
-
-struct pcc_header {
- u32 signature;
- u32 flags;
- u32 length;
- u32 command;
};
/* Generic Communications Channel Shared Memory Region */
diff --git a/include/asm-generic/rqspinlock.h b/include/asm-generic/rqspinlock.h
index 0f2dcbbfee2f..5c5cf2f7fc39 100644
--- a/include/asm-generic/rqspinlock.h
+++ b/include/asm-generic/rqspinlock.h
@@ -191,7 +191,7 @@ static __always_inline int res_spin_lock(rqspinlock_t *lock)
#else
-#define res_spin_lock(lock) resilient_tas_spin_lock(lock)
+#define res_spin_lock(lock) ({ grab_held_lock_entry(lock); resilient_tas_spin_lock(lock); })
#endif /* CONFIG_QUEUED_SPINLOCKS */
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 43783891d359..ff1fecd30478 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -30,7 +30,6 @@
#include <drm/drm_crtc.h>
#include <drm/drm_util.h>
-#include <drm/drm_colorop.h>
/**
* struct drm_crtc_commit - track modeset commits on a CRTC
@@ -707,6 +706,14 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,
struct drm_colorop_state *
drm_atomic_get_colorop_state(struct drm_atomic_state *state,
struct drm_colorop *colorop);
+
+struct drm_colorop_state *
+drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,
+ struct drm_colorop *colorop);
+struct drm_colorop_state *
+drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,
+ struct drm_colorop *colorop);
+
struct drm_connector_state * __must_check
drm_atomic_get_connector_state(struct drm_atomic_state *state,
struct drm_connector *connector);
@@ -803,36 +810,6 @@ drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,
return state->planes[drm_plane_index(plane)].new_state;
}
-/**
- * drm_atomic_get_old_colorop_state - get colorop state, if it exists
- * @state: global atomic state object
- * @colorop: colorop to grab
- *
- * This function returns the old colorop state for the given colorop, or
- * NULL if the colorop is not part of the global atomic state.
- */
-static inline struct drm_colorop_state *
-drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,
- struct drm_colorop *colorop)
-{
- return state->colorops[drm_colorop_index(colorop)].old_state;
-}
-
-/**
- * drm_atomic_get_new_colorop_state - get colorop state, if it exists
- * @state: global atomic state object
- * @colorop: colorop to grab
- *
- * This function returns the new colorop state for the given colorop, or
- * NULL if the colorop is not part of the global atomic state.
- */
-static inline struct drm_colorop_state *
-drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,
- struct drm_colorop *colorop)
-{
- return state->colorops[drm_colorop_index(colorop)].new_state;
-}
-
/**
* drm_atomic_get_old_connector_state - get connector state, if it exists
* @state: global atomic state object
diff --git a/include/drm/intel/intel_lb_mei_interface.h b/include/drm/intel/intel_lb_mei_interface.h
index d65be2cba2ab..0850738a30fc 100644
--- a/include/drm/intel/intel_lb_mei_interface.h
+++ b/include/drm/intel/intel_lb_mei_interface.h
@@ -53,7 +53,8 @@ enum intel_lb_status {
*/
struct intel_lb_component_ops {
/**
- * push_payload - Sends a payload to the authentication firmware
+ * @push_payload: Sends a payload to the authentication firmware
+ *
* @dev: Device struct corresponding to the mei device
* @type: Payload type (see &enum intel_lb_type)
* @flags: Payload flags bitmap (e.g. %INTEL_LB_FLAGS_IS_PERSISTENT)
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 54b416e26995..c9013e472aa3 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -29,7 +29,6 @@ enum {
ATA_MAX_SECTORS_128 = 128,
ATA_MAX_SECTORS = 256,
ATA_MAX_SECTORS_1024 = 1024,
- ATA_MAX_SECTORS_8191 = 8191,
ATA_MAX_SECTORS_LBA48 = 65535,/* avoid count to be 0000h */
ATA_MAX_SECTORS_TAPE = 65535,
ATA_MAX_TRIM_RNUM = 64, /* 512-byte payload / (6-byte LBA + 2-byte range per entry) */
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 536f8ee8da81..b8d8029c6c48 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -128,12 +128,6 @@ enum audit_nfcfgop {
extern int __init audit_register_class(int class, unsigned *list);
extern int audit_classify_syscall(int abi, unsigned syscall);
extern int audit_classify_arch(int arch);
-/* only for compat system calls */
-extern unsigned compat_write_class[];
-extern unsigned compat_read_class[];
-extern unsigned compat_dir_class[];
-extern unsigned compat_chattr_class[];
-extern unsigned compat_signal_class[];
/* audit_names->type values */
#define AUDIT_TYPE_UNKNOWN 0 /* we don't know yet */
diff --git a/include/linux/audit_arch.h b/include/linux/audit_arch.h
index 0e34d673ef17..2b8153791e6a 100644
--- a/include/linux/audit_arch.h
+++ b/include/linux/audit_arch.h
@@ -23,4 +23,11 @@ enum auditsc_class_t {
extern int audit_classify_compat_syscall(int abi, unsigned syscall);
+/* only for compat system calls */
+extern unsigned compat_write_class[];
+extern unsigned compat_read_class[];
+extern unsigned compat_dir_class[];
+extern unsigned compat_chattr_class[];
+extern unsigned compat_signal_class[];
+
#endif
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index e5be698256d1..7b2e51216e73 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -3243,6 +3243,11 @@ static inline void bpf_prog_report_arena_violation(bool write, unsigned long add
}
#endif /* CONFIG_BPF_SYSCALL */
+static inline bool bpf_net_capable(void)
+{
+ return capable(CAP_NET_ADMIN) || capable(CAP_SYS_ADMIN);
+}
+
static __always_inline int
bpf_probe_read_kernel_common(void *dst, u32 size, const void *unsafe_ptr)
{
diff --git a/include/linux/bpf_mprog.h b/include/linux/bpf_mprog.h
index 929225f7b095..0b9f4caeeb0a 100644
--- a/include/linux/bpf_mprog.h
+++ b/include/linux/bpf_mprog.h
@@ -340,4 +340,14 @@ static inline bool bpf_mprog_supported(enum bpf_prog_type type)
return false;
}
}
+
+static inline bool bpf_mprog_detach_empty(enum bpf_prog_type type)
+{
+ switch (type) {
+ case BPF_PROG_TYPE_SCHED_CLS:
+ return bpf_net_capable();
+ default:
+ return false;
+ }
+}
#endif /* __BPF_MPROG_H */
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 1fb08922552c..37db92b3d6f8 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -203,6 +203,12 @@ static inline bool checkpoint_restore_ns_capable(struct user_namespace *ns)
ns_capable(ns, CAP_SYS_ADMIN);
}
+static inline bool checkpoint_restore_ns_capable_noaudit(struct user_namespace *ns)
+{
+ return ns_capable_noaudit(ns, CAP_CHECKPOINT_RESTORE) ||
+ ns_capable_noaudit(ns, CAP_SYS_ADMIN);
+}
+
/* audit system wants to get cap info from files as well */
int get_vfs_caps_from_disk(struct mnt_idmap *idmap,
const struct dentry *dentry,
diff --git a/include/linux/clk.h b/include/linux/clk.h
index b607482ca77e..64ff118ffb1a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -228,6 +228,23 @@ int devm_clk_rate_exclusive_get(struct device *dev, struct clk *clk);
*/
void clk_rate_exclusive_put(struct clk *clk);
+/**
+ * clk_save_context - save clock context for poweroff
+ *
+ * Saves the context of the clock register for powerstates in which the
+ * contents of the registers will be lost. Occurs deep within the suspend
+ * code so locking is not necessary.
+ */
+int clk_save_context(void);
+
+/**
+ * clk_restore_context - restore clock context after poweroff
+ *
+ * This occurs with all clocks enabled. Occurs deep within the resume code
+ * so locking is not necessary.
+ */
+void clk_restore_context(void);
+
#else
static inline int clk_notifier_register(struct clk *clk,
@@ -293,6 +310,13 @@ static inline int devm_clk_rate_exclusive_get(struct device *dev, struct clk *cl
static inline void clk_rate_exclusive_put(struct clk *clk) {}
+static inline int clk_save_context(void)
+{
+ return 0;
+}
+
+static inline void clk_restore_context(void) {}
+
#endif
#ifdef CONFIG_HAVE_CLK_PREPARE
@@ -933,23 +957,6 @@ struct clk *clk_get_parent(struct clk *clk);
*/
struct clk *clk_get_sys(const char *dev_id, const char *con_id);
-/**
- * clk_save_context - save clock context for poweroff
- *
- * Saves the context of the clock register for powerstates in which the
- * contents of the registers will be lost. Occurs deep within the suspend
- * code so locking is not necessary.
- */
-int clk_save_context(void);
-
-/**
- * clk_restore_context - restore clock context after poweroff
- *
- * This occurs with all clocks enabled. Occurs deep within the resume code
- * so locking is not necessary.
- */
-void clk_restore_context(void);
-
#else /* !CONFIG_HAVE_CLK */
static inline struct clk *clk_get(struct device *dev, const char *id)
@@ -1129,13 +1136,6 @@ static inline struct clk *clk_get_sys(const char *dev_id, const char *con_id)
return NULL;
}
-static inline int clk_save_context(void)
-{
- return 0;
-}
-
-static inline void clk_restore_context(void) {}
-
#endif
/* clk_prepare_enable helps cases using clk_enable in non-atomic context. */
diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h
index 0864773a57e8..822085bc2d20 100644
--- a/include/linux/device_cgroup.h
+++ b/include/linux/device_cgroup.h
@@ -21,7 +21,7 @@ static inline int devcgroup_inode_permission(struct inode *inode, int mask)
if (likely(!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode)))
return 0;
- if (likely(!inode->i_rdev))
+ if (!inode->i_rdev)
return 0;
if (S_ISBLK(inode->i_mode))
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index f0cf2714ec52..9bd93d6bd9a4 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -317,6 +317,15 @@ static inline bool exportfs_can_decode_fh(const struct export_operations *nop)
return nop && nop->fh_to_dentry;
}
+static inline bool exportfs_may_export(const struct export_operations *nop)
+{
+ /*
+ * Do not allow nfs export for filesystems with custom ->open() or
+ * ->permission() ops, which nfsd does not respect (e.g. pidfs, nsfs).
+ */
+ return exportfs_can_decode_fh(nop) && !nop->open && !nop->permission;
+}
+
static inline bool exportfs_can_encode_fh(const struct export_operations *nop,
int fh_flags)
{
diff --git a/include/linux/filter.h b/include/linux/filter.h
index fd54fed8f95f..7452817d707d 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1375,24 +1375,13 @@ static inline bool bpf_jit_kallsyms_enabled(void)
return false;
}
-int __bpf_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char *sym);
+int bpf_address_lookup(unsigned long addr, unsigned long *size,
+ unsigned long *off, char *sym);
bool is_bpf_text_address(unsigned long addr);
int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
char *sym);
struct bpf_prog *bpf_prog_ksym_find(unsigned long addr);
-static inline int
-bpf_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char **modname, char *sym)
-{
- int ret = __bpf_address_lookup(addr, size, off, sym);
-
- if (ret && modname)
- *modname = NULL;
- return ret;
-}
-
void bpf_prog_kallsyms_add(struct bpf_prog *fp);
void bpf_prog_kallsyms_del(struct bpf_prog *fp);
@@ -1431,8 +1420,8 @@ static inline bool bpf_jit_kallsyms_enabled(void)
}
static inline int
-__bpf_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char *sym)
+bpf_address_lookup(unsigned long addr, unsigned long *size,
+ unsigned long *off, char *sym)
{
return 0;
}
@@ -1453,13 +1442,6 @@ static inline struct bpf_prog *bpf_prog_ksym_find(unsigned long addr)
return NULL;
}
-static inline int
-bpf_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char **modname, char *sym)
-{
- return 0;
-}
-
static inline void bpf_prog_kallsyms_add(struct bpf_prog *fp)
{
}
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index a3a8989e3268..fa74ae5cc9da 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -87,11 +87,13 @@ struct ftrace_hash;
defined(CONFIG_DYNAMIC_FTRACE)
int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char **modname, char *sym);
+ unsigned long *off, char **modname,
+ const unsigned char **modbuildid, char *sym);
#else
static inline int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char **modname, char *sym)
+ unsigned long *off, char **modname,
+ const unsigned char **modbuildid, char *sym)
{
return 0;
}
@@ -359,7 +361,6 @@ enum {
FTRACE_OPS_FL_DIRECT = BIT(17),
FTRACE_OPS_FL_SUBOP = BIT(18),
FTRACE_OPS_FL_GRAPH = BIT(19),
- FTRACE_OPS_FL_JMP = BIT(20),
};
#ifndef CONFIG_DYNAMIC_FTRACE_WITH_ARGS
diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index ca1ec437a3ca..59f985804958 100644
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -447,12 +447,16 @@ struct hisi_qp_ops {
int (*fill_sqe)(void *sqe, void *q_parm, void *d_parm);
};
+struct instance_backlog {
+ struct list_head list;
+ spinlock_t lock;
+};
+
struct hisi_qp {
u32 qp_id;
u16 sq_depth;
u16 cq_depth;
u8 alg_type;
- u8 req_type;
struct qm_dma qdma;
void *sqe;
@@ -462,7 +466,6 @@ struct hisi_qp {
struct hisi_qp_status qp_status;
struct hisi_qp_ops *hw_ops;
- void *qp_ctx;
void (*req_cb)(struct hisi_qp *qp, void *data);
void (*event_cb)(struct hisi_qp *qp);
@@ -471,6 +474,10 @@ struct hisi_qp {
bool is_in_kernel;
u16 pasid;
struct uacce_queue *uacce_q;
+
+ spinlock_t qp_lock;
+ struct instance_backlog backlog;
+ const void **msg;
};
static inline int vfs_num_set(const char *val, const struct kernel_param *kp)
@@ -575,7 +582,7 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev,
void hisi_acc_free_sgl_pool(struct device *dev,
struct hisi_acc_sgl_pool *pool);
int hisi_qm_alloc_qps_node(struct hisi_qm_list *qm_list, int qp_num,
- u8 alg_type, int node, struct hisi_qp **qps);
+ u8 *alg_type, int node, struct hisi_qp **qps);
void hisi_qm_free_qps(struct hisi_qp **qps, int qp_num);
void hisi_qm_dev_shutdown(struct pci_dev *pdev);
void hisi_qm_wait_task_finish(struct hisi_qm *qm, struct hisi_qm_list *qm_list);
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index b424555753b1..b77bc55a4cf3 100644
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -15,6 +15,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
#include <linux/types.h>
+#include <linux/workqueue_types.h>
/**
* struct hwrng - Hardware Random Number Generator driver
@@ -48,6 +49,7 @@ struct hwrng {
/* internal. */
struct list_head list;
struct kref ref;
+ struct work_struct cleanup_work;
struct completion cleanup_done;
struct completion dying;
};
diff --git a/include/linux/input/adp5589.h b/include/linux/input/adp5589.h
deleted file mode 100644
index 0e4742c8c81e..000000000000
--- a/include/linux/input/adp5589.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Analog Devices ADP5589/ADP5585 I/O Expander and QWERTY Keypad Controller
- *
- * Copyright 2010-2011 Analog Devices Inc.
- */
-
-#ifndef _ADP5589_H
-#define _ADP5589_H
-
-/*
- * ADP5589 specific GPI and Keymap defines
- */
-
-#define ADP5589_KEYMAPSIZE 88
-
-#define ADP5589_GPI_PIN_ROW0 97
-#define ADP5589_GPI_PIN_ROW1 98
-#define ADP5589_GPI_PIN_ROW2 99
-#define ADP5589_GPI_PIN_ROW3 100
-#define ADP5589_GPI_PIN_ROW4 101
-#define ADP5589_GPI_PIN_ROW5 102
-#define ADP5589_GPI_PIN_ROW6 103
-#define ADP5589_GPI_PIN_ROW7 104
-#define ADP5589_GPI_PIN_COL0 105
-#define ADP5589_GPI_PIN_COL1 106
-#define ADP5589_GPI_PIN_COL2 107
-#define ADP5589_GPI_PIN_COL3 108
-#define ADP5589_GPI_PIN_COL4 109
-#define ADP5589_GPI_PIN_COL5 110
-#define ADP5589_GPI_PIN_COL6 111
-#define ADP5589_GPI_PIN_COL7 112
-#define ADP5589_GPI_PIN_COL8 113
-#define ADP5589_GPI_PIN_COL9 114
-#define ADP5589_GPI_PIN_COL10 115
-#define GPI_LOGIC1 116
-#define GPI_LOGIC2 117
-
-#define ADP5589_GPI_PIN_ROW_BASE ADP5589_GPI_PIN_ROW0
-#define ADP5589_GPI_PIN_ROW_END ADP5589_GPI_PIN_ROW7
-#define ADP5589_GPI_PIN_COL_BASE ADP5589_GPI_PIN_COL0
-#define ADP5589_GPI_PIN_COL_END ADP5589_GPI_PIN_COL10
-
-#define ADP5589_GPI_PIN_BASE ADP5589_GPI_PIN_ROW_BASE
-#define ADP5589_GPI_PIN_END ADP5589_GPI_PIN_COL_END
-
-#define ADP5589_GPIMAPSIZE_MAX (ADP5589_GPI_PIN_END - ADP5589_GPI_PIN_BASE + 1)
-
-/*
- * ADP5585 specific GPI and Keymap defines
- */
-
-#define ADP5585_KEYMAPSIZE 30
-
-#define ADP5585_GPI_PIN_ROW0 37
-#define ADP5585_GPI_PIN_ROW1 38
-#define ADP5585_GPI_PIN_ROW2 39
-#define ADP5585_GPI_PIN_ROW3 40
-#define ADP5585_GPI_PIN_ROW4 41
-#define ADP5585_GPI_PIN_ROW5 42
-#define ADP5585_GPI_PIN_COL0 43
-#define ADP5585_GPI_PIN_COL1 44
-#define ADP5585_GPI_PIN_COL2 45
-#define ADP5585_GPI_PIN_COL3 46
-#define ADP5585_GPI_PIN_COL4 47
-#define GPI_LOGIC 48
-
-#define ADP5585_GPI_PIN_ROW_BASE ADP5585_GPI_PIN_ROW0
-#define ADP5585_GPI_PIN_ROW_END ADP5585_GPI_PIN_ROW5
-#define ADP5585_GPI_PIN_COL_BASE ADP5585_GPI_PIN_COL0
-#define ADP5585_GPI_PIN_COL_END ADP5585_GPI_PIN_COL4
-
-#define ADP5585_GPI_PIN_BASE ADP5585_GPI_PIN_ROW_BASE
-#define ADP5585_GPI_PIN_END ADP5585_GPI_PIN_COL_END
-
-#define ADP5585_GPIMAPSIZE_MAX (ADP5585_GPI_PIN_END - ADP5585_GPI_PIN_BASE + 1)
-
-struct adp5589_gpi_map {
- unsigned short pin;
- unsigned short sw_evt;
-};
-
-/* scan_cycle_time */
-#define ADP5589_SCAN_CYCLE_10ms 0
-#define ADP5589_SCAN_CYCLE_20ms 1
-#define ADP5589_SCAN_CYCLE_30ms 2
-#define ADP5589_SCAN_CYCLE_40ms 3
-
-/* RESET_CFG */
-#define RESET_PULSE_WIDTH_500us 0
-#define RESET_PULSE_WIDTH_1ms 1
-#define RESET_PULSE_WIDTH_2ms 2
-#define RESET_PULSE_WIDTH_10ms 3
-
-#define RESET_TRIG_TIME_0ms (0 << 2)
-#define RESET_TRIG_TIME_1000ms (1 << 2)
-#define RESET_TRIG_TIME_1500ms (2 << 2)
-#define RESET_TRIG_TIME_2000ms (3 << 2)
-#define RESET_TRIG_TIME_2500ms (4 << 2)
-#define RESET_TRIG_TIME_3000ms (5 << 2)
-#define RESET_TRIG_TIME_3500ms (6 << 2)
-#define RESET_TRIG_TIME_4000ms (7 << 2)
-
-#define RESET_PASSTHRU_EN (1 << 5)
-#define RESET1_POL_HIGH (1 << 6)
-#define RESET1_POL_LOW (0 << 6)
-#define RESET2_POL_HIGH (1 << 7)
-#define RESET2_POL_LOW (0 << 7)
-
-/* ADP5589 Mask Bits:
- * C C C C C C C C C C C | R R R R R R R R
- * 1 9 8 7 6 5 4 3 2 1 0 | 7 6 5 4 3 2 1 0
- * 0
- * ---------------- BIT ------------------
- * 1 1 1 1 1 1 1 1 1 0 0 | 0 0 0 0 0 0 0 0
- * 8 7 6 5 4 3 2 1 0 9 8 | 7 6 5 4 3 2 1 0
- */
-
-#define ADP_ROW(x) (1 << (x))
-#define ADP_COL(x) (1 << (x + 8))
-#define ADP5589_ROW_MASK 0xFF
-#define ADP5589_COL_MASK 0xFF
-#define ADP5589_COL_SHIFT 8
-#define ADP5589_MAX_ROW_NUM 7
-#define ADP5589_MAX_COL_NUM 10
-
-/* ADP5585 Mask Bits:
- * C C C C C | R R R R R R
- * 4 3 2 1 0 | 5 4 3 2 1 0
- *
- * ---- BIT -- -----------
- * 1 0 0 0 0 | 0 0 0 0 0 0
- * 0 9 8 7 6 | 5 4 3 2 1 0
- */
-
-#define ADP5585_ROW_MASK 0x3F
-#define ADP5585_COL_MASK 0x1F
-#define ADP5585_ROW_SHIFT 0
-#define ADP5585_COL_SHIFT 6
-#define ADP5585_MAX_ROW_NUM 5
-#define ADP5585_MAX_COL_NUM 4
-
-#define ADP5585_ROW(x) (1 << ((x) & ADP5585_ROW_MASK))
-#define ADP5585_COL(x) (1 << (((x) & ADP5585_COL_MASK) + ADP5585_COL_SHIFT))
-
-/* Put one of these structures in i2c_board_info platform_data */
-
-struct adp5589_kpad_platform_data {
- unsigned keypad_en_mask; /* Keypad (Rows/Columns) enable mask */
- const unsigned short *keymap; /* Pointer to keymap */
- unsigned short keymapsize; /* Keymap size */
- bool repeat; /* Enable key repeat */
- bool en_keylock; /* Enable key lock feature (ADP5589 only)*/
- unsigned char unlock_key1; /* Unlock Key 1 (ADP5589 only) */
- unsigned char unlock_key2; /* Unlock Key 2 (ADP5589 only) */
- unsigned char unlock_timer; /* Time in seconds [0..7] between the two unlock keys 0=disable (ADP5589 only) */
- unsigned char scan_cycle_time; /* Time between consecutive scan cycles */
- unsigned char reset_cfg; /* Reset config */
- unsigned short reset1_key_1; /* Reset Key 1 */
- unsigned short reset1_key_2; /* Reset Key 2 */
- unsigned short reset1_key_3; /* Reset Key 3 */
- unsigned short reset2_key_1; /* Reset Key 1 */
- unsigned short reset2_key_2; /* Reset Key 2 */
- unsigned debounce_dis_mask; /* Disable debounce mask */
- unsigned pull_dis_mask; /* Disable all pull resistors mask */
- unsigned pullup_en_100k; /* Pull-Up 100k Enable Mask */
- unsigned pullup_en_300k; /* Pull-Up 300k Enable Mask */
- unsigned pulldown_en_300k; /* Pull-Down 300k Enable Mask */
- const struct adp5589_gpi_map *gpimap;
- unsigned short gpimapsize;
- const struct adp5589_gpio_platform_data *gpio_data;
-};
-
-struct i2c_client; /* forward declaration */
-
-struct adp5589_gpio_platform_data {
- int gpio_start; /* GPIO Chip base # */
-};
-
-#endif
diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h
index f479ef5b3341..fa1f328d6712 100644
--- a/include/linux/intel_rapl.h
+++ b/include/linux/intel_rapl.h
@@ -152,7 +152,7 @@ struct rapl_if_priv {
union rapl_reg reg_unit;
union rapl_reg regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];
int limits[RAPL_DOMAIN_MAX];
- int (*read_raw)(int id, struct reg_action *ra, bool atomic);
+ int (*read_raw)(int id, struct reg_action *ra, bool pmu_ctx);
int (*write_raw)(int id, struct reg_action *ra);
void *defaults;
void *rpi;
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 266f2b39213a..b2bb878abd11 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -228,7 +228,7 @@ static inline int __must_check
devm_request_irq(struct device *dev, unsigned int irq, irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
{
- return devm_request_threaded_irq(dev, irq, handler, NULL, irqflags,
+ return devm_request_threaded_irq(dev, irq, handler, NULL, irqflags | IRQF_COND_ONESHOT,
devname, dev_id);
}
diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
index a3e8ddc9b380..4c9770536eb5 100644
--- a/include/linux/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -444,6 +444,9 @@ struct io_ring_ctx {
struct list_head defer_list;
unsigned nr_drained;
+ /* protected by ->completion_lock */
+ unsigned nr_req_allocated;
+
#ifdef CONFIG_NET_RX_BUSY_POLL
struct list_head napi_list; /* track busy poll napi_id */
spinlock_t napi_lock; /* napi_list lock */
@@ -456,10 +459,6 @@ struct io_ring_ctx {
DECLARE_HASHTABLE(napi_ht, 4);
#endif
- /* protected by ->completion_lock */
- unsigned evfd_last_cq_tail;
- unsigned nr_req_allocated;
-
/*
* Protection for resize vs mmap races - both the mmap and resize
* side will need to grab this lock, to prevent either side from
diff --git a/include/linux/leds-expresswire.h b/include/linux/leds-expresswire.h
index a422921f4159..7f8c4795f69f 100644
--- a/include/linux/leds-expresswire.h
+++ b/include/linux/leds-expresswire.h
@@ -30,9 +30,6 @@ struct expresswire_common_props {
void expresswire_power_off(struct expresswire_common_props *props);
void expresswire_enable(struct expresswire_common_props *props);
-void expresswire_start(struct expresswire_common_props *props);
-void expresswire_end(struct expresswire_common_props *props);
-void expresswire_set_bit(struct expresswire_common_props *props, bool bit);
void expresswire_write_u8(struct expresswire_common_props *props, u8 val);
#endif /* _LEDS_EXPRESSWIRE_H */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 39534fafa36a..a5c66eb708f4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -75,7 +75,7 @@ enum ata_quirks {
__ATA_QUIRK_NO_DMA_LOG, /* Do not use DMA for log read */
__ATA_QUIRK_NOTRIM, /* Do not use TRIM */
__ATA_QUIRK_MAX_SEC_1024, /* Limit max sects to 1024 */
- __ATA_QUIRK_MAX_SEC_8191, /* Limit max sects to 8191 */
+ __ATA_QUIRK_MAX_SEC, /* Limit max sectors */
__ATA_QUIRK_MAX_TRIM_128M, /* Limit max trim size to 128M */
__ATA_QUIRK_NO_NCQ_ON_ATI, /* Disable NCQ on ATI chipset */
__ATA_QUIRK_NO_LPM_ON_ATI, /* Disable LPM on ATI chipset */
@@ -116,7 +116,7 @@ enum {
ATA_QUIRK_NO_DMA_LOG = (1U << __ATA_QUIRK_NO_DMA_LOG),
ATA_QUIRK_NOTRIM = (1U << __ATA_QUIRK_NOTRIM),
ATA_QUIRK_MAX_SEC_1024 = (1U << __ATA_QUIRK_MAX_SEC_1024),
- ATA_QUIRK_MAX_SEC_8191 = (1U << __ATA_QUIRK_MAX_SEC_8191),
+ ATA_QUIRK_MAX_SEC = (1U << __ATA_QUIRK_MAX_SEC),
ATA_QUIRK_MAX_TRIM_128M = (1U << __ATA_QUIRK_MAX_TRIM_128M),
ATA_QUIRK_NO_NCQ_ON_ATI = (1U << __ATA_QUIRK_NO_NCQ_ON_ATI),
ATA_QUIRK_NO_LPM_ON_ATI = (1U << __ATA_QUIRK_NO_LPM_ON_ATI),
@@ -903,6 +903,9 @@ struct ata_port {
u64 qc_active;
int nr_active_links; /* #links with active qcs */
+ struct work_struct deferred_qc_work;
+ struct ata_queued_cmd *deferred_qc;
+
struct ata_link link; /* host default link */
struct ata_link *slave_link; /* see ata_slave_link_init() */
diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
index 5f70d3b5d1b1..097ef4dfcdac 100644
--- a/include/linux/mfd/wm8350/core.h
+++ b/include/linux/mfd/wm8350/core.h
@@ -667,7 +667,7 @@ static inline int wm8350_register_irq(struct wm8350 *wm8350, int irq,
return -ENODEV;
return request_threaded_irq(irq + wm8350->irq_base, NULL,
- handler, flags, name, data);
+ handler, flags | IRQF_ONESHOT, name, data);
}
static inline void wm8350_free_irq(struct wm8350 *wm8350, int irq, void *data)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 1c54aa6f74fb..1967d1c79139 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -1281,12 +1281,12 @@ static inline bool mlx5_rl_is_supported(struct mlx5_core_dev *dev)
static inline int mlx5_core_is_mp_slave(struct mlx5_core_dev *dev)
{
return MLX5_CAP_GEN(dev, affiliate_nic_vport_criteria) &&
- MLX5_CAP_GEN(dev, num_vhca_ports) <= 1;
+ MLX5_CAP_GEN_MAX(dev, num_vhca_ports) <= 1;
}
static inline int mlx5_core_is_mp_master(struct mlx5_core_dev *dev)
{
- return MLX5_CAP_GEN(dev, num_vhca_ports) > 1;
+ return MLX5_CAP_GEN_MAX(dev, num_vhca_ports) > 1;
}
static inline int mlx5_core_mp_enabled(struct mlx5_core_dev *dev)
diff --git a/include/linux/module.h b/include/linux/module.h
index d80c3ea57472..ac254525014c 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -748,6 +748,15 @@ static inline void __module_get(struct module *module)
__mod ? __mod->name : "kernel"; \
})
+static inline const unsigned char *module_buildid(struct module *mod)
+{
+#ifdef CONFIG_STACKTRACE_BUILD_ID
+ return mod->build_id;
+#else
+ return NULL;
+#endif
+}
+
/* Dereference module function descriptor */
void *dereference_module_function_descriptor(struct module *mod, void *ptr);
diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index ce76f5c632e1..049d55c38d52 100644
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -287,7 +287,7 @@ struct spinand_device;
/**
* struct spinand_id - SPI NAND id structure
- * @data: buffer containing the id bytes. Currently 4 bytes large, but can
+ * @data: buffer containing the id bytes. Currently 5 bytes large, but can
* be extended if required
* @len: ID length
*/
diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
index 4286bfdbfdfa..c021c7af175f 100644
--- a/include/linux/pci-epc.h
+++ b/include/linux/pci-epc.h
@@ -223,6 +223,13 @@ struct pci_epc_bar_desc {
/**
* struct pci_epc_features - features supported by a EPC device per function
* @linkup_notifier: indicate if the EPC device can notify EPF driver on link up
+ * @dynamic_inbound_mapping: indicate if the EPC device supports updating
+ * inbound mappings for an already configured BAR
+ * (i.e. allow calling pci_epc_set_bar() again
+ * without first calling pci_epc_clear_bar())
+ * @subrange_mapping: indicate if the EPC device can map inbound subranges for a
+ * BAR. This feature depends on @dynamic_inbound_mapping
+ * feature.
* @msi_capable: indicate if the endpoint function has MSI capability
* @msix_capable: indicate if the endpoint function has MSI-X capability
* @intx_capable: indicate if the endpoint can raise INTx interrupts
@@ -231,6 +238,8 @@ struct pci_epc_bar_desc {
*/
struct pci_epc_features {
unsigned int linkup_notifier : 1;
+ unsigned int dynamic_inbound_mapping : 1;
+ unsigned int subrange_mapping : 1;
unsigned int msi_capable : 1;
unsigned int msix_capable : 1;
unsigned int intx_capable : 1;
diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
index 48f68c4dcfa5..7737a7c03260 100644
--- a/include/linux/pci-epf.h
+++ b/include/linux/pci-epf.h
@@ -110,6 +110,22 @@ struct pci_epf_driver {
#define to_pci_epf_driver(drv) container_of_const((drv), struct pci_epf_driver, driver)
+/**
+ * struct pci_epf_bar_submap - BAR subrange for inbound mapping
+ * @phys_addr: target physical/DMA address for this subrange
+ * @size: the size of the subrange to be mapped
+ *
+ * When pci_epf_bar.num_submap is >0, pci_epf_bar.submap describes the
+ * complete BAR layout. This allows an EPC driver to program multiple
+ * inbound translation windows for a single BAR when supported by the
+ * controller. The array order defines the BAR layout (submap[0] at offset
+ * 0, and each immediately follows the previous one).
+ */
+struct pci_epf_bar_submap {
+ dma_addr_t phys_addr;
+ size_t size;
+};
+
/**
* struct pci_epf_bar - represents the BAR of EPF device
* @phys_addr: physical address that should be mapped to the BAR
@@ -119,6 +135,9 @@ struct pci_epf_driver {
* requirement
* @barno: BAR number
* @flags: flags that are set for the BAR
+ * @num_submap: number of entries in @submap
+ * @submap: array of subrange descriptors allocated by the caller. See
+ * struct pci_epf_bar_submap for the semantics in detail.
*/
struct pci_epf_bar {
dma_addr_t phys_addr;
@@ -127,6 +146,10 @@ struct pci_epf_bar {
size_t mem_size;
enum pci_barno barno;
int flags;
+
+ /* Optional sub-range mapping */
+ unsigned int num_submap;
+ struct pci_epf_bar_submap *submap;
};
/**
diff --git a/include/linux/psp.h b/include/linux/psp.h
index 92e60aeef21e..b337dcce1e99 100644
--- a/include/linux/psp.h
+++ b/include/linux/psp.h
@@ -18,6 +18,7 @@
* and should include an appropriate local definition in their source file.
*/
#define PSP_CMDRESP_STS GENMASK(15, 0)
+#define PSP_TEE_STS_RING_BUSY 0x0000000d /* Ring already initialized */
#define PSP_CMDRESP_CMD GENMASK(23, 16)
#define PSP_CMDRESP_RESERVED GENMASK(29, 24)
#define PSP_CMDRESP_RECOVERY BIT(30)
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index d6ebf0596510..2fb266ea69fa 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -181,7 +181,6 @@ int seq_open_private(struct file *, const struct seq_operations *, int);
int seq_release_private(struct inode *, struct file *);
#ifdef CONFIG_BINARY_PRINTF
-__printf(2, 0)
void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary);
#endif
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 221123660e71..f827cc3cb146 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -1303,15 +1303,14 @@ __scoped_seqlock_next(struct ss_tmp *sst, seqlock_t *lock, enum ss_state target)
__scoped_seqlock_next(&_s, _seqlock, _target))
/**
- * scoped_seqlock_read (lock, ss_state) - execute the read side critical
- * section without manual sequence
- * counter handling or calls to other
- * helpers
- * @lock: pointer to seqlock_t protecting the data
- * @ss_state: one of {ss_lock, ss_lock_irqsave, ss_lockless} indicating
- * the type of critical read section
- *
- * Example:
+ * scoped_seqlock_read() - execute the read-side critical section
+ * without manual sequence counter handling
+ * or calls to other helpers
+ * @_seqlock: pointer to seqlock_t protecting the data
+ * @_target: an enum ss_state: one of {ss_lock, ss_lock_irqsave, ss_lockless}
+ * indicating the type of critical read section
+ *
+ * Example::
*
* scoped_seqlock_read (&lock, ss_lock) {
* // read-side critical section
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 49847888c287..829b281d6c9c 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -97,6 +97,8 @@ struct sk_psock {
struct sk_buff_head ingress_skb;
struct list_head ingress_msg;
spinlock_t ingress_lock;
+ /** @msg_tot_len: Total bytes queued in ingress_msg list. */
+ u32 msg_tot_len;
unsigned long state;
struct list_head link;
spinlock_t link_lock;
@@ -141,6 +143,8 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,
struct sk_msg *msg, u32 bytes);
int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
int len, int flags);
+int __sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
+ int len, int flags, int *copied_from_self);
bool sk_msg_is_readable(struct sock *sk);
static inline void sk_msg_check_to_free(struct sk_msg *msg, u32 i, u32 bytes)
@@ -319,6 +323,27 @@ static inline void sock_drop(struct sock *sk, struct sk_buff *skb)
kfree_skb(skb);
}
+static inline u32 sk_psock_get_msg_len_nolock(struct sk_psock *psock)
+{
+ /* Used by ioctl to read msg_tot_len only; lock-free for performance */
+ return READ_ONCE(psock->msg_tot_len);
+}
+
+static inline void sk_psock_msg_len_add_locked(struct sk_psock *psock, int diff)
+{
+ /* Use WRITE_ONCE to ensure correct read in sk_psock_get_msg_len_nolock().
+ * ingress_lock should be held to prevent concurrent updates to msg_tot_len
+ */
+ WRITE_ONCE(psock->msg_tot_len, psock->msg_tot_len + diff);
+}
+
+static inline void sk_psock_msg_len_add(struct sk_psock *psock, int diff)
+{
+ spin_lock_bh(&psock->ingress_lock);
+ sk_psock_msg_len_add_locked(psock, diff);
+ spin_unlock_bh(&psock->ingress_lock);
+}
+
static inline bool sk_psock_queue_msg(struct sk_psock *psock,
struct sk_msg *msg)
{
@@ -327,6 +352,7 @@ static inline bool sk_psock_queue_msg(struct sk_psock *psock,
spin_lock_bh(&psock->ingress_lock);
if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {
list_add_tail(&msg->list, &psock->ingress_msg);
+ sk_psock_msg_len_add_locked(psock, msg->sg.size);
ret = true;
} else {
sk_msg_free(psock->sk, msg);
@@ -343,18 +369,25 @@ static inline struct sk_msg *sk_psock_dequeue_msg(struct sk_psock *psock)
spin_lock_bh(&psock->ingress_lock);
msg = list_first_entry_or_null(&psock->ingress_msg, struct sk_msg, list);
- if (msg)
+ if (msg) {
list_del(&msg->list);
+ sk_psock_msg_len_add_locked(psock, -msg->sg.size);
+ }
spin_unlock_bh(&psock->ingress_lock);
return msg;
}
+static inline struct sk_msg *sk_psock_peek_msg_locked(struct sk_psock *psock)
+{
+ return list_first_entry_or_null(&psock->ingress_msg, struct sk_msg, list);
+}
+
static inline struct sk_msg *sk_psock_peek_msg(struct sk_psock *psock)
{
struct sk_msg *msg;
spin_lock_bh(&psock->ingress_lock);
- msg = list_first_entry_or_null(&psock->ingress_msg, struct sk_msg, list);
+ msg = sk_psock_peek_msg_locked(psock);
spin_unlock_bh(&psock->ingress_lock);
return msg;
}
@@ -521,6 +554,39 @@ static inline bool sk_psock_strp_enabled(struct sk_psock *psock)
return !!psock->saved_data_ready;
}
+/* for tcp only, sk is locked */
+static inline ssize_t sk_psock_msg_inq(struct sock *sk)
+{
+ struct sk_psock *psock;
+ ssize_t inq = 0;
+
+ psock = sk_psock_get(sk);
+ if (likely(psock)) {
+ inq = sk_psock_get_msg_len_nolock(psock);
+ sk_psock_put(sk, psock);
+ }
+ return inq;
+}
+
+/* for udp only, sk is not locked */
+static inline ssize_t sk_msg_first_len(struct sock *sk)
+{
+ struct sk_psock *psock;
+ struct sk_msg *msg;
+ ssize_t inq = 0;
+
+ psock = sk_psock_get(sk);
+ if (likely(psock)) {
+ spin_lock_bh(&psock->ingress_lock);
+ msg = sk_psock_peek_msg_locked(psock);
+ if (msg)
+ inq = msg->sg.size;
+ spin_unlock_bh(&psock->ingress_lock);
+ sk_psock_put(sk, psock);
+ }
+ return inq;
+}
+
#if IS_ENABLED(CONFIG_NET_SOCK_MSG)
#define BPF_F_STRPARSER (1UL << 1)
diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h
index 0a4edfe3d96d..f052e241736c 100644
--- a/include/linux/soc/qcom/ubwc.h
+++ b/include/linux/soc/qcom/ubwc.h
@@ -8,6 +8,7 @@
#define __QCOM_UBWC_H__
#include <linux/bits.h>
+#include <linux/printk.h>
#include <linux/types.h>
struct qcom_ubwc_cfg_data {
diff --git a/include/linux/string.h b/include/linux/string.h
index 1b564c36d721..b850bd91b3d8 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -336,8 +336,8 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s);
#define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s)
#ifdef CONFIG_BINARY_PRINTF
-__printf(3, 0) int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);
-__printf(3, 0) int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);
+int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);
+int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);
#endif
extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
diff --git a/include/linux/sunrpc/xdrgen/_builtins.h b/include/linux/sunrpc/xdrgen/_builtins.h
index 66ca3ece951a..a5ab75d2db04 100644
--- a/include/linux/sunrpc/xdrgen/_builtins.h
+++ b/include/linux/sunrpc/xdrgen/_builtins.h
@@ -188,12 +188,10 @@ xdrgen_decode_string(struct xdr_stream *xdr, string *ptr, u32 maxlen)
return false;
if (unlikely(maxlen && len > maxlen))
return false;
- if (len != 0) {
- p = xdr_inline_decode(xdr, len);
- if (unlikely(!p))
- return false;
- ptr->data = (unsigned char *)p;
- }
+ p = xdr_inline_decode(xdr, len);
+ if (unlikely(!p))
+ return false;
+ ptr->data = (unsigned char *)p;
ptr->len = len;
return true;
}
@@ -219,12 +217,10 @@ xdrgen_decode_opaque(struct xdr_stream *xdr, opaque *ptr, u32 maxlen)
return false;
if (unlikely(maxlen && len > maxlen))
return false;
- if (len != 0) {
- p = xdr_inline_decode(xdr, len);
- if (unlikely(!p))
- return false;
- ptr->data = (u8 *)p;
- }
+ p = xdr_inline_decode(xdr, len);
+ if (unlikely(!p))
+ return false;
+ ptr->data = (u8 *)p;
ptr->len = len;
return true;
}
diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h
index 457879938fc1..3366090a86bd 100644
--- a/include/linux/u64_stats_sync.h
+++ b/include/linux/u64_stats_sync.h
@@ -89,6 +89,11 @@ static inline void u64_stats_add(u64_stats_t *p, unsigned long val)
local64_add(val, &p->v);
}
+static inline void u64_stats_sub(u64_stats_t *p, s64 val)
+{
+ local64_sub(val, &p->v);
+}
+
static inline void u64_stats_inc(u64_stats_t *p)
{
local64_inc(&p->v);
@@ -130,6 +135,11 @@ static inline void u64_stats_add(u64_stats_t *p, unsigned long val)
p->v += val;
}
+static inline void u64_stats_sub(u64_stats_t *p, s64 val)
+{
+ p->v -= val;
+}
+
static inline void u64_stats_inc(u64_stats_t *p)
{
p->v++;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 4263e71a23ef..8aadf4cdead2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -730,6 +730,8 @@ struct hci_conn {
__u16 le_per_adv_data_offset;
__u8 le_adv_phy;
__u8 le_adv_sec_phy;
+ __u8 le_tx_def_phys;
+ __u8 le_rx_def_phys;
__u8 le_tx_phy;
__u8 le_rx_phy;
__s8 rssi;
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index ea32393464a2..827b87a95dab 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -51,11 +51,25 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
return outer;
}
+/* Apply either ECT(0) or ECT(1) */
+static inline void __INET_ECN_xmit(struct sock *sk, bool use_ect_1)
+{
+ __u8 ect = use_ect_1 ? INET_ECN_ECT_1 : INET_ECN_ECT_0;
+
+ /* Mask the complete byte in case the connection alternates between
+ * ECT(0) and ECT(1).
+ */
+ inet_sk(sk)->tos &= ~INET_ECN_MASK;
+ inet_sk(sk)->tos |= ect;
+ if (inet6_sk(sk)) {
+ inet6_sk(sk)->tclass &= ~INET_ECN_MASK;
+ inet6_sk(sk)->tclass |= ect;
+ }
+}
+
static inline void INET_ECN_xmit(struct sock *sk)
{
- inet_sk(sk)->tos |= INET_ECN_ECT_0;
- if (inet6_sk(sk) != NULL)
- inet6_sk(sk)->tclass |= INET_ECN_ECT_0;
+ __INET_ECN_xmit(sk, false);
}
static inline void INET_ECN_dontxmit(struct sock *sk)
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 74fbf1ad8065..6a933690e0ff 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -1280,12 +1280,15 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
static inline int ip6_sock_set_v6only(struct sock *sk)
{
- if (inet_sk(sk)->inet_num)
- return -EINVAL;
+ int ret = 0;
+
lock_sock(sk);
- sk->sk_ipv6only = true;
+ if (inet_sk(sk)->inet_num)
+ ret = -EINVAL;
+ else
+ sk->sk_ipv6only = true;
release_sock(sk);
- return 0;
+ return ret;
}
static inline void ip6_sock_set_recverr(struct sock *sk)
diff --git a/include/net/netfilter/nf_conntrack_count.h b/include/net/netfilter/nf_conntrack_count.h
index 52a06de41aa0..cf0166520cf3 100644
--- a/include/net/netfilter/nf_conntrack_count.h
+++ b/include/net/netfilter/nf_conntrack_count.h
@@ -13,6 +13,7 @@ struct nf_conncount_list {
u32 last_gc; /* jiffies at most recent gc */
struct list_head head; /* connections with the same filtering key */
unsigned int count; /* length of list */
+ unsigned int last_gc_count; /* length of list at most recent gc */
};
struct nf_conncount_data *nf_conncount_init(struct net *net, unsigned int keylen);
diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index 4aeffddb7586..45eb26b2e95b 100644
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -6,11 +6,13 @@
#include <linux/ipv6.h>
#include <linux/jhash.h>
#include <linux/netfilter.h>
+#include <linux/rhashtable-types.h>
#include <linux/skbuff.h>
/* Each queued (to userspace) skbuff has one of these. */
struct nf_queue_entry {
struct list_head list;
+ struct rhash_head hash_node;
struct sk_buff *skb;
unsigned int id;
unsigned int hook_index; /* index in hook_entries->hook[] */
@@ -19,7 +21,9 @@ struct nf_queue_entry {
struct net_device *physout;
#endif
struct nf_hook_state state;
+ bool nf_ct_is_unconfirmed;
u16 size; /* sizeof(entry) + saved route keys */
+ u16 queue_num;
/* extra space to store route keys */
};
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 0e266c2d0e7f..7eac73f9b4ce 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -278,6 +278,8 @@ struct nft_userdata {
unsigned char data[];
};
+#define NFT_SET_ELEM_INTERNAL_LAST 0x1
+
/* placeholder structure for opaque set element backend representation. */
struct nft_elem_priv { };
@@ -287,6 +289,7 @@ struct nft_elem_priv { };
* @key: element key
* @key_end: closing element key
* @data: element data
+ * @flags: flags
* @priv: element private data and extensions
*/
struct nft_set_elem {
@@ -302,6 +305,7 @@ struct nft_set_elem {
u32 buf[NFT_DATA_VALUE_MAXLEN / sizeof(u32)];
struct nft_data val;
} data;
+ u32 flags;
struct nft_elem_priv *priv;
};
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 2dbd46fc4734..8e971c7bf164 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -88,6 +88,12 @@ struct netns_ipv4 {
int sysctl_tcp_rcvbuf_low_rtt;
__cacheline_group_end(netns_ipv4_read_rx);
+ /* ICMP rate limiter hot cache line. */
+ __cacheline_group_begin_aligned(icmp);
+ atomic_t icmp_global_credit;
+ u32 icmp_global_stamp;
+ __cacheline_group_end_aligned(icmp);
+
struct inet_timewait_death_row tcp_death_row;
struct udp_table *udp_table;
@@ -141,8 +147,7 @@ struct netns_ipv4 {
int sysctl_icmp_ratemask;
int sysctl_icmp_msgs_per_sec;
int sysctl_icmp_msgs_burst;
- atomic_t icmp_global_credit;
- u32 icmp_global_stamp;
+
u32 ip_rt_min_pmtu;
int ip_rt_mtu_expires;
int ip_rt_min_advmss;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0deb5e9dd911..e0a5cf2f7818 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1203,7 +1203,15 @@ enum tcp_ca_ack_event_flags {
#define TCP_CONG_NON_RESTRICTED BIT(0)
/* Requires ECN/ECT set on all packets */
#define TCP_CONG_NEEDS_ECN BIT(1)
-#define TCP_CONG_MASK (TCP_CONG_NON_RESTRICTED | TCP_CONG_NEEDS_ECN)
+/* Require successfully negotiated AccECN capability */
+#define TCP_CONG_NEEDS_ACCECN BIT(2)
+/* Use ECT(1) instead of ECT(0) while the CA is uninitialized */
+#define TCP_CONG_ECT_1_NEGOTIATION BIT(3)
+/* Cannot fallback to RFC3168 during AccECN negotiation */
+#define TCP_CONG_NO_FALLBACK_RFC3168 BIT(4)
+#define TCP_CONG_MASK (TCP_CONG_NON_RESTRICTED | TCP_CONG_NEEDS_ECN | \
+ TCP_CONG_NEEDS_ACCECN | TCP_CONG_ECT_1_NEGOTIATION | \
+ TCP_CONG_NO_FALLBACK_RFC3168)
union tcp_cc_info;
@@ -1335,6 +1343,27 @@ static inline bool tcp_ca_needs_ecn(const struct sock *sk)
return icsk->icsk_ca_ops->flags & TCP_CONG_NEEDS_ECN;
}
+static inline bool tcp_ca_needs_accecn(const struct sock *sk)
+{
+ const struct inet_connection_sock *icsk = inet_csk(sk);
+
+ return icsk->icsk_ca_ops->flags & TCP_CONG_NEEDS_ACCECN;
+}
+
+static inline bool tcp_ca_ect_1_negotiation(const struct sock *sk)
+{
+ const struct inet_connection_sock *icsk = inet_csk(sk);
+
+ return icsk->icsk_ca_ops->flags & TCP_CONG_ECT_1_NEGOTIATION;
+}
+
+static inline bool tcp_ca_no_fallback_rfc3168(const struct sock *sk)
+{
+ const struct inet_connection_sock *icsk = inet_csk(sk);
+
+ return icsk->icsk_ca_ops->flags & TCP_CONG_NO_FALLBACK_RFC3168;
+}
+
static inline void tcp_ca_event(struct sock *sk, const enum tcp_ca_event event)
{
const struct inet_connection_sock *icsk = inet_csk(sk);
diff --git a/include/net/tcp_ecn.h b/include/net/tcp_ecn.h
index f13e5cd2b1ac..a709fb1756eb 100644
--- a/include/net/tcp_ecn.h
+++ b/include/net/tcp_ecn.h
@@ -31,6 +31,12 @@ enum tcp_accecn_option {
TCP_ACCECN_OPTION_FULL = 2,
};
+/* Apply either ECT(0) or ECT(1) based on TCP_CONG_ECT_1_NEGOTIATION flag */
+static inline void INET_ECN_xmit_ect_1_negotiation(struct sock *sk)
+{
+ __INET_ECN_xmit(sk, tcp_ca_ect_1_negotiation(sk));
+}
+
static inline void tcp_ecn_queue_cwr(struct tcp_sock *tp)
{
/* Do not set CWR if in AccECN mode! */
@@ -467,6 +473,26 @@ static inline u8 tcp_accecn_option_init(const struct sk_buff *skb,
return TCP_ACCECN_OPT_COUNTER_SEEN;
}
+static inline void tcp_ecn_rcv_synack_accecn(struct sock *sk,
+ const struct sk_buff *skb, u8 dsf)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+
+ tcp_ecn_mode_set(tp, TCP_ECN_MODE_ACCECN);
+ tp->syn_ect_rcv = dsf & INET_ECN_MASK;
+ /* Demand Accurate ECN option in response to the SYN on the SYN/ACK
+ * and the TCP server will try to send one more packet with an AccECN
+ * Option at a later point during the connection.
+ */
+ if (tp->rx_opt.accecn &&
+ tp->saw_accecn_opt < TCP_ACCECN_OPT_COUNTER_SEEN) {
+ u8 saw_opt = tcp_accecn_option_init(skb, tp->rx_opt.accecn);
+
+ tcp_accecn_saw_opt_fail_recv(tp, saw_opt);
+ tp->accecn_opt_demand = 2;
+ }
+}
+
/* See Table 2 of the AccECN draft */
static inline void tcp_ecn_rcv_synack(struct sock *sk, const struct sk_buff *skb,
const struct tcphdr *th, u8 ip_dsfield)
@@ -489,32 +515,32 @@ static inline void tcp_ecn_rcv_synack(struct sock *sk, const struct sk_buff *skb
tcp_ecn_mode_set(tp, TCP_ECN_DISABLED);
break;
case 0x1:
- case 0x5:
/* +========+========+============+=============+
* | A | B | SYN/ACK | Feedback |
* | | | B->A | Mode of A |
* | | | AE CWR ECE | |
* +========+========+============+=============+
- * | AccECN | Nonce | 1 0 1 | (Reserved) |
* | AccECN | ECN | 0 0 1 | Classic ECN |
* | Nonce | AccECN | 0 0 1 | Classic ECN |
* | ECN | AccECN | 0 0 1 | Classic ECN |
* +========+========+============+=============+
*/
- if (tcp_ecn_mode_pending(tp))
- /* Downgrade from AccECN, or requested initially */
+ if (tcp_ca_no_fallback_rfc3168(sk))
+ tcp_ecn_mode_set(tp, TCP_ECN_DISABLED);
+ else
tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168);
break;
- default:
- tcp_ecn_mode_set(tp, TCP_ECN_MODE_ACCECN);
- tp->syn_ect_rcv = ip_dsfield & INET_ECN_MASK;
- if (tp->rx_opt.accecn &&
- tp->saw_accecn_opt < TCP_ACCECN_OPT_COUNTER_SEEN) {
- u8 saw_opt = tcp_accecn_option_init(skb, tp->rx_opt.accecn);
-
- tcp_accecn_saw_opt_fail_recv(tp, saw_opt);
- tp->accecn_opt_demand = 2;
+ case 0x5:
+ if (tcp_ecn_mode_pending(tp)) {
+ tcp_ecn_rcv_synack_accecn(sk, skb, ip_dsfield);
+ if (INET_ECN_is_ce(ip_dsfield)) {
+ tp->received_ce++;
+ tp->received_ce_pending++;
+ }
}
+ break;
+ default:
+ tcp_ecn_rcv_synack_accecn(sk, skb, ip_dsfield);
if (INET_ECN_is_ce(ip_dsfield) &&
tcp_accecn_validate_syn_feedback(sk, ace,
tp->syn_ect_snt)) {
@@ -525,9 +551,11 @@ static inline void tcp_ecn_rcv_synack(struct sock *sk, const struct sk_buff *skb
}
}
-static inline void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th,
+static inline void tcp_ecn_rcv_syn(struct sock *sk, const struct tcphdr *th,
const struct sk_buff *skb)
{
+ struct tcp_sock *tp = tcp_sk(sk);
+
if (tcp_ecn_mode_pending(tp)) {
if (!tcp_accecn_syn_requested(th)) {
/* Downgrade to classic ECN feedback */
@@ -539,7 +567,8 @@ static inline void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th,
tcp_ecn_mode_set(tp, TCP_ECN_MODE_ACCECN);
}
}
- if (tcp_ecn_mode_rfc3168(tp) && (!th->ece || !th->cwr))
+ if (tcp_ecn_mode_rfc3168(tp) &&
+ (!th->ece || !th->cwr || tcp_ca_no_fallback_rfc3168(sk)))
tcp_ecn_mode_set(tp, TCP_ECN_DISABLED);
}
@@ -561,7 +590,7 @@ static inline void tcp_ecn_send_synack(struct sock *sk, struct sk_buff *skb)
TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_ECE;
else if (tcp_ca_needs_ecn(sk) ||
tcp_bpf_ca_needs_ecn(sk))
- INET_ECN_xmit(sk);
+ INET_ECN_xmit_ect_1_negotiation(sk);
if (tp->ecn_flags & TCP_ECN_MODE_ACCECN) {
TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_ACE;
@@ -579,7 +608,8 @@ static inline void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb)
bool use_ecn, use_accecn;
u8 tcp_ecn = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_ecn);
- use_accecn = tcp_ecn == TCP_ECN_IN_ACCECN_OUT_ACCECN;
+ use_accecn = tcp_ecn == TCP_ECN_IN_ACCECN_OUT_ACCECN ||
+ tcp_ca_needs_accecn(sk);
use_ecn = tcp_ecn == TCP_ECN_IN_ECN_OUT_ECN ||
tcp_ecn == TCP_ECN_IN_ACCECN_OUT_ECN ||
tcp_ca_needs_ecn(sk) || bpf_needs_ecn || use_accecn;
@@ -595,7 +625,7 @@ static inline void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb)
if (use_ecn) {
if (tcp_ca_needs_ecn(sk) || bpf_needs_ecn)
- INET_ECN_xmit(sk);
+ INET_ECN_xmit_ect_1_negotiation(sk);
TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR;
if (use_accecn) {
diff --git a/include/rdma/rw.h b/include/rdma/rw.h
index d606cac48233..9a8f4b76ce58 100644
--- a/include/rdma/rw.h
+++ b/include/rdma/rw.h
@@ -66,6 +66,8 @@ int rdma_rw_ctx_post(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u32 port_num,
unsigned int rdma_rw_mr_factor(struct ib_device *device, u32 port_num,
unsigned int maxpages);
+unsigned int rdma_rw_max_send_wr(struct ib_device *dev, u32 port_num,
+ unsigned int max_rdma_ctxs, u32 create_flags);
void rdma_rw_init_qp(struct ib_device *dev, struct ib_qp_init_attr *attr);
int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr);
void rdma_rw_cleanup_mrs(struct ib_qp *qp);
diff --git a/include/sound/sdca_jack.h b/include/sound/sdca_jack.h
new file mode 100644
index 000000000000..3ec22046d3eb
--- /dev/null
+++ b/include/sound/sdca_jack.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * The MIPI SDCA specification is available for public downloads at
+ * https://www.mipi.org/mipi-sdca-v1-0-download
+ *
+ * Copyright (C) 2025 Cirrus Logic, Inc. and
+ * Cirrus Logic International Semiconductor Ltd.
+ */
+
+#ifndef __SDCA_JACK_H__
+#define __SDCA_JACK_H__
+
+struct sdca_interrupt;
+struct snd_kcontrol;
+struct snd_soc_jack;
+
+/**
+ * struct jack_state - Jack state structure to keep data between interrupts
+ * @kctl: Pointer to the ALSA control attached to this jack
+ * @jack: Pointer to the ASoC jack struct for this jack
+ */
+struct jack_state {
+ struct snd_kcontrol *kctl;
+ struct snd_soc_jack *jack;
+};
+
+int sdca_jack_alloc_state(struct sdca_interrupt *interrupt);
+int sdca_jack_process(struct sdca_interrupt *interrupt);
+int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *jack);
+int sdca_jack_report(struct sdca_interrupt *interrupt);
+
+#endif // __SDCA_JACK_H__
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index f80aa4c9d88f..ba8281086629 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -105,8 +105,6 @@ extern "C" {
*
* %AMDGPU_GEM_DOMAIN_DOORBELL Doorbell. It is an MMIO region for
* signalling user mode queues.
- *
- * %AMDGPU_GEM_DOMAIN_MMIO_REMAP MMIO remap page (special mapping for HDP flushing).
*/
#define AMDGPU_GEM_DOMAIN_CPU 0x1
#define AMDGPU_GEM_DOMAIN_GTT 0x2
@@ -115,15 +113,13 @@ extern "C" {
#define AMDGPU_GEM_DOMAIN_GWS 0x10
#define AMDGPU_GEM_DOMAIN_OA 0x20
#define AMDGPU_GEM_DOMAIN_DOORBELL 0x40
-#define AMDGPU_GEM_DOMAIN_MMIO_REMAP 0x80
#define AMDGPU_GEM_DOMAIN_MASK (AMDGPU_GEM_DOMAIN_CPU | \
AMDGPU_GEM_DOMAIN_GTT | \
AMDGPU_GEM_DOMAIN_VRAM | \
AMDGPU_GEM_DOMAIN_GDS | \
AMDGPU_GEM_DOMAIN_GWS | \
AMDGPU_GEM_DOMAIN_OA | \
- AMDGPU_GEM_DOMAIN_DOORBELL | \
- AMDGPU_GEM_DOMAIN_MMIO_REMAP)
+ AMDGPU_GEM_DOMAIN_DOORBELL)
/* Flag that CPU access will be required for the case of VRAM domain */
#define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED (1 << 0)
diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h
index 71c7196d3281..e629c4953534 100644
--- a/include/uapi/linux/nfs.h
+++ b/include/uapi/linux/nfs.h
@@ -55,7 +55,7 @@
NFSERR_NODEV = 19, /* v2 v3 v4 */
NFSERR_NOTDIR = 20, /* v2 v3 v4 */
NFSERR_ISDIR = 21, /* v2 v3 v4 */
- NFSERR_INVAL = 22, /* v2 v3 v4 */
+ NFSERR_INVAL = 22, /* v3 v4 */
NFSERR_FBIG = 27, /* v2 v3 v4 */
NFSERR_NOSPC = 28, /* v2 v3 v4 */
NFSERR_ROFS = 30, /* v2 v3 v4 */
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 19154228780b..8e15c3a70ed4 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1342,17 +1342,13 @@ static inline void *ufshcd_get_variant(struct ufs_hba *hba)
return hba->priv;
}
-#ifdef CONFIG_PM
extern int ufshcd_runtime_suspend(struct device *dev);
extern int ufshcd_runtime_resume(struct device *dev);
-#endif
-#ifdef CONFIG_PM_SLEEP
extern int ufshcd_system_suspend(struct device *dev);
extern int ufshcd_system_resume(struct device *dev);
extern int ufshcd_system_freeze(struct device *dev);
extern int ufshcd_system_thaw(struct device *dev);
extern int ufshcd_system_restore(struct device *dev);
-#endif
extern int ufshcd_dme_reset(struct ufs_hba *hba);
extern int ufshcd_dme_enable(struct ufs_hba *hba);
diff --git a/include/xen/xen.h b/include/xen/xen.h
index 61854e3f2837..f280c5dcf923 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -69,11 +69,13 @@ extern u64 xen_saved_max_mem_size;
#endif
#ifdef CONFIG_XEN_UNPOPULATED_ALLOC
+extern unsigned long xen_unpopulated_pages;
int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages);
void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages);
#include <linux/ioport.h>
int arch_xen_unpopulated_init(struct resource **res);
#else
+#define xen_unpopulated_pages 0UL
#include <xen/balloon.h>
static inline int xen_alloc_unpopulated_pages(unsigned int nr_pages,
struct page **pages)
diff --git a/io_uring/cancel.h b/io_uring/cancel.h
index 6783961ede1b..1b201a094303 100644
--- a/io_uring/cancel.h
+++ b/io_uring/cancel.h
@@ -6,10 +6,8 @@
struct io_cancel_data {
struct io_ring_ctx *ctx;
- union {
- u64 data;
- struct file *file;
- };
+ u64 data;
+ struct file *file;
u8 opcode;
u32 flags;
int seq;
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index b7a077c11c21..63efd60829f3 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -138,7 +138,7 @@
static void io_queue_sqe(struct io_kiocb *req, unsigned int extra_flags);
static void __io_req_caches_free(struct io_ring_ctx *ctx);
-static __read_mostly DEFINE_STATIC_KEY_FALSE(io_key_has_sqarray);
+static __read_mostly DEFINE_STATIC_KEY_DEFERRED_FALSE(io_key_has_sqarray, HZ);
struct kmem_cache *req_cachep;
static struct workqueue_struct *iou_wq __ro_after_init;
@@ -2375,7 +2375,7 @@ static bool io_get_sqe(struct io_ring_ctx *ctx, const struct io_uring_sqe **sqe)
unsigned mask = ctx->sq_entries - 1;
unsigned head = ctx->cached_sq_head++ & mask;
- if (static_branch_unlikely(&io_key_has_sqarray) &&
+ if (static_branch_unlikely(&io_key_has_sqarray.key) &&
(!(ctx->flags & IORING_SETUP_NO_SQARRAY))) {
head = READ_ONCE(ctx->sq_array[head]);
if (unlikely(head >= ctx->sq_entries)) {
@@ -2867,7 +2867,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
io_rings_free(ctx);
if (!(ctx->flags & IORING_SETUP_NO_SQARRAY))
- static_branch_dec(&io_key_has_sqarray);
+ static_branch_slow_dec_deferred(&io_key_has_sqarray);
percpu_ref_exit(&ctx->refs);
free_uid(ctx->user);
@@ -3256,7 +3256,11 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
ctx = file->private_data;
ret = -EBADFD;
- if (unlikely(ctx->flags & IORING_SETUP_R_DISABLED))
+ /*
+ * Keep IORING_SETUP_R_DISABLED check before submitter_task load
+ * in io_uring_add_tctx_node() -> __io_uring_add_tctx_node_from_submit()
+ */
+ if (unlikely(smp_load_acquire(&ctx->flags) & IORING_SETUP_R_DISABLED))
goto out;
/*
@@ -3596,7 +3600,7 @@ static __cold int io_uring_create(struct io_ctx_config *config)
ctx->clock_offset = 0;
if (!(ctx->flags & IORING_SETUP_NO_SQARRAY))
- static_branch_inc(&io_key_has_sqarray);
+ static_branch_deferred_inc(&io_key_has_sqarray);
if ((ctx->flags & IORING_SETUP_DEFER_TASKRUN) &&
!(ctx->flags & IORING_SETUP_IOPOLL) &&
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 796d131107dd..67d4fe576473 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -669,8 +669,9 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
bl->buf_ring = br;
if (reg.flags & IOU_PBUF_RING_INC)
bl->flags |= IOBL_INC;
- io_buffer_add_list(ctx, bl, reg.bgid);
- return 0;
+ ret = io_buffer_add_list(ctx, bl, reg.bgid);
+ if (!ret)
+ return 0;
fail:
io_free_region(ctx->user, &bl->region);
kfree(bl);
diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c
index 7063ea7964e7..87b4d306cf1b 100644
--- a/io_uring/msg_ring.c
+++ b/io_uring/msg_ring.c
@@ -125,7 +125,11 @@ static int __io_msg_ring_data(struct io_ring_ctx *target_ctx,
return -EINVAL;
if (!(msg->flags & IORING_MSG_RING_FLAGS_PASS) && msg->dst_fd)
return -EINVAL;
- if (target_ctx->flags & IORING_SETUP_R_DISABLED)
+ /*
+ * Keep IORING_SETUP_R_DISABLED check before submitter_task load
+ * in io_msg_data_remote() -> io_msg_remote_post()
+ */
+ if (smp_load_acquire(&target_ctx->flags) & IORING_SETUP_R_DISABLED)
return -EBADFD;
if (io_msg_need_remote(target_ctx))
@@ -245,7 +249,11 @@ static int io_msg_send_fd(struct io_kiocb *req, unsigned int issue_flags)
return -EINVAL;
if (target_ctx == ctx)
return -EINVAL;
- if (target_ctx->flags & IORING_SETUP_R_DISABLED)
+ /*
+ * Keep IORING_SETUP_R_DISABLED check before submitter_task load
+ * in io_msg_fd_remote()
+ */
+ if (smp_load_acquire(&target_ctx->flags) & IORING_SETUP_R_DISABLED)
return -EBADFD;
if (!msg->src_file) {
int ret = io_msg_grab_file(req, issue_flags);
diff --git a/io_uring/register.c b/io_uring/register.c
index 3d3822ff3fd9..12318c276068 100644
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -193,7 +193,8 @@ static int io_register_enable_rings(struct io_ring_ctx *ctx)
if (ctx->restrictions.registered)
ctx->restricted = 1;
- ctx->flags &= ~IORING_SETUP_R_DISABLED;
+ /* Keep submitter_task store before clearing IORING_SETUP_R_DISABLED */
+ smp_store_release(&ctx->flags, ctx->flags & ~IORING_SETUP_R_DISABLED);
if (ctx->sq_data && wq_has_sleeper(&ctx->sq_data->wait))
wake_up(&ctx->sq_data->wait);
return 0;
diff --git a/io_uring/sync.c b/io_uring/sync.c
index cea2d381ffd2..ab7fa1cd7dd6 100644
--- a/io_uring/sync.c
+++ b/io_uring/sync.c
@@ -62,6 +62,8 @@ int io_fsync_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return -EINVAL;
sync->off = READ_ONCE(sqe->off);
+ if (sync->off < 0)
+ return -EINVAL;
sync->len = READ_ONCE(sqe->len);
req->flags |= REQ_F_FORCE_ASYNC;
return 0;
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 15b17e86e198..9b087ebeb643 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -214,7 +214,7 @@ static int ipc_permissions(struct ctl_table_header *head, const struct ctl_table
if (((table->data == &ns->ids[IPC_SEM_IDS].next_id) ||
(table->data == &ns->ids[IPC_MSG_IDS].next_id) ||
(table->data == &ns->ids[IPC_SHM_IDS].next_id)) &&
- checkpoint_restore_ns_capable(ns->user_ns))
+ checkpoint_restore_ns_capable_noaudit(ns->user_ns))
mode = 0666;
else
#endif
diff --git a/kernel/bpf/bpf_insn_array.c b/kernel/bpf/bpf_insn_array.c
index c96630cb75bf..37b43102953e 100644
--- a/kernel/bpf/bpf_insn_array.c
+++ b/kernel/bpf/bpf_insn_array.c
@@ -126,7 +126,7 @@ static int insn_array_map_direct_value_addr(const struct bpf_map *map, u64 *imm,
return -EINVAL;
/* from BPF's point of view, this map is a jump table */
- *imm = (unsigned long)insn_array->ips + off;
+ *imm = (unsigned long)insn_array->ips;
return 0;
}
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 1b9b18e5b03c..85c0feaae0d3 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -713,8 +713,8 @@ static struct bpf_ksym *bpf_ksym_find(unsigned long addr)
return n ? container_of(n, struct bpf_ksym, tnode) : NULL;
}
-int __bpf_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char *sym)
+int bpf_address_lookup(unsigned long addr, unsigned long *size,
+ unsigned long *off, char *sym)
{
struct bpf_ksym *ksym;
int ret = 0;
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index db72b96f9c8c..f66284f8ec2c 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -1077,7 +1077,7 @@ const struct bpf_func_proto bpf_snprintf_proto = {
.func = bpf_snprintf,
.gpl_only = true,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_MEM_OR_NULL,
+ .arg1_type = ARG_PTR_TO_MEM_OR_NULL | MEM_WRITE,
.arg2_type = ARG_CONST_SIZE_OR_ZERO,
.arg3_type = ARG_PTR_TO_CONST_STR,
.arg4_type = ARG_PTR_TO_MEM | PTR_MAYBE_NULL | MEM_RDONLY,
diff --git a/kernel/bpf/rqspinlock.c b/kernel/bpf/rqspinlock.c
index f7d0c8d4644e..2fdfa828e3d3 100644
--- a/kernel/bpf/rqspinlock.c
+++ b/kernel/bpf/rqspinlock.c
@@ -265,10 +265,11 @@ int __lockfunc resilient_tas_spin_lock(rqspinlock_t *lock)
RES_INIT_TIMEOUT(ts);
/*
- * The fast path is not invoked for the TAS fallback, so we must grab
- * the deadlock detection entry here.
+ * We are either called directly from res_spin_lock after grabbing the
+ * deadlock detection entry when queued spinlocks are disabled, or from
+ * resilient_queued_spin_lock_slowpath after grabbing the deadlock
+ * detection entry. No need to obtain it here.
*/
- grab_held_lock_entry(lock);
/*
* Since the waiting loop's time is dependent on the amount of
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 4ff82144f885..ce7db2f3be6f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1366,11 +1366,6 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token,
return ret;
}
-static bool bpf_net_capable(void)
-{
- return capable(CAP_NET_ADMIN) || capable(CAP_SYS_ADMIN);
-}
-
#define BPF_MAP_CREATE_LAST_FIELD excl_prog_hash_size
/* called via syscall */
static int map_create(union bpf_attr *attr, bpfptr_t uattr)
@@ -2820,6 +2815,13 @@ static int bpf_prog_verify_signature(struct bpf_prog *prog, union bpf_attr *attr
void *sig;
int err = 0;
+ /*
+ * Don't attempt to use kmalloc_large or vmalloc for signatures.
+ * Practical signature for BPF program should be below this limit.
+ */
+ if (attr->signature_size > KMALLOC_MAX_CACHE_SIZE)
+ return -EINVAL;
+
if (system_keyring_id_check(attr->keyring_id) == 0)
key = bpf_lookup_system_key(attr->keyring_id);
else
@@ -4565,6 +4567,8 @@ static int bpf_prog_detach(const union bpf_attr *attr)
prog = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
if (IS_ERR(prog))
return PTR_ERR(prog);
+ } else if (!bpf_mprog_detach_empty(ptype)) {
+ return -EPERM;
}
} else if (is_cgroup_prog_type(ptype, 0, false)) {
if (attr->attach_flags || attr->relative_fd)
@@ -5310,6 +5314,9 @@ static int bpf_map_get_info_by_fd(struct file *file,
if (info.hash_size != SHA256_DIGEST_SIZE)
return -EINVAL;
+ if (!READ_ONCE(map->frozen))
+ return -EPERM;
+
err = map->ops->map_get_hash(map, SHA256_DIGEST_SIZE, map->sha);
if (err != 0)
return err;
@@ -6407,7 +6414,7 @@ static const struct bpf_func_proto bpf_kallsyms_lookup_name_proto = {
.func = bpf_kallsyms_lookup_name,
.gpl_only = false,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_MEM,
+ .arg1_type = ARG_PTR_TO_MEM | MEM_RDONLY,
.arg2_type = ARG_CONST_SIZE_OR_ZERO,
.arg3_type = ARG_ANYTHING,
.arg4_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
index 976d89011b15..b9a358d7a78f 100644
--- a/kernel/bpf/trampoline.c
+++ b/kernel/bpf/trampoline.c
@@ -214,10 +214,15 @@ static int modify_fentry(struct bpf_trampoline *tr, u32 orig_flags,
int ret;
if (tr->func.ftrace_managed) {
+ unsigned long addr = (unsigned long) new_addr;
+
+ if (bpf_trampoline_use_jmp(tr->flags))
+ addr = ftrace_jmp_set(addr);
+
if (lock_direct_mutex)
- ret = modify_ftrace_direct(tr->fops, (long)new_addr);
+ ret = modify_ftrace_direct(tr->fops, addr);
else
- ret = modify_ftrace_direct_nolock(tr->fops, (long)new_addr);
+ ret = modify_ftrace_direct_nolock(tr->fops, addr);
} else {
ret = bpf_trampoline_update_fentry(tr, orig_flags, old_addr,
new_addr);
@@ -240,10 +245,15 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr)
}
if (tr->func.ftrace_managed) {
+ unsigned long addr = (unsigned long) new_addr;
+
+ if (bpf_trampoline_use_jmp(tr->flags))
+ addr = ftrace_jmp_set(addr);
+
ret = ftrace_set_filter_ip(tr->fops, (unsigned long)ip, 0, 1);
if (ret)
return ret;
- ret = register_ftrace_direct(tr->fops, (long)new_addr);
+ ret = register_ftrace_direct(tr->fops, addr);
} else {
ret = bpf_trampoline_update_fentry(tr, 0, NULL, new_addr);
}
@@ -499,13 +509,6 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr, bool lock_direct_mut
if (err)
goto out_free;
-#ifdef CONFIG_DYNAMIC_FTRACE_WITH_JMP
- if (bpf_trampoline_use_jmp(tr->flags))
- tr->fops->flags |= FTRACE_OPS_FL_JMP;
- else
- tr->fops->flags &= ~FTRACE_OPS_FL_JMP;
-#endif
-
WARN_ON(tr->cur_image && total == 0);
if (tr->cur_image)
/* progs already running at this address */
@@ -533,15 +536,8 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr, bool lock_direct_mut
tr->cur_image = im;
out:
/* If any error happens, restore previous flags */
- if (err) {
+ if (err)
tr->flags = orig_flags;
-#ifdef CONFIG_DYNAMIC_FTRACE_WITH_JMP
- if (bpf_trampoline_use_jmp(tr->flags))
- tr->fops->flags |= FTRACE_OPS_FL_JMP;
- else
- tr->fops->flags &= ~FTRACE_OPS_FL_JMP;
-#endif
- }
kfree(tlinks);
return err;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 3135643d5695..fe01edfcc34c 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -16827,6 +16827,7 @@ static void sync_linked_regs(struct bpf_verifier_state *vstate, struct bpf_reg_s
} else {
s32 saved_subreg_def = reg->subreg_def;
s32 saved_off = reg->off;
+ u32 saved_id = reg->id;
fake_reg.type = SCALAR_VALUE;
__mark_reg_known(&fake_reg, (s32)reg->off - (s32)known_reg->off);
@@ -16834,10 +16835,11 @@ static void sync_linked_regs(struct bpf_verifier_state *vstate, struct bpf_reg_s
/* reg = known_reg; reg += delta */
copy_register_state(reg, known_reg);
/*
- * Must preserve off, id and add_const flag,
+ * Must preserve off, id and subreg_def flag,
* otherwise another sync_linked_regs() will be incorrect.
*/
reg->off = saved_off;
+ reg->id = saved_id;
reg->subreg_def = saved_subreg_def;
scalar32_min_max_add(reg, &fake_reg);
@@ -19835,8 +19837,10 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)
}
}
if (bpf_calls_callback(env, insn_idx)) {
- if (states_equal(env, &sl->state, cur, RANGE_WITHIN))
+ if (states_equal(env, &sl->state, cur, RANGE_WITHIN)) {
+ loop = true;
goto hit;
+ }
goto skip_inf_loop_check;
}
/* attempt to detect infinite loop to avoid unnecessary doomed work */
@@ -20611,17 +20615,19 @@ static int do_check(struct bpf_verifier_env *env)
* may skip a nospec patched-in after the jump. This can
* currently never happen because nospec_result is only
* used for the write-ops
- * `*(size*)(dst_reg+off)=src_reg|imm32` which must
- * never skip the following insn. Still, add a warning
- * to document this in case nospec_result is used
- * elsewhere in the future.
+ * `*(size*)(dst_reg+off)=src_reg|imm32` and helper
+ * calls. These must never skip the following insn
+ * (i.e., bpf_insn_successors()'s opcode_info.can_jump
+ * is false). Still, add a warning to document this in
+ * case nospec_result is used elsewhere in the future.
*
* All non-branch instructions have a single
* fall-through edge. For these, nospec_result should
* already work.
*/
- if (verifier_bug_if(BPF_CLASS(insn->code) == BPF_JMP ||
- BPF_CLASS(insn->code) == BPF_JMP32, env,
+ if (verifier_bug_if((BPF_CLASS(insn->code) == BPF_JMP ||
+ BPF_CLASS(insn->code) == BPF_JMP32) &&
+ BPF_OP(insn->code) != BPF_CALL, env,
"speculation barrier after jump instruction may not have the desired effect"))
return -EFAULT;
process_bpf_exit:
@@ -20679,29 +20685,29 @@ static int find_btf_percpu_datasec(struct btf *btf)
}
/*
- * Add btf to the used_btfs array and return the index. (If the btf was
- * already added, then just return the index.) Upon successful insertion
- * increase btf refcnt, and, if present, also refcount the corresponding
- * kernel module.
+ * Add btf to the env->used_btfs array. If needed, refcount the
+ * corresponding kernel module. To simplify caller's logic
+ * in case of error or if btf was added before the function
+ * decreases the btf refcount.
*/
static int __add_used_btf(struct bpf_verifier_env *env, struct btf *btf)
{
struct btf_mod_pair *btf_mod;
+ int ret = 0;
int i;
/* check whether we recorded this BTF (and maybe module) already */
for (i = 0; i < env->used_btf_cnt; i++)
if (env->used_btfs[i].btf == btf)
- return i;
+ goto ret_put;
if (env->used_btf_cnt >= MAX_USED_BTFS) {
verbose(env, "The total number of btfs per program has reached the limit of %u\n",
MAX_USED_BTFS);
- return -E2BIG;
+ ret = -E2BIG;
+ goto ret_put;
}
- btf_get(btf);
-
btf_mod = &env->used_btfs[env->used_btf_cnt];
btf_mod->btf = btf;
btf_mod->module = NULL;
@@ -20710,12 +20716,18 @@ static int __add_used_btf(struct bpf_verifier_env *env, struct btf *btf)
if (btf_is_module(btf)) {
btf_mod->module = btf_try_get_module(btf);
if (!btf_mod->module) {
- btf_put(btf);
- return -ENXIO;
+ ret = -ENXIO;
+ goto ret_put;
}
}
- return env->used_btf_cnt++;
+ env->used_btf_cnt++;
+ return 0;
+
+ret_put:
+ /* Either error or this BTF was already added */
+ btf_put(btf);
+ return ret;
}
/* replace pseudo btf_id with kernel symbol address */
@@ -20812,9 +20824,7 @@ static int check_pseudo_btf_id(struct bpf_verifier_env *env,
btf_fd = insn[1].imm;
if (btf_fd) {
- CLASS(fd, f)(btf_fd);
-
- btf = __btf_get_by_fd(f);
+ btf = btf_get_by_fd(btf_fd);
if (IS_ERR(btf)) {
verbose(env, "invalid module BTF object FD specified.\n");
return -EINVAL;
@@ -20824,17 +20834,17 @@ static int check_pseudo_btf_id(struct bpf_verifier_env *env,
verbose(env, "kernel is missing BTF, make sure CONFIG_DEBUG_INFO_BTF=y is specified in Kconfig.\n");
return -EINVAL;
}
+ btf_get(btf_vmlinux);
btf = btf_vmlinux;
}
err = __check_pseudo_btf_id(env, insn, aux, btf);
- if (err)
+ if (err) {
+ btf_put(btf);
return err;
+ }
- err = __add_used_btf(env, btf);
- if (err < 0)
- return err;
- return 0;
+ return __add_used_btf(env, btf);
}
static bool is_tracing_prog_type(enum bpf_prog_type type)
@@ -24650,10 +24660,8 @@ static int add_fd_from_fd_array(struct bpf_verifier_env *env, int fd)
btf = __btf_get_by_fd(f);
if (!IS_ERR(btf)) {
- err = __add_used_btf(env, btf);
- if (err < 0)
- return err;
- return 0;
+ btf_get(btf);
+ return __add_used_btf(env, btf);
}
verbose(env, "fd %d is not pointing to valid bpf_map or btf\n", fd);
@@ -25076,15 +25084,18 @@ static int compute_scc(struct bpf_verifier_env *env)
}
/*
* Assign SCC number only if component has two or more elements,
- * or if component has a self reference.
+ * or if component has a self reference, or if instruction is a
+ * callback calling function (implicit loop).
*/
- assign_scc = stack[stack_sz - 1] != w;
- for (j = 0; j < succ->cnt; ++j) {
+ assign_scc = stack[stack_sz - 1] != w; /* two or more elements? */
+ for (j = 0; j < succ->cnt; ++j) { /* self reference? */
if (succ->items[j] == w) {
assign_scc = true;
break;
}
}
+ if (bpf_calls_callback(env, w)) /* implicit loop? */
+ assign_scc = true;
/* Pop component elements from stack */
do {
t = stack[--stack_sz];
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 049e296f586c..cdd6e025935d 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -345,7 +345,7 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
return 1;
}
return !!module_address_lookup(addr, symbolsize, offset, NULL, NULL, namebuf) ||
- !!__bpf_address_lookup(addr, symbolsize, offset, namebuf);
+ !!bpf_address_lookup(addr, symbolsize, offset, namebuf);
}
static int kallsyms_lookup_buildid(unsigned long addr,
@@ -377,12 +377,11 @@ static int kallsyms_lookup_buildid(unsigned long addr,
ret = module_address_lookup(addr, symbolsize, offset,
modname, modbuildid, namebuf);
if (!ret)
- ret = bpf_address_lookup(addr, symbolsize,
- offset, modname, namebuf);
+ ret = bpf_address_lookup(addr, symbolsize, offset, namebuf);
if (!ret)
- ret = ftrace_mod_address_lookup(addr, symbolsize,
- offset, modname, namebuf);
+ ret = ftrace_mod_address_lookup(addr, symbolsize, offset,
+ modname, modbuildid, namebuf);
return ret;
}
diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c
index 00a60796327c..0fc11e45df9b 100644
--- a/kernel/module/kallsyms.c
+++ b/kernel/module/kallsyms.c
@@ -334,13 +334,8 @@ int module_address_lookup(unsigned long addr,
if (mod) {
if (modname)
*modname = mod->name;
- if (modbuildid) {
-#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID)
- *modbuildid = mod->build_id;
-#else
- *modbuildid = NULL;
-#endif
- }
+ if (modbuildid)
+ *modbuildid = module_buildid(mod);
sym = find_kallsyms_symbol(mod, addr, size, offset);
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 07e51974b06b..83934402a287 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -1750,7 +1750,7 @@ rcu_torture_writer(void *arg)
ulo[i] = cur_ops->get_comp_state();
gp_snap = cur_ops->start_gp_poll();
rcu_torture_writer_state = RTWS_POLL_WAIT;
- if (cur_ops->exp_current && !torture_random(&rand) % 0xff)
+ if (cur_ops->exp_current && !(torture_random(&rand) & 0xff))
cur_ops->exp_current();
while (!cur_ops->poll_gp_state(gp_snap)) {
gp_snap1 = cur_ops->get_gp_state();
@@ -1772,7 +1772,7 @@ rcu_torture_writer(void *arg)
cur_ops->get_comp_state_full(&rgo[i]);
cur_ops->start_gp_poll_full(&gp_snap_full);
rcu_torture_writer_state = RTWS_POLL_WAIT_FULL;
- if (cur_ops->exp_current && !torture_random(&rand) % 0xff)
+ if (cur_ops->exp_current && !(torture_random(&rand) & 0xff))
cur_ops->exp_current();
while (!cur_ops->poll_gp_state_full(&gp_snap_full)) {
cur_ops->get_gp_state_full(&gp_snap1_full);
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index b8bbe7960cda..2265b9c2906e 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -203,7 +203,7 @@ struct rcu_data {
/* during and after the last grace */
/* period it is aware of. */
struct irq_work defer_qs_iw; /* Obtain later scheduler attention. */
- int defer_qs_iw_pending; /* Scheduler attention pending? */
+ int defer_qs_pending; /* irqwork or softirq pending? */
struct work_struct strict_work; /* Schedule readers for strict GPs. */
/* 2) batch handling */
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index dbe2d02be824..95ad967adcf3 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -487,8 +487,8 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
union rcu_special special;
rdp = this_cpu_ptr(&rcu_data);
- if (rdp->defer_qs_iw_pending == DEFER_QS_PENDING)
- rdp->defer_qs_iw_pending = DEFER_QS_IDLE;
+ if (rdp->defer_qs_pending == DEFER_QS_PENDING)
+ rdp->defer_qs_pending = DEFER_QS_IDLE;
/*
* If RCU core is waiting for this CPU to exit its critical section,
@@ -645,7 +645,7 @@ static void rcu_preempt_deferred_qs_handler(struct irq_work *iwp)
* 5. Deferred QS reporting does not happen.
*/
if (rcu_preempt_depth() > 0)
- WRITE_ONCE(rdp->defer_qs_iw_pending, DEFER_QS_IDLE);
+ WRITE_ONCE(rdp->defer_qs_pending, DEFER_QS_IDLE);
}
/*
@@ -747,7 +747,10 @@ static void rcu_read_unlock_special(struct task_struct *t)
// Using softirq, safe to awaken, and either the
// wakeup is free or there is either an expedited
// GP in flight or a potential need to deboost.
- raise_softirq_irqoff(RCU_SOFTIRQ);
+ if (rdp->defer_qs_pending != DEFER_QS_PENDING) {
+ rdp->defer_qs_pending = DEFER_QS_PENDING;
+ raise_softirq_irqoff(RCU_SOFTIRQ);
+ }
} else {
// Enabling BH or preempt does reschedule, so...
// Also if no expediting and no possible deboosting,
@@ -755,11 +758,11 @@ static void rcu_read_unlock_special(struct task_struct *t)
// tick enabled.
set_need_resched_current();
if (IS_ENABLED(CONFIG_IRQ_WORK) && irqs_were_disabled &&
- needs_exp && rdp->defer_qs_iw_pending != DEFER_QS_PENDING &&
+ needs_exp && rdp->defer_qs_pending != DEFER_QS_PENDING &&
cpu_online(rdp->cpu)) {
// Get scheduler to re-evaluate and call hooks.
// If !IRQ_WORK, FQS scan will eventually IPI.
- rdp->defer_qs_iw_pending = DEFER_QS_PENDING;
+ rdp->defer_qs_pending = DEFER_QS_PENDING;
irq_work_queue_on(&rdp->defer_qs_iw, rdp->cpu);
}
}
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 61c2d65156b5..dbf4e32a063f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -119,6 +119,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_compute_energy_tp);
+EXPORT_TRACEPOINT_SYMBOL_GPL(sched_entry_tp);
+EXPORT_TRACEPOINT_SYMBOL_GPL(sched_exit_tp);
+EXPORT_TRACEPOINT_SYMBOL_GPL(sched_set_need_resched_tp);
DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
DEFINE_PER_CPU(struct rnd_state, sched_rnd_state);
@@ -1136,6 +1139,7 @@ void __trace_set_need_resched(struct task_struct *curr, int tif)
{
trace_sched_set_need_resched_tp(curr, smp_processor_id(), tif);
}
+EXPORT_SYMBOL_GPL(__trace_set_need_resched);
void resched_curr(struct rq *rq)
{
@@ -9111,6 +9115,7 @@ void sched_move_task(struct task_struct *tsk, bool for_autogroup)
{
unsigned int queue_flags = DEQUEUE_SAVE | DEQUEUE_MOVE;
bool resched = false;
+ bool queued = false;
struct rq *rq;
CLASS(task_rq_lock, rq_guard)(tsk);
@@ -9122,10 +9127,13 @@ void sched_move_task(struct task_struct *tsk, bool for_autogroup)
scx_cgroup_move_task(tsk);
if (scope->running)
resched = true;
+ queued = scope->queued;
}
if (resched)
resched_curr(rq);
+ else if (queued)
+ wakeup_preempt(rq, tsk, 0);
__balance_callbacks(rq, &rq_guard.rf);
}
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 7bcde7114f1b..e3a6b8ed1d6d 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -3656,6 +3656,9 @@ static void __dl_clear_params(struct sched_dl_entity *dl_se)
dl_se->dl_non_contending = 0;
dl_se->dl_overrun = 0;
dl_se->dl_server = 0;
+ dl_se->dl_defer = 0;
+ dl_se->dl_defer_running = 0;
+ dl_se->dl_defer_armed = 0;
#ifdef CONFIG_RT_MUTEXES
dl_se->pi_se = dl_se;
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index f1867fe8e5c5..e0ff90905019 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2100,6 +2100,7 @@ static void push_rt_tasks(struct rq *rq)
*/
static int rto_next_cpu(struct root_domain *rd)
{
+ int this_cpu = smp_processor_id();
int next;
int cpu;
@@ -2123,6 +2124,10 @@ static int rto_next_cpu(struct root_domain *rd)
rd->rto_cpu = cpu;
+ /* Do not send IPI to self */
+ if (cpu == this_cpu)
+ continue;
+
if (cpu < nr_cpu_ids)
return cpu;
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 0e4bc1ca15ff..84c8ab2a0ceb 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1742,7 +1742,7 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
lockdep_assert_held(&cpu_base->lock);
- debug_deactivate(timer);
+ debug_hrtimer_deactivate(timer);
base->running = timer;
/*
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index f39111830ca3..f3aaef695b8c 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -215,7 +215,7 @@ void sched_clock_register(u64 (*read)(void), int bits, unsigned long rate)
update_clock_read_data(&rd);
- if (sched_clock_timer.function != NULL) {
+ if (ACCESS_PRIVATE(&sched_clock_timer, function) != NULL) {
/* update timeout for clock wrap */
hrtimer_start(&sched_clock_timer, cd.wrap_kt,
HRTIMER_MODE_REL_HARD);
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index d031c8d80be4..c4db5c2e7103 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -793,7 +793,7 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
return PTR_ERR(bt);
}
blk_trace_setup_finalize(q, name, 1, bt, &buts2);
- strcpy(buts.name, buts2.name);
+ strscpy(buts.name, buts2.name, BLKTRACE_BDEV_SIZE);
mutex_unlock(&q->debugfs_mutex);
if (copy_to_user(arg, &buts, sizeof(buts))) {
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index fe28d86f7c35..59c2394981c7 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -1022,7 +1022,7 @@ const struct bpf_func_proto bpf_snprintf_btf_proto = {
.func = bpf_snprintf_btf,
.gpl_only = false,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_MEM,
+ .arg1_type = ARG_PTR_TO_MEM | MEM_WRITE,
.arg2_type = ARG_CONST_SIZE,
.arg3_type = ARG_PTR_TO_MEM | MEM_RDONLY,
.arg4_type = ARG_CONST_SIZE,
@@ -1526,7 +1526,7 @@ static const struct bpf_func_proto bpf_read_branch_records_proto = {
.gpl_only = true,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
- .arg2_type = ARG_PTR_TO_MEM_OR_NULL,
+ .arg2_type = ARG_PTR_TO_MEM_OR_NULL | MEM_WRITE,
.arg3_type = ARG_CONST_SIZE_OR_ZERO,
.arg4_type = ARG_ANYTHING,
};
@@ -1661,7 +1661,7 @@ static const struct bpf_func_proto bpf_get_stack_proto_raw_tp = {
.gpl_only = true,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
- .arg2_type = ARG_PTR_TO_MEM | MEM_RDONLY,
+ .arg2_type = ARG_PTR_TO_UNINIT_MEM,
.arg3_type = ARG_CONST_SIZE_OR_ZERO,
.arg4_type = ARG_ANYTHING,
};
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index aa758efc3731..e835d878038b 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -6049,15 +6049,8 @@ int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
if (ftrace_hash_empty(hash))
return -EINVAL;
- /* This is a "raw" address, and this should never happen. */
- if (WARN_ON_ONCE(ftrace_is_jmp(addr)))
- return -EINVAL;
-
mutex_lock(&direct_mutex);
- if (ops->flags & FTRACE_OPS_FL_JMP)
- addr = ftrace_jmp_set(addr);
-
/* Make sure requested entries are not already registered.. */
size = 1 << hash->size_bits;
for (i = 0; i < size; i++) {
@@ -6178,13 +6171,6 @@ __modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
lockdep_assert_held_once(&direct_mutex);
- /* This is a "raw" address, and this should never happen. */
- if (WARN_ON_ONCE(ftrace_is_jmp(addr)))
- return -EINVAL;
-
- if (ops->flags & FTRACE_OPS_FL_JMP)
- addr = ftrace_jmp_set(addr);
-
/* Enable the tmp_ops to have the same functions as the direct ops */
ftrace_ops_init(&tmp_ops);
tmp_ops.func_hash = ops->func_hash;
@@ -7753,7 +7739,8 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod_map,
int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
- unsigned long *off, char **modname, char *sym)
+ unsigned long *off, char **modname,
+ const unsigned char **modbuildid, char *sym)
{
struct ftrace_mod_map *mod_map;
int ret = 0;
@@ -7765,6 +7752,8 @@ ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
if (ret) {
if (modname)
*modname = mod_map->mod->name;
+ if (modbuildid)
+ *modbuildid = module_buildid(mod_map->mod);
break;
}
}
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 137b4d9bb116..2c6d3e33b9fb 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3963,11 +3963,6 @@ void trace_put_event_file(struct trace_event_file *file)
EXPORT_SYMBOL_GPL(trace_put_event_file);
#ifdef CONFIG_DYNAMIC_FTRACE
-
-/* Avoid typos */
-#define ENABLE_EVENT_STR "enable_event"
-#define DISABLE_EVENT_STR "disable_event"
-
struct event_probe_data {
struct trace_event_file *file;
unsigned long count;
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index c97bb2fda5c0..7e50df8b800b 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -6911,7 +6911,7 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
remove_hist_vars(hist_data);
- kfree(trigger_data);
+ trigger_data_free(trigger_data);
destroy_hist_data(hist_data);
goto out;
diff --git a/kernel/ucount.c b/kernel/ucount.c
index 586af49fc03e..fc4a8f2d3096 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -47,7 +47,7 @@ static int set_permissions(struct ctl_table_header *head,
int mode;
/* Allow users with CAP_SYS_RESOURCE unrestrained access */
- if (ns_capable(user_ns, CAP_SYS_RESOURCE))
+ if (ns_capable_noaudit(user_ns, CAP_SYS_RESOURCE))
mode = (table->mode & S_IRWXU) >> 6;
else
/* Allow all others at most read-only access */
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 253311af47c6..2909c19540ed 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -117,6 +117,8 @@ enum wq_internal_consts {
MAYDAY_INTERVAL = HZ / 10, /* and then every 100ms */
CREATE_COOLDOWN = HZ, /* time to breath after fail */
+ RESCUER_BATCH = 16, /* process items per turn */
+
/*
* Rescue workers are used only on emergencies and shared by
* all cpus. Give MIN_NICE.
@@ -286,6 +288,7 @@ struct pool_workqueue {
struct list_head pending_node; /* LN: node on wq_node_nr_active->pending_pwqs */
struct list_head pwqs_node; /* WR: node on wq->pwqs */
struct list_head mayday_node; /* MD: node on wq->maydays */
+ struct work_struct mayday_cursor; /* L: cursor on pool->worklist */
u64 stats[PWQ_NR_STATS];
@@ -1120,6 +1123,12 @@ static struct worker *find_worker_executing_work(struct worker_pool *pool,
return NULL;
}
+static void mayday_cursor_func(struct work_struct *work)
+{
+ /* should not be processed, only for marking position */
+ BUG();
+}
+
/**
* move_linked_works - move linked works to a list
* @work: start of series of works to be scheduled
@@ -1182,6 +1191,16 @@ static bool assign_work(struct work_struct *work, struct worker *worker,
lockdep_assert_held(&pool->lock);
+ /* The cursor work should not be processed */
+ if (unlikely(work->func == mayday_cursor_func)) {
+ /* only worker_thread() can possibly take this branch */
+ WARN_ON_ONCE(worker->rescue_wq);
+ if (nextp)
+ *nextp = list_next_entry(work, entry);
+ list_del_init(&work->entry);
+ return false;
+ }
+
/*
* A single work shouldn't be executed concurrently by multiple workers.
* __queue_work() ensures that @work doesn't jump to a different pool
@@ -3440,22 +3459,30 @@ static int worker_thread(void *__worker)
static bool assign_rescuer_work(struct pool_workqueue *pwq, struct worker *rescuer)
{
struct worker_pool *pool = pwq->pool;
+ struct work_struct *cursor = &pwq->mayday_cursor;
struct work_struct *work, *n;
/* need rescue? */
if (!pwq->nr_active || !need_to_create_worker(pool))
return false;
- /*
- * Slurp in all works issued via this workqueue and
- * process'em.
- */
- list_for_each_entry_safe(work, n, &pool->worklist, entry) {
- if (get_work_pwq(work) == pwq && assign_work(work, rescuer, &n))
+ /* search from the start or cursor if available */
+ if (list_empty(&cursor->entry))
+ work = list_first_entry(&pool->worklist, struct work_struct, entry);
+ else
+ work = list_next_entry(cursor, entry);
+
+ /* find the next work item to rescue */
+ list_for_each_entry_safe_from(work, n, &pool->worklist, entry) {
+ if (get_work_pwq(work) == pwq && assign_work(work, rescuer, &n)) {
pwq->stats[PWQ_STAT_RESCUED]++;
+ /* put the cursor for next search */
+ list_move_tail(&cursor->entry, &n->entry);
+ return true;
+ }
}
- return !list_empty(&rescuer->scheduled);
+ return false;
}
/**
@@ -3512,6 +3539,7 @@ static int rescuer_thread(void *__rescuer)
struct pool_workqueue *pwq = list_first_entry(&wq->maydays,
struct pool_workqueue, mayday_node);
struct worker_pool *pool = pwq->pool;
+ unsigned int count = 0;
__set_current_state(TASK_RUNNING);
list_del_init(&pwq->mayday_node);
@@ -3524,19 +3552,16 @@ static int rescuer_thread(void *__rescuer)
WARN_ON_ONCE(!list_empty(&rescuer->scheduled));
- if (assign_rescuer_work(pwq, rescuer)) {
+ while (assign_rescuer_work(pwq, rescuer)) {
process_scheduled_works(rescuer);
/*
- * The above execution of rescued work items could
- * have created more to rescue through
- * pwq_activate_first_inactive() or chained
- * queueing. Let's put @pwq back on mayday list so
- * that such back-to-back work items, which may be
- * being used to relieve memory pressure, don't
- * incur MAYDAY_INTERVAL delay inbetween.
+ * If the per-turn work item limit is reached and other
+ * PWQs are in mayday, requeue mayday for this PWQ and
+ * let the rescuer handle the other PWQs first.
*/
- if (pwq->nr_active && need_to_create_worker(pool)) {
+ if (++count > RESCUER_BATCH && !list_empty(&pwq->wq->maydays) &&
+ pwq->nr_active && need_to_create_worker(pool)) {
raw_spin_lock(&wq_mayday_lock);
/*
* Queue iff somebody else hasn't queued it already.
@@ -3546,9 +3571,14 @@ static int rescuer_thread(void *__rescuer)
list_add_tail(&pwq->mayday_node, &wq->maydays);
}
raw_spin_unlock(&wq_mayday_lock);
+ break;
}
}
+ /* The cursor can not be left behind without the rescuer watching it. */
+ if (!list_empty(&pwq->mayday_cursor.entry) && list_empty(&pwq->mayday_node))
+ list_del_init(&pwq->mayday_cursor.entry);
+
/*
* Leave this pool. Notify regular workers; otherwise, we end up
* with 0 concurrency and stalling the execution.
@@ -5167,6 +5197,19 @@ static void init_pwq(struct pool_workqueue *pwq, struct workqueue_struct *wq,
INIT_LIST_HEAD(&pwq->pwqs_node);
INIT_LIST_HEAD(&pwq->mayday_node);
kthread_init_work(&pwq->release_work, pwq_release_workfn);
+
+ /*
+ * Set the dummy cursor work with valid function and get_work_pwq().
+ *
+ * The cursor work should only be in the pwq->pool->worklist, and
+ * should not be treated as a processable work item.
+ *
+ * WORK_STRUCT_PENDING and WORK_STRUCT_INACTIVE just make it less
+ * surprise for kernel debugging tools and reviewers.
+ */
+ INIT_WORK(&pwq->mayday_cursor, mayday_cursor_func);
+ atomic_long_set(&pwq->mayday_cursor.data, (unsigned long)pwq |
+ WORK_STRUCT_PENDING | WORK_STRUCT_PWQ | WORK_STRUCT_INACTIVE);
}
/* sync @pwq with the current state of its associated wq and link it */
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index ba36939fda79..cda3cf1fa302 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1273,7 +1273,7 @@ config BOOTPARAM_HUNG_TASK_PANIC
high-availability systems that have uptime guarantees and
where a hung tasks must be resolved ASAP.
- Say N if unsure.
+ Say 0 if unsure.
config DETECT_HUNG_TASK_BLOCKER
bool "Dump Hung Tasks Blocker"
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index bdde40cd69d7..97be2a39f537 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -340,8 +340,8 @@ EXPORT_SYMBOL(kstrtos8);
* @s: input string
* @res: result
*
- * This routine returns 0 iff the first character is one of 'YyTt1NnFf0', or
- * [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL. Value
+ * This routine returns 0 iff the first character is one of 'EeYyTt1DdNnFf0',
+ * or [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL. Value
* pointed to by res is updated upon finding a match.
*/
noinline
diff --git a/lib/objpool.c b/lib/objpool.c
index b998b720c732..d98fadf1de16 100644
--- a/lib/objpool.c
+++ b/lib/objpool.c
@@ -142,7 +142,7 @@ int objpool_init(struct objpool_head *pool, int nr_objs, int object_size,
pool->gfp = gfp & ~__GFP_ZERO;
pool->context = context;
pool->release = release;
- slot_size = nr_cpu_ids * sizeof(struct objpool_slot);
+ slot_size = nr_cpu_ids * sizeof(struct objpool_slot *);
pool->cpu_slots = kzalloc(slot_size, pool->gfp);
if (!pool->cpu_slots)
return -ENOMEM;
diff --git a/mm/slub.c b/mm/slub.c
index cdc1e652ec52..e1583757331e 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -6265,11 +6265,29 @@ static void rcu_free_sheaf(struct rcu_head *head)
free_empty_sheaf(s, sheaf);
}
+/*
+ * kvfree_call_rcu() can be called while holding a raw_spinlock_t. Since
+ * __kfree_rcu_sheaf() may acquire a spinlock_t (sleeping lock on PREEMPT_RT),
+ * this would violate lock nesting rules. Therefore, kvfree_call_rcu() avoids
+ * this problem by bypassing the sheaves layer entirely on PREEMPT_RT.
+ *
+ * However, lockdep still complains that it is invalid to acquire spinlock_t
+ * while holding raw_spinlock_t, even on !PREEMPT_RT where spinlock_t is a
+ * spinning lock. Tell lockdep that acquiring spinlock_t is valid here
+ * by temporarily raising the wait-type to LD_WAIT_CONFIG.
+ */
+static DEFINE_WAIT_OVERRIDE_MAP(kfree_rcu_sheaf_map, LD_WAIT_CONFIG);
+
bool __kfree_rcu_sheaf(struct kmem_cache *s, void *obj)
{
struct slub_percpu_sheaves *pcs;
struct slab_sheaf *rcu_sheaf;
+ if (WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_RT)))
+ return false;
+
+ lock_map_acquire_try(&kfree_rcu_sheaf_map);
+
if (!local_trylock(&s->cpu_sheaves->lock))
goto fail;
@@ -6346,10 +6364,12 @@ bool __kfree_rcu_sheaf(struct kmem_cache *s, void *obj)
local_unlock(&s->cpu_sheaves->lock);
stat(s, FREE_RCU_SHEAF);
+ lock_map_release(&kfree_rcu_sheaf_map);
return true;
fail:
stat(s, FREE_RCU_SHEAF_FAIL);
+ lock_map_release(&kfree_rcu_sheaf_map);
return false;
}
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index e70ae2c113f9..358fbe5e4d1d 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -22,6 +22,36 @@
struct atm_vcc *sigd = NULL;
+/*
+ * find_get_vcc - validate and get a reference to a vcc pointer
+ * @vcc: the vcc pointer to validate
+ *
+ * This function validates that @vcc points to a registered VCC in vcc_hash.
+ * If found, it increments the socket reference count and returns the vcc.
+ * The caller must call sock_put(sk_atm(vcc)) when done.
+ *
+ * Returns the vcc pointer if valid, NULL otherwise.
+ */
+static struct atm_vcc *find_get_vcc(struct atm_vcc *vcc)
+{
+ int i;
+
+ read_lock(&vcc_sklist_lock);
+ for (i = 0; i < VCC_HTABLE_SIZE; i++) {
+ struct sock *s;
+
+ sk_for_each(s, &vcc_hash[i]) {
+ if (atm_sk(s) == vcc) {
+ sock_hold(s);
+ read_unlock(&vcc_sklist_lock);
+ return vcc;
+ }
+ }
+ }
+ read_unlock(&vcc_sklist_lock);
+ return NULL;
+}
+
static void sigd_put_skb(struct sk_buff *skb)
{
if (!sigd) {
@@ -69,7 +99,14 @@ static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
msg = (struct atmsvc_msg *) skb->data;
WARN_ON(refcount_sub_and_test(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc));
- vcc = *(struct atm_vcc **) &msg->vcc;
+
+ vcc = find_get_vcc(*(struct atm_vcc **)&msg->vcc);
+ if (!vcc) {
+ pr_debug("invalid vcc pointer in msg\n");
+ dev_kfree_skb(skb);
+ return -EINVAL;
+ }
+
pr_debug("%d (0x%lx)\n", (int)msg->type, (unsigned long)vcc);
sk = sk_atm(vcc);
@@ -100,7 +137,16 @@ static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
clear_bit(ATM_VF_WAITING, &vcc->flags);
break;
case as_indicate:
- vcc = *(struct atm_vcc **)&msg->listen_vcc;
+ /* Release the reference from msg->vcc, we'll use msg->listen_vcc instead */
+ sock_put(sk);
+
+ vcc = find_get_vcc(*(struct atm_vcc **)&msg->listen_vcc);
+ if (!vcc) {
+ pr_debug("invalid listen_vcc pointer in msg\n");
+ dev_kfree_skb(skb);
+ return -EINVAL;
+ }
+
sk = sk_atm(vcc);
pr_debug("as_indicate!!!\n");
lock_sock(sk);
@@ -115,6 +161,8 @@ static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
sk->sk_state_change(sk);
as_indicate_complete:
release_sock(sk);
+ /* Paired with find_get_vcc(msg->listen_vcc) above */
+ sock_put(sk);
return 0;
case as_close:
set_bit(ATM_VF_RELEASED, &vcc->flags);
@@ -131,11 +179,15 @@ static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
break;
default:
pr_alert("bad message type %d\n", (int)msg->type);
+ /* Paired with find_get_vcc(msg->vcc) above */
+ sock_put(sk);
return -EINVAL;
}
sk->sk_state_change(sk);
out:
dev_kfree_skb(skb);
+ /* Paired with find_get_vcc(msg->vcc) above */
+ sock_put(sk);
return 0;
}
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index c3f7828bf9d5..5a4374ccf8e8 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1008,6 +1008,11 @@ static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,
/* conn->src should reflect the local identity address */
hci_copy_identity_address(hdev, &conn->src, &conn->src_type);
conn->mtu = hdev->le_mtu ? hdev->le_mtu : hdev->acl_mtu;
+ /* Use the controller supported PHYS as default until the
+ * remote features are resolved.
+ */
+ conn->le_tx_def_phys = hdev->le_tx_def_phys;
+ conn->le_rx_def_phys = hdev->le_tx_def_phys;
break;
case CIS_LINK:
/* conn->src should reflect the local identity address */
@@ -2928,22 +2933,22 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
break;
case LE_LINK:
- if (conn->le_tx_phy & HCI_LE_SET_PHY_1M)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_1M)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_RX;
- if (conn->le_tx_phy & HCI_LE_SET_PHY_2M)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_2M)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_RX;
- if (conn->le_tx_phy & HCI_LE_SET_PHY_CODED)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_CODED)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_RX;
break;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a9868f17ef40..58075bf72055 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6607,8 +6607,20 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, void *data,
conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
if (conn) {
- if (!ev->status)
- memcpy(conn->features[0], ev->features, 8);
+ if (!ev->status) {
+ memcpy(conn->le_features, ev->features, 8);
+
+ /* Update supported PHYs */
+ if (!(conn->le_features[1] & HCI_LE_PHY_2M)) {
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_2M;
+ conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_2M;
+ }
+
+ if (!(conn->le_features[1] & HCI_LE_PHY_CODED)) {
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ }
+ }
if (conn->state == BT_CONFIG) {
__u8 status;
@@ -7221,9 +7233,21 @@ static void hci_le_read_all_remote_features_evt(struct hci_dev *hdev,
if (!conn)
goto unlock;
- if (!ev->status)
+ if (!ev->status) {
memcpy(conn->le_features, ev->features, 248);
+ /* Update supported PHYs */
+ if (!(conn->le_features[1] & HCI_LE_PHY_2M)) {
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_2M;
+ conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_2M;
+ }
+
+ if (!(conn->le_features[1] & HCI_LE_PHY_CODED)) {
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ }
+ }
+
if (conn->state == BT_CONFIG) {
__u8 status;
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d55a4ab87837..e9a7e6530401 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -244,14 +244,11 @@ br_multicast_port_vid_to_port_ctx(struct net_bridge_port *port, u16 vid)
lockdep_assert_held_once(&port->br->multicast_lock);
- if (!br_opt_get(port->br, BROPT_MCAST_VLAN_SNOOPING_ENABLED))
- return NULL;
-
/* Take RCU to access the vlan. */
rcu_read_lock();
vlan = br_vlan_find(nbp_vlan_group_rcu(port), vid);
- if (vlan && !br_multicast_port_ctx_vlan_disabled(&vlan->port_mcast_ctx))
+ if (vlan)
pmctx = &vlan->port_mcast_ctx;
rcu_read_unlock();
@@ -701,7 +698,10 @@ br_multicast_port_ngroups_inc_one(struct net_bridge_mcast_port *pmctx,
u32 max = READ_ONCE(pmctx->mdb_max_entries);
u32 n = READ_ONCE(pmctx->mdb_n_entries);
- if (max && n >= max) {
+ /* enforce the max limit when it's a port pmctx or a port-vlan pmctx
+ * with snooping enabled
+ */
+ if (!br_multicast_port_ctx_vlan_disabled(pmctx) && max && n >= max) {
NL_SET_ERR_MSG_FMT_MOD(extack, "%s is already in %u groups, and mcast_max_groups=%u",
what, n, max);
return -E2BIG;
@@ -736,9 +736,7 @@ static int br_multicast_port_ngroups_inc(struct net_bridge_port *port,
return err;
}
- /* Only count on the VLAN context if VID is given, and if snooping on
- * that VLAN is enabled.
- */
+ /* Only count on the VLAN context if VID is given */
if (!group->vid)
return 0;
@@ -2011,6 +2009,18 @@ void br_multicast_port_ctx_init(struct net_bridge_port *port,
timer_setup(&pmctx->ip6_own_query.timer,
br_ip6_multicast_port_query_expired, 0);
#endif
+ /* initialize mdb_n_entries if a new port vlan is being created */
+ if (vlan) {
+ struct net_bridge_port_group *pg;
+ u32 n = 0;
+
+ spin_lock_bh(&port->br->multicast_lock);
+ hlist_for_each_entry(pg, &port->mglist, mglist)
+ if (pg->key.addr.vid == vlan->vid)
+ n++;
+ WRITE_ONCE(pmctx->mdb_n_entries, n);
+ spin_unlock_bh(&port->br->multicast_lock);
+ }
}
void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx)
@@ -2094,25 +2104,6 @@ static void __br_multicast_enable_port_ctx(struct net_bridge_mcast_port *pmctx)
br_ip4_multicast_add_router(brmctx, pmctx);
br_ip6_multicast_add_router(brmctx, pmctx);
}
-
- if (br_multicast_port_ctx_is_vlan(pmctx)) {
- struct net_bridge_port_group *pg;
- u32 n = 0;
-
- /* The mcast_n_groups counter might be wrong. First,
- * BR_VLFLAG_MCAST_ENABLED is toggled before temporary entries
- * are flushed, thus mcast_n_groups after the toggle does not
- * reflect the true values. And second, permanent entries added
- * while BR_VLFLAG_MCAST_ENABLED was disabled, are not reflected
- * either. Thus we have to refresh the counter.
- */
-
- hlist_for_each_entry(pg, &pmctx->port->mglist, mglist) {
- if (pg->key.addr.vid == pmctx->vlan->vid)
- n++;
- }
- WRITE_ONCE(pmctx->mdb_n_entries, n);
- }
}
static void br_multicast_enable_port_ctx(struct net_bridge_mcast_port *pmctx)
diff --git a/net/core/dev.c b/net/core/dev.c
index ccef685023c2..f5e4040e0839 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -738,7 +738,7 @@ static struct net_device_path *dev_fwd_path(struct net_device_path_stack *stack)
{
int k = stack->num_paths++;
- if (WARN_ON_ONCE(k >= NET_DEVICE_PATH_STACK_MAX))
+ if (k >= NET_DEVICE_PATH_STACK_MAX)
return NULL;
return &stack->path[k];
diff --git a/net/core/filter.c b/net/core/filter.c
index 029e560e32ce..51318cb40f77 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4137,7 +4137,7 @@ static const struct bpf_func_proto bpf_xdp_store_bytes_proto = {
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
.arg2_type = ARG_ANYTHING,
- .arg3_type = ARG_PTR_TO_UNINIT_MEM,
+ .arg3_type = ARG_PTR_TO_MEM | MEM_RDONLY,
.arg4_type = ARG_CONST_SIZE,
};
@@ -6401,7 +6401,7 @@ static const struct bpf_func_proto bpf_xdp_fib_lookup_proto = {
.gpl_only = true,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
- .arg2_type = ARG_PTR_TO_MEM,
+ .arg2_type = ARG_PTR_TO_MEM | MEM_WRITE,
.arg3_type = ARG_CONST_SIZE,
.arg4_type = ARG_ANYTHING,
};
@@ -6456,7 +6456,7 @@ static const struct bpf_func_proto bpf_skb_fib_lookup_proto = {
.gpl_only = true,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
- .arg2_type = ARG_PTR_TO_MEM,
+ .arg2_type = ARG_PTR_TO_MEM | MEM_WRITE,
.arg3_type = ARG_CONST_SIZE,
.arg4_type = ARG_ANYTHING,
};
@@ -8010,9 +8010,9 @@ static const struct bpf_func_proto bpf_tcp_raw_gen_syncookie_ipv4_proto = {
.gpl_only = true, /* __cookie_v4_init_sequence() is GPL */
.pkt_access = true,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg1_size = sizeof(struct iphdr),
- .arg2_type = ARG_PTR_TO_MEM,
+ .arg2_type = ARG_PTR_TO_MEM | MEM_RDONLY,
.arg3_type = ARG_CONST_SIZE_OR_ZERO,
};
@@ -8042,9 +8042,9 @@ static const struct bpf_func_proto bpf_tcp_raw_gen_syncookie_ipv6_proto = {
.gpl_only = true, /* __cookie_v6_init_sequence() is GPL */
.pkt_access = true,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg1_size = sizeof(struct ipv6hdr),
- .arg2_type = ARG_PTR_TO_MEM,
+ .arg2_type = ARG_PTR_TO_MEM | MEM_RDONLY,
.arg3_type = ARG_CONST_SIZE_OR_ZERO,
};
@@ -8062,9 +8062,9 @@ static const struct bpf_func_proto bpf_tcp_raw_check_syncookie_ipv4_proto = {
.gpl_only = true, /* __cookie_v4_check is GPL */
.pkt_access = true,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg1_size = sizeof(struct iphdr),
- .arg2_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg2_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg2_size = sizeof(struct tcphdr),
};
@@ -8086,9 +8086,9 @@ static const struct bpf_func_proto bpf_tcp_raw_check_syncookie_ipv6_proto = {
.gpl_only = true, /* __cookie_v6_check is GPL */
.pkt_access = true,
.ret_type = RET_INTEGER,
- .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg1_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg1_size = sizeof(struct ipv6hdr),
- .arg2_type = ARG_PTR_TO_FIXED_SIZE_MEM,
+ .arg2_type = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_RDONLY,
.arg2_size = sizeof(struct tcphdr),
};
#endif /* CONFIG_SYN_COOKIES */
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 61746c2b95f6..fa6209f45de9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -7231,10 +7231,15 @@ void skb_attempt_defer_free(struct sk_buff *skb)
{
struct skb_defer_node *sdn;
unsigned long defer_count;
- int cpu = skb->alloc_cpu;
unsigned int defer_max;
bool kick;
+ int cpu;
+ /* zero copy notifications should not be delayed. */
+ if (skb_zcopy(skb))
+ goto nodefer;
+
+ cpu = skb->alloc_cpu;
if (cpu == raw_smp_processor_id() ||
WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
!cpu_online(cpu)) {
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 2ac7731e1e0a..ddde93dd8bc6 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -409,22 +409,26 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,
}
EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter);
-/* Receive sk_msg from psock->ingress_msg to @msg. */
-int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
- int len, int flags)
+int __sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
+ int len, int flags, int *copied_from_self)
{
struct iov_iter *iter = &msg->msg_iter;
int peek = flags & MSG_PEEK;
struct sk_msg *msg_rx;
int i, copied = 0;
+ bool from_self;
msg_rx = sk_psock_peek_msg(psock);
+ if (copied_from_self)
+ *copied_from_self = 0;
+
while (copied != len) {
struct scatterlist *sge;
if (unlikely(!msg_rx))
break;
+ from_self = msg_rx->sk == sk;
i = msg_rx->sg.start;
do {
struct page *page;
@@ -443,6 +447,9 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
}
copied += copy;
+ if (from_self && copied_from_self)
+ *copied_from_self += copy;
+
if (likely(!peek)) {
sge->offset += copy;
sge->length -= copy;
@@ -451,6 +458,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
atomic_sub(copy, &sk->sk_rmem_alloc);
}
msg_rx->sg.size -= copy;
+ sk_psock_msg_len_add(psock, -copy);
if (!sge->length) {
sk_msg_iter_var_next(i);
@@ -487,6 +495,13 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
out:
return copied;
}
+
+/* Receive sk_msg from psock->ingress_msg to @msg. */
+int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
+ int len, int flags)
+{
+ return __sk_msg_recvmsg(sk, psock, msg, len, flags, NULL);
+}
EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
bool sk_msg_is_readable(struct sock *sk)
@@ -616,6 +631,12 @@ static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb
if (unlikely(!msg))
return -EAGAIN;
skb_set_owner_r(skb, sk);
+
+ /* This is used in tcp_bpf_recvmsg_parser() to determine whether the
+ * data originates from the socket's own protocol stack. No need to
+ * refcount sk because msg's lifetime is bound to sk via the ingress_msg.
+ */
+ msg->sk = sk;
err = sk_psock_skb_ingress_enqueue(skb, off, len, psock, sk, msg, take_ref);
if (err < 0)
kfree(msg);
@@ -801,9 +822,11 @@ static void __sk_psock_purge_ingress_msg(struct sk_psock *psock)
list_del(&msg->list);
if (!msg->skb)
atomic_sub(msg->sg.size, &psock->sk->sk_rmem_alloc);
+ sk_psock_msg_len_add(psock, -msg->sg.size);
sk_msg_free(psock->sk, msg);
kfree(msg);
}
+ WARN_ON_ONCE(psock->msg_tot_len);
}
static void __sk_psock_zap_ingress(struct sk_psock *psock)
@@ -909,6 +932,7 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock,
sk_msg_compute_data_pointers(msg);
msg->sk = sk;
ret = bpf_prog_run_pin_on_cpu(prog, msg);
+ msg->sk = NULL;
ret = sk_psock_map_verd(ret, msg->sk_redir);
psock->apply_bytes = msg->apply_bytes;
if (ret == __SK_REDIRECT) {
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 4abbec2f47ef..471dd862f663 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -248,7 +248,8 @@ bool icmp_global_allow(struct net *net)
if (delta < HZ / 50)
return false;
- incr = READ_ONCE(net->ipv4.sysctl_icmp_msgs_per_sec) * delta / HZ;
+ incr = READ_ONCE(net->ipv4.sysctl_icmp_msgs_per_sec);
+ incr = div_u64((u64)incr * delta, HZ);
if (!incr)
return false;
@@ -554,6 +555,21 @@ static struct rtable *icmp_route_lookup(struct net *net, struct flowi4 *fl4,
/* steal dst entry from skb_in, don't drop refcnt */
skb_dstref_steal(skb_in);
skb_dstref_restore(skb_in, orefdst);
+
+ /*
+ * At this point, fl4_dec.daddr should NOT be local (we
+ * checked fl4_dec.saddr above). However, a race condition
+ * may occur if the address is added to the interface
+ * concurrently. In that case, ip_route_input() returns a
+ * LOCAL route with dst.output=ip_rt_bug, which must not
+ * be used for output.
+ */
+ if (!err && rt2 && rt2->rt_type == RTN_LOCAL) {
+ net_warn_ratelimited("detected local route for %pI4 during ICMP sending, src %pI4\n",
+ &fl4_dec.daddr, &fl4_dec.saddr);
+ dst_release(&rt2->dst);
+ err = -EINVAL;
+ }
}
if (err)
@@ -1031,16 +1047,22 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
/* Checkin full IP header plus 8 bytes of protocol to
* avoid additional coding at protocol handlers.
*/
- if (!pskb_may_pull(skb, iph->ihl * 4 + 8)) {
- __ICMP_INC_STATS(dev_net_rcu(skb->dev), ICMP_MIB_INERRORS);
- return;
- }
+ if (!pskb_may_pull(skb, iph->ihl * 4 + 8))
+ goto out;
+
+ /* IPPROTO_RAW sockets are not supposed to receive anything. */
+ if (protocol == IPPROTO_RAW)
+ goto out;
raw_icmp_error(skb, protocol, info);
ipprot = rcu_dereference(inet_protos[protocol]);
if (ipprot && ipprot->err_handler)
ipprot->err_handler(skb, info);
+ return;
+
+out:
+ __ICMP_INC_STATS(dev_net_rcu(skb->dev), ICMP_MIB_INERRORS);
}
static bool icmp_tag_validation(int proto)
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index cfbd563498e8..0fec4e564566 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -148,7 +148,7 @@ void ping_unhash(struct sock *sk)
pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num);
spin_lock(&ping_table.lock);
if (sk_del_node_init_rcu(sk)) {
- isk->inet_num = 0;
+ WRITE_ONCE(isk->inet_num, 0);
isk->inet_sport = 0;
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
}
@@ -181,31 +181,35 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)
}
sk_for_each_rcu(sk, hslot) {
+ int bound_dev_if;
+
if (!net_eq(sock_net(sk), net))
continue;
isk = inet_sk(sk);
pr_debug("iterate\n");
- if (isk->inet_num != ident)
+ if (READ_ONCE(isk->inet_num) != ident)
continue;
+ bound_dev_if = READ_ONCE(sk->sk_bound_dev_if);
if (skb->protocol == htons(ETH_P_IP) &&
sk->sk_family == AF_INET) {
+ __be32 rcv_saddr = READ_ONCE(isk->inet_rcv_saddr);
+
pr_debug("found: %p: num=%d, daddr=%pI4, dif=%d\n", sk,
- (int) isk->inet_num, &isk->inet_rcv_saddr,
- sk->sk_bound_dev_if);
+ ident, &rcv_saddr,
+ bound_dev_if);
- if (isk->inet_rcv_saddr &&
- isk->inet_rcv_saddr != ip_hdr(skb)->daddr)
+ if (rcv_saddr && rcv_saddr != ip_hdr(skb)->daddr)
continue;
#if IS_ENABLED(CONFIG_IPV6)
} else if (skb->protocol == htons(ETH_P_IPV6) &&
sk->sk_family == AF_INET6) {
pr_debug("found: %p: num=%d, daddr=%pI6c, dif=%d\n", sk,
- (int) isk->inet_num,
+ ident,
&sk->sk_v6_rcv_saddr,
- sk->sk_bound_dev_if);
+ bound_dev_if);
if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr) &&
!ipv6_addr_equal(&sk->sk_v6_rcv_saddr,
@@ -216,8 +220,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)
continue;
}
- if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif &&
- sk->sk_bound_dev_if != sdif)
+ if (bound_dev_if && bound_dev_if != dif &&
+ bound_dev_if != sdif)
continue;
goto exit;
@@ -392,7 +396,9 @@ static void ping_set_saddr(struct sock *sk, struct sockaddr_unsized *saddr)
if (saddr->sa_family == AF_INET) {
struct inet_sock *isk = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) saddr;
- isk->inet_rcv_saddr = isk->inet_saddr = addr->sin_addr.s_addr;
+
+ isk->inet_saddr = addr->sin_addr.s_addr;
+ WRITE_ONCE(isk->inet_rcv_saddr, addr->sin_addr.s_addr);
#if IS_ENABLED(CONFIG_IPV6)
} else if (saddr->sa_family == AF_INET6) {
struct sockaddr_in6 *addr = (struct sockaddr_in6 *) saddr;
@@ -849,7 +855,8 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,
struct sk_buff *skb;
int copied, err;
- pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num);
+ pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk,
+ READ_ONCE(isk->inet_num));
err = -EOPNOTSUPP;
if (flags & MSG_OOB)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d5319ebe2452..81666571ecfb 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -501,6 +501,9 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc)
struct sk_buff *skb = tcp_write_queue_tail(sk);
u32 tsflags = sockc->tsflags;
+ if (unlikely(!skb))
+ skb = skb_rb_last(&sk->tcp_rtx_queue);
+
if (tsflags && skb) {
struct skb_shared_info *shinfo = skb_shinfo(skb);
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index a268e1595b22..ca8a5cb8e569 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -10,6 +10,7 @@
#include <net/inet_common.h>
#include <net/tls.h>
+#include <asm/ioctls.h>
void tcp_eat_skb(struct sock *sk, struct sk_buff *skb)
{
@@ -226,6 +227,7 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk,
int peek = flags & MSG_PEEK;
struct sk_psock *psock;
struct tcp_sock *tcp;
+ int copied_from_self = 0;
int copied = 0;
u32 seq;
@@ -262,7 +264,7 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk,
}
msg_bytes_ready:
- copied = sk_msg_recvmsg(sk, psock, msg, len, flags);
+ copied = __sk_msg_recvmsg(sk, psock, msg, len, flags, &copied_from_self);
/* The typical case for EFAULT is the socket was gracefully
* shutdown with a FIN pkt. So check here the other case is
* some error on copy_page_to_iter which would be unexpected.
@@ -277,7 +279,7 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk,
goto out;
}
}
- seq += copied;
+ seq += copied_from_self;
if (!copied) {
long timeo;
int data;
@@ -331,6 +333,24 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk,
return copied;
}
+static int tcp_bpf_ioctl(struct sock *sk, int cmd, int *karg)
+{
+ bool slow;
+
+ if (cmd != SIOCINQ)
+ return tcp_ioctl(sk, cmd, karg);
+
+ /* works similar as tcp_ioctl */
+ if (sk->sk_state == TCP_LISTEN)
+ return -EINVAL;
+
+ slow = lock_sock_fast(sk);
+ *karg = sk_psock_msg_inq(sk);
+ unlock_sock_fast(sk, slow);
+
+ return 0;
+}
+
static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
int flags, int *addr_len)
{
@@ -609,6 +629,7 @@ static void tcp_bpf_rebuild_protos(struct proto prot[TCP_BPF_NUM_CFGS],
prot[TCP_BPF_BASE].close = sock_map_close;
prot[TCP_BPF_BASE].recvmsg = tcp_bpf_recvmsg;
prot[TCP_BPF_BASE].sock_is_readable = sk_msg_is_readable;
+ prot[TCP_BPF_BASE].ioctl = tcp_bpf_ioctl;
prot[TCP_BPF_TX] = prot[TCP_BPF_BASE];
prot[TCP_BPF_TX].sendmsg = tcp_bpf_sendmsg;
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index df758adbb445..e9f6c77e0631 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -16,6 +16,7 @@
#include <linux/gfp.h>
#include <linux/jhash.h>
#include <net/tcp.h>
+#include <net/tcp_ecn.h>
#include <trace/events/tcp.h>
static DEFINE_SPINLOCK(tcp_cong_list_lock);
@@ -227,7 +228,7 @@ void tcp_assign_congestion_control(struct sock *sk)
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
if (ca->flags & TCP_CONG_NEEDS_ECN)
- INET_ECN_xmit(sk);
+ INET_ECN_xmit_ect_1_negotiation(sk);
else
INET_ECN_dontxmit(sk);
}
@@ -257,7 +258,7 @@ static void tcp_reinit_congestion_control(struct sock *sk,
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
if (ca->flags & TCP_CONG_NEEDS_ECN)
- INET_ECN_xmit(sk);
+ INET_ECN_xmit_ect_1_negotiation(sk);
else
INET_ECN_dontxmit(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 198f8a0d37be..0d080a3e27d6 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6843,7 +6843,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
tp->max_window = tp->snd_wnd;
- tcp_ecn_rcv_syn(tp, th, skb);
+ tcp_ecn_rcv_syn(sk, th, skb);
tcp_mtup_init(sk);
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
@@ -7248,7 +7248,8 @@ static void tcp_ecn_create_request(struct request_sock *req,
u32 ecn_ok_dst;
if (tcp_accecn_syn_requested(th) &&
- READ_ONCE(net->ipv4.sysctl_tcp_ecn) >= 3) {
+ (READ_ONCE(net->ipv4.sysctl_tcp_ecn) >= 3 ||
+ tcp_ca_needs_accecn(listen_sk))) {
inet_rsk(req)->ecn_ok = 1;
tcp_rsk(req)->accecn_ok = 1;
tcp_rsk(req)->syn_ect_rcv = TCP_SKB_CB(skb)->ip_dsfield &
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index bd5462154f97..9776c921d1bb 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -485,9 +485,10 @@ static void tcp_ecn_openreq_child(struct sock *sk,
tp->accecn_opt_demand = 1;
tcp_ecn_received_counters_payload(sk, skb);
} else {
- tcp_ecn_mode_set(tp, inet_rsk(req)->ecn_ok ?
- TCP_ECN_MODE_RFC3168 :
- TCP_ECN_DISABLED);
+ if (inet_rsk(req)->ecn_ok && !tcp_ca_no_fallback_rfc3168(sk))
+ tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168);
+ else
+ tcp_ecn_mode_set(tp, TCP_ECN_DISABLED);
}
}
diff --git a/net/ipv4/udp_bpf.c b/net/ipv4/udp_bpf.c
index 0735d820e413..91233e37cd97 100644
--- a/net/ipv4/udp_bpf.c
+++ b/net/ipv4/udp_bpf.c
@@ -5,6 +5,7 @@
#include <net/sock.h>
#include <net/udp.h>
#include <net/inet_common.h>
+#include <asm/ioctls.h>
#include "udp_impl.h"
@@ -111,12 +112,26 @@ enum {
static DEFINE_SPINLOCK(udpv6_prot_lock);
static struct proto udp_bpf_prots[UDP_BPF_NUM_PROTS];
+static int udp_bpf_ioctl(struct sock *sk, int cmd, int *karg)
+{
+ if (cmd != SIOCINQ)
+ return udp_ioctl(sk, cmd, karg);
+
+ /* Since we don't hold a lock, sk_receive_queue may contain data.
+ * BPF might only be processing this data at the moment. We only
+ * care about the data in the ingress_msg here.
+ */
+ *karg = sk_msg_first_len(sk);
+ return 0;
+}
+
static void udp_bpf_rebuild_protos(struct proto *prot, const struct proto *base)
{
- *prot = *base;
- prot->close = sock_map_close;
- prot->recvmsg = udp_bpf_recvmsg;
- prot->sock_is_readable = sk_msg_is_readable;
+ *prot = *base;
+ prot->close = sock_map_close;
+ prot->recvmsg = udp_bpf_recvmsg;
+ prot->sock_is_readable = sk_msg_is_readable;
+ prot->ioctl = udp_bpf_ioctl;
}
static void udp_bpf_check_v6_needs_rebuild(struct proto *ops)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index b705751eb73c..d3534bdb805d 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -955,7 +955,7 @@ static int __net_init inet6_net_init(struct net *net)
int err = 0;
net->ipv6.sysctl.bindv6only = 0;
- net->ipv6.sysctl.icmpv6_time = 1*HZ;
+ net->ipv6.sysctl.icmpv6_time = HZ / 10;
net->ipv6.sysctl.icmpv6_echo_ignore_all = 0;
net->ipv6.sysctl.icmpv6_echo_ignore_multicast = 0;
net->ipv6.sysctl.icmpv6_echo_ignore_anycast = 0;
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 9d37e7711bc2..55b1aa75ab80 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -217,14 +217,9 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,
} else if (dev && (dev->flags & IFF_LOOPBACK)) {
res = true;
} else {
- struct rt6_info *rt = dst_rt6_info(dst);
- int tmo = net->ipv6.sysctl.icmpv6_time;
+ int tmo = READ_ONCE(net->ipv6.sysctl.icmpv6_time);
struct inet_peer *peer;
- /* Give more bandwidth to wider prefixes. */
- if (rt->rt6i_dst.plen < 128)
- tmo >>= ((128 - rt->rt6i_dst.plen)>>5);
-
peer = inet_getpeer_v6(net->ipv6.peers, &fl6->daddr);
res = inet_peer_xrlim_allow(peer, tmo);
}
@@ -1066,6 +1061,12 @@ enum skb_drop_reason icmpv6_notify(struct sk_buff *skb, u8 type,
if (reason != SKB_NOT_DROPPED_YET)
goto out;
+ if (nexthdr == IPPROTO_RAW) {
+ /* Add a more specific reason later ? */
+ reason = SKB_DROP_REASON_NOT_SPECIFIED;
+ goto out;
+ }
+
/* BUGGG_FUTURE: we should try to parse exthdrs in this packet.
Without this we will not able f.e. to make source routed
pmtu discovery.
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index c6439e30e892..cc149227b49f 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1139,7 +1139,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
fib6_add_gc_list(iter);
}
if (!(rt->fib6_flags & (RTF_ADDRCONF | RTF_PREFIX_RT)) &&
- !iter->fib6_nh->fib_nh_gw_family) {
+ (iter->nh || !iter->fib6_nh->fib_nh_gw_family)) {
iter->fib6_flags &= ~RTF_ADDRCONF;
iter->fib6_flags &= ~RTF_PREFIX_RT;
}
diff --git a/net/mctp/device.c b/net/mctp/device.c
index 4d404edd7446..04c5570bacff 100644
--- a/net/mctp/device.c
+++ b/net/mctp/device.c
@@ -70,6 +70,7 @@ static int mctp_fill_addrinfo(struct sk_buff *skb,
return -EMSGSIZE;
hdr = nlmsg_data(nlh);
+ memset(hdr, 0, sizeof(*hdr));
hdr->ifa_family = AF_MCTP;
hdr->ifa_prefixlen = 0;
hdr->ifa_flags = 0;
diff --git a/net/mctp/neigh.c b/net/mctp/neigh.c
index 05b899f22d90..fc85f0e69301 100644
--- a/net/mctp/neigh.c
+++ b/net/mctp/neigh.c
@@ -218,6 +218,7 @@ static int mctp_fill_neigh(struct sk_buff *skb, u32 portid, u32 seq, int event,
return -EMSGSIZE;
hdr = nlmsg_data(nlh);
+ memset(hdr, 0, sizeof(*hdr));
hdr->ndm_family = AF_MCTP;
hdr->ndm_ifindex = dev->ifindex;
hdr->ndm_state = 0; // TODO other state bits?
diff --git a/net/mctp/route.c b/net/mctp/route.c
index 2ac4011a953f..ecbbe4beb213 100644
--- a/net/mctp/route.c
+++ b/net/mctp/route.c
@@ -1643,6 +1643,7 @@ static int mctp_fill_rtinfo(struct sk_buff *skb, struct mctp_route *rt,
return -EMSGSIZE;
hdr = nlmsg_data(nlh);
+ memset(hdr, 0, sizeof(*hdr));
hdr->rtm_family = AF_MCTP;
/* we use the _len fields as a number of EIDs, rather than
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 8d3233667418..bad9fc0f27d9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -224,9 +224,6 @@ static bool mptcp_rcvbuf_grow(struct sock *sk, u32 newval)
do_div(grow, oldval);
rcvwin += grow << 1;
- if (!RB_EMPTY_ROOT(&msk->out_of_order_queue))
- rcvwin += MPTCP_SKB_CB(msk->ooo_last_skb)->end_seq - msk->ack_seq;
-
cap = READ_ONCE(net->ipv4.sysctl_tcp_rmem[2]);
rcvbuf = min_t(u32, mptcp_space_from_win(sk, rcvwin), cap);
@@ -350,9 +347,6 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb)
end:
skb_condense(skb);
skb_set_owner_r(skb, sk);
- /* do not grow rcvbuf for not-yet-accepted or orphaned sockets. */
- if (sk->sk_socket)
- mptcp_rcvbuf_grow(sk, msk->rcvq_space.space);
}
static void mptcp_init_skb(struct sock *ssk, struct sk_buff *skb, int offset,
@@ -2088,8 +2082,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
msk->rcvq_space.copied += copied;
- mstamp = div_u64(tcp_clock_ns(), NSEC_PER_USEC);
- time = tcp_stamp_us_delta(mstamp, msk->rcvq_space.time);
+ mstamp = mptcp_stamp();
+ time = tcp_stamp_us_delta(mstamp, READ_ONCE(msk->rcvq_space.time));
rtt_us = msk->rcvq_space.rtt_us;
if (rtt_us && time < (rtt_us >> 3))
@@ -3549,6 +3543,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *sk,
__mptcp_propagate_sndbuf(nsk, ssk);
mptcp_rcv_space_init(msk, ssk);
+ msk->rcvq_space.time = mptcp_stamp();
if (mp_opt->suboptions & OPTION_MPTCP_MPC_ACK)
__mptcp_subflow_fully_established(msk, subflow, mp_opt);
@@ -3566,8 +3561,6 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk)
msk->rcvq_space.copied = 0;
msk->rcvq_space.rtt_us = 0;
- msk->rcvq_space.time = tp->tcp_mstamp;
-
/* initial rcv_space offering made to peer */
msk->rcvq_space.space = min_t(u32, tp->rcv_wnd,
TCP_INIT_CWND * tp->advmss);
@@ -3763,6 +3756,7 @@ void mptcp_finish_connect(struct sock *ssk)
* accessing the field below
*/
WRITE_ONCE(msk->local_key, subflow->local_key);
+ WRITE_ONCE(msk->rcvq_space.time, mptcp_stamp());
mptcp_pm_new_connection(msk, ssk, 0);
}
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 66e973500791..39afd44e072f 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -915,6 +915,11 @@ static inline bool mptcp_is_fully_established(struct sock *sk)
READ_ONCE(mptcp_sk(sk)->fully_established);
}
+static inline u64 mptcp_stamp(void)
+{
+ return div_u64(tcp_clock_ns(), NSEC_PER_USEC);
+}
+
void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk);
void mptcp_data_ready(struct sock *sk, struct sock *ssk);
bool mptcp_finish_join(struct sock *sk);
diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index 83e452916403..63c78a1f3918 100644
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -10,7 +10,8 @@
#include <net/ip_vs.h>
static int
-sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp);
+sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int sctphoff);
static int
sctp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
@@ -108,7 +109,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!sctp_csum_check(cp->af, skb, pp))
+ if (!sctp_csum_check(cp->af, skb, pp, sctphoff))
return 0;
/* Call application helper if needed */
@@ -156,7 +157,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!sctp_csum_check(cp->af, skb, pp))
+ if (!sctp_csum_check(cp->af, skb, pp, sctphoff))
return 0;
/* Call application helper if needed */
@@ -185,19 +186,12 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
}
static int
-sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
+sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int sctphoff)
{
- unsigned int sctphoff;
struct sctphdr *sh;
__le32 cmp, val;
-#ifdef CONFIG_IP_VS_IPV6
- if (af == AF_INET6)
- sctphoff = sizeof(struct ipv6hdr);
- else
-#endif
- sctphoff = ip_hdrlen(skb);
-
sh = (struct sctphdr *)(skb->data + sctphoff);
cmp = sh->checksum;
val = sctp_compute_cksum(skb, sctphoff);
diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
index f68a1533ee45..8cc0a8ce6241 100644
--- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
@@ -28,7 +28,8 @@
#include <net/ip_vs.h>
static int
-tcp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp);
+tcp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int tcphoff);
static int
tcp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
@@ -165,7 +166,7 @@ tcp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!tcp_csum_check(cp->af, skb, pp))
+ if (!tcp_csum_check(cp->af, skb, pp, tcphoff))
return 0;
/* Call application helper if needed */
@@ -243,7 +244,7 @@ tcp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!tcp_csum_check(cp->af, skb, pp))
+ if (!tcp_csum_check(cp->af, skb, pp, tcphoff))
return 0;
/*
@@ -300,17 +301,9 @@ tcp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
static int
-tcp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
+tcp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int tcphoff)
{
- unsigned int tcphoff;
-
-#ifdef CONFIG_IP_VS_IPV6
- if (af == AF_INET6)
- tcphoff = sizeof(struct ipv6hdr);
- else
-#endif
- tcphoff = ip_hdrlen(skb);
-
switch (skb->ip_summed) {
case CHECKSUM_NONE:
skb->csum = skb_checksum(skb, tcphoff, skb->len - tcphoff, 0);
@@ -321,7 +314,7 @@ tcp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
if (csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
&ipv6_hdr(skb)->daddr,
skb->len - tcphoff,
- ipv6_hdr(skb)->nexthdr,
+ IPPROTO_TCP,
skb->csum)) {
IP_VS_DBG_RL_PKT(0, af, pp, skb, 0,
"Failed checksum for");
diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
index 0f0107c80dd2..f9de632e38cd 100644
--- a/net/netfilter/ipvs/ip_vs_proto_udp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
@@ -24,7 +24,8 @@
#include <net/ip6_checksum.h>
static int
-udp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp);
+udp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int udphoff);
static int
udp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
@@ -154,7 +155,7 @@ udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!udp_csum_check(cp->af, skb, pp))
+ if (!udp_csum_check(cp->af, skb, pp, udphoff))
return 0;
/*
@@ -237,7 +238,7 @@ udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
int ret;
/* Some checks before mangling */
- if (!udp_csum_check(cp->af, skb, pp))
+ if (!udp_csum_check(cp->af, skb, pp, udphoff))
return 0;
/*
@@ -296,17 +297,10 @@ udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
static int
-udp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
+udp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
+ unsigned int udphoff)
{
struct udphdr _udph, *uh;
- unsigned int udphoff;
-
-#ifdef CONFIG_IP_VS_IPV6
- if (af == AF_INET6)
- udphoff = sizeof(struct ipv6hdr);
- else
-#endif
- udphoff = ip_hdrlen(skb);
uh = skb_header_pointer(skb, udphoff, sizeof(_udph), &_udph);
if (uh == NULL)
@@ -324,7 +318,7 @@ udp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
if (csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
&ipv6_hdr(skb)->daddr,
skb->len - udphoff,
- ipv6_hdr(skb)->nexthdr,
+ IPPROTO_UDP,
skb->csum)) {
IP_VS_DBG_RL_PKT(0, af, pp, skb, 0,
"Failed checksum for");
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 64c697212578..124f779424b0 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -294,6 +294,12 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs,
return true;
}
+/* rt has device that is down */
+static bool rt_dev_is_down(const struct net_device *dev)
+{
+ return dev && !netif_running(dev);
+}
+
/* Get route to destination or remote server */
static int
__ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
@@ -309,9 +315,11 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
if (dest) {
dest_dst = __ip_vs_dst_check(dest);
- if (likely(dest_dst))
+ if (likely(dest_dst)) {
rt = dst_rtable(dest_dst->dst_cache);
- else {
+ if (ret_saddr)
+ *ret_saddr = dest_dst->dst_saddr.ip;
+ } else {
dest_dst = ip_vs_dest_dst_alloc();
spin_lock_bh(&dest->dst_lock);
if (!dest_dst) {
@@ -327,14 +335,22 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
ip_vs_dest_dst_free(dest_dst);
goto err_unreach;
}
- __ip_vs_dst_set(dest, dest_dst, &rt->dst, 0);
+ /* It is forbidden to attach dest->dest_dst if
+ * device is going down.
+ */
+ if (!rt_dev_is_down(dst_dev_rcu(&rt->dst)))
+ __ip_vs_dst_set(dest, dest_dst, &rt->dst, 0);
+ else
+ noref = 0;
spin_unlock_bh(&dest->dst_lock);
IP_VS_DBG(10, "new dst %pI4, src %pI4, refcnt=%d\n",
&dest->addr.ip, &dest_dst->dst_saddr.ip,
rcuref_read(&rt->dst.__rcuref));
+ if (ret_saddr)
+ *ret_saddr = dest_dst->dst_saddr.ip;
+ if (!noref)
+ ip_vs_dest_dst_free(dest_dst);
}
- if (ret_saddr)
- *ret_saddr = dest_dst->dst_saddr.ip;
} else {
noref = 0;
@@ -471,9 +487,11 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
if (dest) {
dest_dst = __ip_vs_dst_check(dest);
- if (likely(dest_dst))
+ if (likely(dest_dst)) {
rt = dst_rt6_info(dest_dst->dst_cache);
- else {
+ if (ret_saddr)
+ *ret_saddr = dest_dst->dst_saddr.in6;
+ } else {
u32 cookie;
dest_dst = ip_vs_dest_dst_alloc();
@@ -494,14 +512,22 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
}
rt = dst_rt6_info(dst);
cookie = rt6_get_cookie(rt);
- __ip_vs_dst_set(dest, dest_dst, &rt->dst, cookie);
+ /* It is forbidden to attach dest->dest_dst if
+ * device is going down.
+ */
+ if (!rt_dev_is_down(dst_dev_rcu(&rt->dst)))
+ __ip_vs_dst_set(dest, dest_dst, &rt->dst, cookie);
+ else
+ noref = 0;
spin_unlock_bh(&dest->dst_lock);
IP_VS_DBG(10, "new dst %pI6, src %pI6, refcnt=%d\n",
&dest->addr.in6, &dest_dst->dst_saddr.in6,
rcuref_read(&rt->dst.__rcuref));
+ if (ret_saddr)
+ *ret_saddr = dest_dst->dst_saddr.in6;
+ if (!noref)
+ ip_vs_dest_dst_free(dest_dst);
}
- if (ret_saddr)
- *ret_saddr = dest_dst->dst_saddr.in6;
} else {
noref = 0;
dst = __ip_vs_route_output_v6(net, daddr, ret_saddr, do_xfrm,
diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c
index 8487808c8761..14e62b3263cd 100644
--- a/net/netfilter/nf_conncount.c
+++ b/net/netfilter/nf_conncount.c
@@ -34,8 +34,9 @@
#define CONNCOUNT_SLOTS 256U
-#define CONNCOUNT_GC_MAX_NODES 8
-#define MAX_KEYLEN 5
+#define CONNCOUNT_GC_MAX_NODES 8
+#define CONNCOUNT_GC_MAX_COLLECT 64
+#define MAX_KEYLEN 5
/* we will save the tuples of all connections we care about */
struct nf_conncount_tuple {
@@ -178,16 +179,28 @@ static int __nf_conncount_add(struct net *net,
return -ENOENT;
if (ct && nf_ct_is_confirmed(ct)) {
- err = -EEXIST;
- goto out_put;
+ /* local connections are confirmed in postrouting so confirmation
+ * might have happened before hitting connlimit
+ */
+ if (skb->skb_iif != LOOPBACK_IFINDEX) {
+ err = -EEXIST;
+ goto out_put;
+ }
+
+ /* this is likely a local connection, skip optimization to avoid
+ * adding duplicates from a 'packet train'
+ */
+ goto check_connections;
}
- if ((u32)jiffies == list->last_gc)
+ if ((u32)jiffies == list->last_gc &&
+ (list->count - list->last_gc_count) < CONNCOUNT_GC_MAX_COLLECT)
goto add_new_node;
+check_connections:
/* check the saved connections */
list_for_each_entry_safe(conn, conn_n, &list->head, node) {
- if (collect > CONNCOUNT_GC_MAX_NODES)
+ if (collect > CONNCOUNT_GC_MAX_COLLECT)
break;
found = find_or_evict(net, list, conn);
@@ -230,6 +243,7 @@ static int __nf_conncount_add(struct net *net,
nf_ct_put(found_ct);
}
list->last_gc = (u32)jiffies;
+ list->last_gc_count = list->count;
add_new_node:
if (WARN_ON_ONCE(list->count > INT_MAX)) {
@@ -277,6 +291,7 @@ void nf_conncount_list_init(struct nf_conncount_list *list)
spin_lock_init(&list->list_lock);
INIT_LIST_HEAD(&list->head);
list->count = 0;
+ list->last_gc_count = 0;
list->last_gc = (u32)jiffies;
}
EXPORT_SYMBOL_GPL(nf_conncount_list_init);
@@ -316,13 +331,14 @@ static bool __nf_conncount_gc_list(struct net *net,
}
nf_ct_put(found_ct);
- if (collected > CONNCOUNT_GC_MAX_NODES)
+ if (collected > CONNCOUNT_GC_MAX_COLLECT)
break;
}
if (!list->count)
ret = true;
list->last_gc = (u32)jiffies;
+ list->last_gc_count = list->count;
return ret;
}
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 14f73872f647..e35814d68ce3 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1186,13 +1186,13 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
{
struct net *net = nf_ct_net(ct);
struct nf_conntrack_expect *exp;
- struct nf_conntrack_tuple tuple;
+ struct nf_conntrack_tuple tuple = {
+ .src.l3num = nf_ct_l3num(ct),
+ .dst.protonum = IPPROTO_TCP,
+ .dst.u.tcp.port = port,
+ };
- memset(&tuple.src.u3, 0, sizeof(tuple.src.u3));
- tuple.src.u.tcp.port = 0;
memcpy(&tuple.dst.u3, addr, sizeof(tuple.dst.u3));
- tuple.dst.u.tcp.port = port;
- tuple.dst.protonum = IPPROTO_TCP;
exp = __nf_ct_expect_find(net, nf_ct_zone(ct), &tuple);
if (exp && exp->master == ct)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index be92750e2af3..8dae197c7faf 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2822,6 +2822,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 policy,
err_register_hook:
nft_chain_del(chain);
+ synchronize_rcu();
err_chain_add:
nft_trans_destroy(trans);
err_trans:
@@ -3900,23 +3901,6 @@ static int nf_tables_dump_rules(struct sk_buff *skb,
return skb->len;
}
-static int nf_tables_dumpreset_rules(struct sk_buff *skb,
- struct netlink_callback *cb)
-{
- struct nftables_pernet *nft_net = nft_pernet(sock_net(skb->sk));
- int ret;
-
- /* Mutex is held is to prevent that two concurrent dump-and-reset calls
- * do not underrun counters and quotas. The commit_mutex is used for
- * the lack a better lock, this is not transaction path.
- */
- mutex_lock(&nft_net->commit_mutex);
- ret = nf_tables_dump_rules(skb, cb);
- mutex_unlock(&nft_net->commit_mutex);
-
- return ret;
-}
-
static int nf_tables_dump_rules_start(struct netlink_callback *cb)
{
struct nft_rule_dump_ctx *ctx = (void *)cb->ctx;
@@ -3936,16 +3920,10 @@ static int nf_tables_dump_rules_start(struct netlink_callback *cb)
return -ENOMEM;
}
}
- return 0;
-}
-
-static int nf_tables_dumpreset_rules_start(struct netlink_callback *cb)
-{
- struct nft_rule_dump_ctx *ctx = (void *)cb->ctx;
-
- ctx->reset = true;
+ if (NFNL_MSG_TYPE(cb->nlh->nlmsg_type) == NFT_MSG_GETRULE_RESET)
+ ctx->reset = true;
- return nf_tables_dump_rules_start(cb);
+ return 0;
}
static int nf_tables_dump_rules_done(struct netlink_callback *cb)
@@ -4011,6 +3989,8 @@ static int nf_tables_getrule(struct sk_buff *skb, const struct nfnl_info *info,
u32 portid = NETLINK_CB(skb).portid;
struct net *net = info->net;
struct sk_buff *skb2;
+ bool reset = false;
+ char *buf;
if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
struct netlink_dump_control c = {
@@ -4024,47 +4004,16 @@ static int nf_tables_getrule(struct sk_buff *skb, const struct nfnl_info *info,
return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c);
}
- skb2 = nf_tables_getrule_single(portid, info, nla, false);
- if (IS_ERR(skb2))
- return PTR_ERR(skb2);
-
- return nfnetlink_unicast(skb2, net, portid);
-}
-
-static int nf_tables_getrule_reset(struct sk_buff *skb,
- const struct nfnl_info *info,
- const struct nlattr * const nla[])
-{
- struct nftables_pernet *nft_net = nft_pernet(info->net);
- u32 portid = NETLINK_CB(skb).portid;
- struct net *net = info->net;
- struct sk_buff *skb2;
- char *buf;
-
- if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
- struct netlink_dump_control c = {
- .start= nf_tables_dumpreset_rules_start,
- .dump = nf_tables_dumpreset_rules,
- .done = nf_tables_dump_rules_done,
- .module = THIS_MODULE,
- .data = (void *)nla,
- };
-
- return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c);
- }
-
- if (!try_module_get(THIS_MODULE))
- return -EINVAL;
- rcu_read_unlock();
- mutex_lock(&nft_net->commit_mutex);
- skb2 = nf_tables_getrule_single(portid, info, nla, true);
- mutex_unlock(&nft_net->commit_mutex);
- rcu_read_lock();
- module_put(THIS_MODULE);
+ if (NFNL_MSG_TYPE(info->nlh->nlmsg_type) == NFT_MSG_GETRULE_RESET)
+ reset = true;
+ skb2 = nf_tables_getrule_single(portid, info, nla, reset);
if (IS_ERR(skb2))
return PTR_ERR(skb2);
+ if (!reset)
+ return nfnetlink_unicast(skb2, net, portid);
+
buf = kasprintf(GFP_ATOMIC, "%.*s:%u",
nla_len(nla[NFTA_RULE_TABLE]),
(char *)nla_data(nla[NFTA_RULE_TABLE]),
@@ -6323,6 +6272,10 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb)
nla_nest_end(skb, nest);
nlmsg_end(skb, nlh);
+ if (dump_ctx->reset && args.iter.count > args.iter.skip)
+ audit_log_nft_set_reset(table, cb->seq,
+ args.iter.count - args.iter.skip);
+
rcu_read_unlock();
if (args.iter.err && args.iter.err != -EMSGSIZE)
@@ -6338,26 +6291,6 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb)
return -ENOSPC;
}
-static int nf_tables_dumpreset_set(struct sk_buff *skb,
- struct netlink_callback *cb)
-{
- struct nftables_pernet *nft_net = nft_pernet(sock_net(skb->sk));
- struct nft_set_dump_ctx *dump_ctx = cb->data;
- int ret, skip = cb->args[0];
-
- mutex_lock(&nft_net->commit_mutex);
-
- ret = nf_tables_dump_set(skb, cb);
-
- if (cb->args[0] > skip)
- audit_log_nft_set_reset(dump_ctx->ctx.table, cb->seq,
- cb->args[0] - skip);
-
- mutex_unlock(&nft_net->commit_mutex);
-
- return ret;
-}
-
static int nf_tables_dump_set_start(struct netlink_callback *cb)
{
struct nft_set_dump_ctx *dump_ctx = cb->data;
@@ -6601,8 +6534,13 @@ static int nf_tables_getsetelem(struct sk_buff *skb,
{
struct netlink_ext_ack *extack = info->extack;
struct nft_set_dump_ctx dump_ctx;
+ int rem, err = 0, nelems = 0;
+ struct net *net = info->net;
struct nlattr *attr;
- int rem, err = 0;
+ bool reset = false;
+
+ if (NFNL_MSG_TYPE(info->nlh->nlmsg_type) == NFT_MSG_GETSETELEM_RESET)
+ reset = true;
if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
struct netlink_dump_control c = {
@@ -6612,7 +6550,7 @@ static int nf_tables_getsetelem(struct sk_buff *skb,
.module = THIS_MODULE,
};
- err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, false);
+ err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, reset);
if (err)
return err;
@@ -6623,75 +6561,21 @@ static int nf_tables_getsetelem(struct sk_buff *skb,
if (!nla[NFTA_SET_ELEM_LIST_ELEMENTS])
return -EINVAL;
- err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, false);
+ err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, reset);
if (err)
return err;
nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
- err = nft_get_set_elem(&dump_ctx.ctx, dump_ctx.set, attr, false);
- if (err < 0) {
- NL_SET_BAD_ATTR(extack, attr);
- break;
- }
- }
-
- return err;
-}
-
-static int nf_tables_getsetelem_reset(struct sk_buff *skb,
- const struct nfnl_info *info,
- const struct nlattr * const nla[])
-{
- struct nftables_pernet *nft_net = nft_pernet(info->net);
- struct netlink_ext_ack *extack = info->extack;
- struct nft_set_dump_ctx dump_ctx;
- int rem, err = 0, nelems = 0;
- struct nlattr *attr;
-
- if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
- struct netlink_dump_control c = {
- .start = nf_tables_dump_set_start,
- .dump = nf_tables_dumpreset_set,
- .done = nf_tables_dump_set_done,
- .module = THIS_MODULE,
- };
-
- err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, true);
- if (err)
- return err;
-
- c.data = &dump_ctx;
- return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c);
- }
-
- if (!nla[NFTA_SET_ELEM_LIST_ELEMENTS])
- return -EINVAL;
-
- if (!try_module_get(THIS_MODULE))
- return -EINVAL;
- rcu_read_unlock();
- mutex_lock(&nft_net->commit_mutex);
- rcu_read_lock();
-
- err = nft_set_dump_ctx_init(&dump_ctx, skb, info, nla, true);
- if (err)
- goto out_unlock;
-
- nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
- err = nft_get_set_elem(&dump_ctx.ctx, dump_ctx.set, attr, true);
+ err = nft_get_set_elem(&dump_ctx.ctx, dump_ctx.set, attr, reset);
if (err < 0) {
NL_SET_BAD_ATTR(extack, attr);
break;
}
nelems++;
}
- audit_log_nft_set_reset(dump_ctx.ctx.table, nft_base_seq(info->net), nelems);
-
-out_unlock:
- rcu_read_unlock();
- mutex_unlock(&nft_net->commit_mutex);
- rcu_read_lock();
- module_put(THIS_MODULE);
+ if (reset)
+ audit_log_nft_set_reset(dump_ctx.ctx.table, nft_base_seq(net),
+ nelems);
return err;
}
@@ -7269,7 +7153,8 @@ static u32 nft_set_maxsize(const struct nft_set *set)
}
static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
- const struct nlattr *attr, u32 nlmsg_flags)
+ const struct nlattr *attr, u32 nlmsg_flags,
+ bool last)
{
struct nft_expr *expr_array[NFT_SET_EXPR_MAX] = {};
struct nlattr *nla[NFTA_SET_ELEM_MAX + 1];
@@ -7555,6 +7440,11 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
if (flags)
*nft_set_ext_flags(ext) = flags;
+ if (last)
+ elem.flags = NFT_SET_ELEM_INTERNAL_LAST;
+ else
+ elem.flags = 0;
+
if (obj)
*nft_set_ext_obj(ext) = obj;
@@ -7635,6 +7525,11 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
* and an existing one.
*/
err = -EEXIST;
+ } else if (err == -ECANCELED) {
+ /* ECANCELED reports an existing nul-element in
+ * interval sets.
+ */
+ err = 0;
}
goto err_element_clash;
}
@@ -7713,7 +7608,8 @@ static int nf_tables_newsetelem(struct sk_buff *skb,
nft_ctx_init(&ctx, net, skb, info->nlh, family, table, NULL, nla);
nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
- err = nft_add_set_elem(&ctx, set, attr, info->nlh->nlmsg_flags);
+ err = nft_add_set_elem(&ctx, set, attr, info->nlh->nlmsg_flags,
+ nla_is_last(attr, rem));
if (err < 0) {
NL_SET_BAD_ATTR(extack, attr);
return err;
@@ -7836,7 +7732,7 @@ static void nft_trans_elems_destroy_abort(const struct nft_ctx *ctx,
}
static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
- const struct nlattr *attr)
+ const struct nlattr *attr, bool last)
{
struct nlattr *nla[NFTA_SET_ELEM_MAX + 1];
struct nft_set_ext_tmpl tmpl;
@@ -7904,6 +7800,11 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
if (flags)
*nft_set_ext_flags(ext) = flags;
+ if (last)
+ elem.flags = NFT_SET_ELEM_INTERNAL_LAST;
+ else
+ elem.flags = 0;
+
trans = nft_trans_elem_alloc(ctx, NFT_MSG_DELSETELEM, set);
if (trans == NULL)
goto fail_trans;
@@ -8051,7 +7952,8 @@ static int nf_tables_delsetelem(struct sk_buff *skb,
return nft_set_flush(&ctx, set, genmask);
nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
- err = nft_del_setelem(&ctx, set, attr);
+ err = nft_del_setelem(&ctx, set, attr,
+ nla_is_last(attr, rem));
if (err == -ENOENT &&
NFNL_MSG_TYPE(info->nlh->nlmsg_type) == NFT_MSG_DESTROYSETELEM)
continue;
@@ -8544,19 +8446,6 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len;
}
-static int nf_tables_dumpreset_obj(struct sk_buff *skb,
- struct netlink_callback *cb)
-{
- struct nftables_pernet *nft_net = nft_pernet(sock_net(skb->sk));
- int ret;
-
- mutex_lock(&nft_net->commit_mutex);
- ret = nf_tables_dump_obj(skb, cb);
- mutex_unlock(&nft_net->commit_mutex);
-
- return ret;
-}
-
static int nf_tables_dump_obj_start(struct netlink_callback *cb)
{
struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
@@ -8573,16 +8462,10 @@ static int nf_tables_dump_obj_start(struct netlink_callback *cb)
if (nla[NFTA_OBJ_TYPE])
ctx->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));
- return 0;
-}
-
-static int nf_tables_dumpreset_obj_start(struct netlink_callback *cb)
-{
- struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
-
- ctx->reset = true;
+ if (NFNL_MSG_TYPE(cb->nlh->nlmsg_type) == NFT_MSG_GETOBJ_RESET)
+ ctx->reset = true;
- return nf_tables_dump_obj_start(cb);
+ return 0;
}
static int nf_tables_dump_obj_done(struct netlink_callback *cb)
@@ -8644,42 +8527,16 @@ nf_tables_getobj_single(u32 portid, const struct nfnl_info *info,
static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,
const struct nlattr * const nla[])
{
- u32 portid = NETLINK_CB(skb).portid;
- struct sk_buff *skb2;
-
- if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
- struct netlink_dump_control c = {
- .start = nf_tables_dump_obj_start,
- .dump = nf_tables_dump_obj,
- .done = nf_tables_dump_obj_done,
- .module = THIS_MODULE,
- .data = (void *)nla,
- };
-
- return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c);
- }
-
- skb2 = nf_tables_getobj_single(portid, info, nla, false);
- if (IS_ERR(skb2))
- return PTR_ERR(skb2);
-
- return nfnetlink_unicast(skb2, info->net, portid);
-}
-
-static int nf_tables_getobj_reset(struct sk_buff *skb,
- const struct nfnl_info *info,
- const struct nlattr * const nla[])
-{
- struct nftables_pernet *nft_net = nft_pernet(info->net);
u32 portid = NETLINK_CB(skb).portid;
struct net *net = info->net;
struct sk_buff *skb2;
+ bool reset = false;
char *buf;
if (info->nlh->nlmsg_flags & NLM_F_DUMP) {
struct netlink_dump_control c = {
- .start = nf_tables_dumpreset_obj_start,
- .dump = nf_tables_dumpreset_obj,
+ .start = nf_tables_dump_obj_start,
+ .dump = nf_tables_dump_obj,
.done = nf_tables_dump_obj_done,
.module = THIS_MODULE,
.data = (void *)nla,
@@ -8688,18 +8545,16 @@ static int nf_tables_getobj_reset(struct sk_buff *skb,
return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c);
}
- if (!try_module_get(THIS_MODULE))
- return -EINVAL;
- rcu_read_unlock();
- mutex_lock(&nft_net->commit_mutex);
- skb2 = nf_tables_getobj_single(portid, info, nla, true);
- mutex_unlock(&nft_net->commit_mutex);
- rcu_read_lock();
- module_put(THIS_MODULE);
+ if (NFNL_MSG_TYPE(info->nlh->nlmsg_type) == NFT_MSG_GETOBJ_RESET)
+ reset = true;
+ skb2 = nf_tables_getobj_single(portid, info, nla, reset);
if (IS_ERR(skb2))
return PTR_ERR(skb2);
+ if (!reset)
+ return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
+
buf = kasprintf(GFP_ATOMIC, "%.*s:%u",
nla_len(nla[NFTA_OBJ_TABLE]),
(char *)nla_data(nla[NFTA_OBJ_TABLE]),
@@ -10017,7 +9872,7 @@ static const struct nfnl_callback nf_tables_cb[NFT_MSG_MAX] = {
.policy = nft_rule_policy,
},
[NFT_MSG_GETRULE_RESET] = {
- .call = nf_tables_getrule_reset,
+ .call = nf_tables_getrule,
.type = NFNL_CB_RCU,
.attr_count = NFTA_RULE_MAX,
.policy = nft_rule_policy,
@@ -10071,7 +9926,7 @@ static const struct nfnl_callback nf_tables_cb[NFT_MSG_MAX] = {
.policy = nft_set_elem_list_policy,
},
[NFT_MSG_GETSETELEM_RESET] = {
- .call = nf_tables_getsetelem_reset,
+ .call = nf_tables_getsetelem,
.type = NFNL_CB_RCU,
.attr_count = NFTA_SET_ELEM_LIST_MAX,
.policy = nft_set_elem_list_policy,
@@ -10117,7 +9972,7 @@ static const struct nfnl_callback nf_tables_cb[NFT_MSG_MAX] = {
.policy = nft_obj_policy,
},
[NFT_MSG_GETOBJ_RESET] = {
- .call = nf_tables_getobj_reset,
+ .call = nf_tables_getobj,
.type = NFNL_CB_RCU,
.attr_count = NFTA_OBJ_MAX,
.policy = nft_obj_policy,
@@ -11536,6 +11391,13 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb,
ret = __nf_tables_abort(net, action);
nft_gc_seq_end(nft_net, gc_seq);
+ if (action == NFNL_ABORT_NONE) {
+ struct nft_table *table;
+
+ list_for_each_entry(table, &nft_net->tables, list)
+ table->validate_state = NFT_VALIDATE_SKIP;
+ }
+
WARN_ON_ONCE(!list_empty(&nft_net->commit_list));
/* module autoload needs to happen after GC sequence update because it
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 8b7b39d8a109..34548213f2f1 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -30,6 +30,8 @@
#include <linux/netfilter/nf_conntrack_common.h>
#include <linux/list.h>
#include <linux/cgroup-defs.h>
+#include <linux/rhashtable.h>
+#include <linux/jhash.h>
#include <net/gso.h>
#include <net/sock.h>
#include <net/tcp_states.h>
@@ -47,6 +49,8 @@
#endif
#define NFQNL_QMAX_DEFAULT 1024
+#define NFQNL_HASH_MIN 1024
+#define NFQNL_HASH_MAX 1048576
/* We're using struct nlattr which has 16bit nla_len. Note that nla_len
* includes the header length. Thus, the maximum packet length that we
@@ -56,6 +60,26 @@
*/
#define NFQNL_MAX_COPY_RANGE (0xffff - NLA_HDRLEN)
+/* Composite key for packet lookup: (net, queue_num, packet_id) */
+struct nfqnl_packet_key {
+ possible_net_t net;
+ u32 packet_id;
+ u16 queue_num;
+} __aligned(sizeof(u32)); /* jhash2 requires 32-bit alignment */
+
+/* Global rhashtable - one for entire system, all netns */
+static struct rhashtable nfqnl_packet_map __read_mostly;
+
+/* Helper to initialize composite key */
+static inline void nfqnl_init_key(struct nfqnl_packet_key *key,
+ struct net *net, u32 packet_id, u16 queue_num)
+{
+ memset(key, 0, sizeof(*key));
+ write_pnet(&key->net, net);
+ key->packet_id = packet_id;
+ key->queue_num = queue_num;
+}
+
struct nfqnl_instance {
struct hlist_node hlist; /* global list of queues */
struct rcu_head rcu;
@@ -100,6 +124,39 @@ static inline u_int8_t instance_hashfn(u_int16_t queue_num)
return ((queue_num >> 8) ^ queue_num) % INSTANCE_BUCKETS;
}
+/* Extract composite key from nf_queue_entry for hashing */
+static u32 nfqnl_packet_obj_hashfn(const void *data, u32 len, u32 seed)
+{
+ const struct nf_queue_entry *entry = data;
+ struct nfqnl_packet_key key;
+
+ nfqnl_init_key(&key, entry->state.net, entry->id, entry->queue_num);
+
+ return jhash2((u32 *)&key, sizeof(key) / sizeof(u32), seed);
+}
+
+/* Compare stack-allocated key against entry */
+static int nfqnl_packet_obj_cmpfn(struct rhashtable_compare_arg *arg,
+ const void *obj)
+{
+ const struct nfqnl_packet_key *key = arg->key;
+ const struct nf_queue_entry *entry = obj;
+
+ return !net_eq(entry->state.net, read_pnet(&key->net)) ||
+ entry->queue_num != key->queue_num ||
+ entry->id != key->packet_id;
+}
+
+static const struct rhashtable_params nfqnl_rhashtable_params = {
+ .head_offset = offsetof(struct nf_queue_entry, hash_node),
+ .key_len = sizeof(struct nfqnl_packet_key),
+ .obj_hashfn = nfqnl_packet_obj_hashfn,
+ .obj_cmpfn = nfqnl_packet_obj_cmpfn,
+ .automatic_shrinking = true,
+ .min_size = NFQNL_HASH_MIN,
+ .max_size = NFQNL_HASH_MAX,
+};
+
static struct nfqnl_instance *
instance_lookup(struct nfnl_queue_net *q, u_int16_t queue_num)
{
@@ -191,33 +248,45 @@ instance_destroy(struct nfnl_queue_net *q, struct nfqnl_instance *inst)
spin_unlock(&q->instances_lock);
}
-static inline void
+static int
__enqueue_entry(struct nfqnl_instance *queue, struct nf_queue_entry *entry)
{
- list_add_tail(&entry->list, &queue->queue_list);
- queue->queue_total++;
+ int err;
+
+ entry->queue_num = queue->queue_num;
+
+ err = rhashtable_insert_fast(&nfqnl_packet_map, &entry->hash_node,
+ nfqnl_rhashtable_params);
+ if (unlikely(err))
+ return err;
+
+ list_add_tail(&entry->list, &queue->queue_list);
+ queue->queue_total++;
+
+ return 0;
}
static void
__dequeue_entry(struct nfqnl_instance *queue, struct nf_queue_entry *entry)
{
+ rhashtable_remove_fast(&nfqnl_packet_map, &entry->hash_node,
+ nfqnl_rhashtable_params);
list_del(&entry->list);
queue->queue_total--;
}
static struct nf_queue_entry *
-find_dequeue_entry(struct nfqnl_instance *queue, unsigned int id)
+find_dequeue_entry(struct nfqnl_instance *queue, unsigned int id,
+ struct net *net)
{
- struct nf_queue_entry *entry = NULL, *i;
+ struct nfqnl_packet_key key;
+ struct nf_queue_entry *entry;
- spin_lock_bh(&queue->lock);
+ nfqnl_init_key(&key, net, id, queue->queue_num);
- list_for_each_entry(i, &queue->queue_list, list) {
- if (i->id == id) {
- entry = i;
- break;
- }
- }
+ spin_lock_bh(&queue->lock);
+ entry = rhashtable_lookup_fast(&nfqnl_packet_map, &key,
+ nfqnl_rhashtable_params);
if (entry)
__dequeue_entry(queue, entry);
@@ -369,6 +438,34 @@ static void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
nf_queue_entry_free(entry);
}
+/* return true if the entry has an unconfirmed conntrack attached that isn't owned by us
+ * exclusively.
+ */
+static bool nf_ct_drop_unconfirmed(const struct nf_queue_entry *entry, bool *is_unconfirmed)
+{
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
+ struct nf_conn *ct = (void *)skb_nfct(entry->skb);
+
+ if (!ct || nf_ct_is_confirmed(ct))
+ return false;
+
+ if (is_unconfirmed)
+ *is_unconfirmed = true;
+
+ /* in some cases skb_clone() can occur after initial conntrack
+ * pickup, but conntrack assumes exclusive skb->_nfct ownership for
+ * unconfirmed entries.
+ *
+ * This happens for br_netfilter and with ip multicast routing.
+ * This can't be solved with serialization here because one clone
+ * could have been queued for local delivery or could be transmitted
+ * in parallel on another CPU.
+ */
+ return refcount_read(&ct->ct_general.use) > 1;
+#endif
+ return false;
+}
+
static void nfqnl_reinject(struct nf_queue_entry *entry, unsigned int verdict)
{
const struct nf_ct_hook *ct_hook;
@@ -396,6 +493,24 @@ static void nfqnl_reinject(struct nf_queue_entry *entry, unsigned int verdict)
break;
}
}
+
+ if (verdict != NF_DROP && entry->nf_ct_is_unconfirmed) {
+ /* If first queued segment was already reinjected then
+ * there is a good chance the ct entry is now confirmed.
+ *
+ * Handle the rare cases:
+ * - out-of-order verdict
+ * - threaded userspace reinjecting in parallel
+ * - first segment was dropped
+ *
+ * In all of those cases we can't handle this packet
+ * because we can't be sure that another CPU won't modify
+ * nf_conn->ext in parallel which isn't allowed.
+ */
+ if (nf_ct_drop_unconfirmed(entry, NULL))
+ verdict = NF_DROP;
+ }
+
nf_reinject(entry, verdict);
}
@@ -407,8 +522,7 @@ nfqnl_flush(struct nfqnl_instance *queue, nfqnl_cmpfn cmpfn, unsigned long data)
spin_lock_bh(&queue->lock);
list_for_each_entry_safe(entry, next, &queue->queue_list, list) {
if (!cmpfn || cmpfn(entry, data)) {
- list_del(&entry->list);
- queue->queue_total--;
+ __dequeue_entry(queue, entry);
nfqnl_reinject(entry, NF_DROP);
}
}
@@ -826,49 +940,6 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
return NULL;
}
-static bool nf_ct_drop_unconfirmed(const struct nf_queue_entry *entry)
-{
-#if IS_ENABLED(CONFIG_NF_CONNTRACK)
- static const unsigned long flags = IPS_CONFIRMED | IPS_DYING;
- struct nf_conn *ct = (void *)skb_nfct(entry->skb);
- unsigned long status;
- unsigned int use;
-
- if (!ct)
- return false;
-
- status = READ_ONCE(ct->status);
- if ((status & flags) == IPS_DYING)
- return true;
-
- if (status & IPS_CONFIRMED)
- return false;
-
- /* in some cases skb_clone() can occur after initial conntrack
- * pickup, but conntrack assumes exclusive skb->_nfct ownership for
- * unconfirmed entries.
- *
- * This happens for br_netfilter and with ip multicast routing.
- * We can't be solved with serialization here because one clone could
- * have been queued for local delivery.
- */
- use = refcount_read(&ct->ct_general.use);
- if (likely(use == 1))
- return false;
-
- /* Can't decrement further? Exclusive ownership. */
- if (!refcount_dec_not_one(&ct->ct_general.use))
- return false;
-
- skb_set_nfct(entry->skb, 0);
- /* No nf_ct_put(): we already decremented .use and it cannot
- * drop down to 0.
- */
- return true;
-#endif
- return false;
-}
-
static int
__nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue,
struct nf_queue_entry *entry)
@@ -885,26 +956,23 @@ __nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue,
}
spin_lock_bh(&queue->lock);
- if (nf_ct_drop_unconfirmed(entry))
- goto err_out_free_nskb;
+ if (queue->queue_total >= queue->queue_maxlen)
+ goto err_out_queue_drop;
- if (queue->queue_total >= queue->queue_maxlen) {
- if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
- failopen = 1;
- err = 0;
- } else {
- queue->queue_dropped++;
- net_warn_ratelimited("nf_queue: full at %d entries, dropping packets(s)\n",
- queue->queue_total);
- }
- goto err_out_free_nskb;
- }
entry->id = ++queue->id_sequence;
*packet_id_ptr = htonl(entry->id);
+ /* Insert into hash BEFORE unicast. If failure don't send to userspace. */
+ err = __enqueue_entry(queue, entry);
+ if (unlikely(err))
+ goto err_out_queue_drop;
+
/* nfnetlink_unicast will either free the nskb or add it to a socket */
err = nfnetlink_unicast(nskb, net, queue->peer_portid);
if (err < 0) {
+ /* Unicast failed - remove entry we just inserted */
+ __dequeue_entry(queue, entry);
+
if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
failopen = 1;
err = 0;
@@ -914,12 +982,22 @@ __nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue,
goto err_out_unlock;
}
- __enqueue_entry(queue, entry);
-
spin_unlock_bh(&queue->lock);
return 0;
-err_out_free_nskb:
+err_out_queue_drop:
+ if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
+ failopen = 1;
+ err = 0;
+ } else {
+ queue->queue_dropped++;
+
+ if (queue->queue_total >= queue->queue_maxlen)
+ net_warn_ratelimited("nf_queue: full at %d entries, dropping packets(s)\n",
+ queue->queue_total);
+ else
+ net_warn_ratelimited("nf_queue: hash insert failed: %d\n", err);
+ }
kfree_skb(nskb);
err_out_unlock:
spin_unlock_bh(&queue->lock);
@@ -998,9 +1076,10 @@ __nfqnl_enqueue_packet_gso(struct net *net, struct nfqnl_instance *queue,
static int
nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
{
- unsigned int queued;
- struct nfqnl_instance *queue;
struct sk_buff *skb, *segs, *nskb;
+ bool ct_is_unconfirmed = false;
+ struct nfqnl_instance *queue;
+ unsigned int queued;
int err = -ENOBUFS;
struct net *net = entry->state.net;
struct nfnl_queue_net *q = nfnl_queue_pernet(net);
@@ -1024,6 +1103,15 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
break;
}
+ /* Check if someone already holds another reference to
+ * unconfirmed ct. If so, we cannot queue the skb:
+ * concurrent modifications of nf_conn->ext are not
+ * allowed and we can't know if another CPU isn't
+ * processing the same nf_conn entry in parallel.
+ */
+ if (nf_ct_drop_unconfirmed(entry, &ct_is_unconfirmed))
+ return -EINVAL;
+
if (!skb_is_gso(skb) || ((queue->flags & NFQA_CFG_F_GSO) && !skb_is_gso_sctp(skb)))
return __nfqnl_enqueue_packet(net, queue, entry);
@@ -1037,7 +1125,23 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
goto out_err;
queued = 0;
err = 0;
+
skb_list_walk_safe(segs, segs, nskb) {
+ if (ct_is_unconfirmed && queued > 0) {
+ /* skb_gso_segment() increments the ct refcount.
+ * This is a problem for unconfirmed (not in hash)
+ * entries, those can race when reinjections happen
+ * in parallel.
+ *
+ * Annotate this for all queued entries except the
+ * first one.
+ *
+ * As long as the first one is reinjected first it
+ * will do the confirmation for us.
+ */
+ entry->nf_ct_is_unconfirmed = ct_is_unconfirmed;
+ }
+
if (err == 0)
err = __nfqnl_enqueue_packet_gso(net, queue,
segs, entry);
@@ -1430,7 +1534,7 @@ static int nfqnl_recv_verdict(struct sk_buff *skb, const struct nfnl_info *info,
verdict = ntohl(vhdr->verdict);
- entry = find_dequeue_entry(queue, ntohl(vhdr->id));
+ entry = find_dequeue_entry(queue, ntohl(vhdr->id), info->net);
if (entry == NULL)
return -ENOENT;
@@ -1781,10 +1885,14 @@ static int __init nfnetlink_queue_init(void)
{
int status;
+ status = rhashtable_init(&nfqnl_packet_map, &nfqnl_rhashtable_params);
+ if (status < 0)
+ return status;
+
status = register_pernet_subsys(&nfnl_queue_net_ops);
if (status < 0) {
pr_err("failed to register pernet ops\n");
- goto out;
+ goto cleanup_rhashtable;
}
netlink_register_notifier(&nfqnl_rtnl_notifier);
@@ -1809,7 +1917,8 @@ static int __init nfnetlink_queue_init(void)
cleanup_netlink_notifier:
netlink_unregister_notifier(&nfqnl_rtnl_notifier);
unregister_pernet_subsys(&nfnl_queue_net_ops);
-out:
+cleanup_rhashtable:
+ rhashtable_destroy(&nfqnl_packet_map);
return status;
}
@@ -1821,6 +1930,8 @@ static void __exit nfnetlink_queue_fini(void)
netlink_unregister_notifier(&nfqnl_rtnl_notifier);
unregister_pernet_subsys(&nfnl_queue_net_ops);
+ rhashtable_destroy(&nfqnl_packet_map);
+
rcu_barrier(); /* Wait for completion of call_rcu()'s */
}
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index 72711d62fddf..08f620311b03 100644
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -134,7 +134,8 @@ static void nft_target_eval_bridge(const struct nft_expr *expr,
}
static const struct nla_policy nft_target_policy[NFTA_TARGET_MAX + 1] = {
- [NFTA_TARGET_NAME] = { .type = NLA_NUL_STRING },
+ [NFTA_TARGET_NAME] = { .type = NLA_NUL_STRING,
+ .len = XT_EXTENSION_MAXNAMELEN, },
[NFTA_TARGET_REV] = NLA_POLICY_MAX(NLA_BE32, 255),
[NFTA_TARGET_INFO] = { .type = NLA_BINARY },
};
@@ -434,7 +435,8 @@ static void nft_match_eval(const struct nft_expr *expr,
}
static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
- [NFTA_MATCH_NAME] = { .type = NLA_NUL_STRING },
+ [NFTA_MATCH_NAME] = { .type = NLA_NUL_STRING,
+ .len = XT_EXTENSION_MAXNAMELEN },
[NFTA_MATCH_REV] = NLA_POLICY_MAX(NLA_BE32, 255),
[NFTA_MATCH_INFO] = { .type = NLA_BINARY },
};
@@ -693,7 +695,12 @@ static int nfnl_compat_get_rcu(struct sk_buff *skb,
name = nla_data(tb[NFTA_COMPAT_NAME]);
rev = ntohl(nla_get_be32(tb[NFTA_COMPAT_REV]));
- target = ntohl(nla_get_be32(tb[NFTA_COMPAT_TYPE]));
+ /* x_tables api checks for 'target == 1' to mean target,
+ * everything else means 'match'.
+ * In x_tables world, the number is set by kernel, not
+ * userspace.
+ */
+ target = nla_get_be32(tb[NFTA_COMPAT_TYPE]) == htonl(1);
switch(family) {
case AF_INET:
diff --git a/net/netfilter/nft_counter.c b/net/netfilter/nft_counter.c
index cc7325329496..169ae93688bc 100644
--- a/net/netfilter/nft_counter.c
+++ b/net/netfilter/nft_counter.c
@@ -32,6 +32,9 @@ struct nft_counter_percpu_priv {
static DEFINE_PER_CPU(struct u64_stats_sync, nft_counter_sync);
+/* control plane only: sync fetch+reset */
+static DEFINE_SPINLOCK(nft_counter_lock);
+
static inline void nft_counter_do_eval(struct nft_counter_percpu_priv *priv,
struct nft_regs *regs,
const struct nft_pktinfo *pkt)
@@ -117,8 +120,8 @@ static void nft_counter_reset(struct nft_counter_percpu_priv *priv,
nft_sync = this_cpu_ptr(&nft_counter_sync);
u64_stats_update_begin(nft_sync);
- u64_stats_add(&this_cpu->packets, -total->packets);
- u64_stats_add(&this_cpu->bytes, -total->bytes);
+ u64_stats_sub(&this_cpu->packets, total->packets);
+ u64_stats_sub(&this_cpu->bytes, total->bytes);
u64_stats_update_end(nft_sync);
local_bh_enable();
@@ -148,13 +151,25 @@ static void nft_counter_fetch(struct nft_counter_percpu_priv *priv,
}
}
+static void nft_counter_fetch_and_reset(struct nft_counter_percpu_priv *priv,
+ struct nft_counter_tot *total)
+{
+ spin_lock(&nft_counter_lock);
+ nft_counter_fetch(priv, total);
+ nft_counter_reset(priv, total);
+ spin_unlock(&nft_counter_lock);
+}
+
static int nft_counter_do_dump(struct sk_buff *skb,
struct nft_counter_percpu_priv *priv,
bool reset)
{
struct nft_counter_tot total;
- nft_counter_fetch(priv, &total);
+ if (unlikely(reset))
+ nft_counter_fetch_and_reset(priv, &total);
+ else
+ nft_counter_fetch(priv, &total);
if (nla_put_be64(skb, NFTA_COUNTER_BYTES, cpu_to_be64(total.bytes),
NFTA_COUNTER_PAD) ||
@@ -162,9 +177,6 @@ static int nft_counter_do_dump(struct sk_buff *skb,
NFTA_COUNTER_PAD))
goto nla_put_failure;
- if (reset)
- nft_counter_reset(priv, &total);
-
return 0;
nla_put_failure:
diff --git a/net/netfilter/nft_quota.c b/net/netfilter/nft_quota.c
index df0798da2329..cb6c0e04ff67 100644
--- a/net/netfilter/nft_quota.c
+++ b/net/netfilter/nft_quota.c
@@ -140,11 +140,16 @@ static int nft_quota_do_dump(struct sk_buff *skb, struct nft_quota *priv,
u64 consumed, consumed_cap, quota;
u32 flags = priv->flags;
- /* Since we inconditionally increment consumed quota for each packet
+ /* Since we unconditionally increment consumed quota for each packet
* that we see, don't go over the quota boundary in what we send to
* userspace.
*/
- consumed = atomic64_read(priv->consumed);
+ if (reset) {
+ consumed = atomic64_xchg(priv->consumed, 0);
+ clear_bit(NFT_QUOTA_DEPLETED_BIT, &priv->flags);
+ } else {
+ consumed = atomic64_read(priv->consumed);
+ }
quota = atomic64_read(&priv->quota);
if (consumed >= quota) {
consumed_cap = quota;
@@ -160,10 +165,6 @@ static int nft_quota_do_dump(struct sk_buff *skb, struct nft_quota *priv,
nla_put_be32(skb, NFTA_QUOTA_FLAGS, htonl(flags)))
goto nla_put_failure;
- if (reset) {
- atomic64_sub(consumed, priv->consumed);
- clear_bit(NFT_QUOTA_DEPLETED_BIT, &priv->flags);
- }
return 0;
nla_put_failure:
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index ba01ce75d6de..739b992bde59 100644
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -619,15 +619,20 @@ static struct nft_elem_priv *
nft_hash_get(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem, unsigned int flags)
{
+ const u32 *key = (const u32 *)&elem->key.val;
struct nft_hash *priv = nft_set_priv(set);
u8 genmask = nft_genmask_cur(net);
struct nft_hash_elem *he;
u32 hash;
- hash = jhash(elem->key.val.data, set->klen, priv->seed);
+ if (set->klen == 4)
+ hash = jhash_1word(*key, priv->seed);
+ else
+ hash = jhash(key, set->klen, priv->seed);
+
hash = reciprocal_scale(hash, priv->buckets);
hlist_for_each_entry_rcu(he, &priv->table[hash], node) {
- if (!memcmp(nft_set_ext_key(&he->ext), elem->key.val.data, set->klen) &&
+ if (!memcmp(nft_set_ext_key(&he->ext), key, set->klen) &&
nft_set_elem_active(&he->ext, genmask))
return &he->priv;
}
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index ca594161b840..644d4b916705 100644
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -10,21 +10,41 @@
#include <linux/module.h>
#include <linux/list.h>
#include <linux/rbtree.h>
+#include <linux/bsearch.h>
#include <linux/netlink.h>
#include <linux/netfilter.h>
#include <linux/netfilter/nf_tables.h>
#include <net/netfilter/nf_tables_core.h>
+struct nft_array_interval {
+ struct nft_set_ext *from;
+ struct nft_set_ext *to;
+};
+
+struct nft_array {
+ u32 max_intervals;
+ u32 num_intervals;
+ struct nft_array_interval *intervals;
+ struct rcu_head rcu_head;
+};
+
struct nft_rbtree {
struct rb_root root;
rwlock_t lock;
- seqcount_rwlock_t count;
+ struct nft_array __rcu *array;
+ struct nft_array *array_next;
+ unsigned long start_rbe_cookie;
unsigned long last_gc;
+ struct list_head expired;
+ u64 last_tstamp;
};
struct nft_rbtree_elem {
struct nft_elem_priv priv;
- struct rb_node node;
+ union {
+ struct rb_node node;
+ struct list_head list;
+ };
struct nft_set_ext ext;
};
@@ -39,6 +59,13 @@ static bool nft_rbtree_interval_start(const struct nft_rbtree_elem *rbe)
return !nft_rbtree_interval_end(rbe);
}
+static bool nft_rbtree_interval_null(const struct nft_set *set,
+ const struct nft_rbtree_elem *rbe)
+{
+ return (!memchr_inv(nft_set_ext_key(&rbe->ext), 0, set->klen) &&
+ nft_rbtree_interval_end(rbe));
+}
+
static int nft_rbtree_cmp(const struct nft_set *set,
const struct nft_rbtree_elem *e1,
const struct nft_rbtree_elem *e2)
@@ -47,67 +74,33 @@ static int nft_rbtree_cmp(const struct nft_set *set,
set->klen);
}
-static bool nft_rbtree_elem_expired(const struct nft_rbtree_elem *rbe)
-{
- return nft_set_elem_expired(&rbe->ext);
-}
+struct nft_array_lookup_ctx {
+ const u32 *key;
+ u32 klen;
+};
-static const struct nft_set_ext *
-__nft_rbtree_lookup(const struct net *net, const struct nft_set *set,
- const u32 *key, unsigned int seq)
+static int nft_array_lookup_cmp(const void *pkey, const void *entry)
{
- struct nft_rbtree *priv = nft_set_priv(set);
- const struct nft_rbtree_elem *rbe, *interval = NULL;
- u8 genmask = nft_genmask_cur(net);
- const struct rb_node *parent;
- int d;
+ const struct nft_array_interval *interval = entry;
+ const struct nft_array_lookup_ctx *ctx = pkey;
+ int a, b;
- parent = rcu_dereference_raw(priv->root.rb_node);
- while (parent != NULL) {
- if (read_seqcount_retry(&priv->count, seq))
- return NULL;
-
- rbe = rb_entry(parent, struct nft_rbtree_elem, node);
+ if (!interval->from)
+ return 1;
- d = memcmp(nft_set_ext_key(&rbe->ext), key, set->klen);
- if (d < 0) {
- parent = rcu_dereference_raw(parent->rb_left);
- if (interval &&
- !nft_rbtree_cmp(set, rbe, interval) &&
- nft_rbtree_interval_end(rbe) &&
- nft_rbtree_interval_start(interval))
- continue;
- if (nft_set_elem_active(&rbe->ext, genmask) &&
- !nft_rbtree_elem_expired(rbe))
- interval = rbe;
- } else if (d > 0)
- parent = rcu_dereference_raw(parent->rb_right);
- else {
- if (!nft_set_elem_active(&rbe->ext, genmask)) {
- parent = rcu_dereference_raw(parent->rb_left);
- continue;
- }
-
- if (nft_rbtree_elem_expired(rbe))
- return NULL;
-
- if (nft_rbtree_interval_end(rbe)) {
- if (nft_set_is_anonymous(set))
- return NULL;
- parent = rcu_dereference_raw(parent->rb_left);
- interval = NULL;
- continue;
- }
+ a = memcmp(ctx->key, nft_set_ext_key(interval->from), ctx->klen);
+ if (!interval->to)
+ b = -1;
+ else
+ b = memcmp(ctx->key, nft_set_ext_key(interval->to), ctx->klen);
- return &rbe->ext;
- }
- }
+ if (a >= 0 && b < 0)
+ return 0;
- if (set->flags & NFT_SET_INTERVAL && interval != NULL &&
- nft_rbtree_interval_start(interval))
- return &interval->ext;
+ if (a < 0)
+ return -1;
- return NULL;
+ return 1;
}
INDIRECT_CALLABLE_SCOPE
@@ -116,83 +109,57 @@ nft_rbtree_lookup(const struct net *net, const struct nft_set *set,
const u32 *key)
{
struct nft_rbtree *priv = nft_set_priv(set);
- unsigned int seq = read_seqcount_begin(&priv->count);
- const struct nft_set_ext *ext;
-
- ext = __nft_rbtree_lookup(net, set, key, seq);
- if (ext || !read_seqcount_retry(&priv->count, seq))
- return ext;
-
- read_lock_bh(&priv->lock);
- seq = read_seqcount_begin(&priv->count);
- ext = __nft_rbtree_lookup(net, set, key, seq);
- read_unlock_bh(&priv->lock);
-
- return ext;
+ struct nft_array *array = rcu_dereference(priv->array);
+ const struct nft_array_interval *interval;
+ struct nft_array_lookup_ctx ctx = {
+ .key = key,
+ .klen = set->klen,
+ };
+
+ if (!array)
+ return NULL;
+
+ interval = bsearch(&ctx, array->intervals, array->num_intervals,
+ sizeof(struct nft_array_interval),
+ nft_array_lookup_cmp);
+ if (!interval || nft_set_elem_expired(interval->from))
+ return NULL;
+
+ return interval->from;
}
-static bool __nft_rbtree_get(const struct net *net, const struct nft_set *set,
- const u32 *key, struct nft_rbtree_elem **elem,
- unsigned int seq, unsigned int flags, u8 genmask)
-{
- struct nft_rbtree_elem *rbe, *interval = NULL;
- struct nft_rbtree *priv = nft_set_priv(set);
- const struct rb_node *parent;
- const void *this;
- int d;
-
- parent = rcu_dereference_raw(priv->root.rb_node);
- while (parent != NULL) {
- if (read_seqcount_retry(&priv->count, seq))
- return false;
-
- rbe = rb_entry(parent, struct nft_rbtree_elem, node);
-
- this = nft_set_ext_key(&rbe->ext);
- d = memcmp(this, key, set->klen);
- if (d < 0) {
- parent = rcu_dereference_raw(parent->rb_left);
- if (!(flags & NFT_SET_ELEM_INTERVAL_END))
- interval = rbe;
- } else if (d > 0) {
- parent = rcu_dereference_raw(parent->rb_right);
- if (flags & NFT_SET_ELEM_INTERVAL_END)
- interval = rbe;
- } else {
- if (!nft_set_elem_active(&rbe->ext, genmask)) {
- parent = rcu_dereference_raw(parent->rb_left);
- continue;
- }
+struct nft_array_get_ctx {
+ const u32 *key;
+ unsigned int flags;
+ u32 klen;
+};
- if (nft_set_elem_expired(&rbe->ext))
- return false;
+static int nft_array_get_cmp(const void *pkey, const void *entry)
+{
+ const struct nft_array_interval *interval = entry;
+ const struct nft_array_get_ctx *ctx = pkey;
+ int a, b;
- if (!nft_set_ext_exists(&rbe->ext, NFT_SET_EXT_FLAGS) ||
- (*nft_set_ext_flags(&rbe->ext) & NFT_SET_ELEM_INTERVAL_END) ==
- (flags & NFT_SET_ELEM_INTERVAL_END)) {
- *elem = rbe;
- return true;
- }
+ if (!interval->from)
+ return 1;
- if (nft_rbtree_interval_end(rbe))
- interval = NULL;
+ a = memcmp(ctx->key, nft_set_ext_key(interval->from), ctx->klen);
+ if (!interval->to)
+ b = -1;
+ else
+ b = memcmp(ctx->key, nft_set_ext_key(interval->to), ctx->klen);
- parent = rcu_dereference_raw(parent->rb_left);
- }
+ if (a >= 0) {
+ if (ctx->flags & NFT_SET_ELEM_INTERVAL_END && b <= 0)
+ return 0;
+ else if (b < 0)
+ return 0;
}
- if (set->flags & NFT_SET_INTERVAL && interval != NULL &&
- nft_set_elem_active(&interval->ext, genmask) &&
- !nft_set_elem_expired(&interval->ext) &&
- ((!nft_rbtree_interval_end(interval) &&
- !(flags & NFT_SET_ELEM_INTERVAL_END)) ||
- (nft_rbtree_interval_end(interval) &&
- (flags & NFT_SET_ELEM_INTERVAL_END)))) {
- *elem = interval;
- return true;
- }
+ if (a < 0)
+ return -1;
- return false;
+ return 1;
}
static struct nft_elem_priv *
@@ -200,34 +167,41 @@ nft_rbtree_get(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem, unsigned int flags)
{
struct nft_rbtree *priv = nft_set_priv(set);
- unsigned int seq = read_seqcount_begin(&priv->count);
- struct nft_rbtree_elem *rbe = ERR_PTR(-ENOENT);
- const u32 *key = (const u32 *)&elem->key.val;
- u8 genmask = nft_genmask_cur(net);
- bool ret;
-
- ret = __nft_rbtree_get(net, set, key, &rbe, seq, flags, genmask);
- if (ret || !read_seqcount_retry(&priv->count, seq))
- return &rbe->priv;
-
- read_lock_bh(&priv->lock);
- seq = read_seqcount_begin(&priv->count);
- ret = __nft_rbtree_get(net, set, key, &rbe, seq, flags, genmask);
- read_unlock_bh(&priv->lock);
-
- if (!ret)
+ struct nft_array *array = rcu_dereference(priv->array);
+ const struct nft_array_interval *interval;
+ struct nft_array_get_ctx ctx = {
+ .key = (const u32 *)&elem->key.val,
+ .flags = flags,
+ .klen = set->klen,
+ };
+ struct nft_rbtree_elem *rbe;
+
+ if (!array)
return ERR_PTR(-ENOENT);
+ interval = bsearch(&ctx, array->intervals, array->num_intervals,
+ sizeof(struct nft_array_interval), nft_array_get_cmp);
+ if (!interval || nft_set_elem_expired(interval->from))
+ return ERR_PTR(-ENOENT);
+
+ if (flags & NFT_SET_ELEM_INTERVAL_END)
+ rbe = container_of(interval->to, struct nft_rbtree_elem, ext);
+ else
+ rbe = container_of(interval->from, struct nft_rbtree_elem, ext);
+
return &rbe->priv;
}
-static void nft_rbtree_gc_elem_remove(struct net *net, struct nft_set *set,
- struct nft_rbtree *priv,
- struct nft_rbtree_elem *rbe)
+static void nft_rbtree_gc_elem_move(struct net *net, struct nft_set *set,
+ struct nft_rbtree *priv,
+ struct nft_rbtree_elem *rbe)
{
lockdep_assert_held_write(&priv->lock);
nft_setelem_data_deactivate(net, set, &rbe->priv);
rb_erase(&rbe->node, &priv->root);
+
+ /* collected later on in commit callback */
+ list_add(&rbe->list, &priv->expired);
}
static const struct nft_rbtree_elem *
@@ -238,11 +212,6 @@ nft_rbtree_gc_elem(const struct nft_set *__set, struct nft_rbtree *priv,
struct rb_node *prev = rb_prev(&rbe->node);
struct net *net = read_pnet(&set->net);
struct nft_rbtree_elem *rbe_prev;
- struct nft_trans_gc *gc;
-
- gc = nft_trans_gc_alloc(set, 0, GFP_ATOMIC);
- if (!gc)
- return ERR_PTR(-ENOMEM);
/* search for end interval coming before this element.
* end intervals don't carry a timeout extension, they
@@ -260,28 +229,10 @@ nft_rbtree_gc_elem(const struct nft_set *__set, struct nft_rbtree *priv,
rbe_prev = NULL;
if (prev) {
rbe_prev = rb_entry(prev, struct nft_rbtree_elem, node);
- nft_rbtree_gc_elem_remove(net, set, priv, rbe_prev);
-
- /* There is always room in this trans gc for this element,
- * memory allocation never actually happens, hence, the warning
- * splat in such case. No need to set NFT_SET_ELEM_DEAD_BIT,
- * this is synchronous gc which never fails.
- */
- gc = nft_trans_gc_queue_sync(gc, GFP_ATOMIC);
- if (WARN_ON_ONCE(!gc))
- return ERR_PTR(-ENOMEM);
-
- nft_trans_gc_elem_add(gc, rbe_prev);
+ nft_rbtree_gc_elem_move(net, set, priv, rbe_prev);
}
- nft_rbtree_gc_elem_remove(net, set, priv, rbe);
- gc = nft_trans_gc_queue_sync(gc, GFP_ATOMIC);
- if (WARN_ON_ONCE(!gc))
- return ERR_PTR(-ENOMEM);
-
- nft_trans_gc_elem_add(gc, rbe);
-
- nft_trans_gc_queue_sync_done(gc);
+ nft_rbtree_gc_elem_move(net, set, priv, rbe);
return rbe_prev;
}
@@ -302,16 +253,107 @@ static bool nft_rbtree_update_first(const struct nft_set *set,
return false;
}
+/* Only for anonymous sets which do not allow updates, all element are active. */
+static struct nft_rbtree_elem *nft_rbtree_prev_active(struct nft_rbtree_elem *rbe)
+{
+ struct rb_node *node;
+
+ node = rb_prev(&rbe->node);
+ if (!node)
+ return NULL;
+
+ return rb_entry(node, struct nft_rbtree_elem, node);
+}
+
+static struct nft_rbtree_elem *
+__nft_rbtree_next_active(struct rb_node *node, u8 genmask)
+{
+ struct nft_rbtree_elem *next_rbe;
+
+ while (node) {
+ next_rbe = rb_entry(node, struct nft_rbtree_elem, node);
+ if (!nft_set_elem_active(&next_rbe->ext, genmask)) {
+ node = rb_next(node);
+ continue;
+ }
+
+ return next_rbe;
+ }
+
+ return NULL;
+}
+
+static struct nft_rbtree_elem *
+nft_rbtree_next_active(struct nft_rbtree_elem *rbe, u8 genmask)
+{
+ return __nft_rbtree_next_active(rb_next(&rbe->node), genmask);
+}
+
+static void nft_rbtree_maybe_reset_start_cookie(struct nft_rbtree *priv,
+ u64 tstamp)
+{
+ if (priv->last_tstamp != tstamp) {
+ priv->start_rbe_cookie = 0;
+ priv->last_tstamp = tstamp;
+ }
+}
+
+static void nft_rbtree_set_start_cookie(struct nft_rbtree *priv,
+ const struct nft_rbtree_elem *rbe)
+{
+ priv->start_rbe_cookie = (unsigned long)rbe;
+}
+
+static void nft_rbtree_set_start_cookie_open(struct nft_rbtree *priv,
+ const struct nft_rbtree_elem *rbe,
+ unsigned long open_interval)
+{
+ priv->start_rbe_cookie = (unsigned long)rbe | open_interval;
+}
+
+#define NFT_RBTREE_OPEN_INTERVAL 1UL
+
+static bool nft_rbtree_cmp_start_cookie(struct nft_rbtree *priv,
+ const struct nft_rbtree_elem *rbe)
+{
+ return (priv->start_rbe_cookie & ~NFT_RBTREE_OPEN_INTERVAL) == (unsigned long)rbe;
+}
+
+static bool nft_rbtree_insert_same_interval(const struct net *net,
+ struct nft_rbtree *priv,
+ struct nft_rbtree_elem *rbe)
+{
+ u8 genmask = nft_genmask_next(net);
+ struct nft_rbtree_elem *next_rbe;
+
+ if (!priv->start_rbe_cookie)
+ return true;
+
+ next_rbe = nft_rbtree_next_active(rbe, genmask);
+ if (next_rbe) {
+ /* Closest start element differs from last element added. */
+ if (nft_rbtree_interval_start(next_rbe) &&
+ nft_rbtree_cmp_start_cookie(priv, next_rbe)) {
+ priv->start_rbe_cookie = 0;
+ return true;
+ }
+ }
+
+ priv->start_rbe_cookie = 0;
+
+ return false;
+}
+
static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
struct nft_rbtree_elem *new,
- struct nft_elem_priv **elem_priv)
+ struct nft_elem_priv **elem_priv, u64 tstamp, bool last)
{
- struct nft_rbtree_elem *rbe, *rbe_le = NULL, *rbe_ge = NULL;
+ struct nft_rbtree_elem *rbe, *rbe_le = NULL, *rbe_ge = NULL, *rbe_prev;
struct rb_node *node, *next, *parent, **p, *first = NULL;
struct nft_rbtree *priv = nft_set_priv(set);
u8 cur_genmask = nft_genmask_cur(net);
u8 genmask = nft_genmask_next(net);
- u64 tstamp = nft_net_tstamp(net);
+ unsigned long open_interval = 0;
int d;
/* Descend the tree to search for an existing element greater than the
@@ -417,12 +459,46 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
}
}
+ if (nft_rbtree_interval_null(set, new)) {
+ priv->start_rbe_cookie = 0;
+ } else if (nft_rbtree_interval_start(new) && priv->start_rbe_cookie) {
+ if (nft_set_is_anonymous(set)) {
+ priv->start_rbe_cookie = 0;
+ } else if (priv->start_rbe_cookie & NFT_RBTREE_OPEN_INTERVAL) {
+ /* Previous element is an open interval that partially
+ * overlaps with an existing non-open interval.
+ */
+ return -ENOTEMPTY;
+ }
+ }
+
/* - new start element matching existing start element: full overlap
* reported as -EEXIST, cleared by caller if NLM_F_EXCL is not given.
*/
if (rbe_ge && !nft_rbtree_cmp(set, new, rbe_ge) &&
nft_rbtree_interval_start(rbe_ge) == nft_rbtree_interval_start(new)) {
*elem_priv = &rbe_ge->priv;
+
+ /* - Corner case: new start element of open interval (which
+ * comes as last element in the batch) overlaps the start of
+ * an existing interval with an end element: partial overlap.
+ */
+ node = rb_first(&priv->root);
+ rbe = __nft_rbtree_next_active(node, genmask);
+ if (rbe && nft_rbtree_interval_end(rbe)) {
+ rbe = nft_rbtree_next_active(rbe, genmask);
+ if (rbe &&
+ nft_rbtree_interval_start(rbe) &&
+ !nft_rbtree_cmp(set, new, rbe)) {
+ if (last)
+ return -ENOTEMPTY;
+
+ /* Maybe open interval? */
+ open_interval = NFT_RBTREE_OPEN_INTERVAL;
+ }
+ }
+ nft_rbtree_set_start_cookie_open(priv, rbe_ge, open_interval);
+
return -EEXIST;
}
@@ -431,18 +507,37 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
*/
if (rbe_le && !nft_rbtree_cmp(set, new, rbe_le) &&
nft_rbtree_interval_end(rbe_le) == nft_rbtree_interval_end(new)) {
+ /* - ignore null interval, otherwise NLM_F_CREATE bogusly
+ * reports EEXIST.
+ */
+ if (nft_rbtree_interval_null(set, new))
+ return -ECANCELED;
+
*elem_priv = &rbe_le->priv;
+
+ /* - start and end element belong to the same interval. */
+ if (!nft_rbtree_insert_same_interval(net, priv, rbe_le))
+ return -ENOTEMPTY;
+
return -EEXIST;
}
/* - new start element with existing closest, less or equal key value
* being a start element: partial overlap, reported as -ENOTEMPTY.
* Anonymous sets allow for two consecutive start element since they
- * are constant, skip them to avoid bogus overlap reports.
+ * are constant, but validate that this new start element does not
+ * sit in between an existing start and end elements: partial overlap,
+ * reported as -ENOTEMPTY.
*/
- if (!nft_set_is_anonymous(set) && rbe_le &&
- nft_rbtree_interval_start(rbe_le) && nft_rbtree_interval_start(new))
- return -ENOTEMPTY;
+ if (rbe_le &&
+ nft_rbtree_interval_start(rbe_le) && nft_rbtree_interval_start(new)) {
+ if (!nft_set_is_anonymous(set))
+ return -ENOTEMPTY;
+
+ rbe_prev = nft_rbtree_prev_active(rbe_le);
+ if (rbe_prev && nft_rbtree_interval_end(rbe_prev))
+ return -ENOTEMPTY;
+ }
/* - new end element with existing closest, less or equal key value
* being a end element: partial overlap, reported as -ENOTEMPTY.
@@ -458,6 +553,12 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
nft_rbtree_interval_end(rbe_ge) && nft_rbtree_interval_end(new))
return -ENOTEMPTY;
+ /* - start element overlaps an open interval but end element is new:
+ * partial overlap, reported as -ENOEMPTY.
+ */
+ if (!rbe_ge && priv->start_rbe_cookie && nft_rbtree_interval_end(new))
+ return -ENOTEMPTY;
+
/* Accepted element: pick insertion point depending on key value */
parent = NULL;
p = &priv->root.rb_node;
@@ -481,14 +582,102 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
return 0;
}
+static int nft_array_intervals_alloc(struct nft_array *array, u32 max_intervals)
+{
+ struct nft_array_interval *intervals;
+
+ intervals = kvcalloc(max_intervals, sizeof(struct nft_array_interval),
+ GFP_KERNEL_ACCOUNT);
+ if (!intervals)
+ return -ENOMEM;
+
+ if (array->intervals)
+ kvfree(array->intervals);
+
+ array->intervals = intervals;
+ array->max_intervals = max_intervals;
+
+ return 0;
+}
+
+static struct nft_array *nft_array_alloc(u32 max_intervals)
+{
+ struct nft_array *array;
+
+ array = kzalloc(sizeof(*array), GFP_KERNEL_ACCOUNT);
+ if (!array)
+ return NULL;
+
+ if (nft_array_intervals_alloc(array, max_intervals) < 0) {
+ kfree(array);
+ return NULL;
+ }
+
+ return array;
+}
+
+#define NFT_ARRAY_EXTRA_SIZE 10240
+
+/* Similar to nft_rbtree_{u,k}size to hide details to userspace, but consider
+ * packed representation coming from userspace for anonymous sets too.
+ */
+static u32 nft_array_elems(const struct nft_set *set)
+{
+ u32 nelems = atomic_read(&set->nelems);
+
+ /* Adjacent intervals are represented with a single start element in
+ * anonymous sets, use the current element counter as is.
+ */
+ if (nft_set_is_anonymous(set))
+ return nelems;
+
+ /* Add extra room for never matching interval at the beginning and open
+ * interval at the end which only use a single element to represent it.
+ * The conversion to array will compact intervals, this allows reduce
+ * memory consumption.
+ */
+ return (nelems / 2) + 2;
+}
+
+static int nft_array_may_resize(const struct nft_set *set)
+{
+ u32 nelems = nft_array_elems(set), new_max_intervals;
+ struct nft_rbtree *priv = nft_set_priv(set);
+ struct nft_array *array;
+
+ if (!priv->array_next) {
+ array = nft_array_alloc(nelems + NFT_ARRAY_EXTRA_SIZE);
+ if (!array)
+ return -ENOMEM;
+
+ priv->array_next = array;
+ }
+
+ if (nelems < priv->array_next->max_intervals)
+ return 0;
+
+ new_max_intervals = priv->array_next->max_intervals + NFT_ARRAY_EXTRA_SIZE;
+ if (nft_array_intervals_alloc(priv->array_next, new_max_intervals) < 0)
+ return -ENOMEM;
+
+ return 0;
+}
+
static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem,
struct nft_elem_priv **elem_priv)
{
struct nft_rbtree_elem *rbe = nft_elem_priv_cast(elem->priv);
+ bool last = !!(elem->flags & NFT_SET_ELEM_INTERNAL_LAST);
struct nft_rbtree *priv = nft_set_priv(set);
+ u64 tstamp = nft_net_tstamp(net);
int err;
+ nft_rbtree_maybe_reset_start_cookie(priv, tstamp);
+
+ if (nft_array_may_resize(set) < 0)
+ return -ENOMEM;
+
do {
if (fatal_signal_pending(current))
return -EINTR;
@@ -496,10 +685,12 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,
cond_resched();
write_lock_bh(&priv->lock);
- write_seqcount_begin(&priv->count);
- err = __nft_rbtree_insert(net, set, rbe, elem_priv);
- write_seqcount_end(&priv->count);
+ err = __nft_rbtree_insert(net, set, rbe, elem_priv, tstamp, last);
write_unlock_bh(&priv->lock);
+
+ if (nft_rbtree_interval_end(rbe))
+ priv->start_rbe_cookie = 0;
+
} while (err == -EAGAIN);
return err;
@@ -508,9 +699,7 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,
static void nft_rbtree_erase(struct nft_rbtree *priv, struct nft_rbtree_elem *rbe)
{
write_lock_bh(&priv->lock);
- write_seqcount_begin(&priv->count);
rb_erase(&rbe->node, &priv->root);
- write_seqcount_end(&priv->count);
write_unlock_bh(&priv->lock);
}
@@ -533,6 +722,48 @@ static void nft_rbtree_activate(const struct net *net,
nft_clear(net, &rbe->ext);
}
+static struct nft_rbtree_elem *
+nft_rbtree_next_inactive(struct nft_rbtree_elem *rbe, u8 genmask)
+{
+ struct nft_rbtree_elem *next_rbe;
+ struct rb_node *node;
+
+ node = rb_next(&rbe->node);
+ if (node) {
+ next_rbe = rb_entry(node, struct nft_rbtree_elem, node);
+ if (nft_rbtree_interval_start(next_rbe) &&
+ !nft_set_elem_active(&next_rbe->ext, genmask))
+ return next_rbe;
+ }
+
+ return NULL;
+}
+
+static bool nft_rbtree_deactivate_same_interval(const struct net *net,
+ struct nft_rbtree *priv,
+ struct nft_rbtree_elem *rbe)
+{
+ u8 genmask = nft_genmask_next(net);
+ struct nft_rbtree_elem *next_rbe;
+
+ if (!priv->start_rbe_cookie)
+ return true;
+
+ next_rbe = nft_rbtree_next_inactive(rbe, genmask);
+ if (next_rbe) {
+ /* Closest start element differs from last element added. */
+ if (nft_rbtree_interval_start(next_rbe) &&
+ nft_rbtree_cmp_start_cookie(priv, next_rbe)) {
+ priv->start_rbe_cookie = 0;
+ return true;
+ }
+ }
+
+ priv->start_rbe_cookie = 0;
+
+ return false;
+}
+
static void nft_rbtree_flush(const struct net *net,
const struct nft_set *set,
struct nft_elem_priv *elem_priv)
@@ -547,12 +778,22 @@ nft_rbtree_deactivate(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem)
{
struct nft_rbtree_elem *rbe, *this = nft_elem_priv_cast(elem->priv);
- const struct nft_rbtree *priv = nft_set_priv(set);
+ bool last = !!(elem->flags & NFT_SET_ELEM_INTERNAL_LAST);
+ struct nft_rbtree *priv = nft_set_priv(set);
const struct rb_node *parent = priv->root.rb_node;
u8 genmask = nft_genmask_next(net);
u64 tstamp = nft_net_tstamp(net);
int d;
+ nft_rbtree_maybe_reset_start_cookie(priv, tstamp);
+
+ if (nft_rbtree_interval_start(this) ||
+ nft_rbtree_interval_null(set, this))
+ priv->start_rbe_cookie = 0;
+
+ if (nft_array_may_resize(set) < 0)
+ return NULL;
+
while (parent != NULL) {
rbe = rb_entry(parent, struct nft_rbtree_elem, node);
@@ -577,6 +818,13 @@ nft_rbtree_deactivate(const struct net *net, const struct nft_set *set,
parent = parent->rb_left;
continue;
}
+
+ if (nft_rbtree_interval_start(rbe)) {
+ if (!last)
+ nft_rbtree_set_start_cookie(priv, rbe);
+ } else if (!nft_rbtree_deactivate_same_interval(net, priv, rbe))
+ return NULL;
+
nft_rbtree_flush(net, set, &rbe->priv);
return &rbe->priv;
}
@@ -615,6 +863,11 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
switch (iter->type) {
case NFT_ITER_UPDATE:
lockdep_assert_held(&nft_pernet(ctx->net)->commit_mutex);
+
+ if (nft_array_may_resize(set) < 0) {
+ iter->err = -ENOMEM;
+ break;
+ }
nft_rbtree_do_walk(ctx, set, iter);
break;
case NFT_ITER_READ:
@@ -629,29 +882,13 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
}
}
-static void nft_rbtree_gc_remove(struct net *net, struct nft_set *set,
- struct nft_rbtree *priv,
- struct nft_rbtree_elem *rbe)
-{
- nft_setelem_data_deactivate(net, set, &rbe->priv);
- nft_rbtree_erase(priv, rbe);
-}
-
-static void nft_rbtree_gc(struct nft_set *set)
+static void nft_rbtree_gc_scan(struct nft_set *set)
{
struct nft_rbtree *priv = nft_set_priv(set);
struct nft_rbtree_elem *rbe, *rbe_end = NULL;
struct net *net = read_pnet(&set->net);
u64 tstamp = nft_net_tstamp(net);
struct rb_node *node, *next;
- struct nft_trans_gc *gc;
-
- set = nft_set_container_of(priv);
- net = read_pnet(&set->net);
-
- gc = nft_trans_gc_alloc(set, 0, GFP_KERNEL);
- if (!gc)
- return;
for (node = rb_first(&priv->root); node ; node = next) {
next = rb_next(node);
@@ -669,34 +906,46 @@ static void nft_rbtree_gc(struct nft_set *set)
if (!__nft_set_elem_expired(&rbe->ext, tstamp))
continue;
- gc = nft_trans_gc_queue_sync(gc, GFP_KERNEL);
- if (!gc)
- goto try_later;
-
/* end element needs to be removed first, it has
* no timeout extension.
*/
+ write_lock_bh(&priv->lock);
if (rbe_end) {
- nft_rbtree_gc_remove(net, set, priv, rbe_end);
- nft_trans_gc_elem_add(gc, rbe_end);
+ nft_rbtree_gc_elem_move(net, set, priv, rbe_end);
rbe_end = NULL;
}
- gc = nft_trans_gc_queue_sync(gc, GFP_KERNEL);
- if (!gc)
- goto try_later;
-
- nft_rbtree_gc_remove(net, set, priv, rbe);
- nft_trans_gc_elem_add(gc, rbe);
+ nft_rbtree_gc_elem_move(net, set, priv, rbe);
+ write_unlock_bh(&priv->lock);
}
-try_later:
+ priv->last_gc = jiffies;
+}
+
+static void nft_rbtree_gc_queue(struct nft_set *set)
+{
+ struct nft_rbtree *priv = nft_set_priv(set);
+ struct nft_rbtree_elem *rbe, *rbe_end;
+ struct nft_trans_gc *gc;
- if (gc) {
- gc = nft_trans_gc_catchall_sync(gc);
- nft_trans_gc_queue_sync_done(gc);
- priv->last_gc = jiffies;
+ if (list_empty(&priv->expired))
+ return;
+
+ gc = nft_trans_gc_alloc(set, 0, GFP_KERNEL);
+ if (!gc)
+ return;
+
+ list_for_each_entry_safe(rbe, rbe_end, &priv->expired, list) {
+ list_del(&rbe->list);
+ nft_trans_gc_elem_add(gc, rbe);
+
+ gc = nft_trans_gc_queue_sync(gc, GFP_KERNEL);
+ if (!gc)
+ return;
}
+
+ gc = nft_trans_gc_catchall_sync(gc);
+ nft_trans_gc_queue_sync_done(gc);
}
static u64 nft_rbtree_privsize(const struct nlattr * const nla[],
@@ -714,24 +963,45 @@ static int nft_rbtree_init(const struct nft_set *set,
BUILD_BUG_ON(offsetof(struct nft_rbtree_elem, priv) != 0);
rwlock_init(&priv->lock);
- seqcount_rwlock_init(&priv->count, &priv->lock);
priv->root = RB_ROOT;
+ INIT_LIST_HEAD(&priv->expired);
+
+ priv->array = NULL;
+ priv->array_next = NULL;
return 0;
}
+static void __nft_array_free(struct nft_array *array)
+{
+ kvfree(array->intervals);
+ kfree(array);
+}
+
static void nft_rbtree_destroy(const struct nft_ctx *ctx,
const struct nft_set *set)
{
struct nft_rbtree *priv = nft_set_priv(set);
- struct nft_rbtree_elem *rbe;
+ struct nft_rbtree_elem *rbe, *next;
+ struct nft_array *array;
struct rb_node *node;
+ list_for_each_entry_safe(rbe, next, &priv->expired, list) {
+ list_del(&rbe->list);
+ nf_tables_set_elem_destroy(ctx, set, &rbe->priv);
+ }
+
while ((node = priv->root.rb_node) != NULL) {
rb_erase(node, &priv->root);
rbe = rb_entry(node, struct nft_rbtree_elem, node);
nf_tables_set_elem_destroy(ctx, set, &rbe->priv);
}
+
+ array = rcu_dereference_protected(priv->array, true);
+ if (array)
+ __nft_array_free(array);
+ if (priv->array_next)
+ __nft_array_free(priv->array_next);
}
static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
@@ -752,12 +1022,105 @@ static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
return true;
}
+static void nft_array_free_rcu(struct rcu_head *rcu_head)
+{
+ struct nft_array *array = container_of(rcu_head, struct nft_array, rcu_head);
+
+ __nft_array_free(array);
+}
+
static void nft_rbtree_commit(struct nft_set *set)
{
struct nft_rbtree *priv = nft_set_priv(set);
+ struct nft_rbtree_elem *rbe, *prev_rbe;
+ struct nft_array *old;
+ u32 num_intervals = 0;
+ struct rb_node *node;
+ /* No changes, skip, eg. elements updates only. */
+ if (!priv->array_next)
+ return;
+
+ /* GC can be performed if the binary search blob is going
+ * to be rebuilt. It has to be done in two phases: first
+ * scan tree and move all expired elements to the expired
+ * list.
+ *
+ * Then, after blob has been re-built and published to other
+ * CPUs, queue collected entries for freeing.
+ */
if (time_after_eq(jiffies, priv->last_gc + nft_set_gc_interval(set)))
- nft_rbtree_gc(set);
+ nft_rbtree_gc_scan(set);
+
+ /* Reverse walk to create an array from smaller to largest interval. */
+ node = rb_last(&priv->root);
+ if (node)
+ prev_rbe = rb_entry(node, struct nft_rbtree_elem, node);
+ else
+ prev_rbe = NULL;
+
+ while (prev_rbe) {
+ rbe = prev_rbe;
+
+ if (nft_rbtree_interval_start(rbe))
+ priv->array_next->intervals[num_intervals].from = &rbe->ext;
+ else if (nft_rbtree_interval_end(rbe))
+ priv->array_next->intervals[num_intervals++].to = &rbe->ext;
+
+ if (num_intervals >= priv->array_next->max_intervals) {
+ pr_warn_once("malformed interval set from userspace?");
+ goto err_out;
+ }
+
+ node = rb_prev(node);
+ if (!node)
+ break;
+
+ prev_rbe = rb_entry(node, struct nft_rbtree_elem, node);
+
+ /* For anonymous sets, when adjacent ranges are found,
+ * the end element is not added to the set to pack the set
+ * representation. Use next start element to complete this
+ * interval.
+ */
+ if (nft_rbtree_interval_start(rbe) &&
+ nft_rbtree_interval_start(prev_rbe) &&
+ priv->array_next->intervals[num_intervals].from)
+ priv->array_next->intervals[num_intervals++].to = &prev_rbe->ext;
+
+ if (num_intervals >= priv->array_next->max_intervals) {
+ pr_warn_once("malformed interval set from userspace?");
+ goto err_out;
+ }
+ }
+
+ if (priv->array_next->intervals[num_intervals].from)
+ num_intervals++;
+err_out:
+ priv->array_next->num_intervals = num_intervals;
+ old = rcu_replace_pointer(priv->array, priv->array_next,
+ lockdep_is_held(&nft_pernet(read_pnet(&set->net))->commit_mutex));
+ priv->array_next = NULL;
+ if (old)
+ call_rcu(&old->rcu_head, nft_array_free_rcu);
+
+ /* New blob is public, queue collected entries for freeing.
+ * call_rcu ensures elements stay around until readers are done.
+ */
+ nft_rbtree_gc_queue(set);
+}
+
+static void nft_rbtree_abort(const struct nft_set *set)
+{
+ struct nft_rbtree *priv = nft_set_priv(set);
+ struct nft_array *array_next;
+
+ if (!priv->array_next)
+ return;
+
+ array_next = priv->array_next;
+ priv->array_next = NULL;
+ __nft_array_free(array_next);
}
static void nft_rbtree_gc_init(const struct nft_set *set)
@@ -821,6 +1184,7 @@ const struct nft_set_type nft_set_rbtree_type = {
.flush = nft_rbtree_flush,
.activate = nft_rbtree_activate,
.commit = nft_rbtree_commit,
+ .abort = nft_rbtree_abort,
.gc_init = nft_rbtree_gc_init,
.lookup = nft_rbtree_lookup,
.walk = nft_rbtree_walk,
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 4fc37894860c..08c8aa1530d8 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -762,6 +762,14 @@ static void llc_shdlc_deinit(struct nfc_llc *llc)
{
struct llc_shdlc *shdlc = nfc_llc_get_data(llc);
+ timer_shutdown_sync(&shdlc->connect_timer);
+ timer_shutdown_sync(&shdlc->t1_timer);
+ timer_shutdown_sync(&shdlc->t2_timer);
+ shdlc->t1_active = false;
+ shdlc->t2_active = false;
+
+ cancel_work_sync(&shdlc->sm_work);
+
skb_queue_purge(&shdlc->rcv_q);
skb_queue_purge(&shdlc->send_q);
skb_queue_purge(&shdlc->ack_pending_q);
diff --git a/net/psp/Kconfig b/net/psp/Kconfig
index 371e8771f3bd..84d6b0f25460 100644
--- a/net/psp/Kconfig
+++ b/net/psp/Kconfig
@@ -6,6 +6,7 @@ config INET_PSP
bool "PSP Security Protocol support"
depends on INET
select SKB_DECRYPTED
+ select SKB_EXTENSIONS
select SOCK_VALIDATE_XMIT
help
Enable kernel support for the PSP Security Protocol (PSP).
diff --git a/net/rds/send.c b/net/rds/send.c
index 0b3d0ef2f008..071c5dca969a 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1382,9 +1382,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
else
queue_delayed_work(rds_wq, &cpath->cp_send_w, 1);
rcu_read_unlock();
+
+ if (ret)
+ goto out;
}
- if (ret)
- goto out;
+
rds_message_put(rm);
for (ind = 0; ind < vct.indx; ind++)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index f97f77b041d9..d8201eb3ac5f 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -3357,11 +3357,10 @@ int smc_create_clcsk(struct net *net, struct sock *sk, int family)
return 0;
}
-static int __smc_create(struct net *net, struct socket *sock, int protocol,
- int kern, struct socket *clcsock)
+static int smc_create(struct net *net, struct socket *sock, int protocol,
+ int kern)
{
int family = (protocol == SMCPROTO_SMC6) ? PF_INET6 : PF_INET;
- struct smc_sock *smc;
struct sock *sk;
int rc;
@@ -3380,15 +3379,7 @@ static int __smc_create(struct net *net, struct socket *sock, int protocol,
if (!sk)
goto out;
- /* create internal TCP socket for CLC handshake and fallback */
- smc = smc_sk(sk);
-
- rc = 0;
- if (clcsock)
- smc->clcsock = clcsock;
- else
- rc = smc_create_clcsk(net, sk, family);
-
+ rc = smc_create_clcsk(net, sk, family);
if (rc) {
sk_common_release(sk);
sock->sk = NULL;
@@ -3397,76 +3388,12 @@ static int __smc_create(struct net *net, struct socket *sock, int protocol,
return rc;
}
-static int smc_create(struct net *net, struct socket *sock, int protocol,
- int kern)
-{
- return __smc_create(net, sock, protocol, kern, NULL);
-}
-
static const struct net_proto_family smc_sock_family_ops = {
.family = PF_SMC,
.owner = THIS_MODULE,
.create = smc_create,
};
-static int smc_ulp_init(struct sock *sk)
-{
- struct socket *tcp = sk->sk_socket;
- struct net *net = sock_net(sk);
- struct socket *smcsock;
- int protocol, ret;
-
- /* only TCP can be replaced */
- if (tcp->type != SOCK_STREAM || sk->sk_protocol != IPPROTO_TCP ||
- (sk->sk_family != AF_INET && sk->sk_family != AF_INET6))
- return -ESOCKTNOSUPPORT;
- /* don't handle wq now */
- if (tcp->state != SS_UNCONNECTED || !tcp->file || tcp->wq.fasync_list)
- return -ENOTCONN;
-
- if (sk->sk_family == AF_INET)
- protocol = SMCPROTO_SMC;
- else
- protocol = SMCPROTO_SMC6;
-
- smcsock = sock_alloc();
- if (!smcsock)
- return -ENFILE;
-
- smcsock->type = SOCK_STREAM;
- __module_get(THIS_MODULE); /* tried in __tcp_ulp_find_autoload */
- ret = __smc_create(net, smcsock, protocol, 1, tcp);
- if (ret) {
- sock_release(smcsock); /* module_put() which ops won't be NULL */
- return ret;
- }
-
- /* replace tcp socket to smc */
- smcsock->file = tcp->file;
- smcsock->file->private_data = smcsock;
- smcsock->file->f_inode = SOCK_INODE(smcsock); /* replace inode when sock_close */
- smcsock->file->f_path.dentry->d_inode = SOCK_INODE(smcsock); /* dput() in __fput */
- tcp->file = NULL;
-
- return ret;
-}
-
-static void smc_ulp_clone(const struct request_sock *req, struct sock *newsk,
- const gfp_t priority)
-{
- struct inet_connection_sock *icsk = inet_csk(newsk);
-
- /* don't inherit ulp ops to child when listen */
- icsk->icsk_ulp_ops = NULL;
-}
-
-static struct tcp_ulp_ops smc_ulp_ops __read_mostly = {
- .name = "smc",
- .owner = THIS_MODULE,
- .init = smc_ulp_init,
- .clone = smc_ulp_clone,
-};
-
unsigned int smc_net_id;
static __net_init int smc_net_init(struct net *net)
@@ -3589,16 +3516,10 @@ static int __init smc_init(void)
pr_err("%s: ib_register fails with %d\n", __func__, rc);
goto out_sock;
}
-
- rc = tcp_register_ulp(&smc_ulp_ops);
- if (rc) {
- pr_err("%s: tcp_ulp_register fails with %d\n", __func__, rc);
- goto out_ib;
- }
rc = smc_inet_init();
if (rc) {
pr_err("%s: smc_inet_init fails with %d\n", __func__, rc);
- goto out_ulp;
+ goto out_ib;
}
rc = bpf_smc_hs_ctrl_init();
if (rc) {
@@ -3610,8 +3531,6 @@ static int __init smc_init(void)
return 0;
out_inet:
smc_inet_exit();
-out_ulp:
- tcp_unregister_ulp(&smc_ulp_ops);
out_ib:
smc_ib_unregister_client();
out_sock:
@@ -3647,7 +3566,6 @@ static void __exit smc_exit(void)
{
static_branch_disable(&tcp_have_smc);
smc_inet_exit();
- tcp_unregister_ulp(&smc_ulp_ops);
sock_unregister(PF_SMC);
smc_core_exit();
smc_ib_unregister_client();
@@ -3672,7 +3590,6 @@ MODULE_AUTHOR("Ursula Braun <ubraun@linux.vnet.ibm.com>");
MODULE_DESCRIPTION("smc socket address family");
MODULE_LICENSE("GPL");
MODULE_ALIAS_NETPROTO(PF_SMC);
-MODULE_ALIAS_TCP_ULP("smc");
/* 256 for IPPROTO_SMC and 1 for SOCK_STREAM */
MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 256, 1);
#if IS_ENABLED(CONFIG_IPV6)
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 5c095cb8cb20..bb3c3db2713b 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -39,6 +39,8 @@ static const struct rpc_authops authgss_ops;
static const struct rpc_credops gss_credops;
static const struct rpc_credops gss_nullops;
+static void gss_free_callback(struct kref *kref);
+
#define GSS_RETRY_EXPIRED 5
static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;
@@ -551,6 +553,7 @@ gss_alloc_msg(struct gss_auth *gss_auth,
}
return gss_msg;
err_put_pipe_version:
+ kref_put(&gss_auth->kref, gss_free_callback);
put_pipe_version(gss_auth->net);
err_free_msg:
kfree(gss_msg);
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
index 7d2cdc2bd374..f320c0a8e604 100644
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
@@ -320,29 +320,47 @@ static int gssx_dec_status(struct xdr_stream *xdr,
/* status->minor_status */
p = xdr_inline_decode(xdr, 8);
- if (unlikely(p == NULL))
- return -ENOSPC;
+ if (unlikely(p == NULL)) {
+ err = -ENOSPC;
+ goto out_free_mech;
+ }
p = xdr_decode_hyper(p, &status->minor_status);
/* status->major_status_string */
err = gssx_dec_buffer(xdr, &status->major_status_string);
if (err)
- return err;
+ goto out_free_mech;
/* status->minor_status_string */
err = gssx_dec_buffer(xdr, &status->minor_status_string);
if (err)
- return err;
+ goto out_free_major_status_string;
/* status->server_ctx */
err = gssx_dec_buffer(xdr, &status->server_ctx);
if (err)
- return err;
+ goto out_free_minor_status_string;
/* we assume we have no options for now, so simply consume them */
/* status->options */
err = dummy_dec_opt_array(xdr, &status->options);
+ if (err)
+ goto out_free_server_ctx;
+ return 0;
+
+out_free_server_ctx:
+ kfree(status->server_ctx.data);
+ status->server_ctx.data = NULL;
+out_free_minor_status_string:
+ kfree(status->minor_status_string.data);
+ status->minor_status_string.data = NULL;
+out_free_major_status_string:
+ kfree(status->major_status_string.data);
+ status->major_status_string.data = NULL;
+out_free_mech:
+ kfree(status->mech.data);
+ status->mech.data = NULL;
return err;
}
@@ -505,28 +523,35 @@ static int gssx_dec_name(struct xdr_stream *xdr,
/* name->name_type */
err = gssx_dec_buffer(xdr, &dummy_netobj);
if (err)
- return err;
+ goto out_free_display_name;
/* name->exported_name */
err = gssx_dec_buffer(xdr, &dummy_netobj);
if (err)
- return err;
+ goto out_free_display_name;
/* name->exported_composite_name */
err = gssx_dec_buffer(xdr, &dummy_netobj);
if (err)
- return err;
+ goto out_free_display_name;
/* we assume we have no attributes for now, so simply consume them */
/* name->name_attributes */
err = dummy_dec_nameattr_array(xdr, &dummy_name_attr_array);
if (err)
- return err;
+ goto out_free_display_name;
/* we assume we have no options for now, so simply consume them */
/* name->extensions */
err = dummy_dec_opt_array(xdr, &dummy_option_array);
+ if (err)
+ goto out_free_display_name;
+ return 0;
+
+out_free_display_name:
+ kfree(name->display_name.data);
+ name->display_name.data = NULL;
return err;
}
@@ -649,32 +674,34 @@ static int gssx_dec_ctx(struct xdr_stream *xdr,
/* ctx->state */
err = gssx_dec_buffer(xdr, &ctx->state);
if (err)
- return err;
+ goto out_free_exported_context_token;
/* ctx->need_release */
err = gssx_dec_bool(xdr, &ctx->need_release);
if (err)
- return err;
+ goto out_free_state;
/* ctx->mech */
err = gssx_dec_buffer(xdr, &ctx->mech);
if (err)
- return err;
+ goto out_free_state;
/* ctx->src_name */
err = gssx_dec_name(xdr, &ctx->src_name);
if (err)
- return err;
+ goto out_free_mech;
/* ctx->targ_name */
err = gssx_dec_name(xdr, &ctx->targ_name);
if (err)
- return err;
+ goto out_free_src_name;
/* ctx->lifetime */
p = xdr_inline_decode(xdr, 8+8);
- if (unlikely(p == NULL))
- return -ENOSPC;
+ if (unlikely(p == NULL)) {
+ err = -ENOSPC;
+ goto out_free_targ_name;
+ }
p = xdr_decode_hyper(p, &ctx->lifetime);
/* ctx->ctx_flags */
@@ -683,17 +710,36 @@ static int gssx_dec_ctx(struct xdr_stream *xdr,
/* ctx->locally_initiated */
err = gssx_dec_bool(xdr, &ctx->locally_initiated);
if (err)
- return err;
+ goto out_free_targ_name;
/* ctx->open */
err = gssx_dec_bool(xdr, &ctx->open);
if (err)
- return err;
+ goto out_free_targ_name;
/* we assume we have no options for now, so simply consume them */
/* ctx->options */
err = dummy_dec_opt_array(xdr, &ctx->options);
+ if (err)
+ goto out_free_targ_name;
+
+ return 0;
+out_free_targ_name:
+ kfree(ctx->targ_name.display_name.data);
+ ctx->targ_name.display_name.data = NULL;
+out_free_src_name:
+ kfree(ctx->src_name.display_name.data);
+ ctx->src_name.display_name.data = NULL;
+out_free_mech:
+ kfree(ctx->mech.data);
+ ctx->mech.data = NULL;
+out_free_state:
+ kfree(ctx->state.data);
+ ctx->state.data = NULL;
+out_free_exported_context_token:
+ kfree(ctx->exported_context_token.data);
+ ctx->exported_context_token.data = NULL;
return err;
}
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index b7b318ad25c4..9b623849723e 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -462,7 +462,10 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
newxprt->sc_max_bc_requests = 2;
}
- /* Arbitrary estimate of the needed number of rdma_rw contexts.
+ /* Estimate the needed number of rdma_rw contexts. The maximum
+ * Read and Write chunks have one segment each. Each request
+ * can involve one Read chunk and either a Write chunk or Reply
+ * chunk; thus a factor of three.
*/
maxpayload = min(xprt->xpt_server->sv_max_payload,
RPCSVC_MAXPAYLOAD_RDMA);
@@ -470,7 +473,8 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
rdma_rw_mr_factor(dev, newxprt->sc_port_num,
maxpayload >> PAGE_SHIFT);
- newxprt->sc_sq_depth = rq_depth + ctxts;
+ newxprt->sc_sq_depth = rq_depth +
+ rdma_rw_max_send_wr(dev, newxprt->sc_port_num, ctxts, 0);
if (newxprt->sc_sq_depth > dev->attrs.max_qp_wr)
newxprt->sc_sq_depth = dev->attrs.max_qp_wr;
atomic_set(&newxprt->sc_sq_avail, newxprt->sc_sq_depth);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index d0511225799b..f6d56e70c7a2 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1650,10 +1650,9 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr_unsized *uad
timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
- /* First of all allocate resources.
- * If we will make it after state is locked,
- * we will have to recheck all again in any case.
- */
+ err = prepare_peercred(&peercred);
+ if (err)
+ goto out;
/* create new sock for complete connection */
newsk = unix_create1(net, NULL, 0, sock->type);
@@ -1662,10 +1661,6 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr_unsized *uad
goto out;
}
- err = prepare_peercred(&peercred);
- if (err)
- goto out;
-
/* Allocate skb for sending to listening sock */
skb = sock_wmalloc(newsk, 1, 0, GFP_KERNEL);
if (!skb) {
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 9a420d627d3c..a04f96dc9a1d 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1415,8 +1415,10 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
cfg80211_leave_ocb(rdev, dev);
break;
case NL80211_IFTYPE_P2P_DEVICE:
+ cfg80211_stop_p2p_device(rdev, wdev);
+ break;
case NL80211_IFTYPE_NAN:
- /* cannot happen, has no netdev */
+ cfg80211_stop_nan(rdev, wdev);
break;
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_MONITOR:
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 7546647752fd..eb0e77813d46 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1959,7 +1959,7 @@ cfg80211_update_known_bss(struct cfg80211_registered_device *rdev,
ether_addr_copy(known->parent_bssid, new->parent_bssid);
known->pub.max_bssid_indicator = new->pub.max_bssid_indicator;
known->pub.bssid_index = new->pub.bssid_index;
- known->pub.use_for &= new->pub.use_for;
+ known->pub.use_for = new->pub.use_for;
known->pub.cannot_use_reasons = new->pub.cannot_use_reasons;
known->bss_source = new->bss_source;
diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs
index 031720bf5d8c..7b950b01f16d 100644
--- a/rust/kernel/device.rs
+++ b/rust/kernel/device.rs
@@ -5,12 +5,20 @@
//! C header: [`include/linux/device.h`](srctree/include/linux/device.h)
use crate::{
- bindings, fmt,
+ bindings,
+ fmt,
prelude::*,
sync::aref::ARef,
- types::{ForeignOwnable, Opaque},
+ types::{
+ ForeignOwnable,
+ Opaque, //
+ }, //
+};
+use core::{
+ any::TypeId,
+ marker::PhantomData,
+ ptr, //
};
-use core::{any::TypeId, marker::PhantomData, ptr};
#[cfg(CONFIG_PRINTK)]
use crate::c_str;
diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs
index 835d9c11948e..a9917ce71ded 100644
--- a/rust/kernel/devres.rs
+++ b/rust/kernel/devres.rs
@@ -8,30 +8,24 @@
use crate::{
alloc::Flags,
bindings,
- device::{Bound, Device},
- error::{to_result, Error, Result},
- ffi::c_void,
+ device::{
+ Bound,
+ Device, //
+ },
+ error::to_result,
prelude::*,
- revocable::{Revocable, RevocableGuard},
- sync::{aref::ARef, rcu, Completion},
- types::{ForeignOwnable, Opaque, ScopeGuard},
+ revocable::{
+ Revocable,
+ RevocableGuard, //
+ },
+ sync::{
+ aref::ARef,
+ rcu,
+ Arc, //
+ },
+ types::ForeignOwnable,
};
-use pin_init::Wrapper;
-
-/// [`Devres`] inner data accessed from [`Devres::callback`].
-#[pin_data]
-struct Inner<T: Send> {
- #[pin]
- data: Revocable<T>,
- /// Tracks whether [`Devres::callback`] has been completed.
- #[pin]
- devm: Completion,
- /// Tracks whether revoking [`Self::data`] has been completed.
- #[pin]
- revoke: Completion,
-}
-
/// This abstraction is meant to be used by subsystems to containerize [`Device`] bound resources to
/// manage their lifetime.
///
@@ -105,18 +99,13 @@ struct Inner<T: Send> {
/// # fn no_run(dev: &Device<Bound>) -> Result<(), Error> {
/// // SAFETY: Invalid usage for example purposes.
/// let iomem = unsafe { IoMem::<{ core::mem::size_of::<u32>() }>::new(0xBAAAAAAD)? };
-/// let devres = KBox::pin_init(Devres::new(dev, iomem), GFP_KERNEL)?;
+/// let devres = Devres::new(dev, iomem)?;
///
/// let res = devres.try_access().ok_or(ENXIO)?;
/// res.write8(0x42, 0x0);
/// # Ok(())
/// # }
/// ```
-///
-/// # Invariants
-///
-/// `Self::inner` is guaranteed to be initialized and is always accessed read-only.
-#[pin_data(PinnedDrop)]
pub struct Devres<T: Send> {
dev: ARef<Device>,
/// Pointer to [`Self::devres_callback`].
@@ -124,14 +113,7 @@ pub struct Devres<T: Send> {
/// Has to be stored, since Rust does not guarantee to always return the same address for a
/// function. However, the C API uses the address as a key.
callback: unsafe extern "C" fn(*mut c_void),
- /// Contains all the fields shared with [`Self::callback`].
- // TODO: Replace with `UnsafePinned`, once available.
- //
- // Subsequently, the `drop_in_place()` in `Devres::drop` and `Devres::new` as well as the
- // explicit `Send` and `Sync' impls can be removed.
- #[pin]
- inner: Opaque<Inner<T>>,
- _add_action: (),
+ data: Arc<Revocable<T>>,
}
impl<T: Send> Devres<T> {
@@ -139,74 +121,48 @@ impl<T: Send> Devres<T> {
///
/// The `data` encapsulated within the returned `Devres` instance' `data` will be
/// (revoked)[`Revocable`] once the device is detached.
- pub fn new<'a, E>(
- dev: &'a Device<Bound>,
- data: impl PinInit<T, E> + 'a,
- ) -> impl PinInit<Self, Error> + 'a
+ pub fn new<E>(dev: &Device<Bound>, data: impl PinInit<T, E>) -> Result<Self>
where
- T: 'a,
Error: From<E>,
{
- try_pin_init!(&this in Self {
- dev: dev.into(),
- callback: Self::devres_callback,
- // INVARIANT: `inner` is properly initialized.
- inner <- Opaque::pin_init(try_pin_init!(Inner {
- devm <- Completion::new(),
- revoke <- Completion::new(),
- data <- Revocable::new(data),
- })),
- // TODO: Replace with "initializer code blocks" [1] once available.
- //
- // [1] https://github.com/Rust-for-Linux/pin-init/pull/69
- _add_action: {
- // SAFETY: `this` is a valid pointer to uninitialized memory.
- let inner = unsafe { &raw mut (*this.as_ptr()).inner };
+ let callback = Self::devres_callback;
+ let data = Arc::pin_init(Revocable::new(data), GFP_KERNEL)?;
+ let devres_data = data.clone();
+
+ // SAFETY:
+ // - `dev.as_raw()` is a pointer to a valid bound device.
+ // - `data` is guaranteed to be a valid for the duration of the lifetime of `Self`.
+ // - `devm_add_action()` is guaranteed not to call `callback` for the entire lifetime of
+ // `dev`.
+ to_result(unsafe {
+ bindings::devm_add_action(
+ dev.as_raw(),
+ Some(callback),
+ Arc::as_ptr(&data).cast_mut().cast(),
+ )
+ })?;
- // SAFETY:
- // - `dev.as_raw()` is a pointer to a valid bound device.
- // - `inner` is guaranteed to be a valid for the duration of the lifetime of `Self`.
- // - `devm_add_action()` is guaranteed not to call `callback` until `this` has been
- // properly initialized, because we require `dev` (i.e. the *bound* device) to
- // live at least as long as the returned `impl PinInit<Self, Error>`.
- to_result(unsafe {
- bindings::devm_add_action(dev.as_raw(), Some(*callback), inner.cast())
- }).inspect_err(|_| {
- let inner = Opaque::cast_into(inner);
+ // `devm_add_action()` was successful and has consumed the reference count.
+ core::mem::forget(devres_data);
- // SAFETY: `inner` is a valid pointer to an `Inner<T>` and valid for both reads
- // and writes.
- unsafe { core::ptr::drop_in_place(inner) };
- })?;
- },
+ Ok(Self {
+ dev: dev.into(),
+ callback,
+ data,
})
}
- fn inner(&self) -> &Inner<T> {
- // SAFETY: By the type invairants of `Self`, `inner` is properly initialized and always
- // accessed read-only.
- unsafe { &*self.inner.get() }
- }
-
fn data(&self) -> &Revocable<T> {
- &self.inner().data
+ &self.data
}
#[allow(clippy::missing_safety_doc)]
unsafe extern "C" fn devres_callback(ptr: *mut kernel::ffi::c_void) {
- // SAFETY: In `Self::new` we've passed a valid pointer to `Inner` to `devm_add_action()`,
- // hence `ptr` must be a valid pointer to `Inner`.
- let inner = unsafe { &*ptr.cast::<Inner<T>>() };
+ // SAFETY: In `Self::new` we've passed a valid pointer of `Revocable<T>` to
+ // `devm_add_action()`, hence `ptr` must be a valid pointer to `Revocable<T>`.
+ let data = unsafe { Arc::from_raw(ptr.cast::<Revocable<T>>()) };
- // Ensure that `inner` can't be used anymore after we signal completion of this callback.
- let inner = ScopeGuard::new_with_data(inner, |inner| inner.devm.complete_all());
-
- if !inner.data.revoke() {
- // If `revoke()` returns false, it means that `Devres::drop` already started revoking
- // `data` for us. Hence we have to wait until `Devres::drop` signals that it
- // completed revoking `data`.
- inner.revoke.wait_for_completion();
- }
+ data.revoke();
}
fn remove_action(&self) -> bool {
@@ -218,7 +174,7 @@ fn remove_action(&self) -> bool {
bindings::devm_remove_action_nowarn(
self.dev.as_raw(),
Some(self.callback),
- core::ptr::from_ref(self.inner()).cast_mut().cast(),
+ core::ptr::from_ref(self.data()).cast_mut().cast(),
)
} == 0)
}
@@ -289,31 +245,19 @@ unsafe impl<T: Send> Send for Devres<T> {}
// SAFETY: `Devres` can be shared with any task, if `T: Sync`.
unsafe impl<T: Send + Sync> Sync for Devres<T> {}
-#[pinned_drop]
-impl<T: Send> PinnedDrop for Devres<T> {
- fn drop(self: Pin<&mut Self>) {
+impl<T: Send> Drop for Devres<T> {
+ fn drop(&mut self) {
// SAFETY: When `drop` runs, it is guaranteed that nobody is accessing the revocable data
// anymore, hence it is safe not to wait for the grace period to finish.
if unsafe { self.data().revoke_nosync() } {
// We revoked `self.data` before the devres action did, hence try to remove it.
- if !self.remove_action() {
- // We could not remove the devres action, which means that it now runs concurrently,
- // hence signal that `self.data` has been revoked by us successfully.
- self.inner().revoke.complete_all();
-
- // Wait for `Self::devres_callback` to be done using this object.
- self.inner().devm.wait_for_completion();
+ if self.remove_action() {
+ // SAFETY: In `Self::new` we have taken an additional reference count of `self.data`
+ // for `devm_add_action()`. Since `remove_action()` was successful, we have to drop
+ // this additional reference count.
+ drop(unsafe { Arc::from_raw(Arc::as_ptr(&self.data)) });
}
- } else {
- // `Self::devres_callback` revokes `self.data` for us, hence wait for it to be done
- // using this object.
- self.inner().devm.wait_for_completion();
}
-
- // INVARIANT: At this point it is guaranteed that `inner` can't be accessed any more.
- //
- // SAFETY: `inner` is valid for dropping.
- unsafe { core::ptr::drop_in_place(self.inner.get()) };
}
}
diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs
index bee3ae21a27b..36de8098754d 100644
--- a/rust/kernel/driver.rs
+++ b/rust/kernel/driver.rs
@@ -94,10 +94,14 @@
//! [`device_id`]: kernel::device_id
//! [`module_driver`]: kernel::module_driver
-use crate::error::{Error, Result};
-use crate::{acpi, device, of, str::CStr, try_pin_init, types::Opaque, ThisModule};
-use core::pin::Pin;
-use pin_init::{pin_data, pinned_drop, PinInit};
+use crate::{
+ acpi,
+ device,
+ of,
+ prelude::*,
+ types::Opaque,
+ ThisModule, //
+};
/// Trait describing the layout of a specific device driver.
///
diff --git a/rust/kernel/pwm.rs b/rust/kernel/pwm.rs
index cb00f8a8765c..2ba9cfd02bfd 100644
--- a/rust/kernel/pwm.rs
+++ b/rust/kernel/pwm.rs
@@ -601,7 +601,11 @@ pub fn new(
let drvdata_ptr = unsafe { bindings::pwmchip_get_drvdata(c_chip_ptr) };
// SAFETY: We construct the `T` object in-place in the allocated private memory.
- unsafe { data.__pinned_init(drvdata_ptr.cast())? };
+ unsafe { data.__pinned_init(drvdata_ptr.cast()) }.inspect_err(|_| {
+ // SAFETY: It is safe to call `pwmchip_put()` with a valid pointer obtained
+ // from `pwmchip_alloc()`. We will not use pointer after this.
+ unsafe { bindings::pwmchip_put(c_chip_ptr) }
+ })?;
// SAFETY: `c_chip_ptr` points to a valid chip.
unsafe {
diff --git a/rust/kernel/task.rs b/rust/kernel/task.rs
index 49fad6de0674..cc907fb531bc 100644
--- a/rust/kernel/task.rs
+++ b/rust/kernel/task.rs
@@ -204,18 +204,6 @@ pub fn as_ptr(&self) -> *mut bindings::task_struct {
self.0.get()
}
- /// Returns the group leader of the given task.
- pub fn group_leader(&self) -> &Task {
- // SAFETY: The group leader of a task never changes after initialization, so reading this
- // field is not a data race.
- let ptr = unsafe { *ptr::addr_of!((*self.as_ptr()).group_leader) };
-
- // SAFETY: The lifetime of the returned task reference is tied to the lifetime of `self`,
- // and given that a task has a reference to its group leader, we know it must be valid for
- // the lifetime of the returned task reference.
- unsafe { &*ptr.cast() }
- }
-
/// Returns the PID of the given task.
pub fn pid(&self) -> Pid {
// SAFETY: The pid of a task never changes after initialization, so reading this field is
@@ -345,6 +333,18 @@ pub fn active_pid_ns(&self) -> Option<&PidNamespace> {
// `release_task()` call.
Some(unsafe { PidNamespace::from_ptr(active_ns) })
}
+
+ /// Returns the group leader of the current task.
+ pub fn group_leader(&self) -> &Task {
+ // SAFETY: The group leader of a task never changes while the task is running, and `self`
+ // is the current task, which is guaranteed running.
+ let ptr = unsafe { (*self.as_ptr()).group_leader };
+
+ // SAFETY: `current->group_leader` stays valid for at least the duration in which `current`
+ // is running, and the signature of this function ensures that the returned `&Task` can
+ // only be used while `current` is still valid, thus still running.
+ unsafe { &*ptr.cast() }
+ }
}
// SAFETY: The type invariants guarantee that `Task` is always refcounted.
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 907bd2667e28..9252172d5068 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1644,6 +1644,15 @@ static const char *rawdata_get_link_base(struct dentry *dentry,
label = aa_get_label_rcu(&proxy->label);
profile = labels_profile(label);
+
+ /* rawdata can be null when aa_g_export_binary is unset during
+ * runtime and a profile is replaced
+ */
+ if (!profile->rawdata) {
+ aa_put_label(label);
+ return ERR_PTR(-ENOENT);
+ }
+
depth = profile_depth(profile);
target = gen_symlink_name(depth, profile->rawdata->name, name);
aa_put_label(label);
diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index c75820402878..7de23e85cd5d 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -154,8 +154,12 @@ static int path_name(const char *op, const struct cred *subj_cred,
const char *info = NULL;
int error;
- error = aa_path_name(path, flags, buffer, name, &info,
- labels_profile(label)->disconnected);
+ /* don't reaudit files closed during inheritance */
+ if (unlikely(path->dentry == aa_null.dentry))
+ error = -EACCES;
+ else
+ error = aa_path_name(path, flags, buffer, name, &info,
+ labels_profile(label)->disconnected);
if (error) {
fn_for_each_confined(label, profile,
aa_audit_file(subj_cred,
@@ -578,6 +582,9 @@ static bool __unix_needs_revalidation(struct file *file, struct aa_label *label,
return false;
if (request & NET_PEER_MASK)
return false;
+ /* sock and sock->sk can be NULL for sockets being set up or torn down */
+ if (!sock || !sock->sk)
+ return false;
if (sock->sk->sk_family == PF_UNIX) {
struct aa_sk_ctx *ctx = aa_sock(sock->sk);
@@ -613,6 +620,10 @@ int aa_file_perm(const char *op, const struct cred *subj_cred,
AA_BUG(!label);
AA_BUG(!file);
+ /* don't reaudit files closed during inheritance */
+ if (unlikely(file->f_path.dentry == aa_null.dentry))
+ return -EACCES;
+
fctx = file_ctx(file);
rcu_read_lock();
diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h
index 1fbe82f5021b..0dde8eda3d1a 100644
--- a/security/apparmor/include/match.h
+++ b/security/apparmor/include/match.h
@@ -104,16 +104,18 @@ struct aa_dfa {
struct table_header *tables[YYTD_ID_TSIZE];
};
-#define byte_to_byte(X) (X)
-
#define UNPACK_ARRAY(TABLE, BLOB, LEN, TTYPE, BTYPE, NTOHX) \
do { \
typeof(LEN) __i; \
TTYPE *__t = (TTYPE *) TABLE; \
BTYPE *__b = (BTYPE *) BLOB; \
- for (__i = 0; __i < LEN; __i++) { \
- __t[__i] = NTOHX(__b[__i]); \
- } \
+ BUILD_BUG_ON(sizeof(TTYPE) != sizeof(BTYPE)); \
+ if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) \
+ memcpy(__t, __b, (LEN) * sizeof(BTYPE)); \
+ else /* copy & convert from big-endian */ \
+ for (__i = 0; __i < LEN; __i++) { \
+ __t[__i] = NTOHX(&__b[__i]); \
+ } \
} while (0)
static inline size_t table_size(size_t len, size_t el_size)
diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 913678f199c3..dd6c58f595ba 100644
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -1278,7 +1278,7 @@ static inline aa_state_t match_component(struct aa_profile *profile,
* @request: permissions to request
* @perms: perms struct to set
*
- * Returns: 0 on success else ERROR
+ * Returns: state match stopped at or DFA_NOMATCH if aborted early
*
* For the label A//&B//&C this does the perm match for A//&B//&C
* @perms should be preinitialized with allperms OR a previous permission
@@ -1305,7 +1305,7 @@ static int label_compound_match(struct aa_profile *profile,
/* no component visible */
*perms = allperms;
- return 0;
+ return state;
next:
label_for_each_cont(i, label, tp) {
@@ -1317,15 +1317,11 @@ static int label_compound_match(struct aa_profile *profile,
goto fail;
}
*perms = *aa_lookup_perms(rules->policy, state);
- aa_apply_modes_to_perms(profile, perms);
- if ((perms->allow & request) != request)
- return -EACCES;
-
- return 0;
+ return state;
fail:
*perms = nullperms;
- return state;
+ return DFA_NOMATCH;
}
/**
@@ -1338,7 +1334,7 @@ static int label_compound_match(struct aa_profile *profile,
* @request: permissions to request
* @perms: an initialized perms struct to add accumulation to
*
- * Returns: 0 on success else ERROR
+ * Returns: the state the match finished in, may be the none matching state
*
* For the label A//&B//&C this does the perm match for each of A and B and C
* @perms should be preinitialized with allperms OR a previous permission
@@ -1366,11 +1362,10 @@ static int label_components_match(struct aa_profile *profile,
}
/* no subcomponents visible - no change in perms */
- return 0;
+ return state;
next:
tmp = *aa_lookup_perms(rules->policy, state);
- aa_apply_modes_to_perms(profile, &tmp);
aa_perms_accum(perms, &tmp);
label_for_each_cont(i, label, tp) {
if (!aa_ns_visible(profile->ns, tp->ns, subns))
@@ -1379,18 +1374,17 @@ static int label_components_match(struct aa_profile *profile,
if (!state)
goto fail;
tmp = *aa_lookup_perms(rules->policy, state);
- aa_apply_modes_to_perms(profile, &tmp);
aa_perms_accum(perms, &tmp);
}
if ((perms->allow & request) != request)
- return -EACCES;
+ return DFA_NOMATCH;
- return 0;
+ return state;
fail:
*perms = nullperms;
- return -EACCES;
+ return DFA_NOMATCH;
}
/**
@@ -1409,11 +1403,12 @@ int aa_label_match(struct aa_profile *profile, struct aa_ruleset *rules,
struct aa_label *label, aa_state_t state, bool subns,
u32 request, struct aa_perms *perms)
{
- int error = label_compound_match(profile, rules, label, state, subns,
- request, perms);
- if (!error)
- return error;
+ aa_state_t tmp = label_compound_match(profile, rules, label, state, subns,
+ request, perms);
+ if ((perms->allow & request) == request)
+ return tmp;
+ /* failed compound_match try component matches */
*perms = allperms;
return label_components_match(profile, rules, label, state, subns,
request, perms);
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index a87cd60ed206..9175fd677ef3 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -520,33 +520,26 @@ static void apparmor_file_free_security(struct file *file)
aa_put_label(rcu_access_pointer(ctx->label));
}
-static int common_file_perm(const char *op, struct file *file, u32 mask,
- bool in_atomic)
+static int common_file_perm(const char *op, struct file *file, u32 mask)
{
struct aa_label *label;
int error = 0;
- bool needput;
-
- /* don't reaudit files closed during inheritance */
- if (unlikely(file->f_path.dentry == aa_null.dentry))
- return -EACCES;
- label = __begin_current_label_crit_section(&needput);
- error = aa_file_perm(op, current_cred(), label, file, mask, in_atomic);
- __end_current_label_crit_section(label, needput);
+ label = begin_current_label_crit_section();
+ error = aa_file_perm(op, current_cred(), label, file, mask, false);
+ end_current_label_crit_section(label);
return error;
}
static int apparmor_file_receive(struct file *file)
{
- return common_file_perm(OP_FRECEIVE, file, aa_map_file_to_perms(file),
- false);
+ return common_file_perm(OP_FRECEIVE, file, aa_map_file_to_perms(file));
}
static int apparmor_file_permission(struct file *file, int mask)
{
- return common_file_perm(OP_FPERM, file, mask, false);
+ return common_file_perm(OP_FPERM, file, mask);
}
static int apparmor_file_lock(struct file *file, unsigned int cmd)
@@ -556,11 +549,11 @@ static int apparmor_file_lock(struct file *file, unsigned int cmd)
if (cmd == F_WRLCK)
mask |= MAY_WRITE;
- return common_file_perm(OP_FLOCK, file, mask, false);
+ return common_file_perm(OP_FLOCK, file, mask);
}
static int common_mmap(const char *op, struct file *file, unsigned long prot,
- unsigned long flags, bool in_atomic)
+ unsigned long flags)
{
int mask = 0;
@@ -578,21 +571,20 @@ static int common_mmap(const char *op, struct file *file, unsigned long prot,
if (prot & PROT_EXEC)
mask |= AA_EXEC_MMAP;
- return common_file_perm(op, file, mask, in_atomic);
+ return common_file_perm(op, file, mask);
}
static int apparmor_mmap_file(struct file *file, unsigned long reqprot,
unsigned long prot, unsigned long flags)
{
- return common_mmap(OP_FMMAP, file, prot, flags, GFP_ATOMIC);
+ return common_mmap(OP_FMMAP, file, prot, flags);
}
static int apparmor_file_mprotect(struct vm_area_struct *vma,
unsigned long reqprot, unsigned long prot)
{
return common_mmap(OP_FMPROT, vma->vm_file, prot,
- !(vma->vm_flags & VM_SHARED) ? MAP_PRIVATE : 0,
- false);
+ !(vma->vm_flags & VM_SHARED) ? MAP_PRIVATE : 0);
}
#ifdef CONFIG_IO_URING
@@ -2145,7 +2137,8 @@ char *aa_get_buffer(bool in_atomic)
if (!list_empty(&cache->head)) {
aa_buf = list_first_entry(&cache->head, union aa_buffer, list);
list_del(&aa_buf->list);
- cache->hold--;
+ if (cache->hold)
+ cache->hold--;
cache->count--;
put_cpu_ptr(&aa_local_buffers);
return &aa_buf->buffer[0];
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index c5a91600842a..bbeb3be68572 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -15,6 +15,7 @@
#include <linux/vmalloc.h>
#include <linux/err.h>
#include <linux/kref.h>
+#include <linux/unaligned.h>
#include "include/lib.h"
#include "include/match.h"
@@ -42,11 +43,11 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
/* loaded td_id's start at 1, subtract 1 now to avoid doing
* it every time we use td_id as an index
*/
- th.td_id = be16_to_cpu(*(__be16 *) (blob)) - 1;
+ th.td_id = get_unaligned_be16(blob) - 1;
if (th.td_id > YYTD_ID_MAX)
goto out;
- th.td_flags = be16_to_cpu(*(__be16 *) (blob + 2));
- th.td_lolen = be32_to_cpu(*(__be32 *) (blob + 8));
+ th.td_flags = get_unaligned_be16(blob + 2);
+ th.td_lolen = get_unaligned_be32(blob + 8);
blob += sizeof(struct table_header);
if (!(th.td_flags == YYTD_DATA16 || th.td_flags == YYTD_DATA32 ||
@@ -66,14 +67,13 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
table->td_flags = th.td_flags;
table->td_lolen = th.td_lolen;
if (th.td_flags == YYTD_DATA8)
- UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
- u8, u8, byte_to_byte);
+ memcpy(table->td_data, blob, th.td_lolen);
else if (th.td_flags == YYTD_DATA16)
UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
- u16, __be16, be16_to_cpu);
+ u16, __be16, get_unaligned_be16);
else if (th.td_flags == YYTD_DATA32)
UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
- u32, __be32, be32_to_cpu);
+ u32, __be32, get_unaligned_be32);
else
goto fail;
/* if table was vmalloced make sure the page tables are synced
@@ -313,14 +313,14 @@ struct aa_dfa *aa_dfa_unpack(void *blob, size_t size, int flags)
if (size < sizeof(struct table_set_header))
goto fail;
- if (ntohl(*(__be32 *) data) != YYTH_MAGIC)
+ if (get_unaligned_be32(data) != YYTH_MAGIC)
goto fail;
- hsize = ntohl(*(__be32 *) (data + 4));
+ hsize = get_unaligned_be32(data + 4);
if (size < hsize)
goto fail;
- dfa->flags = ntohs(*(__be16 *) (data + 12));
+ dfa->flags = get_unaligned_be16(data + 12);
if (dfa->flags & ~(YYTH_FLAGS))
goto fail;
@@ -329,7 +329,7 @@ struct aa_dfa *aa_dfa_unpack(void *blob, size_t size, int flags)
* if (dfa->flags & YYTH_FLAGS_OOB_TRANS) {
* if (hsize < 16 + 4)
* goto fail;
- * dfa->max_oob = ntol(*(__be32 *) (data + 16));
+ * dfa->max_oob = get_unaligned_be32(data + 16);
* if (dfa->max <= MAX_OOB_SUPPORTED) {
* pr_err("AppArmor DFA OOB greater than supported\n");
* goto fail;
diff --git a/security/apparmor/net.c b/security/apparmor/net.c
index 45cf25605c34..44c04102062f 100644
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
@@ -326,8 +326,10 @@ int aa_sock_file_perm(const struct cred *subj_cred, struct aa_label *label,
struct socket *sock = (struct socket *) file->private_data;
AA_BUG(!label);
- AA_BUG(!sock);
- AA_BUG(!sock->sk);
+
+ /* sock && sock->sk can be NULL for sockets being set up or torn down */
+ if (!sock || !sock->sk)
+ return 0;
if (sock->sk->sk_family == PF_UNIX)
return aa_unix_file_perm(subj_cred, label, op, request, file);
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 7523971e37d9..dd602bd5fca9 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -687,8 +687,10 @@ static ssize_t unpack_perms_table(struct aa_ext *e, struct aa_perms **perms)
if (!aa_unpack_array(e, NULL, &size))
goto fail_reset;
*perms = kcalloc(size, sizeof(struct aa_perms), GFP_KERNEL);
- if (!*perms)
- goto fail_reset;
+ if (!*perms) {
+ e->pos = pos;
+ return -ENOMEM;
+ }
for (i = 0; i < size; i++) {
if (!unpack_perm(e, version, &(*perms)[i]))
goto fail;
diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
index 8e80db3ae21c..64212b39ba4b 100644
--- a/security/apparmor/resource.c
+++ b/security/apparmor/resource.c
@@ -196,6 +196,11 @@ void __aa_transition_rlimits(struct aa_label *old_l, struct aa_label *new_l)
rules->rlimits.limits[j].rlim_max);
/* soft limit should not exceed hard limit */
rlim->rlim_cur = min(rlim->rlim_cur, rlim->rlim_max);
+ if (j == RLIMIT_CPU &&
+ rlim->rlim_cur != RLIM_INFINITY &&
+ IS_ENABLED(CONFIG_POSIX_TIMERS))
+ (void) update_rlimit_cpu(current->group_leader,
+ rlim->rlim_cur);
}
}
}
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index a5e730ffda57..5a8cef45bacf 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -401,6 +401,7 @@ int evm_init_hmac(struct inode *inode, const struct xattr *xattrs,
{
struct shash_desc *desc;
const struct xattr *xattr;
+ struct xattr_list *xattr_entry;
desc = init_desc(EVM_XATTR_HMAC, HASH_ALGO_SHA1);
if (IS_ERR(desc)) {
@@ -408,11 +409,16 @@ int evm_init_hmac(struct inode *inode, const struct xattr *xattrs,
return PTR_ERR(desc);
}
- for (xattr = xattrs; xattr->name; xattr++) {
- if (!evm_protected_xattr(xattr->name))
- continue;
+ list_for_each_entry_lockless(xattr_entry, &evm_config_xattrnames,
+ list) {
+ for (xattr = xattrs; xattr->name; xattr++) {
+ if (strcmp(xattr_entry->name +
+ XATTR_SECURITY_PREFIX_LEN, xattr->name) != 0)
+ continue;
- crypto_shash_update(desc, xattr->value, xattr->value_len);
+ crypto_shash_update(desc, xattr->value,
+ xattr->value_len);
+ }
}
hmac_add_misc(desc, inode, EVM_XATTR_HMAC, hmac_val);
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index e3d71d8d56e3..89ebe98ffc5e 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -441,7 +441,8 @@ int ima_check_blacklist(struct ima_iint_cache *iint,
int ima_appraise_measurement(enum ima_hooks func, struct ima_iint_cache *iint,
struct file *file, const unsigned char *filename,
struct evm_ima_xattr_data *xattr_value,
- int xattr_len, const struct modsig *modsig);
+ int xattr_len, const struct modsig *modsig,
+ bool bprm_is_check);
int ima_must_appraise(struct mnt_idmap *idmap, struct inode *inode,
int mask, enum ima_hooks func);
void ima_update_xattr(struct ima_iint_cache *iint, struct file *file);
@@ -466,7 +467,8 @@ static inline int ima_appraise_measurement(enum ima_hooks func,
const unsigned char *filename,
struct evm_ima_xattr_data *xattr_value,
int xattr_len,
- const struct modsig *modsig)
+ const struct modsig *modsig,
+ bool bprm_is_check)
{
return INTEGRITY_UNKNOWN;
}
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 5149ff4fd50d..16c20c578ea8 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -470,17 +470,6 @@ int ima_check_blacklist(struct ima_iint_cache *iint,
return rc;
}
-static bool is_bprm_creds_for_exec(enum ima_hooks func, struct file *file)
-{
- struct linux_binprm *bprm;
-
- if (func == BPRM_CHECK) {
- bprm = container_of(&file, struct linux_binprm, file);
- return bprm->is_check;
- }
- return false;
-}
-
/*
* ima_appraise_measurement - appraise file measurement
*
@@ -492,7 +481,8 @@ static bool is_bprm_creds_for_exec(enum ima_hooks func, struct file *file)
int ima_appraise_measurement(enum ima_hooks func, struct ima_iint_cache *iint,
struct file *file, const unsigned char *filename,
struct evm_ima_xattr_data *xattr_value,
- int xattr_len, const struct modsig *modsig)
+ int xattr_len, const struct modsig *modsig,
+ bool bprm_is_check)
{
static const char op[] = "appraise_data";
int audit_msgno = AUDIT_INTEGRITY_DATA;
@@ -514,7 +504,7 @@ int ima_appraise_measurement(enum ima_hooks func, struct ima_iint_cache *iint,
* of the script interpreter(userspace). Differentiate kernel and
* userspace enforced integrity audit messages.
*/
- if (is_bprm_creds_for_exec(func, file))
+ if (bprm_is_check)
audit_msgno = AUDIT_INTEGRITY_USERSPACE;
/* If reading the xattr failed and there's no modsig, error out. */
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 5770cf691912..1d6229b156fb 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -236,7 +236,8 @@ static void ima_file_free(struct file *file)
static int process_measurement(struct file *file, const struct cred *cred,
struct lsm_prop *prop, char *buf, loff_t size,
int mask, enum ima_hooks func,
- enum kernel_read_file_id read_id)
+ enum kernel_read_file_id read_id,
+ bool bprm_is_check)
{
struct inode *real_inode, *inode = file_inode(file);
struct ima_iint_cache *iint = NULL;
@@ -426,7 +427,8 @@ static int process_measurement(struct file *file, const struct cred *cred,
inode_lock(inode);
rc = ima_appraise_measurement(func, iint, file,
pathname, xattr_value,
- xattr_len, modsig);
+ xattr_len, modsig,
+ bprm_is_check);
inode_unlock(inode);
}
if (!rc)
@@ -493,14 +495,15 @@ static int ima_file_mmap(struct file *file, unsigned long reqprot,
if (reqprot & PROT_EXEC) {
ret = process_measurement(file, current_cred(), &prop, NULL,
- 0, MAY_EXEC, MMAP_CHECK_REQPROT, 0);
+ 0, MAY_EXEC, MMAP_CHECK_REQPROT, 0,
+ false);
if (ret)
return ret;
}
if (prot & PROT_EXEC)
return process_measurement(file, current_cred(), &prop, NULL,
- 0, MAY_EXEC, MMAP_CHECK, 0);
+ 0, MAY_EXEC, MMAP_CHECK, 0, false);
return 0;
}
@@ -584,7 +587,8 @@ static int ima_bprm_check(struct linux_binprm *bprm)
security_current_getlsmprop_subj(&prop);
return process_measurement(bprm->file, current_cred(),
- &prop, NULL, 0, MAY_EXEC, BPRM_CHECK, 0);
+ &prop, NULL, 0, MAY_EXEC, BPRM_CHECK, 0,
+ bprm->is_check);
}
/**
@@ -614,7 +618,7 @@ static int ima_creds_check(struct linux_binprm *bprm, const struct file *file)
security_current_getlsmprop_subj(&prop);
return process_measurement((struct file *)file, bprm->cred, &prop, NULL,
- 0, MAY_EXEC, CREDS_CHECK, 0);
+ 0, MAY_EXEC, CREDS_CHECK, 0, false);
}
/**
@@ -662,7 +666,7 @@ static int ima_file_check(struct file *file, int mask)
security_current_getlsmprop_subj(&prop);
return process_measurement(file, current_cred(), &prop, NULL, 0,
mask & (MAY_READ | MAY_WRITE | MAY_EXEC |
- MAY_APPEND), FILE_CHECK, 0);
+ MAY_APPEND), FILE_CHECK, 0, false);
}
static int __ima_inode_hash(struct inode *inode, struct file *file, char *buf,
@@ -881,7 +885,7 @@ static int ima_read_file(struct file *file, enum kernel_read_file_id read_id,
func = read_idmap[read_id] ?: FILE_CHECK;
security_current_getlsmprop_subj(&prop);
return process_measurement(file, current_cred(), &prop, NULL, 0,
- MAY_READ, func, 0);
+ MAY_READ, func, 0, false);
}
const int read_idmap[READING_MAX_ID] = {
@@ -925,7 +929,7 @@ static int ima_post_read_file(struct file *file, char *buf, loff_t size,
func = read_idmap[read_id] ?: FILE_CHECK;
security_current_getlsmprop_subj(&prop);
return process_measurement(file, current_cred(), &prop, buf, size,
- MAY_READ, func, read_id);
+ MAY_READ, func, read_id, false);
}
/**
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 2a9d3f2ebbe1..8919e330d2f6 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -70,6 +70,7 @@ enum smk_inos {
static DEFINE_MUTEX(smack_cipso_lock);
static DEFINE_MUTEX(smack_ambient_lock);
static DEFINE_MUTEX(smk_net4addr_lock);
+static DEFINE_MUTEX(smk_cipso_doi_lock);
#if IS_ENABLED(CONFIG_IPV6)
static DEFINE_MUTEX(smk_net6addr_lock);
#endif /* CONFIG_IPV6 */
@@ -141,7 +142,7 @@ struct smack_parsed_rule {
int smk_access2;
};
-static int smk_cipso_doi_value = SMACK_CIPSO_DOI_DEFAULT;
+static u32 smk_cipso_doi_value = CIPSO_V4_DOI_UNKNOWN;
/*
* Values for parsing cipso rules
@@ -663,43 +664,60 @@ static const struct file_operations smk_load_ops = {
};
/**
- * smk_cipso_doi - initialize the CIPSO domain
+ * smk_cipso_doi - set netlabel maps
+ * @ndoi: new value for our CIPSO DOI
+ * @gfp_flags: kmalloc allocation context
*/
-static void smk_cipso_doi(void)
+static int
+smk_cipso_doi(u32 ndoi, gfp_t gfp_flags)
{
- int rc;
+ int rc = 0;
struct cipso_v4_doi *doip;
struct netlbl_audit nai;
- smk_netlabel_audit_set(&nai);
+ mutex_lock(&smk_cipso_doi_lock);
- rc = netlbl_cfg_map_del(NULL, PF_INET, NULL, NULL, &nai);
- if (rc != 0)
- printk(KERN_WARNING "%s:%d remove rc = %d\n",
- __func__, __LINE__, rc);
+ if (smk_cipso_doi_value == ndoi)
+ goto clr_doi_lock;
+
+ smk_netlabel_audit_set(&nai);
- doip = kmalloc(sizeof(struct cipso_v4_doi), GFP_KERNEL | __GFP_NOFAIL);
+ doip = kmalloc(sizeof(struct cipso_v4_doi), gfp_flags);
+ if (!doip) {
+ rc = -ENOMEM;
+ goto clr_doi_lock;
+ }
doip->map.std = NULL;
- doip->doi = smk_cipso_doi_value;
+ doip->doi = ndoi;
doip->type = CIPSO_V4_MAP_PASS;
doip->tags[0] = CIPSO_V4_TAG_RBITMAP;
for (rc = 1; rc < CIPSO_V4_TAG_MAXCNT; rc++)
doip->tags[rc] = CIPSO_V4_TAG_INVALID;
rc = netlbl_cfg_cipsov4_add(doip, &nai);
- if (rc != 0) {
- printk(KERN_WARNING "%s:%d cipso add rc = %d\n",
- __func__, __LINE__, rc);
+ if (rc) {
kfree(doip);
- return;
+ goto clr_doi_lock;
}
- rc = netlbl_cfg_cipsov4_map_add(doip->doi, NULL, NULL, NULL, &nai);
- if (rc != 0) {
- printk(KERN_WARNING "%s:%d map add rc = %d\n",
- __func__, __LINE__, rc);
- netlbl_cfg_cipsov4_del(doip->doi, &nai);
- return;
+
+ if (smk_cipso_doi_value != CIPSO_V4_DOI_UNKNOWN) {
+ rc = netlbl_cfg_map_del(NULL, PF_INET, NULL, NULL, &nai);
+ if (rc && rc != -ENOENT)
+ goto clr_ndoi_def;
+
+ netlbl_cfg_cipsov4_del(smk_cipso_doi_value, &nai);
}
+
+ rc = netlbl_cfg_cipsov4_map_add(ndoi, NULL, NULL, NULL, &nai);
+ if (rc) {
+ smk_cipso_doi_value = CIPSO_V4_DOI_UNKNOWN; // no default map
+clr_ndoi_def: netlbl_cfg_cipsov4_del(ndoi, &nai);
+ } else
+ smk_cipso_doi_value = ndoi;
+
+clr_doi_lock:
+ mutex_unlock(&smk_cipso_doi_lock);
+ return rc;
}
/**
@@ -1562,7 +1580,7 @@ static ssize_t smk_read_doi(struct file *filp, char __user *buf,
if (*ppos != 0)
return 0;
- sprintf(temp, "%d", smk_cipso_doi_value);
+ sprintf(temp, "%lu", (unsigned long)smk_cipso_doi_value);
rc = simple_read_from_buffer(buf, count, ppos, temp, strlen(temp));
return rc;
@@ -1581,7 +1599,7 @@ static ssize_t smk_write_doi(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
char temp[80];
- int i;
+ unsigned long u;
if (!smack_privileged(CAP_MAC_ADMIN))
return -EPERM;
@@ -1594,14 +1612,13 @@ static ssize_t smk_write_doi(struct file *file, const char __user *buf,
temp[count] = '\0';
- if (sscanf(temp, "%d", &i) != 1)
+ if (kstrtoul(temp, 10, &u))
return -EINVAL;
- smk_cipso_doi_value = i;
-
- smk_cipso_doi();
+ if (u == CIPSO_V4_DOI_UNKNOWN || u > U32_MAX)
+ return -EINVAL;
- return count;
+ return smk_cipso_doi(u, GFP_KERNEL) ? : count;
}
static const struct file_operations smk_doi_ops = {
@@ -2982,6 +2999,7 @@ int __init init_smk_fs(void)
{
int err;
int rc;
+ struct netlbl_audit nai;
if (smack_enabled == 0)
return 0;
@@ -3000,7 +3018,10 @@ int __init init_smk_fs(void)
}
}
- smk_cipso_doi();
+ smk_netlabel_audit_set(&nai);
+ (void) netlbl_cfg_map_del(NULL, PF_INET, NULL, NULL, &nai);
+ (void) smk_cipso_doi(SMACK_CIPSO_DOI_DEFAULT,
+ GFP_KERNEL | __GFP_NOFAIL);
smk_unlbl_ambient(NULL);
rc = smack_populate_secattr(&smack_known_floor);
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index da514fef45bc..ed2eeb914c6d 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -514,12 +514,12 @@ static int
snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg)
{
int retval;
- struct snd_compr_codec_caps *caps __free(kfree) = NULL;
if (!stream->ops->get_codec_caps)
return -ENXIO;
- caps = kzalloc(sizeof(*caps), GFP_KERNEL);
+ struct snd_compr_codec_caps *caps __free(kfree) =
+ kzalloc(sizeof(*caps), GFP_KERNEL);
if (!caps)
return -ENOMEM;
@@ -647,7 +647,6 @@ snd_compress_check_input(struct snd_compr_stream *stream, struct snd_compr_param
static int
snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
{
- struct snd_compr_params *params __free(kfree) = NULL;
int retval;
if (stream->runtime->state == SNDRV_PCM_STATE_OPEN || stream->next_track) {
@@ -655,7 +654,9 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
* we should allow parameter change only when stream has been
* opened not in other cases
*/
- params = memdup_user((void __user *)arg, sizeof(*params));
+ struct snd_compr_params *params __free(kfree) =
+ memdup_user((void __user *)arg, sizeof(*params));
+
if (IS_ERR(params))
return PTR_ERR(params);
@@ -687,13 +688,13 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
static int
snd_compr_get_params(struct snd_compr_stream *stream, unsigned long arg)
{
- struct snd_codec *params __free(kfree) = NULL;
int retval;
if (!stream->ops->get_params)
return -EBADFD;
- params = kzalloc(sizeof(*params), GFP_KERNEL);
+ struct snd_codec *params __free(kfree) =
+ kzalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
retval = stream->ops->get_params(stream, params);
@@ -1104,12 +1105,13 @@ static int snd_compr_task_new(struct snd_compr_stream *stream, struct snd_compr_
static int snd_compr_task_create(struct snd_compr_stream *stream, unsigned long arg)
{
- struct snd_compr_task *task __free(kfree) = NULL;
int retval;
if (stream->runtime->state != SNDRV_PCM_STATE_SETUP)
return -EPERM;
- task = memdup_user((void __user *)arg, sizeof(*task));
+
+ struct snd_compr_task *task __free(kfree) =
+ memdup_user((void __user *)arg, sizeof(*task));
if (IS_ERR(task))
return PTR_ERR(task);
retval = snd_compr_task_new(stream, task);
@@ -1165,12 +1167,13 @@ static int snd_compr_task_start(struct snd_compr_stream *stream, struct snd_comp
static int snd_compr_task_start_ioctl(struct snd_compr_stream *stream, unsigned long arg)
{
- struct snd_compr_task *task __free(kfree) = NULL;
int retval;
if (stream->runtime->state != SNDRV_PCM_STATE_SETUP)
return -EPERM;
- task = memdup_user((void __user *)arg, sizeof(*task));
+
+ struct snd_compr_task *task __free(kfree) =
+ memdup_user((void __user *)arg, sizeof(*task));
if (IS_ERR(task))
return PTR_ERR(task);
retval = snd_compr_task_start(stream, task);
@@ -1256,12 +1259,13 @@ static int snd_compr_task_status(struct snd_compr_stream *stream,
static int snd_compr_task_status_ioctl(struct snd_compr_stream *stream, unsigned long arg)
{
- struct snd_compr_task_status *status __free(kfree) = NULL;
int retval;
if (stream->runtime->state != SNDRV_PCM_STATE_SETUP)
return -EPERM;
- status = memdup_user((void __user *)arg, sizeof(*status));
+
+ struct snd_compr_task_status *status __free(kfree) =
+ memdup_user((void __user *)arg, sizeof(*status));
if (IS_ERR(status))
return PTR_ERR(status);
retval = snd_compr_task_status(stream, status);
diff --git a/sound/core/control.c b/sound/core/control.c
index 9c3fd5113a61..486d1bc4dac2 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -867,9 +867,9 @@ EXPORT_SYMBOL(snd_ctl_find_id);
static int snd_ctl_card_info(struct snd_card *card, struct snd_ctl_file * ctl,
unsigned int cmd, void __user *arg)
{
- struct snd_ctl_card_info *info __free(kfree) = NULL;
+ struct snd_ctl_card_info *info __free(kfree) =
+ kzalloc(sizeof(*info), GFP_KERNEL);
- info = kzalloc(sizeof(*info), GFP_KERNEL);
if (! info)
return -ENOMEM;
scoped_guard(rwsem_read, &snd_ioctl_rwsem) {
@@ -1244,10 +1244,10 @@ static int snd_ctl_elem_read(struct snd_card *card,
static int snd_ctl_elem_read_user(struct snd_card *card,
struct snd_ctl_elem_value __user *_control)
{
- struct snd_ctl_elem_value *control __free(kfree) = NULL;
int result;
+ struct snd_ctl_elem_value *control __free(kfree) =
+ memdup_user(_control, sizeof(*control));
- control = memdup_user(_control, sizeof(*control));
if (IS_ERR(control))
return PTR_ERR(control);
@@ -1320,11 +1320,11 @@ static int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,
static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
struct snd_ctl_elem_value __user *_control)
{
- struct snd_ctl_elem_value *control __free(kfree) = NULL;
struct snd_card *card;
int result;
+ struct snd_ctl_elem_value *control __free(kfree) =
+ memdup_user(_control, sizeof(*control));
- control = memdup_user(_control, sizeof(*control));
if (IS_ERR(control))
return PTR_ERR(control);
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 6459809ed364..b8988a4bcd9b 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -80,10 +80,10 @@ static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl,
struct snd_ctl_elem_info32 __user *data32)
{
struct snd_card *card = ctl->card;
- struct snd_ctl_elem_info *data __free(kfree) = NULL;
int err;
+ struct snd_ctl_elem_info *data __free(kfree) =
+ kzalloc(sizeof(*data), GFP_KERNEL);
- data = kzalloc(sizeof(*data), GFP_KERNEL);
if (! data)
return -ENOMEM;
@@ -169,14 +169,15 @@ static int get_ctl_type(struct snd_card *card, struct snd_ctl_elem_id *id,
int *countp)
{
struct snd_kcontrol *kctl;
- struct snd_ctl_elem_info *info __free(kfree) = NULL;
int err;
guard(rwsem_read)(&card->controls_rwsem);
kctl = snd_ctl_find_id(card, id);
if (!kctl)
return -ENOENT;
- info = kzalloc(sizeof(*info), GFP_KERNEL);
+
+ struct snd_ctl_elem_info *info __free(kfree) =
+ kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
return -ENOMEM;
info->id = *id;
@@ -280,10 +281,10 @@ static int copy_ctl_value_to_user(void __user *userdata,
static int __ctl_elem_read_user(struct snd_card *card,
void __user *userdata, void __user *valuep)
{
- struct snd_ctl_elem_value *data __free(kfree) = NULL;
int err, type, count;
+ struct snd_ctl_elem_value *data __free(kfree) =
+ kzalloc(sizeof(*data), GFP_KERNEL);
- data = kzalloc(sizeof(*data), GFP_KERNEL);
if (data == NULL)
return -ENOMEM;
@@ -314,11 +315,11 @@ static int ctl_elem_read_user(struct snd_card *card,
static int __ctl_elem_write_user(struct snd_ctl_file *file,
void __user *userdata, void __user *valuep)
{
- struct snd_ctl_elem_value *data __free(kfree) = NULL;
struct snd_card *card = file->card;
int err, type, count;
+ struct snd_ctl_elem_value *data __free(kfree) =
+ kzalloc(sizeof(*data), GFP_KERNEL);
- data = kzalloc(sizeof(*data), GFP_KERNEL);
if (data == NULL)
return -ENOMEM;
@@ -378,9 +379,9 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file,
struct snd_ctl_elem_info32 __user *data32,
int replace)
{
- struct snd_ctl_elem_info *data __free(kfree) = NULL;
+ struct snd_ctl_elem_info *data __free(kfree) =
+ kzalloc(sizeof(*data), GFP_KERNEL);
- data = kzalloc(sizeof(*data), GFP_KERNEL);
if (! data)
return -ENOMEM;
diff --git a/sound/core/control_led.c b/sound/core/control_led.c
index e33dfcf863cf..c7641d5084e7 100644
--- a/sound/core/control_led.c
+++ b/sound/core/control_led.c
@@ -245,12 +245,12 @@ DEFINE_FREE(snd_card_unref, struct snd_card *, if (_T) snd_card_unref(_T))
static int snd_ctl_led_set_id(int card_number, struct snd_ctl_elem_id *id,
unsigned int group, bool set)
{
- struct snd_card *card __free(snd_card_unref) = NULL;
struct snd_kcontrol *kctl;
struct snd_kcontrol_volatile *vd;
unsigned int ioff, access, new_access;
+ struct snd_card *card __free(snd_card_unref) =
+ snd_card_ref(card_number);
- card = snd_card_ref(card_number);
if (!card)
return -ENXIO;
guard(rwsem_write)(&card->controls_rwsem);
@@ -302,13 +302,13 @@ static void snd_ctl_led_clean(struct snd_card *card)
static int snd_ctl_led_reset(int card_number, unsigned int group)
{
- struct snd_card *card __free(snd_card_unref) = NULL;
struct snd_ctl_led_ctl *lctl, *_lctl;
struct snd_ctl_led *led;
struct snd_kcontrol_volatile *vd;
bool change = false;
+ struct snd_card *card __free(snd_card_unref) =
+ snd_card_ref(card_number);
- card = snd_card_ref(card_number);
if (!card)
return -ENXIO;
@@ -598,11 +598,11 @@ static ssize_t list_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct snd_ctl_led_card *led_card = container_of(dev, struct snd_ctl_led_card, dev);
- struct snd_card *card __free(snd_card_unref) = NULL;
struct snd_ctl_led_ctl *lctl;
size_t l = 0;
+ struct snd_card *card __free(snd_card_unref) =
+ snd_card_ref(led_card->number);
- card = snd_card_ref(led_card->number);
if (!card)
return -ENXIO;
guard(rwsem_read)(&card->controls_rwsem);
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index e839a4bb93f8..8d2d46d03301 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -517,8 +517,6 @@ static void snd_mixer_oss_get_volume1_vol(struct snd_mixer_oss_file *fmixer,
unsigned int numid,
int *left, int *right)
{
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
struct snd_kcontrol *kctl;
struct snd_card *card = fmixer->card;
@@ -528,8 +526,11 @@ static void snd_mixer_oss_get_volume1_vol(struct snd_mixer_oss_file *fmixer,
kctl = snd_ctl_find_numid(card, numid);
if (!kctl)
return;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -550,8 +551,6 @@ static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,
int *left, int *right,
int route)
{
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
struct snd_kcontrol *kctl;
struct snd_card *card = fmixer->card;
@@ -561,8 +560,11 @@ static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,
kctl = snd_ctl_find_numid(card, numid);
if (!kctl)
return;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -609,8 +611,6 @@ static void snd_mixer_oss_put_volume1_vol(struct snd_mixer_oss_file *fmixer,
unsigned int numid,
int left, int right)
{
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
struct snd_kcontrol *kctl;
struct snd_card *card = fmixer->card;
int res;
@@ -621,8 +621,11 @@ static void snd_mixer_oss_put_volume1_vol(struct snd_mixer_oss_file *fmixer,
kctl = snd_ctl_find_numid(card, numid);
if (!kctl)
return;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -646,8 +649,6 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,
int left, int right,
int route)
{
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
struct snd_kcontrol *kctl;
struct snd_card *card = fmixer->card;
int res;
@@ -658,8 +659,11 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,
kctl = snd_ctl_find_numid(card, numid);
if (!kctl)
return;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -783,12 +787,12 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
struct snd_kcontrol *kctl;
struct snd_mixer_oss_slot *pslot;
struct slot *slot;
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
int err, idx;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return -ENOMEM;
guard(rwsem_read)(&card->controls_rwsem);
@@ -825,13 +829,13 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
struct snd_kcontrol *kctl;
struct snd_mixer_oss_slot *pslot;
struct slot *slot = NULL;
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
int err;
unsigned int idx;
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (uinfo == NULL || uctl == NULL)
return -ENOMEM;
guard(rwsem_read)(&card->controls_rwsem);
@@ -872,18 +876,18 @@ struct snd_mixer_oss_assign_table {
static int snd_mixer_oss_build_test(struct snd_mixer_oss *mixer, struct slot *slot, const char *name, int index, int item)
{
- struct snd_ctl_elem_info *info __free(kfree) = NULL;
struct snd_kcontrol *kcontrol;
struct snd_card *card = mixer->card;
int err;
+ struct snd_ctl_elem_info *info __free(kfree) =
+ kmalloc(sizeof(*info), GFP_KERNEL);
+ if (!info)
+ return -ENOMEM;
scoped_guard(rwsem_read, &card->controls_rwsem) {
kcontrol = snd_mixer_oss_test_id(mixer, name, index);
if (kcontrol == NULL)
return 0;
- info = kmalloc(sizeof(*info), GFP_KERNEL);
- if (!info)
- return -ENOMEM;
err = kcontrol->info(kcontrol, info);
if (err < 0)
return err;
@@ -1006,9 +1010,9 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,
if (!ptr->index)
kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);
if (kctl) {
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kzalloc(sizeof(*uinfo), GFP_KERNEL);
- uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
if (!uinfo)
return -ENOMEM;
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index b12df5b5ddfc..3bc94d34b35e 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -377,7 +377,6 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,
snd_pcm_hw_param_t var, unsigned int best,
int *dir)
{
- struct snd_pcm_hw_params *save __free(kfree) = NULL;
int v;
unsigned int saved_min;
int last = 0;
@@ -397,19 +396,22 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,
maxdir = 1;
max--;
}
- save = kmalloc(sizeof(*save), GFP_KERNEL);
+
+ struct snd_pcm_hw_params *save __free(kfree) =
+ kmalloc(sizeof(*save), GFP_KERNEL);
if (save == NULL)
return -ENOMEM;
*save = *params;
saved_min = min;
min = snd_pcm_hw_param_min(pcm, params, var, min, &mindir);
if (min >= 0) {
- struct snd_pcm_hw_params *params1 __free(kfree) = NULL;
if (max < 0)
goto _end;
if ((unsigned int)min == saved_min && mindir == valdir)
goto _end;
- params1 = kmalloc(sizeof(*params1), GFP_KERNEL);
+
+ struct snd_pcm_hw_params *params1 __free(kfree) =
+ kmalloc(sizeof(*params1), GFP_KERNEL);
if (params1 == NULL)
return -ENOMEM;
*params1 = *save;
@@ -781,10 +783,10 @@ static int choose_rate(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, unsigned int best_rate)
{
const struct snd_interval *it;
- struct snd_pcm_hw_params *save __free(kfree) = NULL;
unsigned int rate, prev;
- save = kmalloc(sizeof(*save), GFP_KERNEL);
+ struct snd_pcm_hw_params *save __free(kfree) =
+ kmalloc(sizeof(*save), GFP_KERNEL);
if (save == NULL)
return -ENOMEM;
*save = *params;
@@ -1836,7 +1838,6 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)
struct snd_pcm_substream *substream;
int err;
int direct;
- struct snd_pcm_hw_params *params __free(kfree) = NULL;
unsigned int formats = 0;
const struct snd_mask *format_mask;
int fmt;
@@ -1856,7 +1857,9 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)
AFMT_S32_LE | AFMT_S32_BE |
AFMT_S24_LE | AFMT_S24_BE |
AFMT_S24_PACKED;
- params = kmalloc(sizeof(*params), GFP_KERNEL);
+
+ struct snd_pcm_hw_params *params __free(kfree) =
+ kmalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
_snd_pcm_hw_params_any(params);
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 283aac441fa0..0b512085eb63 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -328,13 +328,13 @@ static const char *snd_pcm_oss_format_name(int format)
static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream,
struct snd_info_buffer *buffer)
{
- struct snd_pcm_info *info __free(kfree) = NULL;
int err;
if (! substream)
return;
- info = kmalloc(sizeof(*info), GFP_KERNEL);
+ struct snd_pcm_info *info __free(kfree) =
+ kmalloc(sizeof(*info), GFP_KERNEL);
if (!info)
return;
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 54eb9bd8eb21..e86f68f1f23c 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -235,7 +235,6 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
int refine,
struct snd_pcm_hw_params32 __user *data32)
{
- struct snd_pcm_hw_params *data __free(kfree) = NULL;
struct snd_pcm_runtime *runtime;
int err;
@@ -243,7 +242,8 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
if (!runtime)
return -ENOTTY;
- data = kmalloc(sizeof(*data), GFP_KERNEL);
+ struct snd_pcm_hw_params *data __free(kfree) =
+ kmalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
@@ -332,7 +332,6 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
compat_caddr_t buf;
compat_caddr_t __user *bufptr;
u32 frames;
- void __user **bufs __free(kfree) = NULL;
int err, ch, i;
if (! substream->runtime)
@@ -349,7 +348,9 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
get_user(frames, &data32->frames))
return -EFAULT;
bufptr = compat_ptr(buf);
- bufs = kmalloc_array(ch, sizeof(void __user *), GFP_KERNEL);
+
+ void __user **bufs __free(kfree) =
+ kmalloc_array(ch, sizeof(void __user *), GFP_KERNEL);
if (bufs == NULL)
return -ENOMEM;
for (i = 0; i < ch; i++) {
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 932a9bf98cbc..844ee1b4d286 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -242,10 +242,10 @@ int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)
int snd_pcm_info_user(struct snd_pcm_substream *substream,
struct snd_pcm_info __user * _info)
{
- struct snd_pcm_info *info __free(kfree) = NULL;
int err;
+ struct snd_pcm_info *info __free(kfree) =
+ kmalloc(sizeof(*info), GFP_KERNEL);
- info = kmalloc(sizeof(*info), GFP_KERNEL);
if (! info)
return -ENOMEM;
err = snd_pcm_info(substream, info);
@@ -364,7 +364,6 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
struct snd_pcm_hw_constraints *constrs =
&substream->runtime->hw_constraints;
unsigned int k;
- unsigned int *rstamps __free(kfree) = NULL;
unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];
unsigned int stamp;
struct snd_pcm_hw_rule *r;
@@ -380,7 +379,8 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
* Each member of 'rstamps' array represents the sequence number of
* recent application of corresponding rule.
*/
- rstamps = kcalloc(constrs->rules_num, sizeof(unsigned int), GFP_KERNEL);
+ unsigned int *rstamps __free(kfree) =
+ kcalloc(constrs->rules_num, sizeof(unsigned int), GFP_KERNEL);
if (!rstamps)
return -ENOMEM;
@@ -583,10 +583,10 @@ EXPORT_SYMBOL(snd_pcm_hw_refine);
static int snd_pcm_hw_refine_user(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params __user * _params)
{
- struct snd_pcm_hw_params *params __free(kfree) = NULL;
int err;
+ struct snd_pcm_hw_params *params __free(kfree) =
+ memdup_user(_params, sizeof(*params));
- params = memdup_user(_params, sizeof(*params));
if (IS_ERR(params))
return PTR_ERR(params);
@@ -889,10 +889,10 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
static int snd_pcm_hw_params_user(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params __user * _params)
{
- struct snd_pcm_hw_params *params __free(kfree) = NULL;
int err;
+ struct snd_pcm_hw_params *params __free(kfree) =
+ memdup_user(_params, sizeof(*params));
- params = memdup_user(_params, sizeof(*params));
if (IS_ERR(params))
return PTR_ERR(params);
@@ -2267,7 +2267,6 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
{
struct snd_pcm_file *pcm_file;
struct snd_pcm_substream *substream1;
- struct snd_pcm_group *group __free(kfree) = NULL;
struct snd_pcm_group *target_group;
bool nonatomic = substream->pcm->nonatomic;
CLASS(fd, f)(fd);
@@ -2283,7 +2282,8 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
if (substream == substream1)
return -EINVAL;
- group = kzalloc(sizeof(*group), GFP_KERNEL);
+ struct snd_pcm_group *group __free(kfree) =
+ kzalloc(sizeof(*group), GFP_KERNEL);
if (!group)
return -ENOMEM;
snd_pcm_group_init(group);
@@ -3291,7 +3291,6 @@ static int snd_pcm_xfern_frames_ioctl(struct snd_pcm_substream *substream,
{
struct snd_xfern xfern;
struct snd_pcm_runtime *runtime = substream->runtime;
- void *bufs __free(kfree) = NULL;
snd_pcm_sframes_t result;
if (runtime->state == SNDRV_PCM_STATE_OPEN)
@@ -3303,7 +3302,8 @@ static int snd_pcm_xfern_frames_ioctl(struct snd_pcm_substream *substream,
if (copy_from_user(&xfern, _xfern, sizeof(xfern)))
return -EFAULT;
- bufs = memdup_array_user(xfern.bufs, runtime->channels, sizeof(void *));
+ void *bufs __free(kfree) =
+ memdup_array_user(xfern.bufs, runtime->channels, sizeof(void *));
if (IS_ERR(bufs))
return PTR_ERR(bufs);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -3577,7 +3577,6 @@ static ssize_t snd_pcm_readv(struct kiocb *iocb, struct iov_iter *to)
struct snd_pcm_runtime *runtime;
snd_pcm_sframes_t result;
unsigned long i;
- void __user **bufs __free(kfree) = NULL;
snd_pcm_uframes_t frames;
const struct iovec *iov = iter_iov(to);
@@ -3596,7 +3595,9 @@ static ssize_t snd_pcm_readv(struct kiocb *iocb, struct iov_iter *to)
if (!frame_aligned(runtime, iov->iov_len))
return -EINVAL;
frames = bytes_to_samples(runtime, iov->iov_len);
- bufs = kmalloc_array(to->nr_segs, sizeof(void *), GFP_KERNEL);
+
+ void __user **bufs __free(kfree) =
+ kmalloc_array(to->nr_segs, sizeof(void *), GFP_KERNEL);
if (bufs == NULL)
return -ENOMEM;
for (i = 0; i < to->nr_segs; ++i) {
@@ -3616,7 +3617,6 @@ static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from)
struct snd_pcm_runtime *runtime;
snd_pcm_sframes_t result;
unsigned long i;
- void __user **bufs __free(kfree) = NULL;
snd_pcm_uframes_t frames;
const struct iovec *iov = iter_iov(from);
@@ -3634,7 +3634,9 @@ static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from)
!frame_aligned(runtime, iov->iov_len))
return -EINVAL;
frames = bytes_to_samples(runtime, iov->iov_len);
- bufs = kmalloc_array(from->nr_segs, sizeof(void *), GFP_KERNEL);
+
+ void __user **bufs __free(kfree) =
+ kmalloc_array(from->nr_segs, sizeof(void *), GFP_KERNEL);
if (bufs == NULL)
return -ENOMEM;
for (i = 0; i < from->nr_segs; ++i) {
@@ -4106,15 +4108,15 @@ static void snd_pcm_hw_convert_to_old_params(struct snd_pcm_hw_params_old *opara
static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params_old __user * _oparams)
{
- struct snd_pcm_hw_params *params __free(kfree) = NULL;
- struct snd_pcm_hw_params_old *oparams __free(kfree) = NULL;
int err;
- params = kmalloc(sizeof(*params), GFP_KERNEL);
+ struct snd_pcm_hw_params *params __free(kfree) =
+ kmalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
- oparams = memdup_user(_oparams, sizeof(*oparams));
+ struct snd_pcm_hw_params_old *oparams __free(kfree) =
+ memdup_user(_oparams, sizeof(*oparams));
if (IS_ERR(oparams))
return PTR_ERR(oparams);
snd_pcm_hw_convert_from_old_params(params, oparams);
@@ -4135,15 +4137,15 @@ static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params_old __user * _oparams)
{
- struct snd_pcm_hw_params *params __free(kfree) = NULL;
- struct snd_pcm_hw_params_old *oparams __free(kfree) = NULL;
int err;
- params = kmalloc(sizeof(*params), GFP_KERNEL);
+ struct snd_pcm_hw_params *params __free(kfree) =
+ kmalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
- oparams = memdup_user(_oparams, sizeof(*oparams));
+ struct snd_pcm_hw_params_old *oparams __free(kfree) =
+ memdup_user(_oparams, sizeof(*oparams));
if (IS_ERR(oparams))
return PTR_ERR(oparams);
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
index 973f057eb731..e0c368bd09cb 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -63,10 +63,10 @@ int __init
snd_seq_oss_create_client(void)
{
int rc;
- struct snd_seq_port_info *port __free(kfree) = NULL;
struct snd_seq_port_callback port_callback;
+ struct snd_seq_port_info *port __free(kfree) =
+ kzalloc(sizeof(*port), GFP_KERNEL);
- port = kzalloc(sizeof(*port), GFP_KERNEL);
if (!port)
return -ENOMEM;
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c
index 023e5d0a4351..2d48c25ff4df 100644
--- a/sound/core/seq/oss/seq_oss_midi.c
+++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -65,11 +65,11 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,
int
snd_seq_oss_midi_lookup_ports(int client)
{
- struct snd_seq_client_info *clinfo __free(kfree) = NULL;
- struct snd_seq_port_info *pinfo __free(kfree) = NULL;
+ struct snd_seq_client_info *clinfo __free(kfree) =
+ kzalloc(sizeof(*clinfo), GFP_KERNEL);
+ struct snd_seq_port_info *pinfo __free(kfree) =
+ kzalloc(sizeof(*pinfo), GFP_KERNEL);
- clinfo = kzalloc(sizeof(*clinfo), GFP_KERNEL);
- pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);
if (!clinfo || !pinfo)
return -ENOMEM;
clinfo->client = -1;
@@ -305,10 +305,10 @@ int
snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
{
int perm;
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
struct snd_seq_port_subscribe subs;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return -ENODEV;
@@ -364,10 +364,10 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
int
snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
struct snd_seq_port_subscribe subs;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return -ENODEV;
guard(mutex)(&mdev->open_mutex);
@@ -399,10 +399,10 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
int
snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
int mode;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return 0;
@@ -422,9 +422,9 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)
void
snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return;
if (!mdev->opened)
@@ -468,9 +468,9 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)
void
snd_seq_oss_midi_get_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_addr *addr)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return;
addr->client = mdev->client;
@@ -485,11 +485,11 @@ int
snd_seq_oss_midi_input(struct snd_seq_event *ev, int direct, void *private_data)
{
struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private_data;
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
if (dp->readq == NULL)
return 0;
- mdev = find_slot(ev->source.client, ev->source.port);
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ find_slot(ev->source.client, ev->source.port);
if (!mdev)
return 0;
if (!(mdev->opened & PERM_READ))
@@ -595,9 +595,9 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq
int
snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, struct snd_seq_event *ev)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return -ENODEV;
if (snd_midi_event_encode_byte(mdev->coder, c, ev)) {
@@ -613,9 +613,9 @@ snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, stru
int
snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info *inf)
{
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mididev(dp, dev);
- mdev = get_mididev(dp, dev);
if (!mdev)
return -ENXIO;
inf->device = dev;
@@ -651,10 +651,9 @@ snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)
snd_iprintf(buf, "\nNumber of MIDI devices: %d\n", max_midi_devs);
for (i = 0; i < max_midi_devs; i++) {
- struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
-
snd_iprintf(buf, "\nmidi %d: ", i);
- mdev = get_mdev(i);
+ struct seq_oss_midi *mdev __free(seq_oss_midi) =
+ get_mdev(i);
if (mdev == NULL) {
snd_iprintf(buf, "*empty*\n");
continue;
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c
index 8c4e5913c7e6..beea37ed942c 100644
--- a/sound/core/seq/oss/seq_oss_synth.c
+++ b/sound/core/seq/oss/seq_oss_synth.c
@@ -368,7 +368,6 @@ reset_channels(struct seq_oss_synthinfo *info)
void
snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev)
{
- struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;
struct seq_oss_synthinfo *info;
info = get_synthinfo_nospec(dp, dev);
@@ -391,7 +390,8 @@ snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev)
return;
}
- rec = get_sdev(dev);
+ struct seq_oss_synth *rec __free(seq_oss_synth) =
+ get_sdev(dev);
if (rec == NULL)
return;
if (rec->oper.reset) {
@@ -415,7 +415,6 @@ int
snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt,
const char __user *buf, int p, int c)
{
- struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;
struct seq_oss_synthinfo *info;
info = get_synthinfo_nospec(dp, dev);
@@ -424,7 +423,9 @@ snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt,
if (info->is_midi)
return 0;
- rec = get_synthdev(dp, dev);
+
+ struct seq_oss_synth *rec __free(seq_oss_synth) =
+ get_synthdev(dp, dev);
if (!rec)
return -ENXIO;
@@ -440,9 +441,9 @@ snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt,
struct seq_oss_synthinfo *
snd_seq_oss_synth_info(struct seq_oss_devinfo *dp, int dev)
{
- struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;
+ struct seq_oss_synth *rec __free(seq_oss_synth) =
+ get_synthdev(dp, dev);
- rec = get_synthdev(dp, dev);
if (rec)
return get_synthinfo_nospec(dp, dev);
return NULL;
@@ -495,13 +496,14 @@ snd_seq_oss_synth_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_event
int
snd_seq_oss_synth_ioctl(struct seq_oss_devinfo *dp, int dev, unsigned int cmd, unsigned long addr)
{
- struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;
struct seq_oss_synthinfo *info;
info = get_synthinfo_nospec(dp, dev);
if (!info || info->is_midi)
return -ENXIO;
- rec = get_synthdev(dp, dev);
+
+ struct seq_oss_synth *rec __free(seq_oss_synth) =
+ get_synthdev(dp, dev);
if (!rec)
return -ENXIO;
if (rec->oper.ioctl == NULL)
@@ -575,10 +577,9 @@ snd_seq_oss_synth_info_read(struct snd_info_buffer *buf)
snd_iprintf(buf, "\nNumber of synth devices: %d\n", max_synth_devs);
for (i = 0; i < max_synth_devs; i++) {
- struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;
-
snd_iprintf(buf, "\nsynth %d: ", i);
- rec = get_sdev(i);
+ struct seq_oss_synth *rec __free(seq_oss_synth) =
+ get_sdev(i);
if (rec == NULL) {
snd_iprintf(buf, "*empty*\n");
continue;
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index f9a6e497f997..75a7a2af9d8c 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -494,9 +494,9 @@ static int check_port_perm(struct snd_seq_client_port *port, unsigned int flags)
*/
static struct snd_seq_client *get_event_dest_client(struct snd_seq_event *event)
{
- struct snd_seq_client *dest __free(snd_seq_client) = NULL;
+ struct snd_seq_client *dest __free(snd_seq_client) =
+ snd_seq_client_use_ptr(event->dest.client);
- dest = snd_seq_client_use_ptr(event->dest.client);
if (dest == NULL)
return NULL;
if (! dest->accept_input)
@@ -565,9 +565,9 @@ static int bounce_error_event(struct snd_seq_client *client,
static int update_timestamp_of_queue(struct snd_seq_event *event,
int queue, int real_time)
{
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(queue);
- q = queueptr(queue);
if (! q)
return 0;
event->queue = queue;
@@ -609,13 +609,13 @@ static int _snd_seq_deliver_single_event(struct snd_seq_client *client,
struct snd_seq_event *event,
int atomic, int hop)
{
- struct snd_seq_client *dest __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *dest_port __free(snd_seq_port) = NULL;
-
- dest = get_event_dest_client(event);
+ struct snd_seq_client *dest __free(snd_seq_client) =
+ get_event_dest_client(event);
if (dest == NULL)
return -ENOENT;
- dest_port = snd_seq_port_use_ptr(dest, event->dest.port);
+
+ struct snd_seq_client_port *dest_port __free(snd_seq_port) =
+ snd_seq_port_use_ptr(dest, event->dest.port);
if (dest_port == NULL)
return -ENOENT;
@@ -672,7 +672,6 @@ static int __deliver_to_subscribers(struct snd_seq_client *client,
struct snd_seq_event *event,
int port, int atomic, int hop)
{
- struct snd_seq_client_port *src_port __free(snd_seq_port) = NULL;
struct snd_seq_subscribers *subs;
int err, result = 0, num_ev = 0;
union __snd_seq_event event_saved;
@@ -681,7 +680,9 @@ static int __deliver_to_subscribers(struct snd_seq_client *client,
if (port < 0)
return 0;
- src_port = snd_seq_port_use_ptr(client, port);
+
+ struct snd_seq_client_port *src_port __free(snd_seq_port) =
+ snd_seq_port_use_ptr(client, port);
if (!src_port)
return 0;
@@ -801,13 +802,13 @@ static int snd_seq_deliver_event(struct snd_seq_client *client, struct snd_seq_e
*/
int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)
{
- struct snd_seq_client *client __free(snd_seq_client) = NULL;
int result;
if (snd_BUG_ON(!cell))
return -EINVAL;
- client = snd_seq_client_use_ptr(cell->event.source.client);
+ struct snd_seq_client *client __free(snd_seq_client) =
+ snd_seq_client_use_ptr(cell->event.source.client);
if (client == NULL) {
snd_seq_cell_free(cell); /* release this cell */
return -EINVAL;
@@ -1154,10 +1155,10 @@ static int snd_seq_ioctl_system_info(struct snd_seq_client *client, void *arg)
static int snd_seq_ioctl_running_mode(struct snd_seq_client *client, void *arg)
{
struct snd_seq_running_info *info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
-
/* requested client number */
- cptr = client_load_and_use_ptr(info->client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(info->client);
+
if (cptr == NULL)
return -ENOENT; /* don't change !!! */
@@ -1207,10 +1208,10 @@ static int snd_seq_ioctl_get_client_info(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_client_info *client_info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
-
/* requested client number */
- cptr = client_load_and_use_ptr(client_info->client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(client_info->client);
+
if (cptr == NULL)
return -ENOENT; /* don't change !!! */
@@ -1344,14 +1345,14 @@ static int snd_seq_ioctl_delete_port(struct snd_seq_client *client, void *arg)
static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client, void *arg)
{
struct snd_seq_port_info *info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *port __free(snd_seq_port) = NULL;
- cptr = client_load_and_use_ptr(info->addr.client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(info->addr.client);
if (cptr == NULL)
return -ENXIO;
- port = snd_seq_port_use_ptr(cptr, info->addr.port);
+ struct snd_seq_client_port *port __free(snd_seq_port) =
+ snd_seq_port_use_ptr(cptr, info->addr.port);
if (port == NULL)
return -ENOENT; /* don't change */
@@ -1367,11 +1368,12 @@ static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client, void *arg)
static int snd_seq_ioctl_set_port_info(struct snd_seq_client *client, void *arg)
{
struct snd_seq_port_info *info = arg;
- struct snd_seq_client_port *port __free(snd_seq_port) = NULL;
if (info->addr.client != client->number) /* only set our own ports ! */
return -EPERM;
- port = snd_seq_port_use_ptr(client, info->addr.port);
+
+ struct snd_seq_client_port *port __free(snd_seq_port) =
+ snd_seq_port_use_ptr(client, info->addr.port);
if (port) {
snd_seq_set_port_info(port, info);
/* notify the change */
@@ -1444,22 +1446,22 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_port_subscribe *subs = arg;
- struct snd_seq_client *receiver __free(snd_seq_client) = NULL;
- struct snd_seq_client *sender __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;
- struct snd_seq_client_port *dport __free(snd_seq_port) = NULL;
int result;
- receiver = client_load_and_use_ptr(subs->dest.client);
+ struct snd_seq_client *receiver __free(snd_seq_client) =
+ client_load_and_use_ptr(subs->dest.client);
if (!receiver)
return -EINVAL;
- sender = client_load_and_use_ptr(subs->sender.client);
+ struct snd_seq_client *sender __free(snd_seq_client) =
+ client_load_and_use_ptr(subs->sender.client);
if (!sender)
return -EINVAL;
- sport = snd_seq_port_use_ptr(sender, subs->sender.port);
+ struct snd_seq_client_port *sport __free(snd_seq_port) =
+ snd_seq_port_use_ptr(sender, subs->sender.port);
if (!sport)
return -EINVAL;
- dport = snd_seq_port_use_ptr(receiver, subs->dest.port);
+ struct snd_seq_client_port *dport __free(snd_seq_port) =
+ snd_seq_port_use_ptr(receiver, subs->dest.port);
if (!dport)
return -EINVAL;
@@ -1483,22 +1485,22 @@ static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_port_subscribe *subs = arg;
- struct snd_seq_client *receiver __free(snd_seq_client) = NULL;
- struct snd_seq_client *sender __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;
- struct snd_seq_client_port *dport __free(snd_seq_port) = NULL;
int result;
- receiver = snd_seq_client_use_ptr(subs->dest.client);
+ struct snd_seq_client *receiver __free(snd_seq_client) =
+ snd_seq_client_use_ptr(subs->dest.client);
if (!receiver)
return -ENXIO;
- sender = snd_seq_client_use_ptr(subs->sender.client);
+ struct snd_seq_client *sender __free(snd_seq_client) =
+ snd_seq_client_use_ptr(subs->sender.client);
if (!sender)
return -ENXIO;
- sport = snd_seq_port_use_ptr(sender, subs->sender.port);
+ struct snd_seq_client_port *sport __free(snd_seq_port) =
+ snd_seq_port_use_ptr(sender, subs->sender.port);
if (!sport)
return -ENXIO;
- dport = snd_seq_port_use_ptr(receiver, subs->dest.port);
+ struct snd_seq_client_port *dport __free(snd_seq_port) =
+ snd_seq_port_use_ptr(receiver, subs->dest.port);
if (!dport)
return -ENXIO;
@@ -1518,9 +1520,9 @@ static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client,
static int snd_seq_ioctl_create_queue(struct snd_seq_client *client, void *arg)
{
struct snd_seq_queue_info *info = arg;
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ snd_seq_queue_alloc(client->number, info->locked, info->flags);
- q = snd_seq_queue_alloc(client->number, info->locked, info->flags);
if (IS_ERR(q))
return PTR_ERR(q);
@@ -1549,9 +1551,9 @@ static int snd_seq_ioctl_get_queue_info(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_info *info = arg;
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(info->queue);
- q = queueptr(info->queue);
if (q == NULL)
return -EINVAL;
@@ -1569,7 +1571,6 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_info *info = arg;
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
if (info->owner != client->number)
return -EINVAL;
@@ -1584,7 +1585,8 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client,
return -EPERM;
}
- q = queueptr(info->queue);
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(info->queue);
if (! q)
return -EINVAL;
if (q->owner != client->number)
@@ -1599,9 +1601,9 @@ static int snd_seq_ioctl_get_named_queue(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_info *info = arg;
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ snd_seq_queue_find_name(info->name);
- q = snd_seq_queue_find_name(info->name);
if (q == NULL)
return -EINVAL;
info->queue = q->queue;
@@ -1616,10 +1618,10 @@ static int snd_seq_ioctl_get_queue_status(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_status *status = arg;
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
struct snd_seq_timer *tmr;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(status->queue);
- queue = queueptr(status->queue);
if (queue == NULL)
return -EINVAL;
memset(status, 0, sizeof(*status));
@@ -1644,10 +1646,10 @@ static int snd_seq_ioctl_get_queue_tempo(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_tempo *tempo = arg;
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
struct snd_seq_timer *tmr;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(tempo->queue);
- queue = queueptr(tempo->queue);
if (queue == NULL)
return -EINVAL;
memset(tempo, 0, sizeof(*tempo));
@@ -1693,10 +1695,10 @@ static int snd_seq_ioctl_get_queue_timer(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_queue_timer *timer = arg;
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
struct snd_seq_timer *tmr;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(timer->queue);
- queue = queueptr(timer->queue);
if (queue == NULL)
return -EINVAL;
@@ -1726,10 +1728,10 @@ static int snd_seq_ioctl_set_queue_timer(struct snd_seq_client *client,
return -EINVAL;
if (snd_seq_queue_check_access(timer->queue, client->number)) {
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
struct snd_seq_timer *tmr;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(timer->queue);
- q = queueptr(timer->queue);
if (q == NULL)
return -ENXIO;
guard(mutex)(&q->timer_mutex);
@@ -1788,9 +1790,9 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_client_pool *info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(info->client);
- cptr = client_load_and_use_ptr(info->client);
if (cptr == NULL)
return -ENOENT;
memset(info, 0, sizeof(*info));
@@ -1888,13 +1890,13 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_port_subscribe *subs = arg;
- struct snd_seq_client *sender __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;
- sender = client_load_and_use_ptr(subs->sender.client);
+ struct snd_seq_client *sender __free(snd_seq_client) =
+ client_load_and_use_ptr(subs->sender.client);
if (!sender)
return -EINVAL;
- sport = snd_seq_port_use_ptr(sender, subs->sender.port);
+ struct snd_seq_client_port *sport __free(snd_seq_port) =
+ snd_seq_port_use_ptr(sender, subs->sender.port);
if (!sport)
return -EINVAL;
return snd_seq_port_get_subscription(&sport->c_src, &subs->dest, subs);
@@ -1907,16 +1909,16 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
static int snd_seq_ioctl_query_subs(struct snd_seq_client *client, void *arg)
{
struct snd_seq_query_subs *subs = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *port __free(snd_seq_port) = NULL;
struct snd_seq_port_subs_info *group;
struct list_head *p;
int i;
- cptr = client_load_and_use_ptr(subs->root.client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(subs->root.client);
if (!cptr)
return -ENXIO;
- port = snd_seq_port_use_ptr(cptr, subs->root.port);
+ struct snd_seq_client_port *port __free(snd_seq_port) =
+ snd_seq_port_use_ptr(cptr, subs->root.port);
if (!port)
return -ENXIO;
@@ -1963,7 +1965,6 @@ static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_client_info *info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
/* search for next client */
if (info->client < INT_MAX)
@@ -1971,7 +1972,8 @@ static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client,
if (info->client < 0)
info->client = 0;
for (; info->client < SNDRV_SEQ_MAX_CLIENTS; info->client++) {
- cptr = client_load_and_use_ptr(info->client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(info->client);
if (cptr) {
get_client_info(cptr, info);
return 0; /* found */
@@ -1987,16 +1989,16 @@ static int snd_seq_ioctl_query_next_port(struct snd_seq_client *client,
void *arg)
{
struct snd_seq_port_info *info = arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *port __free(snd_seq_port) = NULL;
- cptr = client_load_and_use_ptr(info->addr.client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(info->addr.client);
if (cptr == NULL)
return -ENXIO;
/* search for next port */
info->addr.port++;
- port = snd_seq_port_query_nearest(cptr, info);
+ struct snd_seq_client_port *port __free(snd_seq_port) =
+ snd_seq_port_query_nearest(cptr, info);
if (port == NULL)
return -ENOENT;
@@ -2067,7 +2069,6 @@ static int snd_seq_ioctl_client_ump_info(struct snd_seq_client *caller,
{
struct snd_seq_client_ump_info __user *argp =
(struct snd_seq_client_ump_info __user *)arg;
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
int client, type, err = 0;
size_t size;
void *p;
@@ -2083,7 +2084,9 @@ static int snd_seq_ioctl_client_ump_info(struct snd_seq_client *caller,
size = sizeof(struct snd_ump_endpoint_info);
else
size = sizeof(struct snd_ump_block_info);
- cptr = client_load_and_use_ptr(client);
+
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(client);
if (!cptr)
return -ENOENT;
@@ -2342,8 +2345,6 @@ EXPORT_SYMBOL(snd_seq_delete_kernel_client);
int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev,
struct file *file, bool blocking)
{
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
-
if (snd_BUG_ON(!ev))
return -EINVAL;
@@ -2360,7 +2361,8 @@ int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev,
if (check_event_type_and_length(ev))
return -EINVAL;
- cptr = client_load_and_use_ptr(client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ client_load_and_use_ptr(client);
if (cptr == NULL)
return -EINVAL;
@@ -2385,8 +2387,6 @@ EXPORT_SYMBOL(snd_seq_kernel_client_enqueue);
int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event * ev,
int atomic, int hop)
{
- struct snd_seq_client *cptr __free(snd_seq_client) = NULL;
-
if (snd_BUG_ON(!ev))
return -EINVAL;
@@ -2397,7 +2397,8 @@ int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event * ev,
if (check_event_type_and_length(ev))
return -EINVAL;
- cptr = snd_seq_client_use_ptr(client);
+ struct snd_seq_client *cptr __free(snd_seq_client) =
+ snd_seq_client_use_ptr(client);
if (cptr == NULL)
return -EINVAL;
@@ -2450,9 +2451,9 @@ EXPORT_SYMBOL(snd_seq_kernel_client_ctl);
/* a similar like above but taking locks; used only from OSS sequencer layer */
int snd_seq_kernel_client_ioctl(int clientid, unsigned int cmd, void *arg)
{
- struct snd_seq_client *client __free(snd_seq_client) = NULL;
+ struct snd_seq_client *client __free(snd_seq_client) =
+ client_load_and_use_ptr(clientid);
- client = client_load_and_use_ptr(clientid);
if (!client)
return -ENXIO;
guard(mutex)(&client->ioctl_mutex);
@@ -2597,9 +2598,9 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,
/* list the client table */
for (c = 0; c < SNDRV_SEQ_MAX_CLIENTS; c++) {
- struct snd_seq_client *client __free(snd_seq_client) = NULL;
+ struct snd_seq_client *client __free(snd_seq_client) =
+ client_load_and_use_ptr(c);
- client = client_load_and_use_ptr(c);
if (client == NULL)
continue;
if (client->type == NO_CLIENT)
diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c
index 643af4c1e838..260428747e33 100644
--- a/sound/core/seq/seq_compat.c
+++ b/sound/core/seq/seq_compat.c
@@ -31,10 +31,10 @@ struct snd_seq_port_info32 {
static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned int cmd,
struct snd_seq_port_info32 __user *data32)
{
- struct snd_seq_port_info *data __free(kfree) = NULL;
int err;
+ struct snd_seq_port_info *data __free(kfree) =
+ kmalloc(sizeof(*data), GFP_KERNEL);
- data = kmalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 581e138a3115..73dbef8fb2ac 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -270,8 +270,6 @@ snd_seq_midisynth_probe(struct device *_dev)
struct snd_seq_device *dev = to_seq_dev(_dev);
struct seq_midisynth_client *client;
struct seq_midisynth *msynth, *ms;
- struct snd_seq_port_info *port __free(kfree) = NULL;
- struct snd_rawmidi_info *info __free(kfree) = NULL;
struct snd_rawmidi *rmidi = dev->private_data;
int newclient = 0;
unsigned int p, ports;
@@ -282,7 +280,9 @@ snd_seq_midisynth_probe(struct device *_dev)
if (snd_BUG_ON(!card || device < 0 || device >= SNDRV_RAWMIDI_DEVICES))
return -EINVAL;
- info = kmalloc(sizeof(*info), GFP_KERNEL);
+
+ struct snd_rawmidi_info *info __free(kfree) =
+ kmalloc(sizeof(*info), GFP_KERNEL);
if (! info)
return -ENOMEM;
info->device = device;
@@ -320,7 +320,9 @@ snd_seq_midisynth_probe(struct device *_dev)
}
msynth = kcalloc(ports, sizeof(struct seq_midisynth), GFP_KERNEL);
- port = kmalloc(sizeof(*port), GFP_KERNEL);
+
+ struct snd_seq_port_info *port __free(kfree) =
+ kmalloc(sizeof(*port), GFP_KERNEL);
if (msynth == NULL || port == NULL)
goto __nomem;
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index 40fa379847e5..bbec34bba4f9 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -211,14 +211,13 @@ static void clear_subscriber_list(struct snd_seq_client *client,
list_for_each_safe(p, n, &grp->list_head) {
struct snd_seq_subscribers *subs;
- struct snd_seq_client *c __free(snd_seq_client) = NULL;
- struct snd_seq_client_port *aport __free(snd_seq_port) = NULL;
subs = get_subscriber(p, is_src);
- if (is_src)
- aport = get_client_port(&subs->info.dest, &c);
- else
- aport = get_client_port(&subs->info.sender, &c);
+ struct snd_seq_client *c __free(snd_seq_client) = NULL;
+ struct snd_seq_client_port *aport __free(snd_seq_port) =
+ is_src ?
+ get_client_port(&subs->info.dest, &c) :
+ get_client_port(&subs->info.sender, &c);
delete_and_unsubscribe_port(client, port, subs, is_src, false);
if (!aport) {
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index f5c0e401c8ae..c0c5e1424c5a 100644
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -211,8 +211,9 @@ struct snd_seq_queue *snd_seq_queue_find_name(char *name)
int i;
for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
- q = queueptr(i);
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(i);
+
if (q) {
if (strncmp(q->name, name, sizeof(q->name)) == 0)
return no_free_ptr(q);
@@ -285,12 +286,13 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop)
int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop)
{
int dest, err;
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
if (snd_BUG_ON(!cell))
return -EINVAL;
dest = cell->event.queue; /* destination queue */
- q = queueptr(dest);
+
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(dest);
if (q == NULL)
return -EINVAL;
/* handle relative time stamps, convert them into absolute */
@@ -403,10 +405,10 @@ int snd_seq_queue_set_owner(int queueid, int client, int locked)
int snd_seq_queue_timer_open(int queueid)
{
int result = 0;
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
struct snd_seq_timer *tmr;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(queueid);
- queue = queueptr(queueid);
if (queue == NULL)
return -EINVAL;
tmr = queue->timer;
@@ -423,10 +425,10 @@ int snd_seq_queue_timer_open(int queueid)
*/
int snd_seq_queue_timer_close(int queueid)
{
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
int result = 0;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(queueid);
- queue = queueptr(queueid);
if (queue == NULL)
return -EINVAL;
snd_seq_timer_close(queue);
@@ -479,9 +481,9 @@ static void queue_use(struct snd_seq_queue *queue, int client, int use)
*/
int snd_seq_queue_use(int queueid, int client, int use)
{
- struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *queue __free(snd_seq_queue) =
+ queueptr(queueid);
- queue = queueptr(queueid);
if (queue == NULL)
return -EINVAL;
guard(mutex)(&queue->timer_mutex);
@@ -496,9 +498,9 @@ int snd_seq_queue_use(int queueid, int client, int use)
*/
int snd_seq_queue_is_used(int queueid, int client)
{
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(queueid);
- q = queueptr(queueid);
if (q == NULL)
return -EINVAL; /* invalid queue */
return test_bit(client, q->clients_bitmap) ? 1 : 0;
@@ -642,11 +644,11 @@ static void snd_seq_queue_process_event(struct snd_seq_queue *q,
*/
int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop)
{
- struct snd_seq_queue *q __free(snd_seq_queue) = NULL;
-
if (snd_BUG_ON(!ev))
return -EINVAL;
- q = queueptr(ev->data.queue.queue);
+
+ struct snd_seq_queue *q __free(snd_seq_queue) =
+ queueptr(ev->data.queue.queue);
if (q == NULL)
return -EINVAL;
diff --git a/sound/core/seq/seq_ump_client.c b/sound/core/seq/seq_ump_client.c
index 27247babb16d..14b82a31eb19 100644
--- a/sound/core/seq/seq_ump_client.c
+++ b/sound/core/seq/seq_ump_client.c
@@ -214,13 +214,13 @@ static bool skip_group(struct seq_ump_client *client, struct snd_ump_group *grou
static int seq_ump_group_init(struct seq_ump_client *client, int group_index)
{
struct snd_ump_group *group = &client->ump->groups[group_index];
- struct snd_seq_port_info *port __free(kfree) = NULL;
struct snd_seq_port_callback pcallbacks;
if (skip_group(client, group))
return 0;
- port = kzalloc(sizeof(*port), GFP_KERNEL);
+ struct snd_seq_port_info *port __free(kfree) =
+ kzalloc(sizeof(*port), GFP_KERNEL);
if (!port)
return -ENOMEM;
@@ -243,12 +243,12 @@ static int seq_ump_group_init(struct seq_ump_client *client, int group_index)
/* update the sequencer ports; called from notify_fb_change callback */
static void update_port_infos(struct seq_ump_client *client)
{
- struct snd_seq_port_info *old __free(kfree) = NULL;
- struct snd_seq_port_info *new __free(kfree) = NULL;
int i, err;
- old = kzalloc(sizeof(*old), GFP_KERNEL);
- new = kzalloc(sizeof(*new), GFP_KERNEL);
+ struct snd_seq_port_info *old __free(kfree) =
+ kzalloc(sizeof(*old), GFP_KERNEL);
+ struct snd_seq_port_info *new __free(kfree) =
+ kzalloc(sizeof(*new), GFP_KERNEL);
if (!old || !new)
return;
@@ -278,12 +278,12 @@ static void update_port_infos(struct seq_ump_client *client)
/* create a UMP Endpoint port */
static int create_ump_endpoint_port(struct seq_ump_client *client)
{
- struct snd_seq_port_info *port __free(kfree) = NULL;
struct snd_seq_port_callback pcallbacks;
unsigned int rawmidi_info = client->ump->core.info_flags;
int err;
- port = kzalloc(sizeof(*port), GFP_KERNEL);
+ struct snd_seq_port_info *port __free(kfree) =
+ kzalloc(sizeof(*port), GFP_KERNEL);
if (!port)
return -ENOMEM;
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c
index 9e7fd4993a10..574493fbd50d 100644
--- a/sound/core/seq/seq_virmidi.c
+++ b/sound/core/seq/seq_virmidi.c
@@ -361,13 +361,13 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)
{
int client;
struct snd_seq_port_callback pcallbacks;
- struct snd_seq_port_info *pinfo __free(kfree) = NULL;
int err;
if (rdev->client >= 0)
return 0;
- pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);
+ struct snd_seq_port_info *pinfo __free(kfree) =
+ kzalloc(sizeof(*pinfo), GFP_KERNEL);
if (!pinfo)
return -ENOMEM;
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d9fff5c87613..9a4a1748ff80 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1614,12 +1614,12 @@ static int snd_timer_user_next_device(struct snd_timer_id __user *_tid)
static int snd_timer_user_ginfo(struct file *file,
struct snd_timer_ginfo __user *_ginfo)
{
- struct snd_timer_ginfo *ginfo __free(kfree) = NULL;
struct snd_timer_id tid;
struct snd_timer *t;
struct list_head *p;
+ struct snd_timer_ginfo *ginfo __free(kfree) =
+ memdup_user(_ginfo, sizeof(*ginfo));
- ginfo = memdup_user(_ginfo, sizeof(*ginfo));
if (IS_ERR(ginfo))
return PTR_ERR(ginfo);
@@ -1756,7 +1756,6 @@ static int snd_timer_user_info(struct file *file,
struct snd_timer_info __user *_info)
{
struct snd_timer_user *tu;
- struct snd_timer_info *info __free(kfree) = NULL;
struct snd_timer *t;
tu = file->private_data;
@@ -1766,7 +1765,8 @@ static int snd_timer_user_info(struct file *file,
if (!t)
return -EBADFD;
- info = kzalloc(sizeof(*info), GFP_KERNEL);
+ struct snd_timer_info *info __free(kfree) =
+ kzalloc(sizeof(*info), GFP_KERNEL);
if (! info)
return -ENOMEM;
info->card = t->card ? t->card->number : -1;
@@ -2192,10 +2192,10 @@ static int snd_utimer_ioctl_create(struct file *file,
struct snd_timer_uinfo __user *_utimer_info)
{
struct snd_utimer *utimer;
- struct snd_timer_uinfo *utimer_info __free(kfree) = NULL;
int err, timer_fd;
+ struct snd_timer_uinfo *utimer_info __free(kfree) =
+ memdup_user(_utimer_info, sizeof(*utimer_info));
- utimer_info = memdup_user(_utimer_info, sizeof(*utimer_info));
if (IS_ERR(utimer_info))
return PTR_ERR(utimer_info);
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index c657659b236c..76cc64245f5d 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -56,10 +56,10 @@ struct link_follower {
static int follower_update(struct link_follower *follower)
{
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
int err, ch;
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
if (!uctl)
return -ENOMEM;
uctl->id = follower->follower.id;
@@ -74,7 +74,6 @@ static int follower_update(struct link_follower *follower)
/* get the follower ctl info and save the initial values */
static int follower_init(struct link_follower *follower)
{
- struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;
int err;
if (follower->info.count) {
@@ -84,7 +83,8 @@ static int follower_init(struct link_follower *follower)
return 0;
}
- uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL);
+ struct snd_ctl_elem_info *uinfo __free(kfree) =
+ kmalloc(sizeof(*uinfo), GFP_KERNEL);
if (!uinfo)
return -ENOMEM;
uinfo->id = follower->follower.id;
@@ -341,9 +341,9 @@ static int master_get(struct snd_kcontrol *kcontrol,
static int sync_followers(struct link_master *master, int old_val, int new_val)
{
struct link_follower *follower;
- struct snd_ctl_elem_value *uval __free(kfree) = NULL;
+ struct snd_ctl_elem_value *uval __free(kfree) =
+ kmalloc(sizeof(*uval), GFP_KERNEL);
- uval = kmalloc(sizeof(*uval), GFP_KERNEL);
if (!uval)
return -ENOMEM;
list_for_each_entry(follower, &master->followers, list) {
diff --git a/sound/hda/codecs/conexant.c b/sound/hda/codecs/conexant.c
index d6fba7460301..0c517378a6d2 100644
--- a/sound/hda/codecs/conexant.c
+++ b/sound/hda/codecs/conexant.c
@@ -299,6 +299,7 @@ enum {
CXT_PINCFG_SWS_JS201D,
CXT_PINCFG_TOP_SPEAKER,
CXT_FIXUP_HP_A_U,
+ CXT_FIXUP_ACER_SWIFT_HP,
};
/* for hda_fixup_thinkpad_acpi() */
@@ -1024,6 +1025,14 @@ static const struct hda_fixup cxt_fixups[] = {
.type = HDA_FIXUP_FUNC,
.v.func = cxt_fixup_hp_a_u,
},
+ [CXT_FIXUP_ACER_SWIFT_HP] = {
+ .type = HDA_FIXUP_PINS,
+ .v.pins = (const struct hda_pintbl[]) {
+ { 0x16, 0x0321403f }, /* Headphone */
+ { 0x19, 0x40f001f0 }, /* Mic */
+ { }
+ },
+ },
};
static const struct hda_quirk cxt5045_fixups[] = {
@@ -1073,6 +1082,7 @@ static const struct hda_quirk cxt5066_fixups[] = {
SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC),
SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC),
+ SND_PCI_QUIRK(0x1025, 0x136d, "Acer Swift SF314", CXT_FIXUP_ACER_SWIFT_HP),
SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK),
SND_PCI_QUIRK(0x103c, 0x807C, "HP EliteBook 820 G3", CXT_FIXUP_HP_DOCK),
SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),
diff --git a/sound/hda/codecs/generic.c b/sound/hda/codecs/generic.c
index 7bcf9aef8275..443500a3518f 100644
--- a/sound/hda/codecs/generic.c
+++ b/sound/hda/codecs/generic.c
@@ -1984,15 +1984,15 @@ static int parse_output_paths(struct hda_codec *codec)
{
struct hda_gen_spec *spec = codec->spec;
struct auto_pin_cfg *cfg = &spec->autocfg;
- struct auto_pin_cfg *best_cfg __free(kfree) = NULL;
unsigned int val;
int best_badness = INT_MAX;
int badness;
bool fill_hardwired = true, fill_mio_first = true;
bool best_wired = true, best_mio = true;
bool hp_spk_swapped = false;
+ struct auto_pin_cfg *best_cfg __free(kfree) =
+ kmalloc(sizeof(*best_cfg), GFP_KERNEL);
- best_cfg = kmalloc(sizeof(*best_cfg), GFP_KERNEL);
if (!best_cfg)
return -ENOMEM;
*best_cfg = *cfg;
diff --git a/sound/hda/codecs/realtek/alc269.c b/sound/hda/codecs/realtek/alc269.c
index b66965a52107..15203c5855eb 100644
--- a/sound/hda/codecs/realtek/alc269.c
+++ b/sound/hda/codecs/realtek/alc269.c
@@ -2916,7 +2916,6 @@ static void find_cirrus_companion_amps(struct hda_codec *cdc)
{
struct device *dev = hda_codec_dev(cdc);
struct acpi_device *adev;
- struct fwnode_handle *fwnode __free(fwnode_handle) = NULL;
const char *bus = NULL;
static const struct {
const char *hid;
@@ -2946,7 +2945,8 @@ static void find_cirrus_companion_amps(struct hda_codec *cdc)
bus = "spi";
}
- fwnode = fwnode_handle_get(acpi_fwnode_handle(adev));
+ struct fwnode_handle *fwnode __free(fwnode_handle) =
+ fwnode_handle_get(acpi_fwnode_handle(adev));
acpi_dev_put(adev);
if (!bus) {
@@ -7056,7 +7056,9 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x144d, 0xc872, "Samsung Galaxy Book2 Pro (NP950XEE)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),
SND_PCI_QUIRK(0x144d, 0xc886, "Samsung Galaxy Book3 Pro (NP964XFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
SND_PCI_QUIRK(0x144d, 0xc1ca, "Samsung Galaxy Book3 Pro 360 (NP960QFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
+ SND_PCI_QUIRK(0x144d, 0xc1cb, "Samsung Galaxy Book3 Pro 360 (NP965QFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
SND_PCI_QUIRK(0x144d, 0xc1cc, "Samsung Galaxy Book3 Ultra (NT960XFH)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
+ SND_PCI_QUIRK(0x1458, 0x900e, "Gigabyte G5 KF5 (2023)", ALC2XX_FIXUP_HEADSET_MIC),
SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
diff --git a/sound/hda/codecs/realtek/realtek.c b/sound/hda/codecs/realtek/realtek.c
index ca377a5adadb..efe20b450529 100644
--- a/sound/hda/codecs/realtek/realtek.c
+++ b/sound/hda/codecs/realtek/realtek.c
@@ -215,12 +215,13 @@ void alc_update_knob_master(struct hda_codec *codec,
{
unsigned int val;
struct snd_kcontrol *kctl;
- struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
kctl = snd_hda_find_mixer_ctl(codec, "Master Playback Volume");
if (!kctl)
return;
- uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
+
+ struct snd_ctl_elem_value *uctl __free(kfree) =
+ kzalloc(sizeof(*uctl), GFP_KERNEL);
if (!uctl)
return;
val = snd_hda_codec_read(codec, jack->nid, 0,
diff --git a/sound/hda/common/codec.c b/sound/hda/common/codec.c
index c6d44168c7f9..ffe7c69d5a32 100644
--- a/sound/hda/common/codec.c
+++ b/sound/hda/common/codec.c
@@ -1854,9 +1854,9 @@ static int check_follower_present(struct hda_codec *codec,
/* call kctl->put with the given value(s) */
static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)
{
- struct snd_ctl_elem_value *ucontrol __free(kfree) = NULL;
+ struct snd_ctl_elem_value *ucontrol __free(kfree) =
+ kzalloc(sizeof(*ucontrol), GFP_KERNEL);
- ucontrol = kzalloc(sizeof(*ucontrol), GFP_KERNEL);
if (!ucontrol)
return -ENOMEM;
ucontrol->value.integer.value[0] = val;
diff --git a/sound/hda/common/hda_jack.h b/sound/hda/common/hda_jack.h
index ff7d289c034b..e9b9970c59ed 100644
--- a/sound/hda/common/hda_jack.h
+++ b/sound/hda/common/hda_jack.h
@@ -82,10 +82,10 @@ snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid,
int dev_id, hda_jack_callback_fn func);
/**
- * snd_hda_jack_detect_enable - enable the jack-detection
+ * snd_hda_jack_detect_enable_callback - enable the jack-detection
* @codec: the HDA codec
* @nid: pin NID to enable
- * @func: callback function to register
+ * @cb: callback function to register
*
* In the case of error, the return value will be a pointer embedded with
* errno. Check and handle the return value appropriately with standard
diff --git a/sound/hda/common/hda_local.h b/sound/hda/common/hda_local.h
index a7e53277a0fe..ab423f1cef54 100644
--- a/sound/hda/common/hda_local.h
+++ b/sound/hda/common/hda_local.h
@@ -424,7 +424,7 @@ int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,
unsigned int val, bool cached);
/**
- * _snd_hda_set_pin_ctl - Set a pin-control value safely
+ * snd_hda_set_pin_ctl - Set a pin-control value safely
* @codec: the codec instance
* @pin: the pin NID to set the control
* @val: the pin-control value (AC_PINCTL_* bits)
diff --git a/sound/hda/common/sysfs.c b/sound/hda/common/sysfs.c
index f8c8483fd5e5..bedf10b30885 100644
--- a/sound/hda/common/sysfs.c
+++ b/sound/hda/common/sysfs.c
@@ -299,7 +299,6 @@ static void remove_trail_spaces(char *str)
static int parse_hints(struct hda_codec *codec, const char *buf)
{
- char *key __free(kfree) = NULL;
char *val;
struct hda_hint *hint;
@@ -308,7 +307,9 @@ static int parse_hints(struct hda_codec *codec, const char *buf)
return 0;
if (*buf == '=')
return -EINVAL;
- key = kstrndup_noeol(buf, 1024);
+
+ char *key __free(kfree) =
+ kstrndup_noeol(buf, 1024);
if (!key)
return -ENOMEM;
/* extract key and val */
diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index 8f37bfb974ae..96b1a85c26aa 100644
--- a/sound/soc/codecs/aw88261.c
+++ b/sound/soc/codecs/aw88261.c
@@ -423,9 +423,10 @@ static int aw88261_dev_reg_update(struct aw88261 *aw88261,
if (ret)
break;
+ /* keep all three bits from current hw status */
read_val &= (~AW88261_AMPPD_MASK) | (~AW88261_PWDN_MASK) |
(~AW88261_HMUTE_MASK);
- reg_val &= (AW88261_AMPPD_MASK | AW88261_PWDN_MASK | AW88261_HMUTE_MASK);
+ reg_val &= (AW88261_AMPPD_MASK & AW88261_PWDN_MASK & AW88261_HMUTE_MASK);
reg_val |= read_val;
/* enable uls hmute */
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 77dfc83a3c01..d8cdd37e9112 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -528,7 +528,7 @@ static int cs4271_soc_resume(struct snd_soc_component *component)
ret = clk_prepare_enable(cs4271->clk);
if (ret) {
dev_err(component->dev, "Failed to enable clk: %d\n", ret);
- return ret;
+ goto err_disable_regulators;
}
/* Do a proper reset after power up */
@@ -537,15 +537,21 @@ static int cs4271_soc_resume(struct snd_soc_component *component)
/* Restore codec state */
ret = regcache_sync(cs4271->regmap);
if (ret < 0)
- return ret;
+ goto err_disable_clk;
/* then disable the power-down bit */
ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
CS4271_MODE2_PDN, 0);
if (ret < 0)
- return ret;
+ goto err_disable_clk;
return 0;
+
+err_disable_clk:
+ clk_disable_unprepare(cs4271->clk);
+err_disable_regulators:
+ regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);
+ return ret;
}
#else
#define cs4271_soc_suspend NULL
diff --git a/sound/soc/codecs/nau8821.c b/sound/soc/codecs/nau8821.c
index 3beb3c44dc2c..58d2d5e77c8f 100644
--- a/sound/soc/codecs/nau8821.c
+++ b/sound/soc/codecs/nau8821.c
@@ -1264,6 +1264,14 @@ static int nau8821_component_probe(struct snd_soc_component *component)
return 0;
}
+static void nau8821_component_remove(struct snd_soc_component *component)
+{
+ struct nau8821 *nau8821 = snd_soc_component_get_drvdata(component);
+
+ if (nau8821->jdet_active)
+ cancel_delayed_work_sync(&nau8821->jdet_work);
+};
+
/**
* nau8821_calc_fll_param - Calculate FLL parameters.
* @fll_in: external clock provided to codec.
@@ -1597,6 +1605,10 @@ static int __maybe_unused nau8821_suspend(struct snd_soc_component *component)
if (nau8821->irq)
disable_irq(nau8821->irq);
+
+ if (nau8821->jdet_active)
+ cancel_delayed_work_sync(&nau8821->jdet_work);
+
snd_soc_dapm_force_bias_level(nau8821->dapm, SND_SOC_BIAS_OFF);
/* Power down codec power; don't support button wakeup */
snd_soc_dapm_disable_pin(nau8821->dapm, "MICBIAS");
@@ -1621,6 +1633,7 @@ static int __maybe_unused nau8821_resume(struct snd_soc_component *component)
static const struct snd_soc_component_driver nau8821_component_driver = {
.probe = nau8821_component_probe,
+ .remove = nau8821_component_remove,
.set_sysclk = nau8821_set_sysclk,
.set_pll = nau8821_set_fll,
.set_bias_level = nau8821_set_bias_level,
@@ -1655,8 +1668,13 @@ int nau8821_enable_jack_detect(struct snd_soc_component *component,
int ret;
nau8821->jack = jack;
+
+ if (nau8821->jdet_active)
+ return 0;
+
/* Initiate jack detection work queue */
INIT_DELAYED_WORK(&nau8821->jdet_work, nau8821_jdet_work);
+ nau8821->jdet_active = true;
ret = devm_request_threaded_irq(nau8821->dev, nau8821->irq, NULL,
nau8821_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
diff --git a/sound/soc/codecs/nau8821.h b/sound/soc/codecs/nau8821.h
index 88602923780d..f9d7cd8cbd21 100644
--- a/sound/soc/codecs/nau8821.h
+++ b/sound/soc/codecs/nau8821.h
@@ -562,6 +562,7 @@ struct nau8821 {
struct snd_soc_dapm_context *dapm;
struct snd_soc_jack *jack;
struct delayed_work jdet_work;
+ bool jdet_active;
int irq;
int clk_id;
int micbias_voltage;
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index 5de93f458b56..a268fb81a2f8 100644
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -223,13 +223,10 @@ static int fsl_xcvr_mode_put(struct snd_kcontrol *kcontrol,
xcvr->mode = snd_soc_enum_item_to_val(e, item[0]);
- down_read(&card->snd_card->controls_rwsem);
fsl_xcvr_activate_ctl(dai, fsl_xcvr_arc_mode_kctl.name,
(xcvr->mode == FSL_XCVR_MODE_ARC));
fsl_xcvr_activate_ctl(dai, fsl_xcvr_earc_capds_kctl.name,
(xcvr->mode == FSL_XCVR_MODE_EARC));
- up_read(&card->snd_card->controls_rwsem);
-
/* Allow playback for SPDIF only */
rtd = snd_soc_get_pcm_runtime(card, card->dai_link);
rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count =
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index 770b9bfbb384..fc52149ed6ae 100644
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -22,6 +22,7 @@
#define DRV_NAME "rockchip-i2s-tdm"
+#define DEFAULT_MCLK_FS 256
#define CH_GRP_MAX 4 /* The max channel 8 / 2 */
#define MULTIPLEX_CH_MAX 10
@@ -665,6 +666,15 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
mclk_rate = i2s_tdm->mclk_rx_freq;
}
+ /*
+ * When the dai/component driver doesn't need to set mclk-fs for a specific
+ * clock, it can skip the call to set_sysclk() for that clock.
+ * In that case, simply use the clock rate from the params and multiply it by
+ * the default mclk-fs value.
+ */
+ if (!mclk_rate)
+ mclk_rate = DEFAULT_MCLK_FS * params_rate(params);
+
err = clk_set_rate(mclk, mclk_rate);
if (err)
return err;
diff --git a/sound/soc/sdca/Makefile b/sound/soc/sdca/Makefile
index f6b73275d964..b3b0f5d94c8d 100644
--- a/sound/soc/sdca/Makefile
+++ b/sound/soc/sdca/Makefile
@@ -3,7 +3,7 @@
snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_function_device.o \
sdca_regmap.o sdca_asoc.o sdca_ump.o
snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_HID) += sdca_hid.o
-snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.o
+snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.o sdca_jack.o
snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_FDL) += sdca_fdl.o
snd-soc-sdca-class-y := sdca_class.o
diff --git a/sound/soc/sdca/sdca_asoc.c b/sound/soc/sdca/sdca_asoc.c
index 2d328bbb95b9..9685281529e9 100644
--- a/sound/soc/sdca/sdca_asoc.c
+++ b/sound/soc/sdca/sdca_asoc.c
@@ -16,6 +16,7 @@
#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/overflow.h>
+#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/soundwire/sdw_registers.h>
#include <linux/string_helpers.h>
@@ -792,6 +793,48 @@ static int control_limit_kctl(struct device *dev,
return 0;
}
+static int volatile_get_volsw(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+ struct device *dev = component->dev;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(dev);
+ if (ret < 0) {
+ dev_err(dev, "failed to resume reading %s: %d\n",
+ kcontrol->id.name, ret);
+ return ret;
+ }
+
+ ret = snd_soc_get_volsw(kcontrol, ucontrol);
+
+ pm_runtime_put(dev);
+
+ return ret;
+}
+
+static int volatile_put_volsw(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+ struct device *dev = component->dev;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(dev);
+ if (ret < 0) {
+ dev_err(dev, "failed to resume writing %s: %d\n",
+ kcontrol->id.name, ret);
+ return ret;
+ }
+
+ ret = snd_soc_put_volsw(kcontrol, ucontrol);
+
+ pm_runtime_put(dev);
+
+ return ret;
+}
+
static int populate_control(struct device *dev,
struct sdca_function_data *function,
struct sdca_entity *entity,
@@ -849,8 +892,13 @@ static int populate_control(struct device *dev,
(*kctl)->private_value = (unsigned long)mc;
(*kctl)->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
(*kctl)->info = snd_soc_info_volsw;
- (*kctl)->get = snd_soc_get_volsw;
- (*kctl)->put = snd_soc_put_volsw;
+ if (control->is_volatile) {
+ (*kctl)->get = volatile_get_volsw;
+ (*kctl)->put = volatile_put_volsw;
+ } else {
+ (*kctl)->get = snd_soc_get_volsw;
+ (*kctl)->put = snd_soc_put_volsw;
+ }
if (readonly_control(control))
(*kctl)->access = SNDRV_CTL_ELEM_ACCESS_READ;
@@ -1478,7 +1526,7 @@ static int set_usage(struct device *dev, struct regmap *regmap,
unsigned int rate = sdca_range(range, SDCA_USAGE_SAMPLE_RATE, i);
unsigned int width = sdca_range(range, SDCA_USAGE_SAMPLE_WIDTH, i);
- if ((!rate || rate == target_rate) && width == target_width) {
+ if ((!rate || rate == target_rate) && (!width || width == target_width)) {
unsigned int usage = sdca_range(range, SDCA_USAGE_NUMBER, i);
unsigned int reg = SDW_SDCA_CTL(function->desc->adr,
entity->id, sel, 0);
diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_functions.c
index 5a1f120487ef..e86004c9dea0 100644
--- a/sound/soc/sdca/sdca_functions.c
+++ b/sound/soc/sdca/sdca_functions.c
@@ -911,10 +911,6 @@ static int find_sdca_control_value(struct device *dev, struct sdca_entity *entit
return 0;
}
-/*
- * TODO: Add support for -cn- properties, allowing different channels to have
- * different defaults etc.
- */
static int find_sdca_entity_control(struct device *dev, struct sdca_entity *entity,
struct fwnode_handle *control_node,
struct sdca_control *control)
diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interrupts.c
index 8f6a2adfb6fb..ff3a7e405fdc 100644
--- a/sound/soc/sdca/sdca_interrupts.c
+++ b/sound/soc/sdca/sdca_interrupts.c
@@ -22,6 +22,7 @@
#include <sound/sdca_function.h>
#include <sound/sdca_hid.h>
#include <sound/sdca_interrupts.h>
+#include <sound/sdca_jack.h>
#include <sound/sdca_ump.h>
#include <sound/soc-component.h>
#include <sound/soc.h>
@@ -155,14 +156,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data)
{
struct sdca_interrupt *interrupt = data;
struct device *dev = interrupt->dev;
- struct snd_soc_component *component = interrupt->component;
- struct snd_soc_card *card = component->card;
- struct rw_semaphore *rwsem = &card->snd_card->controls_rwsem;
- struct snd_kcontrol *kctl = interrupt->priv;
- struct snd_ctl_elem_value *ucontrol __free(kfree) = NULL;
- struct soc_enum *soc_enum;
irqreturn_t irqret = IRQ_NONE;
- unsigned int reg, val;
int ret;
ret = pm_runtime_get_sync(dev);
@@ -171,76 +165,9 @@ static irqreturn_t detected_mode_handler(int irq, void *data)
goto error;
}
- if (!kctl) {
- const char *name __free(kfree) = kasprintf(GFP_KERNEL, "%s %s",
- interrupt->entity->label,
- SDCA_CTL_SELECTED_MODE_NAME);
-
- if (!name)
- goto error;
-
- kctl = snd_soc_component_get_kcontrol(component, name);
- if (!kctl) {
- dev_dbg(dev, "control not found: %s\n", name);
- goto error;
- }
-
- interrupt->priv = kctl;
- }
-
- soc_enum = (struct soc_enum *)kctl->private_value;
-
- reg = SDW_SDCA_CTL(interrupt->function->desc->adr, interrupt->entity->id,
- interrupt->control->sel, 0);
-
- ret = regmap_read(interrupt->function_regmap, reg, &val);
- if (ret < 0) {
- dev_err(dev, "failed to read detected mode: %d\n", ret);
- goto error;
- }
-
- switch (val) {
- case SDCA_DETECTED_MODE_DETECTION_IN_PROGRESS:
- case SDCA_DETECTED_MODE_JACK_UNKNOWN:
- reg = SDW_SDCA_CTL(interrupt->function->desc->adr,
- interrupt->entity->id,
- SDCA_CTL_GE_SELECTED_MODE, 0);
-
- /*
- * Selected mode is not normally marked as volatile register
- * (RW), but here force a read from the hardware. If the
- * detected mode is unknown we need to see what the device
- * selected as a "safe" option.
- */
- regcache_drop_region(interrupt->function_regmap, reg, reg);
-
- ret = regmap_read(interrupt->function_regmap, reg, &val);
- if (ret) {
- dev_err(dev, "failed to re-check selected mode: %d\n", ret);
- goto error;
- }
- break;
- default:
- break;
- }
-
- dev_dbg(dev, "%s: %#x\n", interrupt->name, val);
-
- ucontrol = kzalloc(sizeof(*ucontrol), GFP_KERNEL);
- if (!ucontrol)
- goto error;
-
- ucontrol->value.enumerated.item[0] = snd_soc_enum_val_to_item(soc_enum, val);
-
- down_write(rwsem);
- ret = kctl->put(kctl, ucontrol);
- up_write(rwsem);
- if (ret < 0) {
- dev_err(dev, "failed to update selected mode: %d\n", ret);
+ ret = sdca_jack_process(interrupt);
+ if (ret)
goto error;
- }
-
- snd_ctl_notify(card->snd_card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
irqret = IRQ_HANDLED;
error:
@@ -536,6 +463,10 @@ int sdca_irq_populate(struct sdca_function_data *function,
handler = function_status_handler;
break;
case SDCA_CTL_TYPE_S(GE, DETECTED_MODE):
+ ret = sdca_jack_alloc_state(interrupt);
+ if (ret)
+ return ret;
+
handler = detected_mode_handler;
break;
case SDCA_CTL_TYPE_S(XU, FDL_CURRENTOWNER):
diff --git a/sound/soc/sdca/sdca_jack.c b/sound/soc/sdca/sdca_jack.c
new file mode 100644
index 000000000000..bfa621b744e1
--- /dev/null
+++ b/sound/soc/sdca/sdca_jack.c
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2025 Cirrus Logic, Inc. and
+// Cirrus Logic International Semiconductor Ltd.
+
+/*
+ * The MIPI SDCA specification is available for public downloads at
+ * https://www.mipi.org/mipi-sdca-v1-0-download
+ */
+
+#include <linux/cleanup.h>
+#include <linux/device.h>
+#include <linux/dev_printk.h>
+#include <linux/soundwire/sdw.h>
+#include <linux/soundwire/sdw_registers.h>
+#include <linux/sprintf.h>
+#include <linux/regmap.h>
+#include <linux/rwsem.h>
+#include <sound/asound.h>
+#include <sound/control.h>
+#include <sound/jack.h>
+#include <sound/sdca.h>
+#include <sound/sdca_function.h>
+#include <sound/sdca_interrupts.h>
+#include <sound/sdca_jack.h>
+#include <sound/soc-component.h>
+#include <sound/soc-jack.h>
+#include <sound/soc.h>
+
+/**
+ * sdca_jack_process - Process an SDCA jack event
+ * @interrupt: SDCA interrupt structure
+ *
+ * Return: Zero on success or a negative error code.
+ */
+int sdca_jack_process(struct sdca_interrupt *interrupt)
+{
+ struct device *dev = interrupt->dev;
+ struct snd_soc_component *component = interrupt->component;
+ struct snd_soc_card *card = component->card;
+ struct rw_semaphore *rwsem = &card->snd_card->controls_rwsem;
+ struct jack_state *state = interrupt->priv;
+ struct snd_kcontrol *kctl = state->kctl;
+ struct snd_ctl_elem_value *ucontrol __free(kfree) = NULL;
+ unsigned int reg, val;
+ int ret;
+
+ guard(rwsem_write)(rwsem);
+
+ if (!kctl) {
+ const char *name __free(kfree) = kasprintf(GFP_KERNEL, "%s %s",
+ interrupt->entity->label,
+ SDCA_CTL_SELECTED_MODE_NAME);
+
+ if (!name)
+ return -ENOMEM;
+
+ kctl = snd_soc_component_get_kcontrol(component, name);
+ if (!kctl)
+ dev_dbg(dev, "control not found: %s\n", name);
+ else
+ state->kctl = kctl;
+ }
+
+ reg = SDW_SDCA_CTL(interrupt->function->desc->adr, interrupt->entity->id,
+ interrupt->control->sel, 0);
+
+ ret = regmap_read(interrupt->function_regmap, reg, &val);
+ if (ret < 0) {
+ dev_err(dev, "failed to read detected mode: %d\n", ret);
+ return ret;
+ }
+
+ reg = SDW_SDCA_CTL(interrupt->function->desc->adr, interrupt->entity->id,
+ SDCA_CTL_GE_SELECTED_MODE, 0);
+
+ switch (val) {
+ case SDCA_DETECTED_MODE_DETECTION_IN_PROGRESS:
+ case SDCA_DETECTED_MODE_JACK_UNKNOWN:
+ /*
+ * Selected mode is not normally marked as volatile register
+ * (RW), but here force a read from the hardware. If the
+ * detected mode is unknown we need to see what the device
+ * selected as a "safe" option.
+ */
+ regcache_drop_region(interrupt->function_regmap, reg, reg);
+
+ ret = regmap_read(interrupt->function_regmap, reg, &val);
+ if (ret) {
+ dev_err(dev, "failed to re-check selected mode: %d\n", ret);
+ return ret;
+ }
+ break;
+ default:
+ break;
+ }
+
+ dev_dbg(dev, "%s: %#x\n", interrupt->name, val);
+
+ if (kctl) {
+ struct soc_enum *soc_enum = (struct soc_enum *)kctl->private_value;
+
+ ucontrol = kzalloc(sizeof(*ucontrol), GFP_KERNEL);
+ if (!ucontrol)
+ return -ENOMEM;
+
+ ucontrol->value.enumerated.item[0] = snd_soc_enum_val_to_item(soc_enum, val);
+
+ ret = kctl->put(kctl, ucontrol);
+ if (ret < 0) {
+ dev_err(dev, "failed to update selected mode: %d\n", ret);
+ return ret;
+ }
+
+ snd_ctl_notify(card->snd_card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
+ } else {
+ ret = regmap_write(interrupt->function_regmap, reg, val);
+ if (ret) {
+ dev_err(dev, "failed to write selected mode: %d\n", ret);
+ return ret;
+ }
+ }
+
+ return sdca_jack_report(interrupt);
+}
+EXPORT_SYMBOL_NS_GPL(sdca_jack_process, "SND_SOC_SDCA");
+
+/**
+ * sdca_jack_alloc_state - allocate state for a jack interrupt
+ * @interrupt: SDCA interrupt structure.
+ *
+ * Return: Zero on success or a negative error code.
+ */
+int sdca_jack_alloc_state(struct sdca_interrupt *interrupt)
+{
+ struct device *dev = interrupt->dev;
+ struct jack_state *jack_state;
+
+ jack_state = devm_kzalloc(dev, sizeof(*jack_state), GFP_KERNEL);
+ if (!jack_state)
+ return -ENOMEM;
+
+ interrupt->priv = jack_state;
+
+ return 0;
+}
+EXPORT_SYMBOL_NS_GPL(sdca_jack_alloc_state, "SND_SOC_SDCA");
+
+/**
+ * sdca_jack_set_jack - attach an ASoC jack to SDCA
+ * @info: SDCA interrupt information.
+ * @jack: ASoC jack to be attached.
+ *
+ * Return: Zero on success or a negative error code.
+ */
+int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *jack)
+{
+ int i, ret;
+
+ guard(mutex)(&info->irq_lock);
+
+ for (i = 0; i < SDCA_MAX_INTERRUPTS; i++) {
+ struct sdca_interrupt *interrupt = &info->irqs[i];
+ struct sdca_control *control = interrupt->control;
+ struct sdca_entity *entity = interrupt->entity;
+ struct jack_state *jack_state;
+
+ if (!interrupt->irq)
+ continue;
+
+ switch (SDCA_CTL_TYPE(entity->type, control->sel)) {
+ case SDCA_CTL_TYPE_S(GE, DETECTED_MODE):
+ jack_state = interrupt->priv;
+ jack_state->jack = jack;
+
+ /* Report initial state in case IRQ was already handled */
+ ret = sdca_jack_report(interrupt);
+ if (ret)
+ return ret;
+ break;
+ default:
+ break;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_NS_GPL(sdca_jack_set_jack, "SND_SOC_SDCA");
+
+int sdca_jack_report(struct sdca_interrupt *interrupt)
+{
+ struct jack_state *jack_state = interrupt->priv;
+ struct sdca_control_range *range;
+ enum sdca_terminal_type type;
+ unsigned int report = 0;
+ unsigned int reg, val;
+ int ret;
+
+ reg = SDW_SDCA_CTL(interrupt->function->desc->adr, interrupt->entity->id,
+ SDCA_CTL_GE_SELECTED_MODE, 0);
+
+ ret = regmap_read(interrupt->function_regmap, reg, &val);
+ if (ret) {
+ dev_err(interrupt->dev, "failed to read selected mode: %d\n", ret);
+ return ret;
+ }
+
+ range = sdca_selector_find_range(interrupt->dev, interrupt->entity,
+ SDCA_CTL_GE_SELECTED_MODE,
+ SDCA_SELECTED_MODE_NCOLS, 0);
+ if (!range)
+ return -EINVAL;
+
+ type = sdca_range_search(range, SDCA_SELECTED_MODE_INDEX,
+ val, SDCA_SELECTED_MODE_TERM_TYPE);
+
+ switch (type) {
+ case SDCA_TERM_TYPE_LINEIN_STEREO:
+ case SDCA_TERM_TYPE_LINEIN_FRONT_LR:
+ case SDCA_TERM_TYPE_LINEIN_CENTER_LFE:
+ case SDCA_TERM_TYPE_LINEIN_SURROUND_LR:
+ case SDCA_TERM_TYPE_LINEIN_REAR_LR:
+ report = SND_JACK_LINEIN;
+ break;
+ case SDCA_TERM_TYPE_LINEOUT_STEREO:
+ case SDCA_TERM_TYPE_LINEOUT_FRONT_LR:
+ case SDCA_TERM_TYPE_LINEOUT_CENTER_LFE:
+ case SDCA_TERM_TYPE_LINEOUT_SURROUND_LR:
+ case SDCA_TERM_TYPE_LINEOUT_REAR_LR:
+ report = SND_JACK_LINEOUT;
+ break;
+ case SDCA_TERM_TYPE_MIC_JACK:
+ report = SND_JACK_MICROPHONE;
+ break;
+ case SDCA_TERM_TYPE_HEADPHONE_JACK:
+ report = SND_JACK_HEADPHONE;
+ break;
+ case SDCA_TERM_TYPE_HEADSET_JACK:
+ report = SND_JACK_HEADSET;
+ break;
+ default:
+ break;
+ }
+
+ snd_soc_jack_report(jack_state->jack, report, 0xFFFF);
+
+ return 0;
+}
+EXPORT_SYMBOL_NS_GPL(sdca_jack_report, "SND_SOC_SDCA");
diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
index e795907a3963..fc5892056f83 100644
--- a/sound/soc/tegra/tegra210_ahub.c
+++ b/sound/soc/tegra/tegra210_ahub.c
@@ -2049,6 +2049,61 @@ static const struct snd_soc_component_driver tegra264_ahub_component = {
.num_dapm_routes = ARRAY_SIZE(tegra264_ahub_routes),
};
+static bool tegra210_ahub_wr_reg(struct device *dev, unsigned int reg)
+{
+ int part;
+
+ if (reg % TEGRA210_XBAR_RX_STRIDE)
+ return false;
+
+ for (part = 0; part < TEGRA210_XBAR_UPDATE_MAX_REG; part++) {
+ switch (reg & ~(part * TEGRA210_XBAR_PART1_RX)) {
+ case TEGRA210_AXBAR_PART_0_ADMAIF_RX1_0 ... TEGRA210_AXBAR_PART_0_ADMAIF_RX10_0:
+ case TEGRA210_AXBAR_PART_0_I2S1_RX1_0 ... TEGRA210_AXBAR_PART_0_I2S5_RX1_0:
+ case TEGRA210_AXBAR_PART_0_SFC1_RX1_0 ... TEGRA210_AXBAR_PART_0_SFC4_RX1_0:
+ case TEGRA210_AXBAR_PART_0_MIXER1_RX1_0 ... TEGRA210_AXBAR_PART_0_MIXER1_RX10_0:
+ case TEGRA210_AXBAR_PART_0_SPDIF1_RX1_0 ... TEGRA210_AXBAR_PART_0_SPDIF1_RX2_0:
+ case TEGRA210_AXBAR_PART_0_AFC1_RX1_0 ... TEGRA210_AXBAR_PART_0_AFC6_RX1_0:
+ case TEGRA210_AXBAR_PART_0_OPE1_RX1_0 ... TEGRA210_AXBAR_PART_0_OPE2_RX1_0:
+ case TEGRA210_AXBAR_PART_0_SPKPROT1_RX1_0:
+ case TEGRA210_AXBAR_PART_0_MVC1_RX1_0 ... TEGRA210_AXBAR_PART_0_MVC2_RX1_0:
+ case TEGRA210_AXBAR_PART_0_AMX1_RX1_0 ... TEGRA210_AXBAR_PART_0_ADX2_RX1_0:
+ return true;
+ default:
+ break;
+ }
+ }
+
+ return false;
+}
+
+static bool tegra186_ahub_wr_reg(struct device *dev, unsigned int reg)
+{
+ int part;
+
+ if (reg % TEGRA210_XBAR_RX_STRIDE)
+ return false;
+
+ for (part = 0; part < TEGRA186_XBAR_UPDATE_MAX_REG; part++) {
+ switch (reg & ~(part * TEGRA210_XBAR_PART1_RX)) {
+ case TEGRA210_AXBAR_PART_0_ADMAIF_RX1_0 ... TEGRA186_AXBAR_PART_0_I2S6_RX1_0:
+ case TEGRA210_AXBAR_PART_0_SFC1_RX1_0 ... TEGRA210_AXBAR_PART_0_SFC4_RX1_0:
+ case TEGRA210_AXBAR_PART_0_MIXER1_RX1_0 ... TEGRA210_AXBAR_PART_0_MIXER1_RX10_0:
+ case TEGRA186_AXBAR_PART_0_DSPK1_RX1_0 ... TEGRA186_AXBAR_PART_0_DSPK2_RX1_0:
+ case TEGRA210_AXBAR_PART_0_AFC1_RX1_0 ... TEGRA210_AXBAR_PART_0_AFC6_RX1_0:
+ case TEGRA210_AXBAR_PART_0_OPE1_RX1_0:
+ case TEGRA186_AXBAR_PART_0_MVC1_RX1_0 ... TEGRA186_AXBAR_PART_0_MVC2_RX1_0:
+ case TEGRA186_AXBAR_PART_0_AMX1_RX1_0 ... TEGRA186_AXBAR_PART_0_AMX3_RX4_0:
+ case TEGRA210_AXBAR_PART_0_ADX1_RX1_0 ... TEGRA186_AXBAR_PART_0_ASRC1_RX7_0:
+ return true;
+ default:
+ break;
+ }
+ }
+
+ return false;
+}
+
static bool tegra264_ahub_wr_reg(struct device *dev, unsigned int reg)
{
int part;
@@ -2076,6 +2131,7 @@ static const struct regmap_config tegra210_ahub_regmap_config = {
.reg_bits = 32,
.val_bits = 32,
.reg_stride = 4,
+ .writeable_reg = tegra210_ahub_wr_reg,
.max_register = TEGRA210_MAX_REGISTER_ADDR,
.cache_type = REGCACHE_FLAT,
};
@@ -2084,6 +2140,7 @@ static const struct regmap_config tegra186_ahub_regmap_config = {
.reg_bits = 32,
.val_bits = 32,
.reg_stride = 4,
+ .writeable_reg = tegra186_ahub_wr_reg,
.max_register = TEGRA186_MAX_REGISTER_ADDR,
.cache_type = REGCACHE_FLAT,
};
diff --git a/sound/soc/tegra/tegra210_ahub.h b/sound/soc/tegra/tegra210_ahub.h
index f355b2cfd19b..acbe640dd3b5 100644
--- a/sound/soc/tegra/tegra210_ahub.h
+++ b/sound/soc/tegra/tegra210_ahub.h
@@ -68,6 +68,36 @@
#define TEGRA210_MAX_REGISTER_ADDR (TEGRA210_XBAR_PART2_RX + \
(TEGRA210_XBAR_RX_STRIDE * (TEGRA210_XBAR_AUDIO_RX_COUNT - 1)))
+/* AXBAR register offsets */
+#define TEGRA186_AXBAR_PART_0_AMX1_RX1_0 0x120
+#define TEGRA186_AXBAR_PART_0_AMX3_RX4_0 0x14c
+#define TEGRA186_AXBAR_PART_0_ASRC1_RX7_0 0x1a8
+#define TEGRA186_AXBAR_PART_0_DSPK1_RX1_0 0xc0
+#define TEGRA186_AXBAR_PART_0_DSPK2_RX1_0 0xc4
+#define TEGRA186_AXBAR_PART_0_I2S6_RX1_0 0x54
+#define TEGRA186_AXBAR_PART_0_MVC1_RX1_0 0x110
+#define TEGRA186_AXBAR_PART_0_MVC2_RX1_0 0x114
+#define TEGRA210_AXBAR_PART_0_ADMAIF_RX10_0 0x24
+#define TEGRA210_AXBAR_PART_0_ADMAIF_RX1_0 0x0
+#define TEGRA210_AXBAR_PART_0_ADX1_RX1_0 0x160
+#define TEGRA210_AXBAR_PART_0_ADX2_RX1_0 0x164
+#define TEGRA210_AXBAR_PART_0_AFC1_RX1_0 0xd0
+#define TEGRA210_AXBAR_PART_0_AFC6_RX1_0 0xe4
+#define TEGRA210_AXBAR_PART_0_AMX1_RX1_0 0x140
+#define TEGRA210_AXBAR_PART_0_I2S1_RX1_0 0x40
+#define TEGRA210_AXBAR_PART_0_I2S5_RX1_0 0x50
+#define TEGRA210_AXBAR_PART_0_MIXER1_RX10_0 0xa4
+#define TEGRA210_AXBAR_PART_0_MIXER1_RX1_0 0x80
+#define TEGRA210_AXBAR_PART_0_MVC1_RX1_0 0x120
+#define TEGRA210_AXBAR_PART_0_MVC2_RX1_0 0x124
+#define TEGRA210_AXBAR_PART_0_OPE1_RX1_0 0x100
+#define TEGRA210_AXBAR_PART_0_OPE2_RX1_0 0x104
+#define TEGRA210_AXBAR_PART_0_SFC1_RX1_0 0x60
+#define TEGRA210_AXBAR_PART_0_SFC4_RX1_0 0x6c
+#define TEGRA210_AXBAR_PART_0_SPDIF1_RX1_0 0xc0
+#define TEGRA210_AXBAR_PART_0_SPDIF1_RX2_0 0xc4
+#define TEGRA210_AXBAR_PART_0_SPKPROT1_RX1_0 0x110
+
#define MUX_REG(id) (TEGRA210_XBAR_RX_STRIDE * (id))
#define MUX_VALUE(npart, nbit) (1 + (nbit) + (npart) * 32)
diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c
index 11e9a96b46ff..1f4595d1e217 100644
--- a/sound/usb/fcp.c
+++ b/sound/usb/fcp.c
@@ -182,10 +182,6 @@ static int fcp_usb(struct usb_mixer_interface *mixer, u32 opcode,
{
struct fcp_data *private = mixer->private_data;
struct usb_device *dev = mixer->chip->dev;
- struct fcp_usb_packet *req __free(kfree) = NULL;
- struct fcp_usb_packet *resp __free(kfree) = NULL;
- size_t req_buf_size = struct_size(req, data, req_size);
- size_t resp_buf_size = struct_size(resp, data, resp_size);
int retries = 0;
const int max_retries = 5;
int err;
@@ -193,10 +189,14 @@ static int fcp_usb(struct usb_mixer_interface *mixer, u32 opcode,
if (!mixer->urb)
return -ENODEV;
+ struct fcp_usb_packet *req __free(kfree) = NULL;
+ size_t req_buf_size = struct_size(req, data, req_size);
req = kmalloc(req_buf_size, GFP_KERNEL);
if (!req)
return -ENOMEM;
+ struct fcp_usb_packet *resp __free(kfree) = NULL;
+ size_t resp_buf_size = struct_size(resp, data, resp_size);
resp = kmalloc(resp_buf_size, GFP_KERNEL);
if (!resp)
return -ENOMEM;
@@ -300,16 +300,17 @@ static int fcp_usb(struct usb_mixer_interface *mixer, u32 opcode,
static int fcp_reinit(struct usb_mixer_interface *mixer)
{
struct fcp_data *private = mixer->private_data;
- void *step0_resp __free(kfree) = NULL;
- void *step2_resp __free(kfree) = NULL;
if (mixer->urb)
return 0;
- step0_resp = kmalloc(private->step0_resp_size, GFP_KERNEL);
+ void *step0_resp __free(kfree) =
+ kmalloc(private->step0_resp_size, GFP_KERNEL);
if (!step0_resp)
return -ENOMEM;
- step2_resp = kmalloc(private->step2_resp_size, GFP_KERNEL);
+
+ void *step2_resp __free(kfree) =
+ kmalloc(private->step2_resp_size, GFP_KERNEL);
if (!step2_resp)
return -ENOMEM;
@@ -464,7 +465,6 @@ static int fcp_ioctl_init(struct usb_mixer_interface *mixer,
struct fcp_init init;
struct usb_device *dev = mixer->chip->dev;
struct fcp_data *private = mixer->private_data;
- void *resp __free(kfree) = NULL;
void *step2_resp;
int err, buf_size;
@@ -485,7 +485,8 @@ static int fcp_ioctl_init(struct usb_mixer_interface *mixer,
/* Allocate response buffer */
buf_size = init.step0_resp_size + init.step2_resp_size;
- resp = kmalloc(buf_size, GFP_KERNEL);
+ void *resp __free(kfree) =
+ kmalloc(buf_size, GFP_KERNEL);
if (!resp)
return -ENOMEM;
@@ -619,7 +620,6 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer,
{
struct fcp_meter_map map;
struct fcp_data *private = mixer->private_data;
- s16 *tmp_map __free(kfree) = NULL;
int err;
if (copy_from_user(&map, arg, sizeof(map)))
@@ -641,7 +641,8 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer,
return -EINVAL;
/* Allocate and copy the map data */
- tmp_map = memdup_array_user(arg->map, map.map_size, sizeof(s16));
+ s16 *tmp_map __free(kfree) =
+ memdup_array_user(arg->map, map.map_size, sizeof(s16));
if (IS_ERR(tmp_map))
return PTR_ERR(tmp_map);
@@ -651,17 +652,16 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer,
/* If the control doesn't exist, create it */
if (!private->meter_ctl) {
- s16 *new_map __free(kfree) = NULL;
- __le32 *meter_levels __free(kfree) = NULL;
-
/* Allocate buffer for the map */
- new_map = kmalloc_array(map.map_size, sizeof(s16), GFP_KERNEL);
+ s16 *new_map __free(kfree) =
+ kmalloc_array(map.map_size, sizeof(s16), GFP_KERNEL);
if (!new_map)
return -ENOMEM;
/* Allocate buffer for reading meter levels */
- meter_levels = kmalloc_array(map.meter_slots, sizeof(__le32),
- GFP_KERNEL);
+ __le32 *meter_levels __free(kfree) =
+ kmalloc_array(map.meter_slots, sizeof(__le32),
+ GFP_KERNEL);
if (!meter_levels)
return -ENOMEM;
diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
index bef8c9e544dd..88b7e42d159e 100644
--- a/sound/usb/mixer_scarlett2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -2377,18 +2377,18 @@ static int scarlett2_usb(
{
struct scarlett2_data *private = mixer->private_data;
struct usb_device *dev = mixer->chip->dev;
- struct scarlett2_usb_packet *req __free(kfree) = NULL;
- struct scarlett2_usb_packet *resp __free(kfree) = NULL;
- size_t req_buf_size = struct_size(req, data, req_size);
- size_t resp_buf_size = struct_size(resp, data, resp_size);
int retries = 0;
const int max_retries = 5;
int err;
+ struct scarlett2_usb_packet *req __free(kfree) = NULL;
+ size_t req_buf_size = struct_size(req, data, req_size);
req = kmalloc(req_buf_size, GFP_KERNEL);
if (!req)
return -ENOMEM;
+ struct scarlett2_usb_packet *resp __free(kfree) = NULL;
+ size_t resp_buf_size = struct_size(resp, data, resp_size);
resp = kmalloc(resp_buf_size, GFP_KERNEL);
if (!resp)
return -ENOMEM;
@@ -3919,9 +3919,9 @@ static int scarlett2_input_select_ctl_info(
struct scarlett2_data *private = mixer->private_data;
int inputs = private->info->gain_input_count;
int i, err;
- char **values __free(kfree) = NULL;
+ char **values __free(kfree) =
+ kcalloc(inputs, sizeof(char *), GFP_KERNEL);
- values = kcalloc(inputs, sizeof(char *), GFP_KERNEL);
if (!values)
return -ENOMEM;
@@ -9083,8 +9083,6 @@ static long scarlett2_hwdep_read(struct snd_hwdep *hw,
__le32 len;
} __packed req;
- u8 *resp __free(kfree) = NULL;
-
/* Flash segment must first be selected */
if (private->flash_write_state != SCARLETT2_FLASH_WRITE_STATE_SELECTED)
return -EINVAL;
@@ -9122,7 +9120,8 @@ static long scarlett2_hwdep_read(struct snd_hwdep *hw,
req.offset = cpu_to_le32(*offset);
req.len = cpu_to_le32(count);
- resp = kzalloc(count, GFP_KERNEL);
+ u8 *resp __free(kfree) =
+ kzalloc(count, GFP_KERNEL);
if (!resp)
return -ENOMEM;
@@ -9267,7 +9266,6 @@ static ssize_t scarlett2_devmap_read(
loff_t pos)
{
struct usb_mixer_interface *mixer = entry->private_data;
- u8 *resp_buf __free(kfree) = NULL;
const size_t block_size = SCARLETT2_DEVMAP_BLOCK_SIZE;
size_t copied = 0;
@@ -9277,7 +9275,8 @@ static ssize_t scarlett2_devmap_read(
if (pos + count > entry->size)
count = entry->size - pos;
- resp_buf = kmalloc(block_size, GFP_KERNEL);
+ u8 *resp_buf __free(kfree) =
+ kmalloc(block_size, GFP_KERNEL);
if (!resp_buf)
return -ENOMEM;
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 2d9f28558874..4f9d19bf1cca 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -555,7 +555,6 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interface *intf)
{
struct usb_host_config *config = dev->actconfig;
- struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL;
int err;
if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||
@@ -566,8 +565,8 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
0x10, 0x43, 0x0001, 0x000a, NULL, 0);
if (err < 0)
dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
-
- new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
+ struct usb_device_descriptor *new_device_descriptor __free(kfree) =
+ kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
if (!new_device_descriptor)
return -ENOMEM;
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
@@ -910,7 +909,6 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
{
struct usb_host_config *config = dev->actconfig;
- struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL;
int err;
u8 bootresponse[0x12];
int fwsize;
@@ -945,7 +943,8 @@ static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "device initialised!\n");
- new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
+ struct usb_device_descriptor *new_device_descriptor __free(kfree) =
+ kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
if (!new_device_descriptor)
return -ENOMEM;
@@ -1267,7 +1266,6 @@ static void mbox3_setup_defaults(struct usb_device *dev)
static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
{
struct usb_host_config *config = dev->actconfig;
- struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL;
int err;
int descriptor_size;
@@ -1280,7 +1278,8 @@ static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "MBOX3: device initialised!\n");
- new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
+ struct usb_device_descriptor *new_device_descriptor __free(kfree) =
+ kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
if (!new_device_descriptor)
return -ENOMEM;
diff --git a/sound/usb/usx2y/us144mkii.c b/sound/usb/usx2y/us144mkii.c
index f6572a576c15..bc71968df8e2 100644
--- a/sound/usb/usx2y/us144mkii.c
+++ b/sound/usb/usx2y/us144mkii.c
@@ -412,7 +412,6 @@ static int tascam_probe(struct usb_interface *intf,
struct snd_card *card;
struct tascam_card *tascam;
int err;
- char *handshake_buf __free(kfree) = NULL;
if (dev->speed != USB_SPEED_HIGH)
dev_info(
@@ -439,7 +438,8 @@ static int tascam_probe(struct usb_interface *intf,
return -ENOENT;
}
- handshake_buf = kmalloc(1, GFP_KERNEL);
+ char *handshake_buf __free(kfree) =
+ kmalloc(1, GFP_KERNEL);
if (!handshake_buf)
return -ENOMEM;
diff --git a/sound/usb/usx2y/us144mkii_controls.c b/sound/usb/usx2y/us144mkii_controls.c
index 5d69441ef414..62055fb8e7ba 100644
--- a/sound/usb/usx2y/us144mkii_controls.c
+++ b/sound/usb/usx2y/us144mkii_controls.c
@@ -373,7 +373,6 @@ static int tascam_samplerate_get(struct snd_kcontrol *kcontrol,
{
struct tascam_card *tascam =
(struct tascam_card *)snd_kcontrol_chip(kcontrol);
- u8 *buf __free(kfree) = NULL;
int err;
u32 rate = 0;
@@ -384,7 +383,8 @@ static int tascam_samplerate_get(struct snd_kcontrol *kcontrol,
}
}
- buf = kmalloc(3, GFP_KERNEL);
+ u8 *buf __free(kfree) =
+ kmalloc(3, GFP_KERNEL);
if (!buf)
return -ENOMEM;
diff --git a/sound/usb/usx2y/us144mkii_pcm.c b/sound/usb/usx2y/us144mkii_pcm.c
index 0c84304d4624..03dfb1f38801 100644
--- a/sound/usb/usx2y/us144mkii_pcm.c
+++ b/sound/usb/usx2y/us144mkii_pcm.c
@@ -115,7 +115,6 @@ void process_capture_routing_us144mkii(struct tascam_card *tascam,
int us144mkii_configure_device_for_rate(struct tascam_card *tascam, int rate)
{
struct usb_device *dev = tascam->dev;
- u8 *rate_payload_buf __free(kfree) = NULL;
u16 rate_vendor_wValue;
int err = 0;
const u8 *current_payload_src;
@@ -148,7 +147,8 @@ int us144mkii_configure_device_for_rate(struct tascam_card *tascam, int rate)
return -EINVAL;
}
- rate_payload_buf = kmemdup(current_payload_src, 3, GFP_KERNEL);
+ u8 *rate_payload_buf __free(kfree) =
+ kmemdup(current_payload_src, 3, GFP_KERNEL);
if (!rate_payload_buf)
return -ENOMEM;
diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
index cfc6f944f7c3..1a06b0b5eef3 100644
--- a/tools/bpf/bpftool/net.c
+++ b/tools/bpf/bpftool/net.c
@@ -156,7 +156,7 @@ static int netlink_recv(int sock, __u32 nl_pid, __u32 seq,
bool multipart = true;
struct nlmsgerr *err;
struct nlmsghdr *nh;
- char buf[4096];
+ char buf[8192];
int len, ret;
while (multipart) {
@@ -201,6 +201,9 @@ static int netlink_recv(int sock, __u32 nl_pid, __u32 seq,
return ret;
}
}
+
+ if (len)
+ p_err("Invalid message or trailing data in Netlink response: %d bytes left", len);
}
ret = 0;
done:
diff --git a/tools/docs/find-unused-docs.sh b/tools/docs/find-unused-docs.sh
index 05552dbda5bc..ca4e607ec3f7 100755
--- a/tools/docs/find-unused-docs.sh
+++ b/tools/docs/find-unused-docs.sh
@@ -28,7 +28,7 @@ if ! [ -d "$1" ]; then
fi
cd "$( dirname "${BASH_SOURCE[0]}" )"
-cd ..
+cd ../..
cd Documentation/
diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 8118e22844f1..afb6a20ac133 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -103,9 +103,12 @@ headers_standalone: headers
$(Q)$(MAKE) -C $(srctree) headers
$(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)sysroot
+CFLAGS_s390 := -m64
+CFLAGS := $(CFLAGS_$(ARCH))
+
headers_check: headers_standalone
$(Q)for header in $(filter-out crt.h std.h,$(all_files)); do \
- $(CC) $(CLANG_CROSS_FLAGS) -Wall -Werror -nostdinc -fsyntax-only -x c /dev/null \
+ $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -nostdinc -fsyntax-only -x c /dev/null \
-I$(or $(objtree),$(srctree))/usr/include -include $$header -include $$header || exit 1; \
done
diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
index 6388392f49a0..53c6624161d7 100644
--- a/tools/lib/bpf/btf_dump.c
+++ b/tools/lib/bpf/btf_dump.c
@@ -1762,9 +1762,18 @@ static int btf_dump_get_bitfield_value(struct btf_dump *d,
__u16 left_shift_bits, right_shift_bits;
const __u8 *bytes = data;
__u8 nr_copy_bits;
+ __u8 start_bit, nr_bytes;
__u64 num = 0;
int i;
+ /* Calculate how many bytes cover the bitfield */
+ start_bit = bits_offset % 8;
+ nr_bytes = (start_bit + bit_sz + 7) / 8;
+
+ /* Bound check */
+ if (data + nr_bytes > d->typed_dump->data_end)
+ return -E2BIG;
+
/* Maximum supported bitfield size is 64 bits */
if (t->size > 8) {
pr_warn("unexpected bitfield size %d\n", t->size);
diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
index f4403e3cf994..78f92c39290a 100644
--- a/tools/lib/bpf/linker.c
+++ b/tools/lib/bpf/linker.c
@@ -581,7 +581,7 @@ int bpf_linker__add_buf(struct bpf_linker *linker, void *buf, size_t buf_sz,
written = 0;
while (written < buf_sz) {
- ret = write(fd, buf, buf_sz);
+ ret = write(fd, buf + written, buf_sz - written);
if (ret < 0) {
ret = -errno;
pr_warn("failed to write '%s': %s\n", filename, errstr(ret));
diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c
index c997e69d507f..c9a78fb16f11 100644
--- a/tools/lib/bpf/netlink.c
+++ b/tools/lib/bpf/netlink.c
@@ -143,7 +143,7 @@ static int libbpf_netlink_recv(int sock, __u32 nl_pid, int seq,
struct nlmsghdr *nh;
int len, ret;
- ret = alloc_iov(&iov, 4096);
+ ret = alloc_iov(&iov, 8192);
if (ret)
goto done;
@@ -212,6 +212,8 @@ static int libbpf_netlink_recv(int sock, __u32 nl_pid, int seq,
}
}
}
+ if (len)
+ pr_warn("Invalid message or trailing data in Netlink response: %d bytes left\n", len);
}
ret = 0;
done:
diff --git a/tools/net/sunrpc/xdrgen/generators/__init__.py b/tools/net/sunrpc/xdrgen/generators/__init__.py
index e22632cf38fb..1d577a986c6c 100644
--- a/tools/net/sunrpc/xdrgen/generators/__init__.py
+++ b/tools/net/sunrpc/xdrgen/generators/__init__.py
@@ -6,7 +6,7 @@ from pathlib import Path
from jinja2 import Environment, FileSystemLoader, Template
from xdr_ast import _XdrAst, Specification, _RpcProgram, _XdrTypeSpecifier
-from xdr_ast import public_apis, pass_by_reference, get_header_name
+from xdr_ast import public_apis, pass_by_reference, structs, get_header_name
from xdr_parse import get_xdr_annotate
@@ -25,6 +25,7 @@ def create_jinja2_environment(language: str, xdr_type: str) -> Environment:
environment.globals["annotate"] = get_xdr_annotate()
environment.globals["public_apis"] = public_apis
environment.globals["pass_by_reference"] = pass_by_reference
+ environment.globals["structs"] = structs
return environment
case _:
raise NotImplementedError("Language not supported")
diff --git a/tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 b/tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2
index 0b1709cca0d4..19b219dd276d 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2
@@ -14,7 +14,11 @@ bool {{ program }}_svc_decode_{{ argument }}(struct svc_rqst *rqstp, struct xdr_
{% if argument == 'void' %}
return xdrgen_decode_void(xdr);
{% else %}
+{% if argument in structs %}
struct {{ argument }} *argp = rqstp->rq_argp;
+{% else %}
+ {{ argument }} *argp = rqstp->rq_argp;
+{% endif %}
return xdrgen_decode_{{ argument }}(xdr, argp);
{% endif %}
diff --git a/tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 b/tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2
index 6fc61a5d47b7..746592cfda56 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2
@@ -14,8 +14,14 @@ bool {{ program }}_svc_encode_{{ result }}(struct svc_rqst *rqstp, struct xdr_st
{% if result == 'void' %}
return xdrgen_encode_void(xdr);
{% else %}
+{% if result in structs %}
struct {{ result }} *resp = rqstp->rq_resp;
return xdrgen_encode_{{ result }}(xdr, resp);
+{% else %}
+ {{ result }} *resp = rqstp->rq_resp;
+
+ return xdrgen_encode_{{ result }}(xdr, *resp);
+{% endif %}
{% endif %}
}
diff --git a/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 b/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
index c5518c519854..df3598c38b2c 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
@@ -8,6 +8,5 @@
#include <linux/sunrpc/xdr.h>
#include <linux/sunrpc/xdrgen/_defs.h>
#include <linux/sunrpc/xdrgen/_builtins.h>
-#include <linux/sunrpc/xdrgen/nlm4.h>
#include <linux/sunrpc/clnt.h>
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index a40f30232929..6964175abdfd 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -29,6 +29,8 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
srctree := $(patsubst %/,%,$(dir $(srctree)))
endif
+RM ?= rm -f
+
LIBSUBCMD_DIR = $(srctree)/tools/lib/subcmd/
ifneq ($(OUTPUT),)
LIBSUBCMD_OUTPUT = $(abspath $(OUTPUT))/libsubcmd
diff --git a/tools/power/x86/intel-speed-select/isst-config.c b/tools/power/x86/intel-speed-select/isst-config.c
index 558138eea75e..d00d15490a98 100644
--- a/tools/power/x86/intel-speed-select/isst-config.c
+++ b/tools/power/x86/intel-speed-select/isst-config.c
@@ -950,9 +950,11 @@ int isolate_cpus(struct isst_id *id, int mask_size, cpu_set_t *cpu_mask, int lev
ret = write(fd, "member", strlen("member"));
if (ret == -1) {
printf("Can't update to member\n");
+ close(fd);
return ret;
}
+ close(fd);
return 0;
}
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 5ad45c2ac5bd..1b26d94c373f 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2135,7 +2135,7 @@ off_t idx_to_offset(int idx)
switch (idx) {
case IDX_PKG_ENERGY:
- if (valid_rapl_msrs & RAPL_AMD_F17H)
+ if (platform->plat_rapl_msrs & RAPL_AMD_F17H)
offset = MSR_PKG_ENERGY_STAT;
else
offset = MSR_PKG_ENERGY_STATUS;
@@ -3001,22 +3001,30 @@ void print_header(char *delim)
}
/*
- * pct()
+ * pct(numerator, denominator)
*
- * If absolute value is < 1.1, return percentage
- * otherwise, return nan
+ * Return sanity checked percentage (100.0 * numerator/denominotor)
*
- * return value is appropriate for printing percentages with %f
- * while flagging some obvious erroneous values.
+ * n < 0: nan
+ * d <= 0: nan
+ * n/d > 1.1: nan
*/
-double pct(double d)
+double pct(double numerator, double denominator)
{
+ double retval;
- double abs = fabs(d);
+ if (numerator < 0)
+ return nan("");
- if (abs < 1.10)
- return (100.0 * d);
- return nan("");
+ if (denominator <= 0)
+ return nan("");
+
+ retval = 100.0 * numerator / denominator;
+
+ if (retval > 110.0)
+ return nan("");
+
+ return retval;
}
int dump_counters(PER_THREAD_PARAMS)
@@ -3046,7 +3054,7 @@ int dump_counters(PER_THREAD_PARAMS)
outp += sprintf(outp, "LLC refs: %lld", t->llc.references);
outp += sprintf(outp, "LLC miss: %lld", t->llc.misses);
- outp += sprintf(outp, "LLC Hit%%: %.2f", pct((t->llc.references - t->llc.misses) / t->llc.references));
+ outp += sprintf(outp, "LLC Hit%%: %.2f", pct((t->llc.references - t->llc.misses), t->llc.references));
for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
outp += sprintf(outp, "tADDED [%d] %8s msr0x%x: %08llX %s\n", i, mp->name, mp->msr_num, t->counter[i], mp->sp->path);
@@ -3261,7 +3269,7 @@ int format_counters(PER_THREAD_PARAMS)
outp += sprintf(outp, "%s%.0f", (printed++ ? delim : ""), 1.0 / units * t->aperf / interval_float);
if (DO_BIC(BIC_Busy))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->mperf / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->mperf, tsc));
if (DO_BIC(BIC_Bzy_MHz)) {
if (has_base_hz)
@@ -3302,7 +3310,7 @@ int format_counters(PER_THREAD_PARAMS)
outp += sprintf(outp, "%s%.0f", (printed++ ? delim : ""), t->llc.references / interval_float / 1000);
if (DO_BIC(BIC_LLC_HIT))
- outp += sprintf(outp, fmt8, (printed++ ? delim : ""), pct((t->llc.references - t->llc.misses) / t->llc.references));
+ outp += sprintf(outp, fmt8, (printed++ ? delim : ""), pct((t->llc.references - t->llc.misses), t->llc.references));
}
/* Added Thread Counters */
@@ -3315,7 +3323,7 @@ int format_counters(PER_THREAD_PARAMS)
if (mp->type == COUNTER_USEC)
outp += print_float_value(&printed, delim, t->counter[i] / interval_float / 10000);
else
- outp += print_float_value(&printed, delim, pct(t->counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(t->counter[i], tsc));
}
}
@@ -3329,7 +3337,7 @@ int format_counters(PER_THREAD_PARAMS)
if (pp->type == COUNTER_USEC)
outp += print_float_value(&printed, delim, t->perf_counter[i] / interval_float / 10000);
else
- outp += print_float_value(&printed, delim, pct(t->perf_counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(t->perf_counter[i], tsc));
}
}
@@ -3343,34 +3351,34 @@ int format_counters(PER_THREAD_PARAMS)
break;
case PMT_TYPE_XTAL_TIME:
- value_converted = pct(value_raw / crystal_hz / interval_float);
+ value_converted = pct(value_raw / crystal_hz, interval_float);
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
break;
case PMT_TYPE_TCORE_CLOCK:
- value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
+ value_converted = pct(value_raw / tcore_clock_freq_hz, interval_float);
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
}
}
/* C1 */
if (DO_BIC(BIC_CPU_c1))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->c1 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->c1, tsc));
/* print per-core data only for 1st thread in core */
if (!is_cpu_first_thread_in_core(t, c))
goto done;
if (DO_BIC(BIC_CPU_c3))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c3 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c3, tsc));
if (DO_BIC(BIC_CPU_c6))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c6 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c6, tsc));
if (DO_BIC(BIC_CPU_c7))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c7 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c7, tsc));
/* Mod%c6 */
if (DO_BIC(BIC_Mod_c6))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->mc6_us / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->mc6_us, tsc));
if (DO_BIC(BIC_CoreTmp))
outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), c->core_temp_c);
@@ -3386,7 +3394,7 @@ int format_counters(PER_THREAD_PARAMS)
else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
outp += print_decimal_value(mp->width, &printed, delim, c->counter[i]);
else if (mp->format == FORMAT_PERCENT)
- outp += print_float_value(&printed, delim, pct(c->counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(c->counter[i], tsc));
}
/* Added perf Core counters */
@@ -3396,7 +3404,7 @@ int format_counters(PER_THREAD_PARAMS)
else if (pp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
outp += print_decimal_value(pp->width, &printed, delim, c->perf_counter[i]);
else if (pp->format == FORMAT_PERCENT)
- outp += print_float_value(&printed, delim, pct(c->perf_counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(c->perf_counter[i], tsc));
}
/* Added PMT Core counters */
@@ -3409,12 +3417,12 @@ int format_counters(PER_THREAD_PARAMS)
break;
case PMT_TYPE_XTAL_TIME:
- value_converted = pct(value_raw / crystal_hz / interval_float);
+ value_converted = pct(value_raw / crystal_hz, interval_float);
outp += print_float_value(&printed, delim, value_converted);
break;
case PMT_TYPE_TCORE_CLOCK:
- value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
+ value_converted = pct(value_raw / tcore_clock_freq_hz, interval_float);
outp += print_float_value(&printed, delim, value_converted);
}
}
@@ -3470,39 +3478,39 @@ int format_counters(PER_THREAD_PARAMS)
if (DO_BIC(BIC_Totl_c0))
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100 * p->pkg_wtd_core_c0 / tsc); /* can exceed 100% */
if (DO_BIC(BIC_Any_c0))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_core_c0 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_core_c0, tsc));
if (DO_BIC(BIC_GFX_c0))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_gfxe_c0 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_gfxe_c0, tsc));
if (DO_BIC(BIC_CPUGFX))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_both_core_gfxe_c0 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_both_core_gfxe_c0, tsc));
if (DO_BIC(BIC_Pkgpc2))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc2 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc2, tsc));
if (DO_BIC(BIC_Pkgpc3))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc3 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc3, tsc));
if (DO_BIC(BIC_Pkgpc6))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc6 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc6, tsc));
if (DO_BIC(BIC_Pkgpc7))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc7 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc7, tsc));
if (DO_BIC(BIC_Pkgpc8))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc8 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc8, tsc));
if (DO_BIC(BIC_Pkgpc9))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc9 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc9, tsc));
if (DO_BIC(BIC_Pkgpc10))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc10 / tsc));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc10, tsc));
if (DO_BIC(BIC_Diec6))
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->die_c6 / crystal_hz / interval_float));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->die_c6 / crystal_hz, interval_float));
if (DO_BIC(BIC_CPU_LPI)) {
if (p->cpu_lpi >= 0)
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->cpu_lpi / 1000000.0 / interval_float));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->cpu_lpi / 1000000.0, interval_float));
else
outp += sprintf(outp, "%s(neg)", (printed++ ? delim : ""));
}
if (DO_BIC(BIC_SYS_LPI)) {
if (p->sys_lpi >= 0)
- outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->sys_lpi / 1000000.0 / interval_float));
+ outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->sys_lpi / 1000000.0, interval_float));
else
outp += sprintf(outp, "%s(neg)", (printed++ ? delim : ""));
}
@@ -3542,7 +3550,7 @@ int format_counters(PER_THREAD_PARAMS)
else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
outp += print_decimal_value(mp->width, &printed, delim, p->counter[i]);
else if (mp->format == FORMAT_PERCENT)
- outp += print_float_value(&printed, delim, pct(p->counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(p->counter[i], tsc));
}
/* Added perf Package Counters */
@@ -3554,7 +3562,7 @@ int format_counters(PER_THREAD_PARAMS)
else if (pp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
outp += print_decimal_value(pp->width, &printed, delim, p->perf_counter[i]);
else if (pp->format == FORMAT_PERCENT)
- outp += print_float_value(&printed, delim, pct(p->perf_counter[i] / tsc));
+ outp += print_float_value(&printed, delim, pct(p->perf_counter[i], tsc));
}
/* Added PMT Package Counters */
@@ -3567,12 +3575,12 @@ int format_counters(PER_THREAD_PARAMS)
break;
case PMT_TYPE_XTAL_TIME:
- value_converted = pct(value_raw / crystal_hz / interval_float);
+ value_converted = pct(value_raw / crystal_hz, interval_float);
outp += print_float_value(&printed, delim, value_converted);
break;
case PMT_TYPE_TCORE_CLOCK:
- value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
+ value_converted = pct(value_raw / tcore_clock_freq_hz, interval_float);
outp += print_float_value(&printed, delim, value_converted);
}
}
diff --git a/tools/spi/.gitignore b/tools/spi/.gitignore
index 14ddba3d2195..038261b34ed8 100644
--- a/tools/spi/.gitignore
+++ b/tools/spi/.gitignore
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
spidev_fdx
spidev_test
+include/
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c
index c9efdd2a5b18..c93718dafd9b 100644
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c
@@ -74,11 +74,20 @@ static void test_stacktrace_ips_kprobe_multi(bool retprobe)
load_kallsyms();
- check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 4,
- ksym_get_addr("bpf_testmod_stacktrace_test_3"),
- ksym_get_addr("bpf_testmod_stacktrace_test_2"),
- ksym_get_addr("bpf_testmod_stacktrace_test_1"),
- ksym_get_addr("bpf_testmod_test_read"));
+ if (retprobe) {
+ check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 4,
+ ksym_get_addr("bpf_testmod_stacktrace_test_3"),
+ ksym_get_addr("bpf_testmod_stacktrace_test_2"),
+ ksym_get_addr("bpf_testmod_stacktrace_test_1"),
+ ksym_get_addr("bpf_testmod_test_read"));
+ } else {
+ check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 5,
+ ksym_get_addr("bpf_testmod_stacktrace_test"),
+ ksym_get_addr("bpf_testmod_stacktrace_test_3"),
+ ksym_get_addr("bpf_testmod_stacktrace_test_2"),
+ ksym_get_addr("bpf_testmod_stacktrace_test_1"),
+ ksym_get_addr("bpf_testmod_test_read"));
+ }
cleanup:
stacktrace_ips__destroy(skel);
diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
index 5af28f359cfd..bab4a31621c7 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
@@ -433,7 +433,7 @@ static u32 pkt_nb_frags(u32 frame_size, struct pkt_stream *pkt_stream, struct pk
}
/* Search for the end of the packet in verbatim mode */
- if (!pkt_continues(pkt->options))
+ if (!pkt_continues(pkt->options) || !pkt->valid)
return nb_frags;
next_frag = pkt_stream->current_pkt_nb;
@@ -1090,6 +1090,8 @@ static int __receive_pkts(struct test_spec *test, struct xsk_socket_info *xsk)
xsk_ring_prod__cancel(&umem->fq, nb_frags);
}
frags_processed -= nb_frags;
+ pkt_stream_cancel(pkt_stream);
+ pkts_sent--;
}
if (ifobj->use_fill_ring)
diff --git a/tools/testing/selftests/bpf/prog_tests/wq.c b/tools/testing/selftests/bpf/prog_tests/wq.c
index 15c67d23128b..84831eecc935 100644
--- a/tools/testing/selftests/bpf/prog_tests/wq.c
+++ b/tools/testing/selftests/bpf/prog_tests/wq.c
@@ -16,12 +16,12 @@ void serial_test_wq(void)
/* re-run the success test to check if the timer was actually executed */
wq_skel = wq__open_and_load();
- if (!ASSERT_OK_PTR(wq_skel, "wq_skel_load"))
+ if (!ASSERT_OK_PTR(wq_skel, "wq__open_and_load"))
return;
err = wq__attach(wq_skel);
if (!ASSERT_OK(err, "wq_attach"))
- return;
+ goto clean_up;
prog_fd = bpf_program__fd(wq_skel->progs.test_syscall_array_sleepable);
err = bpf_prog_test_run_opts(prog_fd, &topts);
@@ -31,6 +31,7 @@ void serial_test_wq(void)
usleep(50); /* 10 usecs should be enough, but give it extra */
ASSERT_EQ(wq_skel->bss->ok_sleepable, (1 << 1), "ok_sleepable");
+clean_up:
wq__destroy(wq_skel);
}
diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
index e962f133250c..1be1e353d40a 100644
--- a/tools/testing/selftests/bpf/veristat.c
+++ b/tools/testing/selftests/bpf/veristat.c
@@ -2580,7 +2580,7 @@ static void output_stats(const struct verif_stats *s, enum resfmt fmt, bool last
if (last && fmt == RESFMT_TABLE) {
output_header_underlines();
printf("Done. Processed %d files, %d programs. Skipped %d files, %d programs.\n",
- env.files_processed, env.files_skipped, env.progs_processed, env.progs_skipped);
+ env.files_processed, env.progs_processed, env.files_skipped, env.progs_skipped);
}
}
diff --git a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh
index ae8abff4be40..64d3941576d5 100644
--- a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh
+++ b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh
@@ -247,8 +247,8 @@ function listen_port_and_save_to() {
SOCAT_MODE="UDP6-LISTEN"
fi
- # Just wait for 2 seconds
- timeout 2 ip netns exec "${NAMESPACE}" \
+ # Just wait for 3 seconds
+ timeout 3 ip netns exec "${NAMESPACE}" \
socat "${SOCAT_MODE}":"${PORT}",fork "${OUTPUT}" 2> /dev/null
}
diff --git a/tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh b/tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh
index 0441a18f098b..aac8ef490feb 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh
@@ -317,7 +317,7 @@ police_limits_test()
tc filter add dev $swp1 ingress pref 1 proto ip handle 101 \
flower skip_sw \
- action police rate 0.5kbit burst 1m conform-exceed drop/ok
+ action police rate 0.5kbit burst 2k conform-exceed drop/ok
check_fail $? "Incorrect success to add police action with too low rate"
tc filter add dev $swp1 ingress pref 1 proto ip handle 101 \
@@ -327,7 +327,7 @@ police_limits_test()
tc filter add dev $swp1 ingress pref 1 proto ip handle 101 \
flower skip_sw \
- action police rate 1.5kbit burst 1m conform-exceed drop/ok
+ action police rate 1.5kbit burst 2k conform-exceed drop/ok
check_err $? "Failed to add police action with low rate"
tc filter del dev $swp1 ingress protocol ip pref 1 handle 101 flower
diff --git a/tools/testing/selftests/memfd/memfd_test.c b/tools/testing/selftests/memfd/memfd_test.c
index 5b993924cc3f..2ca07ea7202a 100644
--- a/tools/testing/selftests/memfd/memfd_test.c
+++ b/tools/testing/selftests/memfd/memfd_test.c
@@ -18,6 +18,9 @@
#include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
#include <unistd.h>
#include <ctype.h>
@@ -39,6 +42,20 @@
F_SEAL_EXEC)
#define MFD_NOEXEC_SEAL 0x0008U
+union semun {
+ int val;
+ struct semid_ds *buf;
+ unsigned short int *array;
+ struct seminfo *__buf;
+};
+
+/*
+ * we use semaphores on nested wait tasks due the use of CLONE_NEWPID: the
+ * child will be PID 1 and can't send SIGSTOP to themselves due special
+ * treatment of the init task, so the SIGSTOP/SIGCONT synchronization
+ * approach can't be used here.
+ */
+#define SEM_KEY 0xdeadbeef
/*
* Default is not to test hugetlbfs
@@ -1333,8 +1350,22 @@ static int sysctl_nested(void *arg)
static int sysctl_nested_wait(void *arg)
{
- /* Wait for a SIGCONT. */
- kill(getpid(), SIGSTOP);
+ int sem = semget(SEM_KEY, 1, 0600);
+ struct sembuf sembuf;
+
+ if (sem < 0) {
+ perror("semget:");
+ abort();
+ }
+ sembuf.sem_num = 0;
+ sembuf.sem_flg = 0;
+ sembuf.sem_op = 0;
+
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ abort();
+ }
+
return sysctl_nested(arg);
}
@@ -1355,7 +1386,9 @@ static void test_sysctl_sysctl2_failset(void)
static int sysctl_nested_child(void *arg)
{
- int pid;
+ int pid, sem;
+ union semun semun;
+ struct sembuf sembuf;
printf("%s nested sysctl 0\n", memfd_str);
sysctl_assert_write("0");
@@ -1389,23 +1422,53 @@ static int sysctl_nested_child(void *arg)
test_sysctl_sysctl2_failset);
join_thread(pid);
+ sem = semget(SEM_KEY, 1, IPC_CREAT | 0600);
+ if (sem < 0) {
+ perror("semget:");
+ return 1;
+ }
+ semun.val = 1;
+ sembuf.sem_op = -1;
+ sembuf.sem_flg = 0;
+ sembuf.sem_num = 0;
+
/* Verify that the rules are actually inherited after fork. */
printf("%s nested sysctl 0 -> 1 after fork\n", memfd_str);
sysctl_assert_write("0");
+ if (semctl(sem, 0, SETVAL, semun) < 0) {
+ perror("semctl:");
+ return 1;
+ }
+
pid = spawn_thread(CLONE_NEWPID, sysctl_nested_wait,
test_sysctl_sysctl1_failset);
sysctl_assert_write("1");
- kill(pid, SIGCONT);
+
+ /* Allow child to continue */
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ return 1;
+ }
join_thread(pid);
printf("%s nested sysctl 0 -> 2 after fork\n", memfd_str);
sysctl_assert_write("0");
+ if (semctl(sem, 0, SETVAL, semun) < 0) {
+ perror("semctl:");
+ return 1;
+ }
+
pid = spawn_thread(CLONE_NEWPID, sysctl_nested_wait,
test_sysctl_sysctl2_failset);
sysctl_assert_write("2");
- kill(pid, SIGCONT);
+
+ /* Allow child to continue */
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ return 1;
+ }
join_thread(pid);
/*
@@ -1415,28 +1478,62 @@ static int sysctl_nested_child(void *arg)
*/
printf("%s nested sysctl 2 -> 1 after fork\n", memfd_str);
sysctl_assert_write("2");
+
+ if (semctl(sem, 0, SETVAL, semun) < 0) {
+ perror("semctl:");
+ return 1;
+ }
+
pid = spawn_thread(CLONE_NEWPID, sysctl_nested_wait,
test_sysctl_sysctl2);
sysctl_assert_write("1");
- kill(pid, SIGCONT);
+
+ /* Allow child to continue */
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ return 1;
+ }
join_thread(pid);
printf("%s nested sysctl 2 -> 0 after fork\n", memfd_str);
sysctl_assert_write("2");
+
+ if (semctl(sem, 0, SETVAL, semun) < 0) {
+ perror("semctl:");
+ return 1;
+ }
+
pid = spawn_thread(CLONE_NEWPID, sysctl_nested_wait,
test_sysctl_sysctl2);
sysctl_assert_write("0");
- kill(pid, SIGCONT);
+
+ /* Allow child to continue */
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ return 1;
+ }
join_thread(pid);
printf("%s nested sysctl 1 -> 0 after fork\n", memfd_str);
sysctl_assert_write("1");
+
+ if (semctl(sem, 0, SETVAL, semun) < 0) {
+ perror("semctl:");
+ return 1;
+ }
+
pid = spawn_thread(CLONE_NEWPID, sysctl_nested_wait,
test_sysctl_sysctl1);
sysctl_assert_write("0");
- kill(pid, SIGCONT);
+ /* Allow child to continue */
+ if (semop(sem, &sembuf, 1) < 0) {
+ perror("semop:");
+ return 1;
+ }
join_thread(pid);
+ semctl(sem, 0, IPC_RMID);
+
return 0;
}
diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c
index accfd198dbda..83b3563be26b 100644
--- a/tools/testing/selftests/mm/cow.c
+++ b/tools/testing/selftests/mm/cow.c
@@ -1612,8 +1612,8 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc)
* the first sub-page and test if we get another sub-page populated
* automatically.
*/
- FORCE_READ(mem);
- FORCE_READ(smem);
+ FORCE_READ(*mem);
+ FORCE_READ(*smem);
if (!pagemap_is_populated(pagemap_fd, mem + pagesize) ||
!pagemap_is_populated(pagemap_fd, smem + pagesize)) {
ksft_test_result_skip("Did not get THPs populated\n");
@@ -1663,8 +1663,8 @@ static void run_with_memfd(non_anon_test_fn fn, const char *desc)
}
/* Fault the page in. */
- FORCE_READ(mem);
- FORCE_READ(smem);
+ FORCE_READ(*mem);
+ FORCE_READ(*smem);
fn(mem, smem, pagesize);
munmap:
@@ -1719,8 +1719,8 @@ static void run_with_tmpfile(non_anon_test_fn fn, const char *desc)
}
/* Fault the page in. */
- FORCE_READ(mem);
- FORCE_READ(smem);
+ FORCE_READ(*mem);
+ FORCE_READ(*smem);
fn(mem, smem, pagesize);
munmap:
@@ -1773,8 +1773,8 @@ static void run_with_memfd_hugetlb(non_anon_test_fn fn, const char *desc,
}
/* Fault the page in. */
- FORCE_READ(mem);
- FORCE_READ(smem);
+ FORCE_READ(*mem);
+ FORCE_READ(*smem);
fn(mem, smem, hugetlbsize);
munmap:
diff --git a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
index af008fbf2725..eb2d8034de9c 100755
--- a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
+++ b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
@@ -98,12 +98,20 @@ setup_prepare()
h1_create
h2_create
switch_create
+
+ if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
+ sysctl_set net.bridge.bridge-nf-call-iptables 0
+ fi
}
cleanup()
{
pre_cleanup
+ if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
+ sysctl_restore net.bridge.bridge-nf-call-iptables
+ fi
+
switch_destroy
h2_destroy
h1_destroy
diff --git a/tools/testing/selftests/net/forwarding/pedit_ip.sh b/tools/testing/selftests/net/forwarding/pedit_ip.sh
index d14efb2d23b2..9235674627ab 100755
--- a/tools/testing/selftests/net/forwarding/pedit_ip.sh
+++ b/tools/testing/selftests/net/forwarding/pedit_ip.sh
@@ -91,12 +91,20 @@ setup_prepare()
h1_create
h2_create
switch_create
+
+ if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
+ sysctl_set net.bridge.bridge-nf-call-iptables 0
+ fi
}
cleanup()
{
pre_cleanup
+ if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
+ sysctl_restore net.bridge.bridge-nf-call-iptables
+ fi
+
switch_destroy
h2_destroy
h1_destroy
diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
index ea89e558672d..86edbc7e2489 100755
--- a/tools/testing/selftests/net/forwarding/tc_actions.sh
+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
@@ -223,7 +223,7 @@ mirred_egress_to_ingress_tcp_test()
ip_proto icmp \
action drop
- ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
+ ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
local rpid=$!
ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
wait -n $rpid
diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
index b43816dd998c..457f41d5e584 100755
--- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
+++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
@@ -567,6 +567,21 @@ vxlan_encapped_ping_do()
local inner_tos=$1; shift
local outer_tos=$1; shift
+ local ipv4hdr=$(:
+ )"45:"$( : IP version + IHL
+ )"$inner_tos:"$( : IP TOS
+ )"00:54:"$( : IP total length
+ )"99:83:"$( : IP identification
+ )"40:00:"$( : IP flags + frag off
+ )"40:"$( : IP TTL
+ )"01:"$( : IP proto
+ )"CHECKSUM:"$( : IP header csum
+ )"c0:00:02:03:"$( : IP saddr: 192.0.2.3
+ )"c0:00:02:01"$( : IP daddr: 192.0.2.1
+ )
+ local checksum=$(payload_template_calc_checksum "$ipv4hdr")
+ ipv4hdr=$(payload_template_expand_checksum "$ipv4hdr" $checksum)
+
$MZ $dev -c $count -d 100msec -q \
-b $next_hop_mac -B $dest_ip \
-t udp tos=$outer_tos,sp=23456,dp=$VXPORT,p=$(:
@@ -577,16 +592,7 @@ vxlan_encapped_ping_do()
)"$dest_mac:"$( : ETH daddr
)"$(mac_get w2):"$( : ETH saddr
)"08:00:"$( : ETH type
- )"45:"$( : IP version + IHL
- )"$inner_tos:"$( : IP TOS
- )"00:54:"$( : IP total length
- )"99:83:"$( : IP identification
- )"40:00:"$( : IP flags + frag off
- )"40:"$( : IP TTL
- )"01:"$( : IP proto
- )"00:00:"$( : IP header csum
- )"c0:00:02:03:"$( : IP saddr: 192.0.2.3
- )"c0:00:02:01:"$( : IP daddr: 192.0.2.1
+ )"$ipv4hdr:"$( : IPv4 header
)"08:"$( : ICMP type
)"00:"$( : ICMP code
)"8b:f2:"$( : ICMP csum
diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh
index a603f7b0a08f..e642feeada0e 100755
--- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh
+++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh
@@ -695,7 +695,7 @@ vxlan_encapped_ping_do()
)"6"$( : IP version
)"$inner_tos"$( : Traffic class
)"0:00:00:"$( : Flow label
- )"00:08:"$( : Payload length
+ )"00:03:"$( : Payload length
)"3a:"$( : Next header
)"04:"$( : Hop limit
)"$saddr:"$( : IP saddr
diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh
index 0ec131b339bc..b40694573f4c 100644
--- a/tools/testing/selftests/net/lib.sh
+++ b/tools/testing/selftests/net/lib.sh
@@ -577,7 +577,7 @@ ip_link_has_flag()
local flag=$1; shift
local state=$(ip -j link show "$name" |
- jq --arg flag "$flag" 'any(.[].flags.[]; . == $flag)')
+ jq --arg flag "$flag" 'any(.[].flags[]; . == $flag)')
[[ $state == true ]]
}
diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c
index 195f04c4d158..b9c1bfb6cc02 100644
--- a/tools/testing/selftests/resctrl/resctrlfs.c
+++ b/tools/testing/selftests/resctrl/resctrlfs.c
@@ -243,6 +243,16 @@ int snc_nodes_per_l3_cache(void)
}
snc_mode = cache_cpus / node_cpus;
+ /*
+ * On some platforms (e.g. Hygon),
+ * cache_cpus < node_cpus, the calculated snc_mode is 0.
+ *
+ * Set snc_mode = 1 to indicate that SNC mode is not
+ * supported on the platform.
+ */
+ if (!snc_mode)
+ snc_mode = 1;
+
if (snc_mode > 1)
ksft_print_msg("SNC-%d mode discovered.\n", snc_mode);
} | {
"author": "Greg Kroah-Hartman <gregkh@linuxfoundation.org>",
"date": "Thu, 26 Feb 2026 15:14:57 -0800",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Thu, Feb 26, 2026 at 11:46:02PM -0500, Kris Karas (Bug Reporting) wrote:
Ick, not good. Can you do 'git bisect' to find the problem commit? As
you have a pretty reliable reproducer it should go pretty fast.
But first, does 7.0-rc1 work or also crash the same way?
thanks,
greg k-h | {
"author": "Greg KH <gregkh@linuxfoundation.org>",
"date": "Thu, 26 Feb 2026 20:56:59 -0800",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | GregKH wrote:
Just tried 6.19.4 (and 6.18.14) and am getting a repeatable Oops right
when networking is initialized, likely when nft is loading its ruleset
from /etc/nftables/*.conf
Once the nft Oops triggers, other processes start to throw errors with
memory allocate/free, resulting very quickly in an unusable system. I
have several systems that run iptables, which are unaffected, notably my
border router with 400+ rules. I have three systems running nftables,
one of which is affected, the affected one having the more sophisticated
nft ruleset (bridging, 802.1Q, etc).
Kris
---------- Snip ----------
Here's the output from dmesg: | {
"author": "\"Kris Karas (Bug Reporting)\" <bugs-a21@moonlit-rail.com>",
"date": "Thu, 26 Feb 2026 23:46:02 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | Greg KH wrote:
Sure, I'll start a bisect. In the meantime...
Appears OK. I'm typing this on the affected system, running 7.0-rc1,
and even with a couple manual network restarts, it seems fine. Likely
it's an issue with the backport to 6.x.
Kris | {
"author": "\"Kris Karas (Bug Reporting)\" <bugs-a21@moonlit-rail.com>",
"date": "Fri, 27 Feb 2026 00:27:33 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | Greg KH wrote:
Bisect complete (from 6.19.3 to 6.19.4)
[snip]
Kris
P.S. I ran the bisect from 7.0-rc1, so many reboots there, and
it is fine. The bug only seems to affect 6.x | {
"author": "\"Kris Karas (Bug Reporting)\" <bugs-a21@moonlit-rail.com>",
"date": "Fri, 27 Feb 2026 01:26:11 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Fri, 2026-02-27 at 01:26 -0500, Kris Karas (Bug Reporting) wrote:
In my case, 7.0-rc1 also boots just fine, but when attempting to load
the nftables rules, nft gives an error and rules are not loaded. The
same rules work fine in 6.19.3.
Do you anything similar?
Linux version 7.0.0-rc1-custom-1-00124-g3f4a08e64442 ...
...
In file included from /etc/nftables.conf:134:2-44:
./etc/nftables.d/set_filter.conf:1746:7-21: Error:
Could not process rule: File exists
xx.xxx.xxx.x/23,
^^^^^^^^^^^^^^^
The line falls somewhere in the middle of list of set elements that are
all ip addresses.
Reported here [1]
gene
[1]https://lore.kernel.org/lkml/a529a6a9a2755d45765f20b58c5c11e2f790eacb.camel@sapience.com/ | {
"author": "Genes Lists <lists@sapience.com>",
"date": "Fri, 27 Feb 2026 07:09:00 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Fri, 2026-02-27 at 07:09 -0500, Genes Lists wrote:
Sorry for noise, not kernel related.
Resolved by updated userspace.
Resolved by rebuilding userspace nftables on 6.19.4.
I used git head for all.
nft rules now load without error using:
- nftables commit de904e22faa2e450d0d4802e1d9bc22013044f93
- libmnl commit 54dea548d796653534645c6e3c8577eaf7d77411
- libnftnl commit 5c5a8385dc974ea7887119963022ae988e2a16cc
gene | {
"author": "Genes Lists <lists@sapience.com>",
"date": "Fri, 27 Feb 2026 08:18:52 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Fri, Feb 27, 2026 at 08:18:52AM -0500, Genes Lists wrote:
Yet 7.0-rc1 worked just fine? That feels wrong... | {
"author": "Greg KH <gregkh@linuxfoundation.org>",
"date": "Fri, 27 Feb 2026 08:32:07 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Fri, 2026-02-27 at 08:32 -0500, Greg KH wrote:
Sorry if was not clear. Only 6.19.4 has kernel crash.
The summary is:
- 7.0-rc1 - no kernel issues
boots fine and does not crash when nftables is invoked.
But, It has an nft error and fails to load rules with
older nftables userspace.
Same rules load fine using updated nftables.
- 6.19.4 - crashes whenever nftables is invoked.
Does not matter which userspace nftables is used, older or newer
- 6.19.3 - works fine.
I will report back soon as have finished testing 6.19.4 with commit
f175b46d9134
gene | {
"author": "Genes Lists <lists@sapience.com>",
"date": "Fri, 27 Feb 2026 08:59:28 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | I'm announcing the release of the 6.19.4 kernel.
All users of the 6.19 kernel series must upgrade.
The updated 6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-driver-intel-xe-sriov | 2
Documentation/PCI/endpoint/pci-vntb-howto.rst | 14
Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml | 13
Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml | 28
Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml | 6
Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml | 4
Documentation/networking/ip-sysctl.rst | 7
Documentation/trace/events-pci.rst | 74
Documentation/trace/index.rst | 1
Makefile | 13
arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1
arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 1
arch/arm/kernel/vdso.c | 1
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 2
arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2
arch/arm64/boot/dts/freescale/imx95-clock.h | 1
arch/arm64/boot/dts/freescale/imx95.dtsi | 2
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2
arch/arm64/boot/dts/qcom/agatti.dtsi | 8
arch/arm64/boot/dts/qcom/hamoa.dtsi | 8
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2
arch/arm64/boot/dts/qcom/sdm630.dtsi | 4
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8
arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4
arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4
arch/arm64/boot/dts/qcom/talos.dtsi | 1
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 1
arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 4
arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 4
arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58
arch/arm64/mm/gcs.c | 4
arch/arm64/net/bpf_jit_comp.c | 2
arch/loongarch/net/bpf_jit.c | 2
arch/mips/Kconfig | 1
arch/mips/kernel/relocate.c | 13
arch/powerpc/include/asm/eeh.h | 2
arch/powerpc/include/asm/kup.h | 2
arch/powerpc/include/asm/uaccess.h | 4
arch/powerpc/kernel/eeh_driver.c | 11
arch/powerpc/kernel/eeh_pe.c | 74
arch/powerpc/net/bpf_jit_comp.c | 2
arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4
arch/s390/Kconfig | 3
arch/x86/events/core.c | 4
arch/x86/hyperv/hv_crash.c | 2
arch/x86/hyperv/hv_vtl.c | 8
arch/x86/include/asm/ftrace.h | 2
arch/x86/kernel/cpu/amd.c | 30
arch/x86/kernel/ftrace_64.S | 5
arch/x86/xen/enlighten.c | 2
block/ioctl.c | 34
drivers/accel/amdxdna/aie2_ctx.c | 66
drivers/accel/amdxdna/aie2_message.c | 63
drivers/accel/amdxdna/aie2_msg_priv.h | 3
drivers/accel/amdxdna/aie2_pci.c | 2
drivers/accel/amdxdna/aie2_pci.h | 2
drivers/accel/amdxdna/aie2_pm.c | 20
drivers/accel/amdxdna/aie2_smu.c | 29
drivers/accel/amdxdna/amdxdna_ctx.h | 6
drivers/accel/amdxdna/amdxdna_mailbox.c | 27
drivers/accel/amdxdna/amdxdna_pci_drv.c | 5
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2
drivers/accel/amdxdna/amdxdna_pm.c | 22
drivers/accel/amdxdna/amdxdna_ubuf.c | 10
drivers/accel/amdxdna/npu4_regs.c | 1
drivers/acpi/acpica/evregion.c | 4
drivers/acpi/cppc_acpi.c | 4
drivers/acpi/power.c | 13
drivers/acpi/processor_driver.c | 2
drivers/ata/libata-core.c | 76
drivers/ata/libata-eh.c | 28
drivers/ata/libata-scsi.c | 174 +-
drivers/ata/libata.h | 2
drivers/ata/pata_ftide010.c | 6
drivers/auxdisplay/arm-charlcd.c | 2
drivers/base/power/wakeirq.c | 9
drivers/base/power/wakeup.c | 4
drivers/block/drbd/drbd_main.c | 3
drivers/block/drbd/drbd_nl.c | 20
drivers/block/rnbd/rnbd-srv.c | 33
drivers/block/ublk_drv.c | 64
drivers/bluetooth/btintel_pcie.c | 9
drivers/char/hw_random/airoha-trng.c | 1
drivers/char/hw_random/core.c | 168 +-
drivers/char/misc_minor_kunit.c | 2
drivers/char/tpm/st33zp24/st33zp24.c | 6
drivers/char/tpm/tpm_i2c_infineon.c | 6
drivers/clk/actions/owl-composite.c | 11
drivers/clk/actions/owl-divider.c | 17
drivers/clk/actions/owl-divider.h | 5
drivers/clk/clk-bm1880.c | 5
drivers/clk/clk-loongson1.c | 5
drivers/clk/clk-milbeaut.c | 5
drivers/clk/clk-versaclock3.c | 7
drivers/clk/hisilicon/clkdivider-hi6220.c | 6
drivers/clk/mediatek/clk-mt7981-eth.c | 6
drivers/clk/mediatek/clk-mt8196-mfg.c | 13
drivers/clk/mediatek/clk-mt8516.c | 2
drivers/clk/mediatek/clk-mtk.c | 12
drivers/clk/mediatek/clk-pll.c | 3
drivers/clk/mediatek/clk-pll.h | 1
drivers/clk/meson/g12a.c | 17
drivers/clk/meson/gxbb.c | 17
drivers/clk/microchip/clk-core.c | 10
drivers/clk/nuvoton/clk-ma35d1-divider.c | 7
drivers/clk/nxp/clk-lpc32xx.c | 6
drivers/clk/qcom/clk-alpha-pll.c | 21
drivers/clk/qcom/clk-rcg2.c | 7
drivers/clk/qcom/clk-regmap-divider.c | 16
drivers/clk/qcom/common.c | 2
drivers/clk/qcom/dispcc-sdm845.c | 4
drivers/clk/qcom/dispcc-sm7150.c | 2
drivers/clk/qcom/gcc-glymur.c | 4
drivers/clk/qcom/gcc-ipq5018.c | 1
drivers/clk/qcom/gcc-milos.c | 6
drivers/clk/qcom/gcc-msm8917.c | 1
drivers/clk/qcom/gcc-msm8953.c | 1
drivers/clk/qcom/gcc-qdu1000.c | 4
drivers/clk/qcom/gcc-sdx75.c | 4
drivers/clk/qcom/gcc-sm4450.c | 6
drivers/clk/qcom/gcc-sm8450.c | 4
drivers/clk/qcom/gcc-sm8550.c | 4
drivers/clk/qcom/gcc-sm8650.c | 4
drivers/clk/qcom/gcc-sm8750.c | 4
drivers/clk/qcom/gcc-x1e80100.c | 4
drivers/clk/rockchip/clk.c | 2
drivers/clk/sophgo/clk-sg2042-clkgen.c | 15
drivers/clk/spacemit/Makefile | 9
drivers/clk/spacemit/ccu-k1.c | 1
drivers/clk/spacemit/ccu_common.c | 6
drivers/clk/spacemit/ccu_ddn.c | 1
drivers/clk/spacemit/ccu_mix.c | 9
drivers/clk/spacemit/ccu_pll.c | 1
drivers/clk/sprd/div.c | 6
drivers/clk/stm32/clk-stm32-core.c | 42
drivers/clk/thead/clk-th1520-ap.c | 34
drivers/clk/x86/clk-cgu.c | 6
drivers/clk/zynqmp/divider.c | 10
drivers/clk/zynqmp/pll.c | 5
drivers/clocksource/timer-sp804.c | 14
drivers/cpufreq/intel_pstate.c | 2
drivers/cpufreq/scmi-cpufreq.c | 1
drivers/cpuidle/cpuidle.c | 10
drivers/cpuidle/governors/menu.c | 22
drivers/crypto/caam/caamalg_qi2.c | 27
drivers/crypto/caam/caamalg_qi2.h | 2
drivers/crypto/cavium/cpt/cptvf_main.c | 3
drivers/crypto/ccp/ccp-ops.c | 2
drivers/crypto/ccp/psp-dev.c | 11
drivers/crypto/ccp/sev-dev.c | 59
drivers/crypto/ccp/sp-dev.c | 12
drivers/crypto/ccp/sp-dev.h | 3
drivers/crypto/ccp/sp-pci.c | 16
drivers/crypto/ccp/tee-dev.c | 56
drivers/crypto/ccp/tee-dev.h | 1
drivers/crypto/hisilicon/Kconfig | 1
drivers/crypto/hisilicon/hpre/hpre.h | 5
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 416 ++---
drivers/crypto/hisilicon/hpre/hpre_main.c | 2
drivers/crypto/hisilicon/qm.c | 112 +
drivers/crypto/hisilicon/sec2/sec.h | 7
drivers/crypto/hisilicon/sec2/sec_crypto.c | 159 +
drivers/crypto/hisilicon/sec2/sec_main.c | 21
drivers/crypto/hisilicon/sgl.c | 2
drivers/crypto/hisilicon/trng/trng.c | 121 +
drivers/crypto/hisilicon/zip/zip.h | 2
drivers/crypto/hisilicon/zip/zip_crypto.c | 133 -
drivers/crypto/hisilicon/zip/zip_main.c | 4
drivers/crypto/inside-secure/eip93/eip93-main.c | 94 -
drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c | 10
drivers/crypto/intel/qat/qat_common/qat_asym_algs.c | 12
drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3
drivers/crypto/starfive/jh7110-aes.c | 9
drivers/cxl/core/edac.c | 64
drivers/cxl/core/hdm.c | 7
drivers/cxl/core/memdev.c | 1
drivers/cxl/core/port.c | 8
drivers/cxl/cxlmem.h | 5
drivers/dma/dma-axi-dmac.c | 11
drivers/dma/fsl-edma-main.c | 1
drivers/dma/mediatek/mtk-uart-apdma.c | 10
drivers/dpll/zl3073x/dpll.c | 12
drivers/dpll/zl3073x/ref.h | 2
drivers/edac/altera_edac.c | 11
drivers/edac/amd64_edac.c | 2
drivers/edac/i5000_edac.c | 1
drivers/edac/i5400_edac.c | 2
drivers/firmware/arm_ffa/driver.c | 33
drivers/firmware/cirrus/cs_dsp.c | 31
drivers/firmware/efi/efi.c | 8
drivers/gpib/common/iblib.c | 5
drivers/gpib/ni_usb/ni_usb_gpib.c | 14
drivers/gpio/gpio-amd-fch.c | 7
drivers/gpio/gpiolib-cdev.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 -
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45
drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 3
drivers/gpu/drm/amd/display/dc/dc.h | 2
drivers/gpu/drm/amd/display/dc/dc_types.h | 2
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 60
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 23
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h | 12
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 55
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4
drivers/gpu/drm/amd/display/dc/link/link_detection.c | 13
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 14
drivers/gpu/drm/amd/display/dc/link/link_factory.c | 61
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 14
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c | 2
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c | 12
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 9
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 8
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c | 8
drivers/gpu/drm/amd/include/amd_shared.h | 1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 2
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3
drivers/gpu/drm/drm_atomic.c | 32
drivers/gpu/drm/drm_atomic_helper.c | 1
drivers/gpu/drm/drm_buddy.c | 1
drivers/gpu/drm/drm_plane.c | 4
drivers/gpu/drm/exynos/exynos_drm_drv.h | 1
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 36
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4
drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8
drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71
drivers/gpu/drm/i915/display/intel_acpi.c | 1
drivers/gpu/drm/i915/display/intel_colorop.c | 2
drivers/gpu/drm/i915/display/intel_colorop.h | 4
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 1
drivers/gpu/drm/i915/display/intel_fbc.c | 10
drivers/gpu/drm/i915/display/intel_fbc.h | 3
drivers/gpu/drm/i915/display/skl_universal_plane.c | 36
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 66
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 7
drivers/gpu/drm/msm/disp/mdp_format.c | 8
drivers/gpu/drm/msm/dp/dp_ctrl.c | 24
drivers/gpu/drm/msm/dp/dp_display.c | 4
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7
drivers/gpu/drm/msm/msm_mdss.c | 2
drivers/gpu/drm/panel/panel-lg-sw43408.c | 4
drivers/gpu/drm/panthor/panthor_fw.c | 5
drivers/gpu/drm/panthor/panthor_gpu.c | 21
drivers/gpu/drm/panthor/panthor_mmu.c | 4
drivers/gpu/drm/panthor/panthor_sched.c | 191 +-
drivers/gpu/drm/panthor/panthor_sched.h | 1
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 7
drivers/gpu/drm/vkms/vkms_composer.c | 1
drivers/gpu/drm/vkms/vkms_drv.c | 1
drivers/gpu/drm/xe/xe_bo.c | 2
drivers/gpu/drm/xe/xe_configfs.h | 12
drivers/gpu/drm/xe/xe_device.c | 1
drivers/gpu/drm/xe/xe_guc_pc.c | 34
drivers/gpu/drm/xe/xe_mmio.c | 10
drivers/gpu/drm/xe/xe_module.h | 2
drivers/gpu/drm/xe/xe_pci.c | 6
drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 54
drivers/gpu/drm/xe/xe_wa.c | 18
drivers/gpu/nova-core/falcon.rs | 11
drivers/hid/hid-playstation.c | 4
drivers/hid/intel-ish-hid/ishtp/bus.c | 2
drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2
drivers/hv/mshv_eventfd.c | 5
drivers/hv/vmbus_drv.c | 66
drivers/hwmon/ibmpex.c | 9
drivers/hwmon/pmbus/mpq8785.c | 28
drivers/hwspinlock/omap_hwspinlock.c | 4
drivers/hwtracing/coresight/coresight-etm3x-core.c | 12
drivers/hwtracing/coresight/coresight-tmc-etr.c | 13
drivers/hwtracing/stm/Kconfig | 4
drivers/i3c/master.c | 6
drivers/i3c/master/dw-i3c-master.c | 3
drivers/iio/accel/sca3000.c | 6
drivers/iio/gyro/mpu3050-core.c | 6
drivers/iio/pressure/mprls0025pa.c | 36
drivers/iio/pressure/mprls0025pa.h | 2
drivers/iio/pressure/mprls0025pa_spi.c | 19
drivers/iio/test/Kconfig | 1
drivers/infiniband/core/cache.c | 3
drivers/infiniband/core/iwcm.c | 56
drivers/infiniband/core/iwcm.h | 1
drivers/infiniband/core/rw.c | 53
drivers/infiniband/core/user_mad.c | 8
drivers/infiniband/core/uverbs_cmd.c | 7
drivers/infiniband/hw/hns/hns_roce_ah.c | 23
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 54
drivers/infiniband/hw/hns/hns_roce_restrack.c | 4
drivers/infiniband/hw/mlx5/main.c | 101 +
drivers/infiniband/hw/mlx5/mlx5_ib.h | 2
drivers/infiniband/hw/mlx5/std_types.c | 4
drivers/infiniband/sw/rxe/rxe_comp.c | 3
drivers/infiniband/sw/rxe/rxe_mr.c | 281 ++-
drivers/infiniband/sw/rxe/rxe_req.c | 3
drivers/infiniband/sw/rxe/rxe_srq.c | 6
drivers/infiniband/sw/rxe/rxe_verbs.h | 10
drivers/infiniband/sw/siw/siw_qp_rx.c | 3
drivers/infiniband/ulp/rtrs/rtrs-srv.c | 33
drivers/interconnect/mediatek/icc-emi.c | 9
drivers/interconnect/qcom/qcs8300.c | 2
drivers/iommu/amd/amd_iommu.h | 1
drivers/iommu/amd/init.c | 12
drivers/iommu/amd/iommu.c | 5
drivers/iommu/generic_pt/fmt/amdv1.h | 3
drivers/iommu/generic_pt/fmt/x86_64.h | 3
drivers/iommu/intel/iommu.c | 33
drivers/iommu/intel/iommu.h | 21
drivers/iommu/intel/nested.c | 9
drivers/iommu/intel/pasid.c | 202 --
drivers/iommu/intel/pasid.h | 28
drivers/irqchip/irq-sifive-plic.c | 82 -
drivers/leds/leds-expresswire.c | 24
drivers/leds/rgb/leds-qcom-lpg.c | 8
drivers/mailbox/pcc.c | 102 -
drivers/mcb/mcb-core.c | 9
drivers/md/dm-zone.c | 11
drivers/md/dm.c | 2
drivers/md/md-llbitmap.c | 4
drivers/md/md.h | 4
drivers/md/raid1.c | 1
drivers/md/raid10.c | 2
drivers/md/raid5.c | 10
drivers/media/i2c/ccs/ccs-core.c | 16
drivers/media/pci/mgb4/mgb4_trigger.c | 2
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 4
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 4
drivers/media/usb/uvc/uvc_video.c | 3
drivers/mfd/Kconfig | 11
drivers/mfd/arizona-core.c | 2
drivers/mfd/sec-irq.c | 1
drivers/mfd/simple-mfd-i2c.c | 1
drivers/mtd/devices/mtd_intel_dg.c | 9
drivers/mtd/nand/raw/cadence-nand-controller.c | 2
drivers/mtd/parsers/ofpart_core.c | 16
drivers/mtd/parsers/tplink_safeloader.c | 1
drivers/net/bonding/bond_main.c | 21
drivers/net/caif/caif_serial.c | 5
drivers/net/ethernet/amd/Kconfig | 2
drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 11
drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 21
drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 64
drivers/net/ethernet/marvell/octeon_ep/octep_main.h | 2
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h | 1
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 8
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 3
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 39
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 2
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 11
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 41
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 1
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 14
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 52
drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 10
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 13
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40
drivers/net/ethernet/mellanox/mlx5/core/wc.c | 14
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 20
drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 19
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 5
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 2
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 2
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2
drivers/net/ethernet/mscc/ocelot_net.c | 75
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 7
drivers/net/ethernet/renesas/rswitch_l2.c | 15
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
drivers/net/ethernet/sun/sunhme.c | 3
drivers/net/macvlan.c | 5
drivers/net/mctp/mctp-i2c.c | 9
drivers/net/ovpn/io.c | 55
drivers/net/ovpn/socket.c | 39
drivers/net/ovpn/tcp.c | 23
drivers/net/ovpn/udp.c | 1
drivers/net/usb/catc.c | 37
drivers/net/wireless/ath/ath10k/sdio.c | 6
drivers/net/wireless/ath/ath11k/core.c | 27
drivers/net/wireless/ath/ath11k/core.h | 4
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 8
drivers/net/wireless/ath/ath12k/mac.c | 4
drivers/net/wireless/ath/ath12k/wow.c | 16
drivers/net/wireless/ath/ath9k/Kconfig | 2
drivers/net/wireless/ath/ath9k/common-debug.h | 8
drivers/net/wireless/ath/ath9k/debug.h | 15
drivers/net/wireless/realtek/rtw89/core.c | 6
drivers/net/wireless/realtek/rtw89/core.h | 2
drivers/net/wireless/realtek/rtw89/debug.c | 8
drivers/net/xen-netback/xenbus.c | 5
drivers/nvdimm/nd_virtio.c | 3
drivers/nvdimm/virtio_pmem.c | 1
drivers/nvdimm/virtio_pmem.h | 4
drivers/nvmem/Kconfig | 2
drivers/of/unittest.c | 6
drivers/opp/core.c | 2
drivers/pci/controller/cadence/pcie-cadence.c | 4
drivers/pci/controller/dwc/pci-dra7xx.c | 1
drivers/pci/controller/dwc/pci-imx6.c | 3
drivers/pci/controller/dwc/pci-keystone.c | 1
drivers/pci/controller/dwc/pcie-artpec6.c | 1
drivers/pci/controller/dwc/pcie-designware-ep.c | 395 +++-
drivers/pci/controller/dwc/pcie-designware-plat.c | 1
drivers/pci/controller/dwc/pcie-designware.c | 59
drivers/pci/controller/dwc/pcie-designware.h | 26
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 6
drivers/pci/controller/dwc/pcie-keembay.c | 1
drivers/pci/controller/dwc/pcie-nxp-s32g.c | 8
drivers/pci/controller/dwc/pcie-qcom-ep.c | 1
drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1
drivers/pci/controller/dwc/pcie-sophgo.c | 18
drivers/pci/controller/dwc/pcie-stm32-ep.c | 1
drivers/pci/controller/dwc/pcie-tegra194.c | 1
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2
drivers/pci/controller/pcie-mediatek.c | 4
drivers/pci/controller/pcie-rzg3s-host.c | 30
drivers/pci/controller/pcie-xilinx.c | 9
drivers/pci/endpoint/functions/pci-epf-mhi.c | 2
drivers/pci/endpoint/functions/pci-epf-ntb.c | 9
drivers/pci/endpoint/functions/pci-epf-test.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9
drivers/pci/endpoint/pci-epc-core.c | 8
drivers/pci/hotplug/pnv_php.c | 2
drivers/pci/hotplug/shpchp_core.c | 3
drivers/pci/p2pdma.c | 10
drivers/pci/pci-acpi.c | 59
drivers/pci/pci.c | 13
drivers/pci/pci.h | 26
drivers/pci/pcie/aer.c | 3
drivers/pci/pcie/portdrv.c | 6
drivers/pci/pcie/ptm.c | 5
drivers/pci/probe.c | 35
drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 6
drivers/pci/quirks.c | 5
drivers/pci/setup-bus.c | 140 -
drivers/perf/arm_spe_pmu.c | 18
drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 10
drivers/pinctrl/pinctrl-equilibrium.c | 1
drivers/pinctrl/pinctrl-k230.c | 7
drivers/pinctrl/pinctrl-single.c | 2
drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2
drivers/platform/chrome/cros_ec_lightbar.c | 2
drivers/platform/chrome/cros_typec_switch.c | 6
drivers/platform/x86/amd/pmf/core.c | 62
drivers/platform/x86/amd/pmf/pmf.h | 10
drivers/platform/x86/amd/pmf/tee-if.c | 12
drivers/platform/x86/hp/hp-wmi.c | 179 +-
drivers/platform/x86/intel/int0002_vgpio.c | 4
drivers/power/reset/nvmem-reboot-mode.c | 15
drivers/power/supply/ab8500_charger.c | 40
drivers/power/supply/act8945a_charger.c | 16
drivers/power/supply/bq256xx_charger.c | 12
drivers/power/supply/bq25980_charger.c | 12
drivers/power/supply/bq27xxx_battery.c | 6
drivers/power/supply/cpcap-battery.c | 8
drivers/power/supply/goldfish_battery.c | 12
drivers/power/supply/pf1550-charger.c | 32
drivers/power/supply/pm8916_bms_vm.c | 18
drivers/power/supply/pm8916_lbc.c | 18
drivers/power/supply/qcom_battmgr.c | 3
drivers/power/supply/rt9455_charger.c | 17
drivers/power/supply/sbs-battery.c | 36
drivers/power/supply/wm97xx_battery.c | 34
drivers/powercap/intel_rapl_common.c | 6
drivers/powercap/intel_rapl_msr.c | 12
drivers/powercap/intel_rapl_tpmi.c | 2
drivers/pwm/pwm-tiehrpwm.c | 6
drivers/regulator/core.c | 78
drivers/regulator/mt6363-regulator.c | 9
drivers/remoteproc/imx_dsp_rproc.c | 58
drivers/remoteproc/imx_rproc.c | 2
drivers/reset/Kconfig | 2
drivers/rtc/rtc-amlogic-a4.c | 2
drivers/s390/cio/css.c | 2
drivers/scsi/csiostor/csio_scsi.c | 3
drivers/scsi/elx/efct/efct_driver.c | 8
drivers/scsi/smartpqi/smartpqi_init.c | 13
drivers/soc/mediatek/mtk-svs.c | 5
drivers/soc/qcom/cmd-db.c | 7
drivers/soc/qcom/smem.c | 4
drivers/soundwire/Kconfig | 1
drivers/spi/spi-cadence-quadspi.c | 4
drivers/spi/spi-microchip-core-spi.c | 2
drivers/spi/spi-wpcm-fiu.c | 2
drivers/staging/greybus/light.c | 8
drivers/thermal/intel/x86_pkg_temp_thermal.c | 3
drivers/thermal/thermal_of.c | 4
drivers/tty/serial/Kconfig | 8
drivers/ufs/host/Kconfig | 1
drivers/ufs/host/ufs-mediatek.c | 12
drivers/usb/cdns3/core.c | 2
drivers/usb/gadget/udc/bdc/bdc_core.c | 4
drivers/usb/typec/tcpm/fusb302.c | 3
drivers/usb/typec/ucsi/Kconfig | 1
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2
drivers/vfio/pci/vfio_pci_core.c | 17
drivers/video/backlight/aw99706.c | 2
drivers/video/backlight/qcom-wled.c | 42
drivers/video/fbdev/au1200fb.c | 6
drivers/video/of_display_timing.c | 6
drivers/watchdog/starfive-wdt.c | 2
drivers/xen/balloon.c | 19
drivers/xen/grant-dma-ops.c | 3
drivers/xen/unpopulated-alloc.c | 3
fs/btrfs/bio.c | 19
fs/btrfs/bio.h | 3
fs/btrfs/block-group.c | 10
fs/btrfs/block-rsv.c | 7
fs/btrfs/qgroup.c | 15
fs/btrfs/transaction.c | 9
fs/btrfs/volumes.c | 243 ++-
fs/erofs/fileio.c | 20
fs/erofs/zdata.c | 37
fs/ext4/ext4.h | 16
fs/ext4/extents.c | 66
fs/ext4/fast_commit.c | 51
fs/ext4/mballoc-test.c | 2
fs/ext4/mballoc.c | 73
fs/fat/namei_msdos.c | 7
fs/fat/namei_vfat.c | 7
fs/file_table.c | 10
fs/fs_struct.c | 1
fs/gfs2/bmap.c | 13
fs/gfs2/glock.c | 36
fs/gfs2/glock.h | 3
fs/gfs2/inode.c | 18
fs/gfs2/log.c | 7
fs/gfs2/lops.c | 39
fs/gfs2/lops.h | 4
fs/gfs2/ops_fstype.c | 2
fs/gfs2/quota.c | 1
fs/gfs2/super.c | 4
fs/hfsplus/bnode.c | 2
fs/iomap/buffered-io.c | 51
fs/iomap/direct-io.c | 10
fs/jfs/jfs_dtree.c | 4
fs/netfs/write_retry.c | 1
fs/nfs/dir.c | 4
fs/nfs/localio.c | 92 -
fs/nfs/pnfs.c | 3
fs/nfsd/export.c | 8
fs/nfsd/nfs2acl.c | 2
fs/nfsd/nfs4idmap.c | 48
fs/nfsd/nfs4proc.c | 2
fs/nfsd/nfs4xdr.c | 16
fs/nfsd/nfsproc.c | 2
fs/ntfs3/file.c | 10
fs/ntfs3/frecord.c | 10
fs/ntfs3/fslog.c | 3
fs/ntfs3/inode.c | 5
fs/ntfs3/ntfs_fs.h | 2
fs/ntfs3/super.c | 9
fs/overlayfs/readdir.c | 2
fs/pidfs.c | 2
fs/proc/array.c | 2
fs/pstore/ram_core.c | 11
fs/quota/quota.c | 1
fs/smb/client/fs_context.c | 4
fs/smb/client/smb2file.c | 2
fs/smb/client/smbdirect.c | 19
fs/smb/server/smb2pdu.c | 4
fs/tests/exec_kunit.c | 6
include/acpi/pcc.h | 29
include/asm-generic/rqspinlock.h | 2
include/drm/drm_atomic.h | 39
include/drm/intel/intel_lb_mei_interface.h | 3
include/linux/ata.h | 1
include/linux/audit.h | 6
include/linux/audit_arch.h | 7
include/linux/bpf.h | 5
include/linux/bpf_mprog.h | 10
include/linux/capability.h | 6
include/linux/clk.h | 48
include/linux/device_cgroup.h | 2
include/linux/exportfs.h | 9
include/linux/filter.h | 26
include/linux/ftrace.h | 7
include/linux/hisi_acc_qm.h | 13
include/linux/hw_random.h | 2
include/linux/input/adp5589.h | 180 --
include/linux/intel_rapl.h | 2
include/linux/interrupt.h | 2
include/linux/io_uring_types.h | 7
include/linux/leds-expresswire.h | 3
include/linux/libata.h | 7
include/linux/mfd/wm8350/core.h | 2
include/linux/mlx5/driver.h | 4
include/linux/module.h | 9
include/linux/mtd/spinand.h | 2
include/linux/pci-epc.h | 9
include/linux/pci-epf.h | 23
include/linux/psp.h | 1
include/linux/seq_file.h | 1
include/linux/seqlock.h | 17
include/linux/skmsg.h | 70
include/linux/soc/qcom/ubwc.h | 1
include/linux/string.h | 4
include/linux/sunrpc/xdrgen/_builtins.h | 20
include/linux/u64_stats_sync.h | 10
include/net/bluetooth/hci_core.h | 2
include/net/inet_ecn.h | 20
include/net/ipv6.h | 11
include/net/netfilter/nf_conntrack_count.h | 1
include/net/netfilter/nf_queue.h | 4
include/net/netfilter/nf_tables.h | 4
include/net/netns/ipv4.h | 9
include/net/tcp.h | 31
include/net/tcp_ecn.h | 66
include/rdma/rw.h | 2
include/sound/sdca_jack.h | 32
include/uapi/drm/amdgpu_drm.h | 6
include/uapi/linux/nfs.h | 2
include/ufs/ufshcd.h | 4
include/xen/xen.h | 2
io_uring/cancel.h | 6
io_uring/io_uring.c | 14
io_uring/kbuf.c | 5
io_uring/msg_ring.c | 12
io_uring/register.c | 3
io_uring/sync.c | 2
ipc/ipc_sysctl.c | 2
kernel/bpf/bpf_insn_array.c | 2
kernel/bpf/core.c | 4
kernel/bpf/helpers.c | 2
kernel/bpf/rqspinlock.c | 7
kernel/bpf/syscall.c | 19
kernel/bpf/trampoline.c | 32
kernel/bpf/verifier.c | 79
kernel/kallsyms.c | 9
kernel/module/kallsyms.c | 9
kernel/rcu/rcutorture.c | 4
kernel/rcu/tree.h | 2
kernel/rcu/tree_plugin.h | 15
kernel/sched/core.c | 8
kernel/sched/deadline.c | 3
kernel/sched/rt.c | 5
kernel/time/hrtimer.c | 2
kernel/time/sched_clock.c | 2
kernel/trace/blktrace.c | 2
kernel/trace/bpf_trace.c | 6
kernel/trace/ftrace.c | 19
kernel/trace/trace_events.c | 5
kernel/trace/trace_events_hist.c | 2
kernel/ucount.c | 2
kernel/workqueue.c | 75
lib/Kconfig.debug | 2
lib/kstrtox.c | 4
lib/objpool.c | 2
mm/slub.c | 20
net/atm/signaling.c | 56
net/bluetooth/hci_conn.c | 17
net/bluetooth/hci_event.c | 30
net/bridge/br_multicast.c | 45
net/core/dev.c | 2
net/core/filter.c | 22
net/core/skbuff.c | 7
net/core/skmsg.c | 30
net/ipv4/icmp.c | 32
net/ipv4/ping.c | 31
net/ipv4/tcp.c | 3
net/ipv4/tcp_bpf.c | 25
net/ipv4/tcp_cong.c | 5
net/ipv4/tcp_input.c | 5
net/ipv4/tcp_minisocks.c | 7
net/ipv4/udp_bpf.c | 23
net/ipv6/af_inet6.c | 2
net/ipv6/icmp.c | 13
net/ipv6/ip6_fib.c | 2
net/mctp/device.c | 1
net/mctp/neigh.c | 1
net/mctp/route.c | 1
net/mptcp/protocol.c | 14
net/mptcp/protocol.h | 5
net/netfilter/ipvs/ip_vs_proto_sctp.c | 18
net/netfilter/ipvs/ip_vs_proto_tcp.c | 21
net/netfilter/ipvs/ip_vs_proto_udp.c | 20
net/netfilter/ipvs/ip_vs_xmit.c | 46
net/netfilter/nf_conncount.c | 30
net/netfilter/nf_conntrack_h323_main.c | 10
net/netfilter/nf_tables_api.c | 282 ---
net/netfilter/nfnetlink_queue.c | 267 ++-
net/netfilter/nft_compat.c | 13
net/netfilter/nft_counter.c | 24
net/netfilter/nft_quota.c | 13
net/netfilter/nft_set_hash.c | 9
net/netfilter/nft_set_rbtree.c | 800 +++++++---
net/nfc/hci/llc_shdlc.c | 8
net/psp/Kconfig | 1
net/rds/send.c | 6
net/smc/af_smc.c | 91 -
net/sunrpc/auth_gss/auth_gss.c | 3
net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 -
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8
net/unix/af_unix.c | 11
net/wireless/core.c | 4
net/wireless/scan.c | 2
rust/kernel/device.rs | 14
rust/kernel/devres.rs | 162 --
rust/kernel/driver.rs | 12
rust/kernel/pwm.rs | 6
rust/kernel/task.rs | 24
security/apparmor/apparmorfs.c | 9
security/apparmor/file.c | 15
security/apparmor/include/match.h | 12
security/apparmor/label.c | 33
security/apparmor/lsm.c | 33
security/apparmor/match.c | 22
security/apparmor/net.c | 6
security/apparmor/policy_unpack.c | 6
security/apparmor/resource.c | 5
security/integrity/evm/evm_crypto.c | 14
security/integrity/ima/ima.h | 6
security/integrity/ima/ima_appraise.c | 16
security/integrity/ima/ima_main.c | 22
security/smack/smackfs.c | 79
sound/core/compress_offload.c | 28
sound/core/control.c | 12
sound/core/control_compat.c | 21
sound/core/control_led.c | 12
sound/core/oss/mixer_oss.c | 64
sound/core/oss/pcm_oss.c | 19
sound/core/pcm.c | 4
sound/core/pcm_compat.c | 9
sound/core/pcm_native.c | 50
sound/core/seq/oss/seq_oss_init.c | 4
sound/core/seq/oss/seq_oss_midi.c | 45
sound/core/seq/oss/seq_oss_synth.c | 23
sound/core/seq/seq_clientmgr.c | 171 +-
sound/core/seq/seq_compat.c | 4
sound/core/seq/seq_midi.c | 10
sound/core/seq/seq_ports.c | 11
sound/core/seq/seq_queue.c | 32
sound/core/seq/seq_ump_client.c | 16
sound/core/seq/seq_virmidi.c | 4
sound/core/timer.c | 12
sound/core/vmaster.c | 12
sound/hda/codecs/conexant.c | 10
sound/hda/codecs/generic.c | 4
sound/hda/codecs/realtek/alc269.c | 6
sound/hda/codecs/realtek/realtek.c | 5
sound/hda/common/codec.c | 4
sound/hda/common/hda_jack.h | 4
sound/hda/common/hda_local.h | 2
sound/hda/common/sysfs.c | 5
sound/soc/codecs/aw88261.c | 3
sound/soc/codecs/cs4271.c | 12
sound/soc/codecs/nau8821.c | 18
sound/soc/codecs/nau8821.h | 1
sound/soc/fsl/fsl_xcvr.c | 3
sound/soc/rockchip/rockchip_i2s_tdm.c | 10
sound/soc/sdca/Makefile | 2
sound/soc/sdca/sdca_asoc.c | 54
sound/soc/sdca/sdca_functions.c | 4
sound/soc/sdca/sdca_interrupts.c | 83 -
sound/soc/sdca/sdca_jack.c | 248 +++
sound/soc/tegra/tegra210_ahub.c | 57
sound/soc/tegra/tegra210_ahub.h | 30
sound/usb/fcp.c | 36
sound/usb/mixer_scarlett2.c | 21
sound/usb/quirks.c | 13
sound/usb/usx2y/us144mkii.c | 4
sound/usb/usx2y/us144mkii_controls.c | 4
sound/usb/usx2y/us144mkii_pcm.c | 4
tools/bpf/bpftool/net.c | 5
tools/docs/find-unused-docs.sh | 2
tools/include/nolibc/Makefile | 5
tools/lib/bpf/btf_dump.c | 9
tools/lib/bpf/linker.c | 2
tools/lib/bpf/netlink.c | 4
tools/net/sunrpc/xdrgen/generators/__init__.py | 3
tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 | 4
tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 | 6
tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 | 1
tools/objtool/Makefile | 2
tools/power/x86/intel-speed-select/isst-config.c | 2
tools/power/x86/turbostat/turbostat.c | 96 -
tools/spi/.gitignore | 1
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c | 19
tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4
tools/testing/selftests/bpf/prog_tests/wq.c | 5
tools/testing/selftests/bpf/veristat.c | 2
tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh | 4
tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh | 4
tools/testing/selftests/memfd/memfd_test.c | 113 +
tools/testing/selftests/mm/cow.c | 16
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 8
tools/testing/selftests/net/forwarding/pedit_ip.sh | 8
tools/testing/selftests/net/forwarding/tc_actions.sh | 2
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 26
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh | 2
tools/testing/selftests/net/lib.sh | 2
tools/testing/selftests/resctrl/resctrlfs.c | 10
856 files changed, 9930 insertions(+), 5904 deletions(-)
Aadityarangan Shridhar Iyengar (1):
PCI/PTM: Fix pcie_ptm_create_debugfs() memory leak
Aaradhana Sahu (2):
wifi: ath12k: Fix index decrement when array_len is zero
wifi: ath12k: clear stale link mapping of ahvif->links_map
Abel Vesa (2):
arm64: dts: qcom: x1e80100: Fix USB combo PHYs SS1 and SS2 ref clocks
dt-bindings: phy: qcom-edp: Add missing clock for X Elite
Abhash Kumar Jha (2):
arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order
arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4
Abhishek Bapat (1):
quota: fix livelock between quotactl and freeze_super
Aboorva Devarajan (1):
cpuidle: Skip governor when only one idle state is available
Adam Ford (1):
regulator: mt6363: Fix interrmittent timeout
Adrian Hunter (1):
i3c: master: Update hot-join flag only on success
Akash Goel (1):
drm/panthor: Remove redundant call to disable the MCU
Akif Ejaz (1):
spi: cadence-qspi: Remove redundant pm_runtime_mark_last_busy call
Aksh Garg (2):
PCI: dwc: ep: Fix resizable BAR support for multi-PF configurations
PCI: dwc: ep: Add per-PF BAR and inbound ATU mapping support
Aleks Todorov (1):
OPP: Return correct value in dev_pm_opp_get_level
Aleksander Jan Bajkowski (3):
crypto: inside-secure/eip93 - fix kernel panic in driver detach
hwrng: airoha - set rng quality to 900
crypto: inside-secure/eip93 - unregister only available algorithm
Aleksei Oladko (3):
selftests: forwarding: vxlan_bridge_1d: fix test failure with br_netfilter enabled
selftests: forwarding: vxlan_bridge_1d_ipv6: fix test failure with br_netfilter enabled
selftests: forwarding: fix pedit tests failure with br_netfilter enabled
Alex Deucher (3):
drm/amdgpu/sdma5: enable queue resets unconditionally
drm/amdgpu/sdma5.2: enable queue resets unconditionally
drm/amdgpu/sdma6: enable queue resets unconditionally
Alex Hung (1):
drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load
Alexander Egorenkov (1):
s390/kexec: Make KEXEC_SIG available when CONFIG_MODULES=n
Alexander Koskovich (1):
power: reset: nvmem-reboot-mode: respect cell size for nvmem_cell_write
Alexander Stein (2):
arm64: dts: tqma8mpql-mba8mpxl: Fix HDMI CEC pad control settings
arm64: dts: tqma8mpql-mba8mp-ras314: Fix HDMI CEC pad control settings
Alexander Usyskin (1):
mtd: intel-dg: Fix accessing regions before setting nregions
Alexandre Ferrieux (1):
ASoC: codecs: aw88261: Fix erroneous bitmask logic in Awinic init
Alexey Simakov (1):
ACPICA: Fix NULL pointer dereference in acpi_ev_address_space_dispatch()
Alice Ryhl (1):
rust: task: restrict Task::group_leader() to current
Alistair Popple (1):
PCI/P2PDMA: Reset page reference count when page mapping fails
Allison Henderson (1):
net/rds: rds_sendmsg should not discard payload_len
Alok Tiwari (1):
mtd: rawnand: cadence: Fix return type of CDMA send-and-wait helper
Alper Ak (3):
tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
tpm: st33zp24: Fix missing cleanup on get_burstcount() error
char: misc: Use IS_ERR() for filp_open() return value
Amery Hung (1):
libbpf: Fix invalid write loop logic in bpf_linker__add_buf()
Amir Goldstein (2):
fs: move initializing f_mode before file_ref_init()
nfsd: do not allow exporting of special kernel filesystems
Anders Grahn (1):
netfilter: nft_counter: fix reset of counters on 32bit archs
Andreas Gruenbacher (4):
gfs2: Retries missing in gfs2_{rename,exchange}
gfs2: Rename gfs2_log_submit_{bio -> write}
gfs2: Initialize bio->bi_opf early
gfs2: Fix slab-use-after-free in qd_put
Andrew Cooper (1):
x86/cpu/amd: Correct the microcode table for Zenbleed
André Draszik (4):
regulator: core: fix locking in regulator_resolve_supply() error path
regulator: core: move supply check earlier in set_machine_constraints()
regulator: core: don't ignore errors from event forwarding setup
mfd: sec: Fix IRQ domain names duplication
Andy Shevchenko (2):
spi: microchip-core: use XOR instead of ANDNOT to fix the logic
platform/chrome: cros_typec_switch: Don't touch struct fwnode_handle::dev
AngeloGioacchino Del Regno (2):
arm64: dts: mediatek: mt8183-jacuzzi-pico6: Fix typo in pinmux node
dmaengine: mediatek: uart-apdma: Fix above 4G addressing TX/RX
Anshumali Gaur (1):
octeontx2-af: Fix PF driver crash with kexec kernel booting
Anthony Iliopoulos (1):
nfsd: never defer requests during idmap lookup
Anthony Pighin (Nokia) (1):
vfio/pci: Lock upstream bridge for vfio_pci_core_disable()
Anton D. Stavinskii (1):
riscv: dts: sophgo: cv180x: fix USB dwc2 FIFO sizes
Anton Protopopov (3):
bpf: Return proper address for non-zero offsets in insn array
bpf: Fix a potential use-after-free of BTF object
bpf: Add a map/btf from a fd array more consistently
Antonio Borneo (1):
coresight: etm3x: Fix cpulocked warning on cpuhp
Antonio Quartulli (1):
ovpn: tcp - don't deref NULL sk_socket member after tcp_close()
Aristeu Rozanski (1):
selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT
Arnd Bergmann (6):
EDAC/amd64: Avoid a -Wformat-security warning
vsnprintf: drop __printf() attributes on binary printing functions
jfs: avoid -Wtautological-constant-out-of-range-compare warning
scsi: ufs: host: mediatek: Require CONFIG_PM
soundwire: intel_ace2x: add SND_HDA_CORE dependency
net: psp: select CONFIG_SKB_EXTENSIONS
Bagas Sanjaya (2):
drm/amd/display: Don't use kernel-doc comment in dc_register_software_state struct
drm/amdgpu: Describe @AMD_IP_BLOCK_TYPE_RAS in amd_ip_block_type enum
Baihan Li (4):
drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq
drm/hisilicon/hibmc: add dp mode valid check
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
Baochen Qiang (1):
wifi: ath12k: do WoW offloads only on primary link
Baokun Li (1):
fs/ntfs3: fix ntfs_mount_options leak in ntfs_fill_super()
Barnabás Czémán (4):
clk: qcom: gcc-msm8953: Remove ALWAYS_ON flag from cpp_gdsc
clk: qcom: gcc-msm8917: Remove ALWAYS_ON flag from cpp_gdsc
backlight: qcom-wled: Support ovp values for PMI8994
backlight: qcom-wled: Change PM8950 WLED configurations
Bartlomiej Kubik (1):
fs/ntfs3: Initialize new folios before use
Baruch Siach (1):
Documentation: PCI: endpoint: Fix ntb/vntb copy & paste errors
Ben Dooks (2):
audit: move the compat_xxx_class[] extern declarations to audit_arch.h
fs: add <linux/init_task.h> for 'init_fs'
Billy Tsai (1):
i3c: Move device name assignment after i3c_bus_init
Bobby Eshleman (3):
eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0
eth: fbnic: increase FBNIC_HDR_BYTES_MIN from 128 to 256 bytes
eth: fbnic: set DMA_HINT_L4 for all flows
Boris Brezillon (7):
drm/panthor: Recover from panthor_gpu_flush_caches() failures
drm/panthor: Fix the full_tick check
drm/panthor: Fix the group priority rotation logic
drm/panthor: Fix immediate ticking on a disabled tick
drm/panthor: Fix the logic that decides when to stop ticking
drm/panthor: Make sure we resume the tick when new jobs are submitted
drm/panthor: Fix panthor_gpu_coherency_set()
Boris Burkov (2):
btrfs: fix block_group_tree dirty_list corruption
btrfs: fix EEXIST abort due to non-consecutive gaps in chunk allocation
Breno Leitao (2):
device_cgroup: remove branch hint after code refactor
arm64/gcs: Fix error handling in arch_set_shadow_stack_status()
Brian Foster (1):
ext4: fix dirtyclusters double decrement on fs shutdown
Brian Masney (20):
drm/msm/dsi_phy_14nm: convert from divider_round_rate() to divider_determine_rate()
clk: qcom: alpha-pll: convert from divider_round_rate() to divider_determine_rate()
clk: microchip: core: remove duplicate determine_rate on pic32_sclk_ops
clk: qcom: regmap-divider: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: qcom: regmap-divider: convert from divider_round_rate() to divider_determine_rate()
clk: actions: owl-composite: convert from owl_divider_helper_round_rate() to divider_determine_rate()
clk: actions: owl-divider: convert from divider_round_rate() to divider_determine_rate()
clk: bm1880: convert from divider_round_rate() to divider_determine_rate()
clk: hisilicon: clkdivider-hi6220: convert from divider_round_rate() to divider_determine_rate()
clk: loongson1: convert from divider_round_rate() to divider_determine_rate()
clk: milbeaut: convert from divider_round_rate() to divider_determine_rate()
clk: nuvoton: ma35d1-divider: convert from divider_round_rate() to divider_determine_rate()
clk: nxp: lpc32xx: convert from divider_round_rate() to divider_determine_rate()
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
clk: sprd: div: convert from divider_round_rate() to divider_determine_rate()
clk: stm32: stm32-core: convert from divider_ro_round_rate() to divider_ro_determine_rate()
clk: stm32: stm32-core: convert from divider_round_rate_parent() to divider_determine_rate()
clk: versaclock3: convert from divider_round_rate() to divider_determine_rate()
clk: x86: cgu: convert from divider_round_rate() to divider_determine_rate()
clk: zynqmp: divider: convert from divider_round_rate() to divider_determine_rate()
Brian Norris (1):
PCI/PM: Avoid redundant delays on D3hot->D3cold
Brian Witte (3):
netfilter: nft_counter: serialize reset with spinlock
netfilter: nft_quota: use atomic64_xchg for reset
netfilter: nf_tables: revert commit_mutex usage in reset path
Caleb Sander Mateos (3):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
ublk: restore auto buf unregister refcount optimization
ublk: use READ_ONCE() to read struct ublksrv_ctrl_cmd
Carl Lee (1):
hwmon: (pmbus/mpq8785) fix VOUT_MODE mismatch during identification
Casey Connolly (3):
arm64: dts: qcom: sdm845-oneplus: Don't mark ts supply boot-on
arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on
arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on
Chaitanya Mishra (2):
lib/kstrtox: fix kstrtobool() docstring to mention enabled/disabled
staging: greybus: lights: avoid NULL deref
Charles Keepax (5):
ASoC: SDCA: Remove outdated todo comment
ASoC: SDCA: Handle volatile controls correctly
ASoC: SDCA: Factor out jack handling into new c file
ASoC: SDCA: Add ability to connect SDCA jacks to ASoC jacks
ASoC: SDCA: Still process most of the jack detect if control is missing
Cheatham, Benjamin (1):
cxl/core: Fix cxl_dport debugfs EINJ entries
Chen Jinghuang (1):
sched/rt: Skip currently executing CPU in rto_next_cpu()
Chen-Yu Tsai (1):
ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
Chengchang Tang (2):
RDMA/hns: Fix WQ_MEM_RECLAIM warning
RDMA/hns: Notify ULP of remaining soft-WCs during reset
Chengfeng Ye (1):
fbnic: close fw_log race between users and teardown
Chenghai Huang (7):
crypto: hisilicon/zip - adjust the way to obtain the req in the callback function
crypto: hisilicon/sec - move backlog management to qp and store sqe in qp for callback
crypto: hisilicon/qm - enhance the configuration of req_type in queue attributes
crypto: hisilicon/qm - centralize the sending locks of each module into qm
crypto: hisilicon/zip - support fallback for zip
crypto: hisilicon - consolidate qp creation and start in hisi_qm_alloc_qps_node
crypto: hisilicon/sgl - fix inconsistent map/unmap direction issue
Chia-I Wu (1):
drm/panthor: fix queue_reset_timeout_locked
Chia-Yu Chang (3):
tcp: ECT_1_NEGOTIATION and NEEDS_ACCECN identifiers
tcp: disable RFC3168 fallback identifier for CC modules
tcp: accecn: handle unexpected AccECN negotiation feedback
Chiara Meiohas (1):
RDMA/mlx5: Fix UMR hang in LAG error state unload
Chris J Arges (1):
ima: Fix stack-out-of-bounds in is_bprm_creds_for_exec()
Christian König (1):
drm/amdgpu: Drop MMIO_REMAP domain bit and keep it Internal
Christoph Böhmwalder (1):
drbd: always set BLK_FEAT_STABLE_WRITES
Christoph Hellwig (1):
iomap: fix submission side handling of completion side errors
Christophe Leroy (1):
powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()
Chuck Lever (6):
xdrgen: Fix struct prefix for typedef types in program wrappers
NFS: NFSERR_INVAL is not defined by NFSv2
xdrgen: Initialize data pointer for zero-length items
xdrgen: Remove inclusion of nlm4.h header
RDMA/core: add rdma_rw_max_sge() helper for SQ sizing
SUNRPC: auth_gss: fix memory leaks in XDR decoding error paths
Claudiu Beznea (1):
PCI: rzg3s-host: Use pci_generic_config_write() for the root bus
Colin Ian King (1):
scsi: csiostor: Fix dereference of null pointer rn
Cosmin Ratiu (2):
net/mlx5e: Fix deadlocks between devlink and netdev instance locks
net/mlx5e: Use unsigned for mlx5e_get_max_num_channels
Cristian Ciocaltea (5):
ASoC: nau8821: Fixup nau8821_enable_jack_detect()
ASoC: nau8821: Cancel delayed work on component remove
ASoC: nau8821: Cancel pending work before suspend
drm/rockchip: dw_hdmi_qp: Fix RK3576 HPD interrupt handling
phy: rockchip: samsung-hdptx: Pre-compute HDMI PLL config for 461.10125 MHz output
D. Wythe (1):
Revert "net/smc: Introduce TCP ULP support"
Damien Le Moal (4):
ata: libata-scsi: refactor ata_scsi_translate()
ata: libata-scsi: avoid Non-NCQ command starvation
ata: libata-eh: correctly handle deferred qc timeouts
ata: libata-core: fix cancellation of a port deferred qc work
Dan Carpenter (6):
EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
drm/plane: Fix IS_ERR() vs NULL bug drm_plane_create_color_pipeline_property()
ALSA: oss: delete self assignment
gpib: Fix error code in ibonline()
gpib: Fix error code in ni_usb_write_registers()
Dan Williams (1):
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion
Daniel Baluta (1):
remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
Daniel Hodges (1):
SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path
Daniel Machon (2):
net: sparx5/lan969x: fix DWRR cost max to match hardware register width
net: sparx5/lan969x: fix PTP clock max_adj value
Danilo Krummrich (2):
rust: driver-core: use "kernel vertical" style for imports
rust: devres: fix race condition due to nesting
David Heidelberg (3):
drm/panel: sw43408: Remove manual invocation of unprepare at remove
media: ccs: Accommodate C-PHY into the calculation
clk: qcom: dispcc-sm7150: Fix dispcc_mdss_pclk1_clk_src
Deepanshu Kartikey (2):
gfs2: Fix use-after-free in iomap inline data write path
gfs2: fix memory leaks in gfs2_fill_super error path
Detlev Casanova (1):
ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
Dimitri Daskalakis (2):
eth: fbnic: Add validation for MTU changes
eth: fbnic: Advertise supported XDP features.
Dmitry Baryshkov (17):
arm64: dts: qcom: sdm630: fix gpu_speed_bin size
arm64: dts: qcom: sm8150-hdk,mtp: specify ZAP firmware name
arm64: dts: qcom: sm8250-hdk: specify ZAP firmware name
soc: qcom: ubwc: add missing include
arm64: dts: qcom: qrb4210-rb2: Fix UART3 wakeup IRQ storm
arm64: dts: qcom: sdm845-db845c: drop CS from SPIO0
arm64: dts: qcom: sdm845-db845c: specify power for WiFi CH1
drm/msm/dpu: fix WD timer handling on DPU 8.x
drm/msm/disp: set num_planes to 1 for interleaved YUV formats
drm/msm/dpu: drop intr_start from DPU 3.x catalog files
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
drm/msm/a2xx: fix pixel shader start on A225
drm/msm/mdss: correct HBB programmed on UBWC 5.x and 6.x devices
drm/msm/dpu: offset HBB values written to DPU by -13
drm/msm/dpu: program correct register for UBWC config on DPU 8.x+
drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+
clk: qcom: gfx3d: add parent to parent request map
Dmitry Torokhov (1):
gpio: amd-fch: ionly return allowed values from amd_fch_gpio_get()
Dmytro Maluka (1):
iommu/vt-d: Flush cache for PASID table before using it
Douglas Anderson (1):
gpio: cdev: Avoid NULL dereference in linehandle_create()
Duje Mihanović (1):
leds: expresswire: Fix chip state breakage
Eduard Zingerman (1):
bpf: bpf_scc_visit instance and backedges accumulation for bpf_loop()
Edward Adam Davis (1):
fs/ntfs3: prevent infinite loops caused by the next valid being the same
Ella Ma (1):
crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Eric Dumazet (9):
tcp: tcp_tx_timestamp() must look at the rtx queue
inet: RAW sockets using IPPROTO_RAW MUST drop incoming ICMP
ipv6: fix a race in ip6_sock_set_v6only()
net: do not delay zero-copy skbs in skb_attempt_defer_free()
ping: annotate data-races in ping_lookup()
macvlan: observe an RCU grace period in macvlan_common_newlink() error path
icmp: prevent possible overflow in icmp_global_allow()
inet: move icmp_global_{credit,stamp} to a separate cache line
ipv6: icmp: remove obsolete code in icmpv6_xrlim_allow()
Eric Joyner (1):
ionic: Rate limit unknown xcvr type messages
Eric Naim (1):
ALSA: hda/realtek: Add quirk for Gigabyte G5 KF5 (2023)
Eric Neulight (1):
arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
Ethan Tidmore (1):
x86/hyperv: Fix error pointer dereference
Etienne AUJAMES (1):
IB/cache: update gid cache on client reregister event
Even Xu (1):
HID: Intel-thc-hid: Intel-thc: Fix wrong register fields updating
Fedor Pchelkin (1):
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Felix Gu (8):
cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()
thermal/of: Fix reference leak in thermal_of_cm_lookup()
PCI: rzg3s-host: Fix device node reference leak in rzg3s_pcie_host_parse_port()
fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()
pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Ferry Meng (1):
erofs: Use %pe format specifier for error pointers
Filipe Manana (3):
btrfs: qgroup: return correct error when deleting qgroup relation item
btrfs: use the correct type to initialize block reserve for delayed refs
btrfs: fix invalid leaf access in btrfs_quota_enable() if ref key not found
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: nfnetlink_queue: do shared-unconfirmed check before segmentation
netfilter: nft_set_hash: fix get operation on big endian
netfilter: nft_set_rbtree: don't gc elements on insert
netfilter: nf_conntrack_h323: don't pass uninitialised l3num value
Florian-Ewald Mueller (1):
rnbd-srv: Fix server side setting of bi_size for special IOs
Francesco Dolcini (2):
arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO
arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO
Francesco Lavra (1):
spi: tools: Add include folder to .gitignore
Fredrik Markstrom (1):
i3c: dw: Initialize spinlock to avoid upsetting lockdep
Gabriele Monaco (2):
sched: Export hidden tracepoints to modules
sched: Fix build for modules using set_tsk_need_resched()
Gal Pressman (3):
net/mlx5e: Fix misidentification of ASO CQE during poll loop
net/mlx5: Fix misidentification of write combining CQE during poll loop
net/mlx5e: MACsec, add ASO poll loop in macsec_aso_set_arm_event
Gao Xiang (3):
erofs: avoid noisy messages for transient -ENOMEM
erofs: handle end of filesystem properly for file-backed mounts
erofs: fix inline data read failure for ztailpacking pclusters
Geert Uytterhoeven (2):
arm64: dts: renesas: r9a09g047e57-smarc: Remove duplicate SW_LCD_EN
clk: Move clk_{save,restore}_context() to COMMON_CLK section
George Moussalem (1):
clk: qcom: gcc-ipq5018: flag sleep clock as critical
Georgia Garcia (1):
apparmor: fix invalid deref of rawdata when export_binary is unset
Giovanni Cabiddu (2):
crypto: qat - fix parameter order used in ICP_QAT_FW_COMN_FLAGS_BUILD
crypto: qat - fix warning on adf_pfvf_pf_proto.c
Gokul Praveen (1):
pwm: tiehrpwm: Enable pwmchip's parent device before setting configuration
Govindarajulu Varadarajan (1):
ublk: Validate SQE128 flag before accessing the cmd
Greg Kroah-Hartman (2):
Revert "mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms"
Linux 6.19.4
Guenter Roeck (1):
Revert "hwmon: (ibmpex) fix use-after-free in high/low store"
Gui-Dong Han (1):
PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races
Guillaume Gonnet (1):
bpf: Fix tcx/netkit detach permissions when prog fd isn't given
Hangbin Liu (1):
bonding: alb: fix UAF in rlb_arp_recv during bond up/down
Haotian Zhang (11):
clk: qcom: Return correct error code in qcom_cc_probe_by_index()
soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe
hwspinlock: omap: Handle devm_pm_runtime_enable() errors
HID: playstation: Add missing check for input_ff_create_memless
PCI: mediatek: Fix IRQ domain leak when MSI allocation fails
PCI: xilinx: Fix INTx IRQ domain leak in error paths
PCI: endpoint: Add missing NULL check for alloc_workqueue()
power: supply: bq27xxx: fix wrong errno when bus ops are unsupported
clk: mediatek: Fix error handling in runtime PM setup
mfd: arizona: Fix regulator resource leak on wm5102_clear_write_sequencer() failure
leds: qcom-lpg: Check the return value of regmap_bulk_write()
Hariprasad Kelam (2):
octeontx2-pf: Unregister devlink on probe failure
octeontx2-af: Fix default entries mcam entry action
Harry Yoo (1):
mm/slab: fix false lockdep warning in __kfree_rcu_sheaf()
Harshit Mogalapalli (2):
ASoC: cs4271: Fix resource leak in cs4271_soc_resume()
iio: sca3000: Fix a resource leak in sca3000_probe()
Helge Deller (2):
AppArmor: Allow apparmor to handle unaligned dfa tables
apparmor: Fix & Optimize table creation from possibly unaligned memory
Honggang LI (1):
RDMA/rtrs: server: remove dead code
Hou Tao (2):
PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails
PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
Huacai Chen (1):
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Huang Chenming (1):
wifi: cfg80211: Fix use_for flag update on BSS refresh
Håkon Bugge (3):
PCI: Do not attempt to set ExtTag for VFs
PCI: Initialize RCB from pci_configure_device()
PCI/ACPI: Restrict program_hpx_type2() to AER bits
Ido Schimmel (1):
selftests: mlxsw: tc_restrictions: Fix test failure with new iproute2
Ilpo Järvinen (3):
PCI: Rewrite bridge window head alignment function
PCI: Stop over-estimating bridge window size
PCI: Remove old_size limit from bridge window sizing
Ingo Molnar (1):
x86/hyperv: Fix smp_ops build failure on UP kernels
Inochi Amaoto (2):
PCI: sophgo: Disable L0s and L1 on Sophgo 2044 PCIe Root Ports
clk: spacemit: Respect Kconfig setting when building modules
Inseo An (1):
netfilter: nf_tables: fix use-after-free in nf_tables_addchain()
Ivan Lipski (2):
drm/amd/display: Remove unused encoder types
drm/amd/display: Use local variable for analog_engine initialization
Ivan Vecera (2):
dpll: zl3073x: Fix output pin phase adjustment sign
dpll: zl3073x: Fix ref frequency setting
Jacob Moroni (1):
RDMA/iwcm: Fix workqueue list corruption by removing work_list
Jagadeesh Kona (8):
clk: qcom: gcc-sm8450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm8750: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sm4450: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-sdx75: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-milos: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-x1e80100: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-qdu1000: Update the SDCC RCGs to use shared_floor_ops
clk: qcom: gcc-glymur: Update the SDCC RCGs to use shared_floor_ops
Jakub Kicinski (2):
bpftool: Fix truncated netlink dumps
selftests: tc_actions: don't dump 2MB of \0 to stdout
Jan Kara (2):
ext4: always allocate blocks only from groups inode can use
ext4: use optimized mballoc scanning regardless of inode format
Jan Kiszka (1):
Drivers: hv: vmbus: Use kthread for vmbus interrupts on PREEMPT_RT
Jani Nikula (3):
drm/i915/colorop: do not include headers from headers
drm/atomic: convert drm_atomic_get_{old, new}_colorop_state() into proper functions
mei: late_bind: fix struct intel_lb_component_ops kernel-doc
Jared Kangas (1):
dmaengine: fsl-edma: don't explicitly disable clocks in .remove()
Jens Axboe (4):
io_uring/eventfd: remove unused ctx->evfd_last_cq_tail member
io_uring/sync: validate passed in offset
io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_uring/cancel: de-unionize file and user_data in struct io_cancel_data
Jeongjun Park (2):
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeremy Kerr (1):
net: mctp: ensure our nlmsg responses are initialised
Jerome Brunet (7):
arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
arm64: dts: amlogic: s4: fix mmc clock assignment
arm64: dts: amlogic: c3: assign the MMC signal clocks
arm64: dts: amlogic: axg: assign the MMC signal clocks
arm64: dts: amlogic: gx: assign the MMC signal clocks
arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
arm64: dts: amlogic: g12: assign the MMC A signal clock
Jian Shen (1):
net: hns3: fix double free issue for tx spare buffer
Jian Zhang (1):
net: mctp-i2c: fix duplicate reception of old data
Jianpeng Chang (1):
crypto: caam - fix netdev memory leak in dpaa2_caam_probe
Jiasheng Jiang (3):
RDMA/rxe: Fix double free in rxe_srq_from_init
fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot
btrfs: reset block group size class when it becomes empty
Jiayu Du (1):
pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
Jiayuan Chen (5):
bpf, sockmap: Fix incorrect copied_seq calculation
bpf, sockmap: Fix FIONREAD for sockmap
net: atm: fix crash due to unvalidated vcc pointer in sigd_send()
xfrm: fix ip_rt_bug race in icmp_route_lookup reverse path
serial: caif: fix use-after-free in caif_serial ldisc_close()
Jie Zhang (1):
net: stmmac: fix oops when split header is enabled
Jingzhou Zhu (2):
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes
arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully
Jinliang Zheng (1):
procfs: fix missing RCU protection when reading real_parent in do_task_stat()
Jiri Olsa (4):
ftrace,bpf: Remove FTRACE_OPS_FL_JMP ftrace_ops flag
x86/fgraph: Fix return_to_handler regs.rsp value
x86/fgraph,bpf: Switch kprobe_multi program stack unwind to hw_regs path
selftests/bpf: Fix kprobe multi stacktrace_ips test
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Joel Fernandes (1):
sched/deadline: Clear the defer params
Johannes Thumshirn (2):
btrfs: zoned: don't zone append to conventional zone
block: don't use strcpy to copy blockdev name
John Johansen (7):
apparmor: fix NULL sock in aa_sock_file_perm
apparmor: drop in_atomic flag in common_mmap, and common_file_perm
apparmor: move check for aa_null file to cover all cases
apparmor: fix rlimit for posix cpu timers
apparmor: remove apply_modes_to_perms from label_match
apparmor: make label_match return a consistent value
apparmor: fix aa_label to return state from compount and component match
Jonathan Marek (1):
arm64: dts: qcom: x1e: bus is 40-bits (fix 64GB models)
Jorge Ramirez-Ortiz (1):
soc: qcom: smem: handle ENOMEM error during probe
Jose Javier Rodriguez Barbarin (1):
mcb: fix incorrect sanity check
Josh Poimboeuf (1):
kbuild: Add objtool to top-level clean target
Julian Anastasov (2):
ipvs: skip ipv6 extension headers for csum checks
ipvs: do not keep dest_dst if dev is going down
Junhui Liu (1):
reset: canaan: k230: drop OF dependency and enable by default
Junjie Cao (1):
backlight: aw99706: Fix build errors caused by wrong gpio header
Junxian Huang (2):
RDMA/hns: Return actual error code instead of fixed EINVAL
RDMA/hns: Fix RoCEv1 failure due to DSCP
Justin Chen (1):
usb: bdc: fix sleep during atomic
Jörg Wedekind (1):
PCI: Mark 3ware-9650SA Root Port Extended Tags as broken
KP Singh (2):
bpf: Limit bpf program signature size
bpf: Require frozen map for calculating map hash
Kai-Heng Feng (1):
PCI: Validate window resource type in pbus_select_window_for_type()
Kari Argillander (1):
rust: pwm: Fix potential memory leak on init error
Karunika Choo (1):
drm/panthor: Fix NULL pointer dereference on panthor_fw_unplug
Kaushlendra Kumar (1):
drm/i915/acpi: free _DSM package when no connectors
Kery Qi (2):
selftests/bpf: Fix resource leak in serial_test_wq on attach failure
watchdog: starfive-wdt: Fix PM reference leak in probe error path
Ketil Johnsen (1):
drm/panthor: Evict groups before VM termination
Kevin Brodsky (1):
selftests/mm: fix usage of FORCE_READ() in cow tests
Kiryl Shutsemau (Meta) (1):
efi: Fix reservation of unaccepted memory table
Koichiro Den (6):
PCI: dwc: ep: Cache MSI outbound iATU mapping
PCI: endpoint: Add dynamic_inbound_mapping EPC feature
PCI: endpoint: Add BAR subrange mapping support
PCI: dwc: Advertise dynamic inbound mapping support
PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU
PCI: dwc: ep: Always clear IB maps on BAR update
Konrad Dybcio (2):
arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
Konstantin Andreev (2):
smack: /smack/doi must be > 0
smack: /smack/doi: accept previously used values
Konstantin Komarov (1):
fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr
Krishna Chomal (1):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
Krzysztof Kozlowski (2):
clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
Kumar Kartikeya Dwivedi (1):
rqspinlock: Fix TAS fallback lock entry creation
Kuniyuki Iwashima (2):
af_unix: Fix memleak of newsk in unix_stream_connect().
ipv6: Fix out-of-bound access in fib6_add_rt2node().
Kuppuswamy Sathyanarayanan (2):
powercap: intel_rapl: Remove incorrect CPU check in PMU context
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
Lad Prabhakar (1):
arm64: dts: renesas: rzt2h-n2h-evk-common: Use GPIO for SD0 write protect
Lai Jiangshan (1):
workqueue: Process rescuer work items one-by-one using a cursor
Larysa Zaremba (2):
selftests/xsk: properly handle batch ending in the middle of a packet
selftests/xsk: fix number of Tx frags in invalid packet
Len Brown (2):
tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error
tools/power turbostat: Harden against unexpected values
Leo Yan (1):
perf: arm_spe: Properly set hw.state on failures
Lewis Mason (1):
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book3 Pro 360 (NP965QFG)
Li Chen (2):
ext4: fast commit: make s_fc_lock reclaim-safe
nvdimm: virtio_pmem: serialize flush requests
Li Nan (1):
md/raid10: fix any_working flag handling in raid10_sync_request
Li RongQing (1):
mshv: fix SRCU protection in irqfd resampler ack handler
Li Zhijian (2):
RDMA/rxe: Fix iova-to-va conversion for MR page sizes != PAGE_SIZE
RDMA/rxe: Fix race condition in QP timer handlers
Lianjie Wang (1):
hwrng: core - use RCU and work_struct to fix race condition
Lijo Lazar (1):
drm/amd/pm: Fix unneeded semicolon warning
Linus Walleij (1):
ata: pata_ftide010: Fix some DMA timings
Lizhi Hou (12):
accel/amdxdna: Fix race condition when checking rpm_on
accel/amdxdna: Fix cu_idx being cleared by memset() during command setup
accel/amdxdna: Fix race where send ring appears full due to delayed head update
accel/amdxdna: Fix potential NULL pointer dereference in context cleanup
accel/amdxdna: Fix notifier_wq flushing warning
accel/amdxdna: Hold mm structure across iommu_sva_unbind_device()
accel/amdxdna: Stop job scheduling across aie2_release_resource()
accel/amdxdna: Enable temporal sharing only mode
accel/amdxdna: Remove hardware context status
accel/amdxdna: Fix incorrect error code returned for failed chain command
accel/amdxdna: Fix incorrect DPM level after suspend/resume
accel/amdxdna: Move RPM resume into job run function
Lu Baolu (3):
iommu/vt-d: Clear Present bit before tearing down PASID entry
iommu/vt-d: Clear Present bit before tearing down context entry
iommu/vt-d: Fix race condition during PASID entry replacement
Luca Boccassi (1):
pidfs: return -EREMOTE when PIDFD_GET_INFO is called on another ns
Luca Weiss (1):
pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
Luis Gerhorst (1):
bpf: Fix verifier_bug_if to account for BPF_CALL
Luiz Augusto von Dentz (1):
Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
Mahadevan P (1):
drm/msm/disp/dpu: add merge3d support for sc7280
Maher Sanalla (1):
RDMA/mlx5: Fix ucaps init error flow
Malaya Kumar Rout (1):
tools/power/x86/intel-speed-select: Fix file descriptor leak in isolate_cpus()
Mani Chandana Ballary Kuntumalla (1):
drm/msm/dp: Update msm_dp_controller IDs for sa8775p
Manivannan Sadhasivam (1):
PCI/pwrctrl: tc9563: Use put_device() instead of i2c_put_adapter()
Marco Crivellari (1):
PCI: Add WQ_PERCPU to alloc_workqueue() users
Marek Vasut (1):
arm64: dts: imx95: Use GPU_CGC as core clock for GPU
Mario Kleiner (1):
drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
Mario Limonciello (AMD) (5):
drm/amd: Drop "amdgpu kernel modesetting enabled" message
crypto: ccp - Declare PSP dead if PSP_CMD_TEE_RING_INIT fails
crypto: ccp - Add an S4 restore flow
crypto: ccp - Factor out ring destroy handling to a helper
crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails
Martin Blumenstingl (2):
clk: meson: gxbb: Limit the HDMI PLL OD to /4 on GXL/GXM SoCs
clk: meson: g12a: Limit the HDMI PLL OD to /4
Matt Johnston (1):
mctp i2c: initialise event handler read bytes
Matt Roper (1):
drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: increase power-on settling delay to 5ms
Miaoqian Lin (2):
tracing: Properly process error handling in event_hist_trigger_parse()
clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Miaoqing Pan (1):
wifi: ath11k: add usecase firmware handling based on device compatible
Michael Dege (1):
net: renesas: rswitch: fix forwarding offload statemachine
Michael Walle (2):
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node
arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator
Michal Wajdeczko (3):
drm/xe/pf: Fix .bulk_profile/sched_priority description
drm/xe/pf: Fix sysfs initialization
drm/xe/configfs: Fix 'parameter name omitted' errors
Michał Grzelak (1):
drm/buddy: release free_trees array on buddy mm teardown
Mike Snitzer (3):
NFS/localio: prevent direct reclaim recursion into NFS via nfs_writepages
NFS/localio: use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit
NFS/localio: remove -EAGAIN handling in nfs_local_doio()
Mikulas Patocka (3):
dm: fix unlocked test for dm_suspended_md
dm: use READ_ONCE in dm_blk_report_zones
dm: use bio_clone_blkg_association
Miquel Raynal (1):
mtd: spinand: Fix kernel doc
Miri Korenblit (1):
wifi: cfg80211: stop NAN and P2P in cfg80211_leave
Narayana Murty N (1):
powerpc/eeh: fix recursive pci_lock_rescan_remove locking in EEH event handling
Nathan Chancellor (1):
drm/msm/dp: Avoid division by zero in msm_dp_ctrl_config_msa()
Nicolas Cavallari (1):
PCI: Add ACS quirk for Pericom PI7C9X2G404 switches [12d8:b404]
Nicolas Frattaroli (3):
clk: mediatek: Add mfg_eb as parent to mt8196 mfgpll clocks
interconnect: mediatek: Don't hijack parent device
interconnect: mediatek: Aggregate bandwidth with saturating add
Niklas Cassel (2):
ata: libata: Add ATA_QUIRK_MAX_SEC and convert all device quirks
ata: libata-core: Quirk INTEL SSDSC2KG480G8 max_sectors
Nikolay Aleksandrov (1):
net: bridge: mcast: always update mdb_n_entries for vlan contexts
Nuno Sá (2):
dma: dma-axi-dmac: fix SW cyclic transfers
dma: dma-axi-dmac: fix HW scatter-gather not looking at the queue
Olga Kornievskaia (1):
pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN
Ondrej Mosnacek (2):
ipc: don't audit capability check in ipc_permissions()
ucount: check for CAP_SYS_RESOURCE using ns_capable_noaudit()
Or Har-Toov (1):
IB/mlx5: Fix port speed query for representors
Pablo Neira Ayuso (8):
netfilter: nft_set_rbtree: fix bogus EEXIST with NLM_F_CREATE with null interval
netfilter: nft_set_rbtree: check for partial overlaps in anonymous sets
netfilter: nft_set_rbtree: translate rbtree to array for binary search
netfilter: nft_set_rbtree: use binary search array in get command
netfilter: nft_set_rbtree: remove seqcount_rwlock_t
netfilter: nft_set_rbtree: validate element belonging to interval
netfilter: nft_set_rbtree: validate open interval overlap
net: remove WARN_ON_ONCE when accessing forward path array
Paolo Abeni (2):
mptcp: do not account for OoO in mptcp_rcvbuf_grow()
mptcp: fix receive space timestamp initialization
Paul Chaignon (1):
bpf: Fix bpf_xdp_store_bytes proto for read-only arg
Paul E. McKenney (1):
rcutorture: Correctly compute probability to invoke ->exp_current()
Paulo Alcantara (2):
smb: client: fix potential UAF and double free in smb2_open_file()
smb: client: fix regression with mount options parsing
Pavel Begunkov (1):
io_uring: delay sqarray static branch disablement
Petr Hodina (1):
clk: qcom: dispcc-sdm845: Enable parents for pixel clocks
Petr Mladek (3):
kallsyms/bpf: rename __bpf_address_lookup() to bpf_address_lookup()
module: add helper function for reading module_buildid()
kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup()
Petre Rodan (5):
iio: pressure: mprls0025pa: fix spi_transfer struct initialisation
iio: pressure: mprls0025pa: fix SPI CS delay violation
iio: pressure: mprls0025pa: fix interrupt flag
iio: pressure: mprls0025pa: fix scan_type struct
iio: pressure: mprls0025pa: fix pressure calculation
Pin-yen Lin (1):
selftests: netconsole: Increase port listening timeout
Ping-Ke Shih (1):
wifi: rtw89: correct use sequence of driver_data in skb->info
Piotr Piórkowski (1):
drm/xe/vf: Avoid reading media version when media GT is disabled
Puranjay Mohan (2):
selftests/bpf: veristat: fix printing order in output_stats()
bpf: Preserve id of register in sync_linked_regs()
Qi Tao (1):
crypto: hisilicon/sec2 - support skcipher/aead fallback for hardware queue unavailable
Qiang Yu (3):
PCI: Add preceding capability position support in PCI_FIND_NEXT_*_CAP macros
PCI: dwc: Add new APIs to remove standard and extended Capability
PCI: dwc: Remove duplicate dw_pcie_ep_hide_ext_capability() function
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Raag Jadav (1):
drm/xe/bo: Redirect faults to dummy page for wedged device
Rafael J. Wysocki (3):
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
cpuidle: governors: menu: Always check timers with tick stopped
thermal: intel: x86_pkg_temp_thermal: Handle invalid temperature
Raju Rangoju (1):
amd-xgbe: do not select NET_SELFTESTS when INET is disabled
Ralf Lici (3):
ovpn: set sk_user_data before overriding callbacks
ovpn: fix possible use-after-free in ovpn_net_xmit
ovpn: fix VPN TX bytes counting
Randy Dunlap (12):
docs: find-unused-docs.sh: fixup directory usage
seqlock: fix scoped_seqlock_read kernel-doc
ALSA: hda - fix function names & missing function parameter
wifi: ath9k: debug.h: fix kernel-doc bad lines and struct ath_tx_stats
wifi: ath9k: fix kernel-doc warnings in common-debug.h
iio: test: drop dangling symbol in gain-time-scale helpers
usb: typec: ucsi: drop an unused Kconfig symbol
serial: imx: change SERIAL_IMX_CONSOLE to bool
serial: SH_SCI: improve "DMA support" prompt
stm class: Kconfig: correct symbol name
nvmem: an8855: drop an unused Kconfig symbol
mips: LOONGSON32: drop a dangling Kconfig symbol
Raviteja Laggyshetty (1):
interconnect: qcom: qcs8300: fix the num_links for nsp icc node
René Rebe (1):
net: sunhme: Fix sbus regression
Ricardo Ribalda (1):
media: uvcvideo: Fix allocation for small frame sizes
Richard Fitzgerald (2):
firmware: cs_dsp: Remove __free() from cs_dsp_debugfs_string_read()
firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()
Rob Clark (2):
drm/msm: Fix x2-85 TPL1_DBG_ECO_CNTL1
drm/msm: Fix GMEM_BASE for gen8
Robert Marko (1):
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
Robert Richter (1):
cxl/hdm: Fix newline character in dev_err() messages
Roberto Sassu (1):
evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()
Roger Pau Monne (1):
Partial revert "x86/xen: fix balloon target initialization for PVH dom0"
Roman Penyaev (1):
RDMA/rtrs-srv: fix SG mapping
Rosen Penev (1):
wifi: ath9k: add OF dependency to AHB
Ryan Lee (3):
apparmor: return -ENOMEM in unpack_perms_table upon alloc failure
apparmor: fix boolean argument in apparmor_mmap_file
apparmor: account for in_atomic removal in common_file_perm
Ryan Lin (1):
HID: intel-ish-hid: fix NULL-ptr-deref in ishtp_bus_remove_all_clients
Sagi Grimberg (1):
fs/nfs: Fix readdir slow-start regression
Sai Ritvik Tanksalkar (1):
pstore/ram: fix buffer overflow in persistent_ram_save_old()
Salah Triki (1):
s390/cio: Fix device lifecycle handling in css_alloc_subchannel()
Samuel Wu (1):
PM: wakeup: Handle empty list in wakeup_sources_walk_start()
Sandipan Das (1):
perf/x86/core: Do not set bit width for unavailable counters
Scott Mitchell (1):
netfilter: nfnetlink_queue: optimize verdict lookup with hash table
Sean V Kelley (1):
ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
Sebastian Andrzej Siewior (10):
genirq: Set IRQF_COND_ONESHOT in devm_request_irq().
platform/x86: int0002: Remove IRQF_ONESHOT from request_irq()
iommu/amd: Use core's primary handler and set IRQF_ONESHOT
Bluetooth: btintel_pcie: Use IRQF_ONESHOT and default primary handler
scsi: efct: Use IRQF_ONESHOT and default primary handler
EDAC/altera: Remove IRQF_ONESHOT
usb: typec: fusb302: Remove IRQF_ONESHOT
rtc: amlogic-a4: Remove IRQF_ONESHOT
mfd: wm8350-core: Use IRQF_ONESHOT
media: pci: mg4b: Use IRQF_NO_THREAD
Sergey Shtylyov (1):
PCI: Check parent for NULL in of_pci_bus_release_domain_nr()
Shardul Bankar (1):
hfsplus: return error when node already exists in hfs_bnode_create
Shay Drory (1):
net/mlx5: Fix multiport device check over light SFs
Sheetal (1):
ASoC: tegra: Add AHUB writeable_reg for RX holes
Shengjiu Wang (4):
remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
Shenwei Wang (1):
remoteproc: imx_rproc: Use strstarts for "rsc-table" check
Shuai Xue (1):
Documentation: tracing: Add PCI tracepoint documentation
Shuicheng Lin (3):
drm/xe: Unregister drm device on probe error
drm/xe/mmio: Avoid double-adjust in 64-bit reads
drm/xe: Make xe_modparam.force_vram_bar_size signed
Shyam Prasad N (1):
netfs: avoid double increment of retry_count in subreq
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
Simon Trimmer (1):
ASoC: SDCA: Allow sample width wild cards in set_usage()
Sjoerd Simons (1):
clk: mediatek: Drop __initconst from gates
Srinivasan Shanmugam (7):
drm/amdkfd: Fix signal_eviction_fence() bool return value
drm/amdgpu: Use explicit VCN instance 0 in SR-IOV init
drm/amdgpu/ttm: Pin 4K MMIO_REMAP Singleton BO at Init v2
drm/amd/display: Fix dc_link NULL handling in HPD init
drm/amdgpu: Fix missing unwind in amdgpu_ib_schedule() error path
drm/amdkfd: Fix watch_id bounds checking in debug address watch v2
drm/amd/display: Fix out-of-bounds stream encoder index v3
Stefan Hajnoczi (1):
block: allow IOC_PR_READ_* ioctls with BLK_OPEN_READ
Stefan Metzmacher (1):
smb: client: correct value for smbd_max_fragmented_recv_size
Stephen Eta Zhou (1):
clocksource/drivers/timer-sp804: Fix an Oops when read_current_timer is called on ARM32 platforms where the SP804 is not registered as the sched_clock.
Steven Rostedt (1):
tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros
Sudeep Holla (2):
firmware: arm_ffa: Correct 32-bit response handling in NOTIFICATION_INFO_GET
Revert "mailbox/pcc: support mailbox management of the shared buffer"
Sunil Khatri (1):
drm/amdgpu: clean up the amdgpu_cs_parser_bos
Suraj Kandpal (1):
drm/display/dp_mst: Add protection against 0 vcpi
Svyatoslav Ryhel (1):
drivers: iio: mpu3050: use dev_err_probe for regulator request
System Administrator (1):
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
Szymon Wilczek (1):
fs/ntfs3: fix deadlock in ni_read_folio_cmpr
Takashi Iwai (12):
ALSA: compress_offload: Relax __free() variable declarations
ALSA: control: Relax __free() variable declarations
ALSA: pcm: Relax __free() variable declarations
ALSA: oss: Relax __free() variable declarations
ALSA: seq: oss: Relax __free() variable declarations
ALSA: seq: Relax __free() variable declarations
ALSA: timer: Relax __free() variable declarations
ALSA: vmaster: Relax __free() variable declarations
ALSA: hda: Relax __free() variable declarations
ALSA: usx2y: Relax __free() variable declarations
ALSA: usb-audio: Relax __free() variable declarations
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Taniya Das (1):
clk: qcom: rcg2: compute 2d using duty fraction directly
Teddy Astie (1):
xen/virtio: Don't use grant-dma-ops when running as Dom0
Teguh Sobirin (1):
drm/msm/dpu: Set vsync source irrespective of mdp top support
Thomas Bogendoerfer (1):
bonding: only set speed/duplex to unknown, if getting speed failed
Thomas Fourier (3):
auxdisplay: arm-charlcd: fix release_mem_region() size
crypto: cavium - fix dma_free_coherent() size
crypto: octeontx - fix dma_free_coherent() size
Thomas Gleixner (3):
time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function
hrtimer: Fix trace oddity
irqchip/sifive-plic: Handle number of hardware interrupts correctly
Thomas Richard (1):
phy: freescale: imx8qm-hsio: fix NULL pointer dereference
Thomas Richard (TI) (1):
usb: cdns3: fix role switching during resume
Thomas Weißschuh (2):
tools/nolibc: always use 64-bit mode for s390 header checks
ARM: VDSO: Patch out __vdso_clock_getres() if unavailable
Timur Kristóf (12):
drm/amd/display: Pass proper DAC encoder ID to VBIOS
drm/amd/display: Don't repeat DAC load detection
drm/amd/pm: Return -EOPNOTSUPP when can't read power limit
drm/amd/display: Reject cursor plane on DCE when scaled differently than primary
drm/amd/display: Use DCE 6 link encoder for DCE 6 analog connectors
drm/amd/display: Only use analog link encoder with analog engine
drm/amd/display: Only use analog stream encoder with analog engine
drm/amd/display: Don't call find_analog_engine() twice
drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
drm/amd/display: Set CRTC source for DAC using registers
drm/amd/display: Enable DAC in DCE link encoder
Timur Tabi (1):
gpu: nova-core: check for overflow to DMATRFBASE1
Titouan Ameline de Cadeville (1):
fs/tests: exec: drop duplicate bprm_stack_limits test vectors
Tom Lendacky (1):
crypto: ccp - Fix a case where SNP_SHUTDOWN is missed
Tomas Glozar (1):
lib/Kconfig.debug: fix BOOTPARAM_HUNG_TASK_PANIC comment
Trond Myklebust (1):
NFS/localio: Handle short writes by retrying
Tuo Li (1):
of: unittest: fix possible null-pointer dereferences in of_unittest_property_copy()
Tycho Andersen (AMD) (1):
crypto: ccp - narrow scope of snp_range_list
Tzung-Bi Shih (1):
platform/chrome: cros_ec_lightbar: Fix response size initialization
Uwe Kleine-König (1):
PCI/portdrv: Fix potential resource leak
Val Packett (1):
power: supply: qcom_battmgr: Recognize "LiP" as lithium-polymer
Varun R Mallya (1):
libbpf: Fix OOB read in btf_dump_get_bitfield_value
Vikas Gupta (1):
bnge: fix reserving resources from FW
Viken Dadhaniya (1):
arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
Vikram Sharma (1):
dt-bindings: media: qcom,qcs8300-camss: Add missing power supplies
Vimlesh Kumar (3):
octeon_ep: disable per ring interrupts
octeon_ep: ensure dbell BADDR updation
octeon_ep_vf: ensure dbell BADDR updation
Vinay Belgaumkar (1):
drm/xe/ptl: Disable DCC on PTL
Vincent Guittot (1):
PCI: s32g: Skip Root Port removal during success
Vinod Govindapillai (1):
drm/i915/display: fix the pixel normalization handling for xe3p_lpd
Vladimir Zapolskiy (5):
arm64: dts: qcom: msm8994-octagon: Fix Analog Devices vendor prefix of AD7147
arm: dts: lpc32xx: add clocks property to Motor Control PWM device tree node
clk: qcom: gcc-sm8550: Use floor ops for SDCC RCGs
clk: qcom: gcc-sm8650: Use floor ops for SDCC RCGs
Input: adp5589 - remove a leftover header file
Votokina Victoria (1):
nfc: hci: shdlc: Stop timers and work before freeing context
Waqar Hameed (13):
power: supply: ab8500: Fix use-after-free in power_supply_changed()
power: supply: act8945a: Fix use-after-free in power_supply_changed()
power: supply: bq256xx: Fix use-after-free in power_supply_changed()
power: supply: bq25980: Fix use-after-free in power_supply_changed()
power: supply: cpcap-battery: Fix use-after-free in power_supply_changed()
power: supply: goldfish: Fix use-after-free in power_supply_changed()
power: supply: pf1550: Fix use-after-free in power_supply_changed()
power: supply: pm8916_bms_vm: Fix use-after-free in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free in power_supply_changed()
power: supply: rt9455: Fix use-after-free in power_supply_changed()
power: supply: sbs-battery: Fix use-after-free in power_supply_changed()
power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed()
power: supply: pm8916_lbc: Fix use-after-free for extcon in IRQ handler
Wei Li (1):
pinctrl: single: fix refcount leak in pcs_add_gpio_func()
Wei Wang (1):
iommupt: Do not set C-bit on MMIO backed PTEs
Weigang He (1):
mtd: parsers: ofpart: fix OF node refcount leak in parse_fixed_partitions()
Weili Qian (3):
crypto: hisilicon/hpre - support the hpre algorithm fallback
crypto: hisilicon/trng - support tfms sharing the device
hisi_acc_vfio_pci: fix VF reset timeout issue
Xiao Ni (1):
md: fix return value of mddev_trylock
Xiaochen Shen (1):
selftests/resctrl: Fix a division by zero error on Hygon
Yao Kai (1):
rcu: Fix rcu_read_unlock() deadloop due to softirq
Yao Zi (2):
clk: thead: th1520-ap: Poll for PLL lock and wait for stability
MIPS: Work around LLVM bug when gp is used as global register variable
Yaxiong Tian (1):
cpufreq: intel_pstate: Enable asym capacity only when CPU SMT is not possible
Yi Liu (2):
RDMA/uverbs: Validate wqe_size before using it in ib_uverbs_post_send
RDMA/uverbs: Add __GFP_NOWARN to ib_uverbs_unmarshall_recv() kmalloc
Yicong Yang (1):
coresight: tmc-etr: Fix race condition between sysfs and perf mode
Yongjian Sun (1):
ext4: fix e4b bitmap inconsistency reports
Yu Kuai (3):
md/raid5: fix raid5_run() to return error when log_init() fails
md/raid5: fix IO hang with degraded array with llbitmap
md/md-llbitmap: fix percpu_ref not resurrected on suspend timeout
Yue Haibing (1):
selftests: net: lib: Fix jq parsing error
YunJe Shin (2):
RDMA/siw: Fix potential NULL pointer dereference in header processing
RDMA/umad: Reject negative data_len in ib_umad_write
Yuxiong Wang (1):
cxl: Fix premature commit_end increment on decoder commit failure
Zesen Liu (1):
bpf: Fix memory access flags in helper prototypes
Zhai Can (1):
ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO
Zhang Yi (6):
ext4: subdivide EXT4_EXT_DATA_VALID1
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
ext4: don't cache extent during splitting extent
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
ext4: drop extent cache when splitting extent fails
Zhengmian Hu (1):
apparmor: avoid per-cpu hold underflow in aa_get_buffer
Zhiyu Zhang (1):
fat: avoid parent link count underflow in rmdir
Zicheng Qu (1):
sched: Re-evaluate scheduling when migrating queued tasks out of throttled cgroups
Zilin Guan (14):
i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
md/raid1: fix memory leak in raid1_run()
crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
soc: mediatek: svs: Fix memory leak in svs_enable_debug_write()
media: chips-media: wave5: Fix memory leak on codec_info allocation failure
wifi: rtw89: debug: Fix memory leak in __print_txpwr_map()
mtd: parsers: Fix memory leak in mtd_parser_tplink_safeloader_parse()
RDMA/mlx5: Fix memory leak in GET_DATA_DIRECT_SYSFS_PATH handler
scsi: smartpqi: Fix memory leak in pqi_report_phys_luns()
gpib: Fix memory leak in ni_usb_init()
drm/amdgpu: Fix memory leak in amdgpu_acpi_enumerate_xcc()
drm/amdgpu: Use kvfree instead of kfree in amdgpu_gmc_get_nps_memranges()
drm/amdgpu: Fix memory leak in amdgpu_ras_init()
ext4: fix memory leak in ext4_ext_shift_extents()
Zishun Yi (1):
accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
Ziyi Guo (7):
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
net: mscc: ocelot: extract ocelot_xmit_timestamp() helper
net: mscc: ocelot: split xmit into FDMA and register injection paths
net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()
net: usb: catc: enable basic endpoint checking
xen-netback: reject zero-queue configuration from guest
ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put()
lizhi (1):
crypto: hisilicon/hpre: extend tag field to 64 bits for better performance
zhouwenhao (1):
objpool: fix the overestimation of object pooling metadata size
| null | null | null | Linux 6.19.4 | On Fri, 2026-02-27 at 08:59 -0500, Genes Lists wrote:
...
...
I confirm that
6.19.4 plus git cherry-pick f175b46d9134f708358b5404730c6dfa200fbf3c
works fine and resolves the crash in nf_tables_abort_release seen in
6.19.4.
gene | {
"author": "Genes Lists <lists@sapience.com>",
"date": "Fri, 27 Feb 2026 09:44:45 -0500",
"is_openbsd": false,
"thread_id": "2026022657-clambake-mountable-8175@gregkh.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Hi all,
the XOR library used for the RAID5 parity is a bit of a mess right now.
The main file sits in crypto/ despite not being cryptography and not
using the crypto API, with the generic implementations sitting in
include/asm-generic and the arch implementations sitting in an asm/
header in theory. The latter doesn't work for many cases, so
architectures often build the code directly into the core kernel, or
create another module for the architecture code.
Changes this to a single module in lib/ that also contains the
architecture optimizations, similar to the library work Eric Biggers
has done for the CRC and crypto libraries later. After that it changes
to better calling conventions that allow for smarter architecture
implementations (although none is contained here yet), and uses
static_call to avoid indirection function call overhead.
A git tree is also available here:
git://git.infradead.org/users/hch/misc.git xor-improvements
Gitweb:
https://git.infradead.org/?p=users/hch/misc.git;a=shortlog;h=refs/heads/xor-improvements
Diffstat:
arch/arm64/include/asm/xor.h | 73 --
arch/loongarch/include/asm/xor.h | 68 --
arch/loongarch/include/asm/xor_simd.h | 34 -
arch/loongarch/lib/xor_simd_glue.c | 72 --
arch/powerpc/include/asm/xor.h | 47 -
arch/powerpc/include/asm/xor_altivec.h | 22
arch/powerpc/lib/xor_vmx.h | 22
arch/powerpc/lib/xor_vmx_glue.c | 63 --
arch/riscv/include/asm/xor.h | 68 --
arch/s390/include/asm/xor.h | 21
arch/sparc/include/asm/xor.h | 9
arch/sparc/include/asm/xor_64.h | 79 ---
arch/um/include/asm/xor.h | 24
arch/x86/include/asm/xor_64.h | 28 -
b/arch/alpha/Kconfig | 1
b/arch/arm/Kconfig | 1
b/arch/arm/lib/Makefile | 5
b/arch/arm64/Kconfig | 1
b/arch/arm64/lib/Makefile | 6
b/arch/loongarch/Kconfig | 1
b/arch/loongarch/lib/Makefile | 2
b/arch/powerpc/Kconfig | 1
b/arch/powerpc/lib/Makefile | 5
b/arch/riscv/Kconfig | 1
b/arch/riscv/lib/Makefile | 1
b/arch/s390/Kconfig | 1
b/arch/s390/lib/Makefile | 2
b/arch/sparc/Kconfig | 1
b/arch/sparc/include/asm/asm-prototypes.h | 1
b/arch/sparc/lib/Makefile | 2
b/arch/um/Kconfig | 1
b/arch/x86/Kconfig | 1
b/crypto/Kconfig | 2
b/crypto/Makefile | 1
b/crypto/async_tx/async_xor.c | 16
b/fs/btrfs/raid56.c | 27 -
b/include/asm-generic/Kbuild | 1
b/include/linux/raid/xor.h | 28 -
b/lib/Kconfig | 1
b/lib/Makefile | 2
b/lib/raid/Kconfig | 7
b/lib/raid/Makefile | 2
b/lib/raid/xor/Makefile | 50 ++
b/lib/raid/xor/alpha/xor.c | 46 -
b/lib/raid/xor/alpha/xor_arch.h | 22
b/lib/raid/xor/arm/xor-neon-glue.c | 19
b/lib/raid/xor/arm/xor-neon.c | 22
b/lib/raid/xor/arm/xor.c | 105 ----
b/lib/raid/xor/arm/xor_arch.h | 22
b/lib/raid/xor/arm64/xor-neon-glue.c | 26 +
b/lib/raid/xor/arm64/xor-neon.c | 94 +--
b/lib/raid/xor/arm64/xor-neon.h | 6
b/lib/raid/xor/arm64/xor_arch.h | 21
b/lib/raid/xor/loongarch/xor_arch.h | 33 +
b/lib/raid/xor/loongarch/xor_simd_glue.c | 37 +
b/lib/raid/xor/powerpc/xor_arch.h | 22
b/lib/raid/xor/powerpc/xor_vmx.c | 40 -
b/lib/raid/xor/powerpc/xor_vmx.h | 10
b/lib/raid/xor/powerpc/xor_vmx_glue.c | 28 +
b/lib/raid/xor/riscv/xor-glue.c | 25 +
b/lib/raid/xor/riscv/xor_arch.h | 17
b/lib/raid/xor/s390/xor.c | 15
b/lib/raid/xor/s390/xor_arch.h | 13
b/lib/raid/xor/sparc/xor-niagara-glue.c | 33 +
b/lib/raid/xor/sparc/xor-niagara.S | 346 --------------
b/lib/raid/xor/sparc/xor-sparc32.c | 32 -
b/lib/raid/xor/sparc/xor-vis-glue.c | 34 +
b/lib/raid/xor/sparc/xor-vis.S | 348 ++++++++++++++
b/lib/raid/xor/sparc/xor_arch.h | 35 +
b/lib/raid/xor/um/xor_arch.h | 9
b/lib/raid/xor/x86/xor-avx.c | 52 --
b/lib/raid/xor/x86/xor-mmx.c | 120 +---
b/lib/raid/xor/x86/xor-sse.c | 105 +---
b/lib/raid/xor/x86/xor_arch.h | 36 +
b/lib/raid/xor/xor-32regs-prefetch.c | 267 ++++++++++
b/lib/raid/xor/xor-32regs.c | 217 ++++++++
b/lib/raid/xor/xor-8regs-prefetch.c | 146 +++++
b/lib/raid/xor/xor-8regs.c | 103 ++++
b/lib/raid/xor/xor-core.c | 187 +++++++
b/lib/raid/xor/xor_impl.h | 60 ++
crypto/xor.c | 174 -------
include/asm-generic/xor.h | 738 ------------------------------
82 files changed, 2033 insertions(+), 2433 deletions(-) | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:12 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Most of the optimized xor_blocks versions require FPU/vector registers,
which generally are not supported in interrupt context.
Both callers already are in user context, so enforce this at the highest
level.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/xor.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/crypto/xor.c b/crypto/xor.c
index f39621a57bb3..864f3604e867 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -28,6 +28,8 @@ xor_blocks(unsigned int src_count, unsigned int bytes, void *dest, void **srcs)
{
unsigned long *p1, *p2, *p3, *p4;
+ WARN_ON_ONCE(in_interrupt());
+
p1 = (unsigned long *) srcs[0];
if (src_count == 1) {
active_template->do_2(bytes, dest, p1);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:13 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | xor_blocks can't be called from interrupt context, so remove the
handling for that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/include/asm/xor.h | 41 +++++++++++---------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/arch/arm/include/asm/xor.h b/arch/arm/include/asm/xor.h
index 934b549905f5..bca2a6514746 100644
--- a/arch/arm/include/asm/xor.h
+++ b/arch/arm/include/asm/xor.h
@@ -4,7 +4,6 @@
*
* Copyright (C) 2001 Russell King
*/
-#include <linux/hardirq.h>
#include <asm-generic/xor.h>
#include <asm/hwcap.h>
#include <asm/neon.h>
@@ -156,13 +155,9 @@ static void
xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2)
{
- if (in_interrupt()) {
- xor_arm4regs_2(bytes, p1, p2);
- } else {
- kernel_neon_begin();
- xor_block_neon_inner.do_2(bytes, p1, p2);
- kernel_neon_end();
- }
+ kernel_neon_begin();
+ xor_block_neon_inner.do_2(bytes, p1, p2);
+ kernel_neon_end();
}
static void
@@ -170,13 +165,9 @@ xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3)
{
- if (in_interrupt()) {
- xor_arm4regs_3(bytes, p1, p2, p3);
- } else {
- kernel_neon_begin();
- xor_block_neon_inner.do_3(bytes, p1, p2, p3);
- kernel_neon_end();
- }
+ kernel_neon_begin();
+ xor_block_neon_inner.do_3(bytes, p1, p2, p3);
+ kernel_neon_end();
}
static void
@@ -185,13 +176,9 @@ xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p3,
const unsigned long * __restrict p4)
{
- if (in_interrupt()) {
- xor_arm4regs_4(bytes, p1, p2, p3, p4);
- } else {
- kernel_neon_begin();
- xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
- kernel_neon_end();
- }
+ kernel_neon_begin();
+ xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
+ kernel_neon_end();
}
static void
@@ -201,13 +188,9 @@ xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p4,
const unsigned long * __restrict p5)
{
- if (in_interrupt()) {
- xor_arm4regs_5(bytes, p1, p2, p3, p4, p5);
- } else {
- kernel_neon_begin();
- xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
- kernel_neon_end();
- }
+ kernel_neon_begin();
+ xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
+ kernel_neon_end();
}
static struct xor_block_template xor_block_neon = {
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:14 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Drop the pretty confusing historic XOR_TRY_TEMPLATES and
XOR_SELECT_TEMPLATE, and instead let the architectures provide a
arch_xor_init that calls either xor_register to register candidates
or xor_force to force a specific implementation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/alpha/include/asm/xor.h | 29 ++++++++++++----------
arch/arm/include/asm/xor.h | 25 +++++++++----------
arch/arm64/include/asm/xor.h | 18 +++++++-------
arch/loongarch/include/asm/xor.h | 42 ++++++++++++--------------------
arch/powerpc/include/asm/xor.h | 31 ++++++++++-------------
arch/riscv/include/asm/xor.h | 19 ++++++++-------
arch/s390/include/asm/xor.h | 12 ++++-----
arch/sparc/include/asm/xor_32.h | 14 +++++------
arch/sparc/include/asm/xor_64.h | 31 +++++++++++------------
arch/x86/include/asm/xor.h | 3 ---
arch/x86/include/asm/xor_32.h | 36 ++++++++++++++-------------
arch/x86/include/asm/xor_64.h | 18 ++++++++------
arch/x86/include/asm/xor_avx.h | 9 -------
include/asm-generic/xor.h | 8 ------
include/linux/raid/xor_impl.h | 5 ++++
lib/raid/xor/xor-core.c | 41 +++++++++++++++++++++++--------
16 files changed, 168 insertions(+), 173 deletions(-)
diff --git a/arch/alpha/include/asm/xor.h b/arch/alpha/include/asm/xor.h
index e0de0c233ab9..4c8085711df1 100644
--- a/arch/alpha/include/asm/xor.h
+++ b/arch/alpha/include/asm/xor.h
@@ -851,16 +851,19 @@ static struct xor_block_template xor_block_alpha_prefetch = {
/* For grins, also test the generic routines. */
#include <asm-generic/xor.h>
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_alpha); \
- xor_speed(&xor_block_alpha_prefetch); \
- } while (0)
-
-/* Force the use of alpha_prefetch if EV6, as it is significantly
- faster in the cold cache case. */
-#define XOR_SELECT_TEMPLATE(FASTEST) \
- (implver() == IMPLVER_EV6 ? &xor_block_alpha_prefetch : FASTEST)
+/*
+ * Force the use of alpha_prefetch if EV6, as it is significantly faster in the
+ * cold cache case.
+ */
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ if (implver() == IMPLVER_EV6) {
+ xor_force(&xor_block_alpha_prefetch);
+ } else {
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_alpha);
+ xor_register(&xor_block_alpha_prefetch);
+ }
+}
diff --git a/arch/arm/include/asm/xor.h b/arch/arm/include/asm/xor.h
index bca2a6514746..b2dcd49186e2 100644
--- a/arch/arm/include/asm/xor.h
+++ b/arch/arm/include/asm/xor.h
@@ -138,15 +138,6 @@ static struct xor_block_template xor_block_arm4regs = {
.do_5 = xor_arm4regs_5,
};
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_arm4regs); \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_32regs); \
- NEON_TEMPLATES; \
- } while (0)
-
#ifdef CONFIG_KERNEL_MODE_NEON
extern struct xor_block_template const xor_block_neon_inner;
@@ -201,8 +192,16 @@ static struct xor_block_template xor_block_neon = {
.do_5 = xor_neon_5
};
-#define NEON_TEMPLATES \
- do { if (cpu_has_neon()) xor_speed(&xor_block_neon); } while (0)
-#else
-#define NEON_TEMPLATES
+#endif /* CONFIG_KERNEL_MODE_NEON */
+
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_arm4regs);
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+#ifdef CONFIG_KERNEL_MODE_NEON
+ if (cpu_has_neon())
+ xor_register(&xor_block_neon);
#endif
+}
diff --git a/arch/arm64/include/asm/xor.h b/arch/arm64/include/asm/xor.h
index c38e3d017a79..bfa6122f55ce 100644
--- a/arch/arm64/include/asm/xor.h
+++ b/arch/arm64/include/asm/xor.h
@@ -60,14 +60,14 @@ static struct xor_block_template xor_block_arm64 = {
.do_4 = xor_neon_4,
.do_5 = xor_neon_5
};
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_32regs); \
- if (cpu_has_neon()) { \
- xor_speed(&xor_block_arm64);\
- } \
- } while (0)
+
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+ if (cpu_has_neon())
+ xor_register(&xor_block_arm64);
+}
#endif /* ! CONFIG_KERNEL_MODE_NEON */
diff --git a/arch/loongarch/include/asm/xor.h b/arch/loongarch/include/asm/xor.h
index 12467fffee46..d17c0e3b047f 100644
--- a/arch/loongarch/include/asm/xor.h
+++ b/arch/loongarch/include/asm/xor.h
@@ -16,14 +16,6 @@ static struct xor_block_template xor_block_lsx = {
.do_4 = xor_lsx_4,
.do_5 = xor_lsx_5,
};
-
-#define XOR_SPEED_LSX() \
- do { \
- if (cpu_has_lsx) \
- xor_speed(&xor_block_lsx); \
- } while (0)
-#else /* CONFIG_CPU_HAS_LSX */
-#define XOR_SPEED_LSX()
#endif /* CONFIG_CPU_HAS_LSX */
#ifdef CONFIG_CPU_HAS_LASX
@@ -34,14 +26,6 @@ static struct xor_block_template xor_block_lasx = {
.do_4 = xor_lasx_4,
.do_5 = xor_lasx_5,
};
-
-#define XOR_SPEED_LASX() \
- do { \
- if (cpu_has_lasx) \
- xor_speed(&xor_block_lasx); \
- } while (0)
-#else /* CONFIG_CPU_HAS_LASX */
-#define XOR_SPEED_LASX()
#endif /* CONFIG_CPU_HAS_LASX */
/*
@@ -54,15 +38,21 @@ static struct xor_block_template xor_block_lasx = {
*/
#include <asm-generic/xor.h>
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
-do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_8regs_p); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_32regs_p); \
- XOR_SPEED_LSX(); \
- XOR_SPEED_LASX(); \
-} while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_8regs_p);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_32regs_p);
+#ifdef CONFIG_CPU_HAS_LSX
+ if (cpu_has_lsx)
+ xor_register(&xor_block_lsx);
+#endif
+#ifdef CONFIG_CPU_HAS_LASX
+ if (cpu_has_lasx)
+ xor_register(&xor_block_lasx);
+#endif
+}
#endif /* _ASM_LOONGARCH_XOR_H */
diff --git a/arch/powerpc/include/asm/xor.h b/arch/powerpc/include/asm/xor.h
index 37d05c11d09c..30224c5279c4 100644
--- a/arch/powerpc/include/asm/xor.h
+++ b/arch/powerpc/include/asm/xor.h
@@ -21,27 +21,22 @@ static struct xor_block_template xor_block_altivec = {
.do_4 = xor_altivec_4,
.do_5 = xor_altivec_5,
};
-
-#define XOR_SPEED_ALTIVEC() \
- do { \
- if (cpu_has_feature(CPU_FTR_ALTIVEC)) \
- xor_speed(&xor_block_altivec); \
- } while (0)
-#else
-#define XOR_SPEED_ALTIVEC()
-#endif
+#endif /* CONFIG_ALTIVEC */
/* Also try the generic routines. */
#include <asm-generic/xor.h>
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
-do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_8regs_p); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_32regs_p); \
- XOR_SPEED_ALTIVEC(); \
-} while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_8regs_p);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_32regs_p);
+#ifdef CONFIG_ALTIVEC
+ if (cpu_has_feature(CPU_FTR_ALTIVEC))
+ xor_register(&xor_block_altivec);
+#endif
+}
#endif /* _ASM_POWERPC_XOR_H */
diff --git a/arch/riscv/include/asm/xor.h b/arch/riscv/include/asm/xor.h
index 96011861e46b..ed5f27903efc 100644
--- a/arch/riscv/include/asm/xor.h
+++ b/arch/riscv/include/asm/xor.h
@@ -55,14 +55,15 @@ static struct xor_block_template xor_block_rvv = {
.do_4 = xor_vector_4,
.do_5 = xor_vector_5
};
+#endif /* CONFIG_RISCV_ISA_V */
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_32regs); \
- if (has_vector()) { \
- xor_speed(&xor_block_rvv);\
- } \
- } while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+#ifdef CONFIG_RISCV_ISA_V
+ if (has_vector())
+ xor_register(&xor_block_rvv);
#endif
+}
diff --git a/arch/s390/include/asm/xor.h b/arch/s390/include/asm/xor.h
index 857d6759b67f..4e2233f64da9 100644
--- a/arch/s390/include/asm/xor.h
+++ b/arch/s390/include/asm/xor.h
@@ -10,12 +10,10 @@
extern struct xor_block_template xor_block_xc;
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
-do { \
- xor_speed(&xor_block_xc); \
-} while (0)
-
-#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_xc)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_force(&xor_block_xc);
+}
#endif /* _ASM_S390_XOR_H */
diff --git a/arch/sparc/include/asm/xor_32.h b/arch/sparc/include/asm/xor_32.h
index 0351813cf3af..8fbf0c07ec28 100644
--- a/arch/sparc/include/asm/xor_32.h
+++ b/arch/sparc/include/asm/xor_32.h
@@ -259,10 +259,10 @@ static struct xor_block_template xor_block_SPARC = {
/* For grins, also test the generic routines. */
#include <asm-generic/xor.h>
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_SPARC); \
- } while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_SPARC);
+}
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h
index caaddea8ad79..e0482ecc0a68 100644
--- a/arch/sparc/include/asm/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
@@ -60,20 +60,17 @@ static struct xor_block_template xor_block_niagara = {
.do_5 = xor_niagara_5,
};
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_VIS); \
- xor_speed(&xor_block_niagara); \
- } while (0)
-
-/* For VIS for everything except Niagara. */
-#define XOR_SELECT_TEMPLATE(FASTEST) \
- ((tlb_type == hypervisor && \
- (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || \
- sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || \
- sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || \
- sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || \
- sun4v_chip_type == SUN4V_CHIP_NIAGARA5)) ? \
- &xor_block_niagara : \
- &xor_block_VIS)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ /* Force VIS for everything except Niagara. */
+ if (tlb_type == hypervisor &&
+ (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA5))
+ xor_force(&xor_block_niagara);
+ else
+ xor_force(&xor_block_VIS);
+}
diff --git a/arch/x86/include/asm/xor.h b/arch/x86/include/asm/xor.h
index 7b0307acc410..33f5620d8d69 100644
--- a/arch/x86/include/asm/xor.h
+++ b/arch/x86/include/asm/xor.h
@@ -496,7 +496,4 @@ static struct xor_block_template xor_block_sse_pf64 = {
# include <asm/xor_64.h>
#endif
-#define XOR_SELECT_TEMPLATE(FASTEST) \
- AVX_SELECT(FASTEST)
-
#endif /* _ASM_X86_XOR_H */
diff --git a/arch/x86/include/asm/xor_32.h b/arch/x86/include/asm/xor_32.h
index 7a6b9474591e..ee32d08c27bc 100644
--- a/arch/x86/include/asm/xor_32.h
+++ b/arch/x86/include/asm/xor_32.h
@@ -552,22 +552,24 @@ static struct xor_block_template xor_block_pIII_sse = {
/* We force the use of the SSE xor block because it can write around L2.
We may also be able to load into the L1 only depending on how the cpu
deals with a load to a line that is being prefetched. */
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
-do { \
- AVX_XOR_SPEED; \
- if (boot_cpu_has(X86_FEATURE_XMM)) { \
- xor_speed(&xor_block_pIII_sse); \
- xor_speed(&xor_block_sse_pf64); \
- } else if (boot_cpu_has(X86_FEATURE_MMX)) { \
- xor_speed(&xor_block_pII_mmx); \
- xor_speed(&xor_block_p5_mmx); \
- } else { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_8regs_p); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_32regs_p); \
- } \
-} while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ if (boot_cpu_has(X86_FEATURE_AVX) &&
+ boot_cpu_has(X86_FEATURE_OSXSAVE)) {
+ xor_force(&xor_block_avx);
+ } else if (boot_cpu_has(X86_FEATURE_XMM)) {
+ xor_register(&xor_block_pIII_sse);
+ xor_register(&xor_block_sse_pf64);
+ } else if (boot_cpu_has(X86_FEATURE_MMX)) {
+ xor_register(&xor_block_pII_mmx);
+ xor_register(&xor_block_p5_mmx);
+ } else {
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_8regs_p);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_32regs_p);
+ }
+}
#endif /* _ASM_X86_XOR_32_H */
diff --git a/arch/x86/include/asm/xor_64.h b/arch/x86/include/asm/xor_64.h
index 0307e4ec5044..2d2ceb241866 100644
--- a/arch/x86/include/asm/xor_64.h
+++ b/arch/x86/include/asm/xor_64.h
@@ -17,12 +17,16 @@ static struct xor_block_template xor_block_sse = {
/* We force the use of the SSE xor block because it can write around L2.
We may also be able to load into the L1 only depending on how the cpu
deals with a load to a line that is being prefetched. */
-#undef XOR_TRY_TEMPLATES
-#define XOR_TRY_TEMPLATES \
-do { \
- AVX_XOR_SPEED; \
- xor_speed(&xor_block_sse_pf64); \
- xor_speed(&xor_block_sse); \
-} while (0)
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ if (boot_cpu_has(X86_FEATURE_AVX) &&
+ boot_cpu_has(X86_FEATURE_OSXSAVE)) {
+ xor_force(&xor_block_avx);
+ } else {
+ xor_register(&xor_block_sse_pf64);
+ xor_register(&xor_block_sse);
+ }
+}
#endif /* _ASM_X86_XOR_64_H */
diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_avx.h
index 7f81dd5897f4..c600888436bb 100644
--- a/arch/x86/include/asm/xor_avx.h
+++ b/arch/x86/include/asm/xor_avx.h
@@ -166,13 +166,4 @@ static struct xor_block_template xor_block_avx = {
.do_5 = xor_avx_5,
};
-#define AVX_XOR_SPEED \
-do { \
- if (boot_cpu_has(X86_FEATURE_AVX) && boot_cpu_has(X86_FEATURE_OSXSAVE)) \
- xor_speed(&xor_block_avx); \
-} while (0)
-
-#define AVX_SELECT(FASTEST) \
- (boot_cpu_has(X86_FEATURE_AVX) && boot_cpu_has(X86_FEATURE_OSXSAVE) ? &xor_block_avx : FASTEST)
-
#endif
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h
index 44509d48fca2..79c0096aa9d9 100644
--- a/include/asm-generic/xor.h
+++ b/include/asm-generic/xor.h
@@ -728,11 +728,3 @@ static struct xor_block_template xor_block_32regs_p __maybe_unused = {
.do_4 = xor_32regs_p_4,
.do_5 = xor_32regs_p_5,
};
-
-#define XOR_TRY_TEMPLATES \
- do { \
- xor_speed(&xor_block_8regs); \
- xor_speed(&xor_block_8regs_p); \
- xor_speed(&xor_block_32regs); \
- xor_speed(&xor_block_32regs_p); \
- } while (0)
diff --git a/include/linux/raid/xor_impl.h b/include/linux/raid/xor_impl.h
index a1890cd66812..6ed4c445ab24 100644
--- a/include/linux/raid/xor_impl.h
+++ b/include/linux/raid/xor_impl.h
@@ -2,6 +2,8 @@
#ifndef _XOR_IMPL_H
#define _XOR_IMPL_H
+#include <linux/init.h>
+
struct xor_block_template {
struct xor_block_template *next;
const char *name;
@@ -22,4 +24,7 @@ struct xor_block_template {
const unsigned long * __restrict);
};
+void __init xor_register(struct xor_block_template *tmpl);
+void __init xor_force(struct xor_block_template *tmpl);
+
#endif /* _XOR_IMPL_H */
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index ddb39dca1026..3b53c70ba615 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -14,10 +14,6 @@
#include <linux/preempt.h>
#include <asm/xor.h>
-#ifndef XOR_SELECT_TEMPLATE
-#define XOR_SELECT_TEMPLATE(x) (x)
-#endif
-
/* The xor routines to use. */
static struct xor_block_template *active_template;
@@ -55,12 +51,33 @@ EXPORT_SYMBOL(xor_blocks);
static struct xor_block_template *__initdata template_list;
static int __initdata xor_forced = false;
-static void __init do_xor_register(struct xor_block_template *tmpl)
+/**
+ * xor_register - register a XOR template
+ * @tmpl: template to register
+ *
+ * Register a XOR implementation with the core. Registered implementations
+ * will be measured by a trivial benchmark, and the fastest one is chosen
+ * unless an implementation is forced using xor_force().
+ */
+void __init xor_register(struct xor_block_template *tmpl)
{
tmpl->next = template_list;
template_list = tmpl;
}
+/**
+ * xor_force - force use of a XOR template
+ * @tmpl: template to register
+ *
+ * Register a XOR implementation with the core and force using it. Forcing
+ * an implementation will make the core ignore any template registered using
+ * xor_register(), or any previous implementation forced using xor_force().
+ */
+void __init xor_force(struct xor_block_template *tmpl)
+{
+ active_template = tmpl;
+}
+
#define BENCH_SIZE 4096
#define REPS 800U
@@ -126,11 +143,19 @@ static int __init calibrate_xor_blocks(void)
static int __init xor_init(void)
{
+#ifdef arch_xor_init
+ arch_xor_init();
+#else
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_8regs_p);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_32regs_p);
+#endif
+
/*
* If this arch/cpu has a short-circuited selection, don't loop through
* all the possible functions, just use the best one.
*/
- active_template = XOR_SELECT_TEMPLATE(NULL);
if (active_template) {
pr_info("xor: automatically using best checksumming function %-10s\n",
active_template->name);
@@ -138,10 +163,6 @@ static int __init xor_init(void)
return 0;
}
-#define xor_speed do_xor_register
- XOR_TRY_TEMPLATES;
-#undef xor_speed
-
#ifdef MODULE
return calibrate_xor_blocks();
#else
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:20 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Keep xor.h for the public API, and split the struct xor_block_template
definition that is only needed by the xor.ko core and
architecture-specific optimizations into a separate xor_impl.h header.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/lib/xor-neon.c | 1 +
arch/s390/lib/xor.c | 2 +-
include/linux/raid/xor.h | 22 +---------------------
include/linux/raid/xor_impl.h | 25 +++++++++++++++++++++++++
lib/raid/xor/xor-core.c | 1 +
5 files changed, 29 insertions(+), 22 deletions(-)
create mode 100644 include/linux/raid/xor_impl.h
diff --git a/arch/arm/lib/xor-neon.c b/arch/arm/lib/xor-neon.c
index cf57fca97908..282980b9bf2a 100644
--- a/arch/arm/lib/xor-neon.c
+++ b/arch/arm/lib/xor-neon.c
@@ -6,6 +6,7 @@
*/
#include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
#include <linux/module.h>
MODULE_DESCRIPTION("NEON accelerated XOR implementation");
diff --git a/arch/s390/lib/xor.c b/arch/s390/lib/xor.c
index 1721b73b7803..4d5ed638d850 100644
--- a/arch/s390/lib/xor.c
+++ b/arch/s390/lib/xor.c
@@ -8,7 +8,7 @@
#include <linux/types.h>
#include <linux/export.h>
-#include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
#include <asm/xor.h>
static void xor_xc_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h
index 51b811b62322..02bda8d99534 100644
--- a/include/linux/raid/xor.h
+++ b/include/linux/raid/xor.h
@@ -7,24 +7,4 @@
extern void xor_blocks(unsigned int count, unsigned int bytes,
void *dest, void **srcs);
-struct xor_block_template {
- struct xor_block_template *next;
- const char *name;
- int speed;
- void (*do_2)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_3)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_4)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_5)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
-};
-
-#endif
+#endif /* _XOR_H */
diff --git a/include/linux/raid/xor_impl.h b/include/linux/raid/xor_impl.h
new file mode 100644
index 000000000000..a1890cd66812
--- /dev/null
+++ b/include/linux/raid/xor_impl.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _XOR_IMPL_H
+#define _XOR_IMPL_H
+
+struct xor_block_template {
+ struct xor_block_template *next;
+ const char *name;
+ int speed;
+ void (*do_2)(unsigned long, unsigned long * __restrict,
+ const unsigned long * __restrict);
+ void (*do_3)(unsigned long, unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict);
+ void (*do_4)(unsigned long, unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict);
+ void (*do_5)(unsigned long, unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict,
+ const unsigned long * __restrict);
+};
+
+#endif /* _XOR_IMPL_H */
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index a2c529d7b7c2..ddb39dca1026 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
#include <linux/jiffies.h>
#include <linux/preempt.h>
#include <asm/xor.h>
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:19 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | XOR_SELECT_TEMPLATE is only ever called with a NULL argument, so all the
ifdef'ery doesn't do anything. With our without this, the time travel
mode should work fine on CPUs that support AVX2, as the AVX2
implementation is forced in this case, and won't work otherwise.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/um/include/asm/xor.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h
index 647fae200c5d..c9ddedc19301 100644
--- a/arch/um/include/asm/xor.h
+++ b/arch/um/include/asm/xor.h
@@ -4,21 +4,11 @@
#ifdef CONFIG_64BIT
#undef CONFIG_X86_32
-#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64))
#else
#define CONFIG_X86_32 1
-#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs))
#endif
#include <asm/cpufeature.h>
#include <../../x86/include/asm/xor.h>
-#include <linux/time-internal.h>
-
-#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT
-#undef XOR_SELECT_TEMPLATE
-/* pick an arbitrary one - measuring isn't possible with inf-cpu */
-#define XOR_SELECT_TEMPLATE(x) \
- (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)
-#endif
#endif
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:15 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Update the to of file comment to be correct and non-redundant, and drop
the unused BH_TRACE define.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
lib/raid/xor/xor-core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index 864f3604e867..28aa654c288d 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -1,14 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * xor.c : Multiple Devices driver for Linux
- *
* Copyright (C) 1996, 1997, 1998, 1999, 2000,
* Ingo Molnar, Matti Aarnio, Jakub Jelinek, Richard Henderson.
*
- * Dispatch optimized RAID-5 checksumming functions.
+ * Dispatch optimized XOR parity functions.
*/
-#define BH_TRACE 0
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/raid/xor.h>
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:17 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in xor.ko
instead of always building it into the main kernel image.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/loongarch/include/asm/xor.h | 24 ++----------
arch/loongarch/include/asm/xor_simd.h | 34 ----------------
arch/loongarch/lib/Makefile | 2 -
lib/raid/xor/Makefile | 2 +
.../lib => lib/raid/xor/loongarch}/xor_simd.c | 0
.../lib => lib/raid/xor/loongarch}/xor_simd.h | 0
.../raid/xor/loongarch}/xor_simd_glue.c | 39 +++++++++++--------
.../raid/xor/loongarch}/xor_template.c | 0
8 files changed, 27 insertions(+), 74 deletions(-)
delete mode 100644 arch/loongarch/include/asm/xor_simd.h
rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.c (100%)
rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.h (100%)
rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd_glue.c (64%)
rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_template.c (100%)
diff --git a/arch/loongarch/include/asm/xor.h b/arch/loongarch/include/asm/xor.h
index d17c0e3b047f..7e32f72f8b03 100644
--- a/arch/loongarch/include/asm/xor.h
+++ b/arch/loongarch/include/asm/xor.h
@@ -6,27 +6,6 @@
#define _ASM_LOONGARCH_XOR_H
#include <asm/cpu-features.h>
-#include <asm/xor_simd.h>
-
-#ifdef CONFIG_CPU_HAS_LSX
-static struct xor_block_template xor_block_lsx = {
- .name = "lsx",
- .do_2 = xor_lsx_2,
- .do_3 = xor_lsx_3,
- .do_4 = xor_lsx_4,
- .do_5 = xor_lsx_5,
-};
-#endif /* CONFIG_CPU_HAS_LSX */
-
-#ifdef CONFIG_CPU_HAS_LASX
-static struct xor_block_template xor_block_lasx = {
- .name = "lasx",
- .do_2 = xor_lasx_2,
- .do_3 = xor_lasx_3,
- .do_4 = xor_lasx_4,
- .do_5 = xor_lasx_5,
-};
-#endif /* CONFIG_CPU_HAS_LASX */
/*
* For grins, also test the generic routines.
@@ -38,6 +17,9 @@ static struct xor_block_template xor_block_lasx = {
*/
#include <asm-generic/xor.h>
+extern struct xor_block_template xor_block_lsx;
+extern struct xor_block_template xor_block_lasx;
+
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
diff --git a/arch/loongarch/include/asm/xor_simd.h b/arch/loongarch/include/asm/xor_simd.h
deleted file mode 100644
index 471b96332f38..000000000000
--- a/arch/loongarch/include/asm/xor_simd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2023 WANG Xuerui <git@xen0n.name>
- */
-#ifndef _ASM_LOONGARCH_XOR_SIMD_H
-#define _ASM_LOONGARCH_XOR_SIMD_H
-
-#ifdef CONFIG_CPU_HAS_LSX
-void xor_lsx_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void xor_lsx_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3);
-void xor_lsx_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void xor_lsx_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3,
- const unsigned long * __restrict p4, const unsigned long * __restrict p5);
-#endif /* CONFIG_CPU_HAS_LSX */
-
-#ifdef CONFIG_CPU_HAS_LASX
-void xor_lasx_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void xor_lasx_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3);
-void xor_lasx_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void xor_lasx_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2, const unsigned long * __restrict p3,
- const unsigned long * __restrict p4, const unsigned long * __restrict p5);
-#endif /* CONFIG_CPU_HAS_LASX */
-
-#endif /* _ASM_LOONGARCH_XOR_SIMD_H */
diff --git a/arch/loongarch/lib/Makefile b/arch/loongarch/lib/Makefile
index ccea3bbd4353..827a88529a42 100644
--- a/arch/loongarch/lib/Makefile
+++ b/arch/loongarch/lib/Makefile
@@ -8,6 +8,4 @@ lib-y += delay.o memset.o memcpy.o memmove.o \
obj-$(CONFIG_ARCH_SUPPORTS_INT128) += tishift.o
-obj-$(CONFIG_CPU_HAS_LSX) += xor_simd.o xor_simd_glue.o
-
obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 3c13851219e5..fafd131cef27 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -15,6 +15,8 @@ xor-$(CONFIG_KERNEL_MODE_NEON) += arm/xor-neon.o arm/xor-neon-glue.o
else
xor-$(CONFIG_KERNEL_MODE_NEON) += arm64/xor-neon.o arm64/xor-neon-glue.o
endif
+xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd.o
+xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd_glue.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
diff --git a/arch/loongarch/lib/xor_simd.c b/lib/raid/xor/loongarch/xor_simd.c
similarity index 100%
rename from arch/loongarch/lib/xor_simd.c
rename to lib/raid/xor/loongarch/xor_simd.c
diff --git a/arch/loongarch/lib/xor_simd.h b/lib/raid/xor/loongarch/xor_simd.h
similarity index 100%
rename from arch/loongarch/lib/xor_simd.h
rename to lib/raid/xor/loongarch/xor_simd.h
diff --git a/arch/loongarch/lib/xor_simd_glue.c b/lib/raid/xor/loongarch/xor_simd_glue.c
similarity index 64%
rename from arch/loongarch/lib/xor_simd_glue.c
rename to lib/raid/xor/loongarch/xor_simd_glue.c
index 393f689dbcf6..11fa3b47ba83 100644
--- a/arch/loongarch/lib/xor_simd_glue.c
+++ b/lib/raid/xor/loongarch/xor_simd_glue.c
@@ -5,24 +5,23 @@
* Copyright (C) 2023 WANG Xuerui <git@xen0n.name>
*/
-#include <linux/export.h>
#include <linux/sched.h>
+#include <linux/raid/xor_impl.h>
#include <asm/fpu.h>
-#include <asm/xor_simd.h>
+#include <asm/xor.h>
#include "xor_simd.h"
#define MAKE_XOR_GLUE_2(flavor) \
-void xor_##flavor##_2(unsigned long bytes, unsigned long * __restrict p1, \
+static void xor_##flavor##_2(unsigned long bytes, unsigned long * __restrict p1,\
const unsigned long * __restrict p2) \
{ \
kernel_fpu_begin(); \
__xor_##flavor##_2(bytes, p1, p2); \
kernel_fpu_end(); \
} \
-EXPORT_SYMBOL_GPL(xor_##flavor##_2)
#define MAKE_XOR_GLUE_3(flavor) \
-void xor_##flavor##_3(unsigned long bytes, unsigned long * __restrict p1, \
+static void xor_##flavor##_3(unsigned long bytes, unsigned long * __restrict p1,\
const unsigned long * __restrict p2, \
const unsigned long * __restrict p3) \
{ \
@@ -30,10 +29,9 @@ void xor_##flavor##_3(unsigned long bytes, unsigned long * __restrict p1, \
__xor_##flavor##_3(bytes, p1, p2, p3); \
kernel_fpu_end(); \
} \
-EXPORT_SYMBOL_GPL(xor_##flavor##_3)
#define MAKE_XOR_GLUE_4(flavor) \
-void xor_##flavor##_4(unsigned long bytes, unsigned long * __restrict p1, \
+static void xor_##flavor##_4(unsigned long bytes, unsigned long * __restrict p1,\
const unsigned long * __restrict p2, \
const unsigned long * __restrict p3, \
const unsigned long * __restrict p4) \
@@ -42,10 +40,9 @@ void xor_##flavor##_4(unsigned long bytes, unsigned long * __restrict p1, \
__xor_##flavor##_4(bytes, p1, p2, p3, p4); \
kernel_fpu_end(); \
} \
-EXPORT_SYMBOL_GPL(xor_##flavor##_4)
#define MAKE_XOR_GLUE_5(flavor) \
-void xor_##flavor##_5(unsigned long bytes, unsigned long * __restrict p1, \
+static void xor_##flavor##_5(unsigned long bytes, unsigned long * __restrict p1,\
const unsigned long * __restrict p2, \
const unsigned long * __restrict p3, \
const unsigned long * __restrict p4, \
@@ -55,18 +52,26 @@ void xor_##flavor##_5(unsigned long bytes, unsigned long * __restrict p1, \
__xor_##flavor##_5(bytes, p1, p2, p3, p4, p5); \
kernel_fpu_end(); \
} \
-EXPORT_SYMBOL_GPL(xor_##flavor##_5)
-#define MAKE_XOR_GLUES(flavor) \
- MAKE_XOR_GLUE_2(flavor); \
- MAKE_XOR_GLUE_3(flavor); \
- MAKE_XOR_GLUE_4(flavor); \
- MAKE_XOR_GLUE_5(flavor)
+#define MAKE_XOR_GLUES(flavor) \
+ MAKE_XOR_GLUE_2(flavor); \
+ MAKE_XOR_GLUE_3(flavor); \
+ MAKE_XOR_GLUE_4(flavor); \
+ MAKE_XOR_GLUE_5(flavor); \
+ \
+struct xor_block_template xor_block_##flavor = { \
+ .name = __stringify(flavor), \
+ .do_2 = xor_##flavor##_2, \
+ .do_3 = xor_##flavor##_3, \
+ .do_4 = xor_##flavor##_4, \
+ .do_5 = xor_##flavor##_5, \
+}
+
#ifdef CONFIG_CPU_HAS_LSX
MAKE_XOR_GLUES(lsx);
-#endif
+#endif /* CONFIG_CPU_HAS_LSX */
#ifdef CONFIG_CPU_HAS_LASX
MAKE_XOR_GLUES(lasx);
-#endif
+#endif /* CONFIG_CPU_HAS_LASX */
diff --git a/arch/loongarch/lib/xor_template.c b/lib/raid/xor/loongarch/xor_template.c
similarity index 100%
rename from arch/loongarch/lib/xor_template.c
rename to lib/raid/xor/loongarch/xor_template.c
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:25 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in the main
xor.ko instead of building a separate module for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/include/asm/xor.h | 190 +-----------------
arch/arm/lib/Makefile | 5 -
lib/raid/xor/Makefile | 8 +
lib/raid/xor/arm/xor-neon-glue.c | 58 ++++++
{arch/arm/lib => lib/raid/xor/arm}/xor-neon.c | 10 +-
lib/raid/xor/arm/xor.c | 136 +++++++++++++
6 files changed, 205 insertions(+), 202 deletions(-)
create mode 100644 lib/raid/xor/arm/xor-neon-glue.c
rename {arch/arm/lib => lib/raid/xor/arm}/xor-neon.c (74%)
create mode 100644 lib/raid/xor/arm/xor.c
diff --git a/arch/arm/include/asm/xor.h b/arch/arm/include/asm/xor.h
index b2dcd49186e2..989c55872ef6 100644
--- a/arch/arm/include/asm/xor.h
+++ b/arch/arm/include/asm/xor.h
@@ -1,198 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * arch/arm/include/asm/xor.h
- *
* Copyright (C) 2001 Russell King
*/
#include <asm-generic/xor.h>
-#include <asm/hwcap.h>
#include <asm/neon.h>
-#define __XOR(a1, a2) a1 ^= a2
-
-#define GET_BLOCK_2(dst) \
- __asm__("ldmia %0, {%1, %2}" \
- : "=r" (dst), "=r" (a1), "=r" (a2) \
- : "0" (dst))
-
-#define GET_BLOCK_4(dst) \
- __asm__("ldmia %0, {%1, %2, %3, %4}" \
- : "=r" (dst), "=r" (a1), "=r" (a2), "=r" (a3), "=r" (a4) \
- : "0" (dst))
-
-#define XOR_BLOCK_2(src) \
- __asm__("ldmia %0!, {%1, %2}" \
- : "=r" (src), "=r" (b1), "=r" (b2) \
- : "0" (src)); \
- __XOR(a1, b1); __XOR(a2, b2);
-
-#define XOR_BLOCK_4(src) \
- __asm__("ldmia %0!, {%1, %2, %3, %4}" \
- : "=r" (src), "=r" (b1), "=r" (b2), "=r" (b3), "=r" (b4) \
- : "0" (src)); \
- __XOR(a1, b1); __XOR(a2, b2); __XOR(a3, b3); __XOR(a4, b4)
-
-#define PUT_BLOCK_2(dst) \
- __asm__ __volatile__("stmia %0!, {%2, %3}" \
- : "=r" (dst) \
- : "0" (dst), "r" (a1), "r" (a2))
-
-#define PUT_BLOCK_4(dst) \
- __asm__ __volatile__("stmia %0!, {%2, %3, %4, %5}" \
- : "=r" (dst) \
- : "0" (dst), "r" (a1), "r" (a2), "r" (a3), "r" (a4))
-
-static void
-xor_arm4regs_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- unsigned int lines = bytes / sizeof(unsigned long) / 4;
- register unsigned int a1 __asm__("r4");
- register unsigned int a2 __asm__("r5");
- register unsigned int a3 __asm__("r6");
- register unsigned int a4 __asm__("r10");
- register unsigned int b1 __asm__("r8");
- register unsigned int b2 __asm__("r9");
- register unsigned int b3 __asm__("ip");
- register unsigned int b4 __asm__("lr");
-
- do {
- GET_BLOCK_4(p1);
- XOR_BLOCK_4(p2);
- PUT_BLOCK_4(p1);
- } while (--lines);
-}
-
-static void
-xor_arm4regs_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- unsigned int lines = bytes / sizeof(unsigned long) / 4;
- register unsigned int a1 __asm__("r4");
- register unsigned int a2 __asm__("r5");
- register unsigned int a3 __asm__("r6");
- register unsigned int a4 __asm__("r10");
- register unsigned int b1 __asm__("r8");
- register unsigned int b2 __asm__("r9");
- register unsigned int b3 __asm__("ip");
- register unsigned int b4 __asm__("lr");
-
- do {
- GET_BLOCK_4(p1);
- XOR_BLOCK_4(p2);
- XOR_BLOCK_4(p3);
- PUT_BLOCK_4(p1);
- } while (--lines);
-}
-
-static void
-xor_arm4regs_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- unsigned int lines = bytes / sizeof(unsigned long) / 2;
- register unsigned int a1 __asm__("r8");
- register unsigned int a2 __asm__("r9");
- register unsigned int b1 __asm__("ip");
- register unsigned int b2 __asm__("lr");
-
- do {
- GET_BLOCK_2(p1);
- XOR_BLOCK_2(p2);
- XOR_BLOCK_2(p3);
- XOR_BLOCK_2(p4);
- PUT_BLOCK_2(p1);
- } while (--lines);
-}
-
-static void
-xor_arm4regs_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- unsigned int lines = bytes / sizeof(unsigned long) / 2;
- register unsigned int a1 __asm__("r8");
- register unsigned int a2 __asm__("r9");
- register unsigned int b1 __asm__("ip");
- register unsigned int b2 __asm__("lr");
-
- do {
- GET_BLOCK_2(p1);
- XOR_BLOCK_2(p2);
- XOR_BLOCK_2(p3);
- XOR_BLOCK_2(p4);
- XOR_BLOCK_2(p5);
- PUT_BLOCK_2(p1);
- } while (--lines);
-}
-
-static struct xor_block_template xor_block_arm4regs = {
- .name = "arm4regs",
- .do_2 = xor_arm4regs_2,
- .do_3 = xor_arm4regs_3,
- .do_4 = xor_arm4regs_4,
- .do_5 = xor_arm4regs_5,
-};
-
-#ifdef CONFIG_KERNEL_MODE_NEON
-
-extern struct xor_block_template const xor_block_neon_inner;
-
-static void
-xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_2(bytes, p1, p2);
- kernel_neon_end();
-}
-
-static void
-xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_3(bytes, p1, p2, p3);
- kernel_neon_end();
-}
-
-static void
-xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
- kernel_neon_end();
-}
-
-static void
-xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
- kernel_neon_end();
-}
-
-static struct xor_block_template xor_block_neon = {
- .name = "neon",
- .do_2 = xor_neon_2,
- .do_3 = xor_neon_3,
- .do_4 = xor_neon_4,
- .do_5 = xor_neon_5
-};
-
-#endif /* CONFIG_KERNEL_MODE_NEON */
+extern struct xor_block_template xor_block_arm4regs;
+extern struct xor_block_template xor_block_neon;
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 0ca5aae1bcc3..9295055cdfc9 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -39,9 +39,4 @@ endif
$(obj)/csumpartialcopy.o: $(obj)/csumpartialcopygeneric.S
$(obj)/csumpartialcopyuser.o: $(obj)/csumpartialcopygeneric.S
-ifeq ($(CONFIG_KERNEL_MODE_NEON),y)
- CFLAGS_xor-neon.o += $(CC_FLAGS_FPU)
- obj-$(CONFIG_XOR_BLOCKS) += xor-neon.o
-endif
-
obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 6d03c27c37c7..fb760edae54b 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -9,3 +9,11 @@ xor-y += xor-8regs-prefetch.o
xor-y += xor-32regs-prefetch.o
xor-$(CONFIG_ALPHA) += alpha/xor.o
+xor-$(CONFIG_ARM) += arm/xor.o
+ifeq ($(CONFIG_ARM),y)
+xor-$(CONFIG_KERNEL_MODE_NEON) += arm/xor-neon.o arm/xor-neon-glue.o
+endif
+
+
+CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
+CFLAGS_REMOVE_arm/xor-neon.o += $(CC_FLAGS_NO_FPU)
diff --git a/lib/raid/xor/arm/xor-neon-glue.c b/lib/raid/xor/arm/xor-neon-glue.c
new file mode 100644
index 000000000000..c7b162b383a2
--- /dev/null
+++ b/lib/raid/xor/arm/xor-neon-glue.c
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2001 Russell King
+ */
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
+
+extern struct xor_block_template const xor_block_neon_inner;
+
+static void
+xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ kernel_neon_begin();
+ xor_block_neon_inner.do_2(bytes, p1, p2);
+ kernel_neon_end();
+}
+
+static void
+xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ kernel_neon_begin();
+ xor_block_neon_inner.do_3(bytes, p1, p2, p3);
+ kernel_neon_end();
+}
+
+static void
+xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ kernel_neon_begin();
+ xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
+ kernel_neon_end();
+}
+
+static void
+xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ kernel_neon_begin();
+ xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
+ kernel_neon_end();
+}
+
+struct xor_block_template xor_block_neon = {
+ .name = "neon",
+ .do_2 = xor_neon_2,
+ .do_3 = xor_neon_3,
+ .do_4 = xor_neon_4,
+ .do_5 = xor_neon_5
+};
diff --git a/arch/arm/lib/xor-neon.c b/lib/raid/xor/arm/xor-neon.c
similarity index 74%
rename from arch/arm/lib/xor-neon.c
rename to lib/raid/xor/arm/xor-neon.c
index b5be50567991..c9d4378b0f0e 100644
--- a/arch/arm/lib/xor-neon.c
+++ b/lib/raid/xor/arm/xor-neon.c
@@ -1,16 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * linux/arch/arm/lib/xor-neon.c
- *
* Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
*/
-#include <linux/raid/xor.h>
#include <linux/raid/xor_impl.h>
-#include <linux/module.h>
-
-MODULE_DESCRIPTION("NEON accelerated XOR implementation");
-MODULE_LICENSE("GPL");
#ifndef __ARM_NEON__
#error You should compile this file with '-march=armv7-a -mfloat-abi=softfp -mfpu=neon'
@@ -27,7 +20,7 @@ MODULE_LICENSE("GPL");
#endif
#define NO_TEMPLATE
-#include "../../../lib/raid/xor/xor-8regs.c"
+#include "../xor-8regs.c"
struct xor_block_template const xor_block_neon_inner = {
.name = "__inner_neon__",
@@ -36,4 +29,3 @@ struct xor_block_template const xor_block_neon_inner = {
.do_4 = xor_8regs_4,
.do_5 = xor_8regs_5,
};
-EXPORT_SYMBOL(xor_block_neon_inner);
diff --git a/lib/raid/xor/arm/xor.c b/lib/raid/xor/arm/xor.c
new file mode 100644
index 000000000000..2263341dbbcd
--- /dev/null
+++ b/lib/raid/xor/arm/xor.c
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2001 Russell King
+ */
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
+
+#define __XOR(a1, a2) a1 ^= a2
+
+#define GET_BLOCK_2(dst) \
+ __asm__("ldmia %0, {%1, %2}" \
+ : "=r" (dst), "=r" (a1), "=r" (a2) \
+ : "0" (dst))
+
+#define GET_BLOCK_4(dst) \
+ __asm__("ldmia %0, {%1, %2, %3, %4}" \
+ : "=r" (dst), "=r" (a1), "=r" (a2), "=r" (a3), "=r" (a4) \
+ : "0" (dst))
+
+#define XOR_BLOCK_2(src) \
+ __asm__("ldmia %0!, {%1, %2}" \
+ : "=r" (src), "=r" (b1), "=r" (b2) \
+ : "0" (src)); \
+ __XOR(a1, b1); __XOR(a2, b2);
+
+#define XOR_BLOCK_4(src) \
+ __asm__("ldmia %0!, {%1, %2, %3, %4}" \
+ : "=r" (src), "=r" (b1), "=r" (b2), "=r" (b3), "=r" (b4) \
+ : "0" (src)); \
+ __XOR(a1, b1); __XOR(a2, b2); __XOR(a3, b3); __XOR(a4, b4)
+
+#define PUT_BLOCK_2(dst) \
+ __asm__ __volatile__("stmia %0!, {%2, %3}" \
+ : "=r" (dst) \
+ : "0" (dst), "r" (a1), "r" (a2))
+
+#define PUT_BLOCK_4(dst) \
+ __asm__ __volatile__("stmia %0!, {%2, %3, %4, %5}" \
+ : "=r" (dst) \
+ : "0" (dst), "r" (a1), "r" (a2), "r" (a3), "r" (a4))
+
+static void
+xor_arm4regs_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ unsigned int lines = bytes / sizeof(unsigned long) / 4;
+ register unsigned int a1 __asm__("r4");
+ register unsigned int a2 __asm__("r5");
+ register unsigned int a3 __asm__("r6");
+ register unsigned int a4 __asm__("r10");
+ register unsigned int b1 __asm__("r8");
+ register unsigned int b2 __asm__("r9");
+ register unsigned int b3 __asm__("ip");
+ register unsigned int b4 __asm__("lr");
+
+ do {
+ GET_BLOCK_4(p1);
+ XOR_BLOCK_4(p2);
+ PUT_BLOCK_4(p1);
+ } while (--lines);
+}
+
+static void
+xor_arm4regs_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ unsigned int lines = bytes / sizeof(unsigned long) / 4;
+ register unsigned int a1 __asm__("r4");
+ register unsigned int a2 __asm__("r5");
+ register unsigned int a3 __asm__("r6");
+ register unsigned int a4 __asm__("r10");
+ register unsigned int b1 __asm__("r8");
+ register unsigned int b2 __asm__("r9");
+ register unsigned int b3 __asm__("ip");
+ register unsigned int b4 __asm__("lr");
+
+ do {
+ GET_BLOCK_4(p1);
+ XOR_BLOCK_4(p2);
+ XOR_BLOCK_4(p3);
+ PUT_BLOCK_4(p1);
+ } while (--lines);
+}
+
+static void
+xor_arm4regs_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ unsigned int lines = bytes / sizeof(unsigned long) / 2;
+ register unsigned int a1 __asm__("r8");
+ register unsigned int a2 __asm__("r9");
+ register unsigned int b1 __asm__("ip");
+ register unsigned int b2 __asm__("lr");
+
+ do {
+ GET_BLOCK_2(p1);
+ XOR_BLOCK_2(p2);
+ XOR_BLOCK_2(p3);
+ XOR_BLOCK_2(p4);
+ PUT_BLOCK_2(p1);
+ } while (--lines);
+}
+
+static void
+xor_arm4regs_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ unsigned int lines = bytes / sizeof(unsigned long) / 2;
+ register unsigned int a1 __asm__("r8");
+ register unsigned int a2 __asm__("r9");
+ register unsigned int b1 __asm__("ip");
+ register unsigned int b2 __asm__("lr");
+
+ do {
+ GET_BLOCK_2(p1);
+ XOR_BLOCK_2(p2);
+ XOR_BLOCK_2(p3);
+ XOR_BLOCK_2(p4);
+ XOR_BLOCK_2(p5);
+ PUT_BLOCK_2(p1);
+ } while (--lines);
+}
+
+struct xor_block_template xor_block_arm4regs = {
+ .name = "arm4regs",
+ .do_2 = xor_arm4regs_2,
+ .do_3 = xor_arm4regs_3,
+ .do_4 = xor_arm4regs_4,
+ .do_5 = xor_arm4regs_5,
+};
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:23 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in the main
xor.ko instead of building a separate module for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm64/include/asm/xor.h | 58 +------------------
arch/arm64/lib/Makefile | 6 --
lib/raid/xor/Makefile | 5 ++
lib/raid/xor/arm64/xor-neon-glue.c | 57 ++++++++++++++++++
.../lib => lib/raid/xor/arm64}/xor-neon.c | 21 ++-----
5 files changed, 69 insertions(+), 78 deletions(-)
create mode 100644 lib/raid/xor/arm64/xor-neon-glue.c
rename {arch/arm64/lib => lib/raid/xor/arm64}/xor-neon.c (95%)
diff --git a/arch/arm64/include/asm/xor.h b/arch/arm64/include/asm/xor.h
index bfa6122f55ce..81718f010761 100644
--- a/arch/arm64/include/asm/xor.h
+++ b/arch/arm64/include/asm/xor.h
@@ -1,73 +1,21 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * arch/arm64/include/asm/xor.h
- *
* Authors: Jackie Liu <liuyun01@kylinos.cn>
* Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
*/
-#include <linux/hardirq.h>
#include <asm-generic/xor.h>
-#include <asm/hwcap.h>
#include <asm/simd.h>
-#ifdef CONFIG_KERNEL_MODE_NEON
-
-extern struct xor_block_template const xor_block_inner_neon;
-
-static void
-xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_2(bytes, p1, p2);
-}
-
-static void
-xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_3(bytes, p1, p2, p3);
-}
-
-static void
-xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_4(bytes, p1, p2, p3, p4);
-}
-
-static void
-xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_5(bytes, p1, p2, p3, p4, p5);
-}
-
-static struct xor_block_template xor_block_arm64 = {
- .name = "arm64_neon",
- .do_2 = xor_neon_2,
- .do_3 = xor_neon_3,
- .do_4 = xor_neon_4,
- .do_5 = xor_neon_5
-};
+extern struct xor_block_template xor_block_arm64;
+void __init xor_neon_init(void);
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
+ xor_neon_init();
xor_register(&xor_block_8regs);
xor_register(&xor_block_32regs);
if (cpu_has_neon())
xor_register(&xor_block_arm64);
}
-
-#endif /* ! CONFIG_KERNEL_MODE_NEON */
diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile
index 633e5223d944..448c917494f3 100644
--- a/arch/arm64/lib/Makefile
+++ b/arch/arm64/lib/Makefile
@@ -5,12 +5,6 @@ lib-y := clear_user.o delay.o copy_from_user.o \
memset.o memcmp.o strcmp.o strncmp.o strlen.o \
strnlen.o strchr.o strrchr.o tishift.o
-ifeq ($(CONFIG_KERNEL_MODE_NEON), y)
-obj-$(CONFIG_XOR_BLOCKS) += xor-neon.o
-CFLAGS_xor-neon.o += $(CC_FLAGS_FPU)
-CFLAGS_REMOVE_xor-neon.o += $(CC_FLAGS_NO_FPU)
-endif
-
lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o
obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index fb760edae54b..3c13851219e5 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -12,8 +12,13 @@ xor-$(CONFIG_ALPHA) += alpha/xor.o
xor-$(CONFIG_ARM) += arm/xor.o
ifeq ($(CONFIG_ARM),y)
xor-$(CONFIG_KERNEL_MODE_NEON) += arm/xor-neon.o arm/xor-neon-glue.o
+else
+xor-$(CONFIG_KERNEL_MODE_NEON) += arm64/xor-neon.o arm64/xor-neon-glue.o
endif
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
CFLAGS_REMOVE_arm/xor-neon.o += $(CC_FLAGS_NO_FPU)
+
+CFLAGS_arm64/xor-neon.o += $(CC_FLAGS_FPU)
+CFLAGS_REMOVE_arm64/xor-neon.o += $(CC_FLAGS_NO_FPU)
diff --git a/lib/raid/xor/arm64/xor-neon-glue.c b/lib/raid/xor/arm64/xor-neon-glue.c
new file mode 100644
index 000000000000..067a2095659a
--- /dev/null
+++ b/lib/raid/xor/arm64/xor-neon-glue.c
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Authors: Jackie Liu <liuyun01@kylinos.cn>
+ * Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
+ */
+
+#include <linux/raid/xor_impl.h>
+#include <asm/simd.h>
+#include <asm/xor.h>
+
+extern struct xor_block_template const xor_block_inner_neon;
+
+static void
+xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ scoped_ksimd()
+ xor_block_inner_neon.do_2(bytes, p1, p2);
+}
+
+static void
+xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ scoped_ksimd()
+ xor_block_inner_neon.do_3(bytes, p1, p2, p3);
+}
+
+static void
+xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ scoped_ksimd()
+ xor_block_inner_neon.do_4(bytes, p1, p2, p3, p4);
+}
+
+static void
+xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ scoped_ksimd()
+ xor_block_inner_neon.do_5(bytes, p1, p2, p3, p4, p5);
+}
+
+struct xor_block_template xor_block_arm64 = {
+ .name = "arm64_neon",
+ .do_2 = xor_neon_2,
+ .do_3 = xor_neon_3,
+ .do_4 = xor_neon_4,
+ .do_5 = xor_neon_5
+};
diff --git a/arch/arm64/lib/xor-neon.c b/lib/raid/xor/arm64/xor-neon.c
similarity index 95%
rename from arch/arm64/lib/xor-neon.c
rename to lib/raid/xor/arm64/xor-neon.c
index 8fffebfa17b2..8d2d185090db 100644
--- a/arch/arm64/lib/xor-neon.c
+++ b/lib/raid/xor/arm64/xor-neon.c
@@ -1,14 +1,13 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * arch/arm64/lib/xor-neon.c
- *
* Authors: Jackie Liu <liuyun01@kylinos.cn>
* Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
*/
-#include <linux/raid/xor.h>
-#include <linux/module.h>
+#include <linux/raid/xor_impl.h>
+#include <linux/cache.h>
#include <asm/neon-intrinsics.h>
+#include <asm/xor.h>
static void xor_arm64_neon_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2)
@@ -179,7 +178,6 @@ struct xor_block_template xor_block_inner_neon __ro_after_init = {
.do_4 = xor_arm64_neon_4,
.do_5 = xor_arm64_neon_5,
};
-EXPORT_SYMBOL(xor_block_inner_neon);
static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r)
{
@@ -317,22 +315,11 @@ static void xor_arm64_eor3_5(unsigned long bytes,
} while (--lines > 0);
}
-static int __init xor_neon_init(void)
+void __init xor_neon_init(void)
{
if (cpu_have_named_feature(SHA3)) {
xor_block_inner_neon.do_3 = xor_arm64_eor3_3;
xor_block_inner_neon.do_4 = xor_arm64_eor3_4;
xor_block_inner_neon.do_5 = xor_arm64_eor3_5;
}
- return 0;
}
-module_init(xor_neon_init);
-
-static void __exit xor_neon_exit(void)
-{
-}
-module_exit(xor_neon_exit);
-
-MODULE_AUTHOR("Jackie Liu <liuyun01@kylinos.cn>");
-MODULE_DESCRIPTION("ARMv8 XOR Extensions");
-MODULE_LICENSE("GPL");
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:24 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Originally, the XOR code benchmarked all algorithms at load time, but
it has since then been hacked multiple times to allow forcing an
algorithm, and then commit 524ccdbdfb52 ("crypto: xor - defer load time
benchmark to a later time") changed the logic to a two-step process
or registration and benchmarking, but only when built-in.
Rework this, so that the XOR_TRY_TEMPLATES macro magic now always just
deals with adding the templates to the list, and benchmarking is always
done in a second pass; for modular builds from module_init, and for the
built-in case using a separate init call level.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
lib/raid/xor/xor-core.c | 98 ++++++++++++++++++++---------------------
1 file changed, 48 insertions(+), 50 deletions(-)
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index 28aa654c288d..a2c529d7b7c2 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -52,29 +52,14 @@ EXPORT_SYMBOL(xor_blocks);
/* Set of all registered templates. */
static struct xor_block_template *__initdata template_list;
+static int __initdata xor_forced = false;
-#ifndef MODULE
static void __init do_xor_register(struct xor_block_template *tmpl)
{
tmpl->next = template_list;
template_list = tmpl;
}
-static int __init register_xor_blocks(void)
-{
- active_template = XOR_SELECT_TEMPLATE(NULL);
-
- if (!active_template) {
-#define xor_speed do_xor_register
- // register all the templates and pick the first as the default
- XOR_TRY_TEMPLATES;
-#undef xor_speed
- active_template = template_list;
- }
- return 0;
-}
-#endif
-
#define BENCH_SIZE 4096
#define REPS 800U
@@ -85,9 +70,6 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
unsigned long reps;
ktime_t min, start, t0;
- tmpl->next = template_list;
- template_list = tmpl;
-
preempt_disable();
reps = 0;
@@ -111,63 +93,79 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
pr_info(" %-16s: %5d MB/sec\n", tmpl->name, speed);
}
-static int __init
-calibrate_xor_blocks(void)
+static int __init calibrate_xor_blocks(void)
{
void *b1, *b2;
struct xor_block_template *f, *fastest;
- fastest = XOR_SELECT_TEMPLATE(NULL);
-
- if (fastest) {
- printk(KERN_INFO "xor: automatically using best "
- "checksumming function %-10s\n",
- fastest->name);
- goto out;
- }
+ if (xor_forced)
+ return 0;
b1 = (void *) __get_free_pages(GFP_KERNEL, 2);
if (!b1) {
- printk(KERN_WARNING "xor: Yikes! No memory available.\n");
+ pr_info("xor: Yikes! No memory available.\n");
return -ENOMEM;
}
b2 = b1 + 2*PAGE_SIZE + BENCH_SIZE;
- /*
- * If this arch/cpu has a short-circuited selection, don't loop through
- * all the possible functions, just test the best one
- */
-
-#define xor_speed(templ) do_xor_speed((templ), b1, b2)
-
- printk(KERN_INFO "xor: measuring software checksum speed\n");
- template_list = NULL;
- XOR_TRY_TEMPLATES;
+ pr_info("xor: measuring software checksum speed\n");
fastest = template_list;
- for (f = fastest; f; f = f->next)
+ for (f = template_list; f; f = f->next) {
+ do_xor_speed(f, b1, b2);
if (f->speed > fastest->speed)
fastest = f;
-
+ }
+ active_template = fastest;
pr_info("xor: using function: %s (%d MB/sec)\n",
fastest->name, fastest->speed);
+ free_pages((unsigned long)b1, 2);
+ return 0;
+}
+
+static int __init xor_init(void)
+{
+ /*
+ * If this arch/cpu has a short-circuited selection, don't loop through
+ * all the possible functions, just use the best one.
+ */
+ active_template = XOR_SELECT_TEMPLATE(NULL);
+ if (active_template) {
+ pr_info("xor: automatically using best checksumming function %-10s\n",
+ active_template->name);
+ xor_forced = true;
+ return 0;
+ }
+
+#define xor_speed do_xor_register
+ XOR_TRY_TEMPLATES;
#undef xor_speed
- free_pages((unsigned long)b1, 2);
-out:
- active_template = fastest;
+#ifdef MODULE
+ return calibrate_xor_blocks();
+#else
+ /*
+ * Pick the first template as the temporary default until calibration
+ * happens.
+ */
+ active_template = template_list;
return 0;
+#endif
}
-static __exit void xor_exit(void) { }
+static __exit void xor_exit(void)
+{
+}
MODULE_DESCRIPTION("RAID-5 checksumming functions");
MODULE_LICENSE("GPL");
+/*
+ * When built-in we must register the default template before md, but we don't
+ * want calibration to run that early as that would delay the boot process.
+ */
#ifndef MODULE
-/* when built-in xor.o must initialize before drivers/md/md.o */
-core_initcall(register_xor_blocks);
+__initcall(calibrate_xor_blocks);
#endif
-
-module_init(calibrate_xor_blocks);
+core_initcall(xor_init);
module_exit(xor_exit);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:18 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in xor.ko
instead of always building it into the main kernel image.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/riscv/include/asm/xor.h | 54 +------------------
arch/riscv/lib/Makefile | 1 -
lib/raid/xor/Makefile | 1 +
lib/raid/xor/riscv/xor-glue.c | 56 ++++++++++++++++++++
{arch/riscv/lib => lib/raid/xor/riscv}/xor.S | 0
5 files changed, 59 insertions(+), 53 deletions(-)
create mode 100644 lib/raid/xor/riscv/xor-glue.c
rename {arch/riscv/lib => lib/raid/xor/riscv}/xor.S (100%)
diff --git a/arch/riscv/include/asm/xor.h b/arch/riscv/include/asm/xor.h
index ed5f27903efc..614d9209d078 100644
--- a/arch/riscv/include/asm/xor.h
+++ b/arch/riscv/include/asm/xor.h
@@ -2,60 +2,10 @@
/*
* Copyright (C) 2021 SiFive
*/
-
-#include <linux/hardirq.h>
-#include <asm-generic/xor.h>
-#ifdef CONFIG_RISCV_ISA_V
#include <asm/vector.h>
-#include <asm/switch_to.h>
-#include <asm/asm-prototypes.h>
-
-static void xor_vector_2(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2)
-{
- kernel_vector_begin();
- xor_regs_2_(bytes, p1, p2);
- kernel_vector_end();
-}
-
-static void xor_vector_3(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3)
-{
- kernel_vector_begin();
- xor_regs_3_(bytes, p1, p2, p3);
- kernel_vector_end();
-}
-
-static void xor_vector_4(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3,
- const unsigned long *__restrict p4)
-{
- kernel_vector_begin();
- xor_regs_4_(bytes, p1, p2, p3, p4);
- kernel_vector_end();
-}
-
-static void xor_vector_5(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3,
- const unsigned long *__restrict p4,
- const unsigned long *__restrict p5)
-{
- kernel_vector_begin();
- xor_regs_5_(bytes, p1, p2, p3, p4, p5);
- kernel_vector_end();
-}
+#include <asm-generic/xor.h>
-static struct xor_block_template xor_block_rvv = {
- .name = "rvv",
- .do_2 = xor_vector_2,
- .do_3 = xor_vector_3,
- .do_4 = xor_vector_4,
- .do_5 = xor_vector_5
-};
-#endif /* CONFIG_RISCV_ISA_V */
+extern struct xor_block_template xor_block_rvv;
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index bbc031124974..e220c35764eb 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -16,5 +16,4 @@ lib-$(CONFIG_MMU) += uaccess.o
lib-$(CONFIG_64BIT) += tishift.o
lib-$(CONFIG_RISCV_ISA_ZICBOZ) += clear_page.o
obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
-lib-$(CONFIG_RISCV_ISA_V) += xor.o
lib-$(CONFIG_RISCV_ISA_V) += riscv_v_helpers.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 3df9e04a1a9b..c939fad43735 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -18,6 +18,7 @@ endif
xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd.o
xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd_glue.o
xor-$(CONFIG_ALTIVEC) += powerpc/xor_vmx.o powerpc/xor_vmx_glue.o
+xor-$(CONFIG_RISCV_ISA_V) += riscv/xor.o riscv/xor-glue.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
diff --git a/lib/raid/xor/riscv/xor-glue.c b/lib/raid/xor/riscv/xor-glue.c
new file mode 100644
index 000000000000..11666a4b6b68
--- /dev/null
+++ b/lib/raid/xor/riscv/xor-glue.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2021 SiFive
+ */
+
+#include <linux/raid/xor_impl.h>
+#include <asm/vector.h>
+#include <asm/switch_to.h>
+#include <asm/asm-prototypes.h>
+#include <asm/xor.h>
+
+static void xor_vector_2(unsigned long bytes, unsigned long *__restrict p1,
+ const unsigned long *__restrict p2)
+{
+ kernel_vector_begin();
+ xor_regs_2_(bytes, p1, p2);
+ kernel_vector_end();
+}
+
+static void xor_vector_3(unsigned long bytes, unsigned long *__restrict p1,
+ const unsigned long *__restrict p2,
+ const unsigned long *__restrict p3)
+{
+ kernel_vector_begin();
+ xor_regs_3_(bytes, p1, p2, p3);
+ kernel_vector_end();
+}
+
+static void xor_vector_4(unsigned long bytes, unsigned long *__restrict p1,
+ const unsigned long *__restrict p2,
+ const unsigned long *__restrict p3,
+ const unsigned long *__restrict p4)
+{
+ kernel_vector_begin();
+ xor_regs_4_(bytes, p1, p2, p3, p4);
+ kernel_vector_end();
+}
+
+static void xor_vector_5(unsigned long bytes, unsigned long *__restrict p1,
+ const unsigned long *__restrict p2,
+ const unsigned long *__restrict p3,
+ const unsigned long *__restrict p4,
+ const unsigned long *__restrict p5)
+{
+ kernel_vector_begin();
+ xor_regs_5_(bytes, p1, p2, p3, p4, p5);
+ kernel_vector_end();
+}
+
+struct xor_block_template xor_block_rvv = {
+ .name = "rvv",
+ .do_2 = xor_vector_2,
+ .do_3 = xor_vector_3,
+ .do_4 = xor_vector_4,
+ .do_5 = xor_vector_5
+};
diff --git a/arch/riscv/lib/xor.S b/lib/raid/xor/riscv/xor.S
similarity index 100%
rename from arch/riscv/lib/xor.S
rename to lib/raid/xor/riscv/xor.S
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:27 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in xor.ko
instead of always building it into the main kernel image.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/powerpc/include/asm/xor.h | 17 +----
arch/powerpc/include/asm/xor_altivec.h | 22 ------
arch/powerpc/lib/Makefile | 5 --
arch/powerpc/lib/xor_vmx_glue.c | 63 -----------------
lib/raid/xor/Makefile | 5 ++
.../lib => lib/raid/xor/powerpc}/xor_vmx.c | 0
.../lib => lib/raid/xor/powerpc}/xor_vmx.h | 0
lib/raid/xor/powerpc/xor_vmx_glue.c | 67 +++++++++++++++++++
8 files changed, 74 insertions(+), 105 deletions(-)
delete mode 100644 arch/powerpc/include/asm/xor_altivec.h
delete mode 100644 arch/powerpc/lib/xor_vmx_glue.c
rename {arch/powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.c (100%)
rename {arch/powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.h (100%)
create mode 100644 lib/raid/xor/powerpc/xor_vmx_glue.c
diff --git a/arch/powerpc/include/asm/xor.h b/arch/powerpc/include/asm/xor.h
index 30224c5279c4..3293ac87181c 100644
--- a/arch/powerpc/include/asm/xor.h
+++ b/arch/powerpc/include/asm/xor.h
@@ -8,24 +8,11 @@
#ifndef _ASM_POWERPC_XOR_H
#define _ASM_POWERPC_XOR_H
-#ifdef CONFIG_ALTIVEC
-
-#include <asm/cputable.h>
#include <asm/cpu_has_feature.h>
-#include <asm/xor_altivec.h>
-
-static struct xor_block_template xor_block_altivec = {
- .name = "altivec",
- .do_2 = xor_altivec_2,
- .do_3 = xor_altivec_3,
- .do_4 = xor_altivec_4,
- .do_5 = xor_altivec_5,
-};
-#endif /* CONFIG_ALTIVEC */
-
-/* Also try the generic routines. */
#include <asm-generic/xor.h>
+extern struct xor_block_template xor_block_altivec;
+
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
diff --git a/arch/powerpc/include/asm/xor_altivec.h b/arch/powerpc/include/asm/xor_altivec.h
deleted file mode 100644
index 294620a25f80..000000000000
--- a/arch/powerpc/include/asm/xor_altivec.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_POWERPC_XOR_ALTIVEC_H
-#define _ASM_POWERPC_XOR_ALTIVEC_H
-
-#ifdef CONFIG_ALTIVEC
-void xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void xor_altivec_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void xor_altivec_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void xor_altivec_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-
-#endif
-#endif /* _ASM_POWERPC_XOR_ALTIVEC_H */
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index f14ecab674a3..002edc3f01d5 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -73,9 +73,4 @@ obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o
-obj-$(CONFIG_ALTIVEC) += xor_vmx.o xor_vmx_glue.o
-CFLAGS_xor_vmx.o += -mhard-float -maltivec $(call cc-option,-mabi=altivec)
-# Enable <altivec.h>
-CFLAGS_xor_vmx.o += -isystem $(shell $(CC) -print-file-name=include)
-
obj-$(CONFIG_PPC64) += $(obj64-y)
diff --git a/arch/powerpc/lib/xor_vmx_glue.c b/arch/powerpc/lib/xor_vmx_glue.c
deleted file mode 100644
index 35d917ece4d1..000000000000
--- a/arch/powerpc/lib/xor_vmx_glue.c
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Altivec XOR operations
- *
- * Copyright 2017 IBM Corp.
- */
-
-#include <linux/preempt.h>
-#include <linux/export.h>
-#include <linux/sched.h>
-#include <asm/switch_to.h>
-#include <asm/xor_altivec.h>
-#include "xor_vmx.h"
-
-void xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_2(bytes, p1, p2);
- disable_kernel_altivec();
- preempt_enable();
-}
-EXPORT_SYMBOL(xor_altivec_2);
-
-void xor_altivec_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_3(bytes, p1, p2, p3);
- disable_kernel_altivec();
- preempt_enable();
-}
-EXPORT_SYMBOL(xor_altivec_3);
-
-void xor_altivec_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_4(bytes, p1, p2, p3, p4);
- disable_kernel_altivec();
- preempt_enable();
-}
-EXPORT_SYMBOL(xor_altivec_4);
-
-void xor_altivec_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_5(bytes, p1, p2, p3, p4, p5);
- disable_kernel_altivec();
- preempt_enable();
-}
-EXPORT_SYMBOL(xor_altivec_5);
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index fafd131cef27..3df9e04a1a9b 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -17,6 +17,7 @@ xor-$(CONFIG_KERNEL_MODE_NEON) += arm64/xor-neon.o arm64/xor-neon-glue.o
endif
xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd.o
xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd_glue.o
+xor-$(CONFIG_ALTIVEC) += powerpc/xor_vmx.o powerpc/xor_vmx_glue.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
@@ -24,3 +25,7 @@ CFLAGS_REMOVE_arm/xor-neon.o += $(CC_FLAGS_NO_FPU)
CFLAGS_arm64/xor-neon.o += $(CC_FLAGS_FPU)
CFLAGS_REMOVE_arm64/xor-neon.o += $(CC_FLAGS_NO_FPU)
+
+CFLAGS_powerpc/xor_vmx.o += -mhard-float -maltivec \
+ $(call cc-option,-mabi=altivec) \
+ -isystem $(shell $(CC) -print-file-name=include)
diff --git a/arch/powerpc/lib/xor_vmx.c b/lib/raid/xor/powerpc/xor_vmx.c
similarity index 100%
rename from arch/powerpc/lib/xor_vmx.c
rename to lib/raid/xor/powerpc/xor_vmx.c
diff --git a/arch/powerpc/lib/xor_vmx.h b/lib/raid/xor/powerpc/xor_vmx.h
similarity index 100%
rename from arch/powerpc/lib/xor_vmx.h
rename to lib/raid/xor/powerpc/xor_vmx.h
diff --git a/lib/raid/xor/powerpc/xor_vmx_glue.c b/lib/raid/xor/powerpc/xor_vmx_glue.c
new file mode 100644
index 000000000000..c41e38340700
--- /dev/null
+++ b/lib/raid/xor/powerpc/xor_vmx_glue.c
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Altivec XOR operations
+ *
+ * Copyright 2017 IBM Corp.
+ */
+
+#include <linux/preempt.h>
+#include <linux/sched.h>
+#include <linux/raid/xor_impl.h>
+#include <asm/switch_to.h>
+#include <asm/xor.h>
+#include "xor_vmx.h"
+
+static void xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ preempt_disable();
+ enable_kernel_altivec();
+ __xor_altivec_2(bytes, p1, p2);
+ disable_kernel_altivec();
+ preempt_enable();
+}
+
+static void xor_altivec_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ preempt_disable();
+ enable_kernel_altivec();
+ __xor_altivec_3(bytes, p1, p2, p3);
+ disable_kernel_altivec();
+ preempt_enable();
+}
+
+static void xor_altivec_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ preempt_disable();
+ enable_kernel_altivec();
+ __xor_altivec_4(bytes, p1, p2, p3, p4);
+ disable_kernel_altivec();
+ preempt_enable();
+}
+
+static void xor_altivec_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ preempt_disable();
+ enable_kernel_altivec();
+ __xor_altivec_5(bytes, p1, p2, p3, p4, p5);
+ disable_kernel_altivec();
+ preempt_enable();
+}
+
+struct xor_block_template xor_block_altivec = {
+ .name = "altivec",
+ .do_2 = xor_altivec_2,
+ .do_3 = xor_altivec_3,
+ .do_4 = xor_altivec_4,
+ .do_5 = xor_altivec_5,
+};
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:26 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in xor.ko
instead of unconditionally building it into the main kernel image.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/s390/lib/Makefile | 2 +-
lib/raid/xor/Makefile | 1 +
{arch/s390/lib => lib/raid/xor/s390}/xor.c | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)
rename {arch/s390/lib => lib/raid/xor/s390}/xor.c (98%)
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index f43f897d3fc0..2bf47204f6ab 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -5,7 +5,7 @@
lib-y += delay.o string.o uaccess.o find.o spinlock.o tishift.o
lib-y += csum-partial.o
-obj-y += mem.o xor.o
+obj-y += mem.o
lib-$(CONFIG_KPROBES) += probes.o
lib-$(CONFIG_UPROBES) += probes.o
obj-$(CONFIG_S390_KPROBES_SANITY_TEST) += test_kprobes_s390.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index eb7617b5c61b..15fd8797ae61 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -22,6 +22,7 @@ xor-$(CONFIG_RISCV_ISA_V) += riscv/xor.o riscv/xor-glue.o
xor-$(CONFIG_SPARC32) += sparc/xor-sparc32.o
xor-$(CONFIG_SPARC64) += sparc/xor-vis.o sparc/xor-vis-glue.o
xor-$(CONFIG_SPARC64) += sparc/xor-niagara.o sparc/xor-niagara-glue.o
+xor-$(CONFIG_S390) += s390/xor.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
diff --git a/arch/s390/lib/xor.c b/lib/raid/xor/s390/xor.c
similarity index 98%
rename from arch/s390/lib/xor.c
rename to lib/raid/xor/s390/xor.c
index 4d5ed638d850..2d5e33eca2a8 100644
--- a/arch/s390/lib/xor.c
+++ b/lib/raid/xor/s390/xor.c
@@ -7,7 +7,6 @@
*/
#include <linux/types.h>
-#include <linux/export.h>
#include <linux/raid/xor_impl.h>
#include <asm/xor.h>
@@ -134,4 +133,3 @@ struct xor_block_template xor_block_xc = {
.do_4 = xor_xc_4,
.do_5 = xor_xc_5,
};
-EXPORT_SYMBOL(xor_block_xc);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:29 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Replace use of the loop around xor_blocks with the easier to use xor_gen
API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/async_tx/async_xor.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 2c499654a36c..460960d45388 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -103,7 +103,6 @@ do_sync_xor_offs(struct page *dest, unsigned int offset,
{
int i;
int xor_src_cnt = 0;
- int src_off = 0;
void *dest_buf;
void **srcs;
@@ -117,23 +116,12 @@ do_sync_xor_offs(struct page *dest, unsigned int offset,
if (src_list[i])
srcs[xor_src_cnt++] = page_address(src_list[i]) +
(src_offs ? src_offs[i] : offset);
- src_cnt = xor_src_cnt;
+
/* set destination address */
dest_buf = page_address(dest) + offset;
-
if (submit->flags & ASYNC_TX_XOR_ZERO_DST)
memset(dest_buf, 0, len);
-
- while (src_cnt > 0) {
- /* process up to 'MAX_XOR_BLOCKS' sources */
- xor_src_cnt = min(src_cnt, MAX_XOR_BLOCKS);
- xor_blocks(xor_src_cnt, len, dest_buf, &srcs[src_off]);
-
- /* drop completed sources */
- src_cnt -= xor_src_cnt;
- src_off += xor_src_cnt;
- }
-
+ xor_gen(dest_buf, srcs, xor_src_cnt, len);
async_tx_sync_epilog(submit);
}
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:34 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | xor_blocks is very annoying to use, because it is limited to 4 + 1
sources / destinations, has an odd argument order and is completely
undocumented.
Lift the code that loops around it from btrfs and async_tx/async_xor into
common code under the name xor_gen and properly document it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/raid/xor.h | 3 +++
lib/raid/xor/xor-core.c | 28 ++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h
index 02bda8d99534..4735a4e960f9 100644
--- a/include/linux/raid/xor.h
+++ b/include/linux/raid/xor.h
@@ -7,4 +7,7 @@
extern void xor_blocks(unsigned int count, unsigned int bytes,
void *dest, void **srcs);
+void xor_gen(void *dest, void **srcss, unsigned int src_cnt,
+ unsigned int bytes);
+
#endif /* _XOR_H */
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index 8dda4055ad09..b7c29ca931ec 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -46,6 +46,34 @@ xor_blocks(unsigned int src_count, unsigned int bytes, void *dest, void **srcs)
}
EXPORT_SYMBOL(xor_blocks);
+/**
+ * xor_gen - generate RAID-style XOR information
+ * @dest: destination vector
+ * @srcs: source vectors
+ * @src_cnt: number of source vectors
+ * @bytes: length in bytes of each vector
+ *
+ * Performs bit-wise XOR operation into @dest for each of the @src_cnt vectors
+ * in @srcs for a length of @bytes bytes.
+ *
+ * Note: for typical RAID uses, @dest either needs to be zeroed, or filled with
+ * the first disk, which then needs to be removed from @srcs.
+ */
+void xor_gen(void *dest, void **srcs, unsigned int src_cnt, unsigned int bytes)
+{
+ unsigned int src_off = 0;
+
+ while (src_cnt > 0) {
+ unsigned int this_cnt = min(src_cnt, MAX_XOR_BLOCKS);
+
+ xor_blocks(this_cnt, bytes, dest, srcs + src_off);
+
+ src_cnt -= this_cnt;
+ src_off += this_cnt;
+ }
+}
+EXPORT_SYMBOL(xor_gen);
+
/* Set of all registered templates. */
static struct xor_block_template *__initdata template_list;
static int __initdata xor_forced = false;
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:33 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Use the new xor_gen helper instead of open coding the loop around
xor_blocks. This helper is very similar to the existing run_xor helper
in btrfs, except that the destination buffer is passed explicitly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/btrfs/raid56.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index b4511f560e92..dab07442f634 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -617,26 +617,6 @@ static void cache_rbio(struct btrfs_raid_bio *rbio)
spin_unlock(&table->cache_lock);
}
-/*
- * helper function to run the xor_blocks api. It is only
- * able to do MAX_XOR_BLOCKS at a time, so we need to
- * loop through.
- */
-static void run_xor(void **pages, int src_cnt, ssize_t len)
-{
- int src_off = 0;
- int xor_src_cnt = 0;
- void *dest = pages[src_cnt];
-
- while(src_cnt > 0) {
- xor_src_cnt = min(src_cnt, MAX_XOR_BLOCKS);
- xor_blocks(xor_src_cnt, len, dest, pages + src_off);
-
- src_cnt -= xor_src_cnt;
- src_off += xor_src_cnt;
- }
-}
-
/*
* Returns true if the bio list inside this rbio covers an entire stripe (no
* rmw required).
@@ -1434,7 +1414,8 @@ static void generate_pq_vertical_step(struct btrfs_raid_bio *rbio, unsigned int
} else {
/* raid5 */
memcpy(pointers[rbio->nr_data], pointers[0], step);
- run_xor(pointers + 1, rbio->nr_data - 1, step);
+ xor_gen(pointers[rbio->nr_data], pointers + 1, rbio->nr_data - 1,
+ step);
}
for (stripe = stripe - 1; stripe >= 0; stripe--)
kunmap_local(pointers[stripe]);
@@ -2034,7 +2015,7 @@ static void recover_vertical_step(struct btrfs_raid_bio *rbio,
pointers[rbio->nr_data - 1] = p;
/* Xor in the rest */
- run_xor(pointers, rbio->nr_data - 1, step);
+ xor_gen(p, pointers, rbio->nr_data - 1, step);
}
cleanup:
@@ -2664,7 +2645,7 @@ static bool verify_one_parity_step(struct btrfs_raid_bio *rbio,
} else {
/* RAID5. */
memcpy(pointers[nr_data], pointers[0], step);
- run_xor(pointers + 1, nr_data - 1, step);
+ xor_gen(pointers[nr_data], pointers + 1, nr_data - 1, step);
}
/* Check scrubbing parity and repair it. */
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:35 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Remove the inner xor_block_templates, and instead have two separate
actual template that call into the neon-enabled compilation unit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm64/include/asm/xor.h | 13 ++--
lib/raid/xor/arm64/xor-neon-glue.c | 95 +++++++++++++++---------------
lib/raid/xor/arm64/xor-neon.c | 73 +++++++++--------------
lib/raid/xor/arm64/xor-neon.h | 30 ++++++++++
4 files changed, 114 insertions(+), 97 deletions(-)
create mode 100644 lib/raid/xor/arm64/xor-neon.h
diff --git a/arch/arm64/include/asm/xor.h b/arch/arm64/include/asm/xor.h
index 81718f010761..4782c760bcac 100644
--- a/arch/arm64/include/asm/xor.h
+++ b/arch/arm64/include/asm/xor.h
@@ -7,15 +7,18 @@
#include <asm-generic/xor.h>
#include <asm/simd.h>
-extern struct xor_block_template xor_block_arm64;
-void __init xor_neon_init(void);
+extern struct xor_block_template xor_block_neon;
+extern struct xor_block_template xor_block_eor3;
#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
- xor_neon_init();
xor_register(&xor_block_8regs);
xor_register(&xor_block_32regs);
- if (cpu_has_neon())
- xor_register(&xor_block_arm64);
+ if (cpu_has_neon()) {
+ if (cpu_have_named_feature(SHA3))
+ xor_register(&xor_block_eor3);
+ else
+ xor_register(&xor_block_neon);
+ }
}
diff --git a/lib/raid/xor/arm64/xor-neon-glue.c b/lib/raid/xor/arm64/xor-neon-glue.c
index 067a2095659a..08c3e3573388 100644
--- a/lib/raid/xor/arm64/xor-neon-glue.c
+++ b/lib/raid/xor/arm64/xor-neon-glue.c
@@ -7,51 +7,54 @@
#include <linux/raid/xor_impl.h>
#include <asm/simd.h>
#include <asm/xor.h>
+#include "xor-neon.h"
-extern struct xor_block_template const xor_block_inner_neon;
-
-static void
-xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_2(bytes, p1, p2);
-}
-
-static void
-xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_3(bytes, p1, p2, p3);
-}
-
-static void
-xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_4(bytes, p1, p2, p3, p4);
-}
-
-static void
-xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- scoped_ksimd()
- xor_block_inner_neon.do_5(bytes, p1, p2, p3, p4, p5);
-}
-
-struct xor_block_template xor_block_arm64 = {
- .name = "arm64_neon",
- .do_2 = xor_neon_2,
- .do_3 = xor_neon_3,
- .do_4 = xor_neon_4,
- .do_5 = xor_neon_5
+#define XOR_TEMPLATE(_name) \
+static void \
+xor_##_name##_2(unsigned long bytes, unsigned long * __restrict p1, \
+ const unsigned long * __restrict p2) \
+{ \
+ scoped_ksimd() \
+ __xor_##_name##_2(bytes, p1, p2); \
+} \
+ \
+static void \
+xor_##_name##_3(unsigned long bytes, unsigned long * __restrict p1, \
+ const unsigned long * __restrict p2, \
+ const unsigned long * __restrict p3) \
+{ \
+ scoped_ksimd() \
+ __xor_##_name##_3(bytes, p1, p2, p3); \
+} \
+ \
+static void \
+xor_##_name##_4(unsigned long bytes, unsigned long * __restrict p1, \
+ const unsigned long * __restrict p2, \
+ const unsigned long * __restrict p3, \
+ const unsigned long * __restrict p4) \
+{ \
+ scoped_ksimd() \
+ __xor_##_name##_4(bytes, p1, p2, p3, p4); \
+} \
+ \
+static void \
+xor_##_name##_5(unsigned long bytes, unsigned long * __restrict p1, \
+ const unsigned long * __restrict p2, \
+ const unsigned long * __restrict p3, \
+ const unsigned long * __restrict p4, \
+ const unsigned long * __restrict p5) \
+{ \
+ scoped_ksimd() \
+ __xor_##_name##_5(bytes, p1, p2, p3, p4, p5); \
+} \
+ \
+struct xor_block_template xor_block_##_name = { \
+ .name = __stringify(_name), \
+ .do_2 = xor_##_name##_2, \
+ .do_3 = xor_##_name##_3, \
+ .do_4 = xor_##_name##_4, \
+ .do_5 = xor_##_name##_5 \
};
+
+XOR_TEMPLATE(neon);
+XOR_TEMPLATE(eor3);
diff --git a/lib/raid/xor/arm64/xor-neon.c b/lib/raid/xor/arm64/xor-neon.c
index 8d2d185090db..61194c292917 100644
--- a/lib/raid/xor/arm64/xor-neon.c
+++ b/lib/raid/xor/arm64/xor-neon.c
@@ -8,9 +8,10 @@
#include <linux/cache.h>
#include <asm/neon-intrinsics.h>
#include <asm/xor.h>
+#include "xor-neon.h"
-static void xor_arm64_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
+void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -36,9 +37,9 @@ static void xor_arm64_neon_2(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-static void xor_arm64_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
+void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -72,10 +73,10 @@ static void xor_arm64_neon_3(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-static void xor_arm64_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
+void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -117,11 +118,11 @@ static void xor_arm64_neon_4(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-static void xor_arm64_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
+void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -171,14 +172,6 @@ static void xor_arm64_neon_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-struct xor_block_template xor_block_inner_neon __ro_after_init = {
- .name = "__inner_neon__",
- .do_2 = xor_arm64_neon_2,
- .do_3 = xor_arm64_neon_3,
- .do_4 = xor_arm64_neon_4,
- .do_5 = xor_arm64_neon_5,
-};
-
static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r)
{
uint64x2_t res;
@@ -189,10 +182,9 @@ static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r)
return res;
}
-static void xor_arm64_eor3_3(unsigned long bytes,
- unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
+void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -224,11 +216,10 @@ static void xor_arm64_eor3_3(unsigned long bytes,
} while (--lines > 0);
}
-static void xor_arm64_eor3_4(unsigned long bytes,
- unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
+void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -268,12 +259,11 @@ static void xor_arm64_eor3_4(unsigned long bytes,
} while (--lines > 0);
}
-static void xor_arm64_eor3_5(unsigned long bytes,
- unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
+void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
{
uint64_t *dp1 = (uint64_t *)p1;
uint64_t *dp2 = (uint64_t *)p2;
@@ -314,12 +304,3 @@ static void xor_arm64_eor3_5(unsigned long bytes,
dp5 += 8;
} while (--lines > 0);
}
-
-void __init xor_neon_init(void)
-{
- if (cpu_have_named_feature(SHA3)) {
- xor_block_inner_neon.do_3 = xor_arm64_eor3_3;
- xor_block_inner_neon.do_4 = xor_arm64_eor3_4;
- xor_block_inner_neon.do_5 = xor_arm64_eor3_5;
- }
-}
diff --git a/lib/raid/xor/arm64/xor-neon.h b/lib/raid/xor/arm64/xor-neon.h
new file mode 100644
index 000000000000..cec0ac846fea
--- /dev/null
+++ b/lib/raid/xor/arm64/xor-neon.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2);
+void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
+
+#define __xor_eor3_2 __xor_neon_2
+void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:31 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR into lib/raid and include it it in xor.ko
instead of always building it into the main kernel image.
This also splits the sparc64 code into separate files for the two
implementations.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/sparc/include/asm/asm-prototypes.h | 1 -
arch/sparc/include/asm/xor.h | 45 ++-
arch/sparc/include/asm/xor_64.h | 76 ----
arch/sparc/lib/Makefile | 2 +-
lib/raid/xor/Makefile | 3 +
lib/raid/xor/sparc/xor-niagara-glue.c | 33 ++
.../xor.S => lib/raid/xor/sparc/xor-niagara.S | 346 +----------------
.../raid/xor/sparc/xor-sparc32.c | 23 +-
lib/raid/xor/sparc/xor-vis-glue.c | 35 ++
lib/raid/xor/sparc/xor-vis.S | 348 ++++++++++++++++++
10 files changed, 465 insertions(+), 447 deletions(-)
delete mode 100644 arch/sparc/include/asm/xor_64.h
create mode 100644 lib/raid/xor/sparc/xor-niagara-glue.c
rename arch/sparc/lib/xor.S => lib/raid/xor/sparc/xor-niagara.S (53%)
rename arch/sparc/include/asm/xor_32.h => lib/raid/xor/sparc/xor-sparc32.c (93%)
create mode 100644 lib/raid/xor/sparc/xor-vis-glue.c
create mode 100644 lib/raid/xor/sparc/xor-vis.S
diff --git a/arch/sparc/include/asm/asm-prototypes.h b/arch/sparc/include/asm/asm-prototypes.h
index 08810808ca6d..bbd1a8afaabf 100644
--- a/arch/sparc/include/asm/asm-prototypes.h
+++ b/arch/sparc/include/asm/asm-prototypes.h
@@ -14,7 +14,6 @@
#include <asm/oplib.h>
#include <asm/pgtable.h>
#include <asm/trap_block.h>
-#include <asm/xor.h>
void *__memscan_zero(void *, size_t);
void *__memscan_generic(void *, int, size_t);
diff --git a/arch/sparc/include/asm/xor.h b/arch/sparc/include/asm/xor.h
index f4c651e203c4..f923b009fc24 100644
--- a/arch/sparc/include/asm/xor.h
+++ b/arch/sparc/include/asm/xor.h
@@ -1,9 +1,44 @@
/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
+ * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
+ */
#ifndef ___ASM_SPARC_XOR_H
#define ___ASM_SPARC_XOR_H
+
#if defined(__sparc__) && defined(__arch64__)
-#include <asm/xor_64.h>
-#else
-#include <asm/xor_32.h>
-#endif
-#endif
+#include <asm/spitfire.h>
+
+extern struct xor_block_template xor_block_VIS;
+extern struct xor_block_template xor_block_niagara;
+
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ /* Force VIS for everything except Niagara. */
+ if (tlb_type == hypervisor &&
+ (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
+ sun4v_chip_type == SUN4V_CHIP_NIAGARA5))
+ xor_force(&xor_block_niagara);
+ else
+ xor_force(&xor_block_VIS);
+}
+#else /* sparc64 */
+
+/* For grins, also test the generic routines. */
+#include <asm-generic/xor.h>
+
+extern struct xor_block_template xor_block_SPARC;
+
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_SPARC);
+}
+#endif /* !sparc64 */
+#endif /* ___ASM_SPARC_XOR_H */
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h
deleted file mode 100644
index e0482ecc0a68..000000000000
--- a/arch/sparc/include/asm/xor_64.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * include/asm/xor.h
- *
- * High speed xor_block operation for RAID4/5 utilizing the
- * UltraSparc Visual Instruction Set and Niagara block-init
- * twin-load instructions.
- *
- * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
- * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
- */
-
-#include <asm/spitfire.h>
-
-void xor_vis_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void xor_vis_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void xor_vis_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void xor_vis_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-
-/* XXX Ugh, write cheetah versions... -DaveM */
-
-static struct xor_block_template xor_block_VIS = {
- .name = "VIS",
- .do_2 = xor_vis_2,
- .do_3 = xor_vis_3,
- .do_4 = xor_vis_4,
- .do_5 = xor_vis_5,
-};
-
-void xor_niagara_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void xor_niagara_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void xor_niagara_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void xor_niagara_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-
-static struct xor_block_template xor_block_niagara = {
- .name = "Niagara",
- .do_2 = xor_niagara_2,
- .do_3 = xor_niagara_3,
- .do_4 = xor_niagara_4,
- .do_5 = xor_niagara_5,
-};
-
-#define arch_xor_init arch_xor_init
-static __always_inline void __init arch_xor_init(void)
-{
- /* Force VIS for everything except Niagara. */
- if (tlb_type == hypervisor &&
- (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 ||
- sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
- sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
- sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
- sun4v_chip_type == SUN4V_CHIP_NIAGARA5))
- xor_force(&xor_block_niagara);
- else
- xor_force(&xor_block_VIS);
-}
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 783bdec0d7be..dd10cdd6f062 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -48,7 +48,7 @@ lib-$(CONFIG_SPARC64) += GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o
lib-$(CONFIG_SPARC64) += GENpatch.o GENpage.o GENbzero.o
lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o
-lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
+lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o hweight.o ffs.o
obj-$(CONFIG_SPARC64) += iomap.o
obj-$(CONFIG_SPARC32) += atomic32.o
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index c939fad43735..eb7617b5c61b 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -19,6 +19,9 @@ xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd.o
xor-$(CONFIG_CPU_HAS_LSX) += loongarch/xor_simd_glue.o
xor-$(CONFIG_ALTIVEC) += powerpc/xor_vmx.o powerpc/xor_vmx_glue.o
xor-$(CONFIG_RISCV_ISA_V) += riscv/xor.o riscv/xor-glue.o
+xor-$(CONFIG_SPARC32) += sparc/xor-sparc32.o
+xor-$(CONFIG_SPARC64) += sparc/xor-vis.o sparc/xor-vis-glue.o
+xor-$(CONFIG_SPARC64) += sparc/xor-niagara.o sparc/xor-niagara-glue.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
diff --git a/lib/raid/xor/sparc/xor-niagara-glue.c b/lib/raid/xor/sparc/xor-niagara-glue.c
new file mode 100644
index 000000000000..5087e63ac130
--- /dev/null
+++ b/lib/raid/xor/sparc/xor-niagara-glue.c
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * High speed xor_block operation for RAID4/5 utilizing the
+ * Niagara block-init twin-load instructions.
+ *
+ * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
+ */
+
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
+
+void xor_niagara_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2);
+void xor_niagara_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+void xor_niagara_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+void xor_niagara_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
+
+struct xor_block_template xor_block_niagara = {
+ .name = "Niagara",
+ .do_2 = xor_niagara_2,
+ .do_3 = xor_niagara_3,
+ .do_4 = xor_niagara_4,
+ .do_5 = xor_niagara_5,
+};
diff --git a/arch/sparc/lib/xor.S b/lib/raid/xor/sparc/xor-niagara.S
similarity index 53%
rename from arch/sparc/lib/xor.S
rename to lib/raid/xor/sparc/xor-niagara.S
index 35461e3b2a9b..f8749a212eb3 100644
--- a/arch/sparc/lib/xor.S
+++ b/lib/raid/xor/sparc/xor-niagara.S
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/sparc64/lib/xor.S
- *
* High speed xor_block operation for RAID4/5 utilizing the
- * UltraSparc Visual Instruction Set and Niagara store-init/twin-load.
+ * Niagara store-init/twin-load.
*
- * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
* Copyright (C) 2006 David S. Miller <davem@davemloft.net>
*/
@@ -16,343 +13,6 @@
#include <asm/dcu.h>
#include <asm/spitfire.h>
-/*
- * Requirements:
- * !(((long)dest | (long)sourceN) & (64 - 1)) &&
- * !(len & 127) && len >= 256
- */
- .text
-
- /* VIS versions. */
-ENTRY(xor_vis_2)
- rd %fprs, %o5
- andcc %o5, FPRS_FEF|FPRS_DU, %g0
- be,pt %icc, 0f
- sethi %hi(VISenter), %g1
- jmpl %g1 + %lo(VISenter), %g7
- add %g7, 8, %g7
-0: wr %g0, FPRS_FEF, %fprs
- rd %asi, %g1
- wr %g0, ASI_BLK_P, %asi
- membar #LoadStore|#StoreLoad|#StoreStore
- sub %o0, 128, %o0
- ldda [%o1] %asi, %f0
- ldda [%o2] %asi, %f16
-
-2: ldda [%o1 + 64] %asi, %f32
- fxor %f0, %f16, %f16
- fxor %f2, %f18, %f18
- fxor %f4, %f20, %f20
- fxor %f6, %f22, %f22
- fxor %f8, %f24, %f24
- fxor %f10, %f26, %f26
- fxor %f12, %f28, %f28
- fxor %f14, %f30, %f30
- stda %f16, [%o1] %asi
- ldda [%o2 + 64] %asi, %f48
- ldda [%o1 + 128] %asi, %f0
- fxor %f32, %f48, %f48
- fxor %f34, %f50, %f50
- add %o1, 128, %o1
- fxor %f36, %f52, %f52
- add %o2, 128, %o2
- fxor %f38, %f54, %f54
- subcc %o0, 128, %o0
- fxor %f40, %f56, %f56
- fxor %f42, %f58, %f58
- fxor %f44, %f60, %f60
- fxor %f46, %f62, %f62
- stda %f48, [%o1 - 64] %asi
- bne,pt %xcc, 2b
- ldda [%o2] %asi, %f16
-
- ldda [%o1 + 64] %asi, %f32
- fxor %f0, %f16, %f16
- fxor %f2, %f18, %f18
- fxor %f4, %f20, %f20
- fxor %f6, %f22, %f22
- fxor %f8, %f24, %f24
- fxor %f10, %f26, %f26
- fxor %f12, %f28, %f28
- fxor %f14, %f30, %f30
- stda %f16, [%o1] %asi
- ldda [%o2 + 64] %asi, %f48
- membar #Sync
- fxor %f32, %f48, %f48
- fxor %f34, %f50, %f50
- fxor %f36, %f52, %f52
- fxor %f38, %f54, %f54
- fxor %f40, %f56, %f56
- fxor %f42, %f58, %f58
- fxor %f44, %f60, %f60
- fxor %f46, %f62, %f62
- stda %f48, [%o1 + 64] %asi
- membar #Sync|#StoreStore|#StoreLoad
- wr %g1, %g0, %asi
- retl
- wr %g0, 0, %fprs
-ENDPROC(xor_vis_2)
-EXPORT_SYMBOL(xor_vis_2)
-
-ENTRY(xor_vis_3)
- rd %fprs, %o5
- andcc %o5, FPRS_FEF|FPRS_DU, %g0
- be,pt %icc, 0f
- sethi %hi(VISenter), %g1
- jmpl %g1 + %lo(VISenter), %g7
- add %g7, 8, %g7
-0: wr %g0, FPRS_FEF, %fprs
- rd %asi, %g1
- wr %g0, ASI_BLK_P, %asi
- membar #LoadStore|#StoreLoad|#StoreStore
- sub %o0, 64, %o0
- ldda [%o1] %asi, %f0
- ldda [%o2] %asi, %f16
-
-3: ldda [%o3] %asi, %f32
- fxor %f0, %f16, %f48
- fxor %f2, %f18, %f50
- add %o1, 64, %o1
- fxor %f4, %f20, %f52
- fxor %f6, %f22, %f54
- add %o2, 64, %o2
- fxor %f8, %f24, %f56
- fxor %f10, %f26, %f58
- fxor %f12, %f28, %f60
- fxor %f14, %f30, %f62
- ldda [%o1] %asi, %f0
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- add %o3, 64, %o3
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- subcc %o0, 64, %o0
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- stda %f48, [%o1 - 64] %asi
- bne,pt %xcc, 3b
- ldda [%o2] %asi, %f16
-
- ldda [%o3] %asi, %f32
- fxor %f0, %f16, %f48
- fxor %f2, %f18, %f50
- fxor %f4, %f20, %f52
- fxor %f6, %f22, %f54
- fxor %f8, %f24, %f56
- fxor %f10, %f26, %f58
- fxor %f12, %f28, %f60
- fxor %f14, %f30, %f62
- membar #Sync
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- stda %f48, [%o1] %asi
- membar #Sync|#StoreStore|#StoreLoad
- wr %g1, %g0, %asi
- retl
- wr %g0, 0, %fprs
-ENDPROC(xor_vis_3)
-EXPORT_SYMBOL(xor_vis_3)
-
-ENTRY(xor_vis_4)
- rd %fprs, %o5
- andcc %o5, FPRS_FEF|FPRS_DU, %g0
- be,pt %icc, 0f
- sethi %hi(VISenter), %g1
- jmpl %g1 + %lo(VISenter), %g7
- add %g7, 8, %g7
-0: wr %g0, FPRS_FEF, %fprs
- rd %asi, %g1
- wr %g0, ASI_BLK_P, %asi
- membar #LoadStore|#StoreLoad|#StoreStore
- sub %o0, 64, %o0
- ldda [%o1] %asi, %f0
- ldda [%o2] %asi, %f16
-
-4: ldda [%o3] %asi, %f32
- fxor %f0, %f16, %f16
- fxor %f2, %f18, %f18
- add %o1, 64, %o1
- fxor %f4, %f20, %f20
- fxor %f6, %f22, %f22
- add %o2, 64, %o2
- fxor %f8, %f24, %f24
- fxor %f10, %f26, %f26
- fxor %f12, %f28, %f28
- fxor %f14, %f30, %f30
- ldda [%o4] %asi, %f48
- fxor %f16, %f32, %f32
- fxor %f18, %f34, %f34
- fxor %f20, %f36, %f36
- fxor %f22, %f38, %f38
- add %o3, 64, %o3
- fxor %f24, %f40, %f40
- fxor %f26, %f42, %f42
- fxor %f28, %f44, %f44
- fxor %f30, %f46, %f46
- ldda [%o1] %asi, %f0
- fxor %f32, %f48, %f48
- fxor %f34, %f50, %f50
- fxor %f36, %f52, %f52
- add %o4, 64, %o4
- fxor %f38, %f54, %f54
- fxor %f40, %f56, %f56
- fxor %f42, %f58, %f58
- subcc %o0, 64, %o0
- fxor %f44, %f60, %f60
- fxor %f46, %f62, %f62
- stda %f48, [%o1 - 64] %asi
- bne,pt %xcc, 4b
- ldda [%o2] %asi, %f16
-
- ldda [%o3] %asi, %f32
- fxor %f0, %f16, %f16
- fxor %f2, %f18, %f18
- fxor %f4, %f20, %f20
- fxor %f6, %f22, %f22
- fxor %f8, %f24, %f24
- fxor %f10, %f26, %f26
- fxor %f12, %f28, %f28
- fxor %f14, %f30, %f30
- ldda [%o4] %asi, %f48
- fxor %f16, %f32, %f32
- fxor %f18, %f34, %f34
- fxor %f20, %f36, %f36
- fxor %f22, %f38, %f38
- fxor %f24, %f40, %f40
- fxor %f26, %f42, %f42
- fxor %f28, %f44, %f44
- fxor %f30, %f46, %f46
- membar #Sync
- fxor %f32, %f48, %f48
- fxor %f34, %f50, %f50
- fxor %f36, %f52, %f52
- fxor %f38, %f54, %f54
- fxor %f40, %f56, %f56
- fxor %f42, %f58, %f58
- fxor %f44, %f60, %f60
- fxor %f46, %f62, %f62
- stda %f48, [%o1] %asi
- membar #Sync|#StoreStore|#StoreLoad
- wr %g1, %g0, %asi
- retl
- wr %g0, 0, %fprs
-ENDPROC(xor_vis_4)
-EXPORT_SYMBOL(xor_vis_4)
-
-ENTRY(xor_vis_5)
- save %sp, -192, %sp
- rd %fprs, %o5
- andcc %o5, FPRS_FEF|FPRS_DU, %g0
- be,pt %icc, 0f
- sethi %hi(VISenter), %g1
- jmpl %g1 + %lo(VISenter), %g7
- add %g7, 8, %g7
-0: wr %g0, FPRS_FEF, %fprs
- rd %asi, %g1
- wr %g0, ASI_BLK_P, %asi
- membar #LoadStore|#StoreLoad|#StoreStore
- sub %i0, 64, %i0
- ldda [%i1] %asi, %f0
- ldda [%i2] %asi, %f16
-
-5: ldda [%i3] %asi, %f32
- fxor %f0, %f16, %f48
- fxor %f2, %f18, %f50
- add %i1, 64, %i1
- fxor %f4, %f20, %f52
- fxor %f6, %f22, %f54
- add %i2, 64, %i2
- fxor %f8, %f24, %f56
- fxor %f10, %f26, %f58
- fxor %f12, %f28, %f60
- fxor %f14, %f30, %f62
- ldda [%i4] %asi, %f16
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- add %i3, 64, %i3
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- ldda [%i5] %asi, %f32
- fxor %f48, %f16, %f48
- fxor %f50, %f18, %f50
- add %i4, 64, %i4
- fxor %f52, %f20, %f52
- fxor %f54, %f22, %f54
- add %i5, 64, %i5
- fxor %f56, %f24, %f56
- fxor %f58, %f26, %f58
- fxor %f60, %f28, %f60
- fxor %f62, %f30, %f62
- ldda [%i1] %asi, %f0
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- subcc %i0, 64, %i0
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- stda %f48, [%i1 - 64] %asi
- bne,pt %xcc, 5b
- ldda [%i2] %asi, %f16
-
- ldda [%i3] %asi, %f32
- fxor %f0, %f16, %f48
- fxor %f2, %f18, %f50
- fxor %f4, %f20, %f52
- fxor %f6, %f22, %f54
- fxor %f8, %f24, %f56
- fxor %f10, %f26, %f58
- fxor %f12, %f28, %f60
- fxor %f14, %f30, %f62
- ldda [%i4] %asi, %f16
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- ldda [%i5] %asi, %f32
- fxor %f48, %f16, %f48
- fxor %f50, %f18, %f50
- fxor %f52, %f20, %f52
- fxor %f54, %f22, %f54
- fxor %f56, %f24, %f56
- fxor %f58, %f26, %f58
- fxor %f60, %f28, %f60
- fxor %f62, %f30, %f62
- membar #Sync
- fxor %f48, %f32, %f48
- fxor %f50, %f34, %f50
- fxor %f52, %f36, %f52
- fxor %f54, %f38, %f54
- fxor %f56, %f40, %f56
- fxor %f58, %f42, %f58
- fxor %f60, %f44, %f60
- fxor %f62, %f46, %f62
- stda %f48, [%i1] %asi
- membar #Sync|#StoreStore|#StoreLoad
- wr %g1, %g0, %asi
- wr %g0, 0, %fprs
- ret
- restore
-ENDPROC(xor_vis_5)
-EXPORT_SYMBOL(xor_vis_5)
/* Niagara versions. */
ENTRY(xor_niagara_2) /* %o0=bytes, %o1=dest, %o2=src */
@@ -399,7 +59,6 @@ ENTRY(xor_niagara_2) /* %o0=bytes, %o1=dest, %o2=src */
ret
restore
ENDPROC(xor_niagara_2)
-EXPORT_SYMBOL(xor_niagara_2)
ENTRY(xor_niagara_3) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2 */
save %sp, -192, %sp
@@ -461,7 +120,6 @@ ENTRY(xor_niagara_3) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2 */
ret
restore
ENDPROC(xor_niagara_3)
-EXPORT_SYMBOL(xor_niagara_3)
ENTRY(xor_niagara_4) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */
save %sp, -192, %sp
@@ -544,7 +202,6 @@ ENTRY(xor_niagara_4) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */
ret
restore
ENDPROC(xor_niagara_4)
-EXPORT_SYMBOL(xor_niagara_4)
ENTRY(xor_niagara_5) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3, %o5=src4 */
save %sp, -192, %sp
@@ -643,4 +300,3 @@ ENTRY(xor_niagara_5) /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3, %o5=s
ret
restore
ENDPROC(xor_niagara_5)
-EXPORT_SYMBOL(xor_niagara_5)
diff --git a/arch/sparc/include/asm/xor_32.h b/lib/raid/xor/sparc/xor-sparc32.c
similarity index 93%
rename from arch/sparc/include/asm/xor_32.h
rename to lib/raid/xor/sparc/xor-sparc32.c
index 8fbf0c07ec28..b65a75a6e59d 100644
--- a/arch/sparc/include/asm/xor_32.h
+++ b/lib/raid/xor/sparc/xor-sparc32.c
@@ -1,16 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * include/asm/xor.h
- *
- * Optimized RAID-5 checksumming functions for 32-bit Sparc.
- */
-
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* High speed xor_block operation for RAID4/5 utilizing the
* ldd/std SPARC instructions.
*
* Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz)
*/
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
static void
sparc_2(unsigned long bytes, unsigned long * __restrict p1,
@@ -248,21 +244,10 @@ sparc_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-static struct xor_block_template xor_block_SPARC = {
+struct xor_block_template xor_block_SPARC = {
.name = "SPARC",
.do_2 = sparc_2,
.do_3 = sparc_3,
.do_4 = sparc_4,
.do_5 = sparc_5,
};
-
-/* For grins, also test the generic routines. */
-#include <asm-generic/xor.h>
-
-#define arch_xor_init arch_xor_init
-static __always_inline void __init arch_xor_init(void)
-{
- xor_register(&xor_block_8regs);
- xor_register(&xor_block_32regs);
- xor_register(&xor_block_SPARC);
-}
diff --git a/lib/raid/xor/sparc/xor-vis-glue.c b/lib/raid/xor/sparc/xor-vis-glue.c
new file mode 100644
index 000000000000..73e5b293d0c9
--- /dev/null
+++ b/lib/raid/xor/sparc/xor-vis-glue.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * High speed xor_block operation for RAID4/5 utilizing the
+ * UltraSparc Visual Instruction Set.
+ *
+ * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
+ */
+
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
+
+void xor_vis_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2);
+void xor_vis_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+void xor_vis_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+void xor_vis_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
+
+/* XXX Ugh, write cheetah versions... -DaveM */
+
+struct xor_block_template xor_block_VIS = {
+ .name = "VIS",
+ .do_2 = xor_vis_2,
+ .do_3 = xor_vis_3,
+ .do_4 = xor_vis_4,
+ .do_5 = xor_vis_5,
+};
diff --git a/lib/raid/xor/sparc/xor-vis.S b/lib/raid/xor/sparc/xor-vis.S
new file mode 100644
index 000000000000..d06e221055d9
--- /dev/null
+++ b/lib/raid/xor/sparc/xor-vis.S
@@ -0,0 +1,348 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * High speed xor_block operation for RAID4/5 utilizing the
+ * UltraSparc Visual Instruction Set.
+ *
+ * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
+ */
+
+#include <linux/export.h>
+#include <linux/linkage.h>
+#include <asm/visasm.h>
+#include <asm/asi.h>
+#include <asm/dcu.h>
+#include <asm/spitfire.h>
+
+/*
+ * Requirements:
+ * !(((long)dest | (long)sourceN) & (64 - 1)) &&
+ * !(len & 127) && len >= 256
+ */
+ .text
+
+ /* VIS versions. */
+ENTRY(xor_vis_2)
+ rd %fprs, %o5
+ andcc %o5, FPRS_FEF|FPRS_DU, %g0
+ be,pt %icc, 0f
+ sethi %hi(VISenter), %g1
+ jmpl %g1 + %lo(VISenter), %g7
+ add %g7, 8, %g7
+0: wr %g0, FPRS_FEF, %fprs
+ rd %asi, %g1
+ wr %g0, ASI_BLK_P, %asi
+ membar #LoadStore|#StoreLoad|#StoreStore
+ sub %o0, 128, %o0
+ ldda [%o1] %asi, %f0
+ ldda [%o2] %asi, %f16
+
+2: ldda [%o1 + 64] %asi, %f32
+ fxor %f0, %f16, %f16
+ fxor %f2, %f18, %f18
+ fxor %f4, %f20, %f20
+ fxor %f6, %f22, %f22
+ fxor %f8, %f24, %f24
+ fxor %f10, %f26, %f26
+ fxor %f12, %f28, %f28
+ fxor %f14, %f30, %f30
+ stda %f16, [%o1] %asi
+ ldda [%o2 + 64] %asi, %f48
+ ldda [%o1 + 128] %asi, %f0
+ fxor %f32, %f48, %f48
+ fxor %f34, %f50, %f50
+ add %o1, 128, %o1
+ fxor %f36, %f52, %f52
+ add %o2, 128, %o2
+ fxor %f38, %f54, %f54
+ subcc %o0, 128, %o0
+ fxor %f40, %f56, %f56
+ fxor %f42, %f58, %f58
+ fxor %f44, %f60, %f60
+ fxor %f46, %f62, %f62
+ stda %f48, [%o1 - 64] %asi
+ bne,pt %xcc, 2b
+ ldda [%o2] %asi, %f16
+
+ ldda [%o1 + 64] %asi, %f32
+ fxor %f0, %f16, %f16
+ fxor %f2, %f18, %f18
+ fxor %f4, %f20, %f20
+ fxor %f6, %f22, %f22
+ fxor %f8, %f24, %f24
+ fxor %f10, %f26, %f26
+ fxor %f12, %f28, %f28
+ fxor %f14, %f30, %f30
+ stda %f16, [%o1] %asi
+ ldda [%o2 + 64] %asi, %f48
+ membar #Sync
+ fxor %f32, %f48, %f48
+ fxor %f34, %f50, %f50
+ fxor %f36, %f52, %f52
+ fxor %f38, %f54, %f54
+ fxor %f40, %f56, %f56
+ fxor %f42, %f58, %f58
+ fxor %f44, %f60, %f60
+ fxor %f46, %f62, %f62
+ stda %f48, [%o1 + 64] %asi
+ membar #Sync|#StoreStore|#StoreLoad
+ wr %g1, %g0, %asi
+ retl
+ wr %g0, 0, %fprs
+ENDPROC(xor_vis_2)
+
+ENTRY(xor_vis_3)
+ rd %fprs, %o5
+ andcc %o5, FPRS_FEF|FPRS_DU, %g0
+ be,pt %icc, 0f
+ sethi %hi(VISenter), %g1
+ jmpl %g1 + %lo(VISenter), %g7
+ add %g7, 8, %g7
+0: wr %g0, FPRS_FEF, %fprs
+ rd %asi, %g1
+ wr %g0, ASI_BLK_P, %asi
+ membar #LoadStore|#StoreLoad|#StoreStore
+ sub %o0, 64, %o0
+ ldda [%o1] %asi, %f0
+ ldda [%o2] %asi, %f16
+
+3: ldda [%o3] %asi, %f32
+ fxor %f0, %f16, %f48
+ fxor %f2, %f18, %f50
+ add %o1, 64, %o1
+ fxor %f4, %f20, %f52
+ fxor %f6, %f22, %f54
+ add %o2, 64, %o2
+ fxor %f8, %f24, %f56
+ fxor %f10, %f26, %f58
+ fxor %f12, %f28, %f60
+ fxor %f14, %f30, %f62
+ ldda [%o1] %asi, %f0
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ add %o3, 64, %o3
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ subcc %o0, 64, %o0
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ stda %f48, [%o1 - 64] %asi
+ bne,pt %xcc, 3b
+ ldda [%o2] %asi, %f16
+
+ ldda [%o3] %asi, %f32
+ fxor %f0, %f16, %f48
+ fxor %f2, %f18, %f50
+ fxor %f4, %f20, %f52
+ fxor %f6, %f22, %f54
+ fxor %f8, %f24, %f56
+ fxor %f10, %f26, %f58
+ fxor %f12, %f28, %f60
+ fxor %f14, %f30, %f62
+ membar #Sync
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ stda %f48, [%o1] %asi
+ membar #Sync|#StoreStore|#StoreLoad
+ wr %g1, %g0, %asi
+ retl
+ wr %g0, 0, %fprs
+ENDPROC(xor_vis_3)
+
+ENTRY(xor_vis_4)
+ rd %fprs, %o5
+ andcc %o5, FPRS_FEF|FPRS_DU, %g0
+ be,pt %icc, 0f
+ sethi %hi(VISenter), %g1
+ jmpl %g1 + %lo(VISenter), %g7
+ add %g7, 8, %g7
+0: wr %g0, FPRS_FEF, %fprs
+ rd %asi, %g1
+ wr %g0, ASI_BLK_P, %asi
+ membar #LoadStore|#StoreLoad|#StoreStore
+ sub %o0, 64, %o0
+ ldda [%o1] %asi, %f0
+ ldda [%o2] %asi, %f16
+
+4: ldda [%o3] %asi, %f32
+ fxor %f0, %f16, %f16
+ fxor %f2, %f18, %f18
+ add %o1, 64, %o1
+ fxor %f4, %f20, %f20
+ fxor %f6, %f22, %f22
+ add %o2, 64, %o2
+ fxor %f8, %f24, %f24
+ fxor %f10, %f26, %f26
+ fxor %f12, %f28, %f28
+ fxor %f14, %f30, %f30
+ ldda [%o4] %asi, %f48
+ fxor %f16, %f32, %f32
+ fxor %f18, %f34, %f34
+ fxor %f20, %f36, %f36
+ fxor %f22, %f38, %f38
+ add %o3, 64, %o3
+ fxor %f24, %f40, %f40
+ fxor %f26, %f42, %f42
+ fxor %f28, %f44, %f44
+ fxor %f30, %f46, %f46
+ ldda [%o1] %asi, %f0
+ fxor %f32, %f48, %f48
+ fxor %f34, %f50, %f50
+ fxor %f36, %f52, %f52
+ add %o4, 64, %o4
+ fxor %f38, %f54, %f54
+ fxor %f40, %f56, %f56
+ fxor %f42, %f58, %f58
+ subcc %o0, 64, %o0
+ fxor %f44, %f60, %f60
+ fxor %f46, %f62, %f62
+ stda %f48, [%o1 - 64] %asi
+ bne,pt %xcc, 4b
+ ldda [%o2] %asi, %f16
+
+ ldda [%o3] %asi, %f32
+ fxor %f0, %f16, %f16
+ fxor %f2, %f18, %f18
+ fxor %f4, %f20, %f20
+ fxor %f6, %f22, %f22
+ fxor %f8, %f24, %f24
+ fxor %f10, %f26, %f26
+ fxor %f12, %f28, %f28
+ fxor %f14, %f30, %f30
+ ldda [%o4] %asi, %f48
+ fxor %f16, %f32, %f32
+ fxor %f18, %f34, %f34
+ fxor %f20, %f36, %f36
+ fxor %f22, %f38, %f38
+ fxor %f24, %f40, %f40
+ fxor %f26, %f42, %f42
+ fxor %f28, %f44, %f44
+ fxor %f30, %f46, %f46
+ membar #Sync
+ fxor %f32, %f48, %f48
+ fxor %f34, %f50, %f50
+ fxor %f36, %f52, %f52
+ fxor %f38, %f54, %f54
+ fxor %f40, %f56, %f56
+ fxor %f42, %f58, %f58
+ fxor %f44, %f60, %f60
+ fxor %f46, %f62, %f62
+ stda %f48, [%o1] %asi
+ membar #Sync|#StoreStore|#StoreLoad
+ wr %g1, %g0, %asi
+ retl
+ wr %g0, 0, %fprs
+ENDPROC(xor_vis_4)
+
+ENTRY(xor_vis_5)
+ save %sp, -192, %sp
+ rd %fprs, %o5
+ andcc %o5, FPRS_FEF|FPRS_DU, %g0
+ be,pt %icc, 0f
+ sethi %hi(VISenter), %g1
+ jmpl %g1 + %lo(VISenter), %g7
+ add %g7, 8, %g7
+0: wr %g0, FPRS_FEF, %fprs
+ rd %asi, %g1
+ wr %g0, ASI_BLK_P, %asi
+ membar #LoadStore|#StoreLoad|#StoreStore
+ sub %i0, 64, %i0
+ ldda [%i1] %asi, %f0
+ ldda [%i2] %asi, %f16
+
+5: ldda [%i3] %asi, %f32
+ fxor %f0, %f16, %f48
+ fxor %f2, %f18, %f50
+ add %i1, 64, %i1
+ fxor %f4, %f20, %f52
+ fxor %f6, %f22, %f54
+ add %i2, 64, %i2
+ fxor %f8, %f24, %f56
+ fxor %f10, %f26, %f58
+ fxor %f12, %f28, %f60
+ fxor %f14, %f30, %f62
+ ldda [%i4] %asi, %f16
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ add %i3, 64, %i3
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ ldda [%i5] %asi, %f32
+ fxor %f48, %f16, %f48
+ fxor %f50, %f18, %f50
+ add %i4, 64, %i4
+ fxor %f52, %f20, %f52
+ fxor %f54, %f22, %f54
+ add %i5, 64, %i5
+ fxor %f56, %f24, %f56
+ fxor %f58, %f26, %f58
+ fxor %f60, %f28, %f60
+ fxor %f62, %f30, %f62
+ ldda [%i1] %asi, %f0
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ subcc %i0, 64, %i0
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ stda %f48, [%i1 - 64] %asi
+ bne,pt %xcc, 5b
+ ldda [%i2] %asi, %f16
+
+ ldda [%i3] %asi, %f32
+ fxor %f0, %f16, %f48
+ fxor %f2, %f18, %f50
+ fxor %f4, %f20, %f52
+ fxor %f6, %f22, %f54
+ fxor %f8, %f24, %f56
+ fxor %f10, %f26, %f58
+ fxor %f12, %f28, %f60
+ fxor %f14, %f30, %f62
+ ldda [%i4] %asi, %f16
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ ldda [%i5] %asi, %f32
+ fxor %f48, %f16, %f48
+ fxor %f50, %f18, %f50
+ fxor %f52, %f20, %f52
+ fxor %f54, %f22, %f54
+ fxor %f56, %f24, %f56
+ fxor %f58, %f26, %f58
+ fxor %f60, %f28, %f60
+ fxor %f62, %f30, %f62
+ membar #Sync
+ fxor %f48, %f32, %f48
+ fxor %f50, %f34, %f50
+ fxor %f52, %f36, %f52
+ fxor %f54, %f38, %f54
+ fxor %f56, %f40, %f56
+ fxor %f58, %f42, %f58
+ fxor %f60, %f44, %f60
+ fxor %f62, %f46, %f62
+ stda %f48, [%i1] %asi
+ membar #Sync|#StoreStore|#StoreLoad
+ wr %g1, %g0, %asi
+ wr %g0, 0, %fprs
+ ret
+ restore
+ENDPROC(xor_vis_5)
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:28 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Avoid the indirect call for xor_generation by using a static_call.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
lib/raid/xor/xor-32regs.c | 2 +-
lib/raid/xor/xor-core.c | 29 ++++++++++++++---------------
lib/raid/xor/xor_impl.h | 4 ++++
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/lib/raid/xor/xor-32regs.c b/lib/raid/xor/xor-32regs.c
index acb4a10d1e95..759a31f76414 100644
--- a/lib/raid/xor/xor-32regs.c
+++ b/lib/raid/xor/xor-32regs.c
@@ -209,7 +209,7 @@ xor_32regs_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-DO_XOR_BLOCKS(32regs, xor_32regs_2, xor_32regs_3, xor_32regs_4, xor_32regs_5);
+__DO_XOR_BLOCKS(32regs, xor_32regs_2, xor_32regs_3, xor_32regs_4, xor_32regs_5);
struct xor_block_template xor_block_32regs = {
.name = "32regs",
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index f18dcc57004b..2ab03dd294bf 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -11,10 +11,14 @@
#include <linux/raid/xor.h>
#include <linux/jiffies.h>
#include <linux/preempt.h>
+#include <linux/static_call.h>
#include "xor_impl.h"
-/* The xor routine to use. */
-static struct xor_block_template *active_template;
+/*
+ * Provide a temporary default until the fastest or forced implementation is
+ * picked.
+ */
+DEFINE_STATIC_CALL(xor_gen_impl, xor_gen_32regs);
/**
* xor_gen - generate RAID-style XOR information
@@ -32,13 +36,13 @@ static struct xor_block_template *active_template;
void xor_gen(void *dest, void **srcs, unsigned int src_cnt, unsigned int bytes)
{
WARN_ON_ONCE(in_interrupt());
- active_template->xor_gen(dest, srcs, src_cnt, bytes);
+ static_call(xor_gen_impl)(dest, srcs, src_cnt, bytes);
}
EXPORT_SYMBOL(xor_gen);
/* Set of all registered templates. */
static struct xor_block_template *__initdata template_list;
-static int __initdata xor_forced = false;
+static struct xor_block_template *forced_template;
/**
* xor_register - register a XOR template
@@ -64,7 +68,7 @@ void __init xor_register(struct xor_block_template *tmpl)
*/
void __init xor_force(struct xor_block_template *tmpl)
{
- active_template = tmpl;
+ forced_template = tmpl;
}
#define BENCH_SIZE 4096
@@ -106,7 +110,7 @@ static int __init calibrate_xor_blocks(void)
void *b1, *b2;
struct xor_block_template *f, *fastest;
- if (xor_forced)
+ if (forced_template)
return 0;
b1 = (void *) __get_free_pages(GFP_KERNEL, 2);
@@ -123,7 +127,7 @@ static int __init calibrate_xor_blocks(void)
if (f->speed > fastest->speed)
fastest = f;
}
- active_template = fastest;
+ static_call_update(xor_gen_impl, fastest->xor_gen);
pr_info("xor: using function: %s (%d MB/sec)\n",
fastest->name, fastest->speed);
@@ -151,21 +155,16 @@ static int __init xor_init(void)
* If this arch/cpu has a short-circuited selection, don't loop through
* all the possible functions, just use the best one.
*/
- if (active_template) {
+ if (forced_template) {
pr_info("xor: automatically using best checksumming function %-10s\n",
- active_template->name);
- xor_forced = true;
+ forced_template->name);
+ static_call_update(xor_gen_impl, forced_template->xor_gen);
return 0;
}
#ifdef MODULE
return calibrate_xor_blocks();
#else
- /*
- * Pick the first template as the temporary default until calibration
- * happens.
- */
- active_template = template_list;
return 0;
#endif
}
diff --git a/lib/raid/xor/xor_impl.h b/lib/raid/xor/xor_impl.h
index 968dd07df627..f11910162b08 100644
--- a/lib/raid/xor/xor_impl.h
+++ b/lib/raid/xor/xor_impl.h
@@ -50,6 +50,10 @@ extern struct xor_block_template xor_block_32regs;
extern struct xor_block_template xor_block_8regs_p;
extern struct xor_block_template xor_block_32regs_p;
+/* default call until updated */
+void xor_gen_32regs(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
+
void __init xor_register(struct xor_block_template *tmpl);
void __init xor_force(struct xor_block_template *tmpl);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:37 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the generic implementations from asm-generic/xor.h to
per-implementaion .c files in lib/raid.
Note that this would cause the second xor_block_8regs instance created by
arch/arm/lib/xor-neon.c to be generated instead of discarded as dead
code, so add a NO_TEMPLATE symbol to disable it for this case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/lib/xor-neon.c | 4 +-
include/asm-generic/xor.h | 727 +----------------------------
lib/raid/xor/Makefile | 4 +
lib/raid/xor/xor-32regs-prefetch.c | 268 +++++++++++
lib/raid/xor/xor-32regs.c | 219 +++++++++
lib/raid/xor/xor-8regs-prefetch.c | 146 ++++++
lib/raid/xor/xor-8regs.c | 105 +++++
7 files changed, 748 insertions(+), 725 deletions(-)
create mode 100644 lib/raid/xor/xor-32regs-prefetch.c
create mode 100644 lib/raid/xor/xor-32regs.c
create mode 100644 lib/raid/xor/xor-8regs-prefetch.c
create mode 100644 lib/raid/xor/xor-8regs.c
diff --git a/arch/arm/lib/xor-neon.c b/arch/arm/lib/xor-neon.c
index 282980b9bf2a..b5be50567991 100644
--- a/arch/arm/lib/xor-neon.c
+++ b/arch/arm/lib/xor-neon.c
@@ -26,8 +26,8 @@ MODULE_LICENSE("GPL");
#pragma GCC optimize "tree-vectorize"
#endif
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#include <asm-generic/xor.h>
+#define NO_TEMPLATE
+#include "../../../lib/raid/xor/xor-8regs.c"
struct xor_block_template const xor_block_neon_inner = {
.name = "__inner_neon__",
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h
index 79c0096aa9d9..fc151fdc45ab 100644
--- a/include/asm-generic/xor.h
+++ b/include/asm-generic/xor.h
@@ -5,726 +5,7 @@
* Generic optimized RAID-5 checksumming functions.
*/
-#include <linux/prefetch.h>
-
-static void
-xor_8regs_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- p1[0] ^= p2[0];
- p1[1] ^= p2[1];
- p1[2] ^= p2[2];
- p1[3] ^= p2[3];
- p1[4] ^= p2[4];
- p1[5] ^= p2[5];
- p1[6] ^= p2[6];
- p1[7] ^= p2[7];
- p1 += 8;
- p2 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_8regs_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- p1[0] ^= p2[0] ^ p3[0];
- p1[1] ^= p2[1] ^ p3[1];
- p1[2] ^= p2[2] ^ p3[2];
- p1[3] ^= p2[3] ^ p3[3];
- p1[4] ^= p2[4] ^ p3[4];
- p1[5] ^= p2[5] ^ p3[5];
- p1[6] ^= p2[6] ^ p3[6];
- p1[7] ^= p2[7] ^ p3[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_8regs_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- p1[0] ^= p2[0] ^ p3[0] ^ p4[0];
- p1[1] ^= p2[1] ^ p3[1] ^ p4[1];
- p1[2] ^= p2[2] ^ p3[2] ^ p4[2];
- p1[3] ^= p2[3] ^ p3[3] ^ p4[3];
- p1[4] ^= p2[4] ^ p3[4] ^ p4[4];
- p1[5] ^= p2[5] ^ p3[5] ^ p4[5];
- p1[6] ^= p2[6] ^ p3[6] ^ p4[6];
- p1[7] ^= p2[7] ^ p3[7] ^ p4[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_8regs_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- p1[0] ^= p2[0] ^ p3[0] ^ p4[0] ^ p5[0];
- p1[1] ^= p2[1] ^ p3[1] ^ p4[1] ^ p5[1];
- p1[2] ^= p2[2] ^ p3[2] ^ p4[2] ^ p5[2];
- p1[3] ^= p2[3] ^ p3[3] ^ p4[3] ^ p5[3];
- p1[4] ^= p2[4] ^ p3[4] ^ p4[4] ^ p5[4];
- p1[5] ^= p2[5] ^ p3[5] ^ p4[5] ^ p5[5];
- p1[6] ^= p2[6] ^ p3[6] ^ p4[6] ^ p5[6];
- p1[7] ^= p2[7] ^ p3[7] ^ p4[7] ^ p5[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- p5 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_32regs_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_32regs_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_32regs_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- d0 ^= p4[0];
- d1 ^= p4[1];
- d2 ^= p4[2];
- d3 ^= p4[3];
- d4 ^= p4[4];
- d5 ^= p4[5];
- d6 ^= p4[6];
- d7 ^= p4[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_32regs_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- long lines = bytes / (sizeof (long)) / 8;
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- d0 ^= p4[0];
- d1 ^= p4[1];
- d2 ^= p4[2];
- d3 ^= p4[3];
- d4 ^= p4[4];
- d5 ^= p4[5];
- d6 ^= p4[6];
- d7 ^= p4[7];
- d0 ^= p5[0];
- d1 ^= p5[1];
- d2 ^= p5[2];
- d3 ^= p5[3];
- d4 ^= p5[4];
- d5 ^= p5[5];
- d6 ^= p5[6];
- d7 ^= p5[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- p5 += 8;
- } while (--lines > 0);
-}
-
-static void
-xor_8regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
- prefetchw(p1);
- prefetch(p2);
-
- do {
- prefetchw(p1+8);
- prefetch(p2+8);
- once_more:
- p1[0] ^= p2[0];
- p1[1] ^= p2[1];
- p1[2] ^= p2[2];
- p1[3] ^= p2[3];
- p1[4] ^= p2[4];
- p1[5] ^= p2[5];
- p1[6] ^= p2[6];
- p1[7] ^= p2[7];
- p1 += 8;
- p2 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_8regs_p_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
-
- do {
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- once_more:
- p1[0] ^= p2[0] ^ p3[0];
- p1[1] ^= p2[1] ^ p3[1];
- p1[2] ^= p2[2] ^ p3[2];
- p1[3] ^= p2[3] ^ p3[3];
- p1[4] ^= p2[4] ^ p3[4];
- p1[5] ^= p2[5] ^ p3[5];
- p1[6] ^= p2[6] ^ p3[6];
- p1[7] ^= p2[7] ^ p3[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_8regs_p_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
- prefetch(p4);
-
- do {
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- prefetch(p4+8);
- once_more:
- p1[0] ^= p2[0] ^ p3[0] ^ p4[0];
- p1[1] ^= p2[1] ^ p3[1] ^ p4[1];
- p1[2] ^= p2[2] ^ p3[2] ^ p4[2];
- p1[3] ^= p2[3] ^ p3[3] ^ p4[3];
- p1[4] ^= p2[4] ^ p3[4] ^ p4[4];
- p1[5] ^= p2[5] ^ p3[5] ^ p4[5];
- p1[6] ^= p2[6] ^ p3[6] ^ p4[6];
- p1[7] ^= p2[7] ^ p3[7] ^ p4[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_8regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
- prefetch(p4);
- prefetch(p5);
-
- do {
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- prefetch(p4+8);
- prefetch(p5+8);
- once_more:
- p1[0] ^= p2[0] ^ p3[0] ^ p4[0] ^ p5[0];
- p1[1] ^= p2[1] ^ p3[1] ^ p4[1] ^ p5[1];
- p1[2] ^= p2[2] ^ p3[2] ^ p4[2] ^ p5[2];
- p1[3] ^= p2[3] ^ p3[3] ^ p4[3] ^ p5[3];
- p1[4] ^= p2[4] ^ p3[4] ^ p4[4] ^ p5[4];
- p1[5] ^= p2[5] ^ p3[5] ^ p4[5] ^ p5[5];
- p1[6] ^= p2[6] ^ p3[6] ^ p4[6] ^ p5[6];
- p1[7] ^= p2[7] ^ p3[7] ^ p4[7] ^ p5[7];
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- p5 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_32regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
-
- prefetchw(p1+8);
- prefetch(p2+8);
- once_more:
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_32regs_p_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
-
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- once_more:
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_32regs_p_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
- prefetch(p4);
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
-
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- prefetch(p4+8);
- once_more:
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- d0 ^= p4[0];
- d1 ^= p4[1];
- d2 ^= p4[2];
- d3 ^= p4[3];
- d4 ^= p4[4];
- d5 ^= p4[5];
- d6 ^= p4[6];
- d7 ^= p4[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static void
-xor_32regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- long lines = bytes / (sizeof (long)) / 8 - 1;
-
- prefetchw(p1);
- prefetch(p2);
- prefetch(p3);
- prefetch(p4);
- prefetch(p5);
-
- do {
- register long d0, d1, d2, d3, d4, d5, d6, d7;
-
- prefetchw(p1+8);
- prefetch(p2+8);
- prefetch(p3+8);
- prefetch(p4+8);
- prefetch(p5+8);
- once_more:
- d0 = p1[0]; /* Pull the stuff into registers */
- d1 = p1[1]; /* ... in bursts, if possible. */
- d2 = p1[2];
- d3 = p1[3];
- d4 = p1[4];
- d5 = p1[5];
- d6 = p1[6];
- d7 = p1[7];
- d0 ^= p2[0];
- d1 ^= p2[1];
- d2 ^= p2[2];
- d3 ^= p2[3];
- d4 ^= p2[4];
- d5 ^= p2[5];
- d6 ^= p2[6];
- d7 ^= p2[7];
- d0 ^= p3[0];
- d1 ^= p3[1];
- d2 ^= p3[2];
- d3 ^= p3[3];
- d4 ^= p3[4];
- d5 ^= p3[5];
- d6 ^= p3[6];
- d7 ^= p3[7];
- d0 ^= p4[0];
- d1 ^= p4[1];
- d2 ^= p4[2];
- d3 ^= p4[3];
- d4 ^= p4[4];
- d5 ^= p4[5];
- d6 ^= p4[6];
- d7 ^= p4[7];
- d0 ^= p5[0];
- d1 ^= p5[1];
- d2 ^= p5[2];
- d3 ^= p5[3];
- d4 ^= p5[4];
- d5 ^= p5[5];
- d6 ^= p5[6];
- d7 ^= p5[7];
- p1[0] = d0; /* Store the result (in bursts) */
- p1[1] = d1;
- p1[2] = d2;
- p1[3] = d3;
- p1[4] = d4;
- p1[5] = d5;
- p1[6] = d6;
- p1[7] = d7;
- p1 += 8;
- p2 += 8;
- p3 += 8;
- p4 += 8;
- p5 += 8;
- } while (--lines > 0);
- if (lines == 0)
- goto once_more;
-}
-
-static struct xor_block_template xor_block_8regs = {
- .name = "8regs",
- .do_2 = xor_8regs_2,
- .do_3 = xor_8regs_3,
- .do_4 = xor_8regs_4,
- .do_5 = xor_8regs_5,
-};
-
-static struct xor_block_template xor_block_32regs = {
- .name = "32regs",
- .do_2 = xor_32regs_2,
- .do_3 = xor_32regs_3,
- .do_4 = xor_32regs_4,
- .do_5 = xor_32regs_5,
-};
-
-static struct xor_block_template xor_block_8regs_p __maybe_unused = {
- .name = "8regs_prefetch",
- .do_2 = xor_8regs_p_2,
- .do_3 = xor_8regs_p_3,
- .do_4 = xor_8regs_p_4,
- .do_5 = xor_8regs_p_5,
-};
-
-static struct xor_block_template xor_block_32regs_p __maybe_unused = {
- .name = "32regs_prefetch",
- .do_2 = xor_32regs_p_2,
- .do_3 = xor_32regs_p_3,
- .do_4 = xor_32regs_p_4,
- .do_5 = xor_32regs_p_5,
-};
+extern struct xor_block_template xor_block_8regs;
+extern struct xor_block_template xor_block_32regs;
+extern struct xor_block_template xor_block_8regs_p;
+extern struct xor_block_template xor_block_32regs_p;
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 7bca0ce8e90a..89a944c9f990 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -3,3 +3,7 @@
obj-$(CONFIG_XOR_BLOCKS) += xor.o
xor-y += xor-core.o
+xor-y += xor-8regs.o
+xor-y += xor-32regs.o
+xor-y += xor-8regs-prefetch.o
+xor-y += xor-32regs-prefetch.o
diff --git a/lib/raid/xor/xor-32regs-prefetch.c b/lib/raid/xor/xor-32regs-prefetch.c
new file mode 100644
index 000000000000..8666c287f777
--- /dev/null
+++ b/lib/raid/xor/xor-32regs-prefetch.c
@@ -0,0 +1,268 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <linux/prefetch.h>
+#include <linux/raid/xor_impl.h>
+#include <asm-generic/xor.h>
+
+static void
+xor_32regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ once_more:
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_32regs_p_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ once_more:
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_32regs_p_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+ prefetch(p4);
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ prefetch(p4+8);
+ once_more:
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ d0 ^= p4[0];
+ d1 ^= p4[1];
+ d2 ^= p4[2];
+ d3 ^= p4[3];
+ d4 ^= p4[4];
+ d5 ^= p4[5];
+ d6 ^= p4[6];
+ d7 ^= p4[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_32regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+ prefetch(p4);
+ prefetch(p5);
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ prefetch(p4+8);
+ prefetch(p5+8);
+ once_more:
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ d0 ^= p4[0];
+ d1 ^= p4[1];
+ d2 ^= p4[2];
+ d3 ^= p4[3];
+ d4 ^= p4[4];
+ d5 ^= p4[5];
+ d6 ^= p4[6];
+ d7 ^= p4[7];
+ d0 ^= p5[0];
+ d1 ^= p5[1];
+ d2 ^= p5[2];
+ d3 ^= p5[3];
+ d4 ^= p5[4];
+ d5 ^= p5[5];
+ d6 ^= p5[6];
+ d7 ^= p5[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ p5 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+struct xor_block_template xor_block_32regs_p = {
+ .name = "32regs_prefetch",
+ .do_2 = xor_32regs_p_2,
+ .do_3 = xor_32regs_p_3,
+ .do_4 = xor_32regs_p_4,
+ .do_5 = xor_32regs_p_5,
+};
diff --git a/lib/raid/xor/xor-32regs.c b/lib/raid/xor/xor-32regs.c
new file mode 100644
index 000000000000..58d4fac43eb4
--- /dev/null
+++ b/lib/raid/xor/xor-32regs.c
@@ -0,0 +1,219 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <linux/raid/xor_impl.h>
+#include <asm-generic/xor.h>
+
+static void
+xor_32regs_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_32regs_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_32regs_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ d0 ^= p4[0];
+ d1 ^= p4[1];
+ d2 ^= p4[2];
+ d3 ^= p4[3];
+ d4 ^= p4[4];
+ d5 ^= p4[5];
+ d6 ^= p4[6];
+ d7 ^= p4[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_32regs_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ register long d0, d1, d2, d3, d4, d5, d6, d7;
+ d0 = p1[0]; /* Pull the stuff into registers */
+ d1 = p1[1]; /* ... in bursts, if possible. */
+ d2 = p1[2];
+ d3 = p1[3];
+ d4 = p1[4];
+ d5 = p1[5];
+ d6 = p1[6];
+ d7 = p1[7];
+ d0 ^= p2[0];
+ d1 ^= p2[1];
+ d2 ^= p2[2];
+ d3 ^= p2[3];
+ d4 ^= p2[4];
+ d5 ^= p2[5];
+ d6 ^= p2[6];
+ d7 ^= p2[7];
+ d0 ^= p3[0];
+ d1 ^= p3[1];
+ d2 ^= p3[2];
+ d3 ^= p3[3];
+ d4 ^= p3[4];
+ d5 ^= p3[5];
+ d6 ^= p3[6];
+ d7 ^= p3[7];
+ d0 ^= p4[0];
+ d1 ^= p4[1];
+ d2 ^= p4[2];
+ d3 ^= p4[3];
+ d4 ^= p4[4];
+ d5 ^= p4[5];
+ d6 ^= p4[6];
+ d7 ^= p4[7];
+ d0 ^= p5[0];
+ d1 ^= p5[1];
+ d2 ^= p5[2];
+ d3 ^= p5[3];
+ d4 ^= p5[4];
+ d5 ^= p5[5];
+ d6 ^= p5[6];
+ d7 ^= p5[7];
+ p1[0] = d0; /* Store the result (in bursts) */
+ p1[1] = d1;
+ p1[2] = d2;
+ p1[3] = d3;
+ p1[4] = d4;
+ p1[5] = d5;
+ p1[6] = d6;
+ p1[7] = d7;
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ p5 += 8;
+ } while (--lines > 0);
+}
+
+struct xor_block_template xor_block_32regs = {
+ .name = "32regs",
+ .do_2 = xor_32regs_2,
+ .do_3 = xor_32regs_3,
+ .do_4 = xor_32regs_4,
+ .do_5 = xor_32regs_5,
+};
diff --git a/lib/raid/xor/xor-8regs-prefetch.c b/lib/raid/xor/xor-8regs-prefetch.c
new file mode 100644
index 000000000000..67061e35a0a6
--- /dev/null
+++ b/lib/raid/xor/xor-8regs-prefetch.c
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <linux/prefetch.h>
+#include <linux/raid/xor_impl.h>
+#include <asm-generic/xor.h>
+
+static void
+xor_8regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+ prefetchw(p1);
+ prefetch(p2);
+
+ do {
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ once_more:
+ p1[0] ^= p2[0];
+ p1[1] ^= p2[1];
+ p1[2] ^= p2[2];
+ p1[3] ^= p2[3];
+ p1[4] ^= p2[4];
+ p1[5] ^= p2[5];
+ p1[6] ^= p2[6];
+ p1[7] ^= p2[7];
+ p1 += 8;
+ p2 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_8regs_p_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+
+ do {
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ once_more:
+ p1[0] ^= p2[0] ^ p3[0];
+ p1[1] ^= p2[1] ^ p3[1];
+ p1[2] ^= p2[2] ^ p3[2];
+ p1[3] ^= p2[3] ^ p3[3];
+ p1[4] ^= p2[4] ^ p3[4];
+ p1[5] ^= p2[5] ^ p3[5];
+ p1[6] ^= p2[6] ^ p3[6];
+ p1[7] ^= p2[7] ^ p3[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_8regs_p_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+ prefetch(p4);
+
+ do {
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ prefetch(p4+8);
+ once_more:
+ p1[0] ^= p2[0] ^ p3[0] ^ p4[0];
+ p1[1] ^= p2[1] ^ p3[1] ^ p4[1];
+ p1[2] ^= p2[2] ^ p3[2] ^ p4[2];
+ p1[3] ^= p2[3] ^ p3[3] ^ p4[3];
+ p1[4] ^= p2[4] ^ p3[4] ^ p4[4];
+ p1[5] ^= p2[5] ^ p3[5] ^ p4[5];
+ p1[6] ^= p2[6] ^ p3[6] ^ p4[6];
+ p1[7] ^= p2[7] ^ p3[7] ^ p4[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+static void
+xor_8regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ long lines = bytes / (sizeof (long)) / 8 - 1;
+
+ prefetchw(p1);
+ prefetch(p2);
+ prefetch(p3);
+ prefetch(p4);
+ prefetch(p5);
+
+ do {
+ prefetchw(p1+8);
+ prefetch(p2+8);
+ prefetch(p3+8);
+ prefetch(p4+8);
+ prefetch(p5+8);
+ once_more:
+ p1[0] ^= p2[0] ^ p3[0] ^ p4[0] ^ p5[0];
+ p1[1] ^= p2[1] ^ p3[1] ^ p4[1] ^ p5[1];
+ p1[2] ^= p2[2] ^ p3[2] ^ p4[2] ^ p5[2];
+ p1[3] ^= p2[3] ^ p3[3] ^ p4[3] ^ p5[3];
+ p1[4] ^= p2[4] ^ p3[4] ^ p4[4] ^ p5[4];
+ p1[5] ^= p2[5] ^ p3[5] ^ p4[5] ^ p5[5];
+ p1[6] ^= p2[6] ^ p3[6] ^ p4[6] ^ p5[6];
+ p1[7] ^= p2[7] ^ p3[7] ^ p4[7] ^ p5[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ p5 += 8;
+ } while (--lines > 0);
+ if (lines == 0)
+ goto once_more;
+}
+
+struct xor_block_template xor_block_8regs_p = {
+ .name = "8regs_prefetch",
+ .do_2 = xor_8regs_p_2,
+ .do_3 = xor_8regs_p_3,
+ .do_4 = xor_8regs_p_4,
+ .do_5 = xor_8regs_p_5,
+};
diff --git a/lib/raid/xor/xor-8regs.c b/lib/raid/xor/xor-8regs.c
new file mode 100644
index 000000000000..769f796ab2cf
--- /dev/null
+++ b/lib/raid/xor/xor-8regs.c
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <linux/raid/xor_impl.h>
+#include <asm-generic/xor.h>
+
+static void
+xor_8regs_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ p1[0] ^= p2[0];
+ p1[1] ^= p2[1];
+ p1[2] ^= p2[2];
+ p1[3] ^= p2[3];
+ p1[4] ^= p2[4];
+ p1[5] ^= p2[5];
+ p1[6] ^= p2[6];
+ p1[7] ^= p2[7];
+ p1 += 8;
+ p2 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_8regs_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ p1[0] ^= p2[0] ^ p3[0];
+ p1[1] ^= p2[1] ^ p3[1];
+ p1[2] ^= p2[2] ^ p3[2];
+ p1[3] ^= p2[3] ^ p3[3];
+ p1[4] ^= p2[4] ^ p3[4];
+ p1[5] ^= p2[5] ^ p3[5];
+ p1[6] ^= p2[6] ^ p3[6];
+ p1[7] ^= p2[7] ^ p3[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_8regs_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ p1[0] ^= p2[0] ^ p3[0] ^ p4[0];
+ p1[1] ^= p2[1] ^ p3[1] ^ p4[1];
+ p1[2] ^= p2[2] ^ p3[2] ^ p4[2];
+ p1[3] ^= p2[3] ^ p3[3] ^ p4[3];
+ p1[4] ^= p2[4] ^ p3[4] ^ p4[4];
+ p1[5] ^= p2[5] ^ p3[5] ^ p4[5];
+ p1[6] ^= p2[6] ^ p3[6] ^ p4[6];
+ p1[7] ^= p2[7] ^ p3[7] ^ p4[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ } while (--lines > 0);
+}
+
+static void
+xor_8regs_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ long lines = bytes / (sizeof (long)) / 8;
+
+ do {
+ p1[0] ^= p2[0] ^ p3[0] ^ p4[0] ^ p5[0];
+ p1[1] ^= p2[1] ^ p3[1] ^ p4[1] ^ p5[1];
+ p1[2] ^= p2[2] ^ p3[2] ^ p4[2] ^ p5[2];
+ p1[3] ^= p2[3] ^ p3[3] ^ p4[3] ^ p5[3];
+ p1[4] ^= p2[4] ^ p3[4] ^ p4[4] ^ p5[4];
+ p1[5] ^= p2[5] ^ p3[5] ^ p4[5] ^ p5[5];
+ p1[6] ^= p2[6] ^ p3[6] ^ p4[6] ^ p5[6];
+ p1[7] ^= p2[7] ^ p3[7] ^ p4[7] ^ p5[7];
+ p1 += 8;
+ p2 += 8;
+ p3 += 8;
+ p4 += 8;
+ p5 += 8;
+ } while (--lines > 0);
+}
+
+#ifndef NO_TEMPLATE
+struct xor_block_template xor_block_8regs = {
+ .name = "8regs",
+ .do_2 = xor_8regs_2,
+ .do_3 = xor_8regs_3,
+ .do_4 = xor_8regs_4,
+ .do_5 = xor_8regs_5,
+};
+#endif /* NO_TEMPLATE */
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:21 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR code out of line into lib/raid.
Note that the giant inline assembly block might be better off as a
separate assembly source file now, but I'll leave that to the alpha
maintainers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/alpha/include/asm/xor.h | 853 +----------------------------------
lib/raid/xor/Makefile | 2 +
lib/raid/xor/alpha/xor.c | 849 ++++++++++++++++++++++++++++++++++
3 files changed, 855 insertions(+), 849 deletions(-)
create mode 100644 lib/raid/xor/alpha/xor.c
diff --git a/arch/alpha/include/asm/xor.h b/arch/alpha/include/asm/xor.h
index 4c8085711df1..e517be577a09 100644
--- a/arch/alpha/include/asm/xor.h
+++ b/arch/alpha/include/asm/xor.h
@@ -1,856 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * include/asm-alpha/xor.h
- *
- * Optimized RAID-5 checksumming functions for alpha EV5 and EV6
- */
-
-extern void
-xor_alpha_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-extern void
-xor_alpha_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-extern void
-xor_alpha_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-extern void
-xor_alpha_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-
-extern void
-xor_alpha_prefetch_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-extern void
-xor_alpha_prefetch_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-extern void
-xor_alpha_prefetch_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-extern void
-xor_alpha_prefetch_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-asm(" \n\
- .text \n\
- .align 3 \n\
- .ent xor_alpha_2 \n\
-xor_alpha_2: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- .align 4 \n\
-2: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,8($17) \n\
- ldq $3,8($18) \n\
- \n\
- ldq $4,16($17) \n\
- ldq $5,16($18) \n\
- ldq $6,24($17) \n\
- ldq $7,24($18) \n\
- \n\
- ldq $19,32($17) \n\
- ldq $20,32($18) \n\
- ldq $21,40($17) \n\
- ldq $22,40($18) \n\
- \n\
- ldq $23,48($17) \n\
- ldq $24,48($18) \n\
- ldq $25,56($17) \n\
- xor $0,$1,$0 # 7 cycles from $1 load \n\
- \n\
- ldq $27,56($18) \n\
- xor $2,$3,$2 \n\
- stq $0,0($17) \n\
- xor $4,$5,$4 \n\
- \n\
- stq $2,8($17) \n\
- xor $6,$7,$6 \n\
- stq $4,16($17) \n\
- xor $19,$20,$19 \n\
- \n\
- stq $6,24($17) \n\
- xor $21,$22,$21 \n\
- stq $19,32($17) \n\
- xor $23,$24,$23 \n\
- \n\
- stq $21,40($17) \n\
- xor $25,$27,$25 \n\
- stq $23,48($17) \n\
- subq $16,1,$16 \n\
- \n\
- stq $25,56($17) \n\
- addq $17,64,$17 \n\
- addq $18,64,$18 \n\
- bgt $16,2b \n\
- \n\
- ret \n\
- .end xor_alpha_2 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_3 \n\
-xor_alpha_3: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- .align 4 \n\
-3: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,8($17) \n\
- \n\
- ldq $4,8($18) \n\
- ldq $6,16($17) \n\
- ldq $7,16($18) \n\
- ldq $21,24($17) \n\
- \n\
- ldq $22,24($18) \n\
- ldq $24,32($17) \n\
- ldq $25,32($18) \n\
- ldq $5,8($19) \n\
- \n\
- ldq $20,16($19) \n\
- ldq $23,24($19) \n\
- ldq $27,32($19) \n\
- nop \n\
- \n\
- xor $0,$1,$1 # 8 cycles from $0 load \n\
- xor $3,$4,$4 # 6 cycles from $4 load \n\
- xor $6,$7,$7 # 6 cycles from $7 load \n\
- xor $21,$22,$22 # 5 cycles from $22 load \n\
- \n\
- xor $1,$2,$2 # 9 cycles from $2 load \n\
- xor $24,$25,$25 # 5 cycles from $25 load \n\
- stq $2,0($17) \n\
- xor $4,$5,$5 # 6 cycles from $5 load \n\
- \n\
- stq $5,8($17) \n\
- xor $7,$20,$20 # 7 cycles from $20 load \n\
- stq $20,16($17) \n\
- xor $22,$23,$23 # 7 cycles from $23 load \n\
- \n\
- stq $23,24($17) \n\
- xor $25,$27,$27 # 7 cycles from $27 load \n\
- stq $27,32($17) \n\
- nop \n\
- \n\
- ldq $0,40($17) \n\
- ldq $1,40($18) \n\
- ldq $3,48($17) \n\
- ldq $4,48($18) \n\
- \n\
- ldq $6,56($17) \n\
- ldq $7,56($18) \n\
- ldq $2,40($19) \n\
- ldq $5,48($19) \n\
- \n\
- ldq $20,56($19) \n\
- xor $0,$1,$1 # 4 cycles from $1 load \n\
- xor $3,$4,$4 # 5 cycles from $4 load \n\
- xor $6,$7,$7 # 5 cycles from $7 load \n\
- \n\
- xor $1,$2,$2 # 4 cycles from $2 load \n\
- xor $4,$5,$5 # 5 cycles from $5 load \n\
- stq $2,40($17) \n\
- xor $7,$20,$20 # 4 cycles from $20 load \n\
- \n\
- stq $5,48($17) \n\
- subq $16,1,$16 \n\
- stq $20,56($17) \n\
- addq $19,64,$19 \n\
- \n\
- addq $18,64,$18 \n\
- addq $17,64,$17 \n\
- bgt $16,3b \n\
- ret \n\
- .end xor_alpha_3 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_4 \n\
-xor_alpha_4: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- .align 4 \n\
-4: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,0($20) \n\
- \n\
- ldq $4,8($17) \n\
- ldq $5,8($18) \n\
- ldq $6,8($19) \n\
- ldq $7,8($20) \n\
- \n\
- ldq $21,16($17) \n\
- ldq $22,16($18) \n\
- ldq $23,16($19) \n\
- ldq $24,16($20) \n\
- \n\
- ldq $25,24($17) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- ldq $27,24($18) \n\
- xor $2,$3,$3 # 6 cycles from $3 load \n\
- \n\
- ldq $0,24($19) \n\
- xor $1,$3,$3 \n\
- ldq $1,24($20) \n\
- xor $4,$5,$5 # 7 cycles from $5 load \n\
- \n\
- stq $3,0($17) \n\
- xor $6,$7,$7 \n\
- xor $21,$22,$22 # 7 cycles from $22 load \n\
- xor $5,$7,$7 \n\
- \n\
- stq $7,8($17) \n\
- xor $23,$24,$24 # 7 cycles from $24 load \n\
- ldq $2,32($17) \n\
- xor $22,$24,$24 \n\
- \n\
- ldq $3,32($18) \n\
- ldq $4,32($19) \n\
- ldq $5,32($20) \n\
- xor $25,$27,$27 # 8 cycles from $27 load \n\
- \n\
- ldq $6,40($17) \n\
- ldq $7,40($18) \n\
- ldq $21,40($19) \n\
- ldq $22,40($20) \n\
- \n\
- stq $24,16($17) \n\
- xor $0,$1,$1 # 9 cycles from $1 load \n\
- xor $2,$3,$3 # 5 cycles from $3 load \n\
- xor $27,$1,$1 \n\
- \n\
- stq $1,24($17) \n\
- xor $4,$5,$5 # 5 cycles from $5 load \n\
- ldq $23,48($17) \n\
- ldq $24,48($18) \n\
- \n\
- ldq $25,48($19) \n\
- xor $3,$5,$5 \n\
- ldq $27,48($20) \n\
- ldq $0,56($17) \n\
- \n\
- ldq $1,56($18) \n\
- ldq $2,56($19) \n\
- xor $6,$7,$7 # 8 cycles from $6 load \n\
- ldq $3,56($20) \n\
- \n\
- stq $5,32($17) \n\
- xor $21,$22,$22 # 8 cycles from $22 load \n\
- xor $7,$22,$22 \n\
- xor $23,$24,$24 # 5 cycles from $24 load \n\
- \n\
- stq $22,40($17) \n\
- xor $25,$27,$27 # 5 cycles from $27 load \n\
- xor $24,$27,$27 \n\
- xor $0,$1,$1 # 5 cycles from $1 load \n\
- \n\
- stq $27,48($17) \n\
- xor $2,$3,$3 # 4 cycles from $3 load \n\
- xor $1,$3,$3 \n\
- subq $16,1,$16 \n\
- \n\
- stq $3,56($17) \n\
- addq $20,64,$20 \n\
- addq $19,64,$19 \n\
- addq $18,64,$18 \n\
- \n\
- addq $17,64,$17 \n\
- bgt $16,4b \n\
- ret \n\
- .end xor_alpha_4 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_5 \n\
-xor_alpha_5: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- .align 4 \n\
-5: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,0($20) \n\
- \n\
- ldq $4,0($21) \n\
- ldq $5,8($17) \n\
- ldq $6,8($18) \n\
- ldq $7,8($19) \n\
- \n\
- ldq $22,8($20) \n\
- ldq $23,8($21) \n\
- ldq $24,16($17) \n\
- ldq $25,16($18) \n\
- \n\
- ldq $27,16($19) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- ldq $28,16($20) \n\
- xor $2,$3,$3 # 6 cycles from $3 load \n\
- \n\
- ldq $0,16($21) \n\
- xor $1,$3,$3 \n\
- ldq $1,24($17) \n\
- xor $3,$4,$4 # 7 cycles from $4 load \n\
- \n\
- stq $4,0($17) \n\
- xor $5,$6,$6 # 7 cycles from $6 load \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- xor $6,$23,$23 # 7 cycles from $23 load \n\
- \n\
- ldq $2,24($18) \n\
- xor $22,$23,$23 \n\
- ldq $3,24($19) \n\
- xor $24,$25,$25 # 8 cycles from $25 load \n\
- \n\
- stq $23,8($17) \n\
- xor $25,$27,$27 # 8 cycles from $27 load \n\
- ldq $4,24($20) \n\
- xor $28,$0,$0 # 7 cycles from $0 load \n\
- \n\
- ldq $5,24($21) \n\
- xor $27,$0,$0 \n\
- ldq $6,32($17) \n\
- ldq $7,32($18) \n\
- \n\
- stq $0,16($17) \n\
- xor $1,$2,$2 # 6 cycles from $2 load \n\
- ldq $22,32($19) \n\
- xor $3,$4,$4 # 4 cycles from $4 load \n\
- \n\
- ldq $23,32($20) \n\
- xor $2,$4,$4 \n\
- ldq $24,32($21) \n\
- ldq $25,40($17) \n\
- \n\
- ldq $27,40($18) \n\
- ldq $28,40($19) \n\
- ldq $0,40($20) \n\
- xor $4,$5,$5 # 7 cycles from $5 load \n\
- \n\
- stq $5,24($17) \n\
- xor $6,$7,$7 # 7 cycles from $7 load \n\
- ldq $1,40($21) \n\
- ldq $2,48($17) \n\
- \n\
- ldq $3,48($18) \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- ldq $4,48($19) \n\
- xor $23,$24,$24 # 6 cycles from $24 load \n\
- \n\
- ldq $5,48($20) \n\
- xor $22,$24,$24 \n\
- ldq $6,48($21) \n\
- xor $25,$27,$27 # 7 cycles from $27 load \n\
- \n\
- stq $24,32($17) \n\
- xor $27,$28,$28 # 8 cycles from $28 load \n\
- ldq $7,56($17) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- \n\
- ldq $22,56($18) \n\
- ldq $23,56($19) \n\
- ldq $24,56($20) \n\
- ldq $25,56($21) \n\
- \n\
- xor $28,$1,$1 \n\
- xor $2,$3,$3 # 9 cycles from $3 load \n\
- xor $3,$4,$4 # 9 cycles from $4 load \n\
- xor $5,$6,$6 # 8 cycles from $6 load \n\
- \n\
- stq $1,40($17) \n\
- xor $4,$6,$6 \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- xor $23,$24,$24 # 6 cycles from $24 load \n\
- \n\
- stq $6,48($17) \n\
- xor $22,$24,$24 \n\
- subq $16,1,$16 \n\
- xor $24,$25,$25 # 8 cycles from $25 load \n\
- \n\
- stq $25,56($17) \n\
- addq $21,64,$21 \n\
- addq $20,64,$20 \n\
- addq $19,64,$19 \n\
- \n\
- addq $18,64,$18 \n\
- addq $17,64,$17 \n\
- bgt $16,5b \n\
- ret \n\
- .end xor_alpha_5 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_prefetch_2 \n\
-xor_alpha_prefetch_2: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- \n\
- ldq $31, 0($17) \n\
- ldq $31, 0($18) \n\
- \n\
- ldq $31, 64($17) \n\
- ldq $31, 64($18) \n\
- \n\
- ldq $31, 128($17) \n\
- ldq $31, 128($18) \n\
- \n\
- ldq $31, 192($17) \n\
- ldq $31, 192($18) \n\
- .align 4 \n\
-2: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,8($17) \n\
- ldq $3,8($18) \n\
- \n\
- ldq $4,16($17) \n\
- ldq $5,16($18) \n\
- ldq $6,24($17) \n\
- ldq $7,24($18) \n\
- \n\
- ldq $19,32($17) \n\
- ldq $20,32($18) \n\
- ldq $21,40($17) \n\
- ldq $22,40($18) \n\
- \n\
- ldq $23,48($17) \n\
- ldq $24,48($18) \n\
- ldq $25,56($17) \n\
- ldq $27,56($18) \n\
- \n\
- ldq $31,256($17) \n\
- xor $0,$1,$0 # 8 cycles from $1 load \n\
- ldq $31,256($18) \n\
- xor $2,$3,$2 \n\
- \n\
- stq $0,0($17) \n\
- xor $4,$5,$4 \n\
- stq $2,8($17) \n\
- xor $6,$7,$6 \n\
- \n\
- stq $4,16($17) \n\
- xor $19,$20,$19 \n\
- stq $6,24($17) \n\
- xor $21,$22,$21 \n\
- \n\
- stq $19,32($17) \n\
- xor $23,$24,$23 \n\
- stq $21,40($17) \n\
- xor $25,$27,$25 \n\
- \n\
- stq $23,48($17) \n\
- subq $16,1,$16 \n\
- stq $25,56($17) \n\
- addq $17,64,$17 \n\
- \n\
- addq $18,64,$18 \n\
- bgt $16,2b \n\
- ret \n\
- .end xor_alpha_prefetch_2 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_prefetch_3 \n\
-xor_alpha_prefetch_3: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- \n\
- ldq $31, 0($17) \n\
- ldq $31, 0($18) \n\
- ldq $31, 0($19) \n\
- \n\
- ldq $31, 64($17) \n\
- ldq $31, 64($18) \n\
- ldq $31, 64($19) \n\
- \n\
- ldq $31, 128($17) \n\
- ldq $31, 128($18) \n\
- ldq $31, 128($19) \n\
- \n\
- ldq $31, 192($17) \n\
- ldq $31, 192($18) \n\
- ldq $31, 192($19) \n\
- .align 4 \n\
-3: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,8($17) \n\
- \n\
- ldq $4,8($18) \n\
- ldq $6,16($17) \n\
- ldq $7,16($18) \n\
- ldq $21,24($17) \n\
- \n\
- ldq $22,24($18) \n\
- ldq $24,32($17) \n\
- ldq $25,32($18) \n\
- ldq $5,8($19) \n\
- \n\
- ldq $20,16($19) \n\
- ldq $23,24($19) \n\
- ldq $27,32($19) \n\
- nop \n\
- \n\
- xor $0,$1,$1 # 8 cycles from $0 load \n\
- xor $3,$4,$4 # 7 cycles from $4 load \n\
- xor $6,$7,$7 # 6 cycles from $7 load \n\
- xor $21,$22,$22 # 5 cycles from $22 load \n\
- \n\
- xor $1,$2,$2 # 9 cycles from $2 load \n\
- xor $24,$25,$25 # 5 cycles from $25 load \n\
- stq $2,0($17) \n\
- xor $4,$5,$5 # 6 cycles from $5 load \n\
- \n\
- stq $5,8($17) \n\
- xor $7,$20,$20 # 7 cycles from $20 load \n\
- stq $20,16($17) \n\
- xor $22,$23,$23 # 7 cycles from $23 load \n\
- \n\
- stq $23,24($17) \n\
- xor $25,$27,$27 # 7 cycles from $27 load \n\
- stq $27,32($17) \n\
- nop \n\
- \n\
- ldq $0,40($17) \n\
- ldq $1,40($18) \n\
- ldq $3,48($17) \n\
- ldq $4,48($18) \n\
- \n\
- ldq $6,56($17) \n\
- ldq $7,56($18) \n\
- ldq $2,40($19) \n\
- ldq $5,48($19) \n\
- \n\
- ldq $20,56($19) \n\
- ldq $31,256($17) \n\
- ldq $31,256($18) \n\
- ldq $31,256($19) \n\
- \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- xor $3,$4,$4 # 5 cycles from $4 load \n\
- xor $6,$7,$7 # 5 cycles from $7 load \n\
- xor $1,$2,$2 # 4 cycles from $2 load \n\
- \n\
- xor $4,$5,$5 # 5 cycles from $5 load \n\
- xor $7,$20,$20 # 4 cycles from $20 load \n\
- stq $2,40($17) \n\
- subq $16,1,$16 \n\
- \n\
- stq $5,48($17) \n\
- addq $19,64,$19 \n\
- stq $20,56($17) \n\
- addq $18,64,$18 \n\
- \n\
- addq $17,64,$17 \n\
- bgt $16,3b \n\
- ret \n\
- .end xor_alpha_prefetch_3 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_prefetch_4 \n\
-xor_alpha_prefetch_4: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- \n\
- ldq $31, 0($17) \n\
- ldq $31, 0($18) \n\
- ldq $31, 0($19) \n\
- ldq $31, 0($20) \n\
- \n\
- ldq $31, 64($17) \n\
- ldq $31, 64($18) \n\
- ldq $31, 64($19) \n\
- ldq $31, 64($20) \n\
- \n\
- ldq $31, 128($17) \n\
- ldq $31, 128($18) \n\
- ldq $31, 128($19) \n\
- ldq $31, 128($20) \n\
- \n\
- ldq $31, 192($17) \n\
- ldq $31, 192($18) \n\
- ldq $31, 192($19) \n\
- ldq $31, 192($20) \n\
- .align 4 \n\
-4: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,0($20) \n\
- \n\
- ldq $4,8($17) \n\
- ldq $5,8($18) \n\
- ldq $6,8($19) \n\
- ldq $7,8($20) \n\
- \n\
- ldq $21,16($17) \n\
- ldq $22,16($18) \n\
- ldq $23,16($19) \n\
- ldq $24,16($20) \n\
- \n\
- ldq $25,24($17) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- ldq $27,24($18) \n\
- xor $2,$3,$3 # 6 cycles from $3 load \n\
- \n\
- ldq $0,24($19) \n\
- xor $1,$3,$3 \n\
- ldq $1,24($20) \n\
- xor $4,$5,$5 # 7 cycles from $5 load \n\
- \n\
- stq $3,0($17) \n\
- xor $6,$7,$7 \n\
- xor $21,$22,$22 # 7 cycles from $22 load \n\
- xor $5,$7,$7 \n\
- \n\
- stq $7,8($17) \n\
- xor $23,$24,$24 # 7 cycles from $24 load \n\
- ldq $2,32($17) \n\
- xor $22,$24,$24 \n\
- \n\
- ldq $3,32($18) \n\
- ldq $4,32($19) \n\
- ldq $5,32($20) \n\
- xor $25,$27,$27 # 8 cycles from $27 load \n\
- \n\
- ldq $6,40($17) \n\
- ldq $7,40($18) \n\
- ldq $21,40($19) \n\
- ldq $22,40($20) \n\
- \n\
- stq $24,16($17) \n\
- xor $0,$1,$1 # 9 cycles from $1 load \n\
- xor $2,$3,$3 # 5 cycles from $3 load \n\
- xor $27,$1,$1 \n\
- \n\
- stq $1,24($17) \n\
- xor $4,$5,$5 # 5 cycles from $5 load \n\
- ldq $23,48($17) \n\
- xor $3,$5,$5 \n\
- \n\
- ldq $24,48($18) \n\
- ldq $25,48($19) \n\
- ldq $27,48($20) \n\
- ldq $0,56($17) \n\
- \n\
- ldq $1,56($18) \n\
- ldq $2,56($19) \n\
- ldq $3,56($20) \n\
- xor $6,$7,$7 # 8 cycles from $6 load \n\
- \n\
- ldq $31,256($17) \n\
- xor $21,$22,$22 # 8 cycles from $22 load \n\
- ldq $31,256($18) \n\
- xor $7,$22,$22 \n\
- \n\
- ldq $31,256($19) \n\
- xor $23,$24,$24 # 6 cycles from $24 load \n\
- ldq $31,256($20) \n\
- xor $25,$27,$27 # 6 cycles from $27 load \n\
- \n\
- stq $5,32($17) \n\
- xor $24,$27,$27 \n\
- xor $0,$1,$1 # 7 cycles from $1 load \n\
- xor $2,$3,$3 # 6 cycles from $3 load \n\
- \n\
- stq $22,40($17) \n\
- xor $1,$3,$3 \n\
- stq $27,48($17) \n\
- subq $16,1,$16 \n\
- \n\
- stq $3,56($17) \n\
- addq $20,64,$20 \n\
- addq $19,64,$19 \n\
- addq $18,64,$18 \n\
- \n\
- addq $17,64,$17 \n\
- bgt $16,4b \n\
- ret \n\
- .end xor_alpha_prefetch_4 \n\
- \n\
- .align 3 \n\
- .ent xor_alpha_prefetch_5 \n\
-xor_alpha_prefetch_5: \n\
- .prologue 0 \n\
- srl $16, 6, $16 \n\
- \n\
- ldq $31, 0($17) \n\
- ldq $31, 0($18) \n\
- ldq $31, 0($19) \n\
- ldq $31, 0($20) \n\
- ldq $31, 0($21) \n\
- \n\
- ldq $31, 64($17) \n\
- ldq $31, 64($18) \n\
- ldq $31, 64($19) \n\
- ldq $31, 64($20) \n\
- ldq $31, 64($21) \n\
- \n\
- ldq $31, 128($17) \n\
- ldq $31, 128($18) \n\
- ldq $31, 128($19) \n\
- ldq $31, 128($20) \n\
- ldq $31, 128($21) \n\
- \n\
- ldq $31, 192($17) \n\
- ldq $31, 192($18) \n\
- ldq $31, 192($19) \n\
- ldq $31, 192($20) \n\
- ldq $31, 192($21) \n\
- .align 4 \n\
-5: \n\
- ldq $0,0($17) \n\
- ldq $1,0($18) \n\
- ldq $2,0($19) \n\
- ldq $3,0($20) \n\
- \n\
- ldq $4,0($21) \n\
- ldq $5,8($17) \n\
- ldq $6,8($18) \n\
- ldq $7,8($19) \n\
- \n\
- ldq $22,8($20) \n\
- ldq $23,8($21) \n\
- ldq $24,16($17) \n\
- ldq $25,16($18) \n\
- \n\
- ldq $27,16($19) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- ldq $28,16($20) \n\
- xor $2,$3,$3 # 6 cycles from $3 load \n\
- \n\
- ldq $0,16($21) \n\
- xor $1,$3,$3 \n\
- ldq $1,24($17) \n\
- xor $3,$4,$4 # 7 cycles from $4 load \n\
- \n\
- stq $4,0($17) \n\
- xor $5,$6,$6 # 7 cycles from $6 load \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- xor $6,$23,$23 # 7 cycles from $23 load \n\
- \n\
- ldq $2,24($18) \n\
- xor $22,$23,$23 \n\
- ldq $3,24($19) \n\
- xor $24,$25,$25 # 8 cycles from $25 load \n\
- \n\
- stq $23,8($17) \n\
- xor $25,$27,$27 # 8 cycles from $27 load \n\
- ldq $4,24($20) \n\
- xor $28,$0,$0 # 7 cycles from $0 load \n\
- \n\
- ldq $5,24($21) \n\
- xor $27,$0,$0 \n\
- ldq $6,32($17) \n\
- ldq $7,32($18) \n\
- \n\
- stq $0,16($17) \n\
- xor $1,$2,$2 # 6 cycles from $2 load \n\
- ldq $22,32($19) \n\
- xor $3,$4,$4 # 4 cycles from $4 load \n\
- \n\
- ldq $23,32($20) \n\
- xor $2,$4,$4 \n\
- ldq $24,32($21) \n\
- ldq $25,40($17) \n\
- \n\
- ldq $27,40($18) \n\
- ldq $28,40($19) \n\
- ldq $0,40($20) \n\
- xor $4,$5,$5 # 7 cycles from $5 load \n\
- \n\
- stq $5,24($17) \n\
- xor $6,$7,$7 # 7 cycles from $7 load \n\
- ldq $1,40($21) \n\
- ldq $2,48($17) \n\
- \n\
- ldq $3,48($18) \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- ldq $4,48($19) \n\
- xor $23,$24,$24 # 6 cycles from $24 load \n\
- \n\
- ldq $5,48($20) \n\
- xor $22,$24,$24 \n\
- ldq $6,48($21) \n\
- xor $25,$27,$27 # 7 cycles from $27 load \n\
- \n\
- stq $24,32($17) \n\
- xor $27,$28,$28 # 8 cycles from $28 load \n\
- ldq $7,56($17) \n\
- xor $0,$1,$1 # 6 cycles from $1 load \n\
- \n\
- ldq $22,56($18) \n\
- ldq $23,56($19) \n\
- ldq $24,56($20) \n\
- ldq $25,56($21) \n\
- \n\
- ldq $31,256($17) \n\
- xor $28,$1,$1 \n\
- ldq $31,256($18) \n\
- xor $2,$3,$3 # 9 cycles from $3 load \n\
- \n\
- ldq $31,256($19) \n\
- xor $3,$4,$4 # 9 cycles from $4 load \n\
- ldq $31,256($20) \n\
- xor $5,$6,$6 # 8 cycles from $6 load \n\
- \n\
- stq $1,40($17) \n\
- xor $4,$6,$6 \n\
- xor $7,$22,$22 # 7 cycles from $22 load \n\
- xor $23,$24,$24 # 6 cycles from $24 load \n\
- \n\
- stq $6,48($17) \n\
- xor $22,$24,$24 \n\
- ldq $31,256($21) \n\
- xor $24,$25,$25 # 8 cycles from $25 load \n\
- \n\
- stq $25,56($17) \n\
- subq $16,1,$16 \n\
- addq $21,64,$21 \n\
- addq $20,64,$20 \n\
- \n\
- addq $19,64,$19 \n\
- addq $18,64,$18 \n\
- addq $17,64,$17 \n\
- bgt $16,5b \n\
- \n\
- ret \n\
- .end xor_alpha_prefetch_5 \n\
-");
-
-static struct xor_block_template xor_block_alpha = {
- .name = "alpha",
- .do_2 = xor_alpha_2,
- .do_3 = xor_alpha_3,
- .do_4 = xor_alpha_4,
- .do_5 = xor_alpha_5,
-};
-
-static struct xor_block_template xor_block_alpha_prefetch = {
- .name = "alpha prefetch",
- .do_2 = xor_alpha_prefetch_2,
- .do_3 = xor_alpha_prefetch_3,
- .do_4 = xor_alpha_prefetch_4,
- .do_5 = xor_alpha_prefetch_5,
-};
-
-/* For grins, also test the generic routines. */
+#include <asm/special_insns.h>
#include <asm-generic/xor.h>
+extern struct xor_block_template xor_block_alpha;
+extern struct xor_block_template xor_block_alpha_prefetch;
+
/*
* Force the use of alpha_prefetch if EV6, as it is significantly faster in the
* cold cache case.
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 89a944c9f990..6d03c27c37c7 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -7,3 +7,5 @@ xor-y += xor-8regs.o
xor-y += xor-32regs.o
xor-y += xor-8regs-prefetch.o
xor-y += xor-32regs-prefetch.o
+
+xor-$(CONFIG_ALPHA) += alpha/xor.o
diff --git a/lib/raid/xor/alpha/xor.c b/lib/raid/xor/alpha/xor.c
new file mode 100644
index 000000000000..0964ac420604
--- /dev/null
+++ b/lib/raid/xor/alpha/xor.c
@@ -0,0 +1,849 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Optimized XOR parity functions for alpha EV5 and EV6
+ */
+#include <linux/raid/xor_impl.h>
+#include <asm/xor.h>
+
+extern void
+xor_alpha_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2);
+extern void
+xor_alpha_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+extern void
+xor_alpha_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+extern void
+xor_alpha_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
+
+extern void
+xor_alpha_prefetch_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2);
+extern void
+xor_alpha_prefetch_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3);
+extern void
+xor_alpha_prefetch_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4);
+extern void
+xor_alpha_prefetch_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5);
+
+asm(" \n\
+ .text \n\
+ .align 3 \n\
+ .ent xor_alpha_2 \n\
+xor_alpha_2: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ .align 4 \n\
+2: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,8($17) \n\
+ ldq $3,8($18) \n\
+ \n\
+ ldq $4,16($17) \n\
+ ldq $5,16($18) \n\
+ ldq $6,24($17) \n\
+ ldq $7,24($18) \n\
+ \n\
+ ldq $19,32($17) \n\
+ ldq $20,32($18) \n\
+ ldq $21,40($17) \n\
+ ldq $22,40($18) \n\
+ \n\
+ ldq $23,48($17) \n\
+ ldq $24,48($18) \n\
+ ldq $25,56($17) \n\
+ xor $0,$1,$0 # 7 cycles from $1 load \n\
+ \n\
+ ldq $27,56($18) \n\
+ xor $2,$3,$2 \n\
+ stq $0,0($17) \n\
+ xor $4,$5,$4 \n\
+ \n\
+ stq $2,8($17) \n\
+ xor $6,$7,$6 \n\
+ stq $4,16($17) \n\
+ xor $19,$20,$19 \n\
+ \n\
+ stq $6,24($17) \n\
+ xor $21,$22,$21 \n\
+ stq $19,32($17) \n\
+ xor $23,$24,$23 \n\
+ \n\
+ stq $21,40($17) \n\
+ xor $25,$27,$25 \n\
+ stq $23,48($17) \n\
+ subq $16,1,$16 \n\
+ \n\
+ stq $25,56($17) \n\
+ addq $17,64,$17 \n\
+ addq $18,64,$18 \n\
+ bgt $16,2b \n\
+ \n\
+ ret \n\
+ .end xor_alpha_2 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_3 \n\
+xor_alpha_3: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ .align 4 \n\
+3: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,8($17) \n\
+ \n\
+ ldq $4,8($18) \n\
+ ldq $6,16($17) \n\
+ ldq $7,16($18) \n\
+ ldq $21,24($17) \n\
+ \n\
+ ldq $22,24($18) \n\
+ ldq $24,32($17) \n\
+ ldq $25,32($18) \n\
+ ldq $5,8($19) \n\
+ \n\
+ ldq $20,16($19) \n\
+ ldq $23,24($19) \n\
+ ldq $27,32($19) \n\
+ nop \n\
+ \n\
+ xor $0,$1,$1 # 8 cycles from $0 load \n\
+ xor $3,$4,$4 # 6 cycles from $4 load \n\
+ xor $6,$7,$7 # 6 cycles from $7 load \n\
+ xor $21,$22,$22 # 5 cycles from $22 load \n\
+ \n\
+ xor $1,$2,$2 # 9 cycles from $2 load \n\
+ xor $24,$25,$25 # 5 cycles from $25 load \n\
+ stq $2,0($17) \n\
+ xor $4,$5,$5 # 6 cycles from $5 load \n\
+ \n\
+ stq $5,8($17) \n\
+ xor $7,$20,$20 # 7 cycles from $20 load \n\
+ stq $20,16($17) \n\
+ xor $22,$23,$23 # 7 cycles from $23 load \n\
+ \n\
+ stq $23,24($17) \n\
+ xor $25,$27,$27 # 7 cycles from $27 load \n\
+ stq $27,32($17) \n\
+ nop \n\
+ \n\
+ ldq $0,40($17) \n\
+ ldq $1,40($18) \n\
+ ldq $3,48($17) \n\
+ ldq $4,48($18) \n\
+ \n\
+ ldq $6,56($17) \n\
+ ldq $7,56($18) \n\
+ ldq $2,40($19) \n\
+ ldq $5,48($19) \n\
+ \n\
+ ldq $20,56($19) \n\
+ xor $0,$1,$1 # 4 cycles from $1 load \n\
+ xor $3,$4,$4 # 5 cycles from $4 load \n\
+ xor $6,$7,$7 # 5 cycles from $7 load \n\
+ \n\
+ xor $1,$2,$2 # 4 cycles from $2 load \n\
+ xor $4,$5,$5 # 5 cycles from $5 load \n\
+ stq $2,40($17) \n\
+ xor $7,$20,$20 # 4 cycles from $20 load \n\
+ \n\
+ stq $5,48($17) \n\
+ subq $16,1,$16 \n\
+ stq $20,56($17) \n\
+ addq $19,64,$19 \n\
+ \n\
+ addq $18,64,$18 \n\
+ addq $17,64,$17 \n\
+ bgt $16,3b \n\
+ ret \n\
+ .end xor_alpha_3 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_4 \n\
+xor_alpha_4: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ .align 4 \n\
+4: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,0($20) \n\
+ \n\
+ ldq $4,8($17) \n\
+ ldq $5,8($18) \n\
+ ldq $6,8($19) \n\
+ ldq $7,8($20) \n\
+ \n\
+ ldq $21,16($17) \n\
+ ldq $22,16($18) \n\
+ ldq $23,16($19) \n\
+ ldq $24,16($20) \n\
+ \n\
+ ldq $25,24($17) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ ldq $27,24($18) \n\
+ xor $2,$3,$3 # 6 cycles from $3 load \n\
+ \n\
+ ldq $0,24($19) \n\
+ xor $1,$3,$3 \n\
+ ldq $1,24($20) \n\
+ xor $4,$5,$5 # 7 cycles from $5 load \n\
+ \n\
+ stq $3,0($17) \n\
+ xor $6,$7,$7 \n\
+ xor $21,$22,$22 # 7 cycles from $22 load \n\
+ xor $5,$7,$7 \n\
+ \n\
+ stq $7,8($17) \n\
+ xor $23,$24,$24 # 7 cycles from $24 load \n\
+ ldq $2,32($17) \n\
+ xor $22,$24,$24 \n\
+ \n\
+ ldq $3,32($18) \n\
+ ldq $4,32($19) \n\
+ ldq $5,32($20) \n\
+ xor $25,$27,$27 # 8 cycles from $27 load \n\
+ \n\
+ ldq $6,40($17) \n\
+ ldq $7,40($18) \n\
+ ldq $21,40($19) \n\
+ ldq $22,40($20) \n\
+ \n\
+ stq $24,16($17) \n\
+ xor $0,$1,$1 # 9 cycles from $1 load \n\
+ xor $2,$3,$3 # 5 cycles from $3 load \n\
+ xor $27,$1,$1 \n\
+ \n\
+ stq $1,24($17) \n\
+ xor $4,$5,$5 # 5 cycles from $5 load \n\
+ ldq $23,48($17) \n\
+ ldq $24,48($18) \n\
+ \n\
+ ldq $25,48($19) \n\
+ xor $3,$5,$5 \n\
+ ldq $27,48($20) \n\
+ ldq $0,56($17) \n\
+ \n\
+ ldq $1,56($18) \n\
+ ldq $2,56($19) \n\
+ xor $6,$7,$7 # 8 cycles from $6 load \n\
+ ldq $3,56($20) \n\
+ \n\
+ stq $5,32($17) \n\
+ xor $21,$22,$22 # 8 cycles from $22 load \n\
+ xor $7,$22,$22 \n\
+ xor $23,$24,$24 # 5 cycles from $24 load \n\
+ \n\
+ stq $22,40($17) \n\
+ xor $25,$27,$27 # 5 cycles from $27 load \n\
+ xor $24,$27,$27 \n\
+ xor $0,$1,$1 # 5 cycles from $1 load \n\
+ \n\
+ stq $27,48($17) \n\
+ xor $2,$3,$3 # 4 cycles from $3 load \n\
+ xor $1,$3,$3 \n\
+ subq $16,1,$16 \n\
+ \n\
+ stq $3,56($17) \n\
+ addq $20,64,$20 \n\
+ addq $19,64,$19 \n\
+ addq $18,64,$18 \n\
+ \n\
+ addq $17,64,$17 \n\
+ bgt $16,4b \n\
+ ret \n\
+ .end xor_alpha_4 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_5 \n\
+xor_alpha_5: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ .align 4 \n\
+5: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,0($20) \n\
+ \n\
+ ldq $4,0($21) \n\
+ ldq $5,8($17) \n\
+ ldq $6,8($18) \n\
+ ldq $7,8($19) \n\
+ \n\
+ ldq $22,8($20) \n\
+ ldq $23,8($21) \n\
+ ldq $24,16($17) \n\
+ ldq $25,16($18) \n\
+ \n\
+ ldq $27,16($19) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ ldq $28,16($20) \n\
+ xor $2,$3,$3 # 6 cycles from $3 load \n\
+ \n\
+ ldq $0,16($21) \n\
+ xor $1,$3,$3 \n\
+ ldq $1,24($17) \n\
+ xor $3,$4,$4 # 7 cycles from $4 load \n\
+ \n\
+ stq $4,0($17) \n\
+ xor $5,$6,$6 # 7 cycles from $6 load \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ xor $6,$23,$23 # 7 cycles from $23 load \n\
+ \n\
+ ldq $2,24($18) \n\
+ xor $22,$23,$23 \n\
+ ldq $3,24($19) \n\
+ xor $24,$25,$25 # 8 cycles from $25 load \n\
+ \n\
+ stq $23,8($17) \n\
+ xor $25,$27,$27 # 8 cycles from $27 load \n\
+ ldq $4,24($20) \n\
+ xor $28,$0,$0 # 7 cycles from $0 load \n\
+ \n\
+ ldq $5,24($21) \n\
+ xor $27,$0,$0 \n\
+ ldq $6,32($17) \n\
+ ldq $7,32($18) \n\
+ \n\
+ stq $0,16($17) \n\
+ xor $1,$2,$2 # 6 cycles from $2 load \n\
+ ldq $22,32($19) \n\
+ xor $3,$4,$4 # 4 cycles from $4 load \n\
+ \n\
+ ldq $23,32($20) \n\
+ xor $2,$4,$4 \n\
+ ldq $24,32($21) \n\
+ ldq $25,40($17) \n\
+ \n\
+ ldq $27,40($18) \n\
+ ldq $28,40($19) \n\
+ ldq $0,40($20) \n\
+ xor $4,$5,$5 # 7 cycles from $5 load \n\
+ \n\
+ stq $5,24($17) \n\
+ xor $6,$7,$7 # 7 cycles from $7 load \n\
+ ldq $1,40($21) \n\
+ ldq $2,48($17) \n\
+ \n\
+ ldq $3,48($18) \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ ldq $4,48($19) \n\
+ xor $23,$24,$24 # 6 cycles from $24 load \n\
+ \n\
+ ldq $5,48($20) \n\
+ xor $22,$24,$24 \n\
+ ldq $6,48($21) \n\
+ xor $25,$27,$27 # 7 cycles from $27 load \n\
+ \n\
+ stq $24,32($17) \n\
+ xor $27,$28,$28 # 8 cycles from $28 load \n\
+ ldq $7,56($17) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ \n\
+ ldq $22,56($18) \n\
+ ldq $23,56($19) \n\
+ ldq $24,56($20) \n\
+ ldq $25,56($21) \n\
+ \n\
+ xor $28,$1,$1 \n\
+ xor $2,$3,$3 # 9 cycles from $3 load \n\
+ xor $3,$4,$4 # 9 cycles from $4 load \n\
+ xor $5,$6,$6 # 8 cycles from $6 load \n\
+ \n\
+ stq $1,40($17) \n\
+ xor $4,$6,$6 \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ xor $23,$24,$24 # 6 cycles from $24 load \n\
+ \n\
+ stq $6,48($17) \n\
+ xor $22,$24,$24 \n\
+ subq $16,1,$16 \n\
+ xor $24,$25,$25 # 8 cycles from $25 load \n\
+ \n\
+ stq $25,56($17) \n\
+ addq $21,64,$21 \n\
+ addq $20,64,$20 \n\
+ addq $19,64,$19 \n\
+ \n\
+ addq $18,64,$18 \n\
+ addq $17,64,$17 \n\
+ bgt $16,5b \n\
+ ret \n\
+ .end xor_alpha_5 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_prefetch_2 \n\
+xor_alpha_prefetch_2: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ \n\
+ ldq $31, 0($17) \n\
+ ldq $31, 0($18) \n\
+ \n\
+ ldq $31, 64($17) \n\
+ ldq $31, 64($18) \n\
+ \n\
+ ldq $31, 128($17) \n\
+ ldq $31, 128($18) \n\
+ \n\
+ ldq $31, 192($17) \n\
+ ldq $31, 192($18) \n\
+ .align 4 \n\
+2: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,8($17) \n\
+ ldq $3,8($18) \n\
+ \n\
+ ldq $4,16($17) \n\
+ ldq $5,16($18) \n\
+ ldq $6,24($17) \n\
+ ldq $7,24($18) \n\
+ \n\
+ ldq $19,32($17) \n\
+ ldq $20,32($18) \n\
+ ldq $21,40($17) \n\
+ ldq $22,40($18) \n\
+ \n\
+ ldq $23,48($17) \n\
+ ldq $24,48($18) \n\
+ ldq $25,56($17) \n\
+ ldq $27,56($18) \n\
+ \n\
+ ldq $31,256($17) \n\
+ xor $0,$1,$0 # 8 cycles from $1 load \n\
+ ldq $31,256($18) \n\
+ xor $2,$3,$2 \n\
+ \n\
+ stq $0,0($17) \n\
+ xor $4,$5,$4 \n\
+ stq $2,8($17) \n\
+ xor $6,$7,$6 \n\
+ \n\
+ stq $4,16($17) \n\
+ xor $19,$20,$19 \n\
+ stq $6,24($17) \n\
+ xor $21,$22,$21 \n\
+ \n\
+ stq $19,32($17) \n\
+ xor $23,$24,$23 \n\
+ stq $21,40($17) \n\
+ xor $25,$27,$25 \n\
+ \n\
+ stq $23,48($17) \n\
+ subq $16,1,$16 \n\
+ stq $25,56($17) \n\
+ addq $17,64,$17 \n\
+ \n\
+ addq $18,64,$18 \n\
+ bgt $16,2b \n\
+ ret \n\
+ .end xor_alpha_prefetch_2 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_prefetch_3 \n\
+xor_alpha_prefetch_3: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ \n\
+ ldq $31, 0($17) \n\
+ ldq $31, 0($18) \n\
+ ldq $31, 0($19) \n\
+ \n\
+ ldq $31, 64($17) \n\
+ ldq $31, 64($18) \n\
+ ldq $31, 64($19) \n\
+ \n\
+ ldq $31, 128($17) \n\
+ ldq $31, 128($18) \n\
+ ldq $31, 128($19) \n\
+ \n\
+ ldq $31, 192($17) \n\
+ ldq $31, 192($18) \n\
+ ldq $31, 192($19) \n\
+ .align 4 \n\
+3: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,8($17) \n\
+ \n\
+ ldq $4,8($18) \n\
+ ldq $6,16($17) \n\
+ ldq $7,16($18) \n\
+ ldq $21,24($17) \n\
+ \n\
+ ldq $22,24($18) \n\
+ ldq $24,32($17) \n\
+ ldq $25,32($18) \n\
+ ldq $5,8($19) \n\
+ \n\
+ ldq $20,16($19) \n\
+ ldq $23,24($19) \n\
+ ldq $27,32($19) \n\
+ nop \n\
+ \n\
+ xor $0,$1,$1 # 8 cycles from $0 load \n\
+ xor $3,$4,$4 # 7 cycles from $4 load \n\
+ xor $6,$7,$7 # 6 cycles from $7 load \n\
+ xor $21,$22,$22 # 5 cycles from $22 load \n\
+ \n\
+ xor $1,$2,$2 # 9 cycles from $2 load \n\
+ xor $24,$25,$25 # 5 cycles from $25 load \n\
+ stq $2,0($17) \n\
+ xor $4,$5,$5 # 6 cycles from $5 load \n\
+ \n\
+ stq $5,8($17) \n\
+ xor $7,$20,$20 # 7 cycles from $20 load \n\
+ stq $20,16($17) \n\
+ xor $22,$23,$23 # 7 cycles from $23 load \n\
+ \n\
+ stq $23,24($17) \n\
+ xor $25,$27,$27 # 7 cycles from $27 load \n\
+ stq $27,32($17) \n\
+ nop \n\
+ \n\
+ ldq $0,40($17) \n\
+ ldq $1,40($18) \n\
+ ldq $3,48($17) \n\
+ ldq $4,48($18) \n\
+ \n\
+ ldq $6,56($17) \n\
+ ldq $7,56($18) \n\
+ ldq $2,40($19) \n\
+ ldq $5,48($19) \n\
+ \n\
+ ldq $20,56($19) \n\
+ ldq $31,256($17) \n\
+ ldq $31,256($18) \n\
+ ldq $31,256($19) \n\
+ \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ xor $3,$4,$4 # 5 cycles from $4 load \n\
+ xor $6,$7,$7 # 5 cycles from $7 load \n\
+ xor $1,$2,$2 # 4 cycles from $2 load \n\
+ \n\
+ xor $4,$5,$5 # 5 cycles from $5 load \n\
+ xor $7,$20,$20 # 4 cycles from $20 load \n\
+ stq $2,40($17) \n\
+ subq $16,1,$16 \n\
+ \n\
+ stq $5,48($17) \n\
+ addq $19,64,$19 \n\
+ stq $20,56($17) \n\
+ addq $18,64,$18 \n\
+ \n\
+ addq $17,64,$17 \n\
+ bgt $16,3b \n\
+ ret \n\
+ .end xor_alpha_prefetch_3 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_prefetch_4 \n\
+xor_alpha_prefetch_4: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ \n\
+ ldq $31, 0($17) \n\
+ ldq $31, 0($18) \n\
+ ldq $31, 0($19) \n\
+ ldq $31, 0($20) \n\
+ \n\
+ ldq $31, 64($17) \n\
+ ldq $31, 64($18) \n\
+ ldq $31, 64($19) \n\
+ ldq $31, 64($20) \n\
+ \n\
+ ldq $31, 128($17) \n\
+ ldq $31, 128($18) \n\
+ ldq $31, 128($19) \n\
+ ldq $31, 128($20) \n\
+ \n\
+ ldq $31, 192($17) \n\
+ ldq $31, 192($18) \n\
+ ldq $31, 192($19) \n\
+ ldq $31, 192($20) \n\
+ .align 4 \n\
+4: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,0($20) \n\
+ \n\
+ ldq $4,8($17) \n\
+ ldq $5,8($18) \n\
+ ldq $6,8($19) \n\
+ ldq $7,8($20) \n\
+ \n\
+ ldq $21,16($17) \n\
+ ldq $22,16($18) \n\
+ ldq $23,16($19) \n\
+ ldq $24,16($20) \n\
+ \n\
+ ldq $25,24($17) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ ldq $27,24($18) \n\
+ xor $2,$3,$3 # 6 cycles from $3 load \n\
+ \n\
+ ldq $0,24($19) \n\
+ xor $1,$3,$3 \n\
+ ldq $1,24($20) \n\
+ xor $4,$5,$5 # 7 cycles from $5 load \n\
+ \n\
+ stq $3,0($17) \n\
+ xor $6,$7,$7 \n\
+ xor $21,$22,$22 # 7 cycles from $22 load \n\
+ xor $5,$7,$7 \n\
+ \n\
+ stq $7,8($17) \n\
+ xor $23,$24,$24 # 7 cycles from $24 load \n\
+ ldq $2,32($17) \n\
+ xor $22,$24,$24 \n\
+ \n\
+ ldq $3,32($18) \n\
+ ldq $4,32($19) \n\
+ ldq $5,32($20) \n\
+ xor $25,$27,$27 # 8 cycles from $27 load \n\
+ \n\
+ ldq $6,40($17) \n\
+ ldq $7,40($18) \n\
+ ldq $21,40($19) \n\
+ ldq $22,40($20) \n\
+ \n\
+ stq $24,16($17) \n\
+ xor $0,$1,$1 # 9 cycles from $1 load \n\
+ xor $2,$3,$3 # 5 cycles from $3 load \n\
+ xor $27,$1,$1 \n\
+ \n\
+ stq $1,24($17) \n\
+ xor $4,$5,$5 # 5 cycles from $5 load \n\
+ ldq $23,48($17) \n\
+ xor $3,$5,$5 \n\
+ \n\
+ ldq $24,48($18) \n\
+ ldq $25,48($19) \n\
+ ldq $27,48($20) \n\
+ ldq $0,56($17) \n\
+ \n\
+ ldq $1,56($18) \n\
+ ldq $2,56($19) \n\
+ ldq $3,56($20) \n\
+ xor $6,$7,$7 # 8 cycles from $6 load \n\
+ \n\
+ ldq $31,256($17) \n\
+ xor $21,$22,$22 # 8 cycles from $22 load \n\
+ ldq $31,256($18) \n\
+ xor $7,$22,$22 \n\
+ \n\
+ ldq $31,256($19) \n\
+ xor $23,$24,$24 # 6 cycles from $24 load \n\
+ ldq $31,256($20) \n\
+ xor $25,$27,$27 # 6 cycles from $27 load \n\
+ \n\
+ stq $5,32($17) \n\
+ xor $24,$27,$27 \n\
+ xor $0,$1,$1 # 7 cycles from $1 load \n\
+ xor $2,$3,$3 # 6 cycles from $3 load \n\
+ \n\
+ stq $22,40($17) \n\
+ xor $1,$3,$3 \n\
+ stq $27,48($17) \n\
+ subq $16,1,$16 \n\
+ \n\
+ stq $3,56($17) \n\
+ addq $20,64,$20 \n\
+ addq $19,64,$19 \n\
+ addq $18,64,$18 \n\
+ \n\
+ addq $17,64,$17 \n\
+ bgt $16,4b \n\
+ ret \n\
+ .end xor_alpha_prefetch_4 \n\
+ \n\
+ .align 3 \n\
+ .ent xor_alpha_prefetch_5 \n\
+xor_alpha_prefetch_5: \n\
+ .prologue 0 \n\
+ srl $16, 6, $16 \n\
+ \n\
+ ldq $31, 0($17) \n\
+ ldq $31, 0($18) \n\
+ ldq $31, 0($19) \n\
+ ldq $31, 0($20) \n\
+ ldq $31, 0($21) \n\
+ \n\
+ ldq $31, 64($17) \n\
+ ldq $31, 64($18) \n\
+ ldq $31, 64($19) \n\
+ ldq $31, 64($20) \n\
+ ldq $31, 64($21) \n\
+ \n\
+ ldq $31, 128($17) \n\
+ ldq $31, 128($18) \n\
+ ldq $31, 128($19) \n\
+ ldq $31, 128($20) \n\
+ ldq $31, 128($21) \n\
+ \n\
+ ldq $31, 192($17) \n\
+ ldq $31, 192($18) \n\
+ ldq $31, 192($19) \n\
+ ldq $31, 192($20) \n\
+ ldq $31, 192($21) \n\
+ .align 4 \n\
+5: \n\
+ ldq $0,0($17) \n\
+ ldq $1,0($18) \n\
+ ldq $2,0($19) \n\
+ ldq $3,0($20) \n\
+ \n\
+ ldq $4,0($21) \n\
+ ldq $5,8($17) \n\
+ ldq $6,8($18) \n\
+ ldq $7,8($19) \n\
+ \n\
+ ldq $22,8($20) \n\
+ ldq $23,8($21) \n\
+ ldq $24,16($17) \n\
+ ldq $25,16($18) \n\
+ \n\
+ ldq $27,16($19) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ ldq $28,16($20) \n\
+ xor $2,$3,$3 # 6 cycles from $3 load \n\
+ \n\
+ ldq $0,16($21) \n\
+ xor $1,$3,$3 \n\
+ ldq $1,24($17) \n\
+ xor $3,$4,$4 # 7 cycles from $4 load \n\
+ \n\
+ stq $4,0($17) \n\
+ xor $5,$6,$6 # 7 cycles from $6 load \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ xor $6,$23,$23 # 7 cycles from $23 load \n\
+ \n\
+ ldq $2,24($18) \n\
+ xor $22,$23,$23 \n\
+ ldq $3,24($19) \n\
+ xor $24,$25,$25 # 8 cycles from $25 load \n\
+ \n\
+ stq $23,8($17) \n\
+ xor $25,$27,$27 # 8 cycles from $27 load \n\
+ ldq $4,24($20) \n\
+ xor $28,$0,$0 # 7 cycles from $0 load \n\
+ \n\
+ ldq $5,24($21) \n\
+ xor $27,$0,$0 \n\
+ ldq $6,32($17) \n\
+ ldq $7,32($18) \n\
+ \n\
+ stq $0,16($17) \n\
+ xor $1,$2,$2 # 6 cycles from $2 load \n\
+ ldq $22,32($19) \n\
+ xor $3,$4,$4 # 4 cycles from $4 load \n\
+ \n\
+ ldq $23,32($20) \n\
+ xor $2,$4,$4 \n\
+ ldq $24,32($21) \n\
+ ldq $25,40($17) \n\
+ \n\
+ ldq $27,40($18) \n\
+ ldq $28,40($19) \n\
+ ldq $0,40($20) \n\
+ xor $4,$5,$5 # 7 cycles from $5 load \n\
+ \n\
+ stq $5,24($17) \n\
+ xor $6,$7,$7 # 7 cycles from $7 load \n\
+ ldq $1,40($21) \n\
+ ldq $2,48($17) \n\
+ \n\
+ ldq $3,48($18) \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ ldq $4,48($19) \n\
+ xor $23,$24,$24 # 6 cycles from $24 load \n\
+ \n\
+ ldq $5,48($20) \n\
+ xor $22,$24,$24 \n\
+ ldq $6,48($21) \n\
+ xor $25,$27,$27 # 7 cycles from $27 load \n\
+ \n\
+ stq $24,32($17) \n\
+ xor $27,$28,$28 # 8 cycles from $28 load \n\
+ ldq $7,56($17) \n\
+ xor $0,$1,$1 # 6 cycles from $1 load \n\
+ \n\
+ ldq $22,56($18) \n\
+ ldq $23,56($19) \n\
+ ldq $24,56($20) \n\
+ ldq $25,56($21) \n\
+ \n\
+ ldq $31,256($17) \n\
+ xor $28,$1,$1 \n\
+ ldq $31,256($18) \n\
+ xor $2,$3,$3 # 9 cycles from $3 load \n\
+ \n\
+ ldq $31,256($19) \n\
+ xor $3,$4,$4 # 9 cycles from $4 load \n\
+ ldq $31,256($20) \n\
+ xor $5,$6,$6 # 8 cycles from $6 load \n\
+ \n\
+ stq $1,40($17) \n\
+ xor $4,$6,$6 \n\
+ xor $7,$22,$22 # 7 cycles from $22 load \n\
+ xor $23,$24,$24 # 6 cycles from $24 load \n\
+ \n\
+ stq $6,48($17) \n\
+ xor $22,$24,$24 \n\
+ ldq $31,256($21) \n\
+ xor $24,$25,$25 # 8 cycles from $25 load \n\
+ \n\
+ stq $25,56($17) \n\
+ subq $16,1,$16 \n\
+ addq $21,64,$21 \n\
+ addq $20,64,$20 \n\
+ \n\
+ addq $19,64,$19 \n\
+ addq $18,64,$18 \n\
+ addq $17,64,$17 \n\
+ bgt $16,5b \n\
+ \n\
+ ret \n\
+ .end xor_alpha_prefetch_5 \n\
+");
+
+struct xor_block_template xor_block_alpha = {
+ .name = "alpha",
+ .do_2 = xor_alpha_2,
+ .do_3 = xor_alpha_3,
+ .do_4 = xor_alpha_4,
+ .do_5 = xor_alpha_5,
+};
+
+struct xor_block_template xor_block_alpha_prefetch = {
+ .name = "alpha prefetch",
+ .do_2 = xor_alpha_prefetch_2,
+ .do_3 = xor_alpha_prefetch_3,
+ .do_4 = xor_alpha_prefetch_4,
+ .do_5 = xor_alpha_prefetch_5,
+};
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:22 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the optimized XOR code out of line into lib/raid.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/x86/include/asm/xor.h | 518 ++----------------
arch/x86/include/asm/xor_64.h | 32 --
lib/raid/xor/Makefile | 8 +
.../xor_avx.h => lib/raid/xor/x86/xor-avx.c | 14 +-
.../xor_32.h => lib/raid/xor/x86/xor-mmx.c | 60 +-
lib/raid/xor/x86/xor-sse.c | 476 ++++++++++++++++
6 files changed, 528 insertions(+), 580 deletions(-)
delete mode 100644 arch/x86/include/asm/xor_64.h
rename arch/x86/include/asm/xor_avx.h => lib/raid/xor/x86/xor-avx.c (95%)
rename arch/x86/include/asm/xor_32.h => lib/raid/xor/x86/xor-mmx.c (90%)
create mode 100644 lib/raid/xor/x86/xor-sse.c
diff --git a/arch/x86/include/asm/xor.h b/arch/x86/include/asm/xor.h
index 33f5620d8d69..d1aab8275908 100644
--- a/arch/x86/include/asm/xor.h
+++ b/arch/x86/include/asm/xor.h
@@ -2,498 +2,42 @@
#ifndef _ASM_X86_XOR_H
#define _ASM_X86_XOR_H
-/*
- * Optimized RAID-5 checksumming functions for SSE.
- */
-
-/*
- * Cache avoiding checksumming functions utilizing KNI instructions
- * Copyright (C) 1999 Zach Brown (with obvious credit due Ingo)
- */
+#include <asm/cpufeature.h>
+#include <asm-generic/xor.h>
-/*
- * Based on
- * High-speed RAID5 checksumming functions utilizing SSE instructions.
- * Copyright (C) 1998 Ingo Molnar.
- */
+extern struct xor_block_template xor_block_pII_mmx;
+extern struct xor_block_template xor_block_p5_mmx;
+extern struct xor_block_template xor_block_sse;
+extern struct xor_block_template xor_block_sse_pf64;
+extern struct xor_block_template xor_block_avx;
/*
- * x86-64 changes / gcc fixes from Andi Kleen.
- * Copyright 2002 Andi Kleen, SuSE Labs.
+ * When SSE is available, use it as it can write around L2. We may also be able
+ * to load into the L1 only depending on how the cpu deals with a load to a line
+ * that is being prefetched.
+ *
+ * When AVX2 is available, force using it as it is better by all measures.
*
- * This hasn't been optimized for the hammer yet, but there are likely
- * no advantages to be gotten from x86-64 here anyways.
+ * 32-bit without MMX can fall back to the generic routines.
*/
-
-#include <asm/fpu/api.h>
-
-#ifdef CONFIG_X86_32
-/* reduce register pressure */
-# define XOR_CONSTANT_CONSTRAINT "i"
-#else
-# define XOR_CONSTANT_CONSTRAINT "re"
-#endif
-
-#define OFFS(x) "16*("#x")"
-#define PF_OFFS(x) "256+16*("#x")"
-#define PF0(x) " prefetchnta "PF_OFFS(x)"(%[p1]) ;\n"
-#define LD(x, y) " movaps "OFFS(x)"(%[p1]), %%xmm"#y" ;\n"
-#define ST(x, y) " movaps %%xmm"#y", "OFFS(x)"(%[p1]) ;\n"
-#define PF1(x) " prefetchnta "PF_OFFS(x)"(%[p2]) ;\n"
-#define PF2(x) " prefetchnta "PF_OFFS(x)"(%[p3]) ;\n"
-#define PF3(x) " prefetchnta "PF_OFFS(x)"(%[p4]) ;\n"
-#define PF4(x) " prefetchnta "PF_OFFS(x)"(%[p5]) ;\n"
-#define XO1(x, y) " xorps "OFFS(x)"(%[p2]), %%xmm"#y" ;\n"
-#define XO2(x, y) " xorps "OFFS(x)"(%[p3]), %%xmm"#y" ;\n"
-#define XO3(x, y) " xorps "OFFS(x)"(%[p4]), %%xmm"#y" ;\n"
-#define XO4(x, y) " xorps "OFFS(x)"(%[p5]), %%xmm"#y" ;\n"
-#define NOP(x)
-
-#define BLK64(pf, op, i) \
- pf(i) \
- op(i, 0) \
- op(i + 1, 1) \
- op(i + 2, 2) \
- op(i + 3, 3)
-
-static void
-xor_sse_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- LD(i, 0) \
- LD(i + 1, 1) \
- PF1(i) \
- PF1(i + 2) \
- LD(i + 2, 2) \
- LD(i + 3, 3) \
- PF0(i + 4) \
- PF0(i + 6) \
- XO1(i, 0) \
- XO1(i + 1, 1) \
- XO1(i + 2, 2) \
- XO1(i + 3, 3) \
- ST(i, 0) \
- ST(i + 1, 1) \
- ST(i + 2, 2) \
- ST(i + 3, 3) \
-
-
- PF0(0)
- PF0(2)
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines),
- [p1] "+r" (p1), [p2] "+r" (p2)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- BLK64(PF0, LD, i) \
- BLK64(PF1, XO1, i) \
- BLK64(NOP, ST, i) \
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines),
- [p1] "+r" (p1), [p2] "+r" (p2)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- PF1(i) \
- PF1(i + 2) \
- LD(i, 0) \
- LD(i + 1, 1) \
- LD(i + 2, 2) \
- LD(i + 3, 3) \
- PF2(i) \
- PF2(i + 2) \
- PF0(i + 4) \
- PF0(i + 6) \
- XO1(i, 0) \
- XO1(i + 1, 1) \
- XO1(i + 2, 2) \
- XO1(i + 3, 3) \
- XO2(i, 0) \
- XO2(i + 1, 1) \
- XO2(i + 2, 2) \
- XO2(i + 3, 3) \
- ST(i, 0) \
- ST(i + 1, 1) \
- ST(i + 2, 2) \
- ST(i + 3, 3) \
-
-
- PF0(0)
- PF0(2)
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines),
- [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
+#define arch_xor_init arch_xor_init
+static __always_inline void __init arch_xor_init(void)
+{
+ if (boot_cpu_has(X86_FEATURE_AVX) &&
+ boot_cpu_has(X86_FEATURE_OSXSAVE)) {
+ xor_force(&xor_block_avx);
+ } else if (IS_ENABLED(CONFIG_X86_64) || boot_cpu_has(X86_FEATURE_XMM)) {
+ xor_register(&xor_block_sse);
+ xor_register(&xor_block_sse_pf64);
+ } else if (boot_cpu_has(X86_FEATURE_MMX)) {
+ xor_register(&xor_block_pII_mmx);
+ xor_register(&xor_block_p5_mmx);
+ } else {
+ xor_register(&xor_block_8regs);
+ xor_register(&xor_block_8regs_p);
+ xor_register(&xor_block_32regs);
+ xor_register(&xor_block_32regs_p);
+ }
}
-static void
-xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- BLK64(PF0, LD, i) \
- BLK64(PF1, XO1, i) \
- BLK64(PF2, XO2, i) \
- BLK64(NOP, ST, i) \
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines),
- [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- PF1(i) \
- PF1(i + 2) \
- LD(i, 0) \
- LD(i + 1, 1) \
- LD(i + 2, 2) \
- LD(i + 3, 3) \
- PF2(i) \
- PF2(i + 2) \
- XO1(i, 0) \
- XO1(i + 1, 1) \
- XO1(i + 2, 2) \
- XO1(i + 3, 3) \
- PF3(i) \
- PF3(i + 2) \
- PF0(i + 4) \
- PF0(i + 6) \
- XO2(i, 0) \
- XO2(i + 1, 1) \
- XO2(i + 2, 2) \
- XO2(i + 3, 3) \
- XO3(i, 0) \
- XO3(i + 1, 1) \
- XO3(i + 2, 2) \
- XO3(i + 3, 3) \
- ST(i, 0) \
- ST(i + 1, 1) \
- ST(i + 2, 2) \
- ST(i + 3, 3) \
-
-
- PF0(0)
- PF0(2)
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " add %[inc], %[p4] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines), [p1] "+r" (p1),
- [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- BLK64(PF0, LD, i) \
- BLK64(PF1, XO1, i) \
- BLK64(PF2, XO2, i) \
- BLK64(PF3, XO3, i) \
- BLK64(NOP, ST, i) \
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " add %[inc], %[p4] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines), [p1] "+r" (p1),
- [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- PF1(i) \
- PF1(i + 2) \
- LD(i, 0) \
- LD(i + 1, 1) \
- LD(i + 2, 2) \
- LD(i + 3, 3) \
- PF2(i) \
- PF2(i + 2) \
- XO1(i, 0) \
- XO1(i + 1, 1) \
- XO1(i + 2, 2) \
- XO1(i + 3, 3) \
- PF3(i) \
- PF3(i + 2) \
- XO2(i, 0) \
- XO2(i + 1, 1) \
- XO2(i + 2, 2) \
- XO2(i + 3, 3) \
- PF4(i) \
- PF4(i + 2) \
- PF0(i + 4) \
- PF0(i + 6) \
- XO3(i, 0) \
- XO3(i + 1, 1) \
- XO3(i + 2, 2) \
- XO3(i + 3, 3) \
- XO4(i, 0) \
- XO4(i + 1, 1) \
- XO4(i + 2, 2) \
- XO4(i + 3, 3) \
- ST(i, 0) \
- ST(i + 1, 1) \
- ST(i + 2, 2) \
- ST(i + 3, 3) \
-
-
- PF0(0)
- PF0(2)
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " add %[inc], %[p4] ;\n"
- " add %[inc], %[p5] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines), [p1] "+r" (p1), [p2] "+r" (p2),
- [p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static void
-xor_sse_5_pf64(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- unsigned long lines = bytes >> 8;
-
- kernel_fpu_begin();
-
- asm volatile(
-#undef BLOCK
-#define BLOCK(i) \
- BLK64(PF0, LD, i) \
- BLK64(PF1, XO1, i) \
- BLK64(PF2, XO2, i) \
- BLK64(PF3, XO3, i) \
- BLK64(PF4, XO4, i) \
- BLK64(NOP, ST, i) \
-
- " .align 32 ;\n"
- " 1: ;\n"
-
- BLOCK(0)
- BLOCK(4)
- BLOCK(8)
- BLOCK(12)
-
- " add %[inc], %[p1] ;\n"
- " add %[inc], %[p2] ;\n"
- " add %[inc], %[p3] ;\n"
- " add %[inc], %[p4] ;\n"
- " add %[inc], %[p5] ;\n"
- " dec %[cnt] ;\n"
- " jnz 1b ;\n"
- : [cnt] "+r" (lines), [p1] "+r" (p1), [p2] "+r" (p2),
- [p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
- : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
- : "memory");
-
- kernel_fpu_end();
-}
-
-static struct xor_block_template xor_block_sse_pf64 = {
- .name = "prefetch64-sse",
- .do_2 = xor_sse_2_pf64,
- .do_3 = xor_sse_3_pf64,
- .do_4 = xor_sse_4_pf64,
- .do_5 = xor_sse_5_pf64,
-};
-
-#undef LD
-#undef XO1
-#undef XO2
-#undef XO3
-#undef XO4
-#undef ST
-#undef NOP
-#undef BLK64
-#undef BLOCK
-
-#undef XOR_CONSTANT_CONSTRAINT
-
-#ifdef CONFIG_X86_32
-# include <asm/xor_32.h>
-#else
-# include <asm/xor_64.h>
-#endif
-
#endif /* _ASM_X86_XOR_H */
diff --git a/arch/x86/include/asm/xor_64.h b/arch/x86/include/asm/xor_64.h
deleted file mode 100644
index 2d2ceb241866..000000000000
--- a/arch/x86/include/asm/xor_64.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_X86_XOR_64_H
-#define _ASM_X86_XOR_64_H
-
-static struct xor_block_template xor_block_sse = {
- .name = "generic_sse",
- .do_2 = xor_sse_2,
- .do_3 = xor_sse_3,
- .do_4 = xor_sse_4,
- .do_5 = xor_sse_5,
-};
-
-
-/* Also try the AVX routines */
-#include <asm/xor_avx.h>
-
-/* We force the use of the SSE xor block because it can write around L2.
- We may also be able to load into the L1 only depending on how the cpu
- deals with a load to a line that is being prefetched. */
-#define arch_xor_init arch_xor_init
-static __always_inline void __init arch_xor_init(void)
-{
- if (boot_cpu_has(X86_FEATURE_AVX) &&
- boot_cpu_has(X86_FEATURE_OSXSAVE)) {
- xor_force(&xor_block_avx);
- } else {
- xor_register(&xor_block_sse_pf64);
- xor_register(&xor_block_sse);
- }
-}
-
-#endif /* _ASM_X86_XOR_64_H */
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index 15fd8797ae61..eeda2610f7e7 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -23,6 +23,14 @@ xor-$(CONFIG_SPARC32) += sparc/xor-sparc32.o
xor-$(CONFIG_SPARC64) += sparc/xor-vis.o sparc/xor-vis-glue.o
xor-$(CONFIG_SPARC64) += sparc/xor-niagara.o sparc/xor-niagara-glue.o
xor-$(CONFIG_S390) += s390/xor.o
+ifeq ($(CONFIG_32BIT),y)
+xor-$(CONFIG_UML_X86) += x86/xor-mmx.o
+endif
+xor-$(CONFIG_UML_X86) += x86/xor-avx.o
+xor-$(CONFIG_UML_X86) += x86/xor-sse.o
+xor-$(CONFIG_X86_32) += x86/xor-mmx.o
+xor-$(CONFIG_X86) += x86/xor-avx.o
+xor-$(CONFIG_X86) += x86/xor-sse.o
CFLAGS_arm/xor-neon.o += $(CC_FLAGS_FPU)
diff --git a/arch/x86/include/asm/xor_avx.h b/lib/raid/xor/x86/xor-avx.c
similarity index 95%
rename from arch/x86/include/asm/xor_avx.h
rename to lib/raid/xor/x86/xor-avx.c
index c600888436bb..b49cb5199e70 100644
--- a/arch/x86/include/asm/xor_avx.h
+++ b/lib/raid/xor/x86/xor-avx.c
@@ -1,18 +1,16 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _ASM_X86_XOR_AVX_H
-#define _ASM_X86_XOR_AVX_H
-
+// SPDX-License-Identifier: GPL-2.0-only
/*
- * Optimized RAID-5 checksumming functions for AVX
+ * Optimized XOR parity functions for AVX
*
* Copyright (C) 2012 Intel Corporation
* Author: Jim Kukunas <james.t.kukunas@linux.intel.com>
*
* Based on Ingo Molnar and Zach Brown's respective MMX and SSE routines
*/
-
#include <linux/compiler.h>
+#include <linux/raid/xor_impl.h>
#include <asm/fpu/api.h>
+#include <asm/xor.h>
#define BLOCK4(i) \
BLOCK(32 * i, 0) \
@@ -158,12 +156,10 @@ do { \
kernel_fpu_end();
}
-static struct xor_block_template xor_block_avx = {
+struct xor_block_template xor_block_avx = {
.name = "avx",
.do_2 = xor_avx_2,
.do_3 = xor_avx_3,
.do_4 = xor_avx_4,
.do_5 = xor_avx_5,
};
-
-#endif
diff --git a/arch/x86/include/asm/xor_32.h b/lib/raid/xor/x86/xor-mmx.c
similarity index 90%
rename from arch/x86/include/asm/xor_32.h
rename to lib/raid/xor/x86/xor-mmx.c
index ee32d08c27bc..cf0fafea33b7 100644
--- a/arch/x86/include/asm/xor_32.h
+++ b/lib/raid/xor/x86/xor-mmx.c
@@ -1,15 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef _ASM_X86_XOR_32_H
-#define _ASM_X86_XOR_32_H
-
-/*
- * Optimized RAID-5 checksumming functions for MMX.
- */
-
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * High-speed RAID5 checksumming functions utilizing MMX instructions.
+ * Optimized XOR parity functions for MMX.
+ *
* Copyright (C) 1998 Ingo Molnar.
*/
+#include <linux/raid/xor_impl.h>
+#include <asm/fpu/api.h>
+#include <asm/xor.h>
#define LD(x, y) " movq 8*("#x")(%1), %%mm"#y" ;\n"
#define ST(x, y) " movq %%mm"#y", 8*("#x")(%1) ;\n"
@@ -18,8 +15,6 @@
#define XO3(x, y) " pxor 8*("#x")(%4), %%mm"#y" ;\n"
#define XO4(x, y) " pxor 8*("#x")(%5), %%mm"#y" ;\n"
-#include <asm/fpu/api.h>
-
static void
xor_pII_mmx_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2)
@@ -519,7 +514,7 @@ xor_p5_mmx_5(unsigned long bytes, unsigned long * __restrict p1,
kernel_fpu_end();
}
-static struct xor_block_template xor_block_pII_mmx = {
+struct xor_block_template xor_block_pII_mmx = {
.name = "pII_mmx",
.do_2 = xor_pII_mmx_2,
.do_3 = xor_pII_mmx_3,
@@ -527,49 +522,10 @@ static struct xor_block_template xor_block_pII_mmx = {
.do_5 = xor_pII_mmx_5,
};
-static struct xor_block_template xor_block_p5_mmx = {
+struct xor_block_template xor_block_p5_mmx = {
.name = "p5_mmx",
.do_2 = xor_p5_mmx_2,
.do_3 = xor_p5_mmx_3,
.do_4 = xor_p5_mmx_4,
.do_5 = xor_p5_mmx_5,
};
-
-static struct xor_block_template xor_block_pIII_sse = {
- .name = "pIII_sse",
- .do_2 = xor_sse_2,
- .do_3 = xor_sse_3,
- .do_4 = xor_sse_4,
- .do_5 = xor_sse_5,
-};
-
-/* Also try the AVX routines */
-#include <asm/xor_avx.h>
-
-/* Also try the generic routines. */
-#include <asm-generic/xor.h>
-
-/* We force the use of the SSE xor block because it can write around L2.
- We may also be able to load into the L1 only depending on how the cpu
- deals with a load to a line that is being prefetched. */
-#define arch_xor_init arch_xor_init
-static __always_inline void __init arch_xor_init(void)
-{
- if (boot_cpu_has(X86_FEATURE_AVX) &&
- boot_cpu_has(X86_FEATURE_OSXSAVE)) {
- xor_force(&xor_block_avx);
- } else if (boot_cpu_has(X86_FEATURE_XMM)) {
- xor_register(&xor_block_pIII_sse);
- xor_register(&xor_block_sse_pf64);
- } else if (boot_cpu_has(X86_FEATURE_MMX)) {
- xor_register(&xor_block_pII_mmx);
- xor_register(&xor_block_p5_mmx);
- } else {
- xor_register(&xor_block_8regs);
- xor_register(&xor_block_8regs_p);
- xor_register(&xor_block_32regs);
- xor_register(&xor_block_32regs_p);
- }
-}
-
-#endif /* _ASM_X86_XOR_32_H */
diff --git a/lib/raid/xor/x86/xor-sse.c b/lib/raid/xor/x86/xor-sse.c
new file mode 100644
index 000000000000..0e727ced8b00
--- /dev/null
+++ b/lib/raid/xor/x86/xor-sse.c
@@ -0,0 +1,476 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Optimized XOR parity functions for SSE.
+ *
+ * Cache avoiding checksumming functions utilizing KNI instructions
+ * Copyright (C) 1999 Zach Brown (with obvious credit due Ingo)
+ *
+ * Based on
+ * High-speed RAID5 checksumming functions utilizing SSE instructions.
+ * Copyright (C) 1998 Ingo Molnar.
+ *
+ * x86-64 changes / gcc fixes from Andi Kleen.
+ * Copyright 2002 Andi Kleen, SuSE Labs.
+ */
+#include <linux/raid/xor_impl.h>
+#include <asm/fpu/api.h>
+#include <asm/xor.h>
+
+#ifdef CONFIG_X86_32
+/* reduce register pressure */
+# define XOR_CONSTANT_CONSTRAINT "i"
+#else
+# define XOR_CONSTANT_CONSTRAINT "re"
+#endif
+
+#define OFFS(x) "16*("#x")"
+#define PF_OFFS(x) "256+16*("#x")"
+#define PF0(x) " prefetchnta "PF_OFFS(x)"(%[p1]) ;\n"
+#define LD(x, y) " movaps "OFFS(x)"(%[p1]), %%xmm"#y" ;\n"
+#define ST(x, y) " movaps %%xmm"#y", "OFFS(x)"(%[p1]) ;\n"
+#define PF1(x) " prefetchnta "PF_OFFS(x)"(%[p2]) ;\n"
+#define PF2(x) " prefetchnta "PF_OFFS(x)"(%[p3]) ;\n"
+#define PF3(x) " prefetchnta "PF_OFFS(x)"(%[p4]) ;\n"
+#define PF4(x) " prefetchnta "PF_OFFS(x)"(%[p5]) ;\n"
+#define XO1(x, y) " xorps "OFFS(x)"(%[p2]), %%xmm"#y" ;\n"
+#define XO2(x, y) " xorps "OFFS(x)"(%[p3]), %%xmm"#y" ;\n"
+#define XO3(x, y) " xorps "OFFS(x)"(%[p4]), %%xmm"#y" ;\n"
+#define XO4(x, y) " xorps "OFFS(x)"(%[p5]), %%xmm"#y" ;\n"
+#define NOP(x)
+
+#define BLK64(pf, op, i) \
+ pf(i) \
+ op(i, 0) \
+ op(i + 1, 1) \
+ op(i + 2, 2) \
+ op(i + 3, 3)
+
+static void
+xor_sse_2(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ LD(i, 0) \
+ LD(i + 1, 1) \
+ PF1(i) \
+ PF1(i + 2) \
+ LD(i + 2, 2) \
+ LD(i + 3, 3) \
+ PF0(i + 4) \
+ PF0(i + 6) \
+ XO1(i, 0) \
+ XO1(i + 1, 1) \
+ XO1(i + 2, 2) \
+ XO1(i + 3, 3) \
+ ST(i, 0) \
+ ST(i + 1, 1) \
+ ST(i + 2, 2) \
+ ST(i + 3, 3) \
+
+
+ PF0(0)
+ PF0(2)
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines),
+ [p1] "+r" (p1), [p2] "+r" (p2)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ BLK64(PF0, LD, i) \
+ BLK64(PF1, XO1, i) \
+ BLK64(NOP, ST, i) \
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines),
+ [p1] "+r" (p1), [p2] "+r" (p2)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_3(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ PF1(i) \
+ PF1(i + 2) \
+ LD(i, 0) \
+ LD(i + 1, 1) \
+ LD(i + 2, 2) \
+ LD(i + 3, 3) \
+ PF2(i) \
+ PF2(i + 2) \
+ PF0(i + 4) \
+ PF0(i + 6) \
+ XO1(i, 0) \
+ XO1(i + 1, 1) \
+ XO1(i + 2, 2) \
+ XO1(i + 3, 3) \
+ XO2(i, 0) \
+ XO2(i + 1, 1) \
+ XO2(i + 2, 2) \
+ XO2(i + 3, 3) \
+ ST(i, 0) \
+ ST(i + 1, 1) \
+ ST(i + 2, 2) \
+ ST(i + 3, 3) \
+
+
+ PF0(0)
+ PF0(2)
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines),
+ [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ BLK64(PF0, LD, i) \
+ BLK64(PF1, XO1, i) \
+ BLK64(PF2, XO2, i) \
+ BLK64(NOP, ST, i) \
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines),
+ [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_4(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ PF1(i) \
+ PF1(i + 2) \
+ LD(i, 0) \
+ LD(i + 1, 1) \
+ LD(i + 2, 2) \
+ LD(i + 3, 3) \
+ PF2(i) \
+ PF2(i + 2) \
+ XO1(i, 0) \
+ XO1(i + 1, 1) \
+ XO1(i + 2, 2) \
+ XO1(i + 3, 3) \
+ PF3(i) \
+ PF3(i + 2) \
+ PF0(i + 4) \
+ PF0(i + 6) \
+ XO2(i, 0) \
+ XO2(i + 1, 1) \
+ XO2(i + 2, 2) \
+ XO2(i + 3, 3) \
+ XO3(i, 0) \
+ XO3(i + 1, 1) \
+ XO3(i + 2, 2) \
+ XO3(i + 3, 3) \
+ ST(i, 0) \
+ ST(i + 1, 1) \
+ ST(i + 2, 2) \
+ ST(i + 3, 3) \
+
+
+ PF0(0)
+ PF0(2)
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " add %[inc], %[p4] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines), [p1] "+r" (p1),
+ [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ BLK64(PF0, LD, i) \
+ BLK64(PF1, XO1, i) \
+ BLK64(PF2, XO2, i) \
+ BLK64(PF3, XO3, i) \
+ BLK64(NOP, ST, i) \
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " add %[inc], %[p4] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines), [p1] "+r" (p1),
+ [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_5(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ PF1(i) \
+ PF1(i + 2) \
+ LD(i, 0) \
+ LD(i + 1, 1) \
+ LD(i + 2, 2) \
+ LD(i + 3, 3) \
+ PF2(i) \
+ PF2(i + 2) \
+ XO1(i, 0) \
+ XO1(i + 1, 1) \
+ XO1(i + 2, 2) \
+ XO1(i + 3, 3) \
+ PF3(i) \
+ PF3(i + 2) \
+ XO2(i, 0) \
+ XO2(i + 1, 1) \
+ XO2(i + 2, 2) \
+ XO2(i + 3, 3) \
+ PF4(i) \
+ PF4(i + 2) \
+ PF0(i + 4) \
+ PF0(i + 6) \
+ XO3(i, 0) \
+ XO3(i + 1, 1) \
+ XO3(i + 2, 2) \
+ XO3(i + 3, 3) \
+ XO4(i, 0) \
+ XO4(i + 1, 1) \
+ XO4(i + 2, 2) \
+ XO4(i + 3, 3) \
+ ST(i, 0) \
+ ST(i + 1, 1) \
+ ST(i + 2, 2) \
+ ST(i + 3, 3) \
+
+
+ PF0(0)
+ PF0(2)
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " add %[inc], %[p4] ;\n"
+ " add %[inc], %[p5] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines), [p1] "+r" (p1), [p2] "+r" (p2),
+ [p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+static void
+xor_sse_5_pf64(unsigned long bytes, unsigned long * __restrict p1,
+ const unsigned long * __restrict p2,
+ const unsigned long * __restrict p3,
+ const unsigned long * __restrict p4,
+ const unsigned long * __restrict p5)
+{
+ unsigned long lines = bytes >> 8;
+
+ kernel_fpu_begin();
+
+ asm volatile(
+#undef BLOCK
+#define BLOCK(i) \
+ BLK64(PF0, LD, i) \
+ BLK64(PF1, XO1, i) \
+ BLK64(PF2, XO2, i) \
+ BLK64(PF3, XO3, i) \
+ BLK64(PF4, XO4, i) \
+ BLK64(NOP, ST, i) \
+
+ " .align 32 ;\n"
+ " 1: ;\n"
+
+ BLOCK(0)
+ BLOCK(4)
+ BLOCK(8)
+ BLOCK(12)
+
+ " add %[inc], %[p1] ;\n"
+ " add %[inc], %[p2] ;\n"
+ " add %[inc], %[p3] ;\n"
+ " add %[inc], %[p4] ;\n"
+ " add %[inc], %[p5] ;\n"
+ " dec %[cnt] ;\n"
+ " jnz 1b ;\n"
+ : [cnt] "+r" (lines), [p1] "+r" (p1), [p2] "+r" (p2),
+ [p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
+ : [inc] XOR_CONSTANT_CONSTRAINT (256UL)
+ : "memory");
+
+ kernel_fpu_end();
+}
+
+struct xor_block_template xor_block_sse = {
+ .name = "sse",
+ .do_2 = xor_sse_2,
+ .do_3 = xor_sse_3,
+ .do_4 = xor_sse_4,
+ .do_5 = xor_sse_5,
+};
+
+struct xor_block_template xor_block_sse_pf64 = {
+ .name = "prefetch64-sse",
+ .do_2 = xor_sse_2_pf64,
+ .do_3 = xor_sse_3_pf64,
+ .do_4 = xor_sse_4_pf64,
+ .do_5 = xor_sse_5_pf64,
+};
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:30 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Move the asm/xor.h headers to lib/raid/xor/$(SRCARCH)/xor_arch.h and
include/linux/raid/xor_impl.h to lib/raid/xor/xor_impl.h so that the
xor.ko module implementation is self-contained in lib/raid/.
As this remove the asm-generic mechanism a new kconfig symbol is
added to indicate that a architecture-specific implementations
exists, and xor_arch.h should be included.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/alpha/Kconfig | 1 +
arch/arm/Kconfig | 1 +
arch/arm64/Kconfig | 1 +
arch/loongarch/Kconfig | 1 +
arch/powerpc/Kconfig | 1 +
arch/riscv/Kconfig | 1 +
arch/s390/Kconfig | 1 +
arch/sparc/Kconfig | 1 +
arch/um/Kconfig | 1 +
arch/x86/Kconfig | 1 +
include/asm-generic/Kbuild | 1 -
include/asm-generic/xor.h | 11 -----------
lib/raid/Kconfig | 4 ++++
lib/raid/xor/Makefile | 6 ++++++
lib/raid/xor/alpha/xor.c | 4 ++--
.../asm/xor.h => lib/raid/xor/alpha/xor_arch.h | 2 --
lib/raid/xor/arm/xor-neon-glue.c | 4 ++--
lib/raid/xor/arm/xor-neon.c | 2 +-
lib/raid/xor/arm/xor.c | 4 ++--
.../asm/xor.h => lib/raid/xor/arm/xor_arch.h | 2 --
lib/raid/xor/arm64/xor-neon-glue.c | 4 ++--
lib/raid/xor/arm64/xor-neon.c | 4 ++--
.../asm/xor.h => lib/raid/xor/arm64/xor_arch.h | 3 ---
.../xor.h => lib/raid/xor/loongarch/xor_arch.h | 7 -------
lib/raid/xor/loongarch/xor_simd_glue.c | 4 ++--
.../xor.h => lib/raid/xor/powerpc/xor_arch.h | 7 -------
lib/raid/xor/powerpc/xor_vmx_glue.c | 4 ++--
lib/raid/xor/riscv/xor-glue.c | 4 ++--
.../asm/xor.h => lib/raid/xor/riscv/xor_arch.h | 2 --
lib/raid/xor/s390/xor.c | 4 ++--
.../asm/xor.h => lib/raid/xor/s390/xor_arch.h | 6 ------
lib/raid/xor/sparc/xor-niagara-glue.c | 4 ++--
lib/raid/xor/sparc/xor-sparc32.c | 4 ++--
lib/raid/xor/sparc/xor-vis-glue.c | 4 ++--
.../asm/xor.h => lib/raid/xor/sparc/xor_arch.h | 9 ---------
.../asm/xor.h => lib/raid/xor/um/xor_arch.h | 7 +------
lib/raid/xor/x86/xor-avx.c | 4 ++--
lib/raid/xor/x86/xor-mmx.c | 4 ++--
lib/raid/xor/x86/xor-sse.c | 4 ++--
.../asm/xor.h => lib/raid/xor/x86/xor_arch.h | 7 -------
lib/raid/xor/xor-32regs-prefetch.c | 3 +--
lib/raid/xor/xor-32regs.c | 3 +--
lib/raid/xor/xor-8regs-prefetch.c | 3 +--
lib/raid/xor/xor-8regs.c | 3 +--
lib/raid/xor/xor-core.c | 18 +++++++++++-------
.../linux/raid => lib/raid/xor}/xor_impl.h | 6 ++++++
46 files changed, 73 insertions(+), 109 deletions(-)
delete mode 100644 include/asm-generic/xor.h
rename arch/alpha/include/asm/xor.h => lib/raid/xor/alpha/xor_arch.h (90%)
rename arch/arm/include/asm/xor.h => lib/raid/xor/arm/xor_arch.h (87%)
rename arch/arm64/include/asm/xor.h => lib/raid/xor/arm64/xor_arch.h (89%)
rename arch/loongarch/include/asm/xor.h => lib/raid/xor/loongarch/xor_arch.h (85%)
rename arch/powerpc/include/asm/xor.h => lib/raid/xor/powerpc/xor_arch.h (77%)
rename arch/riscv/include/asm/xor.h => lib/raid/xor/riscv/xor_arch.h (84%)
rename arch/s390/include/asm/xor.h => lib/raid/xor/s390/xor_arch.h (71%)
rename arch/sparc/include/asm/xor.h => lib/raid/xor/sparc/xor_arch.h (81%)
rename arch/um/include/asm/xor.h => lib/raid/xor/um/xor_arch.h (61%)
rename arch/x86/include/asm/xor.h => lib/raid/xor/x86/xor_arch.h (89%)
rename {include/linux/raid => lib/raid/xor}/xor_impl.h (80%)
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 6c7dbf0adad6..8b9d7005bcd5 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -40,6 +40,7 @@ config ALPHA
select MMU_GATHER_NO_RANGE
select MMU_GATHER_RCU_TABLE_FREE
select SPARSEMEM_EXTREME if SPARSEMEM
+ select XOR_BLOCKS_ARCH
select ZONE_DMA
help
The Alpha is a 64-bit general-purpose processor designed and
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ec33376f8e2b..92917231789d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -159,6 +159,7 @@ config ARM
select HAVE_ARCH_VMAP_STACK if MMU && ARM_HAS_GROUP_RELOCS
select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
select USE_OF if !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)
+ select XOR_BLOCKS_ARCH
# Above selects are sorted alphabetically; please add new ones
# according to that. Thanks.
help
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 38dba5f7e4d2..0ee65af90085 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -285,6 +285,7 @@ config ARM64
select USER_STACKTRACE_SUPPORT
select VDSO_GETRANDOM
select VMAP_STACK
+ select XOR_BLOCKS_ARCH
help
ARM 64-bit (AArch64) Linux support.
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index d211c6572b0a..f262583b07a4 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -215,6 +215,7 @@ config LOONGARCH
select USE_PERCPU_NUMA_NODE_ID
select USER_STACKTRACE_SUPPORT
select VDSO_GETRANDOM
+ select XOR_BLOCKS_ARCH
select ZONE_DMA32
config 32BIT
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ad7a2fe63a2a..c28776660246 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -328,6 +328,7 @@ config PPC
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
select VDSO_GETRANDOM
+ select XOR_BLOCKS_ARCH
#
# Please keep this list sorted alphabetically.
#
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 90c531e6abf5..03ac092adb41 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -227,6 +227,7 @@ config RISCV
select UACCESS_MEMCPY if !MMU
select VDSO_GETRANDOM if HAVE_GENERIC_VDSO && 64BIT
select USER_STACKTRACE_SUPPORT
+ select XOR_BLOCKS_ARCH
select ZONE_DMA32 if 64BIT
config RUSTC_SUPPORTS_RISCV
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index edc927d9e85a..163df316ee0e 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -287,6 +287,7 @@ config S390
select VDSO_GETRANDOM
select VIRT_CPU_ACCOUNTING
select VMAP_STACK
+ select XOR_BLOCKS_ARCH
select ZONE_DMA
# Note: keep the above list sorted alphabetically
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 8699be91fca9..fbdc88910de1 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -50,6 +50,7 @@ config SPARC
select NEED_DMA_MAP_STATE
select NEED_SG_DMA_LENGTH
select TRACE_IRQFLAGS_SUPPORT
+ select XOR_BLOCKS_ARCH
config SPARC32
def_bool !64BIT
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 098cda44db22..77f752fc72d5 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -43,6 +43,7 @@ config UML
select THREAD_INFO_IN_TASK
select SPARSE_IRQ
select MMU_GATHER_RCU_TABLE_FREE
+ select XOR_BLOCKS_ARCH
config MMU
bool
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e2df1b147184..19783304e34c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -336,6 +336,7 @@ config X86
select ARCH_SUPPORTS_SCHED_CLUSTER if SMP
select ARCH_SUPPORTS_SCHED_MC if SMP
select HAVE_SINGLE_FTRACE_DIRECT_OPS if X86_64 && DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+ select XOR_BLOCKS_ARCH
config INSTRUCTION_DECODER
def_bool y
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 9aff61e7b8f2..2c53a1e0b760 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -65,4 +65,3 @@ mandatory-y += vermagic.h
mandatory-y += vga.h
mandatory-y += video.h
mandatory-y += word-at-a-time.h
-mandatory-y += xor.h
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h
deleted file mode 100644
index fc151fdc45ab..000000000000
--- a/include/asm-generic/xor.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * include/asm-generic/xor.h
- *
- * Generic optimized RAID-5 checksumming functions.
- */
-
-extern struct xor_block_template xor_block_8regs;
-extern struct xor_block_template xor_block_32regs;
-extern struct xor_block_template xor_block_8regs_p;
-extern struct xor_block_template xor_block_32regs_p;
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
index 4b720f3454a2..dfa73530848e 100644
--- a/lib/raid/Kconfig
+++ b/lib/raid/Kconfig
@@ -1,3 +1,7 @@
config XOR_BLOCKS
tristate
+
+# selected by architectures that provide an optimized XOR implementation
+config XOR_BLOCKS_ARCH
+ bool
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
index eeda2610f7e7..447471b100b1 100644
--- a/lib/raid/xor/Makefile
+++ b/lib/raid/xor/Makefile
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+ccflags-y += -I $(src)
+
obj-$(CONFIG_XOR_BLOCKS) += xor.o
xor-y += xor-core.o
@@ -8,6 +10,10 @@ xor-y += xor-32regs.o
xor-y += xor-8regs-prefetch.o
xor-y += xor-32regs-prefetch.o
+ifeq ($(CONFIG_XOR_BLOCKS_ARCH),y)
+CFLAGS_xor-core.o += -I$(src)/$(SRCARCH)
+endif
+
xor-$(CONFIG_ALPHA) += alpha/xor.o
xor-$(CONFIG_ARM) += arm/xor.o
ifeq ($(CONFIG_ARM),y)
diff --git a/lib/raid/xor/alpha/xor.c b/lib/raid/xor/alpha/xor.c
index 0964ac420604..90694cc47395 100644
--- a/lib/raid/xor/alpha/xor.c
+++ b/lib/raid/xor/alpha/xor.c
@@ -2,8 +2,8 @@
/*
* Optimized XOR parity functions for alpha EV5 and EV6
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
extern void
xor_alpha_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/arch/alpha/include/asm/xor.h b/lib/raid/xor/alpha/xor_arch.h
similarity index 90%
rename from arch/alpha/include/asm/xor.h
rename to lib/raid/xor/alpha/xor_arch.h
index e517be577a09..0dcfea578a48 100644
--- a/arch/alpha/include/asm/xor.h
+++ b/lib/raid/xor/alpha/xor_arch.h
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <asm/special_insns.h>
-#include <asm-generic/xor.h>
extern struct xor_block_template xor_block_alpha;
extern struct xor_block_template xor_block_alpha_prefetch;
@@ -10,7 +9,6 @@ extern struct xor_block_template xor_block_alpha_prefetch;
* Force the use of alpha_prefetch if EV6, as it is significantly faster in the
* cold cache case.
*/
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
if (implver() == IMPLVER_EV6) {
diff --git a/lib/raid/xor/arm/xor-neon-glue.c b/lib/raid/xor/arm/xor-neon-glue.c
index c7b162b383a2..7afd6294464b 100644
--- a/lib/raid/xor/arm/xor-neon-glue.c
+++ b/lib/raid/xor/arm/xor-neon-glue.c
@@ -2,8 +2,8 @@
/*
* Copyright (C) 2001 Russell King
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
extern struct xor_block_template const xor_block_neon_inner;
diff --git a/lib/raid/xor/arm/xor-neon.c b/lib/raid/xor/arm/xor-neon.c
index c9d4378b0f0e..806a42c5952c 100644
--- a/lib/raid/xor/arm/xor-neon.c
+++ b/lib/raid/xor/arm/xor-neon.c
@@ -3,7 +3,7 @@
* Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
*/
-#include <linux/raid/xor_impl.h>
+#include "xor_impl.h"
#ifndef __ARM_NEON__
#error You should compile this file with '-march=armv7-a -mfloat-abi=softfp -mfpu=neon'
diff --git a/lib/raid/xor/arm/xor.c b/lib/raid/xor/arm/xor.c
index 2263341dbbcd..5bd5f048bbe9 100644
--- a/lib/raid/xor/arm/xor.c
+++ b/lib/raid/xor/arm/xor.c
@@ -2,8 +2,8 @@
/*
* Copyright (C) 2001 Russell King
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#define __XOR(a1, a2) a1 ^= a2
diff --git a/arch/arm/include/asm/xor.h b/lib/raid/xor/arm/xor_arch.h
similarity index 87%
rename from arch/arm/include/asm/xor.h
rename to lib/raid/xor/arm/xor_arch.h
index 989c55872ef6..5a7eedb48fbb 100644
--- a/arch/arm/include/asm/xor.h
+++ b/lib/raid/xor/arm/xor_arch.h
@@ -2,13 +2,11 @@
/*
* Copyright (C) 2001 Russell King
*/
-#include <asm-generic/xor.h>
#include <asm/neon.h>
extern struct xor_block_template xor_block_arm4regs;
extern struct xor_block_template xor_block_neon;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_arm4regs);
diff --git a/lib/raid/xor/arm64/xor-neon-glue.c b/lib/raid/xor/arm64/xor-neon-glue.c
index 08c3e3573388..3db0a318cf5b 100644
--- a/lib/raid/xor/arm64/xor-neon-glue.c
+++ b/lib/raid/xor/arm64/xor-neon-glue.c
@@ -4,9 +4,9 @@
* Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
*/
-#include <linux/raid/xor_impl.h>
#include <asm/simd.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#include "xor-neon.h"
#define XOR_TEMPLATE(_name) \
diff --git a/lib/raid/xor/arm64/xor-neon.c b/lib/raid/xor/arm64/xor-neon.c
index 61194c292917..61f00c4fee49 100644
--- a/lib/raid/xor/arm64/xor-neon.c
+++ b/lib/raid/xor/arm64/xor-neon.c
@@ -4,10 +4,10 @@
* Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
*/
-#include <linux/raid/xor_impl.h>
#include <linux/cache.h>
#include <asm/neon-intrinsics.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#include "xor-neon.h"
void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/arch/arm64/include/asm/xor.h b/lib/raid/xor/arm64/xor_arch.h
similarity index 89%
rename from arch/arm64/include/asm/xor.h
rename to lib/raid/xor/arm64/xor_arch.h
index 4782c760bcac..5dbb40319501 100644
--- a/arch/arm64/include/asm/xor.h
+++ b/lib/raid/xor/arm64/xor_arch.h
@@ -3,14 +3,11 @@
* Authors: Jackie Liu <liuyun01@kylinos.cn>
* Copyright (C) 2018,Tianjin KYLIN Information Technology Co., Ltd.
*/
-
-#include <asm-generic/xor.h>
#include <asm/simd.h>
extern struct xor_block_template xor_block_neon;
extern struct xor_block_template xor_block_eor3;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_8regs);
diff --git a/arch/loongarch/include/asm/xor.h b/lib/raid/xor/loongarch/xor_arch.h
similarity index 85%
rename from arch/loongarch/include/asm/xor.h
rename to lib/raid/xor/loongarch/xor_arch.h
index 7e32f72f8b03..fe5e8244fd0e 100644
--- a/arch/loongarch/include/asm/xor.h
+++ b/lib/raid/xor/loongarch/xor_arch.h
@@ -2,9 +2,6 @@
/*
* Copyright (C) 2023 WANG Xuerui <git@xen0n.name>
*/
-#ifndef _ASM_LOONGARCH_XOR_H
-#define _ASM_LOONGARCH_XOR_H
-
#include <asm/cpu-features.h>
/*
@@ -15,12 +12,10 @@
* the scalar ones, maybe for errata or micro-op reasons. It may be
* appropriate to revisit this after one or two more uarch generations.
*/
-#include <asm-generic/xor.h>
extern struct xor_block_template xor_block_lsx;
extern struct xor_block_template xor_block_lasx;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_8regs);
@@ -36,5 +31,3 @@ static __always_inline void __init arch_xor_init(void)
xor_register(&xor_block_lasx);
#endif
}
-
-#endif /* _ASM_LOONGARCH_XOR_H */
diff --git a/lib/raid/xor/loongarch/xor_simd_glue.c b/lib/raid/xor/loongarch/xor_simd_glue.c
index 11fa3b47ba83..b387aa0213b4 100644
--- a/lib/raid/xor/loongarch/xor_simd_glue.c
+++ b/lib/raid/xor/loongarch/xor_simd_glue.c
@@ -6,9 +6,9 @@
*/
#include <linux/sched.h>
-#include <linux/raid/xor_impl.h>
#include <asm/fpu.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#include "xor_simd.h"
#define MAKE_XOR_GLUE_2(flavor) \
diff --git a/arch/powerpc/include/asm/xor.h b/lib/raid/xor/powerpc/xor_arch.h
similarity index 77%
rename from arch/powerpc/include/asm/xor.h
rename to lib/raid/xor/powerpc/xor_arch.h
index 3293ac87181c..3b00a4a2fd67 100644
--- a/arch/powerpc/include/asm/xor.h
+++ b/lib/raid/xor/powerpc/xor_arch.h
@@ -5,15 +5,10 @@
*
* Author: Anton Blanchard <anton@au.ibm.com>
*/
-#ifndef _ASM_POWERPC_XOR_H
-#define _ASM_POWERPC_XOR_H
-
#include <asm/cpu_has_feature.h>
-#include <asm-generic/xor.h>
extern struct xor_block_template xor_block_altivec;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_8regs);
@@ -25,5 +20,3 @@ static __always_inline void __init arch_xor_init(void)
xor_register(&xor_block_altivec);
#endif
}
-
-#endif /* _ASM_POWERPC_XOR_H */
diff --git a/lib/raid/xor/powerpc/xor_vmx_glue.c b/lib/raid/xor/powerpc/xor_vmx_glue.c
index c41e38340700..56e99ddfb64f 100644
--- a/lib/raid/xor/powerpc/xor_vmx_glue.c
+++ b/lib/raid/xor/powerpc/xor_vmx_glue.c
@@ -7,9 +7,9 @@
#include <linux/preempt.h>
#include <linux/sched.h>
-#include <linux/raid/xor_impl.h>
#include <asm/switch_to.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#include "xor_vmx.h"
static void xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/riscv/xor-glue.c b/lib/raid/xor/riscv/xor-glue.c
index 11666a4b6b68..060e5f22ebcc 100644
--- a/lib/raid/xor/riscv/xor-glue.c
+++ b/lib/raid/xor/riscv/xor-glue.c
@@ -3,11 +3,11 @@
* Copyright (C) 2021 SiFive
*/
-#include <linux/raid/xor_impl.h>
#include <asm/vector.h>
#include <asm/switch_to.h>
#include <asm/asm-prototypes.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
static void xor_vector_2(unsigned long bytes, unsigned long *__restrict p1,
const unsigned long *__restrict p2)
diff --git a/arch/riscv/include/asm/xor.h b/lib/raid/xor/riscv/xor_arch.h
similarity index 84%
rename from arch/riscv/include/asm/xor.h
rename to lib/raid/xor/riscv/xor_arch.h
index 614d9209d078..9240857d760b 100644
--- a/arch/riscv/include/asm/xor.h
+++ b/lib/raid/xor/riscv/xor_arch.h
@@ -3,11 +3,9 @@
* Copyright (C) 2021 SiFive
*/
#include <asm/vector.h>
-#include <asm-generic/xor.h>
extern struct xor_block_template xor_block_rvv;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_8regs);
diff --git a/lib/raid/xor/s390/xor.c b/lib/raid/xor/s390/xor.c
index 2d5e33eca2a8..48b8cdc684a3 100644
--- a/lib/raid/xor/s390/xor.c
+++ b/lib/raid/xor/s390/xor.c
@@ -7,8 +7,8 @@
*/
#include <linux/types.h>
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
static void xor_xc_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2)
diff --git a/arch/s390/include/asm/xor.h b/lib/raid/xor/s390/xor_arch.h
similarity index 71%
rename from arch/s390/include/asm/xor.h
rename to lib/raid/xor/s390/xor_arch.h
index 4e2233f64da9..4a233ed2b97a 100644
--- a/arch/s390/include/asm/xor.h
+++ b/lib/raid/xor/s390/xor_arch.h
@@ -5,15 +5,9 @@
* Copyright IBM Corp. 2016
* Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
*/
-#ifndef _ASM_S390_XOR_H
-#define _ASM_S390_XOR_H
-
extern struct xor_block_template xor_block_xc;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_force(&xor_block_xc);
}
-
-#endif /* _ASM_S390_XOR_H */
diff --git a/lib/raid/xor/sparc/xor-niagara-glue.c b/lib/raid/xor/sparc/xor-niagara-glue.c
index 5087e63ac130..92d4712c65e1 100644
--- a/lib/raid/xor/sparc/xor-niagara-glue.c
+++ b/lib/raid/xor/sparc/xor-niagara-glue.c
@@ -6,8 +6,8 @@
* Copyright (C) 2006 David S. Miller <davem@davemloft.net>
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
void xor_niagara_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2);
diff --git a/lib/raid/xor/sparc/xor-sparc32.c b/lib/raid/xor/sparc/xor-sparc32.c
index b65a75a6e59d..307c4a84f535 100644
--- a/lib/raid/xor/sparc/xor-sparc32.c
+++ b/lib/raid/xor/sparc/xor-sparc32.c
@@ -5,8 +5,8 @@
*
* Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz)
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
static void
sparc_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/sparc/xor-vis-glue.c b/lib/raid/xor/sparc/xor-vis-glue.c
index 73e5b293d0c9..1c0977e85f53 100644
--- a/lib/raid/xor/sparc/xor-vis-glue.c
+++ b/lib/raid/xor/sparc/xor-vis-glue.c
@@ -6,8 +6,8 @@
* Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
*/
-#include <linux/raid/xor_impl.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
void xor_vis_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2);
diff --git a/arch/sparc/include/asm/xor.h b/lib/raid/xor/sparc/xor_arch.h
similarity index 81%
rename from arch/sparc/include/asm/xor.h
rename to lib/raid/xor/sparc/xor_arch.h
index f923b009fc24..af288abe4e91 100644
--- a/arch/sparc/include/asm/xor.h
+++ b/lib/raid/xor/sparc/xor_arch.h
@@ -3,16 +3,12 @@
* Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz)
* Copyright (C) 2006 David S. Miller <davem@davemloft.net>
*/
-#ifndef ___ASM_SPARC_XOR_H
-#define ___ASM_SPARC_XOR_H
-
#if defined(__sparc__) && defined(__arch64__)
#include <asm/spitfire.h>
extern struct xor_block_template xor_block_VIS;
extern struct xor_block_template xor_block_niagara;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
/* Force VIS for everything except Niagara. */
@@ -28,12 +24,8 @@ static __always_inline void __init arch_xor_init(void)
}
#else /* sparc64 */
-/* For grins, also test the generic routines. */
-#include <asm-generic/xor.h>
-
extern struct xor_block_template xor_block_SPARC;
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_8regs);
@@ -41,4 +33,3 @@ static __always_inline void __init arch_xor_init(void)
xor_register(&xor_block_SPARC);
}
#endif /* !sparc64 */
-#endif /* ___ASM_SPARC_XOR_H */
diff --git a/arch/um/include/asm/xor.h b/lib/raid/xor/um/xor_arch.h
similarity index 61%
rename from arch/um/include/asm/xor.h
rename to lib/raid/xor/um/xor_arch.h
index c9ddedc19301..c75cd9caf792 100644
--- a/arch/um/include/asm/xor.h
+++ b/lib/raid/xor/um/xor_arch.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_UM_XOR_H
-#define _ASM_UM_XOR_H
-
#ifdef CONFIG_64BIT
#undef CONFIG_X86_32
#else
@@ -9,6 +6,4 @@
#endif
#include <asm/cpufeature.h>
-#include <../../x86/include/asm/xor.h>
-
-#endif
+#include <../x86/xor_arch.h>
diff --git a/lib/raid/xor/x86/xor-avx.c b/lib/raid/xor/x86/xor-avx.c
index b49cb5199e70..d411efa1ff43 100644
--- a/lib/raid/xor/x86/xor-avx.c
+++ b/lib/raid/xor/x86/xor-avx.c
@@ -8,9 +8,9 @@
* Based on Ingo Molnar and Zach Brown's respective MMX and SSE routines
*/
#include <linux/compiler.h>
-#include <linux/raid/xor_impl.h>
#include <asm/fpu/api.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#define BLOCK4(i) \
BLOCK(32 * i, 0) \
diff --git a/lib/raid/xor/x86/xor-mmx.c b/lib/raid/xor/x86/xor-mmx.c
index cf0fafea33b7..e48c58f92874 100644
--- a/lib/raid/xor/x86/xor-mmx.c
+++ b/lib/raid/xor/x86/xor-mmx.c
@@ -4,9 +4,9 @@
*
* Copyright (C) 1998 Ingo Molnar.
*/
-#include <linux/raid/xor_impl.h>
#include <asm/fpu/api.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#define LD(x, y) " movq 8*("#x")(%1), %%mm"#y" ;\n"
#define ST(x, y) " movq %%mm"#y", 8*("#x")(%1) ;\n"
diff --git a/lib/raid/xor/x86/xor-sse.c b/lib/raid/xor/x86/xor-sse.c
index 0e727ced8b00..5993ed688c15 100644
--- a/lib/raid/xor/x86/xor-sse.c
+++ b/lib/raid/xor/x86/xor-sse.c
@@ -12,9 +12,9 @@
* x86-64 changes / gcc fixes from Andi Kleen.
* Copyright 2002 Andi Kleen, SuSE Labs.
*/
-#include <linux/raid/xor_impl.h>
#include <asm/fpu/api.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
+#include "xor_arch.h"
#ifdef CONFIG_X86_32
/* reduce register pressure */
diff --git a/arch/x86/include/asm/xor.h b/lib/raid/xor/x86/xor_arch.h
similarity index 89%
rename from arch/x86/include/asm/xor.h
rename to lib/raid/xor/x86/xor_arch.h
index d1aab8275908..99fe85a213c6 100644
--- a/arch/x86/include/asm/xor.h
+++ b/lib/raid/xor/x86/xor_arch.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef _ASM_X86_XOR_H
-#define _ASM_X86_XOR_H
-
#include <asm/cpufeature.h>
-#include <asm-generic/xor.h>
extern struct xor_block_template xor_block_pII_mmx;
extern struct xor_block_template xor_block_p5_mmx;
@@ -20,7 +16,6 @@ extern struct xor_block_template xor_block_avx;
*
* 32-bit without MMX can fall back to the generic routines.
*/
-#define arch_xor_init arch_xor_init
static __always_inline void __init arch_xor_init(void)
{
if (boot_cpu_has(X86_FEATURE_AVX) &&
@@ -39,5 +34,3 @@ static __always_inline void __init arch_xor_init(void)
xor_register(&xor_block_32regs_p);
}
}
-
-#endif /* _ASM_X86_XOR_H */
diff --git a/lib/raid/xor/xor-32regs-prefetch.c b/lib/raid/xor/xor-32regs-prefetch.c
index 8666c287f777..2856a8e50cb8 100644
--- a/lib/raid/xor/xor-32regs-prefetch.c
+++ b/lib/raid/xor/xor-32regs-prefetch.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <linux/prefetch.h>
-#include <linux/raid/xor_impl.h>
-#include <asm-generic/xor.h>
+#include "xor_impl.h"
static void
xor_32regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/xor-32regs.c b/lib/raid/xor/xor-32regs.c
index 58d4fac43eb4..cc44d64032fa 100644
--- a/lib/raid/xor/xor-32regs.c
+++ b/lib/raid/xor/xor-32regs.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-#include <linux/raid/xor_impl.h>
-#include <asm-generic/xor.h>
+#include "xor_impl.h"
static void
xor_32regs_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/xor-8regs-prefetch.c b/lib/raid/xor/xor-8regs-prefetch.c
index 67061e35a0a6..1d53aec50d27 100644
--- a/lib/raid/xor/xor-8regs-prefetch.c
+++ b/lib/raid/xor/xor-8regs-prefetch.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <linux/prefetch.h>
-#include <linux/raid/xor_impl.h>
-#include <asm-generic/xor.h>
+#include "xor_impl.h"
static void
xor_8regs_p_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/xor-8regs.c b/lib/raid/xor/xor-8regs.c
index 769f796ab2cf..72a44e898c55 100644
--- a/lib/raid/xor/xor-8regs.c
+++ b/lib/raid/xor/xor-8regs.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-#include <linux/raid/xor_impl.h>
-#include <asm-generic/xor.h>
+#include "xor_impl.h"
static void
xor_8regs_2(unsigned long bytes, unsigned long * __restrict p1,
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index 3b53c70ba615..8dda4055ad09 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -9,10 +9,9 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/raid/xor.h>
-#include <linux/raid/xor_impl.h>
#include <linux/jiffies.h>
#include <linux/preempt.h>
-#include <asm/xor.h>
+#include "xor_impl.h"
/* The xor routines to use. */
static struct xor_block_template *active_template;
@@ -141,16 +140,21 @@ static int __init calibrate_xor_blocks(void)
return 0;
}
-static int __init xor_init(void)
-{
-#ifdef arch_xor_init
- arch_xor_init();
+#ifdef CONFIG_XOR_BLOCKS_ARCH
+#include "xor_arch.h" /* $SRCARCH/xor_arch.h */
#else
+static void __init arch_xor_init(void)
+{
xor_register(&xor_block_8regs);
xor_register(&xor_block_8regs_p);
xor_register(&xor_block_32regs);
xor_register(&xor_block_32regs_p);
-#endif
+}
+#endif /* CONFIG_XOR_BLOCKS_ARCH */
+
+static int __init xor_init(void)
+{
+ arch_xor_init();
/*
* If this arch/cpu has a short-circuited selection, don't loop through
diff --git a/include/linux/raid/xor_impl.h b/lib/raid/xor/xor_impl.h
similarity index 80%
rename from include/linux/raid/xor_impl.h
rename to lib/raid/xor/xor_impl.h
index 6ed4c445ab24..44b6c99e2093 100644
--- a/include/linux/raid/xor_impl.h
+++ b/lib/raid/xor/xor_impl.h
@@ -24,6 +24,12 @@ struct xor_block_template {
const unsigned long * __restrict);
};
+/* generic implementations */
+extern struct xor_block_template xor_block_8regs;
+extern struct xor_block_template xor_block_32regs;
+extern struct xor_block_template xor_block_8regs_p;
+extern struct xor_block_template xor_block_32regs_p;
+
void __init xor_register(struct xor_block_template *tmpl);
void __init xor_force(struct xor_block_template *tmpl);
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:32 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | Currently the high-level xor code chunks up all operations into small
units for only up to 1 + 4 vectors, and passes it to four different
methods. This means the FPU/vector context is entered and left a lot
for wide stripes, and a lot of indirect expensive indirect calls are
performed. Switch to passing the entire gen_xor request to the
low-level ops, and provide a macro to dispatch it to the existing
helper.
This reduce the number of indirect calls and FPU/vector context switches
by a factor approaching nr_stripes / 4, and also reduces source and
binary code size.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/raid/xor.h | 5 --
lib/raid/xor/alpha/xor.c | 19 ++++----
lib/raid/xor/arm/xor-neon-glue.c | 49 ++------------------
lib/raid/xor/arm/xor-neon.c | 9 +---
lib/raid/xor/arm/xor.c | 10 ++--
lib/raid/xor/arm/xor_arch.h | 3 ++
lib/raid/xor/arm64/xor-neon-glue.c | 44 ++----------------
lib/raid/xor/arm64/xor-neon.c | 20 +++++---
lib/raid/xor/arm64/xor-neon.h | 32 ++-----------
lib/raid/xor/loongarch/xor_simd_glue.c | 62 +++++--------------------
lib/raid/xor/powerpc/xor_vmx.c | 40 ++++++++--------
lib/raid/xor/powerpc/xor_vmx.h | 16 +------
lib/raid/xor/powerpc/xor_vmx_glue.c | 49 ++------------------
lib/raid/xor/riscv/xor-glue.c | 43 +++--------------
lib/raid/xor/s390/xor.c | 9 ++--
lib/raid/xor/sparc/xor-niagara-glue.c | 10 ++--
lib/raid/xor/sparc/xor-sparc32.c | 9 ++--
lib/raid/xor/sparc/xor-vis-glue.c | 9 ++--
lib/raid/xor/x86/xor-avx.c | 29 ++++--------
lib/raid/xor/x86/xor-mmx.c | 64 ++++++++++----------------
lib/raid/xor/x86/xor-sse.c | 63 +++++++++----------------
lib/raid/xor/xor-32regs-prefetch.c | 10 ++--
lib/raid/xor/xor-32regs.c | 9 ++--
lib/raid/xor/xor-8regs-prefetch.c | 11 +++--
lib/raid/xor/xor-8regs.c | 9 ++--
lib/raid/xor/xor-core.c | 47 ++-----------------
lib/raid/xor/xor_impl.h | 48 +++++++++++++------
27 files changed, 224 insertions(+), 504 deletions(-)
diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h
index 4735a4e960f9..11620d5f5b93 100644
--- a/include/linux/raid/xor.h
+++ b/include/linux/raid/xor.h
@@ -2,11 +2,6 @@
#ifndef _XOR_H
#define _XOR_H
-#define MAX_XOR_BLOCKS 4
-
-extern void xor_blocks(unsigned int count, unsigned int bytes,
- void *dest, void **srcs);
-
void xor_gen(void *dest, void **srcss, unsigned int src_cnt,
unsigned int bytes);
diff --git a/lib/raid/xor/alpha/xor.c b/lib/raid/xor/alpha/xor.c
index 90694cc47395..a8f72f2dd3a5 100644
--- a/lib/raid/xor/alpha/xor.c
+++ b/lib/raid/xor/alpha/xor.c
@@ -832,18 +832,17 @@ xor_alpha_prefetch_5: \n\
.end xor_alpha_prefetch_5 \n\
");
+DO_XOR_BLOCKS(alpha, xor_alpha_2, xor_alpha_3, xor_alpha_4, xor_alpha_5);
+
struct xor_block_template xor_block_alpha = {
- .name = "alpha",
- .do_2 = xor_alpha_2,
- .do_3 = xor_alpha_3,
- .do_4 = xor_alpha_4,
- .do_5 = xor_alpha_5,
+ .name = "alpha",
+ .xor_gen = xor_gen_alpha,
};
+DO_XOR_BLOCKS(alpha_prefetch, xor_alpha_prefetch_2, xor_alpha_prefetch_3,
+ xor_alpha_prefetch_4, xor_alpha_prefetch_5);
+
struct xor_block_template xor_block_alpha_prefetch = {
- .name = "alpha prefetch",
- .do_2 = xor_alpha_prefetch_2,
- .do_3 = xor_alpha_prefetch_3,
- .do_4 = xor_alpha_prefetch_4,
- .do_5 = xor_alpha_prefetch_5,
+ .name = "alpha prefetch",
+ .xor_gen = xor_gen_alpha_prefetch,
};
diff --git a/lib/raid/xor/arm/xor-neon-glue.c b/lib/raid/xor/arm/xor-neon-glue.c
index 7afd6294464b..cea39e019904 100644
--- a/lib/raid/xor/arm/xor-neon-glue.c
+++ b/lib/raid/xor/arm/xor-neon-glue.c
@@ -5,54 +5,15 @@
#include "xor_impl.h"
#include "xor_arch.h"
-extern struct xor_block_template const xor_block_neon_inner;
-
-static void
-xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_2(bytes, p1, p2);
- kernel_neon_end();
-}
-
-static void
-xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_3(bytes, p1, p2, p3);
- kernel_neon_end();
-}
-
-static void
-xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- kernel_neon_begin();
- xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
- kernel_neon_end();
-}
-
-static void
-xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
+static void xor_gen_neon(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
{
kernel_neon_begin();
- xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
+ xor_gen_neon_inner(dest, srcs, src_cnt, bytes);
kernel_neon_end();
}
struct xor_block_template xor_block_neon = {
- .name = "neon",
- .do_2 = xor_neon_2,
- .do_3 = xor_neon_3,
- .do_4 = xor_neon_4,
- .do_5 = xor_neon_5
+ .name = "neon",
+ .xor_gen = xor_gen_neon,
};
diff --git a/lib/raid/xor/arm/xor-neon.c b/lib/raid/xor/arm/xor-neon.c
index 806a42c5952c..23147e3a7904 100644
--- a/lib/raid/xor/arm/xor-neon.c
+++ b/lib/raid/xor/arm/xor-neon.c
@@ -4,6 +4,7 @@
*/
#include "xor_impl.h"
+#include "xor_arch.h"
#ifndef __ARM_NEON__
#error You should compile this file with '-march=armv7-a -mfloat-abi=softfp -mfpu=neon'
@@ -22,10 +23,4 @@
#define NO_TEMPLATE
#include "../xor-8regs.c"
-struct xor_block_template const xor_block_neon_inner = {
- .name = "__inner_neon__",
- .do_2 = xor_8regs_2,
- .do_3 = xor_8regs_3,
- .do_4 = xor_8regs_4,
- .do_5 = xor_8regs_5,
-};
+__DO_XOR_BLOCKS(neon_inner, xor_8regs_2, xor_8regs_3, xor_8regs_4, xor_8regs_5);
diff --git a/lib/raid/xor/arm/xor.c b/lib/raid/xor/arm/xor.c
index 5bd5f048bbe9..45139b6c55ea 100644
--- a/lib/raid/xor/arm/xor.c
+++ b/lib/raid/xor/arm/xor.c
@@ -127,10 +127,10 @@ xor_arm4regs_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines);
}
+DO_XOR_BLOCKS(arm4regs, xor_arm4regs_2, xor_arm4regs_3, xor_arm4regs_4,
+ xor_arm4regs_5);
+
struct xor_block_template xor_block_arm4regs = {
- .name = "arm4regs",
- .do_2 = xor_arm4regs_2,
- .do_3 = xor_arm4regs_3,
- .do_4 = xor_arm4regs_4,
- .do_5 = xor_arm4regs_5,
+ .name = "arm4regs",
+ .xor_gen = xor_gen_arm4regs,
};
diff --git a/lib/raid/xor/arm/xor_arch.h b/lib/raid/xor/arm/xor_arch.h
index 5a7eedb48fbb..775ff835df65 100644
--- a/lib/raid/xor/arm/xor_arch.h
+++ b/lib/raid/xor/arm/xor_arch.h
@@ -7,6 +7,9 @@
extern struct xor_block_template xor_block_arm4regs;
extern struct xor_block_template xor_block_neon;
+void xor_gen_neon_inner(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
+
static __always_inline void __init arch_xor_init(void)
{
xor_register(&xor_block_arm4regs);
diff --git a/lib/raid/xor/arm64/xor-neon-glue.c b/lib/raid/xor/arm64/xor-neon-glue.c
index 3db0a318cf5b..f0284f86feb4 100644
--- a/lib/raid/xor/arm64/xor-neon-glue.c
+++ b/lib/raid/xor/arm64/xor-neon-glue.c
@@ -10,50 +10,16 @@
#include "xor-neon.h"
#define XOR_TEMPLATE(_name) \
-static void \
-xor_##_name##_2(unsigned long bytes, unsigned long * __restrict p1, \
- const unsigned long * __restrict p2) \
+static void xor_gen_##_name(void *dest, void **srcs, unsigned int src_cnt, \
+ unsigned int bytes) \
{ \
scoped_ksimd() \
- __xor_##_name##_2(bytes, p1, p2); \
-} \
- \
-static void \
-xor_##_name##_3(unsigned long bytes, unsigned long * __restrict p1, \
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3) \
-{ \
- scoped_ksimd() \
- __xor_##_name##_3(bytes, p1, p2, p3); \
-} \
- \
-static void \
-xor_##_name##_4(unsigned long bytes, unsigned long * __restrict p1, \
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3, \
- const unsigned long * __restrict p4) \
-{ \
- scoped_ksimd() \
- __xor_##_name##_4(bytes, p1, p2, p3, p4); \
-} \
- \
-static void \
-xor_##_name##_5(unsigned long bytes, unsigned long * __restrict p1, \
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3, \
- const unsigned long * __restrict p4, \
- const unsigned long * __restrict p5) \
-{ \
- scoped_ksimd() \
- __xor_##_name##_5(bytes, p1, p2, p3, p4, p5); \
+ xor_gen_##_name##_inner(dest, srcs, src_cnt, bytes); \
} \
\
struct xor_block_template xor_block_##_name = { \
- .name = __stringify(_name), \
- .do_2 = xor_##_name##_2, \
- .do_3 = xor_##_name##_3, \
- .do_4 = xor_##_name##_4, \
- .do_5 = xor_##_name##_5 \
+ .name = __stringify(_name), \
+ .xor_gen = xor_gen_##_name, \
};
XOR_TEMPLATE(neon);
diff --git a/lib/raid/xor/arm64/xor-neon.c b/lib/raid/xor/arm64/xor-neon.c
index 61f00c4fee49..97ef3cb92496 100644
--- a/lib/raid/xor/arm64/xor-neon.c
+++ b/lib/raid/xor/arm64/xor-neon.c
@@ -10,7 +10,7 @@
#include "xor_arch.h"
#include "xor-neon.h"
-void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2)
{
uint64_t *dp1 = (uint64_t *)p1;
@@ -37,7 +37,7 @@ void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3)
{
@@ -73,7 +73,7 @@ void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3,
const unsigned long * __restrict p4)
@@ -118,7 +118,7 @@ void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3,
const unsigned long * __restrict p4,
@@ -172,6 +172,9 @@ void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
+__DO_XOR_BLOCKS(neon_inner, __xor_neon_2, __xor_neon_3, __xor_neon_4,
+ __xor_neon_5);
+
static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r)
{
uint64x2_t res;
@@ -182,7 +185,7 @@ static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r)
return res;
}
-void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3)
{
@@ -216,7 +219,7 @@ void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3,
const unsigned long * __restrict p4)
@@ -259,7 +262,7 @@ void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
-void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
+static void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p2,
const unsigned long * __restrict p3,
const unsigned long * __restrict p4,
@@ -304,3 +307,6 @@ void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
dp5 += 8;
} while (--lines > 0);
}
+
+__DO_XOR_BLOCKS(eor3_inner, __xor_neon_2, __xor_eor3_3, __xor_eor3_4,
+ __xor_eor3_5);
diff --git a/lib/raid/xor/arm64/xor-neon.h b/lib/raid/xor/arm64/xor-neon.h
index cec0ac846fea..514699ba8f5f 100644
--- a/lib/raid/xor/arm64/xor-neon.h
+++ b/lib/raid/xor/arm64/xor-neon.h
@@ -1,30 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
-
-#define __xor_eor3_2 __xor_neon_2
-void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
+void xor_gen_neon_inner(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
+void xor_gen_eor3_inner(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
diff --git a/lib/raid/xor/loongarch/xor_simd_glue.c b/lib/raid/xor/loongarch/xor_simd_glue.c
index b387aa0213b4..7f324d924f87 100644
--- a/lib/raid/xor/loongarch/xor_simd_glue.c
+++ b/lib/raid/xor/loongarch/xor_simd_glue.c
@@ -11,63 +11,23 @@
#include "xor_arch.h"
#include "xor_simd.h"
-#define MAKE_XOR_GLUE_2(flavor) \
-static void xor_##flavor##_2(unsigned long bytes, unsigned long * __restrict p1,\
- const unsigned long * __restrict p2) \
+#define MAKE_XOR_GLUES(flavor) \
+DO_XOR_BLOCKS(flavor##_inner, __xor_##flavor##_2, __xor_##flavor##_3, \
+ __xor_##flavor##_4, __xor_##flavor##_5); \
+ \
+static void xor_gen_##flavor(void *dest, void **srcs, unsigned int src_cnt, \
+ unsigned int bytes) \
{ \
kernel_fpu_begin(); \
- __xor_##flavor##_2(bytes, p1, p2); \
+ xor_gen_##flavor##_inner(dest, srcs, src_cnt, bytes); \
kernel_fpu_end(); \
} \
-
-#define MAKE_XOR_GLUE_3(flavor) \
-static void xor_##flavor##_3(unsigned long bytes, unsigned long * __restrict p1,\
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3) \
-{ \
- kernel_fpu_begin(); \
- __xor_##flavor##_3(bytes, p1, p2, p3); \
- kernel_fpu_end(); \
-} \
-
-#define MAKE_XOR_GLUE_4(flavor) \
-static void xor_##flavor##_4(unsigned long bytes, unsigned long * __restrict p1,\
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3, \
- const unsigned long * __restrict p4) \
-{ \
- kernel_fpu_begin(); \
- __xor_##flavor##_4(bytes, p1, p2, p3, p4); \
- kernel_fpu_end(); \
-} \
-
-#define MAKE_XOR_GLUE_5(flavor) \
-static void xor_##flavor##_5(unsigned long bytes, unsigned long * __restrict p1,\
- const unsigned long * __restrict p2, \
- const unsigned long * __restrict p3, \
- const unsigned long * __restrict p4, \
- const unsigned long * __restrict p5) \
-{ \
- kernel_fpu_begin(); \
- __xor_##flavor##_5(bytes, p1, p2, p3, p4, p5); \
- kernel_fpu_end(); \
-} \
-
-#define MAKE_XOR_GLUES(flavor) \
- MAKE_XOR_GLUE_2(flavor); \
- MAKE_XOR_GLUE_3(flavor); \
- MAKE_XOR_GLUE_4(flavor); \
- MAKE_XOR_GLUE_5(flavor); \
- \
-struct xor_block_template xor_block_##flavor = { \
- .name = __stringify(flavor), \
- .do_2 = xor_##flavor##_2, \
- .do_3 = xor_##flavor##_3, \
- .do_4 = xor_##flavor##_4, \
- .do_5 = xor_##flavor##_5, \
+ \
+struct xor_block_template xor_block_##flavor = { \
+ .name = __stringify(flavor), \
+ .xor_gen = xor_gen_##flavor \
}
-
#ifdef CONFIG_CPU_HAS_LSX
MAKE_XOR_GLUES(lsx);
#endif /* CONFIG_CPU_HAS_LSX */
diff --git a/lib/raid/xor/powerpc/xor_vmx.c b/lib/raid/xor/powerpc/xor_vmx.c
index aab49d056d18..09bed98c1bc7 100644
--- a/lib/raid/xor/powerpc/xor_vmx.c
+++ b/lib/raid/xor/powerpc/xor_vmx.c
@@ -10,6 +10,7 @@
* Sparse (as at v0.5.0) gets very, very confused by this file.
* Make it a bit simpler for it.
*/
+#include "xor_impl.h"
#if !defined(__CHECKER__)
#include <altivec.h>
#else
@@ -49,9 +50,9 @@ typedef vector signed char unative_t;
V1##_3 = vec_xor(V1##_3, V2##_3); \
} while (0)
-void __xor_altivec_2(unsigned long bytes,
- unsigned long * __restrict v1_in,
- const unsigned long * __restrict v2_in)
+static void __xor_altivec_2(unsigned long bytes,
+ unsigned long * __restrict v1_in,
+ const unsigned long * __restrict v2_in)
{
DEFINE(v1);
DEFINE(v2);
@@ -68,10 +69,10 @@ void __xor_altivec_2(unsigned long bytes,
} while (--lines > 0);
}
-void __xor_altivec_3(unsigned long bytes,
- unsigned long * __restrict v1_in,
- const unsigned long * __restrict v2_in,
- const unsigned long * __restrict v3_in)
+static void __xor_altivec_3(unsigned long bytes,
+ unsigned long * __restrict v1_in,
+ const unsigned long * __restrict v2_in,
+ const unsigned long * __restrict v3_in)
{
DEFINE(v1);
DEFINE(v2);
@@ -92,11 +93,11 @@ void __xor_altivec_3(unsigned long bytes,
} while (--lines > 0);
}
-void __xor_altivec_4(unsigned long bytes,
- unsigned long * __restrict v1_in,
- const unsigned long * __restrict v2_in,
- const unsigned long * __restrict v3_in,
- const unsigned long * __restrict v4_in)
+static void __xor_altivec_4(unsigned long bytes,
+ unsigned long * __restrict v1_in,
+ const unsigned long * __restrict v2_in,
+ const unsigned long * __restrict v3_in,
+ const unsigned long * __restrict v4_in)
{
DEFINE(v1);
DEFINE(v2);
@@ -121,12 +122,12 @@ void __xor_altivec_4(unsigned long bytes,
} while (--lines > 0);
}
-void __xor_altivec_5(unsigned long bytes,
- unsigned long * __restrict v1_in,
- const unsigned long * __restrict v2_in,
- const unsigned long * __restrict v3_in,
- const unsigned long * __restrict v4_in,
- const unsigned long * __restrict v5_in)
+static void __xor_altivec_5(unsigned long bytes,
+ unsigned long * __restrict v1_in,
+ const unsigned long * __restrict v2_in,
+ const unsigned long * __restrict v3_in,
+ const unsigned long * __restrict v4_in,
+ const unsigned long * __restrict v5_in)
{
DEFINE(v1);
DEFINE(v2);
@@ -154,3 +155,6 @@ void __xor_altivec_5(unsigned long bytes,
v5 += 4;
} while (--lines > 0);
}
+
+__DO_XOR_BLOCKS(altivec_inner, __xor_altivec_2, __xor_altivec_3,
+ __xor_altivec_4, __xor_altivec_5);
diff --git a/lib/raid/xor/powerpc/xor_vmx.h b/lib/raid/xor/powerpc/xor_vmx.h
index 573c41d90dac..1d26c1133a86 100644
--- a/lib/raid/xor/powerpc/xor_vmx.h
+++ b/lib/raid/xor/powerpc/xor_vmx.h
@@ -6,17 +6,5 @@
* outside of the enable/disable altivec block.
*/
-void __xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2);
-void __xor_altivec_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3);
-void __xor_altivec_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4);
-void __xor_altivec_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5);
+void xor_gen_altivec_inner(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
diff --git a/lib/raid/xor/powerpc/xor_vmx_glue.c b/lib/raid/xor/powerpc/xor_vmx_glue.c
index 56e99ddfb64f..dbfbb5cadc36 100644
--- a/lib/raid/xor/powerpc/xor_vmx_glue.c
+++ b/lib/raid/xor/powerpc/xor_vmx_glue.c
@@ -12,56 +12,17 @@
#include "xor_arch.h"
#include "xor_vmx.h"
-static void xor_altivec_2(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2)
+static void xor_gen_altivec(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
{
preempt_disable();
enable_kernel_altivec();
- __xor_altivec_2(bytes, p1, p2);
- disable_kernel_altivec();
- preempt_enable();
-}
-
-static void xor_altivec_3(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_3(bytes, p1, p2, p3);
- disable_kernel_altivec();
- preempt_enable();
-}
-
-static void xor_altivec_4(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_4(bytes, p1, p2, p3, p4);
- disable_kernel_altivec();
- preempt_enable();
-}
-
-static void xor_altivec_5(unsigned long bytes, unsigned long * __restrict p1,
- const unsigned long * __restrict p2,
- const unsigned long * __restrict p3,
- const unsigned long * __restrict p4,
- const unsigned long * __restrict p5)
-{
- preempt_disable();
- enable_kernel_altivec();
- __xor_altivec_5(bytes, p1, p2, p3, p4, p5);
+ xor_gen_altivec_inner(dest, srcs, src_cnt, bytes);
disable_kernel_altivec();
preempt_enable();
}
struct xor_block_template xor_block_altivec = {
- .name = "altivec",
- .do_2 = xor_altivec_2,
- .do_3 = xor_altivec_3,
- .do_4 = xor_altivec_4,
- .do_5 = xor_altivec_5,
+ .name = "altivec",
+ .xor_gen = xor_gen_altivec,
};
diff --git a/lib/raid/xor/riscv/xor-glue.c b/lib/raid/xor/riscv/xor-glue.c
index 060e5f22ebcc..2e4c1b05d998 100644
--- a/lib/raid/xor/riscv/xor-glue.c
+++ b/lib/raid/xor/riscv/xor-glue.c
@@ -9,48 +9,17 @@
#include "xor_impl.h"
#include "xor_arch.h"
-static void xor_vector_2(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2)
-{
- kernel_vector_begin();
- xor_regs_2_(bytes, p1, p2);
- kernel_vector_end();
-}
-
-static void xor_vector_3(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3)
-{
- kernel_vector_begin();
- xor_regs_3_(bytes, p1, p2, p3);
- kernel_vector_end();
-}
-
-static void xor_vector_4(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3,
- const unsigned long *__restrict p4)
-{
- kernel_vector_begin();
- xor_regs_4_(bytes, p1, p2, p3, p4);
- kernel_vector_end();
-}
+DO_XOR_BLOCKS(vector_inner, xor_regs_2_, xor_regs_3_, xor_regs_4_, xor_regs_5_);
-static void xor_vector_5(unsigned long bytes, unsigned long *__restrict p1,
- const unsigned long *__restrict p2,
- const unsigned long *__restrict p3,
- const unsigned long *__restrict p4,
- const unsigned long *__restrict p5)
+static void xor_gen_vector(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
{
kernel_vector_begin();
- xor_regs_5_(bytes, p1, p2, p3, p4, p5);
+ xor_gen_vector_inner(dest, srcs, src_cnt, bytes);
kernel_vector_end();
}
struct xor_block_template xor_block_rvv = {
- .name = "rvv",
- .do_2 = xor_vector_2,
- .do_3 = xor_vector_3,
- .do_4 = xor_vector_4,
- .do_5 = xor_vector_5
+ .name = "rvv",
+ .xor_gen = xor_gen_vector,
};
diff --git a/lib/raid/xor/s390/xor.c b/lib/raid/xor/s390/xor.c
index 48b8cdc684a3..d8a62a70db6c 100644
--- a/lib/raid/xor/s390/xor.c
+++ b/lib/raid/xor/s390/xor.c
@@ -126,10 +126,9 @@ static void xor_xc_5(unsigned long bytes, unsigned long * __restrict p1,
: : "0", "cc", "memory");
}
+DO_XOR_BLOCKS(xc, xor_xc_2, xor_xc_3, xor_xc_4, xor_xc_5);
+
struct xor_block_template xor_block_xc = {
- .name = "xc",
- .do_2 = xor_xc_2,
- .do_3 = xor_xc_3,
- .do_4 = xor_xc_4,
- .do_5 = xor_xc_5,
+ .name = "xc",
+ .xor_gen = xor_gen_xc,
};
diff --git a/lib/raid/xor/sparc/xor-niagara-glue.c b/lib/raid/xor/sparc/xor-niagara-glue.c
index 92d4712c65e1..a4adb088e7d3 100644
--- a/lib/raid/xor/sparc/xor-niagara-glue.c
+++ b/lib/raid/xor/sparc/xor-niagara-glue.c
@@ -24,10 +24,10 @@ void xor_niagara_5(unsigned long bytes, unsigned long * __restrict p1,
const unsigned long * __restrict p4,
const unsigned long * __restrict p5);
+DO_XOR_BLOCKS(niagara, xor_niagara_2, xor_niagara_3, xor_niagara_4,
+ xor_niagara_5);
+
struct xor_block_template xor_block_niagara = {
- .name = "Niagara",
- .do_2 = xor_niagara_2,
- .do_3 = xor_niagara_3,
- .do_4 = xor_niagara_4,
- .do_5 = xor_niagara_5,
+ .name = "Niagara",
+ .xor_gen = xor_gen_niagara,
};
diff --git a/lib/raid/xor/sparc/xor-sparc32.c b/lib/raid/xor/sparc/xor-sparc32.c
index 307c4a84f535..fb37631e90e6 100644
--- a/lib/raid/xor/sparc/xor-sparc32.c
+++ b/lib/raid/xor/sparc/xor-sparc32.c
@@ -244,10 +244,9 @@ sparc_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
+DO_XOR_BLOCKS(sparc32, sparc_2, sparc_3, sparc_4, sparc_5);
+
struct xor_block_template xor_block_SPARC = {
- .name = "SPARC",
- .do_2 = sparc_2,
- .do_3 = sparc_3,
- .do_4 = sparc_4,
- .do_5 = sparc_5,
+ .name = "SPARC",
+ .xor_gen = xor_gen_sparc32,
};
diff --git a/lib/raid/xor/sparc/xor-vis-glue.c b/lib/raid/xor/sparc/xor-vis-glue.c
index 1c0977e85f53..ef39d6c8b9bb 100644
--- a/lib/raid/xor/sparc/xor-vis-glue.c
+++ b/lib/raid/xor/sparc/xor-vis-glue.c
@@ -26,10 +26,9 @@ void xor_vis_5(unsigned long bytes, unsigned long * __restrict p1,
/* XXX Ugh, write cheetah versions... -DaveM */
+DO_XOR_BLOCKS(vis, xor_vis_2, xor_vis_3, xor_vis_4, xor_vis_5);
+
struct xor_block_template xor_block_VIS = {
- .name = "VIS",
- .do_2 = xor_vis_2,
- .do_3 = xor_vis_3,
- .do_4 = xor_vis_4,
- .do_5 = xor_vis_5,
+ .name = "VIS",
+ .xor_gen = xor_gen_vis,
};
diff --git a/lib/raid/xor/x86/xor-avx.c b/lib/raid/xor/x86/xor-avx.c
index d411efa1ff43..f7777d7aa269 100644
--- a/lib/raid/xor/x86/xor-avx.c
+++ b/lib/raid/xor/x86/xor-avx.c
@@ -29,8 +29,6 @@ static void xor_avx_2(unsigned long bytes, unsigned long * __restrict p0,
{
unsigned long lines = bytes >> 9;
- kernel_fpu_begin();
-
while (lines--) {
#undef BLOCK
#define BLOCK(i, reg) \
@@ -47,8 +45,6 @@ do { \
p0 = (unsigned long *)((uintptr_t)p0 + 512);
p1 = (unsigned long *)((uintptr_t)p1 + 512);
}
-
- kernel_fpu_end();
}
static void xor_avx_3(unsigned long bytes, unsigned long * __restrict p0,
@@ -57,8 +53,6 @@ static void xor_avx_3(unsigned long bytes, unsigned long * __restrict p0,
{
unsigned long lines = bytes >> 9;
- kernel_fpu_begin();
-
while (lines--) {
#undef BLOCK
#define BLOCK(i, reg) \
@@ -78,8 +72,6 @@ do { \
p1 = (unsigned long *)((uintptr_t)p1 + 512);
p2 = (unsigned long *)((uintptr_t)p2 + 512);
}
-
- kernel_fpu_end();
}
static void xor_avx_4(unsigned long bytes, unsigned long * __restrict p0,
@@ -89,8 +81,6 @@ static void xor_avx_4(unsigned long bytes, unsigned long * __restrict p0,
{
unsigned long lines = bytes >> 9;
- kernel_fpu_begin();
-
while (lines--) {
#undef BLOCK
#define BLOCK(i, reg) \
@@ -113,8 +103,6 @@ do { \
p2 = (unsigned long *)((uintptr_t)p2 + 512);
p3 = (unsigned long *)((uintptr_t)p3 + 512);
}
-
- kernel_fpu_end();
}
static void xor_avx_5(unsigned long bytes, unsigned long * __restrict p0,
@@ -125,8 +113,6 @@ static void xor_avx_5(unsigned long bytes, unsigned long * __restrict p0,
{
unsigned long lines = bytes >> 9;
- kernel_fpu_begin();
-
while (lines--) {
#undef BLOCK
#define BLOCK(i, reg) \
@@ -152,14 +138,19 @@ do { \
p3 = (unsigned long *)((uintptr_t)p3 + 512);
p4 = (unsigned long *)((uintptr_t)p4 + 512);
}
+}
+
+DO_XOR_BLOCKS(avx_inner, xor_avx_2, xor_avx_3, xor_avx_4, xor_avx_5);
+static void xor_gen_avx(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
+{
+ kernel_fpu_begin();
+ xor_gen_avx_inner(dest, srcs, src_cnt, bytes);
kernel_fpu_end();
}
struct xor_block_template xor_block_avx = {
- .name = "avx",
- .do_2 = xor_avx_2,
- .do_3 = xor_avx_3,
- .do_4 = xor_avx_4,
- .do_5 = xor_avx_5,
+ .name = "avx",
+ .xor_gen = xor_gen_avx,
};
diff --git a/lib/raid/xor/x86/xor-mmx.c b/lib/raid/xor/x86/xor-mmx.c
index e48c58f92874..63a8b0444fce 100644
--- a/lib/raid/xor/x86/xor-mmx.c
+++ b/lib/raid/xor/x86/xor-mmx.c
@@ -21,8 +21,6 @@ xor_pII_mmx_2(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 7;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -55,8 +53,6 @@ xor_pII_mmx_2(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2)
:
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -66,8 +62,6 @@ xor_pII_mmx_3(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 7;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -105,8 +99,6 @@ xor_pII_mmx_3(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2), "+r" (p3)
:
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -117,8 +109,6 @@ xor_pII_mmx_4(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 7;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -161,8 +151,6 @@ xor_pII_mmx_4(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2), "+r" (p3), "+r" (p4)
:
: "memory");
-
- kernel_fpu_end();
}
@@ -175,8 +163,6 @@ xor_pII_mmx_5(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 7;
- kernel_fpu_begin();
-
/* Make sure GCC forgets anything it knows about p4 or p5,
such that it won't pass to the asm volatile below a
register that is shared with any other variable. That's
@@ -237,8 +223,6 @@ xor_pII_mmx_5(unsigned long bytes, unsigned long * __restrict p1,
Clobber them just to be sure nobody does something stupid
like assuming they have some legal value. */
asm("" : "=r" (p4), "=r" (p5));
-
- kernel_fpu_end();
}
#undef LD
@@ -255,8 +239,6 @@ xor_p5_mmx_2(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 6;
- kernel_fpu_begin();
-
asm volatile(
" .align 32 ;\n"
" 1: ;\n"
@@ -293,8 +275,6 @@ xor_p5_mmx_2(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2)
:
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -304,8 +284,6 @@ xor_p5_mmx_3(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 6;
- kernel_fpu_begin();
-
asm volatile(
" .align 32,0x90 ;\n"
" 1: ;\n"
@@ -351,8 +329,6 @@ xor_p5_mmx_3(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2), "+r" (p3)
:
: "memory" );
-
- kernel_fpu_end();
}
static void
@@ -363,8 +339,6 @@ xor_p5_mmx_4(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 6;
- kernel_fpu_begin();
-
asm volatile(
" .align 32,0x90 ;\n"
" 1: ;\n"
@@ -419,8 +393,6 @@ xor_p5_mmx_4(unsigned long bytes, unsigned long * __restrict p1,
"+r" (p1), "+r" (p2), "+r" (p3), "+r" (p4)
:
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -432,8 +404,6 @@ xor_p5_mmx_5(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 6;
- kernel_fpu_begin();
-
/* Make sure GCC forgets anything it knows about p4 or p5,
such that it won't pass to the asm volatile below a
register that is shared with any other variable. That's
@@ -510,22 +480,36 @@ xor_p5_mmx_5(unsigned long bytes, unsigned long * __restrict p1,
Clobber them just to be sure nobody does something stupid
like assuming they have some legal value. */
asm("" : "=r" (p4), "=r" (p5));
+}
+
+DO_XOR_BLOCKS(pII_mmx_inner, xor_pII_mmx_2, xor_pII_mmx_3, xor_pII_mmx_4,
+ xor_pII_mmx_5);
+static void xor_gen_pII_mmx(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
+{
+ kernel_fpu_begin();
+ xor_gen_pII_mmx_inner(dest, srcs, src_cnt, bytes);
kernel_fpu_end();
}
struct xor_block_template xor_block_pII_mmx = {
- .name = "pII_mmx",
- .do_2 = xor_pII_mmx_2,
- .do_3 = xor_pII_mmx_3,
- .do_4 = xor_pII_mmx_4,
- .do_5 = xor_pII_mmx_5,
+ .name = "pII_mmx",
+ .xor_gen = xor_gen_pII_mmx,
};
+DO_XOR_BLOCKS(p5_mmx_inner, xor_p5_mmx_2, xor_p5_mmx_3, xor_p5_mmx_4,
+ xor_p5_mmx_5);
+
+static void xor_gen_p5_mmx(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
+{
+ kernel_fpu_begin();
+ xor_gen_p5_mmx_inner(dest, srcs, src_cnt, bytes);
+ kernel_fpu_end();
+}
+
struct xor_block_template xor_block_p5_mmx = {
- .name = "p5_mmx",
- .do_2 = xor_p5_mmx_2,
- .do_3 = xor_p5_mmx_3,
- .do_4 = xor_p5_mmx_4,
- .do_5 = xor_p5_mmx_5,
+ .name = "p5_mmx",
+ .xor_gen = xor_gen_p5_mmx,
};
diff --git a/lib/raid/xor/x86/xor-sse.c b/lib/raid/xor/x86/xor-sse.c
index 5993ed688c15..c6626ecae6ba 100644
--- a/lib/raid/xor/x86/xor-sse.c
+++ b/lib/raid/xor/x86/xor-sse.c
@@ -51,8 +51,6 @@ xor_sse_2(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -93,8 +91,6 @@ xor_sse_2(unsigned long bytes, unsigned long * __restrict p1,
[p1] "+r" (p1), [p2] "+r" (p2)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -103,8 +99,6 @@ xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -128,8 +122,6 @@ xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1,
[p1] "+r" (p1), [p2] "+r" (p2)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -139,8 +131,6 @@ xor_sse_3(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -188,8 +178,6 @@ xor_sse_3(unsigned long bytes, unsigned long * __restrict p1,
[p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -199,8 +187,6 @@ xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -226,8 +212,6 @@ xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1,
[p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -238,8 +222,6 @@ xor_sse_4(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -294,8 +276,6 @@ xor_sse_4(unsigned long bytes, unsigned long * __restrict p1,
[p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -306,8 +286,6 @@ xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -335,8 +313,6 @@ xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1,
[p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -348,8 +324,6 @@ xor_sse_5(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -411,8 +385,6 @@ xor_sse_5(unsigned long bytes, unsigned long * __restrict p1,
[p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
-
- kernel_fpu_end();
}
static void
@@ -424,8 +396,6 @@ xor_sse_5_pf64(unsigned long bytes, unsigned long * __restrict p1,
{
unsigned long lines = bytes >> 8;
- kernel_fpu_begin();
-
asm volatile(
#undef BLOCK
#define BLOCK(i) \
@@ -455,22 +425,35 @@ xor_sse_5_pf64(unsigned long bytes, unsigned long * __restrict p1,
[p3] "+r" (p3), [p4] "+r" (p4), [p5] "+r" (p5)
: [inc] XOR_CONSTANT_CONSTRAINT (256UL)
: "memory");
+}
+
+DO_XOR_BLOCKS(sse_inner, xor_sse_2, xor_sse_3, xor_sse_4, xor_sse_5);
+static void xor_gen_sse(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
+{
+ kernel_fpu_begin();
+ xor_gen_sse_inner(dest, srcs, src_cnt, bytes);
kernel_fpu_end();
}
struct xor_block_template xor_block_sse = {
- .name = "sse",
- .do_2 = xor_sse_2,
- .do_3 = xor_sse_3,
- .do_4 = xor_sse_4,
- .do_5 = xor_sse_5,
+ .name = "sse",
+ .xor_gen = xor_gen_sse,
};
+DO_XOR_BLOCKS(sse_pf64_inner, xor_sse_2_pf64, xor_sse_3_pf64, xor_sse_4_pf64,
+ xor_sse_5_pf64);
+
+static void xor_gen_sse_pf64(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes)
+{
+ kernel_fpu_begin();
+ xor_gen_sse_pf64_inner(dest, srcs, src_cnt, bytes);
+ kernel_fpu_end();
+}
+
struct xor_block_template xor_block_sse_pf64 = {
- .name = "prefetch64-sse",
- .do_2 = xor_sse_2_pf64,
- .do_3 = xor_sse_3_pf64,
- .do_4 = xor_sse_4_pf64,
- .do_5 = xor_sse_5_pf64,
+ .name = "prefetch64-sse",
+ .xor_gen = xor_gen_sse_pf64,
};
diff --git a/lib/raid/xor/xor-32regs-prefetch.c b/lib/raid/xor/xor-32regs-prefetch.c
index 2856a8e50cb8..ade2a7d8cbe2 100644
--- a/lib/raid/xor/xor-32regs-prefetch.c
+++ b/lib/raid/xor/xor-32regs-prefetch.c
@@ -258,10 +258,10 @@ xor_32regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
goto once_more;
}
+DO_XOR_BLOCKS(32regs_p, xor_32regs_p_2, xor_32regs_p_3, xor_32regs_p_4,
+ xor_32regs_p_5);
+
struct xor_block_template xor_block_32regs_p = {
- .name = "32regs_prefetch",
- .do_2 = xor_32regs_p_2,
- .do_3 = xor_32regs_p_3,
- .do_4 = xor_32regs_p_4,
- .do_5 = xor_32regs_p_5,
+ .name = "32regs_prefetch",
+ .xor_gen = xor_gen_32regs_p,
};
diff --git a/lib/raid/xor/xor-32regs.c b/lib/raid/xor/xor-32regs.c
index cc44d64032fa..acb4a10d1e95 100644
--- a/lib/raid/xor/xor-32regs.c
+++ b/lib/raid/xor/xor-32regs.c
@@ -209,10 +209,9 @@ xor_32regs_5(unsigned long bytes, unsigned long * __restrict p1,
} while (--lines > 0);
}
+DO_XOR_BLOCKS(32regs, xor_32regs_2, xor_32regs_3, xor_32regs_4, xor_32regs_5);
+
struct xor_block_template xor_block_32regs = {
- .name = "32regs",
- .do_2 = xor_32regs_2,
- .do_3 = xor_32regs_3,
- .do_4 = xor_32regs_4,
- .do_5 = xor_32regs_5,
+ .name = "32regs",
+ .xor_gen = xor_gen_32regs,
};
diff --git a/lib/raid/xor/xor-8regs-prefetch.c b/lib/raid/xor/xor-8regs-prefetch.c
index 1d53aec50d27..451527a951b1 100644
--- a/lib/raid/xor/xor-8regs-prefetch.c
+++ b/lib/raid/xor/xor-8regs-prefetch.c
@@ -136,10 +136,11 @@ xor_8regs_p_5(unsigned long bytes, unsigned long * __restrict p1,
goto once_more;
}
+
+DO_XOR_BLOCKS(8regs_p, xor_8regs_p_2, xor_8regs_p_3, xor_8regs_p_4,
+ xor_8regs_p_5);
+
struct xor_block_template xor_block_8regs_p = {
- .name = "8regs_prefetch",
- .do_2 = xor_8regs_p_2,
- .do_3 = xor_8regs_p_3,
- .do_4 = xor_8regs_p_4,
- .do_5 = xor_8regs_p_5,
+ .name = "8regs_prefetch",
+ .xor_gen = xor_gen_8regs_p,
};
diff --git a/lib/raid/xor/xor-8regs.c b/lib/raid/xor/xor-8regs.c
index 72a44e898c55..1edaed8acffe 100644
--- a/lib/raid/xor/xor-8regs.c
+++ b/lib/raid/xor/xor-8regs.c
@@ -94,11 +94,10 @@ xor_8regs_5(unsigned long bytes, unsigned long * __restrict p1,
}
#ifndef NO_TEMPLATE
+DO_XOR_BLOCKS(8regs, xor_8regs_2, xor_8regs_3, xor_8regs_4, xor_8regs_5);
+
struct xor_block_template xor_block_8regs = {
- .name = "8regs",
- .do_2 = xor_8regs_2,
- .do_3 = xor_8regs_3,
- .do_4 = xor_8regs_4,
- .do_5 = xor_8regs_5,
+ .name = "8regs",
+ .xor_gen = xor_gen_8regs,
};
#endif /* NO_TEMPLATE */
diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index b7c29ca931ec..f18dcc57004b 100644
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -13,39 +13,9 @@
#include <linux/preempt.h>
#include "xor_impl.h"
-/* The xor routines to use. */
+/* The xor routine to use. */
static struct xor_block_template *active_template;
-void
-xor_blocks(unsigned int src_count, unsigned int bytes, void *dest, void **srcs)
-{
- unsigned long *p1, *p2, *p3, *p4;
-
- WARN_ON_ONCE(in_interrupt());
-
- p1 = (unsigned long *) srcs[0];
- if (src_count == 1) {
- active_template->do_2(bytes, dest, p1);
- return;
- }
-
- p2 = (unsigned long *) srcs[1];
- if (src_count == 2) {
- active_template->do_3(bytes, dest, p1, p2);
- return;
- }
-
- p3 = (unsigned long *) srcs[2];
- if (src_count == 3) {
- active_template->do_4(bytes, dest, p1, p2, p3);
- return;
- }
-
- p4 = (unsigned long *) srcs[3];
- active_template->do_5(bytes, dest, p1, p2, p3, p4);
-}
-EXPORT_SYMBOL(xor_blocks);
-
/**
* xor_gen - generate RAID-style XOR information
* @dest: destination vector
@@ -61,16 +31,8 @@ EXPORT_SYMBOL(xor_blocks);
*/
void xor_gen(void *dest, void **srcs, unsigned int src_cnt, unsigned int bytes)
{
- unsigned int src_off = 0;
-
- while (src_cnt > 0) {
- unsigned int this_cnt = min(src_cnt, MAX_XOR_BLOCKS);
-
- xor_blocks(this_cnt, bytes, dest, srcs + src_off);
-
- src_cnt -= this_cnt;
- src_off += this_cnt;
- }
+ WARN_ON_ONCE(in_interrupt());
+ active_template->xor_gen(dest, srcs, src_cnt, bytes);
}
EXPORT_SYMBOL(xor_gen);
@@ -114,6 +76,7 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
int speed;
unsigned long reps;
ktime_t min, start, t0;
+ void *srcs[1] = { b2 };
preempt_disable();
@@ -124,7 +87,7 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
cpu_relax();
do {
mb(); /* prevent loop optimization */
- tmpl->do_2(BENCH_SIZE, b1, b2);
+ tmpl->xor_gen(b1, srcs, 1, BENCH_SIZE);
mb();
} while (reps++ < REPS || (t0 = ktime_get()) == start);
min = ktime_sub(t0, start);
diff --git a/lib/raid/xor/xor_impl.h b/lib/raid/xor/xor_impl.h
index 44b6c99e2093..968dd07df627 100644
--- a/lib/raid/xor/xor_impl.h
+++ b/lib/raid/xor/xor_impl.h
@@ -3,27 +3,47 @@
#define _XOR_IMPL_H
#include <linux/init.h>
+#include <linux/minmax.h>
struct xor_block_template {
struct xor_block_template *next;
const char *name;
int speed;
- void (*do_2)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_3)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_4)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
- void (*do_5)(unsigned long, unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict,
- const unsigned long * __restrict);
+ void (*xor_gen)(void *dest, void **srcs, unsigned int src_cnt,
+ unsigned int bytes);
};
+#define __DO_XOR_BLOCKS(_name, _handle1, _handle2, _handle3, _handle4) \
+void \
+xor_gen_##_name(void *dest, void **srcs, unsigned int src_cnt, \
+ unsigned int bytes) \
+{ \
+ unsigned int src_off = 0; \
+ \
+ while (src_cnt > 0) { \
+ unsigned int this_cnt = min(src_cnt, 4); \
+ unsigned long *p1 = (unsigned long *)srcs[src_off]; \
+ unsigned long *p2 = (unsigned long *)srcs[src_off + 1]; \
+ unsigned long *p3 = (unsigned long *)srcs[src_off + 2]; \
+ unsigned long *p4 = (unsigned long *)srcs[src_off + 3]; \
+ \
+ if (this_cnt == 1) \
+ _handle1(bytes, dest, p1); \
+ else if (this_cnt == 2) \
+ _handle2(bytes, dest, p1, p2); \
+ else if (this_cnt == 3) \
+ _handle3(bytes, dest, p1, p2, p3); \
+ else \
+ _handle4(bytes, dest, p1, p2, p3, p4); \
+ \
+ src_cnt -= this_cnt; \
+ src_off += this_cnt; \
+ } \
+}
+
+#define DO_XOR_BLOCKS(_name, _handle1, _handle2, _handle3, _handle4) \
+ static __DO_XOR_BLOCKS(_name, _handle1, _handle2, _handle3, _handle4)
+
/* generic implementations */
extern struct xor_block_template xor_block_8regs;
extern struct xor_block_template xor_block_32regs;
--
2.47.3 | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Thu, 26 Feb 2026 07:10:36 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, Feb 26, 2026, at 16:10, Christoph Hellwig wrote:
Acked-by: Arnd Bergmann <arnd@arndb.de> # for asm-generic
The #include is slightly ugly, but I see it gets better in a later patch,
and is clearly worth it either way.
The rest of the series looks good to me as well. I had a brief
look at each patch, but nothing to complain about.
Arnd | {
"author": "\"Arnd Bergmann\" <arnd@arndb.de>",
"date": "Thu, 26 Feb 2026 16:40:21 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, 26 Feb 2026 07:10:12 -0800 Christoph Hellwig <hch@lst.de> wrote:
Thanks, I'll add this to mm.git's mm-nonmm-unstable tree for some
testing in linux-next. | {
"author": "Andrew Morton <akpm@linux-foundation.org>",
"date": "Thu, 26 Feb 2026 10:20:37 -0800",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | ----- Ursprüngliche Mail -----
IIRC Johannes added XOR_SELECT_TEMPLATE() here to skip
the template selection logic because it didn't work with time travel mode.
Johannes, can you please test whether this change does not break
time travel mode?
Thanks,
//richard | {
"author": "Richard Weinberger <richard@nod.at>",
"date": "Thu, 26 Feb 2026 22:45:26 +0100 (CET)",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, Feb 26, 2026 at 10:45:26PM +0100, Richard Weinberger wrote:
I'm pretty sure that was the intent, but as I wrote above it worked
and still works on AVX-supporting CPUs by chance, and already doesn't
on older CPUs, and unless my git blaming went wrong someewhere already
didn't when this was originally added. | {
"author": "hch <hch@lst.de>",
"date": "Thu, 26 Feb 2026 23:00:38 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, 2026-02-26 at 22:45 +0100, Richard Weinberger wrote:
It does work, even if it reports nonsense (as you'd expect):
xor: measuring software checksum speed
prefetch64-sse : 12816000 MB/sec
sse : 12816000 MB/sec
xor: using function: prefetch64-sse (12816000 MB/sec)
I think it works now because the loop is using ktime and is bounded by
REPS, since commit c055e3eae0f1 ("crypto: xor - use ktime for template
benchmarking").
The RAID speed select still hangs, but we've gotten that removed via
Kconfig, so that's already handled. Perhaps raid6_choose_gen() should
use a similar algorithm? But for UML it doesn't really matter since
CONFIG_RAID6_PQ_BENCHMARK exists.
As far as AVX2 is concerned, yeah, I guess that was a bug, but evidently
nobody (who configured time-travel) ever cared - what _did_ matter
though in practice is that the boot not get stuck entirely... Two
completely separate issues.
johannes | {
"author": "Johannes Berg <johannes@sipsolutions.net>",
"date": "Fri, 27 Feb 2026 08:39:47 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, Feb 26, 2026 at 07:10:29AM -0800, Christoph Hellwig wrote:
FWIW:
Acked-by: Heiko Carstens <hca@linux.ibm.com>
However, I just had a look at the s390 implementation and just saw that the
inline assembly constraints for xor_xc_2() are incorrect. "bytes", "p1",
and "p2" are input operands, while all three of them are modified within
the inline assembly. Given that the function consists only of this inline
assembly I doubt that this causes any harm, however I still want to fix
this now; but your patch should apply fine with or without this fixed. | {
"author": "Heiko Carstens <hca@linux.ibm.com>",
"date": "Fri, 27 Feb 2026 10:09:59 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Fri, Feb 27, 2026 at 10:09:59AM +0100, Heiko Carstens wrote:
Two comments on that: I thin kin the long run simply moving the
implementation to a pure assembly file might be easier to maintain.
Also with this series you can now optimize for more than 5 stripes,
which should be the mormal case. I'll try to make sure we'll get
units tests to help with that. | {
"author": "Christoph Hellwig <hch@lst.de>",
"date": "Fri, 27 Feb 2026 15:13:11 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, Feb 26, 2026 at 07:10:13AM -0800, Christoph Hellwig wrote:
Your changelog makes it sound like you want:
WARN_ON_ONCE(!in_task());
But perhaps something like so:
lockdep_assert_preempt_enabled();
Would do? That ensures we are in preemptible context, which is much the
same. That also ensures the cost of this assertion is only paid on debug
kernels. | {
"author": "Peter Zijlstra <peterz@infradead.org>",
"date": "Fri, 27 Feb 2026 15:24:55 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | Move the RAID XOR code to lib/raid/ as it has nothing to do with the
crypto API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/Kconfig | 2 --
crypto/Makefile | 1 -
lib/Kconfig | 1 +
lib/Makefile | 2 +-
lib/raid/Kconfig | 3 +++
lib/raid/Makefile | 2 ++
lib/raid/xor/Makefile | 5 +++++
crypto/xor.c => lib/raid/xor/xor-core.c | 0
8 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/raid/Kconfig
create mode 100644 lib/raid/Makefile
create mode 100644 lib/raid/xor/Makefile
rename crypto/xor.c => lib/raid/xor/xor-core.c (100%)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2b4106ac961..5cdb1b25ae87 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -2,8 +2,6 @@
#
# Generic algorithms support
#
-config XOR_BLOCKS
- tristate
#
# async_tx api: hardware offloaded memory transfer/transform support
diff --git a/crypto/Makefile b/crypto/Makefile
index 04e269117589..795c2eea51fe 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -196,7 +196,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
#
# generic algorithms and the async_tx api
#
-obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
crypto_simd-y := simd.o
diff --git a/lib/Kconfig b/lib/Kconfig
index 0f2fb9610647..5be57adcd454 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -138,6 +138,7 @@ config TRACE_MMIO_ACCESS
source "lib/crc/Kconfig"
source "lib/crypto/Kconfig"
+source "lib/raid/Kconfig"
config XXHASH
tristate
diff --git a/lib/Makefile b/lib/Makefile
index 1b9ee167517f..84da412a044f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -120,7 +120,7 @@ endif
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
-obj-y += math/ crc/ crypto/ tests/ vdso/
+obj-y += math/ crc/ crypto/ tests/ vdso/ raid/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
diff --git a/lib/raid/Kconfig b/lib/raid/Kconfig
new file mode 100644
index 000000000000..4b720f3454a2
--- /dev/null
+++ b/lib/raid/Kconfig
@@ -0,0 +1,3 @@
+
+config XOR_BLOCKS
+ tristate
diff --git a/lib/raid/Makefile b/lib/raid/Makefile
new file mode 100644
index 000000000000..382f2d1694bd
--- /dev/null
+++ b/lib/raid/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += xor/
diff --git a/lib/raid/xor/Makefile b/lib/raid/xor/Makefile
new file mode 100644
index 000000000000..7bca0ce8e90a
--- /dev/null
+++ b/lib/raid/xor/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_XOR_BLOCKS) += xor.o
+
+xor-y += xor-core.o
diff --git a/crypto/xor.c b/lib/raid/xor/xor-core.c
similarity index 100%
rename from crypto/xor.c
rename to lib/raid/xor/xor-core.c
--
2.47.3
| null | null | null | [PATCH 04/25] xor: move to lib/raid/ | On Thu, Feb 26, 2026 at 07:10:30AM -0800, Christoph Hellwig wrote:
I gotta ask, why lib/raid/xor/$arch/ instead of something like
arch/$arch/lib/xor ? | {
"author": "Peter Zijlstra <peterz@infradead.org>",
"date": "Fri, 27 Feb 2026 15:30:16 +0100",
"is_openbsd": false,
"thread_id": "20260227143606.GI1282955@noisy.programming.kicks-ass.net.mbox.gz"
} |
lkml_critique | lkml | The driver currently sets bit 0 of USB_PHY_CFG1 (PLL_EN) during PHY
initialization. According to the M31 EUSB2 PHY hardware documentation,
this bit is intended only for test/debug scenarios and does not control
mission mode operation. Keeping PLL_EN asserted causes the PHY to draw
additional current during USB bus suspend. Clearing this bit results in
lower suspend power consumption without affecting normal operation.
Update the driver to leave PLL_EN cleared as recommended by the hardware
documentation.
Fixes: 9c8504861cc4 ("phy: qcom: Add M31 based eUSB2 PHY driver")
Cc: stable@vger.kernel.org
Signed-off-by: Elson Serrao <elson.serrao@oss.qualcomm.com>
---
drivers/phy/qualcomm/phy-qcom-m31-eusb2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c b/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
index 95cd3175926d..68f1ba8fec4a 100644
--- a/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
@@ -83,7 +83,7 @@ static const struct m31_phy_tbl_entry m31_eusb2_setup_tbl[] = {
M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG0, UTMI_PHY_CMN_CTRL_OVERRIDE_EN, 1),
M31_EUSB_PHY_INIT_CFG(USB_PHY_UTMI_CTRL5, POR, 1),
M31_EUSB_PHY_INIT_CFG(USB_PHY_HS_PHY_CTRL_COMMON0, PHY_ENABLE, 1),
- M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG1, PLL_EN, 1),
+ M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG1, PLL_EN, 0),
M31_EUSB_PHY_INIT_CFG(USB_PHY_FSEL_SEL, FSEL_SEL, 1),
};
--
2.34.1
| null | null | null | [PATCH] phy: qcom: m31-eusb2: clear PLL_EN during init | On 2/17/26 9:11 PM, Elson Serrao wrote:
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad | {
"author": "Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>",
"date": "Wed, 18 Feb 2026 11:58:50 +0100",
"is_openbsd": false,
"thread_id": "177220617425.330302.16212600767917338005.b4-ty@kernel.org.mbox.gz"
} |
lkml_critique | lkml | The driver currently sets bit 0 of USB_PHY_CFG1 (PLL_EN) during PHY
initialization. According to the M31 EUSB2 PHY hardware documentation,
this bit is intended only for test/debug scenarios and does not control
mission mode operation. Keeping PLL_EN asserted causes the PHY to draw
additional current during USB bus suspend. Clearing this bit results in
lower suspend power consumption without affecting normal operation.
Update the driver to leave PLL_EN cleared as recommended by the hardware
documentation.
Fixes: 9c8504861cc4 ("phy: qcom: Add M31 based eUSB2 PHY driver")
Cc: stable@vger.kernel.org
Signed-off-by: Elson Serrao <elson.serrao@oss.qualcomm.com>
---
drivers/phy/qualcomm/phy-qcom-m31-eusb2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c b/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
index 95cd3175926d..68f1ba8fec4a 100644
--- a/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31-eusb2.c
@@ -83,7 +83,7 @@ static const struct m31_phy_tbl_entry m31_eusb2_setup_tbl[] = {
M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG0, UTMI_PHY_CMN_CTRL_OVERRIDE_EN, 1),
M31_EUSB_PHY_INIT_CFG(USB_PHY_UTMI_CTRL5, POR, 1),
M31_EUSB_PHY_INIT_CFG(USB_PHY_HS_PHY_CTRL_COMMON0, PHY_ENABLE, 1),
- M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG1, PLL_EN, 1),
+ M31_EUSB_PHY_INIT_CFG(USB_PHY_CFG1, PLL_EN, 0),
M31_EUSB_PHY_INIT_CFG(USB_PHY_FSEL_SEL, FSEL_SEL, 1),
};
--
2.34.1
| null | null | null | [PATCH] phy: qcom: m31-eusb2: clear PLL_EN during init | On Tue, 17 Feb 2026 12:11:30 -0800, Elson Serrao wrote:
Applied, thanks!
[1/1] phy: qcom: m31-eusb2: clear PLL_EN during init
commit: 520a98bdf7ae0130e22d8adced3d69a2e211b41f
Best regards,
--
~Vinod | {
"author": "Vinod Koul <vkoul@kernel.org>",
"date": "Fri, 27 Feb 2026 20:59:34 +0530",
"is_openbsd": false,
"thread_id": "177220617425.330302.16212600767917338005.b4-ty@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | The EDID parsing code initially introduced the DRM_COLOR_FORMAT_*
defines to represent the sink capabilities. Since a given sink could
support multiple formats, it was first defined as a bitmask.
However, the core and drivers have since leveraged those defines to
represent both the supported formats but also the current format being
used.
Considering the latter case, the more natural, and consistent, thing to
do would be to create an enum of all the possible formats, and then list
the supported formats using a bitmask of the individual enum values.
Let's create a new enum following that pattern, drm_output_color_format,
while maintaining the DRM_COLOR_FORMAT_* compatibility to make the
transition easier.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
include/drm/drm_connector.h | 42 ++++++++++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 8 deletions(-)
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 7eaec37ae1c735334afa7dad15a38cf0c8b761b8..c67539708f636ae3905bb8424c63799bd1811f28 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -554,10 +554,35 @@ enum drm_colorspace {
DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT = 14,
DRM_MODE_COLORIMETRY_BT601_YCC = 15,
DRM_MODE_COLORIMETRY_COUNT
};
+/**
+ * enum drm_output_color_format - Output Color Format
+ *
+ * This enum is a consolidated color format list supported by
+ * connectors. It's only ever really been used for HDMI and DP so far,
+ * so it's not exhaustive and can be extended to represent other formats
+ * in the future.
+ *
+ *
+ * @DRM_OUTPUT_COLOR_FORMAT_RGB444:
+ * RGB output format
+ * @DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
+ * YCbCr 4:4:4 output format (ie. not subsampled)
+ * @DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
+ * YCbCr 4:2:2 output format (ie. with horizontal subsampling)
+ * @DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
+ * YCbCr 4:2:0 output format (ie. with horizontal and vertical subsampling)
+ */
+enum drm_output_color_format {
+ DRM_OUTPUT_COLOR_FORMAT_RGB444 = 0,
+ DRM_OUTPUT_COLOR_FORMAT_YCBCR444,
+ DRM_OUTPUT_COLOR_FORMAT_YCBCR422,
+ DRM_OUTPUT_COLOR_FORMAT_YCBCR420,
+};
+
/**
* enum drm_bus_flags - bus_flags info for &drm_display_info
*
* This enum defines signal polarities and clock edge information for signals on
* a bus as bitmask flags.
@@ -697,14 +722,14 @@ struct drm_display_info {
/**
* @subpixel_order: Subpixel order of LCD panels.
*/
enum subpixel_order subpixel_order;
-#define DRM_COLOR_FORMAT_RGB444 (1<<0)
-#define DRM_COLOR_FORMAT_YCBCR444 (1<<1)
-#define DRM_COLOR_FORMAT_YCBCR422 (1<<2)
-#define DRM_COLOR_FORMAT_YCBCR420 (1<<3)
+#define DRM_COLOR_FORMAT_RGB444 (1 << DRM_OUTPUT_COLOR_FORMAT_RGB444)
+#define DRM_COLOR_FORMAT_YCBCR444 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR444)
+#define DRM_COLOR_FORMAT_YCBCR422 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR422)
+#define DRM_COLOR_FORMAT_YCBCR420 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
/**
* @panel_orientation: Read only connector property for built-in panels,
* indicating the orientation of the panel vs the device's casing.
* drm_connector_init() sets this to DRM_MODE_PANEL_ORIENTATION_UNKNOWN.
@@ -712,14 +737,15 @@ struct drm_display_info {
* fb to compensate and gets exported as prop to userspace.
*/
int panel_orientation;
/**
- * @color_formats: HDMI Color formats, selects between RGB and YCrCb
- * modes. Used DRM_COLOR_FORMAT\_ defines, which are _not_ the same ones
- * as used to describe the pixel format in framebuffers, and also don't
- * match the formats in @bus_formats which are shared with v4l.
+ * @color_formats: HDMI Color formats, selects between RGB and
+ * YCrCb modes. Uses a bitmask of DRM_OUTPUT_COLOR_FORMAT\_
+ * defines, which are _not_ the same ones as used to describe
+ * the pixel format in framebuffers, and also don't match the
+ * formats in @bus_formats which are shared with v4l.
*/
u32 color_formats;
/**
* @bus_formats: Pixel data format on the wire, somewhat redundant with
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:40 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_edid.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 26bb7710a46204548c150a25d390dac512ec7f0e..316bbdcdbbd3a9bb447e1a4127be9da039e306b5 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5314,11 +5314,11 @@ static void parse_cta_y420cmdb(struct drm_connector *connector,
for (i = 0; i < map_len; i++)
map |= (u64)data[i] << (8 * i);
out:
if (map)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
*y420cmdb_map = map;
}
static int add_cea_modes(struct drm_connector *connector,
@@ -6090,11 +6090,11 @@ static void parse_cta_y420vdb(struct drm_connector *connector,
if (!drm_valid_cea_vic(vic))
continue;
bitmap_set(hdmi->y420_vdb_modes, vic, 1);
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
}
}
static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
{
@@ -6424,15 +6424,15 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
"[CONNECTOR:%d:%s] CEA extension version mismatch %u != %u\n",
connector->base.id, connector->name,
info->cea_rev, edid_ext[1]);
/* The existence of a CTA extension should imply RGB support */
- info->color_formats = DRM_COLOR_FORMAT_RGB444;
+ info->color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
if (edid_ext[3] & EDID_CEA_YCRCB444)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444);
if (edid_ext[3] & EDID_CEA_YCRCB422)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
if (edid_ext[3] & EDID_BASIC_AUDIO)
info->has_audio = true;
}
drm_edid_iter_end(&edid_iter);
@@ -6696,11 +6696,11 @@ static void update_display_info(struct drm_connector *connector,
goto out;
if (!drm_edid_is_digital(drm_edid))
goto out;
- info->color_formats |= DRM_COLOR_FORMAT_RGB444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_parse_cea_ext(connector, drm_edid);
update_displayid_info(connector, drm_edid);
/*
@@ -6750,13 +6750,13 @@ static void update_display_info(struct drm_connector *connector,
drm_dbg_kms(connector->dev,
"[CONNECTOR:%d:%s] Assigning EDID-1.4 digital sink color depth as %d bpc.\n",
connector->base.id, connector->name, info->bpc);
if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444);
if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
drm_update_mso(connector, drm_edid);
out:
if (drm_edid_has_internal_quirk(connector, EDID_QUIRK_NON_DESKTOP)) {
@@ -7227,11 +7227,11 @@ static bool is_hdmi2_sink(const struct drm_connector *connector)
*/
if (!connector)
return true;
return connector->display_info.hdmi.scdc.supported ||
- connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR420;
+ connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
}
static u8 drm_mode_hdmi_vic(const struct drm_connector *connector,
const struct drm_display_mode *mode)
{
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:41 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
index a1d16762ac7a9ebdc48f081c5d2f5e200d406099..f2aec6f65e7a374cea9a1e3adafb4f1cc4d6ab9a 100644
--- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
@@ -426,11 +426,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
* color_formats field will be blank and not report any
* format supported. In such a case, assume that RGB is
* supported so we can keep things going and light up
* the display.
*/
- if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
+ if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444)))
drm_warn(dev, "HDMI Sink doesn't support RGB, something's wrong.\n");
if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
drm_dbg_kms(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
return false;
@@ -446,11 +446,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
return true;
case HDMI_COLORSPACE_YUV420:
drm_dbg_kms(dev, "YUV420 format, checking the constraints.\n");
- if (!(info->color_formats & DRM_COLOR_FORMAT_YCBCR420)) {
+ if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420))) {
drm_dbg_kms(dev, "Sink doesn't support YUV420.\n");
return false;
}
if (!drm_mode_is_420(info, mode)) {
@@ -478,11 +478,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
return true;
case HDMI_COLORSPACE_YUV422:
drm_dbg_kms(dev, "YUV422 format, checking the constraints.\n");
- if (!(info->color_formats & DRM_COLOR_FORMAT_YCBCR422)) {
+ if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))) {
drm_dbg_kms(dev, "Sink doesn't support YUV422.\n");
return false;
}
if (bpc > 12) {
@@ -501,11 +501,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
return true;
case HDMI_COLORSPACE_YUV444:
drm_dbg_kms(dev, "YUV444 format, checking the constraints.\n");
- if (!(info->color_formats & DRM_COLOR_FORMAT_YCBCR444)) {
+ if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))) {
drm_dbg_kms(dev, "Sink doesn't support YUV444.\n");
return false;
}
if (bpc == 10 && !(info->edid_hdmi_ycbcr444_dc_modes & DRM_EDID_HDMI_DC_30)) {
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:42 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index c3c045c8144f104ce498d8be3664438b6b799588..76348fb027dfee26c3fceaedf7d37fc29d91e7f5 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6717,15 +6717,15 @@ static void fill_stream_properties_from_drm_display_mode(
timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
else if (drm_mode_is_420_also(info, mode_in)
&& aconnector
&& aconnector->force_yuv420_output)
timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
- else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
&& aconnector
&& aconnector->force_yuv422_output)
timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR422;
- else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
&& stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR444;
else
timing_out->pixel_encoding = PIXEL_ENCODING_RGB;
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:43 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 1050bb62280bb4794f0b0ae01597269652c063d0..6bd76c1fb0071c8c9cd9c293b3a48a2b4487768e 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -226,11 +226,11 @@ static void adv7511_set_config_csc(struct adv7511 *adv7511,
} else {
config.csc_scaling_factor = ADV7511_CSC_SCALING_4;
config.csc_coefficents = adv7511_csc_ycbcr_to_rgb;
if ((connector->display_info.color_formats &
- DRM_COLOR_FORMAT_YCBCR422) &&
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) &&
connector->display_info.is_hdmi) {
config.csc_enable = false;
output_format_422 = true;
output_format_ycbcr = true;
} else {
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:44 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index efe534977d12de3383390fb3040bbfa4a99064cc..71e3d2426ab013218ff1bdda70e299a7e5229eec 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1341,13 +1341,13 @@ static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge,
break;
default:
video->color_depth = COLOR_8;
break;
}
- if (display_info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (display_info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
video->color_space = COLOR_YCBCR444;
- else if (display_info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ else if (display_info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
video->color_space = COLOR_YCBCR422;
else
video->color_space = COLOR_RGB;
/*
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:45 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +++++++++++-----------
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index 38726ae1bf1504528bcd9e3e11670c658a067423..5c2165b310677cb671e57447eb854af614f849ec 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -1500,18 +1500,18 @@ static u32 cdns_mhdp_get_bpp(struct cdns_mhdp_display_fmt *fmt)
if (fmt->y_only)
return fmt->bpc;
switch (fmt->color_format) {
- case DRM_COLOR_FORMAT_RGB444:
- case DRM_COLOR_FORMAT_YCBCR444:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
bpp = fmt->bpc * 3;
break;
- case DRM_COLOR_FORMAT_YCBCR422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
bpp = fmt->bpc * 2;
break;
- case DRM_COLOR_FORMAT_YCBCR420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
bpp = fmt->bpc * 3 / 2;
break;
default:
bpp = fmt->bpc * 3;
WARN_ON(1);
@@ -1710,30 +1710,30 @@ static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp,
/*
* If YCBCR supported and stream not SD, use ITU709
* Need to handle ITU version with YCBCR420 when supported
*/
- if ((pxlfmt == DRM_COLOR_FORMAT_YCBCR444 ||
- pxlfmt == DRM_COLOR_FORMAT_YCBCR422) && mode->crtc_vdisplay >= 720)
+ if ((pxlfmt == DRM_OUTPUT_COLOR_FORMAT_YCBCR444 ||
+ pxlfmt == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) && mode->crtc_vdisplay >= 720)
misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
bpp = cdns_mhdp_get_bpp(&mhdp->display_fmt);
switch (pxlfmt) {
- case DRM_COLOR_FORMAT_RGB444:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_RGB;
break;
- case DRM_COLOR_FORMAT_YCBCR444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
- case DRM_COLOR_FORMAT_YCBCR422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
- case DRM_COLOR_FORMAT_YCBCR420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
break;
default:
pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
}
@@ -1825,11 +1825,11 @@ static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp,
mode->crtc_vtotal % 2 == 0)
misc1 = DP_TEST_INTERLACED;
if (mhdp->display_fmt.y_only)
misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
/* Use VSC SDP for Y420 */
- if (pxlfmt == DRM_COLOR_FORMAT_YCBCR420)
+ if (pxlfmt == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
misc1 = CDNS_DP_TEST_VSC_SDP;
cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
misc0 | (misc1 << 8));
@@ -2479,11 +2479,11 @@ static int cdns_mhdp_probe(struct platform_device *pdev)
mhdp->link.rate = mhdp->host.link_rate;
mhdp->link.num_lanes = mhdp->host.lanes_cnt;
/* The only currently supported format */
mhdp->display_fmt.y_only = false;
- mhdp->display_fmt.color_format = DRM_COLOR_FORMAT_RGB444;
+ mhdp->display_fmt.color_format = DRM_OUTPUT_COLOR_FORMAT_RGB444;
mhdp->display_fmt.bpc = 8;
mhdp->bridge.of_node = pdev->dev.of_node;
mhdp->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID |
DRM_BRIDGE_OP_HPD;
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
index bad2fc0c7306607a98b84730233c0e984c90576f..8e99a813db0f25eb92f0aa6675e1807c992750a6 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
@@ -304,11 +304,11 @@ struct cdns_mhdp_sink {
bool enhanced;
bool ssc;
};
struct cdns_mhdp_display_fmt {
- u32 color_format;
+ enum drm_output_color_format color_format;
u32 bpc;
bool y_only;
};
/*
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:46 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 +++++++++++++++++----------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-dp.c b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
index 43234245248473805f0a36c5b251212bb31bfb17..e9c03c69781d2070fd0ffde2e4eaafa726e4f758 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
@@ -383,28 +383,28 @@ enum {
DW_DP_PHY_PATTERN_CP2520_2,
};
struct dw_dp_output_format {
u32 bus_format;
- u32 color_format;
+ enum drm_output_color_format color_format;
u8 video_mapping;
u8 bpc;
u8 bpp;
};
#define to_dw_dp_bridge_state(s) container_of(s, struct dw_dp_bridge_state, base)
static const struct dw_dp_output_format dw_dp_output_formats[] = {
- { MEDIA_BUS_FMT_RGB101010_1X30, DRM_COLOR_FORMAT_RGB444, DW_DP_RGB_10BIT, 10, 30 },
- { MEDIA_BUS_FMT_RGB888_1X24, DRM_COLOR_FORMAT_RGB444, DW_DP_RGB_8BIT, 8, 24 },
- { MEDIA_BUS_FMT_YUV10_1X30, DRM_COLOR_FORMAT_YCBCR444, DW_DP_YCBCR444_10BIT, 10, 30 },
- { MEDIA_BUS_FMT_YUV8_1X24, DRM_COLOR_FORMAT_YCBCR444, DW_DP_YCBCR444_8BIT, 8, 24},
- { MEDIA_BUS_FMT_YUYV10_1X20, DRM_COLOR_FORMAT_YCBCR422, DW_DP_YCBCR422_10BIT, 10, 20 },
- { MEDIA_BUS_FMT_YUYV8_1X16, DRM_COLOR_FORMAT_YCBCR422, DW_DP_YCBCR422_8BIT, 8, 16 },
- { MEDIA_BUS_FMT_UYYVYY10_0_5X30, DRM_COLOR_FORMAT_YCBCR420, DW_DP_YCBCR420_10BIT, 10, 15 },
- { MEDIA_BUS_FMT_UYYVYY8_0_5X24, DRM_COLOR_FORMAT_YCBCR420, DW_DP_YCBCR420_8BIT, 8, 12 },
- { MEDIA_BUS_FMT_RGB666_1X24_CPADHI, DRM_COLOR_FORMAT_RGB444, DW_DP_RGB_6BIT, 6, 18 },
+ { MEDIA_BUS_FMT_RGB101010_1X30, DRM_OUTPUT_COLOR_FORMAT_RGB444, DW_DP_RGB_10BIT, 10, 30 },
+ { MEDIA_BUS_FMT_RGB888_1X24, DRM_OUTPUT_COLOR_FORMAT_RGB444, DW_DP_RGB_8BIT, 8, 24 },
+ { MEDIA_BUS_FMT_YUV10_1X30, DRM_OUTPUT_COLOR_FORMAT_YCBCR444, DW_DP_YCBCR444_10BIT, 10, 30 },
+ { MEDIA_BUS_FMT_YUV8_1X24, DRM_OUTPUT_COLOR_FORMAT_YCBCR444, DW_DP_YCBCR444_8BIT, 8, 24},
+ { MEDIA_BUS_FMT_YUYV10_1X20, DRM_OUTPUT_COLOR_FORMAT_YCBCR422, DW_DP_YCBCR422_10BIT, 10, 20 },
+ { MEDIA_BUS_FMT_YUYV8_1X16, DRM_OUTPUT_COLOR_FORMAT_YCBCR422, DW_DP_YCBCR422_8BIT, 8, 16 },
+ { MEDIA_BUS_FMT_UYYVYY10_0_5X30, DRM_OUTPUT_COLOR_FORMAT_YCBCR420, DW_DP_YCBCR420_10BIT, 10, 15 },
+ { MEDIA_BUS_FMT_UYYVYY8_0_5X24, DRM_OUTPUT_COLOR_FORMAT_YCBCR420, DW_DP_YCBCR420_8BIT, 8, 12 },
+ { MEDIA_BUS_FMT_RGB666_1X24_CPADHI, DRM_OUTPUT_COLOR_FORMAT_RGB444, DW_DP_RGB_6BIT, 6, 18 },
};
static const struct dw_dp_output_format *dw_dp_get_output_format(u32 bus_format)
{
unsigned int i;
@@ -1095,26 +1095,26 @@ static int dw_dp_send_vsc_sdp(struct dw_dp *dp)
vsc.content_type = DP_CONTENT_TYPE_NOT_DEFINED;
sdp.flags = DW_DP_SDP_VERTICAL_INTERVAL;
switch (state->color_format) {
- case DRM_COLOR_FORMAT_YCBCR444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
vsc.pixelformat = DP_PIXELFORMAT_YUV444;
break;
- case DRM_COLOR_FORMAT_YCBCR420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
vsc.pixelformat = DP_PIXELFORMAT_YUV420;
break;
- case DRM_COLOR_FORMAT_YCBCR422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
vsc.pixelformat = DP_PIXELFORMAT_YUV422;
break;
- case DRM_COLOR_FORMAT_RGB444:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
default:
vsc.pixelformat = DP_PIXELFORMAT_RGB;
break;
}
- if (state->color_format == DRM_COLOR_FORMAT_RGB444) {
+ if (state->color_format == DRM_OUTPUT_COLOR_FORMAT_RGB444) {
vsc.colorimetry = DP_COLORIMETRY_DEFAULT;
vsc.dynamic_range = DP_DYNAMIC_RANGE_VESA;
} else {
vsc.colorimetry = DP_COLORIMETRY_BT709_YCC;
vsc.dynamic_range = DP_DYNAMIC_RANGE_CTA;
@@ -1152,35 +1152,36 @@ static bool dw_dp_video_need_vsc_sdp(struct dw_dp *dp)
return -EINVAL;
if (!link->vsc_sdp_supported)
return false;
- if (state->color_format == DRM_COLOR_FORMAT_YCBCR420)
+ if (state->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
return true;
return false;
}
-static int dw_dp_video_set_msa(struct dw_dp *dp, u8 color_format, u8 bpc,
- u16 vstart, u16 hstart)
+static int dw_dp_video_set_msa(struct dw_dp *dp,
+ enum drm_output_color_format color_format,
+ u8 bpc, u16 vstart, u16 hstart)
{
u16 misc = 0;
if (dw_dp_video_need_vsc_sdp(dp))
misc |= DP_MSA_MISC_COLOR_VSC_SDP;
switch (color_format) {
- case DRM_COLOR_FORMAT_RGB444:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
misc |= DP_MSA_MISC_COLOR_RGB;
break;
- case DRM_COLOR_FORMAT_YCBCR444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
misc |= DP_MSA_MISC_COLOR_YCBCR_444_BT709;
break;
- case DRM_COLOR_FORMAT_YCBCR422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
misc |= DP_MSA_MISC_COLOR_YCBCR_422_BT709;
break;
- case DRM_COLOR_FORMAT_YCBCR420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
break;
default:
return -EINVAL;
}
@@ -1308,13 +1309,13 @@ static int dw_dp_video_enable(struct dw_dp *dp)
average_bytes_per_tu = ts / 1000;
average_bytes_per_tu_frac = ts / 100 - average_bytes_per_tu * 10;
if (dp->pixel_mode == DW_DP_MP_SINGLE_PIXEL) {
if (average_bytes_per_tu < 6)
init_threshold = 32;
- else if (hblank <= 80 && color_format != DRM_COLOR_FORMAT_YCBCR420)
+ else if (hblank <= 80 && color_format != DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
init_threshold = 12;
- else if (hblank <= 40 && color_format == DRM_COLOR_FORMAT_YCBCR420)
+ else if (hblank <= 40 && color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
init_threshold = 3;
else
init_threshold = 16;
} else {
u32 t1 = 0, t2 = 0, t3 = 0;
@@ -1322,47 +1323,47 @@ static int dw_dp_video_enable(struct dw_dp *dp)
switch (bpc) {
case 6:
t1 = (4 * 1000 / 9) * link->lanes;
break;
case 8:
- if (color_format == DRM_COLOR_FORMAT_YCBCR422) {
+ if (color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) {
t1 = (1000 / 2) * link->lanes;
} else {
if (dp->pixel_mode == DW_DP_MP_DUAL_PIXEL)
t1 = (1000 / 3) * link->lanes;
else
t1 = (3000 / 16) * link->lanes;
}
break;
case 10:
- if (color_format == DRM_COLOR_FORMAT_YCBCR422)
+ if (color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422)
t1 = (2000 / 5) * link->lanes;
else
t1 = (4000 / 15) * link->lanes;
break;
case 12:
- if (color_format == DRM_COLOR_FORMAT_YCBCR422) {
+ if (color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) {
if (dp->pixel_mode == DW_DP_MP_DUAL_PIXEL)
t1 = (1000 / 6) * link->lanes;
else
t1 = (1000 / 3) * link->lanes;
} else {
t1 = (2000 / 9) * link->lanes;
}
break;
case 16:
- if (color_format != DRM_COLOR_FORMAT_YCBCR422 &&
+ if (color_format != DRM_OUTPUT_COLOR_FORMAT_YCBCR422 &&
dp->pixel_mode == DW_DP_MP_DUAL_PIXEL)
t1 = (1000 / 6) * link->lanes;
else
t1 = (1000 / 4) * link->lanes;
break;
default:
return -EINVAL;
}
- if (color_format == DRM_COLOR_FORMAT_YCBCR420)
+ if (color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
t2 = (link->rate / 4) * 1000 / (mode->clock / 2);
else
t2 = (link->rate / 4) * 1000 / mode->clock;
if (average_bytes_per_tu_frac)
@@ -1578,17 +1579,17 @@ static enum drm_mode_status dw_dp_bridge_mode_valid(struct drm_bridge *bridge,
{
struct dw_dp *dp = bridge_to_dp(bridge);
struct dw_dp_link *link = &dp->link;
u32 min_bpp;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR420 &&
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420) &&
link->vsc_sdp_supported &&
(drm_mode_is_420_only(info, mode) || drm_mode_is_420_also(info, mode)))
min_bpp = 12;
- else if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ else if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
min_bpp = 16;
- else if (info->color_formats & DRM_COLOR_FORMAT_RGB444)
+ else if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444))
min_bpp = 18;
else
min_bpp = 24;
if (!link->vsc_sdp_supported &&
@@ -1781,18 +1782,18 @@ static u32 *dw_dp_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
fmt = &dw_dp_output_formats[i];
if (fmt->bpc > conn_state->max_bpc)
continue;
- if (!(fmt->color_format & di->color_formats))
+ if (!(BIT(fmt->color_format) & di->color_formats))
continue;
- if (fmt->color_format == DRM_COLOR_FORMAT_YCBCR420 &&
+ if (fmt->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420 &&
!link->vsc_sdp_supported)
continue;
- if (fmt->color_format != DRM_COLOR_FORMAT_YCBCR420 &&
+ if (fmt->color_format != DRM_OUTPUT_COLOR_FORMAT_YCBCR420 &&
drm_mode_is_420_only(di, &mode))
continue;
if (!dw_dp_bandwidth_ok(dp, &mode, fmt->bpp, link->lanes, link->rate))
continue;
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:47 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ee88c0e793b0416d20105a43448cb4037402e64b..0296e110ce65ffc284e120f4e3f92052474e83e5 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2662,11 +2662,11 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
struct drm_connector *conn = conn_state->connector;
struct drm_display_info *info = &conn->display_info;
struct drm_display_mode *mode = &crtc_state->mode;
u8 max_bpc = conn_state->max_requested_bpc;
bool is_hdmi2_sink = info->hdmi.scdc.supported ||
- (info->color_formats & DRM_COLOR_FORMAT_YCBCR420);
+ (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420));
u32 *output_fmts;
unsigned int i = 0;
*num_output_fmts = 0;
@@ -2721,40 +2721,40 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
/* Default 8bit RGB fallback */
output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
if (max_bpc >= 16 && info->bpc == 16) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
output_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
output_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
}
if (max_bpc >= 12 && info->bpc >= 12) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
output_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
output_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
output_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
}
if (max_bpc >= 10 && info->bpc >= 10) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
output_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
output_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
}
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))
output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
*num_output_fmts = i;
return output_fmts;
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:48 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +++++++-------
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +++--
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
index 67e5d3b4190f62549bc8da700deb4b15e138b515..27ca2930cdac6e76a058102ea2c1d8306d85e751 100644
--- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
+++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
@@ -1078,15 +1078,15 @@ static void d71_improc_update(struct komeda_component *c,
}
mask |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420;
/* config color format */
- if (st->color_format == DRM_COLOR_FORMAT_YCBCR420)
+ if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420;
- else if (st->color_format == DRM_COLOR_FORMAT_YCBCR422)
+ else if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422)
ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422;
- else if (st->color_format == DRM_COLOR_FORMAT_YCBCR444)
+ else if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR444)
ctrl |= IPS_CTRL_YUV;
malidp_write32_mask(reg, BLK_CONTROL, mask, ctrl);
}
@@ -1143,16 +1143,16 @@ static int d71_improc_init(struct d71_dev *d71,
return PTR_ERR(c);
}
improc = to_improc(c);
improc->supported_color_depths = BIT(8) | BIT(10);
- improc->supported_color_formats = DRM_COLOR_FORMAT_RGB444 |
- DRM_COLOR_FORMAT_YCBCR444 |
- DRM_COLOR_FORMAT_YCBCR422;
+ improc->supported_color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
value = malidp_read32(reg, BLK_INFO);
if (value & IPS_INFO_CHD420)
- improc->supported_color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+ improc->supported_color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
improc->supports_csc = true;
improc->supports_gamma = true;
return 0;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index 5a66948ffd24343cfc144e9b500679fd0c6bf43b..e78604469ef74800a4cac1e854821578b7e7bce8 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -38,11 +38,11 @@ void komeda_crtc_get_color_config(struct drm_crtc_state *crtc_st,
min_bpc = conn_bpc;
}
/* connector doesn't config any color_format, use RGB444 as default */
if (!conn_color_formats)
- conn_color_formats = DRM_COLOR_FORMAT_RGB444;
+ conn_color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
*color_depths = GENMASK(min_bpc, 0);
*color_formats = conn_color_formats;
}
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index ac8725e248537e5737d16cd36860401c42073500..dbe93894b2f6a193e24963d497ebb7b717ce3ebb 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -315,20 +315,21 @@ struct komeda_splitter_state {
u16 overlap;
};
struct komeda_improc {
struct komeda_component base;
- u32 supported_color_formats; /* DRM_RGB/YUV444/YUV420*/
+ u32 supported_color_formats; /* BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444/YUV444/YUV420) */
u32 supported_color_depths; /* BIT(8) | BIT(10)*/
u8 supports_degamma : 1;
u8 supports_csc : 1;
u8 supports_gamma : 1;
};
struct komeda_improc_state {
struct komeda_component_state base;
- u8 color_format, color_depth;
+ enum drm_output_color_format color_format;
+ u8 color_depth;
u16 hsize, vsize;
u32 fgamma_coeffs[KOMEDA_N_GAMMA_COEFFS];
u32 ctm_coeffs[KOMEDA_N_CTM_COEFFS];
};
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
index f4e76b46ca327a1c5db9bdbdd9550b45190b30d8..6f9b10cc831ff748296b9ed30b6de398c90c4786 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
@@ -797,11 +797,11 @@ komeda_improc_validate(struct komeda_improc *improc,
improc->supported_color_formats);
return -EINVAL;
}
st->color_depth = __fls(avail_depths);
- st->color_format = BIT(__ffs(avail_formats));
+ st->color_format = __ffs(avail_formats);
}
if (kcrtc_st->base.color_mgmt_changed) {
drm_lut_to_fgamma_coeffs(kcrtc_st->base.gamma_lut,
st->fgamma_coeffs);
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:49 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/mediatek/mtk_dp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 5e67dab6e2e91de880282289479cf109087af3f2..24b1b62c286635e51f7f4ddc27d07f4dcef01723 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -2452,11 +2452,11 @@ static enum drm_mode_status
mtk_dp_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
- u32 bpp = info->color_formats & DRM_COLOR_FORMAT_YCBCR422 ? 16 : 24;
+ u32 bpp = info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) ? 16 : 24;
u32 lane_count_min = mtk_dp->train_info.lane_count;
u32 rate = drm_dp_bw_code_to_link_rate(mtk_dp->train_info.link_rate) *
lane_count_min;
/*
@@ -2519,11 +2519,11 @@ static u32 *mtk_dp_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
* datarate of YUV422 and sink device supports YUV422, we output YUV422
* format. Use this condition, we can support more resolution.
*/
if (((rate * 97 / 100) < (mode->clock * 24 / 8)) &&
((rate * 97 / 100) > (mode->clock * 16 / 8)) &&
- (display_info->color_formats & DRM_COLOR_FORMAT_YCBCR422)) {
+ (display_info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))) {
input_fmts = kcalloc(1, sizeof(*input_fmts), GFP_KERNEL);
if (!input_fmts)
return NULL;
*num_input_fmts = 1;
input_fmts[0] = MEDIA_BUS_FMT_YUYV8_1X16;
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:50 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.
The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.
The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index fdab71d51e2a71d644f128b1bf1c39429b4ad52a..96bd3dd239d251af3d5a7d0fbd4dd74942d44f2d 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -169,16 +169,16 @@ static int rockchip_dp_powerdown(struct analogix_dp_plat_data *plat_data)
static int rockchip_dp_get_modes(struct analogix_dp_plat_data *plat_data,
struct drm_connector *connector)
{
struct drm_display_info *di = &connector->display_info;
/* VOP couldn't output YUV video format for eDP rightly */
- u32 mask = DRM_COLOR_FORMAT_YCBCR444 | DRM_COLOR_FORMAT_YCBCR422;
+ u32 mask = BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
if ((di->color_formats & mask)) {
DRM_DEBUG_KMS("Swapping display color format from YUV to RGB\n");
di->color_formats &= ~mask;
- di->color_formats |= DRM_COLOR_FORMAT_RGB444;
+ di->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
di->bpc = 8;
}
return 0;
}
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:51 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Now that all users of DRM_COLOR_FORMAT_* defines have been converted to
the new enum, we can get rid of those defines.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
include/drm/drm_connector.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index c67539708f636ae3905bb8424c63799bd1811f28..e97c8a209ef5c96ecf4bcb5f0b1b5f1bc0f35b3c 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -722,15 +722,10 @@ struct drm_display_info {
/**
* @subpixel_order: Subpixel order of LCD panels.
*/
enum subpixel_order subpixel_order;
-#define DRM_COLOR_FORMAT_RGB444 (1 << DRM_OUTPUT_COLOR_FORMAT_RGB444)
-#define DRM_COLOR_FORMAT_YCBCR444 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR444)
-#define DRM_COLOR_FORMAT_YCBCR422 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR422)
-#define DRM_COLOR_FORMAT_YCBCR420 (1 << DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
-
/**
* @panel_orientation: Read only connector property for built-in panels,
* indicating the orientation of the panel vs the device's casing.
* drm_connector_init() sets this to DRM_MODE_PANEL_ORIENTATION_UNKNOWN.
* When not UNKNOWN this gets used by the drm_fb_helpers to rotate the
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:52 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | The hdmi_colorspace enum was defined to represent the colorspace value
of the HDMI infoframes. It was later used by some HDMI drivers to
express the output format they should be setting up.
During the introduction of the HDMI helpers, it then was used to
represent it in the drm_connector_hdmi_state structure.
However, it's always been somewhat redundant with the DRM_COLOR_FORMAT_*
defines, and now with the drm_output_color_format enum. Let's
consolidate around drm_output_color_format in drm_connector_hdmi_state
to facilitate the current effort to provide a global output format
selection mechanism.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 52 ++++--
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 7 +-
14 files changed, 205 insertions(+), 180 deletions(-)
diff --git a/drivers/gpu/drm/bridge/inno-hdmi.c b/drivers/gpu/drm/bridge/inno-hdmi.c
index a26b99b101c4ad04cae15306ce18060fbc52d51a..87422d15d9a2148498fb257667049939788071fd 100644
--- a/drivers/gpu/drm/bridge/inno-hdmi.c
+++ b/drivers/gpu/drm/bridge/inno-hdmi.c
@@ -651,11 +651,11 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi,
value = v_VIDEO_INPUT_BITS(VIDEO_INPUT_8BITS) |
v_VIDEO_OUTPUT_COLOR(0) |
v_VIDEO_INPUT_CSP(0);
hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL2, value);
- if (conn_state->hdmi.output_format == HDMI_COLORSPACE_RGB) {
+ if (conn_state->hdmi.output_format == DRM_OUTPUT_COLOR_FORMAT_RGB444) {
if (conn_state->hdmi.is_limited_range) {
csc_mode = CSC_RGB_0_255_TO_RGB_16_235_8BIT;
auto_csc = AUTO_CSC_DISABLE;
c0_c2_change = C0_C2_CHANGE_DISABLE;
csc_enable = v_CSC_ENABLE;
@@ -670,18 +670,18 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi,
v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE));
return 0;
}
} else {
if (colorimetry == HDMI_COLORIMETRY_ITU_601) {
- if (conn_state->hdmi.output_format == HDMI_COLORSPACE_YUV444) {
+ if (conn_state->hdmi.output_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR444) {
csc_mode = CSC_RGB_0_255_TO_ITU601_16_235_8BIT;
auto_csc = AUTO_CSC_DISABLE;
c0_c2_change = C0_C2_CHANGE_DISABLE;
csc_enable = v_CSC_ENABLE;
}
} else {
- if (conn_state->hdmi.output_format == HDMI_COLORSPACE_YUV444) {
+ if (conn_state->hdmi.output_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR444) {
csc_mode = CSC_RGB_0_255_TO_ITU709_16_235_8BIT;
auto_csc = AUTO_CSC_DISABLE;
c0_c2_change = C0_C2_CHANGE_DISABLE;
csc_enable = v_CSC_ENABLE;
}
diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/ite-it6263.c
index 3991fb76143c97cda5f0e1d33eba14c58ff8c5d4..dd3fbfc43a438a8fa064ff5551f17584f3286d2f 100644
--- a/drivers/gpu/drm/bridge/ite-it6263.c
+++ b/drivers/gpu/drm/bridge/ite-it6263.c
@@ -664,11 +664,11 @@ it6263_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
unsigned long long rate;
- rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444);
if (rate == 0)
return MODE_NOCLOCK;
return bridge->funcs->hdmi_tmds_char_rate_valid(bridge, mode, rate);
}
diff --git a/drivers/gpu/drm/display/drm_hdmi_helper.c b/drivers/gpu/drm/display/drm_hdmi_helper.c
index a237dc55805d0decf0773f3dccb71868861486c2..5cb0b033b1713ee9e3aee46503aeaa2cdb8306b1 100644
--- a/drivers/gpu/drm/display/drm_hdmi_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_helper.c
@@ -208,11 +208,12 @@ EXPORT_SYMBOL(drm_hdmi_avi_infoframe_content_type);
* RETURNS:
* The TMDS Character Rate, in Hertz, or 0 on error.
*/
unsigned long long
drm_hdmi_compute_mode_clock(const struct drm_display_mode *mode,
- unsigned int bpc, enum hdmi_colorspace fmt)
+ unsigned int bpc,
+ enum drm_output_color_format fmt)
{
unsigned long long clock = mode->clock * 1000ULL;
unsigned int vic = drm_match_cea_mode(mode);
/*
@@ -220,11 +221,11 @@ drm_hdmi_compute_mode_clock(const struct drm_display_mode *mode,
* mandates that VIC 1 always uses 8 bpc.
*/
if (vic == 1 && bpc != 8)
return 0;
- if (fmt == HDMI_COLORSPACE_YUV422) {
+ if (fmt == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) {
/*
* HDMI 1.0 Spec, section 6.5 - Pixel Encoding states that
* YUV422 sends 24 bits over three channels, with Cb and Cr
* components being sent on odd and even pixels, respectively.
*
@@ -246,11 +247,11 @@ drm_hdmi_compute_mode_clock(const struct drm_display_mode *mode,
/*
* HDMI 2.0 Spec, Section 7.1 - YCbCr 4:2:0 Pixel Encoding
* specifies that YUV420 encoding is carried at a TMDS Character Rate
* equal to half the pixel clock rate.
*/
- if (fmt == HDMI_COLORSPACE_YUV420)
+ if (fmt == DRM_OUTPUT_COLOR_FORMAT_YCBCR420)
clock = clock / 2;
if (mode->flags & DRM_MODE_FLAG_DBLCLK)
clock = clock * 2;
diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
index f2aec6f65e7a374cea9a1e3adafb4f1cc4d6ab9a..9f3b696aceeb4b60e6e7dea6bc5458ce5027a4aa 100644
--- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
@@ -324,10 +324,29 @@ void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector,
new_conn_state->max_requested_bpc = max_bpc;
new_conn_state->hdmi.broadcast_rgb = DRM_HDMI_BROADCAST_RGB_AUTO;
}
EXPORT_SYMBOL(__drm_atomic_helper_connector_hdmi_reset);
+static enum hdmi_colorspace
+output_color_format_to_hdmi_colorspace(const struct drm_connector *connector,
+ enum drm_output_color_format fmt)
+{
+ switch (fmt) {
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
+ return HDMI_COLORSPACE_YUV420;
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
+ return HDMI_COLORSPACE_YUV422;
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
+ return HDMI_COLORSPACE_YUV444;
+ default:
+ drm_warn(connector->dev, "Unsupported output color format. Defaulting to RGB.");
+ fallthrough;
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
+ return HDMI_COLORSPACE_RGB;
+ }
+}
+
static const struct drm_display_mode *
connector_state_get_mode(const struct drm_connector_state *conn_state)
{
struct drm_atomic_state *state;
struct drm_crtc_state *crtc_state;
@@ -358,11 +377,11 @@ static bool hdmi_is_limited_range(const struct drm_connector *connector,
/*
* The Broadcast RGB property only applies to RGB format, and
* i915 just assumes limited range for YCbCr output, so let's
* just do the same.
*/
- if (conn_state->hdmi.output_format != HDMI_COLORSPACE_RGB)
+ if (conn_state->hdmi.output_format != DRM_OUTPUT_COLOR_FORMAT_RGB444)
return true;
if (conn_state->hdmi.broadcast_rgb == DRM_HDMI_BROADCAST_RGB_FULL)
return false;
@@ -377,11 +396,12 @@ static bool hdmi_is_limited_range(const struct drm_connector *connector,
static bool
sink_supports_format_bpc(const struct drm_connector *connector,
const struct drm_display_info *info,
const struct drm_display_mode *mode,
- unsigned int format, unsigned int bpc)
+ enum drm_output_color_format format,
+ unsigned int bpc)
{
struct drm_device *dev = connector->dev;
u8 vic = drm_match_cea_mode(mode);
/*
@@ -398,28 +418,28 @@ sink_supports_format_bpc(const struct drm_connector *connector,
drm_dbg_kms(dev, "VIC1 requires a bpc of 8, got %u\n", bpc);
return false;
}
if (!info->is_hdmi &&
- (format != HDMI_COLORSPACE_RGB || bpc != 8)) {
+ (format != DRM_OUTPUT_COLOR_FORMAT_RGB444 || bpc != 8)) {
drm_dbg_kms(dev, "DVI Monitors require an RGB output at 8 bpc\n");
return false;
}
if (!(connector->hdmi.supported_formats & BIT(format))) {
drm_dbg_kms(dev, "%s format unsupported by the connector.\n",
drm_hdmi_connector_get_output_format_name(format));
return false;
}
- if (drm_mode_is_420_only(info, mode) && format != HDMI_COLORSPACE_YUV420) {
+ if (drm_mode_is_420_only(info, mode) && format != DRM_OUTPUT_COLOR_FORMAT_YCBCR420) {
drm_dbg_kms(dev, "Mode can be only supported in YUV420 format.\n");
return false;
}
switch (format) {
- case HDMI_COLORSPACE_RGB:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
drm_dbg_kms(dev, "RGB Format, checking the constraints.\n");
/*
* In some cases, like when the EDID readout fails, or
* is not an HDMI compliant EDID for some reason, the
@@ -443,11 +463,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
drm_dbg_kms(dev, "RGB format supported in that configuration.\n");
return true;
- case HDMI_COLORSPACE_YUV420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
drm_dbg_kms(dev, "YUV420 format, checking the constraints.\n");
if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420))) {
drm_dbg_kms(dev, "Sink doesn't support YUV420.\n");
return false;
@@ -475,11 +495,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
drm_dbg_kms(dev, "YUV420 format supported in that configuration.\n");
return true;
- case HDMI_COLORSPACE_YUV422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
drm_dbg_kms(dev, "YUV422 format, checking the constraints.\n");
if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))) {
drm_dbg_kms(dev, "Sink doesn't support YUV422.\n");
return false;
@@ -498,11 +518,11 @@ sink_supports_format_bpc(const struct drm_connector *connector,
drm_dbg_kms(dev, "YUV422 format supported in that configuration.\n");
return true;
- case HDMI_COLORSPACE_YUV444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
drm_dbg_kms(dev, "YUV444 format, checking the constraints.\n");
if (!(info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444))) {
drm_dbg_kms(dev, "Sink doesn't support YUV444.\n");
return false;
@@ -551,11 +571,11 @@ hdmi_clock_valid(const struct drm_connector *connector,
static int
hdmi_compute_clock(const struct drm_connector *connector,
struct drm_connector_state *conn_state,
const struct drm_display_mode *mode,
- unsigned int bpc, enum hdmi_colorspace fmt)
+ unsigned int bpc, enum drm_output_color_format fmt)
{
enum drm_mode_status status;
unsigned long long clock;
clock = drm_hdmi_compute_mode_clock(mode, bpc, fmt);
@@ -573,11 +593,11 @@ hdmi_compute_clock(const struct drm_connector *connector,
static bool
hdmi_try_format_bpc(const struct drm_connector *connector,
struct drm_connector_state *conn_state,
const struct drm_display_mode *mode,
- unsigned int bpc, enum hdmi_colorspace fmt)
+ unsigned int bpc, enum drm_output_color_format fmt)
{
const struct drm_display_info *info = &connector->display_info;
struct drm_device *dev = connector->dev;
int ret;
@@ -609,11 +629,11 @@ hdmi_try_format_bpc(const struct drm_connector *connector,
static int
hdmi_compute_format_bpc(const struct drm_connector *connector,
struct drm_connector_state *conn_state,
const struct drm_display_mode *mode,
- unsigned int max_bpc, enum hdmi_colorspace fmt)
+ unsigned int max_bpc, enum drm_output_color_format fmt)
{
struct drm_device *dev = connector->dev;
unsigned int bpc;
int ret;
@@ -650,16 +670,16 @@ hdmi_compute_config(const struct drm_connector *connector,
conn_state->max_bpc,
8, connector->max_bpc);
int ret;
ret = hdmi_compute_format_bpc(connector, conn_state, mode, max_bpc,
- HDMI_COLORSPACE_RGB);
+ DRM_OUTPUT_COLOR_FORMAT_RGB444);
if (ret) {
if (connector->ycbcr_420_allowed) {
ret = hdmi_compute_format_bpc(connector, conn_state,
mode, max_bpc,
- HDMI_COLORSPACE_YUV420);
+ DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
if (ret)
drm_dbg_kms(connector->dev,
"YUV420 output format doesn't work.\n");
} else {
drm_dbg_kms(connector->dev,
@@ -689,11 +709,13 @@ static int hdmi_generate_avi_infoframe(const struct drm_connector *connector,
ret = drm_hdmi_avi_infoframe_from_display_mode(frame, connector, mode);
if (ret)
return ret;
- frame->colorspace = conn_state->hdmi.output_format;
+ frame->colorspace =
+ output_color_format_to_hdmi_colorspace(connector,
+ conn_state->hdmi.output_format);
/*
* FIXME: drm_hdmi_avi_infoframe_quant_range() doesn't handle
* YUV formats at all at the moment, so if we ever support YUV
* formats this needs to be revised.
@@ -887,11 +909,11 @@ enum drm_mode_status
drm_hdmi_connector_mode_valid(struct drm_connector *connector,
const struct drm_display_mode *mode)
{
unsigned long long clock;
- clock = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
+ clock = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444);
if (!clock)
return MODE_ERROR;
return hdmi_clock_valid(connector, mode, clock);
}
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 3b165a0d1e779ebcf7fe710a28ce3d15d7ab9c81..5f6177f4d5f0370604bdea3f943c6a313765aab3 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -385,11 +385,11 @@ void drm_bridge_add(struct drm_bridge *bridge)
mutex_init(&bridge->hpd_mutex);
if (bridge->ops & DRM_BRIDGE_OP_HDMI)
bridge->ycbcr_420_allowed = !!(bridge->supported_formats &
- BIT(HDMI_COLORSPACE_YUV420));
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420));
mutex_lock(&bridge_lock);
list_add_tail(&bridge->list, &bridge_list);
mutex_unlock(&bridge_lock);
}
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 4f5b27fab475c7c733622eb8727927571f3fb8fe..171cd495976a3e16f201fd339d3d42a09dc3b63f 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -589,14 +589,14 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
if (!(connector_type == DRM_MODE_CONNECTOR_HDMIA ||
connector_type == DRM_MODE_CONNECTOR_HDMIB))
return -EINVAL;
- if (!supported_formats || !(supported_formats & BIT(HDMI_COLORSPACE_RGB)))
+ if (!supported_formats || !(supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444)))
return -EINVAL;
- if (connector->ycbcr_420_allowed != !!(supported_formats & BIT(HDMI_COLORSPACE_YUV420)))
+ if (connector->ycbcr_420_allowed != !!(supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)))
return -EINVAL;
if (!(max_bpc == 8 || max_bpc == 10 || max_bpc == 12))
return -EINVAL;
@@ -1424,25 +1424,25 @@ drm_hdmi_connector_get_broadcast_rgb_name(enum drm_hdmi_broadcast_rgb broadcast_
return broadcast_rgb_names[broadcast_rgb].name;
}
EXPORT_SYMBOL(drm_hdmi_connector_get_broadcast_rgb_name);
static const char * const output_format_str[] = {
- [HDMI_COLORSPACE_RGB] = "RGB",
- [HDMI_COLORSPACE_YUV420] = "YUV 4:2:0",
- [HDMI_COLORSPACE_YUV422] = "YUV 4:2:2",
- [HDMI_COLORSPACE_YUV444] = "YUV 4:4:4",
+ [DRM_OUTPUT_COLOR_FORMAT_RGB444] = "RGB",
+ [DRM_OUTPUT_COLOR_FORMAT_YCBCR420] = "YUV 4:2:0",
+ [DRM_OUTPUT_COLOR_FORMAT_YCBCR422] = "YUV 4:2:2",
+ [DRM_OUTPUT_COLOR_FORMAT_YCBCR444] = "YUV 4:4:4",
};
/*
* drm_hdmi_connector_get_output_format_name() - Return a string for HDMI connector output format
* @fmt: Output format to compute name of
*
* Returns: the name of the output format, or NULL if the type is not
* valid.
*/
const char *
-drm_hdmi_connector_get_output_format_name(enum hdmi_colorspace fmt)
+drm_hdmi_connector_get_output_format_name(enum drm_output_color_format fmt)
{
if (fmt >= ARRAY_SIZE(output_format_str))
return NULL;
return output_format_str[fmt];
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c b/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c
index 279ca896b0a2a25e9dfd254be120e6ed0108b513..b5c738380dc2537d0a8deee73e99c95dde1d2c37 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c
@@ -745,27 +745,27 @@ static void mtk_hdmi_v2_change_video_resolution(struct mtk_hdmi *hdmi,
/* Enable scrambling if tmds clock is 340MHz or more */
mtk_hdmi_v2_enable_scrambling(hdmi, hdmi->mode.clock >= 340 * KILO);
switch (conn_state->hdmi.output_format) {
default:
- case HDMI_COLORSPACE_RGB:
- case HDMI_COLORSPACE_YUV444:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
/* Disable YUV420 downsampling for RGB and YUV444 */
mtk_hdmi_yuv420_downsampling(hdmi, false);
break;
- case HDMI_COLORSPACE_YUV422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
/*
* YUV420 downsampling is special and needs a bit of setup
* so we disable everything there before doing anything else.
*
* YUV422 downsampling instead just needs one bit to be set.
*/
mtk_hdmi_yuv420_downsampling(hdmi, false);
regmap_set_bits(hdmi->regs, VID_DOWNSAMPLE_CONFIG,
C444_C422_CONFIG_ENABLE);
break;
- case HDMI_COLORSPACE_YUV420:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR420:
mtk_hdmi_yuv420_downsampling(hdmi, true);
break;
}
}
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index a50f260c73e41493528e545591aaad0e3f138be2..dd2a78defdb4b93f454d2af6167a3d4e83e3d542 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -659,11 +659,11 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
"AW", "HDMI",
&sun4i_hdmi_connector_funcs,
&sun4i_hdmi_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA,
hdmi->ddc_i2c,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
if (ret) {
dev_err(dev,
"Couldn't initialise the HDMI connector\n");
goto err_cleanup_connector;
diff --git a/drivers/gpu/drm/tests/drm_connector_test.c b/drivers/gpu/drm/tests/drm_connector_test.c
index 86860ad0861c8eadbd7afd5d36500b7ab4d57433..beb1d50a6646419fed8d1e3b213decefbf18e190 100644
--- a/drivers/gpu/drm/tests/drm_connector_test.c
+++ b/drivers/gpu/drm/tests/drm_connector_test.c
@@ -673,11 +673,11 @@ static void drm_test_connector_hdmi_init_valid(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
}
/*
@@ -693,11 +693,11 @@ static void drm_test_connector_hdmi_init_null_ddc(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
NULL,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
}
/*
@@ -713,11 +713,11 @@ static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test)
NULL, "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -733,11 +733,11 @@ static void drm_test_connector_hdmi_init_null_product(struct kunit *test)
"Vendor", NULL,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -759,11 +759,11 @@ static void drm_test_connector_hdmi_init_product_valid(struct kunit *test)
"Vendor", product_name,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.product,
expected_product,
@@ -792,11 +792,11 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test
"Vendor", product_name,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.product,
expected_product,
@@ -819,11 +819,11 @@ static void drm_test_connector_hdmi_init_product_length_too_long(struct kunit *t
"Vendor", product_name,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -845,11 +845,11 @@ static void drm_test_connector_hdmi_init_vendor_valid(struct kunit *test)
vendor_name, "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.vendor,
expected_vendor,
@@ -877,11 +877,11 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test)
vendor_name, "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.vendor,
expected_vendor,
@@ -904,11 +904,11 @@ static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *te
vendor_name, "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -924,11 +924,11 @@ static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
9);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -944,11 +944,11 @@ static void drm_test_connector_hdmi_init_bpc_null(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
0);
KUNIT_EXPECT_LT(test, ret, 0);
}
/*
@@ -969,11 +969,11 @@ static void drm_test_connector_hdmi_init_bpc_8(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
KUNIT_ASSERT_NOT_NULL(test, prop);
@@ -1010,11 +1010,11 @@ static void drm_test_connector_hdmi_init_bpc_10(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
KUNIT_ASSERT_NOT_NULL(test, prop);
@@ -1051,11 +1051,11 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
KUNIT_ASSERT_NOT_NULL(test, prop);
@@ -1107,11 +1107,11 @@ static void drm_test_connector_hdmi_init_formats_no_rgb(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_YUV422),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
struct drm_connector_hdmi_init_formats_yuv420_allowed_test {
@@ -1120,21 +1120,21 @@ struct drm_connector_hdmi_init_formats_yuv420_allowed_test {
int expected_result;
};
#define YUV420_ALLOWED_TEST(_formats, _allowed, _result) \
{ \
- .supported_formats = BIT(HDMI_COLORSPACE_RGB) | (_formats), \
+ .supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | (_formats), \
.yuv420_allowed = _allowed, \
.expected_result = _result, \
}
static const struct drm_connector_hdmi_init_formats_yuv420_allowed_test
drm_connector_hdmi_init_formats_yuv420_allowed_tests[] = {
- YUV420_ALLOWED_TEST(BIT(HDMI_COLORSPACE_YUV420), true, 0),
- YUV420_ALLOWED_TEST(BIT(HDMI_COLORSPACE_YUV420), false, -EINVAL),
- YUV420_ALLOWED_TEST(BIT(HDMI_COLORSPACE_YUV422), true, -EINVAL),
- YUV420_ALLOWED_TEST(BIT(HDMI_COLORSPACE_YUV422), false, 0),
+ YUV420_ALLOWED_TEST(BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420), true, 0),
+ YUV420_ALLOWED_TEST(BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420), false, -EINVAL),
+ YUV420_ALLOWED_TEST(BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422), true, -EINVAL),
+ YUV420_ALLOWED_TEST(BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422), false, 0),
};
static void
drm_connector_hdmi_init_formats_yuv420_allowed_desc(const struct drm_connector_hdmi_init_formats_yuv420_allowed_test *t,
char *desc)
@@ -1186,11 +1186,11 @@ static void drm_test_connector_hdmi_init_type_valid(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
connector_type,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
}
static const unsigned int drm_connector_hdmi_init_type_valid_tests[] = {
@@ -1221,11 +1221,11 @@ static void drm_test_connector_hdmi_init_type_invalid(struct kunit *test)
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
connector_type,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_LT(test, ret, 0);
}
static const unsigned int drm_connector_hdmi_init_type_invalid_tests[] = {
@@ -1430,14 +1430,14 @@ static void drm_test_drm_hdmi_connector_get_output_format_name(struct kunit *tes
}
static const
struct drm_hdmi_connector_get_output_format_name_test
drm_hdmi_connector_get_output_format_name_valid_tests[] = {
- OUTPUT_FORMAT_TEST(HDMI_COLORSPACE_RGB, "RGB"),
- OUTPUT_FORMAT_TEST(HDMI_COLORSPACE_YUV420, "YUV 4:2:0"),
- OUTPUT_FORMAT_TEST(HDMI_COLORSPACE_YUV422, "YUV 4:2:2"),
- OUTPUT_FORMAT_TEST(HDMI_COLORSPACE_YUV444, "YUV 4:4:4"),
+ OUTPUT_FORMAT_TEST(DRM_OUTPUT_COLOR_FORMAT_RGB444, "RGB"),
+ OUTPUT_FORMAT_TEST(DRM_OUTPUT_COLOR_FORMAT_YCBCR420, "YUV 4:2:0"),
+ OUTPUT_FORMAT_TEST(DRM_OUTPUT_COLOR_FORMAT_YCBCR422, "YUV 4:2:2"),
+ OUTPUT_FORMAT_TEST(DRM_OUTPUT_COLOR_FORMAT_YCBCR444, "YUV 4:4:4"),
};
static void
drm_hdmi_connector_get_output_format_name_valid_desc(const struct drm_hdmi_connector_get_output_format_name_test *t,
char *desc)
@@ -1498,11 +1498,11 @@ static void drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector(
"Vendor", "Product",
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
&priv->ddc,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_EXPECT_EQ(test, ret, 0);
ret = drm_connector_attach_broadcast_rgb_property(connector);
KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1538,11 +1538,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb(struct kunit *test)
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1000ULL, rate);
}
/*
@@ -1559,11 +1559,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc(struct kunit *test)
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 10, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 10, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1250, rate);
}
/*
@@ -1578,11 +1578,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc_vic_1(struct kunit *t
struct drm_device *drm = &priv->drm;
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);
KUNIT_ASSERT_NOT_NULL(test, mode);
- rate = drm_hdmi_compute_mode_clock(mode, 10, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 10, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, rate, 0);
}
/*
* Test that for a given mode, with 12bpc and an RGB output the TMDS
@@ -1598,11 +1598,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc(struct kunit *test)
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1500, rate);
}
/*
@@ -1617,11 +1617,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc_vic_1(struct kunit *t
struct drm_device *drm = &priv->drm;
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);
KUNIT_ASSERT_NOT_NULL(test, mode);
- rate = drm_hdmi_compute_mode_clock(mode, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, rate, 0);
}
/*
* Test that for a mode with the pixel repetition flag, the TMDS
@@ -1637,11 +1637,11 @@ static void drm_test_drm_hdmi_compute_mode_clock_rgb_double(struct kunit *test)
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 6);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_TRUE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, (mode->clock * 1000ULL) * 2, rate);
}
/*
@@ -1660,11 +1660,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv420_valid(struct kunit
mode = drm_kunit_display_mode_from_cea_vic(test, drm, vic);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, (mode->clock * 1000ULL) / 2, rate);
}
static const unsigned int drm_hdmi_compute_mode_clock_yuv420_vic_valid_tests[] = {
@@ -1697,11 +1697,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv420_10_bpc(struct kuni
mode = drm_kunit_display_mode_from_cea_vic(test, drm, vic);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 10, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(mode, 10, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 625, rate);
}
@@ -1722,11 +1722,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv420_12_bpc(struct kuni
mode = drm_kunit_display_mode_from_cea_vic(test, drm, vic);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 12, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(mode, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 750, rate);
}
@@ -1745,11 +1745,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv422_8_bpc(struct kunit
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1000, rate);
}
/*
@@ -1767,11 +1767,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv422_10_bpc(struct kuni
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 10, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(mode, 10, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1000, rate);
}
/*
@@ -1789,11 +1789,11 @@ static void drm_test_connector_hdmi_compute_mode_clock_yuv422_12_bpc(struct kuni
mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16);
KUNIT_ASSERT_NOT_NULL(test, mode);
KUNIT_ASSERT_FALSE(test, mode->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(mode, 12, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(mode, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_GT(test, rate, 0);
KUNIT_EXPECT_EQ(test, mode->clock * 1000, rate);
}
static struct kunit_case drm_hdmi_compute_mode_clock_tests[] = {
diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
index 4bdcea3c7435146aebb1716f38d7302ddb7c6296..a4357efaa983dbd10262b4f77fb0581d8d9690c8 100644
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -237,11 +237,11 @@ __connector_hdmi_init(struct kunit *test,
KUNIT_ASSERT_EQ(test, ret, 0);
enc->possible_crtcs = drm_crtc_mask(priv->crtc);
conn = &priv->connector;
- conn->ycbcr_420_allowed = !!(formats & BIT(HDMI_COLORSPACE_YUV420));
+ conn->ycbcr_420_allowed = !!(formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420));
ret = drmm_connector_hdmi_init(drm, conn,
"Vendor", "Product",
&dummy_connector_funcs,
hdmi_funcs,
@@ -298,11 +298,11 @@ static void drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -373,11 +373,11 @@ static void drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -448,11 +448,11 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -515,11 +515,11 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode_vic_1(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
conn = &priv->connector;
@@ -582,11 +582,11 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -651,11 +651,11 @@ static void drm_test_check_broadcast_rgb_full_cea_mode_vic_1(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
conn = &priv->connector;
@@ -720,11 +720,11 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -789,11 +789,11 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode_vic_1(struct kunit *te
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
conn = &priv->connector;
@@ -861,12 +861,12 @@ static void drm_test_check_broadcast_rgb_cea_mode_yuv420(struct kunit *test)
int ret;
broadcast_rgb = *(enum drm_hdmi_broadcast_rgb *)test->param_value;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV420),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420),
8,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -916,11 +916,11 @@ static void drm_test_check_broadcast_rgb_cea_mode_yuv420(struct kunit *test)
conn_state = drm_atomic_get_new_connector_state(state, conn);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
KUNIT_ASSERT_EQ(test, conn_state->hdmi.broadcast_rgb, broadcast_rgb);
- KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_YUV420);
+ KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_EXPECT_TRUE(test, conn_state->hdmi.is_limited_range);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
@@ -961,11 +961,11 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1043,11 +1043,11 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1120,13 +1120,13 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12,
&dummy_connector_hdmi_funcs,
test_edid_dvi_1080p);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1155,11 +1155,11 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1177,11 +1177,11 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1208,11 +1208,11 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1000);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1232,11 +1232,11 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1263,11 +1263,11 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_bpc, 10);
- KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1250);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1287,11 +1287,11 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1318,11 +1318,11 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_bpc, 12);
- KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1500);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1346,11 +1346,11 @@ static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm = &priv->drm;
crtc = priv->crtc;
@@ -1414,11 +1414,11 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_rgb(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1431,14 +1431,14 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_rgb(struct kunit *test)
preferred = find_preferred_mode(conn);
KUNIT_ASSERT_NOT_NULL(test, preferred);
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 10, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1455,11 +1455,11 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_rgb(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 10);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1250);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1488,12 +1488,12 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_yuv420(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV420),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1507,14 +1507,14 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_yuv420(struct kunit *test)
yuv420_only_mode = drm_kunit_display_mode_from_cea_vic(test, drm, 95);
KUNIT_ASSERT_NOT_NULL(test, yuv420_only_mode);
KUNIT_ASSERT_TRUE(test, drm_mode_is_420_only(info, yuv420_only_mode));
- rate = drm_hdmi_compute_mode_clock(yuv420_only_mode, 12, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(yuv420_only_mode, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(yuv420_only_mode, 10, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(yuv420_only_mode, 10, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1529,11 +1529,11 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_yuv420(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 10);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_YUV420);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, yuv420_only_mode->clock * 625);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1563,13 +1563,13 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv422(struct kunit
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1582,17 +1582,17 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv422(struct kunit
preferred = find_preferred_mode(conn);
KUNIT_ASSERT_NOT_NULL(test, preferred);
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
- rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 10, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1609,11 +1609,11 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv422(struct kunit
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 10);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1642,12 +1642,12 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv420(struct kunit
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV420),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_4k_rgb_yuv420_dc_max_340mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1662,17 +1662,17 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv420(struct kunit
preferred = find_preferred_mode(conn);
KUNIT_ASSERT_NOT_NULL(test, preferred);
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
KUNIT_ASSERT_TRUE(test, drm_mode_is_420_also(info, preferred));
- rate = drm_hdmi_compute_mode_clock(preferred, 8, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 10, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV420);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1687,11 +1687,11 @@ static void drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv420(struct kunit
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1713,11 +1713,11 @@ static void drm_test_check_driver_unsupported_fallback_yuv420(struct kunit *test
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1748,11 +1748,11 @@ static void drm_test_check_driver_unsupported_fallback_yuv420(struct kunit *test
}
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
retry_crtc_state:
@@ -1798,13 +1798,13 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1845,11 +1845,11 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1869,11 +1869,11 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1894,14 +1894,14 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
* by the display, and YUV422 works for that display.
*
* But since the driver only supports RGB, we should fallback to
* a lower bpc with RGB.
*/
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1918,11 +1918,11 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_LT(test, conn_state->hdmi.output_bpc, 12);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -1942,13 +1942,13 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -1969,14 +1969,14 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
* by the display, and YUV422 works for that display.
*
* But since the display only supports RGB, we should fallback to
* a lower bpc with RGB.
*/
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000);
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -1993,11 +1993,11 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_LT(test, conn_state->hdmi.output_bpc, 12);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -2018,11 +2018,11 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2038,11 +2038,11 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
/*
* We're making sure that we have headroom on the TMDS character
* clock to actually use 12bpc.
*/
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -2059,11 +2059,11 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -2084,13 +2084,13 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_340mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2106,11 +2106,11 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
/*
* We're making sure that we have headroom on the TMDS character
* clock to actually use 12bpc.
*/
- rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
+ rate = drm_hdmi_compute_mode_clock(preferred, 12, DRM_OUTPUT_COLOR_FORMAT_RGB444);
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
drm_modeset_acquire_init(&ctx, 0);
retry_conn_enable:
@@ -2127,11 +2127,11 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
conn_state = conn->state;
KUNIT_ASSERT_NOT_NULL(test, conn_state);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8);
- KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
+ KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -2148,11 +2148,11 @@ static void drm_test_check_disable_connector(struct kunit *test)
struct drm_device *drm;
struct drm_crtc *crtc;
int ret;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
drm_modeset_acquire_init(&ctx, 0);
@@ -2253,11 +2253,11 @@ static void drm_test_check_broadcast_rgb_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2275,11 +2275,11 @@ static void drm_test_check_bpc_8_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2299,11 +2299,11 @@ static void drm_test_check_bpc_10_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2323,11 +2323,11 @@ static void drm_test_check_bpc_12_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
12);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2345,13 +2345,13 @@ static void drm_test_check_format_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2367,13 +2367,13 @@ static void drm_test_check_tmds_char_value(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector_state *conn_state;
struct drm_connector *conn;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
12);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
conn_state = conn->state;
@@ -2405,11 +2405,11 @@ static void drm_test_check_mode_valid(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector *conn;
struct drm_display_mode *preferred;
priv = drm_kunit_helper_connector_hdmi_init(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8);
KUNIT_ASSERT_NOT_NULL(test, priv);
conn = &priv->connector;
preferred = find_preferred_mode(conn);
@@ -2429,11 +2429,11 @@ static void drm_test_check_mode_valid_reject_rate(struct kunit *test)
{
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_display_mode *preferred;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&reject_100mhz_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2461,11 +2461,11 @@ static void drm_test_check_mode_valid_reject(struct kunit *test)
struct drm_display_mode *preferred;
unsigned char no_edid[] = {};
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&reject_connector_hdmi_funcs,
no_edid);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2491,11 +2491,11 @@ static void drm_test_check_mode_valid_reject_max_clock(struct kunit *test)
struct drm_atomic_helper_connector_hdmi_priv *priv;
struct drm_connector *conn;
struct drm_display_mode *preferred;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_100mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2538,11 +2538,11 @@ static void drm_test_check_infoframes(struct kunit *test)
struct drm_crtc *crtc;
int old_hdmi_update_failures;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&dummy_connector_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2641,11 +2641,11 @@ static void drm_test_check_reject_avi_infoframe(struct kunit *test)
struct drm_crtc *crtc;
int old_hdmi_update_failures;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&reject_avi_infoframe_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2745,11 +2745,11 @@ static void drm_test_check_reject_hdr_infoframe_bpc_8(struct kunit *test)
struct drm_crtc *crtc;
int old_hdmi_update_failures;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&reject_hdr_infoframe_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz_hdr);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2859,11 +2859,11 @@ static void drm_test_check_reject_hdr_infoframe_bpc_10(struct kunit *test)
struct drm_property_blob *hdr_blob;
bool replaced;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
10,
&reject_hdr_infoframe_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz_hdr);
KUNIT_ASSERT_NOT_NULL(test, priv);
@@ -2994,11 +2994,11 @@ static void drm_test_check_reject_audio_infoframe(struct kunit *test)
int old_hdmi_update_failures;
struct hdmi_audio_infoframe cea;
int ret;
priv = drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test,
- BIT(HDMI_COLORSPACE_RGB),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
8,
&reject_audio_infoframe_hdmi_funcs,
test_edid_hdmi_1080p_rgb_max_200mhz);
KUNIT_ASSERT_NOT_NULL(test, priv);
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 2ea31938168d73682724b312844fe2ba5a00d6d5..ceb09e133401bc67d1055fb99530207fbb7858c0 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -131,11 +131,11 @@ static bool vc4_hdmi_supports_scrambling(struct vc4_hdmi *vc4_hdmi)
return true;
}
static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode,
unsigned int bpc,
- enum hdmi_colorspace fmt)
+ enum drm_output_color_format fmt)
{
unsigned long long clock = drm_hdmi_compute_mode_clock(mode, bpc, fmt);
return clock > HDMI_14_MAX_TMDS_CLK;
}
@@ -442,11 +442,11 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
if (!vc4->hvs->vc5_hdmi_enable_hdmi_20) {
struct drm_device *drm = connector->dev;
const struct drm_display_mode *mode;
list_for_each_entry(mode, &connector->probed_modes, head) {
- if (vc4_hdmi_mode_needs_scrambling(mode, 8, HDMI_COLORSPACE_RGB)) {
+ if (vc4_hdmi_mode_needs_scrambling(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444)) {
drm_warn_once(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz.");
drm_warn_once(drm, "Please change your config.txt file to add hdmi_enable_4kp60.");
}
}
}
@@ -545,13 +545,13 @@ static int vc4_hdmi_connector_init(struct drm_device *dev,
"Broadcom", "Videocore",
&vc4_hdmi_connector_funcs,
&vc4_hdmi_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA,
vc4_hdmi->ddc,
- BIT(HDMI_COLORSPACE_RGB) |
- BIT(HDMI_COLORSPACE_YUV422) |
- BIT(HDMI_COLORSPACE_YUV444),
+ BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) |
+ BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444),
max_bpc);
if (ret)
return ret;
ret = drm_connector_hdmi_audio_init(connector, dev->dev,
@@ -1212,17 +1212,17 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
return;
spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
switch (state->hdmi.output_format) {
- case HDMI_COLORSPACE_YUV444:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR444:
csc = vc5_hdmi_find_yuv_csc_coeffs(vc4_hdmi, state->colorspace, !!lim_range);
vc5_hdmi_set_csc_coeffs_swap(vc4_hdmi, csc);
break;
- case HDMI_COLORSPACE_YUV422:
+ case DRM_OUTPUT_COLOR_FORMAT_YCBCR422:
csc = vc5_hdmi_find_yuv_csc_coeffs(vc4_hdmi, state->colorspace, !!lim_range);
csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
@@ -1235,11 +1235,11 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
vc5_hdmi_set_csc_coeffs(vc4_hdmi, csc);
break;
- case HDMI_COLORSPACE_RGB:
+ case DRM_OUTPUT_COLOR_FORMAT_RGB444:
if_xbar = 0x354021;
vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_rgb[lim_range]);
break;
@@ -1392,11 +1392,11 @@ static void vc5_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi,
/*
* YCC422 is always 36-bit and not considered deep colour so
* doesn't signal in GCP.
*/
- if (state->hdmi.output_format == HDMI_COLORSPACE_YUV422) {
+ if (state->hdmi.output_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) {
gcp = 0;
}
reg = HDMI_READ(HDMI_DEEP_COLOR_CONFIG_1);
reg &= ~(VC5_HDMI_DEEP_COLOR_CONFIG_1_INIT_PACK_PHASE_MASK |
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index 8d069718df00d9afc13aadbb12648e2bb75a1721..29d461d4ee49fdee29edd6a102e70ded9067a64b 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -208,11 +208,11 @@ struct vc4_hdmi {
/**
* @output_format: Copy of
* @drm_connector_state.hdmi.output_format for use outside of
* KMS hooks. Protected by @mutex.
*/
- enum hdmi_colorspace output_format;
+ enum drm_output_color_format output_format;
/**
* @hdmi_jack: Represents the connection state of the HDMI plug, for
* ALSA jack detection.
*/
diff --git a/include/drm/display/drm_hdmi_helper.h b/include/drm/display/drm_hdmi_helper.h
index 09145c9ee9fc0cd839242f2373b305940e06e157..414e134ca23bcdcdd6ef491812ed0a9020b204ba 100644
--- a/include/drm/display/drm_hdmi_helper.h
+++ b/include/drm/display/drm_hdmi_helper.h
@@ -2,10 +2,11 @@
#ifndef DRM_HDMI_HELPER
#define DRM_HDMI_HELPER
#include <linux/hdmi.h>
+#include <drm/drm_connector.h>
struct drm_connector;
struct drm_connector_state;
struct drm_display_mode;
@@ -24,11 +25,11 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
const struct drm_connector_state *conn_state);
unsigned long long
drm_hdmi_compute_mode_clock(const struct drm_display_mode *mode,
- unsigned int bpc, enum hdmi_colorspace fmt);
+ unsigned int bpc, enum drm_output_color_format fmt);
void
drm_hdmi_acr_get_n_cts(unsigned long long tmds_char_rate,
unsigned int sample_rate,
unsigned int *out_n,
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index e97c8a209ef5c96ecf4bcb5f0b1b5f1bc0f35b3c..8d7b761c54c1da676afc2a8859b975be936806dc 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -400,12 +400,10 @@ enum drm_hdmi_broadcast_rgb {
DRM_HDMI_BROADCAST_RGB_LIMITED,
};
const char *
drm_hdmi_connector_get_broadcast_rgb_name(enum drm_hdmi_broadcast_rgb broadcast_rgb);
-const char *
-drm_hdmi_connector_get_output_format_name(enum hdmi_colorspace fmt);
/**
* struct drm_monitor_range_info - Panel's Monitor range in EDID for
* &drm_display_info
*
@@ -579,10 +577,13 @@ enum drm_output_color_format {
DRM_OUTPUT_COLOR_FORMAT_YCBCR444,
DRM_OUTPUT_COLOR_FORMAT_YCBCR422,
DRM_OUTPUT_COLOR_FORMAT_YCBCR420,
};
+const char *
+drm_hdmi_connector_get_output_format_name(enum drm_output_color_format fmt);
+
/**
* enum drm_bus_flags - bus_flags info for &drm_display_info
*
* This enum defines signal polarities and clock edge information for signals on
* a bus as bitmask flags.
@@ -1010,11 +1011,11 @@ struct drm_connector_hdmi_state {
unsigned int output_bpc;
/**
* @output_format: Pixel format to output in.
*/
- enum hdmi_colorspace output_format;
+ enum drm_output_color_format output_format;
/**
* @tmds_char_rate: TMDS Character Rate, in Hz.
*/
unsigned long long tmds_char_rate;
--
2.52.0 | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Tue, 24 Feb 2026 11:58:53 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Tue, 24 Feb 2026, Maxime Ripard <mripard@kernel.org> wrote:
You could avoid the include by forward declaring the enum, which is not
strictly standard C but allowed by both GCC and Clang, and quite useful
in reducing header dependencies.
BR,
Jani.
--
Jani Nikula, Intel | {
"author": "Jani Nikula <jani.nikula@linux.intel.com>",
"date": "Tue, 24 Feb 2026 14:43:37 +0200",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Tue, 24 Feb 2026, Maxime Ripard <mripard@kernel.org> wrote:
I like this. I eyeballed through the series, but did not spend enough
time to call it detailed review.
Acked-by: Jani Nikula <jani.nikula@intel.com>
--
Jani Nikula, Intel | {
"author": "Jani Nikula <jani.nikula@linux.intel.com>",
"date": "Tue, 24 Feb 2026 14:44:57 +0200",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Tue, Feb 24, 2026 at 11:58:49AM +0100, Maxime Ripard wrote:
For the first patch in the series that introduces the enum and this one:
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Best regards,
Liviu
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯ | {
"author": "Liviu Dudau <liviu.dudau@arm.com>",
"date": "Wed, 25 Feb 2026 16:12:08 +0000",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Tuesday, 24 February 2026 11:58:53 Central European Standard Time Maxime Ripard wrote:
Almost unrelated nit: we might want to also `fmt < 0 ||` here, since the
base type of enums is a signed int. I almost caught myself using this function
as a way to quickly check if a supplied color format property from userspace
was valid, which would've had some unpleasant consequences for the kernel's
memory.
Alternatively, I make my own switch-case based "is this a valid enum value"
function. I probably should do that actually, but my laziness lead me to
make sure we only have a single source of truth of what counts as a valid
enum value.
Thanks for your work on this series, I was afraid of getting rid of
DRM_COLOR_FORMAT_* myself because I suspected it was going to be a
fairly large refactor across every driver. Guess I was both right
and wrong: it touches many files, but all the replacements are
fairly simple. :)
Kind regards,
Nicolas Frattaroli | {
"author": "Nicolas Frattaroli <nicolas.frattaroli@collabora.com>",
"date": "Wed, 25 Feb 2026 18:03:00 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Wednesday, 25 February 2026 18:03:00 Central European Standard Time Nicolas Frattaroli wrote:
Gah, disregard this, I just realised that this enum shouldn't be used as
the one in the property anyway, because of AUTO, as you already pointed out
in your reply to my series as well. | {
"author": "Nicolas Frattaroli <nicolas.frattaroli@collabora.com>",
"date": "Wed, 25 Feb 2026 18:21:46 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Di, 2026-02-24 at 11:58 +0100, Maxime Ripard wrote:
s/different/difference/
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp | {
"author": "Philipp Zabel <p.zabel@pengutronix.de>",
"date": "Thu, 26 Feb 2026 09:58:24 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Di, 2026-02-24 at 11:58 +0100, Maxime Ripard wrote:
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp | {
"author": "Philipp Zabel <p.zabel@pengutronix.de>",
"date": "Thu, 26 Feb 2026 09:59:38 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Di, 2026-02-24 at 11:58 +0100, Maxime Ripard wrote:
Can we move this? Either up, directly after drm_output_color_format, or
down, directly before color_formats.
I think 8d70f395e6cb ("drm: Add support for a panel-orientation
connector property, v6") didn't separate the two on purpose.
Maybe s/YCrCb/YCbCr/ for consistency?
regards
Philipp | {
"author": "Philipp Zabel <p.zabel@pengutronix.de>",
"date": "Thu, 26 Feb 2026 10:12:02 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Tuesday, 24 February 2026 11:58:53 Central European Standard Time Maxime Ripard wrote:
I don't think this will work as-is. drm_bridge_connector_init calls this
function assuming hdmi_colorspace bitmasks in supported_formats.
This may have slipped through the conversion; the synopsys dw-hdmi-qp core
(separate from synopsys dw-hdmi) also assumes hdmi_colorspace, see e.g.
dw_hdmi_qp_plat_data::supported_formats in include/drm/bridge/dw_hdmi_qp.h
So should be a simple fix I hope.
Kind regards,
Nicolas Frattaroli | {
"author": "Nicolas Frattaroli <nicolas.frattaroli@collabora.com>",
"date": "Thu, 26 Feb 2026 17:24:05 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Hi
On Thu, Feb 26, 2026 at 05:24:05PM +0100, Nicolas Frattaroli wrote:
Yeah, you're right I missed the conversion in drm_bridge_connector_init.
It should be fixed now.
For this one, did you identify anything more than the comment in
dw_hdmi_qp_plat_data? I couldn't find any user of HDMI_COLORSPACE_* left
for the dw_hdmi_qp_plat_data.supported_formats users.
Maxime | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Fri, 27 Feb 2026 09:29:05 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Hi Philipp
On Thu, Feb 26, 2026 at 10:12:02AM +0100, Philipp Zabel wrote:
I'm not sure it's worth it, the last patch in this series will remove
these so it's not going to stick around either.
Yep, definitely. I'll update it.
Maxime | {
"author": "Maxime Ripard <mripard@kernel.org>",
"date": "Fri, 27 Feb 2026 09:38:13 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | On Friday, 27 February 2026 09:29:05 Central European Standard Time Maxime Ripard wrote:
Nope, it's really just the comment. My series will obviously need
adjusting since it makes use of that member, but that's part of my
rebase. So far, there don't seem to be any users that set the member,
so it's just the comment documenting it.
Kind regards,
Nicolas Frattaroli | {
"author": "Nicolas Frattaroli <nicolas.frattaroli@collabora.com>",
"date": "Fri, 27 Feb 2026 13:46:50 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | Hi,
This series creates an enum to represent the output color format as an
enum instead of a bitmask, and consolidate the HDMI helpers to use the
new enum.
This should make Nicolas' work easier.
It has been build tested, and passes kunit tests.
Let me know what you think,
Maxime
---
Maxime Ripard (14):
drm/connector: Introduce drm_output_color_format enum
drm/edid: Convert to drm_output_color_format enum
drm/display: hdmi: Convert to drm_output_color_format
drm/amdgpu: display: Convert to drm_output_color_format
drm/bridge: adv7511: Convert to drm_output_color_format
drm/bridge: analogix: Convert to drm_output_color_format
drm/bridge: cadence: Convert to drm_output_color_format
drm/bridge: synopsys: dw-dp: Convert to drm_output_color_format
drm/bridge: synopsys: dw-hdmi: Convert to drm_output_color_format
drm/arm: komeda: Convert to drm_output_color_format
drm/mediatek: dp: Convert to drm_output_color_format
drm/rockchip: analogix: Convert to drm_output_color_format
drm/connector: Remove DRM_COLOR_FORMAT defines
drm/display: hdmi: Use drm_output_color_format instead of hdmi_colorspace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_pipeline.h | 5 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +-
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 24 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-dp.c | 71 ++++----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 ++++---
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_connector.c | 14 +-
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 4 +-
drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 ++++++++++-----------
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
include/drm/display/drm_hdmi_helper.h | 3 +-
include/drm/drm_connector.h | 46 ++++--
28 files changed, 326 insertions(+), 278 deletions(-)
---
base-commit: 3a2ffb469faa8240fe87e7d5f3533d14fdcc69f3
change-id: 20260224-drm-rework-color-formats-82dcccc13c11
Best regards,
--
Maxime Ripard <mripard@kernel.org>
| null | null | null | [PATCH 00/14] drm: Create drm_output_color_format enum | Hi Maxime,
On Fr, 2026-02-27 at 09:38 +0100, Maxime Ripard wrote:
[...]
[...]
I agree it's not, I just didn't look as far as patch 13.
regards
Philipp | {
"author": "Philipp Zabel <p.zabel@pengutronix.de>",
"date": "Fri, 27 Feb 2026 16:10:39 +0100",
"is_openbsd": false,
"thread_id": "20260224-drm-rework-color-formats-v1-0-bebc76604ada@kernel.org.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | This patch set adds support for standard ethtool statistics - rmon,
eth-ctrl, eth-mac and pause - to dpaa2-mac and its users dpaa2-eth and
dpaa2-switch.
The first patch extends the firmware APIs related to MAC counters and
adds dpmac_get_statistics() which can be used to retrieve multiple counter
values through a single firmware call.
This new API is put in use in the second patch by gathering all
previously exported ethtool statistics through a single MC firmware
call. In this patch we are also adding the setup and cleanup
infrastructure which will be also used for the standard ethtool
counters.
The third patch adds the actual suppord for rmon, eth-ctrl, eth-mac and
pause statistics in dpaa2-mac and its users.
The last two patches extend the selftest infrastructure with a new
script - ethtool_std_stats.sh - which validates the standard counters
(except rmon which is already covered). This new selftest was run on
LX2160ARDB with both dpaa2-eth and dpaa2-switch interfaces as well as
LS1028ARDB with ENETC and Felix switch interfaces.
Ioana Ciornei (5):
net: dpaa2-mac: extend APIs related to statistics
net: dpaa2-mac: retrieve MAC statistics in one firmware command
net: dpaa2-mac: export standard statistics
selftests: forwarding: extend ethtool_std_stats_get with pause
statistics
selftests: drivers: hw: add tests for the ethtool standard counters
.../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 59 ++-
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 381 ++++++++++++++++--
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 23 +-
.../freescale/dpaa2/dpaa2-switch-ethtool.c | 45 ++-
.../net/ethernet/freescale/dpaa2/dpmac-cmd.h | 11 +-
drivers/net/ethernet/freescale/dpaa2/dpmac.c | 30 +-
drivers/net/ethernet/freescale/dpaa2/dpmac.h | 86 +++-
.../testing/selftests/drivers/net/hw/Makefile | 1 +
.../drivers/net/hw/ethtool_std_stats.sh | 192 +++++++++
tools/testing/selftests/net/forwarding/lib.sh | 8 +-
10 files changed, 792 insertions(+), 44 deletions(-)
create mode 100755 tools/testing/selftests/drivers/net/hw/ethtool_std_stats.sh
--
2.25.1 | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Wed, 25 Feb 2026 17:06:43 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | Even though pause frame statistics are not exported through the same
ethtool command, there is no point in adding another helper just for
them. Extent the ethtool_std_stats_get() function so that we are able to
interrogate using the same helper all the standard statistics.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
tools/testing/selftests/net/forwarding/lib.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index a9034f0bb58b..efd236ae1c28 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -831,8 +831,12 @@ ethtool_std_stats_get()
local name=$1; shift
local src=$1; shift
- ethtool --json -S $dev --groups $grp -- --src $src | \
- jq '.[]."'"$grp"'"."'$name'"'
+ if [[ "$grp" == "pause" ]]; then
+ ethtool -I --json -a $dev | jq '.[].statistics.'$name
+ else
+ ethtool --json -S $dev --groups $grp -- --src $src | \
+ jq '.[]."'"$grp"'"."'$name'"'
+ fi
}
qdisc_stats_get()
--
2.25.1 | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Wed, 25 Feb 2026 17:06:47 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | Take advantage of all the newly added MAC counters available through the
MC API and export them through the standard statistics structures -
rmon, eth-ctrl, eth-mac and pause.
A new version based feature is added into dpaa2-mac -
DPAA2_MAC_FEATURE_STANDARD_STATS - and based on the two memory zones
needed for gathering the MAC counters are setup for each statistics
group.
The dpmac_counter structure is extended with a new field - size_t offset
- which is being used to instruct the dpaa2_mac_transfer_stats()
function where exactly to store a counter value inside the standard
statistics structure.
The newly added support is used both in the dpaa2-eth driver as well as
the dpaa2-switch one.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 59 +++++-
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 192 ++++++++++++++++++
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 13 ++
.../freescale/dpaa2/dpaa2-switch-ethtool.c | 45 +++-
4 files changed, 307 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
index baab4f1c908d..6f3b15a404fb 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* Copyright 2014-2016 Freescale Semiconductor Inc.
- * Copyright 2016-2022 NXP
+ * Copyright 2016-2022, 2024-2026 NXP
*/
#include <linux/net_tstamp.h>
@@ -938,6 +938,59 @@ static void dpaa2_eth_get_channels(struct net_device *net_dev,
channels->other_count;
}
+static void dpaa2_eth_get_rmon_stats(struct net_device *net_dev,
+ struct ethtool_rmon_stats *rmon_stats,
+ const struct ethtool_rmon_hist_range **ranges)
+{
+ struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+ mutex_lock(&priv->mac_lock);
+
+ if (dpaa2_eth_has_mac(priv))
+ dpaa2_mac_get_rmon_stats(priv->mac, rmon_stats, ranges);
+
+ mutex_unlock(&priv->mac_lock);
+}
+
+static void dpaa2_eth_get_pause_stats(struct net_device *net_dev,
+ struct ethtool_pause_stats *pause_stats)
+{
+ struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+ mutex_lock(&priv->mac_lock);
+
+ if (dpaa2_eth_has_mac(priv))
+ dpaa2_mac_get_pause_stats(priv->mac, pause_stats);
+
+ mutex_unlock(&priv->mac_lock);
+}
+
+static void dpaa2_eth_get_ctrl_stats(struct net_device *net_dev,
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+ struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+ mutex_lock(&priv->mac_lock);
+
+ if (dpaa2_eth_has_mac(priv))
+ dpaa2_mac_get_ctrl_stats(priv->mac, ctrl_stats);
+
+ mutex_unlock(&priv->mac_lock);
+}
+
+static void dpaa2_eth_get_eth_mac_stats(struct net_device *net_dev,
+ struct ethtool_eth_mac_stats *eth_mac_stats)
+{
+ struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+ mutex_lock(&priv->mac_lock);
+
+ if (dpaa2_eth_has_mac(priv))
+ dpaa2_mac_get_eth_mac_stats(priv->mac, eth_mac_stats);
+
+ mutex_unlock(&priv->mac_lock);
+}
+
const struct ethtool_ops dpaa2_ethtool_ops = {
.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
@@ -962,4 +1015,8 @@ const struct ethtool_ops dpaa2_ethtool_ops = {
.get_coalesce = dpaa2_eth_get_coalesce,
.set_coalesce = dpaa2_eth_set_coalesce,
.get_channels = dpaa2_eth_get_channels,
+ .get_rmon_stats = dpaa2_eth_get_rmon_stats,
+ .get_pause_stats = dpaa2_eth_get_pause_stats,
+ .get_eth_ctrl_stats = dpaa2_eth_get_ctrl_stats,
+ .get_eth_mac_stats = dpaa2_eth_get_eth_mac_stats,
};
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 63dc597dbd7c..abdac6ce7bc4 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -18,20 +18,43 @@
#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+#define DPMAC_STANDARD_STATS_VER_MAJOR 4
+#define DPMAC_STANDARD_STATS_VER_MINOR 11
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+#define DPAA2_MAC_FEATURE_STANDARD_STATS BIT(2)
struct dpmac_counter {
enum dpmac_counter_id id;
+ size_t offset;
const char *name;
};
+#define DPMAC_COUNTER(counter_id, struct_name, struct_offset) \
+ { \
+ .id = counter_id, \
+ .offset = offsetof(struct_name, struct_offset), \
+ }
+
#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
{ \
.id = counter_id, \
.name = counter_name, \
}
+#define DPMAC_RMON_COUNTER(counter_id, struct_offset) \
+ DPMAC_COUNTER(counter_id, struct ethtool_rmon_stats, struct_offset)
+
+#define DPMAC_PAUSE_COUNTER(counter_id, struct_offset) \
+ DPMAC_COUNTER(counter_id, struct ethtool_pause_stats, struct_offset)
+
+#define DPMAC_CTRL_COUNTER(counter_id, struct_offset) \
+ DPMAC_COUNTER(counter_id, struct ethtool_eth_ctrl_stats, struct_offset)
+
+#define DPMAC_MAC_COUNTER(counter_id, struct_offset) \
+ DPMAC_COUNTER(counter_id, struct ethtool_eth_mac_stats, struct_offset)
+
static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
@@ -65,6 +88,60 @@ static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+static const struct dpmac_counter dpaa2_mac_rmon_stats[] = {
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_64, hist[0]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_127, hist[1]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_255, hist[2]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_511, hist[3]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_1023, hist[4]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_1518, hist[5]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, hist[6]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_64, hist_tx[0]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_127, hist_tx[1]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_255, hist_tx[2]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_511, hist_tx[3]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_1023, hist_tx[4]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_1518, hist_tx[5]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_FRAME_1519_MAX, hist_tx[6]),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, undersize_pkts),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_OVERSIZED, oversize_pkts),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_FRAG, fragments),
+ DPMAC_RMON_COUNTER(DPMAC_CNT_ING_JABBER, jabbers),
+};
+
+#define DPAA2_MAC_NUM_RMON_STATS ARRAY_SIZE(dpaa2_mac_rmon_stats)
+
+static const struct dpmac_counter dpaa2_mac_pause_stats[] = {
+ DPMAC_PAUSE_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, rx_pause_frames),
+ DPMAC_PAUSE_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, tx_pause_frames),
+};
+
+#define DPAA2_MAC_NUM_PAUSE_STATS ARRAY_SIZE(dpaa2_mac_pause_stats)
+
+static const struct dpmac_counter dpaa2_mac_eth_ctrl_stats[] = {
+ DPMAC_CTRL_COUNTER(DPMAC_CNT_ING_CONTROL_FRAME, MACControlFramesReceived),
+ DPMAC_CTRL_COUNTER(DPMAC_CNT_EGR_CONTROL_FRAME, MACControlFramesTransmitted),
+};
+
+#define DPAA2_MAC_NUM_ETH_CTRL_STATS ARRAY_SIZE(dpaa2_mac_eth_ctrl_stats)
+
+static const struct dpmac_counter dpaa2_mac_eth_mac_stats[] = {
+ DPMAC_MAC_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, FramesTransmittedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, FramesReceivedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_FCS_ERR, FrameCheckSequenceErrors),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, AlignmentErrors),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_EGR_ALL_BYTE, OctetsTransmittedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, FramesLostDueToIntMACXmitError),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_ALL_BYTE, OctetsReceivedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD_NOT_TRUNC, FramesLostDueToIntMACRcvError),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, MulticastFramesXmittedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, BroadcastFramesXmittedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, MulticastFramesReceivedOK),
+ DPMAC_MAC_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, BroadcastFramesReceivedOK),
+};
+
+#define DPAA2_MAC_NUM_ETH_MAC_STATS ARRAY_SIZE(dpaa2_mac_eth_mac_stats)
+
static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
size_t num_stats, const struct dpmac_counter *counters)
{
@@ -150,6 +227,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STANDARD_STATS_VER_MAJOR,
+ DPMAC_STANDARD_STATS_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STANDARD_STATS;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -626,6 +707,20 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+ if (mac->features & DPAA2_MAC_FEATURE_STANDARD_STATS) {
+ dpaa2_mac_setup_stats(mac, &mac->rmon_stats,
+ DPAA2_MAC_NUM_RMON_STATS, dpaa2_mac_rmon_stats);
+
+ dpaa2_mac_setup_stats(mac, &mac->pause_stats,
+ DPAA2_MAC_NUM_PAUSE_STATS, dpaa2_mac_pause_stats);
+
+ dpaa2_mac_setup_stats(mac, &mac->eth_ctrl_stats,
+ DPAA2_MAC_NUM_ETH_CTRL_STATS, dpaa2_mac_eth_ctrl_stats);
+
+ dpaa2_mac_setup_stats(mac, &mac->eth_mac_stats,
+ DPAA2_MAC_NUM_ETH_MAC_STATS, dpaa2_mac_eth_mac_stats);
+ }
+
return 0;
err_close_dpmac:
@@ -640,11 +735,108 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (mac->features & DPAA2_MAC_FEATURE_STANDARD_STATS) {
+ dpaa2_mac_clear_stats(mac, &mac->rmon_stats, DPAA2_MAC_NUM_RMON_STATS);
+ dpaa2_mac_clear_stats(mac, &mac->pause_stats, DPAA2_MAC_NUM_PAUSE_STATS);
+ dpaa2_mac_clear_stats(mac, &mac->eth_ctrl_stats, DPAA2_MAC_NUM_ETH_CTRL_STATS);
+ dpaa2_mac_clear_stats(mac, &mac->eth_mac_stats, DPAA2_MAC_NUM_ETH_MAC_STATS);
+ }
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
+static void dpaa2_mac_transfer_stats(const struct dpmac_counter *counters,
+ size_t num_counters, void *s,
+ u64 *cnt_values)
+{
+ for (size_t i = 0; i < num_counters; i++) {
+ u64 *p = s + counters[i].offset;
+
+ *p = le64_to_cpu(cnt_values[i]);
+ }
+}
+
+static const struct ethtool_rmon_hist_range dpaa2_mac_rmon_ranges[] = {
+ { 64, 64 },
+ { 65, 127 },
+ { 128, 255 },
+ { 256, 511 },
+ { 512, 1023 },
+ { 1024, 1518 },
+ { 1519, DPAA2_ETH_MFL },
+ {},
+};
+
+static void dpaa2_mac_get_standard_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_cnt, const struct dpmac_counter *counters,
+ void *s)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ int err;
+
+ if (!(mac->features & DPAA2_MAC_FEATURE_STANDARD_STATS))
+ return;
+
+ if (!stats->idx_dma_mem || !stats->values_dma_mem)
+ return;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ stats->idx_iova, stats->values_iova,
+ num_cnt);
+ if (err) {
+ netdev_err(mac->net_dev, "%s: dpmac_get_statistics() = %d\n",
+ __func__, err);
+ return;
+ }
+
+ dma_sync_single_for_cpu(dev, stats->values_iova, num_cnt * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ dpaa2_mac_transfer_stats(counters, num_cnt, s, stats->values_dma_mem);
+}
+
+void dpaa2_mac_get_rmon_stats(struct dpaa2_mac *mac, struct ethtool_rmon_stats *s,
+ const struct ethtool_rmon_hist_range **ranges)
+{
+ if (s->src != ETHTOOL_MAC_STATS_SRC_AGGREGATE)
+ return;
+
+ dpaa2_mac_get_standard_stats(mac, &mac->rmon_stats, DPAA2_MAC_NUM_RMON_STATS,
+ dpaa2_mac_rmon_stats, s);
+
+ *ranges = dpaa2_mac_rmon_ranges;
+}
+
+void dpaa2_mac_get_pause_stats(struct dpaa2_mac *mac, struct ethtool_pause_stats *s)
+{
+ if (s->src != ETHTOOL_MAC_STATS_SRC_AGGREGATE)
+ return;
+
+ dpaa2_mac_get_standard_stats(mac, &mac->pause_stats, DPAA2_MAC_NUM_PAUSE_STATS,
+ dpaa2_mac_pause_stats, s);
+}
+
+void dpaa2_mac_get_ctrl_stats(struct dpaa2_mac *mac, struct ethtool_eth_ctrl_stats *s)
+{
+ if (s->src != ETHTOOL_MAC_STATS_SRC_AGGREGATE)
+ return;
+
+ dpaa2_mac_get_standard_stats(mac, &mac->eth_ctrl_stats, DPAA2_MAC_NUM_ETH_CTRL_STATS,
+ dpaa2_mac_eth_ctrl_stats, s);
+}
+
+void dpaa2_mac_get_eth_mac_stats(struct dpaa2_mac *mac, struct ethtool_eth_mac_stats *s)
+{
+ if (s->src != ETHTOOL_MAC_STATS_SRC_AGGREGATE)
+ return;
+
+ dpaa2_mac_get_standard_stats(mac, &mac->eth_mac_stats, DPAA2_MAC_NUM_ETH_MAC_STATS,
+ dpaa2_mac_eth_mac_stats, s);
+}
+
int dpaa2_mac_get_sset_count(void)
{
return DPAA2_MAC_NUM_ETHTOOL_STATS;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 386286209606..eeb632b9da0a 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -36,6 +36,10 @@ struct dpaa2_mac {
struct phy *serdes_phy;
struct dpaa2_mac_stats ethtool_stats;
+ struct dpaa2_mac_stats rmon_stats;
+ struct dpaa2_mac_stats pause_stats;
+ struct dpaa2_mac_stats eth_ctrl_stats;
+ struct dpaa2_mac_stats eth_mac_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
@@ -61,6 +65,15 @@ void dpaa2_mac_get_strings(u8 **data);
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data);
+void dpaa2_mac_get_rmon_stats(struct dpaa2_mac *mac, struct ethtool_rmon_stats *s,
+ const struct ethtool_rmon_hist_range **ranges);
+
+void dpaa2_mac_get_pause_stats(struct dpaa2_mac *mac, struct ethtool_pause_stats *s);
+
+void dpaa2_mac_get_ctrl_stats(struct dpaa2_mac *mac, struct ethtool_eth_ctrl_stats *s);
+
+void dpaa2_mac_get_eth_mac_stats(struct dpaa2_mac *mac, struct ethtool_eth_mac_stats *s);
+
void dpaa2_mac_start(struct dpaa2_mac *mac);
void dpaa2_mac_stop(struct dpaa2_mac *mac);
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c
index a888f6e6e9b0..3203873fae85 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c
@@ -3,7 +3,7 @@
* DPAA2 Ethernet Switch ethtool support
*
* Copyright 2014-2016 Freescale Semiconductor Inc.
- * Copyright 2017-2018 NXP
+ * Copyright 2017-2018, 2024-2026 NXP
*
*/
@@ -210,6 +210,46 @@ static void dpaa2_switch_ethtool_get_stats(struct net_device *netdev,
mutex_unlock(&port_priv->mac_lock);
}
+static void dpaa2_switch_get_rmon_stats(struct net_device *netdev,
+ struct ethtool_rmon_stats *rmon_stats,
+ const struct ethtool_rmon_hist_range **ranges)
+{
+ struct ethsw_port_priv *port_priv = netdev_priv(netdev);
+
+ mutex_lock(&port_priv->mac_lock);
+
+ if (dpaa2_switch_port_has_mac(port_priv))
+ dpaa2_mac_get_rmon_stats(port_priv->mac, rmon_stats, ranges);
+
+ mutex_unlock(&port_priv->mac_lock);
+}
+
+static void dpaa2_switch_get_ctrl_stats(struct net_device *net_dev,
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+ struct ethsw_port_priv *port_priv = netdev_priv(net_dev);
+
+ mutex_lock(&port_priv->mac_lock);
+
+ if (dpaa2_switch_port_has_mac(port_priv))
+ dpaa2_mac_get_ctrl_stats(port_priv->mac, ctrl_stats);
+
+ mutex_unlock(&port_priv->mac_lock);
+}
+
+static void dpaa2_switch_get_eth_mac_stats(struct net_device *net_dev,
+ struct ethtool_eth_mac_stats *eth_mac_stats)
+{
+ struct ethsw_port_priv *port_priv = netdev_priv(net_dev);
+
+ mutex_lock(&port_priv->mac_lock);
+
+ if (dpaa2_switch_port_has_mac(port_priv))
+ dpaa2_mac_get_eth_mac_stats(port_priv->mac, eth_mac_stats);
+
+ mutex_unlock(&port_priv->mac_lock);
+}
+
const struct ethtool_ops dpaa2_switch_port_ethtool_ops = {
.get_drvinfo = dpaa2_switch_get_drvinfo,
.get_link = ethtool_op_get_link,
@@ -218,4 +258,7 @@ const struct ethtool_ops dpaa2_switch_port_ethtool_ops = {
.get_strings = dpaa2_switch_ethtool_get_strings,
.get_ethtool_stats = dpaa2_switch_ethtool_get_stats,
.get_sset_count = dpaa2_switch_ethtool_get_sset_count,
+ .get_rmon_stats = dpaa2_switch_get_rmon_stats,
+ .get_eth_ctrl_stats = dpaa2_switch_get_ctrl_stats,
+ .get_eth_mac_stats = dpaa2_switch_get_eth_mac_stats,
};
--
2.25.1 | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Wed, 25 Feb 2026 17:06:46 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | Extend the dpmac_counter_id enum with the newly added counters which can
be interrogated through the MC firmware. Also add the
dpmac_get_statistics() API which can be used to retrieve multiple MAC
counters through a single firmware command.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpmac-cmd.h | 11 ++-
drivers/net/ethernet/freescale/dpaa2/dpmac.c | 30 ++++++-
drivers/net/ethernet/freescale/dpaa2/dpmac.h | 86 ++++++++++++++++++-
3 files changed, 123 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h
index e9ac2ecef3be..a864a99a0f75 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
/* Copyright 2013-2016 Freescale Semiconductor Inc.
- * Copyright 2019 NXP
+ * Copyright 2019, 2024-2026 NXP
*/
#ifndef _FSL_DPMAC_CMD_H
#define _FSL_DPMAC_CMD_H
@@ -28,6 +28,8 @@
#define DPMAC_CMDID_SET_PROTOCOL DPMAC_CMD(0x0c7)
+#define DPMAC_CMDID_GET_STATISTICS DPMAC_CMD(0x0c8)
+
/* Macros for accessing command fields smaller than 1byte */
#define DPMAC_MASK(field) \
GENMASK(DPMAC_##field##_SHIFT + DPMAC_##field##_SIZE - 1, \
@@ -82,4 +84,11 @@ struct dpmac_rsp_get_api_version {
struct dpmac_cmd_set_protocol {
u8 eth_if;
};
+
+struct dpmac_cmd_get_statistics {
+ __le64 iova_cnt;
+ __le64 iova_values;
+ __le32 num_cnt;
+};
+
#endif /* _FSL_DPMAC_CMD_H */
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.c b/drivers/net/ethernet/freescale/dpaa2/dpmac.c
index f440a4c3b70c..8957665c05fc 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpmac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpmac.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/* Copyright 2013-2016 Freescale Semiconductor Inc.
- * Copyright 2019 NXP
+ * Copyright 2019, 2024-2026 NXP
*/
#include <linux/fsl/mc.h>
#include "dpmac.h"
@@ -235,3 +235,31 @@ int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,
return mc_send_command(mc_io, &cmd);
}
+
+/**
+ * dpmac_get_statistics() - Get MAC statistics
+ * @mc_io: Pointer to opaque I/O object
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
+ * @token: Token of DPMAC object
+ * @iova_cnt: IOVA containing the requested MAC counters formatted as an
+ * array of __le32 representing the dpmac_counter_id.
+ * @iova_values: IOVA containing the values for all the requested counters
+ * formatted as an array of __le64.
+ * @num_cnt: Number of counters requested
+ *
+ * Return: '0' on Success; Error code otherwise.
+ */
+int dpmac_get_statistics(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,
+ u64 iova_cnt, u64 iova_values, u32 num_cnt)
+{
+ struct dpmac_cmd_get_statistics *cmd_params;
+ struct fsl_mc_command cmd = { 0 };
+
+ cmd.header = mc_encode_cmd_header(DPMAC_CMDID_GET_STATISTICS, cmd_flags, token);
+ cmd_params = (struct dpmac_cmd_get_statistics *)cmd.params;
+ cmd_params->iova_cnt = cpu_to_le64(iova_cnt);
+ cmd_params->iova_values = cpu_to_le64(iova_values);
+ cmd_params->num_cnt = cpu_to_le32(num_cnt);
+
+ return mc_send_command(mc_io, &cmd);
+}
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.h b/drivers/net/ethernet/freescale/dpaa2/dpmac.h
index 17488819ef68..857b40a5b339 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpmac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpmac.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
/* Copyright 2013-2016 Freescale Semiconductor Inc.
- * Copyright 2019 NXP
+ * Copyright 2019, 2024-2026 NXP
*/
#ifndef __FSL_DPMAC_H
#define __FSL_DPMAC_H
@@ -170,6 +170,50 @@ int dpmac_set_link_state(struct fsl_mc_io *mc_io,
* pause frames.
* @DPMAC_CNT_EGR_GOOD_FRAME: counts frames transmitted without error, including
* pause frames.
+ * @DPMAC_CNT_EGR_FRAME_64: counts transmitted 64-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_127: counts transmitted 65 to 127-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_255: counts transmitted 128 to 255-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_511: counts transmitted 256 to 511-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_1023: counts transmitted 512 to 1023-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_1518: counts transmitted 1024 to 1518-bytes frames, good or bad.
+ * @DPMAC_CNT_EGR_FRAME_1519_MAX: counts transmitted 1519-bytes frames and
+ * larger (up to max frame length specified), good or bad.
+ * @DPMAC_CNT_ING_ALL_BYTE: counts bytes received in both good and bad packets
+ * @DPMAC_CNT_ING_FCS_ERR: counts frames received with a CRC-32 error but the
+ * frame is otherwise of correct length
+ * @DPMAC_CNT_ING_VLAN_FRAME: counts the received VLAN tagged frames which are valid.
+ * @DPMAC_CNT_ING_UNDERSIZED: counts received frames which were less than 64
+ * bytes long and with a good CRC.
+ * @DPMAC_CNT_ING_CONTROL_FRAME: counts received control frames (type 0x8808)
+ * but not pause frames.
+ * @DPMAC_CNT_ING_FRAME_DISCARD_NOT_TRUNC: counts the fully dropped frames (not
+ * truncated) due to internal errors of the MAC client. Occurs when a received
+ * FIFO overflows.
+ * @DPMAC_CNT_EGR_ALL_BYTE: counts transmitted bytes in both good and bad
+ * packets.
+ * @DPMAC_CNT_EGR_FCS_ERR: counts trasmitted frames with a CRC-32 error except
+ * for underflows.
+ * @DPMAC_CNT_EGR_VLAN_FRAME: counts the transmitted VLAN tagged frames which
+ * are valid.
+ * @DPMAC_CNT_EGR_ALL_FRAME: counts all trasmitted frames, good or bad.
+ * @DPMAC_CNT_EGR_CONTROL_FRAME: counts transmitted control frames (type
+ * 0x8808) but not pause frames.
+ * @DPMAC_CNT_ING_PFC0: number of PFC frames received for class 0.
+ * @DPMAC_CNT_ING_PFC1: number of PFC frames received for class 1.
+ * @DPMAC_CNT_ING_PFC2: number of PFC frames received for class 2.
+ * @DPMAC_CNT_ING_PFC3: number of PFC frames received for class 3.
+ * @DPMAC_CNT_ING_PFC4: number of PFC frames received for class 4.
+ * @DPMAC_CNT_ING_PFC5: number of PFC frames received for class 5.
+ * @DPMAC_CNT_ING_PFC6: number of PFC frames received for class 6.
+ * @DPMAC_CNT_ING_PFC7: number of PFC frames received for class 7.
+ * @DPMAC_CNT_EGR_PFC0: number of PFC frames transmitted for class 0.
+ * @DPMAC_CNT_EGR_PFC1: number of PFC frames transmitted for class 1.
+ * @DPMAC_CNT_EGR_PFC2: number of PFC frames transmitted for class 2.
+ * @DPMAC_CNT_EGR_PFC3: number of PFC frames transmitted for class 3.
+ * @DPMAC_CNT_EGR_PFC4: number of PFC frames transmitted for class 4.
+ * @DPMAC_CNT_EGR_PFC5: number of PFC frames transmitted for class 5.
+ * @DPMAC_CNT_EGR_PFC6: number of PFC frames transmitted for class 6.
+ * @DPMAC_CNT_EGR_PFC7: number of PFC frames transmitted for class 7.
*/
enum dpmac_counter_id {
DPMAC_CNT_ING_FRAME_64,
@@ -199,7 +243,41 @@ enum dpmac_counter_id {
DPMAC_CNT_EGR_UCAST_FRAME,
DPMAC_CNT_EGR_ERR_FRAME,
DPMAC_CNT_ING_GOOD_FRAME,
- DPMAC_CNT_EGR_GOOD_FRAME
+ DPMAC_CNT_EGR_GOOD_FRAME,
+ DPMAC_CNT_EGR_FRAME_64,
+ DPMAC_CNT_EGR_FRAME_127,
+ DPMAC_CNT_EGR_FRAME_255,
+ DPMAC_CNT_EGR_FRAME_511,
+ DPMAC_CNT_EGR_FRAME_1023,
+ DPMAC_CNT_EGR_FRAME_1518,
+ DPMAC_CNT_EGR_FRAME_1519_MAX,
+ DPMAC_CNT_ING_ALL_BYTE,
+ DPMAC_CNT_ING_FCS_ERR,
+ DPMAC_CNT_ING_VLAN_FRAME,
+ DPMAC_CNT_ING_UNDERSIZED,
+ DPMAC_CNT_ING_CONTROL_FRAME,
+ DPMAC_CNT_ING_FRAME_DISCARD_NOT_TRUNC,
+ DPMAC_CNT_EGR_ALL_BYTE,
+ DPMAC_CNT_EGR_FCS_ERR,
+ DPMAC_CNT_EGR_VLAN_FRAME,
+ DPMAC_CNT_EGR_ALL_FRAME,
+ DPMAC_CNT_EGR_CONTROL_FRAME,
+ DPMAC_CNT_ING_PFC0,
+ DPMAC_CNT_ING_PFC1,
+ DPMAC_CNT_ING_PFC2,
+ DPMAC_CNT_ING_PFC3,
+ DPMAC_CNT_ING_PFC4,
+ DPMAC_CNT_ING_PFC5,
+ DPMAC_CNT_ING_PFC6,
+ DPMAC_CNT_ING_PFC7,
+ DPMAC_CNT_EGR_PFC0,
+ DPMAC_CNT_EGR_PFC1,
+ DPMAC_CNT_EGR_PFC2,
+ DPMAC_CNT_EGR_PFC3,
+ DPMAC_CNT_EGR_PFC4,
+ DPMAC_CNT_EGR_PFC5,
+ DPMAC_CNT_EGR_PFC6,
+ DPMAC_CNT_EGR_PFC7,
};
int dpmac_get_counter(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,
@@ -210,4 +288,8 @@ int dpmac_get_api_version(struct fsl_mc_io *mc_io, u32 cmd_flags,
int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,
enum dpmac_eth_if protocol);
+
+int dpmac_get_statistics(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,
+ u64 iova_cnt, u64 iova_values, u32 num_cnt);
+
#endif /* __FSL_DPMAC_H */
--
2.25.1 | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Wed, 25 Feb 2026 17:06:44 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | Add a new selftest - ethtool_std_stats.sh - which validates the
eth-ctrl, eth-mac and pause standard statistics exported by an
interface. Not all counters can be validated in software, especially
those that are keeping track of errors. Counters such as
SingleCollisionFrames, FrameCheckSequenceErrors etc are not tested nor
included in this new selftest.
The central part of this patch is the traffic_test() function which
gathers the 'before' counter values, sends a batch of traffic and then
interrogates again the same counters in order to determine if the delta
is on target. The function receives an array through which the caller
can request what counters to be interrogated and, for each of them, what
is their target delta value.
The output from this selftest looks as follows on a LX2160ARDB board:
$ ./ethtool_std_stats.sh eth0 eth1
TEST: eth-ctrl tx on eth0 (MACControlFramesTransmitted on eth0) [ OK ]
TEST: eth-ctrl tx on eth0 (MACControlFramesReceived on eth1) [ OK ]
TEST: eth-ctrl tx on eth1 (MACControlFramesTransmitted on eth1) [ OK ]
TEST: eth-ctrl tx on eth1 (MACControlFramesReceived on eth0) [ OK ]
TEST: eth-mac bcast tx on eth0 (BroadcastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac bcast tx on eth0 (FramesTransmittedOK on eth0) [ OK ]
TEST: eth-mac bcast tx on eth0 (OctetsTransmittedOK on eth0) [ OK ]
TEST: eth-mac bcast tx on eth0 (MulticastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac bcast tx on eth0 (BroadcastFramesReceivedOK on eth1) [ OK ]
TEST: eth-mac bcast tx on eth0 (FramesReceivedOK on eth1) [ OK ]
TEST: eth-mac bcast tx on eth0 (OctetsReceivedOK on eth1) [ OK ]
TEST: eth-mac bcast tx on eth0 (MulticastFramesReceivedOK on eth1) [ OK ]
TEST: eth-mac mcast tx on eth0 (BroadcastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac mcast tx on eth0 (FramesTransmittedOK on eth0) [ OK ]
TEST: eth-mac mcast tx on eth0 (OctetsTransmittedOK on eth0) [ OK ]
TEST: eth-mac mcast tx on eth0 (MulticastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac mcast tx on eth0 (BroadcastFramesReceivedOK on eth1) [ OK ]
TEST: eth-mac mcast tx on eth0 (FramesReceivedOK on eth1) [ OK ]
TEST: eth-mac mcast tx on eth0 (OctetsReceivedOK on eth1) [ OK ]
TEST: eth-mac mcast tx on eth0 (MulticastFramesReceivedOK on eth1) [ OK ]
TEST: eth-mac ucast tx on eth0 (BroadcastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac ucast tx on eth0 (FramesTransmittedOK on eth0) [ OK ]
TEST: eth-mac ucast tx on eth0 (OctetsTransmittedOK on eth0) [ OK ]
TEST: eth-mac ucast tx on eth0 (MulticastFramesXmittedOK on eth0) [ OK ]
TEST: eth-mac ucast tx on eth0 (BroadcastFramesReceivedOK on eth1) [ OK ]
TEST: eth-mac ucast tx on eth0 (FramesReceivedOK on eth1) [ OK ]
TEST: eth-mac ucast tx on eth0 (OctetsReceivedOK on eth1) [ OK ]
TEST: eth-mac ucast tx on eth0 (MulticastFramesReceivedOK on eth1) [ OK ]
TEST: pause tx on eth0 (tx_pause_frames on eth0) [ OK ]
TEST: pause tx on eth0 (rx_pause_frames on eth1) [ OK ]
TEST: pause tx on eth1 (tx_pause_frames on eth1) [ OK ]
TEST: pause tx on eth1 (rx_pause_frames on eth0) [ OK ]
Please note that not all MACs are counting the software injected pause
frames as real Tx pause. For example, on a LS1028ARDB the selftest
output will reflect the fact that neither the ENETC MAC, nor the Felix
switch MAC are able to detect Tx pause frames injected by software.
$ ./ethtool_std_stats.sh eno0 swp0
(...)
TEST: Not all MACs detect injected pause frames [XFAIL]
TEST: pause tx on eno0 (rx_pause_frames on swp0) [ OK ]
TEST: Not all MACs detect injected pause frames [XFAIL]
TEST: pause tx on swp0 (rx_pause_frames on eno0) [ OK ]
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../testing/selftests/drivers/net/hw/Makefile | 1 +
.../drivers/net/hw/ethtool_std_stats.sh | 192 ++++++++++++++++++
2 files changed, 193 insertions(+)
create mode 100755 tools/testing/selftests/drivers/net/hw/ethtool_std_stats.sh
diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile
index a64140333a46..d447813a14b2 100644
--- a/tools/testing/selftests/drivers/net/hw/Makefile
+++ b/tools/testing/selftests/drivers/net/hw/Makefile
@@ -26,6 +26,7 @@ TEST_PROGS = \
ethtool_extended_state.sh \
ethtool_mm.sh \
ethtool_rmon.sh \
+ ethtool_std_stats.sh \
hw_stats_l3.sh \
hw_stats_l3_gre.sh \
iou-zcrx.py \
diff --git a/tools/testing/selftests/drivers/net/hw/ethtool_std_stats.sh b/tools/testing/selftests/drivers/net/hw/ethtool_std_stats.sh
new file mode 100755
index 000000000000..4ce8f140a18c
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/hw/ethtool_std_stats.sh
@@ -0,0 +1,192 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#shellcheck disable=SC2034 # SC does not see the global variables
+
+ALL_TESTS="
+ test_eth_ctrl_stats
+ test_eth_mac_stats
+ test_pause_stats
+"
+STABLE_MAC_ADDRS=yes
+NUM_NETIFS=2
+lib_dir=$(dirname "$0")
+# shellcheck source=./../../../net/forwarding/lib.sh
+source "$lib_dir"/../../../net/forwarding/lib.sh
+
+traffic_test()
+{
+ local iface=$1; shift
+ local neigh=$1; shift
+ local num_tx=$1; shift
+ local pkt_format="$1"; shift
+ local title="$1"; shift
+ declare -a counters=( "${@:2:$1}" ); shift "$(( $1 + 1 ))"
+ local before after delta target_high extra
+ local int grp counter target unit
+ local num_rx=$((num_tx * 2))
+ local xfail_message
+ local src="aggregate"
+
+ for i in "${!counters[@]}"; do
+ read -r int grp counter target unit xfail_message <<< "${counters[$i]}"
+ before[i]=$(ethtool_std_stats_get "$int" "$grp" "$counter" "$src")
+ done
+
+ # shellcheck disable=SC2086 # needs split options
+ $MZ "$iface" -q -c "$num_tx" $pkt_format
+
+ # shellcheck disable=SC2086 # needs split options
+ $MZ "$neigh" -q -c "$num_rx" $pkt_format
+
+ for i in "${!counters[@]}"; do
+ read -r int grp counter target unit xfail_message<<< "${counters[$i]}"
+
+ after[i]=$(ethtool_std_stats_get "$int" "$grp" "$counter" "$src")
+ if [[ "${after[$i]}" == "null" ]]; then
+ log_test_skip "$int does not support $grp-$counter"
+ continue;
+ fi
+
+ delta=$((after[i] - before[i]))
+
+ # Allow an extra 1% tolerance for random packets sent by the stack
+ extra=$((num_pkts * unit / 100))
+ target_high=$((target + extra))
+
+ RET=0
+ [ "$delta" -ge "$target" ] && [ "$delta" -le "$target_high" ]
+ err="$?"
+ if [[ $err != 0 ]] && [[ -n $xfail_message ]]; then
+ log_test_xfail "$xfail_message"
+ continue;
+ fi
+ check_err "$err" "$grp-$counter is not valid on $int (expected $target, got $delta)"
+ log_test "$title" "$counter on $int"
+ done
+}
+
+test_eth_ctrl_stats()
+{
+ local pkt_format="-a own -b bcast 88:08 -p 64"
+ local num_pkts=1000
+ local counters
+
+ counters=("$h1 eth-ctrl MACControlFramesTransmitted $num_pkts 1"
+ "$h2 eth-ctrl MACControlFramesReceived $num_pkts 1")
+ traffic_test "$h1" "$h2" "$num_pkts" "$pkt_format" \
+ "eth-ctrl tx on $h1" \
+ "${#counters[@]}" "${counters[@]}"
+
+ counters=("$h2 eth-ctrl MACControlFramesTransmitted $num_pkts 1"
+ "$h1 eth-ctrl MACControlFramesReceived $num_pkts 1")
+ traffic_test "$h2" "$h1" "$num_pkts" "$pkt_format" \
+ "eth-ctrl tx on $h2" \
+ "${#counters[@]}" "${counters[@]}"
+}
+
+test_eth_mac_stats()
+{
+ local pkt_size=100
+ local pkt_size_fcs=$((pkt_size + 4))
+ local bcast_pkt_format="-a own -b bcast -p $pkt_size"
+ local mcast_pkt_format="-a own -b -b 01:00:5E:00:00:01 -p $pkt_size"
+ local ucast_pkt_format="-a own -b $h2_mac -p $pkt_size"
+ local num_pkts=2000
+ local octets=$((pkt_size_fcs * num_pkts))
+ local counters
+
+ counters=("$h1 eth-mac BroadcastFramesXmittedOK $num_pkts 1"
+ "$h1 eth-mac FramesTransmittedOK $num_pkts 1"
+ "$h1 eth-mac OctetsTransmittedOK $octets $pkt_size_fcs"
+ "$h1 eth-mac MulticastFramesXmittedOK 0 1"
+ "$h2 eth-mac BroadcastFramesReceivedOK $num_pkts 1"
+ "$h2 eth-mac FramesReceivedOK $num_pkts 1"
+ "$h2 eth-mac OctetsReceivedOK $octets $pkt_size_fcs"
+ "$h2 eth-mac MulticastFramesReceivedOK 0 1")
+ traffic_test "$h1" "$h2" "$num_pkts" "$bcast_pkt_format" \
+ "eth-mac bcast tx on $h1" \
+ "${#counters[@]}" "${counters[@]}"
+
+ counters=("$h1 eth-mac BroadcastFramesXmittedOK 0 1"
+ "$h1 eth-mac FramesTransmittedOK $num_pkts 1"
+ "$h1 eth-mac OctetsTransmittedOK $octets $pkt_size_fcs"
+ "$h1 eth-mac MulticastFramesXmittedOK $num_pkts 1"
+ "$h2 eth-mac BroadcastFramesReceivedOK 0 1"
+ "$h2 eth-mac FramesReceivedOK $num_pkts 1"
+ "$h2 eth-mac OctetsReceivedOK $octets $pkt_size_fcs"
+ "$h2 eth-mac MulticastFramesReceivedOK $num_pkts 1")
+ traffic_test "$h1" "$h2" "$num_pkts" "$mcast_pkt_format" \
+ "eth-mac mcast tx on $h1" \
+ "${#counters[@]}" "${counters[@]}"
+
+ counters=("$h1 eth-mac BroadcastFramesXmittedOK 0 1"
+ "$h1 eth-mac FramesTransmittedOK $num_pkts 1"
+ "$h1 eth-mac OctetsTransmittedOK $octets $pkt_size_fcs"
+ "$h1 eth-mac MulticastFramesXmittedOK 0 1"
+ "$h2 eth-mac BroadcastFramesReceivedOK 0 1"
+ "$h2 eth-mac FramesReceivedOK $num_pkts 1"
+ "$h2 eth-mac OctetsReceivedOK $octets $pkt_size_fcs"
+ "$h2 eth-mac MulticastFramesReceivedOK 0 1")
+ traffic_test "$h1" "$h2" "$num_pkts" "$ucast_pkt_format" \
+ "eth-mac ucast tx on $h1" \
+ "${#counters[@]}" "${counters[@]}"
+}
+
+test_pause_stats()
+{
+ local pkt_format="-a own -b 01:80:c2:00:00:01 88:08:00:01:00:01"
+ local xfail_message="Not all MACs detect injected pause frames"
+ local num_pkts=2000
+ local counters i
+
+ # Check that there is pause frame support
+ for ((i = 1; i <= NUM_NETIFS; ++i)); do
+ if ! ethtool -I --json -a "${NETIFS[p$i]}" > /dev/null 2>&1; then
+ log_test_skip "No support for pause frames, skip tests"
+ exit
+ fi
+ done
+
+ counters=("$h1 pause tx_pause_frames $num_pkts 1 $xfail_message"
+ "$h2 pause rx_pause_frames $num_pkts 1")
+ traffic_test "$h1" "$h2" "$num_pkts" "$pkt_format" \
+ "pause tx on $h1" \
+ "${#counters[@]}" "${counters[@]}"
+
+ counters=("$h2 pause tx_pause_frames $num_pkts 1 $xfail_message"
+ "$h1 pause rx_pause_frames $num_pkts 1")
+ traffic_test "$h2" "$h1" "$num_pkts" "$pkt_format" \
+ "pause tx on $h2" \
+ "${#counters[@]}" "${counters[@]}"
+}
+
+setup_prepare()
+{
+ h1=${NETIFS[p1]}
+ h2=${NETIFS[p2]}
+
+ h2_mac=$(mac_get "$h2")
+
+ for iface in $h1 $h2; do
+ ip link set dev "$iface" up
+ done
+}
+
+cleanup()
+{
+ pre_cleanup
+
+ for iface in $h2 $h1; do
+ ip link set dev "$iface" down
+ done
+}
+
+check_ethtool_counter_group_support
+trap cleanup EXIT
+
+setup_prepare
+setup_wait
+
+tests_run
+
+exit "$EXIT_STATUS"
--
2.25.1 | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Wed, 25 Feb 2026 17:06:48 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Wed, Feb 25, 2026 at 05:06:48PM +0200, Ioana Ciornei wrote:
Hi Ioana
Thanks for the test!
Do we actually expect errors when running such a test? How many times
have you run this test and seen any of the error counters be anything
other than 0?
Which do you think is more likely:
1) A real error happens
2) Bug in the driver so that it reports a value in the wrong place?
Maybe we should check the error counters are zero?
Andrew | {
"author": "Andrew Lunn <andrew@lunn.ch>",
"date": "Thu, 26 Feb 2026 00:38:58 +0100",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Thu, Feb 26, 2026 at 12:38:58AM +0100, Andrew Lunn wrote:
No, we don't expect any errors with this test and I didn't see any error
counters incremenent in the tens of times that I ran the selftest. But,
to be fair, I was not looking for them thoroughly through testing.
I would say that having a driver bug is much likely than, for example,
having an FCS error.
Ok, I will extend the test to check the errors against zero and see how it behaves.
Thanks! | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Thu, 26 Feb 2026 09:03:32 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Thu, Feb 26, 2026 at 09:03:32AM +0200, Ioana Ciornei wrote:
I am back with a bit more information. The counters which were not
checked in this version can be grouped in two categories:
- Error counters such as:
u64 FrameCheckSequenceErrors;
u64 AlignmentErrors;
u64 FramesLostDueToIntMACXmitError;
u64 CarrierSenseErrors;
u64 FramesLostDueToIntMACRcvError;
u64 InRangeLengthErrors;
u64 OutOfRangeLengthField;
u64 FrameTooLongErrors;
u64 FramesAbortedDueToXSColls;
I did extend the selftest with these ones so that we check them
against zero. I ran the test hundreds of times and I did not see any
problems.
- Collision related counters (not really errors):
u64 SingleCollisionFrames;
u64 MultipleCollisionFrames;
u64 FramesWithDeferredXmissions;
u64 LateCollisions;
u64 FramesWithExcessiveDeferral;
With these I don't know what to do. Theoretically, they could be
non-zero in half-duplex circumstances which means that checking for
zero would not be entirely accurate.
Ioana | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Thu, 26 Feb 2026 14:19:33 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | Great.
How about, fail the test if any are greater than 1% of the number of
packets transmitted/received? My _guess_ is, if you have 1% packet
loss, networking is not going to be happy anyway. It probably means
you have one end doing Half duplex and the other Full. That is a
typical configuration error you see causing collisions. Not that i've
actually seen this for maybe a decade!
Failing the test, with a comment about checking duplex configuration,
seems sensible.
Andrew | {
"author": "Andrew Lunn <andrew@lunn.ch>",
"date": "Thu, 26 Feb 2026 14:31:26 +0100",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Wed, 25 Feb 2026 17:06:48 +0200 Ioana Ciornei wrote:
Argh, at some point we should probably decide whether we have
a preference on which "library" / set of env vars we use under
drivers/net/hw. Adding Petr to CC.
The existing tests under drivers/net/hw which source forwarding/lib.sh
pre-date the "NIC setup" described in
tools/testing/selftests/drivers/net/README.rst
Should we ask "NIC setup" to be used for all tests which only need
NUM_NETIFS=2 ? These are basically simple tests where one netif is
a traffic generator and the other is the DUT. And IIUC the "forwarding
setup" can't be used when the traffic generator is controlled over SSH? | {
"author": "Jakub Kicinski <kuba@kernel.org>",
"date": "Thu, 26 Feb 2026 18:22:23 -0800",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Thu, 26 Feb 2026 16:18:21 +0200 Ioana Ciornei wrote:
FWIW the expectation is that the test should be able to run even on
systems / boards with a single interface. So the control traffic
(communicating with the traffic generator) will run over the same
interface as the test. 1% error is unachievable. I'd only check the
lower bound, and use some sanity value for the upper bound (2^30 ?)
if at all | {
"author": "Jakub Kicinski <kuba@kernel.org>",
"date": "Thu, 26 Feb 2026 18:25:11 -0800",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | This is an AI-generated review of your patch. The human sending this
email has considered the AI review valid, or at least plausible.
For local reproduction steps see https://netdev-ai.bots.linux.dev/ai-local.html
---
net: dpaa2-mac: retrieve MAC statistics in one firmware command
The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well. In order to use the dpmac_get_statistics() API,
two DMA memory areas are used: one to transmit what counters the driver
is requesting and one to receive the values of those counters. These
memory areas are allocated and DMA mapped at probe time so that we don't
waste time at runtime.
[ ... ]
[ ... ]
^
Does the fallback path need to pass dpaa2_mac_ethtool_stats[i].id instead
of i here?
The old code used a sparse array indexed by enum dpmac_counter_id values:
static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
[DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
...
};
where the loop index i directly corresponded to the enum value passed to
dpmac_get_counter(). The new code uses a compact array where array index 0
contains DPMAC_CNT_ING_ALL_FRAME (enum value 18), but the fallback code
still passes i (sequential 0, 1, 2...) instead of the stored enum value.
When i=0, the code requests counter 0 (DPMAC_CNT_ING_FRAME_64) but the
name is "[mac] rx all frames" (DPMAC_CNT_ING_ALL_FRAME). This would cause
all statistics to report wrong values for their labels.
[ ... ]
--
pw-bot: cr | {
"author": "Jakub Kicinski <kuba@kernel.org>",
"date": "Thu, 26 Feb 2026 18:26:13 -0800",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Thu, Feb 26, 2026 at 06:25:11PM -0800, Jakub Kicinski wrote:
Really? I didn't know of that expectation at all.
I did take ethtool_rmon.sh as an example and that selftest as well
takes NUM_NETIFS=2 and does check for both a lower bound and upper bound
that takes into account a 1% deviance from the target.
How would the test even work with only a single interface? | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Fri, 27 Feb 2026 09:34:28 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Thu, Feb 26, 2026 at 06:26:13PM -0800, Jakub Kicinski wrote:
(...)
Yes, that is indeed true. Thanks for catching it!
Ioana | {
"author": "Ioana Ciornei <ioana.ciornei@nxp.com>",
"date": "Fri, 27 Feb 2026 12:37:56 +0200",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
lkml_critique | lkml | The latest MC firmware version added a new command to retrieve all DPMAC
counters in a single firmware call. Use this new command, when possible,
in dpaa2-mac as well.
In order to use the dpmac_get_statistics() API, two DMA memory areas are
used: one to transmit what counters the driver is requesting and one to
receive the values of those counters. These memory areas are allocated
and DMA mapped at probe time so that we don't waste time at runtime.
And since we are planning to add rmon, eth-ctrl and other standard
statistics using the same infrastructure, make the setup and cleanup
processes as generic as possibile through the dpaa2_mac_setup_stats()
and dpaa2_mac_clear_stats() functions.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 195 ++++++++++++++----
.../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +-
2 files changed, 166 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 422ce13a7c94..63dc597dbd7c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#include <linux/acpi.h>
#include <linux/pcs-lynx.h>
@@ -15,7 +15,121 @@
#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR 4
#define DPMAC_PROTOCOL_CHANGE_VER_MINOR 8
+#define DPMAC_STATS_BUNDLE_VER_MAJOR 4
+#define DPMAC_STATS_BUNDLE_VER_MINOR 10
+
#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE BIT(0)
+#define DPAA2_MAC_FEATURE_STATS_BUNDLE BIT(1)
+
+struct dpmac_counter {
+ enum dpmac_counter_id id;
+ const char *name;
+};
+
+#define DPMAC_UNSTRUCTURED_COUNTER(counter_id, counter_name) \
+ { \
+ .id = counter_id, \
+ .name = counter_name, \
+ }
+
+static const struct dpmac_counter dpaa2_mac_ethtool_stats[] = {
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALL_FRAME, "[mac] rx all frames"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_GOOD_FRAME, "[mac] rx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ERR_FRAME, "[mac] rx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_DISCARD, "[mac] rx frame discards"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_UCAST_FRAME, "[mac] rx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BCAST_FRAME, "[mac] rx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_MCAST_FRAME, "[mac] rx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_64, "[mac] rx 64 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_127, "[mac] rx 65-127 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_255, "[mac] rx 128-255 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_511, "[mac] rx 256-511 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1023, "[mac] rx 512-1023 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1518, "[mac] rx 1024-1518 bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAME_1519_MAX, "[mac] rx 1519-max bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_FRAG, "[mac] rx frags"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_JABBER, "[mac] rx jabber"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_ALIGN_ERR, "[mac] rx align errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_OVERSIZED, "[mac] rx oversized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_VALID_PAUSE_FRAME, "[mac] rx pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_ING_BYTE, "[mac] rx bytes"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_GOOD_FRAME, "[mac] tx frames ok"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UCAST_FRAME, "[mac] tx u-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_MCAST_FRAME, "[mac] tx m-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BCAST_FRAME, "[mac] tx b-cast"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_ERR_FRAME, "[mac] tx frame errors"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_UNDERSIZED, "[mac] tx undersized"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_VALID_PAUSE_FRAME, "[mac] tx b-pause"),
+ DPMAC_UNSTRUCTURED_COUNTER(DPMAC_CNT_EGR_BYTE, "[mac] tx bytes"),
+};
+
+#define DPAA2_MAC_NUM_ETHTOOL_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
+
+static void dpaa2_mac_setup_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats, const struct dpmac_counter *counters)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+ u32 *cnt_idx;
+
+ stats->idx_dma_mem = kcalloc(num_stats, sizeof(u32), GFP_KERNEL);
+ if (!stats->idx_dma_mem)
+ goto out;
+
+ stats->values_dma_mem = kcalloc(num_stats, sizeof(u64), GFP_KERNEL);
+ if (!stats->values_dma_mem)
+ goto err_alloc_values;
+
+ cnt_idx = stats->idx_dma_mem;
+ for (size_t i = 0; i < num_stats; i++)
+ *cnt_idx++ = cpu_to_le32((u32)(counters[i].id));
+
+ stats->idx_iova = dma_map_single(dev, stats->idx_dma_mem,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dev, stats->idx_iova))
+ goto err_dma_map_idx;
+
+ stats->values_iova = dma_map_single(dev, stats->values_dma_mem,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dev, stats->values_iova))
+ goto err_dma_map_values;
+
+ return;
+
+err_dma_map_values:
+ dma_unmap_single(dev, stats->idx_iova, num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+err_dma_map_idx:
+ kfree(stats->values_dma_mem);
+err_alloc_values:
+ kfree(stats->idx_dma_mem);
+out:
+ stats->idx_dma_mem = NULL;
+ stats->values_dma_mem = NULL;
+}
+
+static void dpaa2_mac_clear_stats(struct dpaa2_mac *mac, struct dpaa2_mac_stats *stats,
+ size_t num_stats)
+{
+ struct device *dev = mac->net_dev->dev.parent;
+
+ if (stats->idx_dma_mem) {
+ dma_unmap_single(dev, stats->idx_iova,
+ num_stats * sizeof(u32),
+ DMA_TO_DEVICE);
+ kfree(stats->idx_dma_mem);
+ stats->idx_dma_mem = NULL;
+ }
+
+ if (stats->values_dma_mem) {
+ dma_unmap_single(dev, stats->values_iova,
+ num_stats * sizeof(u64),
+ DMA_FROM_DEVICE);
+ kfree(stats->values_dma_mem);
+ stats->values_dma_mem = NULL;
+ }
+}
static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,
u16 ver_major, u16 ver_minor)
@@ -32,6 +146,10 @@ static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)
if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,
DPMAC_PROTOCOL_CHANGE_VER_MINOR) >= 0)
mac->features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;
+
+ if (dpaa2_mac_cmp_ver(mac, DPMAC_STATS_BUNDLE_VER_MAJOR,
+ DPMAC_STATS_BUNDLE_VER_MINOR) >= 0)
+ mac->features |= DPAA2_MAC_FEATURE_STATS_BUNDLE;
}
static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
@@ -504,6 +622,10 @@ int dpaa2_mac_open(struct dpaa2_mac *mac)
mac->fw_node = fw_node;
net_dev->dev.of_node = to_of_node(mac->fw_node);
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_setup_stats(mac, &mac->ethtool_stats,
+ DPAA2_MAC_NUM_ETHTOOL_STATS, dpaa2_mac_ethtool_stats);
+
return 0;
err_close_dpmac:
@@ -515,64 +637,61 @@ void dpaa2_mac_close(struct dpaa2_mac *mac)
{
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ if (mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE)
+ dpaa2_mac_clear_stats(mac, &mac->ethtool_stats, DPAA2_MAC_NUM_ETHTOOL_STATS);
+
dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle);
if (mac->fw_node)
fwnode_handle_put(mac->fw_node);
}
-static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {
- [DPMAC_CNT_ING_ALL_FRAME] = "[mac] rx all frames",
- [DPMAC_CNT_ING_GOOD_FRAME] = "[mac] rx frames ok",
- [DPMAC_CNT_ING_ERR_FRAME] = "[mac] rx frame errors",
- [DPMAC_CNT_ING_FRAME_DISCARD] = "[mac] rx frame discards",
- [DPMAC_CNT_ING_UCAST_FRAME] = "[mac] rx u-cast",
- [DPMAC_CNT_ING_BCAST_FRAME] = "[mac] rx b-cast",
- [DPMAC_CNT_ING_MCAST_FRAME] = "[mac] rx m-cast",
- [DPMAC_CNT_ING_FRAME_64] = "[mac] rx 64 bytes",
- [DPMAC_CNT_ING_FRAME_127] = "[mac] rx 65-127 bytes",
- [DPMAC_CNT_ING_FRAME_255] = "[mac] rx 128-255 bytes",
- [DPMAC_CNT_ING_FRAME_511] = "[mac] rx 256-511 bytes",
- [DPMAC_CNT_ING_FRAME_1023] = "[mac] rx 512-1023 bytes",
- [DPMAC_CNT_ING_FRAME_1518] = "[mac] rx 1024-1518 bytes",
- [DPMAC_CNT_ING_FRAME_1519_MAX] = "[mac] rx 1519-max bytes",
- [DPMAC_CNT_ING_FRAG] = "[mac] rx frags",
- [DPMAC_CNT_ING_JABBER] = "[mac] rx jabber",
- [DPMAC_CNT_ING_ALIGN_ERR] = "[mac] rx align errors",
- [DPMAC_CNT_ING_OVERSIZED] = "[mac] rx oversized",
- [DPMAC_CNT_ING_VALID_PAUSE_FRAME] = "[mac] rx pause",
- [DPMAC_CNT_ING_BYTE] = "[mac] rx bytes",
- [DPMAC_CNT_EGR_GOOD_FRAME] = "[mac] tx frames ok",
- [DPMAC_CNT_EGR_UCAST_FRAME] = "[mac] tx u-cast",
- [DPMAC_CNT_EGR_MCAST_FRAME] = "[mac] tx m-cast",
- [DPMAC_CNT_EGR_BCAST_FRAME] = "[mac] tx b-cast",
- [DPMAC_CNT_EGR_ERR_FRAME] = "[mac] tx frame errors",
- [DPMAC_CNT_EGR_UNDERSIZED] = "[mac] tx undersized",
- [DPMAC_CNT_EGR_VALID_PAUSE_FRAME] = "[mac] tx b-pause",
- [DPMAC_CNT_EGR_BYTE] = "[mac] tx bytes",
-};
-
-#define DPAA2_MAC_NUM_STATS ARRAY_SIZE(dpaa2_mac_ethtool_stats)
-
int dpaa2_mac_get_sset_count(void)
{
- return DPAA2_MAC_NUM_STATS;
+ return DPAA2_MAC_NUM_ETHTOOL_STATS;
}
void dpaa2_mac_get_strings(u8 **data)
{
int i;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++)
- ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ ethtool_puts(data, dpaa2_mac_ethtool_stats[i].name);
}
void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)
{
+ struct device *dev = mac->net_dev->dev.parent;
struct fsl_mc_device *dpmac_dev = mac->mc_dev;
+ u64 *cnt_values;
int i, err;
u64 value;
- for (i = 0; i < DPAA2_MAC_NUM_STATS; i++) {
+ if (!(mac->features & DPAA2_MAC_FEATURE_STATS_BUNDLE))
+ goto fallback;
+
+ if (!mac->ethtool_stats.idx_dma_mem || !mac->ethtool_stats.values_dma_mem)
+ goto fallback;
+
+ err = dpmac_get_statistics(mac->mc_io, 0, dpmac_dev->mc_handle,
+ mac->ethtool_stats.idx_iova, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS);
+ if (err)
+ goto fallback;
+
+ dma_sync_single_for_cpu(dev, mac->ethtool_stats.values_iova,
+ DPAA2_MAC_NUM_ETHTOOL_STATS * sizeof(u64),
+ DMA_FROM_DEVICE);
+
+ cnt_values = mac->ethtool_stats.values_dma_mem;
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++)
+ *(data + i) = le64_to_cpu(*cnt_values++);
+
+ return;
+
+fallback:
+
+ /* Fallback and retrieve each counter one by one */
+ for (i = 0; i < DPAA2_MAC_NUM_ETHTOOL_STATS; i++) {
err = dpmac_get_counter(mac->mc_io, 0, dpmac_dev->mc_handle,
i, &value);
if (err) {
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
index 53f8d106d11e..386286209606 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/* Copyright 2019 NXP */
+/* Copyright 2019, 2024-2026 NXP */
#ifndef DPAA2_MAC_H
#define DPAA2_MAC_H
@@ -11,6 +11,12 @@
#include "dpmac.h"
#include "dpmac-cmd.h"
+struct dpaa2_mac_stats {
+ u32 *idx_dma_mem;
+ u64 *values_dma_mem;
+ dma_addr_t idx_iova, values_iova;
+};
+
struct dpaa2_mac {
struct fsl_mc_device *mc_dev;
struct dpmac_link_state state;
@@ -28,6 +34,8 @@ struct dpaa2_mac {
struct fwnode_handle *fw_node;
struct phy *serdes_phy;
+
+ struct dpaa2_mac_stats ethtool_stats;
};
static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
--
2.25.1
| null | null | null | [PATCH net-next 2/5] net: dpaa2-mac: retrieve MAC statistics in one firmware command | On Fri, Feb 27, 2026 at 09:34:28AM +0200, Ioana Ciornei wrote:
Just to add to this, for the 1% i was referring to counters for
collisions. If the control traffic is causing collisions the system it
just as wrongly configured as generated traffic causing collisions.
For 'everyday' systems, i doubt Half Duplex is ever used, but
automotive with a T1 PHY might. So we might need to review this 1%
once somebody runs this test on such a system.
Andrew | {
"author": "Andrew Lunn <andrew@lunn.ch>",
"date": "Fri, 27 Feb 2026 15:17:02 +0100",
"is_openbsd": false,
"thread_id": "87ms0ufc0p.fsf@nvidia.com.mbox.gz"
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.