Commit 0e8655b4 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next 



Backmerging to get a late RC of v6.10 before moving into v6.11.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents 0c3f3a83 d4ef5d2b

.editorconfig

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ root = true 
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = tab

indent_size = 8
@@ -13,7 +12,6 @@ indent_size = 8 
[*.{json,py,rs}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = space

indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8 
[*.yaml]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = unset

insert_final_newline = true

indent_style = space

indent_size = 2

.mailmap

+9 −4
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com> 
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>

Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>

Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>

Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
@@ -217,6 +219,7 @@ Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com> 
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <tanggeliang@kylinos.cn>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -337,10 +340,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org> 
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>

Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Kees Cook <kees@kernel.org> <kees.cook@canonical.com>

Kees Cook <kees@kernel.org> <keescook@chromium.org>

Kees Cook <kees@kernel.org> <keescook@google.com>

Kees Cook <kees@kernel.org> <kees@outflux.net>

Kees Cook <kees@kernel.org> <kees@ubuntu.com>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>
@@ -604,6 +608,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/ABI/testing/debugfs-driver-habanalabs

+9 −3
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ Description: Displays the hop values and physical address for a given ASID 
                and virtual address. The user should write the ASID and VA into

                the file and then read the file to get the result.

                e.g. to display info about VA 0x1000 for ASID 1 you need to do:

                echo "1 0x1000" > /sys/kernel/debug/accel/0/mmu

                echo "1 0x1000" > /sys/kernel/debug/accel/<parent_device>/mmu



What:           /sys/kernel/debug/accel/<parent_device>/mmu_error

Date:           Mar 2021
@@ -226,8 +226,8 @@ Contact: fkassabri@habana.ai 
Description:    Check and display page fault or access violation mmu errors for

                all MMUs specified in mmu_cap_mask.

                e.g. to display error info for MMU hw cap bit 9, you need to do:

                echo "0x200" > /sys/kernel/debug/accel/0/mmu_error

                cat /sys/kernel/debug/accel/0/mmu_error

                echo "0x200" > /sys/kernel/debug/accel/<parent_device>/mmu_error

                cat /sys/kernel/debug/accel/<parent_device>/mmu_error



What:           /sys/kernel/debug/accel/<parent_device>/monitor_dump

Date:           Mar 2022
@@ -253,6 +253,12 @@ Description: Triggers dump of monitor data. The value to trigger the operatio 
                When the write is finished, the user can read the "monitor_dump"

                blob



What:           /sys/kernel/debug/accel/<parent_device>/server_type

Date:           Feb 2024

KernelVersion:  6.11

Contact:        trisin@habana.ai

Description:    Exposes the device's server type, maps to enum hl_server_type.



What:           /sys/kernel/debug/accel/<parent_device>/set_power_state

Date:           Jan 2019

KernelVersion:  5.1

Documentation/admin-guide/LSM/tomoyo.rst

+11 −24
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel. 


LiveCD-based tutorials are available at



http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html

http://tomoyo.sourceforge.jp/1.8/centos6-live.html

https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html

https://tomoyo.sourceforge.net/1.8/centos6-live.html



Though these tutorials use non-LSM version of TOMOYO, they are useful for you

to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO? 
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on

kernel's command line.



Please see http://tomoyo.osdn.jp/2.5/ for details.

Please see https://tomoyo.sourceforge.net/2.6/ for details.



Where is documentation?

=======================



User <-> Kernel interface documentation is available at

https://tomoyo.osdn.jp/2.5/policy-specification/index.html .

https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .



Materials we prepared for seminars and symposiums are available at

https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .

https://sourceforge.net/projects/tomoyo/files/docs/ .

Below lists are chosen from three aspects.



What is TOMOYO?

  TOMOYO Linux Overview

    https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf

  TOMOYO Linux: pragmatic and manageable security for Linux

    https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf

  TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box

    https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf



What can TOMOYO do?

  Deep inside TOMOYO Linux

    https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf

  The role of "pathname based access control" in security.

    https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf



History of TOMOYO?

  Realities of Mainlining

    https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf



What is future plan?

====================



We believe that inode based security and name based security are complementary

and both should be used together. But unfortunately, so far, we cannot enable

multiple LSM modules at the same time. We feel sorry that you have to give up

SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.



We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM

version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .

LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning

to port non-LSM version's functionalities to LSM versions.
 
    https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

Documentation/admin-guide/kernel-parameters.txt

+22 −25
Original line number Diff line number Diff line
@@ -788,25 +788,6 @@ 
			Documentation/networking/netconsole.rst for an

			alternative.



		<DEVNAME>:<n>.<n>[,options]

			Use the specified serial port on the serial core bus.

			The addressing uses DEVNAME of the physical serial port

			device, followed by the serial core controller instance,

			and the serial port instance. The options are the same

			as documented for the ttyS addressing above.



			The mapping of the serial ports to the tty instances

			can be viewed with:



			$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*

			/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0



			In the above example, the console can be addressed with

			console=00:04:0.0. Note that a console addressed this

			way will only get added when the related device driver

			is ready. The use of an earlycon parameter in addition to

			the console may be desired for console output early on.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio16,<addr>[,options]
@@ -1921,6 +1902,28 @@ 
				Format:

				<bus_id>,<clkrate>



	i2c_touchscreen_props= [HW,ACPI,X86]

			Set device-properties for ACPI-enumerated I2C-attached

			touchscreen, to e.g. fix coordinates of upside-down

			mounted touchscreens. If you need this option please

			submit a drivers/platform/x86/touchscreen_dmi.c patch

			adding a DMI quirk for this.



			Format:

			<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]

			Where <val> is one of:

			Omit "=<val>" entirely	Set a boolean device-property

			Unsigned number		Set a u32 device-property

			Anything else		Set a string device-property



			Examples (split over multiple lines):

			i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:

			touchscreen-inverted-y



			i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:

			touchscreen-size-y=1080:touchscreen-inverted-y:

			firmware-name=gsl1680-vendor-model.fw:silead,home-button



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.unmask_kbd_data

			[HW] Enable printing of interrupt data from the KBD port
@@ -2170,12 +2173,6 @@ 
			Format: 0 | 1

			Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.



	init_mlocked_on_free=	[MM] Fill freed userspace memory with zeroes if

				it was mlock'ed and not explicitly munlock'ed

				afterwards.

				Format: 0 | 1

				Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON



	init_pkru=	[X86] Specify the default memory protection keys rights

			register contents for all processes.  0x55555554 by

			default (disallow access to all but pkey 0).  Can