mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
Update linux headers to v6.3rc5
commit 7e364e56293bb98cae1b55fd835f5991c4e96e7d Signed-off-by: David 'Digit' Turner <digit@google.com> Message-Id: <20230405172109.3081788-4-digit@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
9fc7dd234f
commit
c5c0fdbe39
15 changed files with 506 additions and 10 deletions
|
@ -711,6 +711,24 @@ enum ethtool_stringset {
|
|||
ETH_SS_COUNT
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_mac_stats_src - source of ethtool MAC statistics
|
||||
* @ETHTOOL_MAC_STATS_SRC_AGGREGATE:
|
||||
* if device supports a MAC merge layer, this retrieves the aggregate
|
||||
* statistics of the eMAC and pMAC. Otherwise, it retrieves just the
|
||||
* statistics of the single (express) MAC.
|
||||
* @ETHTOOL_MAC_STATS_SRC_EMAC:
|
||||
* if device supports a MM layer, this retrieves the eMAC statistics.
|
||||
* Otherwise, it retrieves the statistics of the single (express) MAC.
|
||||
* @ETHTOOL_MAC_STATS_SRC_PMAC:
|
||||
* if device supports a MM layer, this retrieves the pMAC statistics.
|
||||
*/
|
||||
enum ethtool_mac_stats_src {
|
||||
ETHTOOL_MAC_STATS_SRC_AGGREGATE,
|
||||
ETHTOOL_MAC_STATS_SRC_EMAC,
|
||||
ETHTOOL_MAC_STATS_SRC_PMAC,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_module_power_mode_policy - plug-in module power mode policy
|
||||
* @ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH: Module is always in high power mode.
|
||||
|
@ -779,6 +797,31 @@ enum ethtool_podl_pse_pw_d_status {
|
|||
ETHTOOL_PODL_PSE_PW_D_STATUS_ERROR,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_mm_verify_status - status of MAC Merge Verify function
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_UNKNOWN:
|
||||
* verification status is unknown
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_INITIAL:
|
||||
* the 802.3 Verify State diagram is in the state INIT_VERIFICATION
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_VERIFYING:
|
||||
* the Verify State diagram is in the state VERIFICATION_IDLE,
|
||||
* SEND_VERIFY or WAIT_FOR_RESPONSE
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED:
|
||||
* indicates that the Verify State diagram is in the state VERIFIED
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_FAILED:
|
||||
* the Verify State diagram is in the state VERIFY_FAIL
|
||||
* @ETHTOOL_MM_VERIFY_STATUS_DISABLED:
|
||||
* verification of preemption operation is disabled
|
||||
*/
|
||||
enum ethtool_mm_verify_status {
|
||||
ETHTOOL_MM_VERIFY_STATUS_UNKNOWN,
|
||||
ETHTOOL_MM_VERIFY_STATUS_INITIAL,
|
||||
ETHTOOL_MM_VERIFY_STATUS_VERIFYING,
|
||||
ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED,
|
||||
ETHTOOL_MM_VERIFY_STATUS_FAILED,
|
||||
ETHTOOL_MM_VERIFY_STATUS_DISABLED,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ethtool_gstrings - string set for data tagging
|
||||
* @cmd: Command number = %ETHTOOL_GSTRINGS
|
||||
|
@ -1183,7 +1226,7 @@ struct ethtool_rxnfc {
|
|||
uint32_t rule_cnt;
|
||||
uint32_t rss_context;
|
||||
};
|
||||
uint32_t rule_locs[0];
|
||||
uint32_t rule_locs[];
|
||||
};
|
||||
|
||||
|
||||
|
@ -1741,6 +1784,9 @@ enum ethtool_link_mode_bit_indices {
|
|||
ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT = 96,
|
||||
ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT = 97,
|
||||
ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT = 98,
|
||||
ETHTOOL_LINK_MODE_10baseT1S_Full_BIT = 99,
|
||||
ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100,
|
||||
ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101,
|
||||
|
||||
/* must be last entry */
|
||||
__ETHTOOL_LINK_MODE_MASK_NBITS
|
||||
|
|
|
@ -201,6 +201,11 @@
|
|||
* 7.38
|
||||
* - add FUSE_EXPIRE_ONLY flag to fuse_notify_inval_entry
|
||||
* - add FOPEN_PARALLEL_DIRECT_WRITES
|
||||
* - add total_extlen to fuse_in_header
|
||||
* - add FUSE_MAX_NR_SECCTX
|
||||
* - add extension header
|
||||
* - add FUSE_EXT_GROUPS
|
||||
* - add FUSE_CREATE_SUPP_GROUP
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_FUSE_H
|
||||
|
@ -358,6 +363,8 @@ struct fuse_file_lock {
|
|||
* FUSE_SECURITY_CTX: add security context to create, mkdir, symlink, and
|
||||
* mknod
|
||||
* FUSE_HAS_INODE_DAX: use per inode DAX
|
||||
* FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir,
|
||||
* symlink and mknod (single group that matches parent)
|
||||
*/
|
||||
#define FUSE_ASYNC_READ (1 << 0)
|
||||
#define FUSE_POSIX_LOCKS (1 << 1)
|
||||
|
@ -394,6 +401,7 @@ struct fuse_file_lock {
|
|||
/* bits 32..63 get shifted down 32 bits into the flags2 field */
|
||||
#define FUSE_SECURITY_CTX (1ULL << 32)
|
||||
#define FUSE_HAS_INODE_DAX (1ULL << 33)
|
||||
#define FUSE_CREATE_SUPP_GROUP (1ULL << 34)
|
||||
|
||||
/**
|
||||
* CUSE INIT request/reply flags
|
||||
|
@ -499,6 +507,17 @@ struct fuse_file_lock {
|
|||
*/
|
||||
#define FUSE_EXPIRE_ONLY (1 << 0)
|
||||
|
||||
/**
|
||||
* extension type
|
||||
* FUSE_MAX_NR_SECCTX: maximum value of &fuse_secctx_header.nr_secctx
|
||||
* FUSE_EXT_GROUPS: &fuse_supp_groups extension
|
||||
*/
|
||||
enum fuse_ext_type {
|
||||
/* Types 0..31 are reserved for fuse_secctx_header */
|
||||
FUSE_MAX_NR_SECCTX = 31,
|
||||
FUSE_EXT_GROUPS = 32,
|
||||
};
|
||||
|
||||
enum fuse_opcode {
|
||||
FUSE_LOOKUP = 1,
|
||||
FUSE_FORGET = 2, /* no reply */
|
||||
|
@ -882,7 +901,8 @@ struct fuse_in_header {
|
|||
uint32_t uid;
|
||||
uint32_t gid;
|
||||
uint32_t pid;
|
||||
uint32_t padding;
|
||||
uint16_t total_extlen; /* length of extensions in 8byte units */
|
||||
uint16_t padding;
|
||||
};
|
||||
|
||||
struct fuse_out_header {
|
||||
|
@ -1043,4 +1063,27 @@ struct fuse_secctx_header {
|
|||
uint32_t nr_secctx;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fuse_ext_header - extension header
|
||||
* @size: total size of this extension including this header
|
||||
* @type: type of extension
|
||||
*
|
||||
* This is made compatible with fuse_secctx_header by using type values >
|
||||
* FUSE_MAX_NR_SECCTX
|
||||
*/
|
||||
struct fuse_ext_header {
|
||||
uint32_t size;
|
||||
uint32_t type;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fuse_supp_groups - Supplementary group extension
|
||||
* @nr_groups: number of supplementary groups
|
||||
* @groups: flexible array of group IDs
|
||||
*/
|
||||
struct fuse_supp_groups {
|
||||
uint32_t nr_groups;
|
||||
uint32_t groups[];
|
||||
};
|
||||
|
||||
#endif /* _LINUX_FUSE_H */
|
||||
|
|
|
@ -693,6 +693,7 @@
|
|||
#define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380 /* Transmit Margin */
|
||||
#define PCI_EXP_LNKCTL2_HASD 0x0020 /* HW Autonomous Speed Disable */
|
||||
#define PCI_EXP_LNKSTA2 0x32 /* Link Status 2 */
|
||||
#define PCI_EXP_LNKSTA2_FLIT 0x0400 /* Flit Mode Status */
|
||||
#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x32 /* end of v2 EPs w/ link */
|
||||
#define PCI_EXP_SLTCAP2 0x34 /* Slot Capabilities 2 */
|
||||
#define PCI_EXP_SLTCAP2_IBPD 0x00000001 /* In-band PD Disable Supported */
|
||||
|
|
|
@ -163,5 +163,7 @@ struct vhost_vdpa_iova_range {
|
|||
#define VHOST_BACKEND_F_IOTLB_ASID 0x3
|
||||
/* Device can be suspended */
|
||||
#define VHOST_BACKEND_F_SUSPEND 0x4
|
||||
/* Device can be resumed */
|
||||
#define VHOST_BACKEND_F_RESUME 0x5
|
||||
|
||||
#endif
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#define VIRTIO_BLK_F_DISCARD 13 /* DISCARD is supported */
|
||||
#define VIRTIO_BLK_F_WRITE_ZEROES 14 /* WRITE ZEROES is supported */
|
||||
#define VIRTIO_BLK_F_SECURE_ERASE 16 /* Secure Erase is supported */
|
||||
#define VIRTIO_BLK_F_ZONED 17 /* Zoned block device */
|
||||
|
||||
/* Legacy feature bits */
|
||||
#ifndef VIRTIO_BLK_NO_LEGACY
|
||||
|
@ -135,6 +136,16 @@ struct virtio_blk_config {
|
|||
/* Secure erase commands must be aligned to this number of sectors. */
|
||||
__virtio32 secure_erase_sector_alignment;
|
||||
|
||||
/* Zoned block device characteristics (if VIRTIO_BLK_F_ZONED) */
|
||||
struct virtio_blk_zoned_characteristics {
|
||||
uint32_t zone_sectors;
|
||||
uint32_t max_open_zones;
|
||||
uint32_t max_active_zones;
|
||||
uint32_t max_append_sectors;
|
||||
uint32_t write_granularity;
|
||||
uint8_t model;
|
||||
uint8_t unused2[3];
|
||||
} zoned;
|
||||
} QEMU_PACKED;
|
||||
|
||||
/*
|
||||
|
@ -172,6 +183,27 @@ struct virtio_blk_config {
|
|||
/* Secure erase command */
|
||||
#define VIRTIO_BLK_T_SECURE_ERASE 14
|
||||
|
||||
/* Zone append command */
|
||||
#define VIRTIO_BLK_T_ZONE_APPEND 15
|
||||
|
||||
/* Report zones command */
|
||||
#define VIRTIO_BLK_T_ZONE_REPORT 16
|
||||
|
||||
/* Open zone command */
|
||||
#define VIRTIO_BLK_T_ZONE_OPEN 18
|
||||
|
||||
/* Close zone command */
|
||||
#define VIRTIO_BLK_T_ZONE_CLOSE 20
|
||||
|
||||
/* Finish zone command */
|
||||
#define VIRTIO_BLK_T_ZONE_FINISH 22
|
||||
|
||||
/* Reset zone command */
|
||||
#define VIRTIO_BLK_T_ZONE_RESET 24
|
||||
|
||||
/* Reset All zones command */
|
||||
#define VIRTIO_BLK_T_ZONE_RESET_ALL 26
|
||||
|
||||
#ifndef VIRTIO_BLK_NO_LEGACY
|
||||
/* Barrier before this op. */
|
||||
#define VIRTIO_BLK_T_BARRIER 0x80000000
|
||||
|
@ -191,6 +223,72 @@ struct virtio_blk_outhdr {
|
|||
__virtio64 sector;
|
||||
};
|
||||
|
||||
/*
|
||||
* Supported zoned device models.
|
||||
*/
|
||||
|
||||
/* Regular block device */
|
||||
#define VIRTIO_BLK_Z_NONE 0
|
||||
/* Host-managed zoned device */
|
||||
#define VIRTIO_BLK_Z_HM 1
|
||||
/* Host-aware zoned device */
|
||||
#define VIRTIO_BLK_Z_HA 2
|
||||
|
||||
/*
|
||||
* Zone descriptor. A part of VIRTIO_BLK_T_ZONE_REPORT command reply.
|
||||
*/
|
||||
struct virtio_blk_zone_descriptor {
|
||||
/* Zone capacity */
|
||||
uint64_t z_cap;
|
||||
/* The starting sector of the zone */
|
||||
uint64_t z_start;
|
||||
/* Zone write pointer position in sectors */
|
||||
uint64_t z_wp;
|
||||
/* Zone type */
|
||||
uint8_t z_type;
|
||||
/* Zone state */
|
||||
uint8_t z_state;
|
||||
uint8_t reserved[38];
|
||||
};
|
||||
|
||||
struct virtio_blk_zone_report {
|
||||
uint64_t nr_zones;
|
||||
uint8_t reserved[56];
|
||||
struct virtio_blk_zone_descriptor zones[];
|
||||
};
|
||||
|
||||
/*
|
||||
* Supported zone types.
|
||||
*/
|
||||
|
||||
/* Conventional zone */
|
||||
#define VIRTIO_BLK_ZT_CONV 1
|
||||
/* Sequential Write Required zone */
|
||||
#define VIRTIO_BLK_ZT_SWR 2
|
||||
/* Sequential Write Preferred zone */
|
||||
#define VIRTIO_BLK_ZT_SWP 3
|
||||
|
||||
/*
|
||||
* Zone states that are available for zones of all types.
|
||||
*/
|
||||
|
||||
/* Not a write pointer (conventional zones only) */
|
||||
#define VIRTIO_BLK_ZS_NOT_WP 0
|
||||
/* Empty */
|
||||
#define VIRTIO_BLK_ZS_EMPTY 1
|
||||
/* Implicitly Open */
|
||||
#define VIRTIO_BLK_ZS_IOPEN 2
|
||||
/* Explicitly Open */
|
||||
#define VIRTIO_BLK_ZS_EOPEN 3
|
||||
/* Closed */
|
||||
#define VIRTIO_BLK_ZS_CLOSED 4
|
||||
/* Read-Only */
|
||||
#define VIRTIO_BLK_ZS_RDONLY 13
|
||||
/* Full */
|
||||
#define VIRTIO_BLK_ZS_FULL 14
|
||||
/* Offline */
|
||||
#define VIRTIO_BLK_ZS_OFFLINE 15
|
||||
|
||||
/* Unmap this range (only valid for write zeroes command) */
|
||||
#define VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP 0x00000001
|
||||
|
||||
|
@ -217,4 +315,11 @@ struct virtio_scsi_inhdr {
|
|||
#define VIRTIO_BLK_S_OK 0
|
||||
#define VIRTIO_BLK_S_IOERR 1
|
||||
#define VIRTIO_BLK_S_UNSUPP 2
|
||||
|
||||
/* Error codes that are specific to zoned block devices */
|
||||
#define VIRTIO_BLK_S_ZONE_INVALID_CMD 3
|
||||
#define VIRTIO_BLK_S_ZONE_UNALIGNED_WP 4
|
||||
#define VIRTIO_BLK_S_ZONE_OPEN_RESOURCE 5
|
||||
#define VIRTIO_BLK_S_ZONE_ACTIVE_RESOURCE 6
|
||||
|
||||
#endif /* _LINUX_VIRTIO_BLK_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue