Commit dc6f8d45 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

linux-headers: update against Linux 5.7-rc3 



commit 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c

Reviewed-by: Michael S. Tsirkin <mst@redhat.com> # virtio/vhost parts
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200427102415.10915-3-cohuck@redhat.com>
parent 9904adfa

include/standard-headers/linux/ethtool.h

+9 −1
Original line number Diff line number Diff line
@@ -596,6 +596,9 @@ struct ethtool_pauseparam { 
 * @ETH_SS_LINK_MODES: link mode names

 * @ETH_SS_MSG_CLASSES: debug message class names

 * @ETH_SS_WOL_MODES: wake-on-lan modes

 * @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags

 * @ETH_SS_TS_TX_TYPES: timestamping Tx types

 * @ETH_SS_TS_RX_FILTERS: timestamping Rx filters

 */

enum ethtool_stringset {

	ETH_SS_TEST		= 0,
@@ -610,6 +613,9 @@ enum ethtool_stringset { 
	ETH_SS_LINK_MODES,

	ETH_SS_MSG_CLASSES,

	ETH_SS_WOL_MODES,

	ETH_SS_SOF_TIMESTAMPING,

	ETH_SS_TS_TX_TYPES,

	ETH_SS_TS_RX_FILTERS,



	/* add new constants above here */

	ETH_SS_COUNT
@@ -1330,6 +1336,7 @@ enum ethtool_fec_config_bits { 
	ETHTOOL_FEC_OFF_BIT,

	ETHTOOL_FEC_RS_BIT,

	ETHTOOL_FEC_BASER_BIT,

	ETHTOOL_FEC_LLRS_BIT,

};



#define ETHTOOL_FEC_NONE		(1 << ETHTOOL_FEC_NONE_BIT)
@@ -1337,6 +1344,7 @@ enum ethtool_fec_config_bits { 
#define ETHTOOL_FEC_OFF			(1 << ETHTOOL_FEC_OFF_BIT)

#define ETHTOOL_FEC_RS			(1 << ETHTOOL_FEC_RS_BIT)

#define ETHTOOL_FEC_BASER		(1 << ETHTOOL_FEC_BASER_BIT)

#define ETHTOOL_FEC_LLRS		(1 << ETHTOOL_FEC_LLRS_BIT)



/* CMDs currently supported */

#define ETHTOOL_GSET		0x00000001 /* DEPRECATED, Get settings.
@@ -1521,7 +1529,7 @@ enum ethtool_link_mode_bit_indices { 
	ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71,

	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT	 = 72,

	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT	 = 73,



	ETHTOOL_LINK_MODE_FEC_LLRS_BIT			 = 74,

	/* must be last entry */

	__ETHTOOL_LINK_MODE_MASK_NBITS

};

include/standard-headers/linux/input-event-codes.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Input event codes

 *
@@ -652,6 +652,9 @@ 
/* Electronic privacy screen control */

#define KEY_PRIVACY_SCREEN_TOGGLE	0x279



/* Select an area of screen to be copied */

#define KEY_SELECTIVE_SCREENSHOT	0x27a



/*

 * Some keyboards have keys which do not have a defined meaning, these keys

 * are intended to be programmed / bound to macros by the user. For most

include/standard-headers/linux/pci_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ 
#define  PCI_EXP_SLTCTL_PWR_OFF        0x0400 /* Power Off */

#define  PCI_EXP_SLTCTL_EIC	0x0800	/* Electromechanical Interlock Control */

#define  PCI_EXP_SLTCTL_DLLSCE	0x1000	/* Data Link Layer State Changed Enable */

#define  PCI_EXP_SLTCTL_IBPD_DISABLE	0x4000 /* In-band PD disable */

#define PCI_EXP_SLTSTA		26	/* Slot Status */

#define  PCI_EXP_SLTSTA_ABP	0x0001	/* Attention Button Pressed */

#define  PCI_EXP_SLTSTA_PFD	0x0002	/* Power Fault Detected */
@@ -680,6 +681,7 @@ 
#define PCI_EXP_LNKSTA2		50	/* Link Status 2 */

#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	52	/* v2 endpoints with link end here */

#define PCI_EXP_SLTCAP2		52	/* Slot Capabilities 2 */

#define  PCI_EXP_SLTCAP2_IBPD	0x00000001 /* In-band PD Disable Supported */

#define PCI_EXP_SLTCTL2		56	/* Slot Control 2 */

#define PCI_EXP_SLTSTA2		58	/* Slot Status 2 */

include/standard-headers/linux/vhost_types.h

+8 −0
Original line number Diff line number Diff line
@@ -119,6 +119,14 @@ struct vhost_scsi_target { 
	unsigned short reserved;

};



/* VHOST_VDPA specific definitions */



struct vhost_vdpa_config {

	uint32_t off;

	uint32_t len;

	uint8_t buf[0];

};



/* Feature bits */

/* Log all write descriptors. Can be changed while device is active. */

#define VHOST_F_LOG_ALL 26

include/standard-headers/linux/virtio_balloon.h

+10 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define VIRTIO_BALLOON_F_DEFLATE_ON_OOM	2 /* Deflate balloon on OOM */

#define VIRTIO_BALLOON_F_FREE_PAGE_HINT	3 /* VQ to report free pages */

#define VIRTIO_BALLOON_F_PAGE_POISON	4 /* Guest is using page poisoning */

#define VIRTIO_BALLOON_F_REPORTING	5 /* Page reporting virtqueue */



/* Size of a PFN in the balloon interface. */

#define VIRTIO_BALLOON_PFN_SHIFT 12
@@ -47,8 +48,15 @@ struct virtio_balloon_config { 
	uint32_t num_pages;

	/* Number of pages we've actually got in balloon. */

	uint32_t actual;

	/* Free page report command id, readonly by guest */

	uint32_t free_page_report_cmd_id;

	/*

	 * Free page hint command id, readonly by guest.

	 * Was previously named free_page_report_cmd_id so we

	 * need to carry that name for legacy support.

	 */

	union {

		uint32_t free_page_hint_cmd_id;

		uint32_t free_page_report_cmd_id;	/* deprecated */

	};

	/* Stores PAGE_POISON if page poisoning is in use */

	uint32_t poison_val;

};