Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92ad6325 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Minor SPDX change conflict.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e0effb5f c356dc4b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)> 
Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>
@@ -238,6 +239,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Will Deacon <will@kernel.org> <will.deacon@arm.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-bus-siox

+11 −11
Original line number Diff line number Diff line 
What:		/sys/bus/siox/devices/siox-X/active

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		On reading represents the current state of the bus. If it

		contains a "0" the bus is stopped and connected devices are
@@ -12,7 +12,7 @@ Description: 


What:		/sys/bus/siox/devices/siox-X/device_add

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. Write
@@ -27,13 +27,13 @@ Description: 


What:		/sys/bus/siox/devices/siox-X/device_remove

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. A single write removes the last device in the siox chain.



What:		/sys/bus/siox/devices/siox-X/poll_interval_ns

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Defines the interval between two poll cycles in nano seconds.

		Note this is rounded to jiffies on writing. On reading the current value
@@ -41,33 +41,33 @@ Description: 


What:		/sys/bus/siox/devices/siox-X-Y/connected

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.

		communication with it is not ensured. "1" signals a working connection.



What:		/sys/bus/siox/devices/siox-X-Y/inbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the inbytes value provided to siox-X/device_add



What:		/sys/bus/siox/devices/siox-X-Y/status_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Counts the number of time intervals when the read status byte doesn't yield the

		expected value.



What:		/sys/bus/siox/devices/siox-X-Y/type

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the type value provided to siox-X/device_add.



What:		/sys/bus/siox/devices/siox-X-Y/watchdog

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting if the watchdog of the siox device is

		active. "0" means the watchdog is not active and the device is expected to
@@ -75,13 +75,13 @@ Description: 


What:		/sys/bus/siox/devices/siox-X-Y/watchdog_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the number to time intervals when the

		watchdog was active.



What:		/sys/bus/siox/devices/siox-X-Y/outbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the outbytes value provided to siox-X/device_add.

Documentation/driver-api/uio-howto.rst

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ fields of ``struct uio_mem``: 
-  ``int memtype``: Required if the mapping is used. Set this to

   ``UIO_MEM_PHYS`` if you you have physical memory on your card to be

   mapped. Use ``UIO_MEM_LOGICAL`` for logical memory (e.g. allocated

   with :c:func:`kmalloc()`). There's also ``UIO_MEM_VIRTUAL`` for

   virtual memory.

   with :c:func:`__get_free_pages()` but not kmalloc()). There's also

   ``UIO_MEM_VIRTUAL`` for virtual memory.



-  ``phys_addr_t addr``: Required if the mapping is used. Fill in the

   address of your memory block. This address is the one that appears in

Documentation/fb/fbcon.txt

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ C. Boot options 


        Select the initial font to use. The value 'name' can be any of the

        compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,

        PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, VGA8x16, VGA8x8.

        PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.



	Note, not all drivers can handle font with widths not divisible by 8,

        such as vga16fb.

Documentation/virtual/kvm/api.txt

+32 −16
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ yet and must be cleared on entry. 


4.35 KVM_SET_USER_MEMORY_REGION



Capability: KVM_CAP_USER_MEM

Capability: KVM_CAP_USER_MEMORY

Architectures: all

Type: vm ioctl

Parameters: struct kvm_userspace_memory_region (in)
@@ -3857,43 +3857,59 @@ Type: vcpu ioctl 
Parameters: struct kvm_nested_state (in/out)

Returns: 0 on success, -1 on error

Errors:

  E2BIG:     the total state size (including the fixed-size part of struct

             kvm_nested_state) exceeds the value of 'size' specified by

  E2BIG:     the total state size exceeds the value of 'size' specified by

             the user; the size required will be written into size.



struct kvm_nested_state {

	__u16 flags;

	__u16 format;

	__u32 size;



	union {

		struct kvm_vmx_nested_state vmx;

		struct kvm_svm_nested_state svm;

		struct kvm_vmx_nested_state_hdr vmx;

		struct kvm_svm_nested_state_hdr svm;



		/* Pad the header to 128 bytes.  */

		__u8 pad[120];

	};

	__u8 data[0];

	} hdr;



	union {

		struct kvm_vmx_nested_state_data vmx[0];

		struct kvm_svm_nested_state_data svm[0];

	} data;

};



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002

#define KVM_STATE_NESTED_EVMCS		0x00000004



#define KVM_STATE_NESTED_SMM_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_SMM_VMXON	0x00000002

#define KVM_STATE_NESTED_FORMAT_VMX		0

#define KVM_STATE_NESTED_FORMAT_SVM		1



struct kvm_vmx_nested_state {

#define KVM_STATE_NESTED_VMX_VMCS_SIZE		0x1000



#define KVM_STATE_NESTED_VMX_SMM_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_VMX_SMM_VMXON		0x00000002



struct kvm_vmx_nested_state_hdr {

	__u64 vmxon_pa;

	__u64 vmcs_pa;

	__u64 vmcs12_pa;



	struct {

		__u16 flags;

	} smm;

};



struct kvm_vmx_nested_state_data {

	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

};



This ioctl copies the vcpu's nested virtualization state from the kernel to

userspace.



The maximum size of the state, including the fixed-size part of struct

kvm_nested_state, can be retrieved by passing KVM_CAP_NESTED_STATE to

the KVM_CHECK_EXTENSION ioctl().

The maximum size of the state can be retrieved by passing KVM_CAP_NESTED_STATE

to the KVM_CHECK_EXTENSION ioctl().



4.115 KVM_SET_NESTED_STATE
@@ -3903,8 +3919,8 @@ Type: vcpu ioctl 
Parameters: struct kvm_nested_state (in)

Returns: 0 on success, -1 on error



This copies the vcpu's kvm_nested_state struct from userspace to the kernel.  For

the definition of struct kvm_nested_state, see KVM_GET_NESTED_STATE.

This copies the vcpu's kvm_nested_state struct from userspace to the kernel.

For the definition of struct kvm_nested_state, see KVM_GET_NESTED_STATE.



4.116 KVM_(UN)REGISTER_COALESCED_MMIO