mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
linux-headers: update to 6.10-rc1
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> Message-Id: <20240527-pvpanic-shutdown-v8-2-5a28ec02558b@t-8ch.de> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
c51dca0428
commit
c5614ee3f2
19 changed files with 236 additions and 6 deletions
|
@ -752,6 +752,61 @@ enum ethtool_module_power_mode {
|
|||
ETHTOOL_MODULE_POWER_MODE_HIGH,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_pse_types - Types of PSE controller.
|
||||
* @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown
|
||||
* @ETHTOOL_PSE_PODL: PSE controller which support PoDL
|
||||
* @ETHTOOL_PSE_C33: PSE controller which support Clause 33 (PoE)
|
||||
*/
|
||||
enum ethtool_pse_types {
|
||||
ETHTOOL_PSE_UNKNOWN = 1 << 0,
|
||||
ETHTOOL_PSE_PODL = 1 << 1,
|
||||
ETHTOOL_PSE_C33 = 1 << 2,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_c33_pse_admin_state - operational state of the PoDL PSE
|
||||
* functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN: state of PSE functions is unknown
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED: PSE functions are disabled
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED: PSE functions are enabled
|
||||
*/
|
||||
enum ethtool_c33_pse_admin_state {
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN = 1,
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED,
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_c33_pse_pw_d_status - power detection status of the PSE.
|
||||
* IEEE 802.3-2022 30.9.1.1.3 aPoDLPSEPowerDetectionStatus:
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN: PSE status is unknown
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED: The enumeration "disabled"
|
||||
* indicates that the PSE State diagram is in the state DISABLED.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING: The enumeration "searching"
|
||||
* indicates the PSE State diagram is in a state other than those
|
||||
* listed.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING: The enumeration
|
||||
* "deliveringPower" indicates that the PSE State diagram is in the
|
||||
* state POWER_ON.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_TEST: The enumeration "test" indicates that
|
||||
* the PSE State diagram is in the state TEST_MODE.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_FAULT: The enumeration "fault" indicates that
|
||||
* the PSE State diagram is in the state TEST_ERROR.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT: The enumeration "otherFault"
|
||||
* indicates that the PSE State diagram is in the state IDLE due to
|
||||
* the variable error_condition = true.
|
||||
*/
|
||||
enum ethtool_c33_pse_pw_d_status {
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN = 1,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_TEST,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_FAULT,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_podl_pse_admin_state - operational state of the PoDL PSE
|
||||
* functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState
|
||||
|
|
|
@ -1144,8 +1144,14 @@
|
|||
#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff
|
||||
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER 0x0000ff00
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000
|
||||
|
||||
/* Compute Express Link (CXL r3.1, sec 8.1.5) */
|
||||
#define PCI_DVSEC_CXL_PORT 3
|
||||
#define PCI_DVSEC_CXL_PORT_CTL 0x0c
|
||||
#define PCI_DVSEC_CXL_PORT_CTL_UNMASK_SBR 0x00000001
|
||||
|
||||
#endif /* LINUX_PCI_REGS_H */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
enum virtio_bt_config_type {
|
||||
VIRTIO_BT_CONFIG_TYPE_PRIMARY = 0,
|
||||
VIRTIO_BT_CONFIG_TYPE_AMP = 1,
|
||||
};
|
||||
|
||||
enum virtio_bt_config_vendor {
|
||||
|
|
|
@ -90,6 +90,8 @@
|
|||
#define VIRTIO_MEM_F_ACPI_PXM 0
|
||||
/* unplugged memory must not be accessed */
|
||||
#define VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE 1
|
||||
/* plugged memory will remain plugged when suspending+resuming */
|
||||
#define VIRTIO_MEM_F_PERSISTENT_SUSPEND 2
|
||||
|
||||
|
||||
/* --- virtio-mem: guest -> host requests --- */
|
||||
|
|
|
@ -56,6 +56,7 @@
|
|||
#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
|
||||
* Steering */
|
||||
#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
|
||||
#define VIRTIO_NET_F_DEVICE_STATS 50 /* Device can provide device-level statistics. */
|
||||
#define VIRTIO_NET_F_VQ_NOTF_COAL 52 /* Device supports virtqueue notification coalescing */
|
||||
#define VIRTIO_NET_F_NOTF_COAL 53 /* Device supports notifications coalescing */
|
||||
#define VIRTIO_NET_F_GUEST_USO4 54 /* Guest can handle USOv4 in. */
|
||||
|
@ -406,4 +407,146 @@ struct virtio_net_ctrl_coal_vq {
|
|||
struct virtio_net_ctrl_coal coal;
|
||||
};
|
||||
|
||||
/*
|
||||
* Device Statistics
|
||||
*/
|
||||
#define VIRTIO_NET_CTRL_STATS 8
|
||||
#define VIRTIO_NET_CTRL_STATS_QUERY 0
|
||||
#define VIRTIO_NET_CTRL_STATS_GET 1
|
||||
|
||||
struct virtio_net_stats_capabilities {
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_CVQ (1ULL << 32)
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_BASIC (1ULL << 0)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_CSUM (1ULL << 1)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_GSO (1ULL << 2)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_SPEED (1ULL << 3)
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_BASIC (1ULL << 16)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_CSUM (1ULL << 17)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_GSO (1ULL << 18)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_SPEED (1ULL << 19)
|
||||
|
||||
uint64_t supported_stats_types[1];
|
||||
};
|
||||
|
||||
struct virtio_net_ctrl_queue_stats {
|
||||
struct {
|
||||
uint16_t vq_index;
|
||||
uint16_t reserved[3];
|
||||
uint64_t types_bitmap[1];
|
||||
} stats[1];
|
||||
};
|
||||
|
||||
struct virtio_net_stats_reply_hdr {
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_CVQ 32
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_BASIC 0
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_CSUM 1
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_GSO 2
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_SPEED 3
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_BASIC 16
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_CSUM 17
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_GSO 18
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_SPEED 19
|
||||
uint8_t type;
|
||||
uint8_t reserved;
|
||||
uint16_t vq_index;
|
||||
uint16_t reserved1;
|
||||
uint16_t size;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_cvq {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t command_num;
|
||||
uint64_t ok_num;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_basic {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_notifications;
|
||||
|
||||
uint64_t rx_packets;
|
||||
uint64_t rx_bytes;
|
||||
|
||||
uint64_t rx_interrupts;
|
||||
|
||||
uint64_t rx_drops;
|
||||
uint64_t rx_drop_overruns;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_basic {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_notifications;
|
||||
|
||||
uint64_t tx_packets;
|
||||
uint64_t tx_bytes;
|
||||
|
||||
uint64_t tx_interrupts;
|
||||
|
||||
uint64_t tx_drops;
|
||||
uint64_t tx_drop_malformed;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_csum {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_csum_valid;
|
||||
uint64_t rx_needs_csum;
|
||||
uint64_t rx_csum_none;
|
||||
uint64_t rx_csum_bad;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_csum {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_csum_none;
|
||||
uint64_t tx_needs_csum;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_gso {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_gso_packets;
|
||||
uint64_t rx_gso_bytes;
|
||||
uint64_t rx_gso_packets_coalesced;
|
||||
uint64_t rx_gso_bytes_coalesced;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_gso {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_gso_packets;
|
||||
uint64_t tx_gso_bytes;
|
||||
uint64_t tx_gso_segments;
|
||||
uint64_t tx_gso_segments_bytes;
|
||||
uint64_t tx_gso_packets_noseg;
|
||||
uint64_t tx_gso_bytes_noseg;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_speed {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
/* rx_{packets,bytes}_allowance_exceeded are too long. So rename to
|
||||
* short name.
|
||||
*/
|
||||
uint64_t rx_ratelimit_packets;
|
||||
uint64_t rx_ratelimit_bytes;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_speed {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
/* tx_{packets,bytes}_allowance_exceeded are too long. So rename to
|
||||
* short name.
|
||||
*/
|
||||
uint64_t tx_ratelimit_packets;
|
||||
uint64_t tx_ratelimit_bytes;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_VIRTIO_NET_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue