Unverified Commit 20772c4e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: Allow for NHLT configuration 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>
From AudioDSP perspective, only gateway-related modules e.g.: Copier:

Small set of changes providing new feature which the driver is already
utilizing on the market - for its Long-Term-Support (LTS) devices.

The goal is to cover systems which shipped with invalid Non HDAudio Link
Table (NHLT) - not just the descriptors (headers), but cases where the
hardware configuration is invalid too. The table is part of the ACPI
tree and forcing BIOS updates is not a feasible solution. With the
override, the topology file can carry the hardware configuration
instead.

From AudioDSP perspective, only gateway-related modules e.g.: Copier
care about the procedure. To ensure correct order of operations when
initializing such modules, the overrides take precedence over what's
currently there in the NHLT.
parents 05b0e941 d5c8b790

.mailmap

+4 −2
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com> 
David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -426,7 +427,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -605,7 +606,8 @@ Oleksij Rempel <o.rempel@pengutronix.de> 
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Documentation/userspace-api/netlink/intro-specs.rst

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ Simple CLI 
Kernel comes with a simple CLI tool which should be useful when

developing Netlink related code. The tool is implemented in Python

and can use a YAML specification to issue Netlink requests

to the kernel. Only Generic Netlink is supported.

to the kernel.



The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts

a handul of arguments, the most important ones are:

a handful of arguments, the most important ones are:



 - ``--spec`` - point to the spec file

 - ``--do $name`` / ``--dump $name`` - issue request ``$name``

MAINTAINERS

+21 −19
Original line number Diff line number Diff line
@@ -915,6 +915,7 @@ F: drivers/staging/media/sunxi/cedrus/ 
ALPHA PORT

M:	Richard Henderson <richard.henderson@linaro.org>

M:	Matt Turner <mattst88@gmail.com>

M:	Magnus Lindholm <linmag7@gmail.com>

L:	linux-alpha@vger.kernel.org

S:	Odd Fixes

F:	arch/alpha/
@@ -4399,7 +4400,7 @@ BLOCK LAYER 
M:	Jens Axboe <axboe@kernel.dk>

L:	linux-block@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git

F:	Documentation/ABI/stable/sysfs-block

F:	Documentation/block/

F:	block/
@@ -9209,6 +9210,7 @@ R: Yue Hu <zbestahu@gmail.com> 
R:	Jeffle Xu <jefflexu@linux.alibaba.com>

R:	Sandeep Dhavale <dhavale@google.com>

R:	Hongbo Li <lihongbo22@huawei.com>

R:	Chunhai Guo <guochunhai@vivo.com>

L:	linux-erofs@lists.ozlabs.org

S:	Maintained

W:	https://erofs.docs.kernel.org
@@ -11527,7 +11529,7 @@ F: include/linux/platform_data/huawei-gaokun-ec.h 
HUGETLB SUBSYSTEM

M:	Muchun Song <muchun.song@linux.dev>

M:	Oscar Salvador <osalvador@suse.de>

R:	David Hildenbrand <david@redhat.com>

R:	David Hildenbrand <david@kernel.org>

L:	linux-mm@kvack.org

S:	Maintained

F:	Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -13660,7 +13662,7 @@ F: virt/kvm/* 








KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)









M:	Marc Zyngier <maz@kernel.org>









M:	Oliver Upton <oliver.upton@linux.dev>









M:	Oliver Upton <oupton@kernel.org>









R:	Joey Gouly <joey.gouly@arm.com>









R:	Suzuki K Poulose <suzuki.poulose@arm.com>









R:	Zenghui Yu <yuzenghui@huawei.com>








@@ -13734,7 +13736,7 @@ KERNEL VIRTUAL MACHINE for s390 (KVM/s390)







M:	Christian Borntraeger <borntraeger@linux.ibm.com>









M:	Janosch Frank <frankja@linux.ibm.com>









M:	Claudio Imbrenda <imbrenda@linux.ibm.com>









R:	David Hildenbrand <david@redhat.com>









R:	David Hildenbrand <david@kernel.org>









L:	kvm@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git








@@ -16221,7 +16223,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git







F:	drivers/devfreq/tegra30-devfreq.c

















MEMORY HOT(UN)PLUG









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Oscar Salvador <osalvador@suse.de>









L:	linux-mm@kvack.org









S:	Maintained








@@ -16246,7 +16248,7 @@ F:	tools/mm/















MEMORY MANAGEMENT - CORE









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>








@@ -16302,7 +16304,7 @@ F:	mm/execmem.c















MEMORY MANAGEMENT - GUP (GET USER PAGES)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Jason Gunthorpe <jgg@nvidia.com>









R:	John Hubbard <jhubbard@nvidia.com>









R:	Peter Xu <peterx@redhat.com>








@@ -16318,7 +16320,7 @@ F:	tools/testing/selftests/mm/gup_test.c















MEMORY MANAGEMENT - KSM (Kernel Samepage Merging)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Xu Xin <xu.xin16@zte.com.cn>









R:	Chengming Zhou <chengming.zhou@linux.dev>









L:	linux-mm@kvack.org








@@ -16334,7 +16336,7 @@ F:	mm/mm_slot.h















MEMORY MANAGEMENT - MEMORY POLICY AND MIGRATION









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Zi Yan <ziy@nvidia.com>









R:	Matthew Brost <matthew.brost@intel.com>









R:	Joshua Hahn <joshua.hahnjy@gmail.com>








@@ -16374,7 +16376,7 @@ F:	mm/workingset.c















MEMORY MANAGEMENT - MISC









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>








@@ -16462,7 +16464,7 @@ F:	mm/shuffle.h







MEMORY MANAGEMENT - RECLAIM









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Johannes Weiner <hannes@cmpxchg.org>









R:	David Hildenbrand <david@redhat.com>









R:	David Hildenbrand <david@kernel.org>









R:	Michal Hocko <mhocko@kernel.org>









R:	Qi Zheng <zhengqi.arch@bytedance.com>









R:	Shakeel Butt <shakeel.butt@linux.dev>








@@ -16475,7 +16477,7 @@ F:	mm/workingset.c















MEMORY MANAGEMENT - RMAP (REVERSE MAPPING)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Rik van Riel <riel@surriel.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>








@@ -16499,12 +16501,12 @@ F:	mm/secretmem.c















MEMORY MANAGEMENT - SWAP









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Chris Li <chrisl@kernel.org>









M:	Kairui Song <kasong@tencent.com>









R:	Kemeng Shi <shikemeng@huaweicloud.com>









R:	Kairui Song <kasong@tencent.com>









R:	Nhat Pham <nphamcs@gmail.com>









R:	Baoquan He <bhe@redhat.com>









R:	Barry Song <baohua@kernel.org>









R:	Chris Li <chrisl@kernel.org>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/mm/swap-table.rst








@@ -16520,7 +16522,7 @@ F:	mm/swapfile.c















MEMORY MANAGEMENT - THP (TRANSPARENT HUGE PAGE)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Zi Yan <ziy@nvidia.com>









R:	Baolin Wang <baolin.wang@linux.alibaba.com>








@@ -16622,7 +16624,7 @@ MEMORY MAPPING - MADVISE (MEMORY ADVICE)







M:	Andrew Morton <akpm@linux-foundation.org>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org








@@ -27089,7 +27091,7 @@ F:	net/vmw_vsock/virtio_transport_common.c















VIRTIO BALLOON









M:	"Michael S. Tsirkin" <mst@redhat.com>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









L:	virtualization@lists.linux.dev









S:	Maintained









F:	drivers/virtio/virtio_balloon.c








@@ -27244,7 +27246,7 @@ F:	drivers/iommu/virtio-iommu.c







F:	include/uapi/linux/virtio_iommu.h

















VIRTIO MEM DRIVER









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









L:	virtualization@lists.linux.dev









S:	Maintained









W:	https://virtio-mem.gitlab.io/








@@ -27851,7 +27853,7 @@ F:	arch/x86/kernel/stacktrace.c







F:	arch/x86/kernel/unwind_*.c

















X86 TRUST DOMAIN EXTENSIONS (TDX)









M:	Kirill A. Shutemov <kas@kernel.org>









M:	Kiryl Shutsemau <kas@kernel.org>









R:	Dave Hansen <dave.hansen@linux.intel.com>









R:	Rick Edgecombe <rick.p.edgecombe@intel.com>









L:	x86@kernel.org

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 18









SUBLEVEL = 0









EXTRAVERSION = -rc5









EXTRAVERSION = -rc6









NAME = Baby Opossum Posse



















# *DOCUMENTATION*
































arch/arm64/include/asm/alternative.h



+5
−2






























Original line number
Diff line number
Diff line







@@ -26,9 +26,12 @@ void __init apply_alternatives_all(void);







bool alternative_is_applied(u16 cpucap);



















#ifdef CONFIG_MODULES









void apply_alternatives_module(void *start, size_t length);









int apply_alternatives_module(void *start, size_t length);









#else









static inline void apply_alternatives_module(void *start, size_t length) { }









static inline int apply_alternatives_module(void *start, size_t length)









{









	return 0;









}









#endif



















void alt_cb_patch_nops(struct alt_instr *alt, __le32 *origptr,