Backmerging to bring in 6.19-rc1. An important upstream bugfix and to help unblock PTL CI.
Showing the changes to include/uapi (70 of 10864 files). Show all
Unified · Split
| @@ -86,6 +86,7 @@ typedef struct { · 85 unmodified lines | |||
| 86 | */ | 86 | */ |
| 87 | typedef __kernel_long_t __kernel_off_t; | 87 | typedef __kernel_long_t __kernel_off_t; |
| 88 | typedef long long __kernel_loff_t; | 88 | typedef long long __kernel_loff_t; |
| 89 | typedef unsigned long long __kernel_uoff_t; | ||
| 89 | typedef __kernel_long_t __kernel_old_time_t; | 90 | typedef __kernel_long_t __kernel_old_time_t; |
| 90 | #ifndef __KERNEL__ | 91 | #ifndef __KERNEL__ |
| 91 | typedef __kernel_long_t __kernel_time_t; | 92 | typedef __kernel_long_t __kernel_time_t; |
| @@ -857,9 +857,11 @@ __SYSCALL(__NR_open_tree_attr, sys_open_tree_attr) · 856 unmodified lines | |||
| 857 | __SYSCALL(__NR_file_getattr, sys_file_getattr) | 857 | __SYSCALL(__NR_file_getattr, sys_file_getattr) |
| 858 | #define __NR_file_setattr 469 | 858 | #define __NR_file_setattr 469 |
| 859 | __SYSCALL(__NR_file_setattr, sys_file_setattr) | 859 | __SYSCALL(__NR_file_setattr, sys_file_setattr) |
| 860 | #define __NR_listns 470 | ||
| 861 | __SYSCALL(__NR_listns, sys_listns) | ||
| 860 | 862 | ||
| 861 | #undef __NR_syscalls | 863 | #undef __NR_syscalls |
| 862 | #define __NR_syscalls 470 | 864 | #define __NR_syscalls 471 |
| 863 | 865 | ||
| 864 | /* | 866 | /* |
| 865 | * 32 bit systems traditionally used different | 867 | * 32 bit systems traditionally used different |
| @@ -418,26 +418,32 @@ struct acrn_pcidev { · 417 unmodified lines | |||
| 418 | }; | 418 | }; |
| 419 | 419 | ||
| 420 | /** | 420 | /** |
| 421 | * struct acrn_mmiodev - Info for assigning or de-assigning a MMIO device | 421 | * struct acrn_mmio_dev_res - MMIO device resource description |
| 422 | * @name: Name of the MMIO device. | 422 | * @user_vm_pa: Physical address of User VM of the MMIO region |
| 423 | * @res[].user_vm_pa: Physical address of User VM of the MMIO region | 423 | * for the MMIO device. |
| 424 | * for the MMIO device. | 424 | * @service_vm_pa: Physical address of Service VM of the MMIO |
| 425 | * @res[].service_vm_pa: Physical address of Service VM of the MMIO | 425 | * region for the MMIO device. |
| 426 | * region for the MMIO device. | 426 | * @size: Size of the MMIO region for the MMIO device. |
| 427 | * @res[].size: Size of the MMIO region for the MMIO device. | 427 | * @mem_type: Memory type of the MMIO region for the MMIO |
| 428 | * @res[].mem_type: Memory type of the MMIO region for the MMIO | 428 | * device. |
| 429 | * device. | 429 | */ |
| 430 | struct acrn_mmio_dev_res { | ||
| 431 | __u64 user_vm_pa; | ||
| 432 | __u64 service_vm_pa; | ||
| 433 | __u64 size; | ||
| 434 | __u64 mem_type; | ||
| 435 | }; | ||
| 436 | |||
| 437 | /** | ||
| 438 | * struct acrn_mmiodev - Info for assigning or de-assigning an MMIO device | ||
| 439 | * @name: Name of the MMIO device. | ||
| 440 | * @res: Array of MMIO device descriptions | ||
| 430 | * | 441 | * |
| 431 | * This structure will be passed to hypervisor directly. | 442 | * This structure will be passed to hypervisor directly. |
| 432 | */ | 443 | */ |
| 433 | struct acrn_mmiodev { | 444 | struct acrn_mmiodev { |
| 434 | __u8 name[8]; | 445 | __u8 name[8]; |
| 435 | struct { | 446 | struct acrn_mmio_dev_res res[ACRN_MMIODEV_RES_NUM]; |
| 436 | __u64 user_vm_pa; | ||
| 437 | __u64 service_vm_pa; | ||
| 438 | __u64 size; | ||
| 439 | __u64 mem_type; | ||
| 440 | } res[ACRN_MMIODEV_RES_NUM]; | ||
| 441 | }; | 447 | }; |
| 442 | 448 | ||
| 443 | /** | 449 | /** |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/binder.yaml */ | 3 | /* Documentation/netlink/specs/binder.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_ANDROID_BINDER_NETLINK_H | 7 | #ifndef _UAPI_LINUX_ANDROID_BINDER_NETLINK_H |
| 7 | #define _UAPI_LINUX_ANDROID_BINDER_NETLINK_H | 8 | #define _UAPI_LINUX_ANDROID_BINDER_NETLINK_H |
| @@ -26,11 +26,22 @@ enum blktrace_cat { · 25 unmodified lines | |||
| 26 | BLK_TC_DRV_DATA = 1 << 14, /* binary per-driver data */ | 26 | BLK_TC_DRV_DATA = 1 << 14, /* binary per-driver data */ |
| 27 | BLK_TC_FUA = 1 << 15, /* fua requests */ | 27 | BLK_TC_FUA = 1 << 15, /* fua requests */ |
| 28 | 28 | ||
| 29 | BLK_TC_END = 1 << 15, /* we've run out of bits! */ | 29 | BLK_TC_END_V1 = 1 << 15, /* we've run out of bits! */ |
| 30 | |||
| 31 | BLK_TC_ZONE_APPEND = 1ull << 16, /* zone append */ | ||
| 32 | BLK_TC_ZONE_RESET = 1ull << 17, /* zone reset */ | ||
| 33 | BLK_TC_ZONE_RESET_ALL = 1ull << 18, /* zone reset all */ | ||
| 34 | BLK_TC_ZONE_FINISH = 1ull << 19, /* zone finish */ | ||
| 35 | BLK_TC_ZONE_OPEN = 1ull << 20, /* zone open */ | ||
| 36 | BLK_TC_ZONE_CLOSE = 1ull << 21, /* zone close */ | ||
| 37 | |||
| 38 | BLK_TC_WRITE_ZEROES = 1ull << 22, /* write-zeroes */ | ||
| 39 | |||
| 40 | BLK_TC_END_V2 = 1ull << 22, | ||
| 30 | }; | 41 | }; |
| 31 | 42 | ||
| 32 | #define BLK_TC_SHIFT (16) | 43 | #define BLK_TC_SHIFT (16) |
| 33 | #define BLK_TC_ACT(act) ((act) << BLK_TC_SHIFT) | 44 | #define BLK_TC_ACT(act) ((u64)(act) << BLK_TC_SHIFT) |
| 34 | 45 | ||
| 35 | /* | 46 | /* |
| 36 | * Basic trace actions | 47 | * Basic trace actions |
| @@ -53,6 +64,8 @@ enum blktrace_act { · 16 unmodified lines | |||
| 53 | __BLK_TA_REMAP, /* bio was remapped */ | 64 | __BLK_TA_REMAP, /* bio was remapped */ |
| 54 | __BLK_TA_ABORT, /* request aborted */ | 65 | __BLK_TA_ABORT, /* request aborted */ |
| 55 | __BLK_TA_DRV_DATA, /* driver-specific binary data */ | 66 | __BLK_TA_DRV_DATA, /* driver-specific binary data */ |
| 67 | __BLK_TA_ZONE_PLUG, /* zone write plug was plugged */ | ||
| 68 | __BLK_TA_ZONE_UNPLUG, /* zone write plug was unplugged */ | ||
| 56 | __BLK_TA_CGROUP = 1 << 8, /* from a cgroup*/ | 69 | __BLK_TA_CGROUP = 1 << 8, /* from a cgroup*/ |
| 57 | }; | 70 | }; |
| 58 | 71 | ||
| @@ -88,12 +101,19 @@ enum blktrace_notify { · 29 unmodified lines | |||
| 88 | #define BLK_TA_ABORT (__BLK_TA_ABORT | BLK_TC_ACT(BLK_TC_QUEUE)) | 101 | #define BLK_TA_ABORT (__BLK_TA_ABORT | BLK_TC_ACT(BLK_TC_QUEUE)) |
| 89 | #define BLK_TA_DRV_DATA (__BLK_TA_DRV_DATA | BLK_TC_ACT(BLK_TC_DRV_DATA)) | 102 | #define BLK_TA_DRV_DATA (__BLK_TA_DRV_DATA | BLK_TC_ACT(BLK_TC_DRV_DATA)) |
| 90 | 103 | ||
| 104 | #define BLK_TA_ZONE_APPEND (__BLK_TA_COMPLETE |\ | ||
| 105 | BLK_TC_ACT(BLK_TC_ZONE_APPEND)) | ||
| 106 | #define BLK_TA_ZONE_PLUG (__BLK_TA_ZONE_PLUG | BLK_TC_ACT(BLK_TC_QUEUE)) | ||
| 107 | #define BLK_TA_ZONE_UNPLUG (__BLK_TA_ZONE_UNPLUG |\ | ||
| 108 | BLK_TC_ACT(BLK_TC_QUEUE)) | ||
| 109 | |||
| 91 | #define BLK_TN_PROCESS (__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY)) | 110 | #define BLK_TN_PROCESS (__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY)) |
| 92 | #define BLK_TN_TIMESTAMP (__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY)) | 111 | #define BLK_TN_TIMESTAMP (__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY)) |
| 93 | #define BLK_TN_MESSAGE (__BLK_TN_MESSAGE | BLK_TC_ACT(BLK_TC_NOTIFY)) | 112 | #define BLK_TN_MESSAGE (__BLK_TN_MESSAGE | BLK_TC_ACT(BLK_TC_NOTIFY)) |
| 94 | 113 | ||
| 95 | #define BLK_IO_TRACE_MAGIC 0x65617400 | 114 | #define BLK_IO_TRACE_MAGIC 0x65617400 |
| 96 | #define BLK_IO_TRACE_VERSION 0x07 | 115 | #define BLK_IO_TRACE_VERSION 0x07 |
| 116 | #define BLK_IO_TRACE2_VERSION 0x08 | ||
| 97 | 117 | ||
| 98 | /* | 118 | /* |
| 99 | * The trace itself | 119 | * The trace itself |
| @@ -113,6 +133,21 @@ struct blk_io_trace { · 13 unmodified lines | |||
| 113 | /* cgroup id will be stored here if exists */ | 133 | /* cgroup id will be stored here if exists */ |
| 114 | }; | 134 | }; |
| 115 | 135 | ||
| 136 | struct blk_io_trace2 { | ||
| 137 | __u32 magic; /* MAGIC << 8 | BLK_IO_TRACE2_VERSION */ | ||
| 138 | __u32 sequence; /* event number */ | ||
| 139 | __u64 time; /* in nanoseconds */ | ||
| 140 | __u64 sector; /* disk offset */ | ||
| 141 | __u32 bytes; /* transfer length */ | ||
| 142 | __u32 pid; /* who did it */ | ||
| 143 | __u64 action; /* what happened */ | ||
| 144 | __u32 device; /* device number */ | ||
| 145 | __u32 cpu; /* on what cpu did it happen */ | ||
| 146 | __u16 error; /* completion error */ | ||
| 147 | __u16 pdu_len; /* length of data after this trace */ | ||
| 148 | __u8 pad[12]; | ||
| 149 | /* cgroup id will be stored here if it exists */ | ||
| 150 | }; | ||
| 116 | /* | 151 | /* |
| 117 | * The remap event | 152 | * The remap event |
| 118 | */ | 153 | */ |
| @@ -129,6 +164,7 @@ enum { · 10 unmodified lines | |||
| 129 | }; | 164 | }; |
| 130 | 165 | ||
| 131 | #define BLKTRACE_BDEV_SIZE 32 | 166 | #define BLKTRACE_BDEV_SIZE 32 |
| 167 | #define BLKTRACE_BDEV_SIZE2 64 | ||
| 132 | 168 | ||
| 133 | /* | 169 | /* |
| 134 | * User setup structure passed with BLKTRACESETUP | 170 | * User setup structure passed with BLKTRACESETUP |
| @@ -143,4 +179,19 @@ struct blk_user_trace_setup { · 8 unmodified lines | |||
| 143 | __u32 pid; | 179 | __u32 pid; |
| 144 | }; | 180 | }; |
| 145 | 181 | ||
| 182 | /* | ||
| 183 | * User setup structure passed with BLKTRACESETUP2 | ||
| 184 | */ | ||
| 185 | struct blk_user_trace_setup2 { | ||
| 186 | char name[BLKTRACE_BDEV_SIZE2]; /* output */ | ||
| 187 | __u64 act_mask; /* input */ | ||
| 188 | __u32 buf_size; /* input */ | ||
| 189 | __u32 buf_nr; /* input */ | ||
| 190 | __u64 start_lba; | ||
| 191 | __u64 end_lba; | ||
| 192 | __u32 pid; | ||
| 193 | __u32 flags; /* currently unused */ | ||
| 194 | __u64 reserved[11]; | ||
| 195 | }; | ||
| 196 | |||
| 146 | #endif /* _UAPIBLKTRACE_H */ | 197 | #endif /* _UAPIBLKTRACE_H */ |
| @@ -48,6 +48,8 @@ enum blk_zone_type { · 47 unmodified lines | |||
| 48 | * FINISH ZONE command. | 48 | * FINISH ZONE command. |
| 49 | * @BLK_ZONE_COND_READONLY: The zone is read-only. | 49 | * @BLK_ZONE_COND_READONLY: The zone is read-only. |
| 50 | * @BLK_ZONE_COND_OFFLINE: The zone is offline (sectors cannot be read/written). | 50 | * @BLK_ZONE_COND_OFFLINE: The zone is offline (sectors cannot be read/written). |
| 51 | * @BLK_ZONE_COND_ACTIVE: The zone is either implicitly open, explicitly open, | ||
| 52 | * or closed. | ||
| 51 | * | 53 | * |
| 52 | * The Zone Condition state machine in the ZBC/ZAC standards maps the above | 54 | * The Zone Condition state machine in the ZBC/ZAC standards maps the above |
| 53 | * deinitions as: | 55 | * deinitions as: |
| @@ -61,6 +63,13 @@ enum blk_zone_type { · 7 unmodified lines | |||
| 61 | * | 63 | * |
| 62 | * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should | 64 | * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should |
| 63 | * be considered invalid. | 65 | * be considered invalid. |
| 66 | * | ||
| 67 | * The condition BLK_ZONE_COND_ACTIVE is used only with cached zone reports. | ||
| 68 | * It is used to report any of the BLK_ZONE_COND_IMP_OPEN, | ||
| 69 | * BLK_ZONE_COND_EXP_OPEN and BLK_ZONE_COND_CLOSED conditions. Conversely, a | ||
| 70 | * regular zone report will never report a zone condition using | ||
| 71 | * BLK_ZONE_COND_ACTIVE and instead use the conditions BLK_ZONE_COND_IMP_OPEN, | ||
| 72 | * BLK_ZONE_COND_EXP_OPEN or BLK_ZONE_COND_CLOSED as reported by the device. | ||
| 64 | */ | 73 | */ |
| 65 | enum blk_zone_cond { | 74 | enum blk_zone_cond { |
| 66 | BLK_ZONE_COND_NOT_WP = 0x0, | 75 | BLK_ZONE_COND_NOT_WP = 0x0, |
| @@ -71,15 +80,27 @@ enum blk_zone_cond { · 4 unmodified lines | |||
| 71 | BLK_ZONE_COND_READONLY = 0xD, | 80 | BLK_ZONE_COND_READONLY = 0xD, |
| 72 | BLK_ZONE_COND_FULL = 0xE, | 81 | BLK_ZONE_COND_FULL = 0xE, |
| 73 | BLK_ZONE_COND_OFFLINE = 0xF, | 82 | BLK_ZONE_COND_OFFLINE = 0xF, |
| 83 | |||
| 84 | BLK_ZONE_COND_ACTIVE = 0xFF, | ||
| 74 | }; | 85 | }; |
| 75 | 86 | ||
| 76 | /** | 87 | /** |
| 77 | * enum blk_zone_report_flags - Feature flags of reported zone descriptors. | 88 | * enum blk_zone_report_flags - Feature flags of reported zone descriptors. |
| 78 | * | 89 | * |
| 79 | * @BLK_ZONE_REP_CAPACITY: Zone descriptor has capacity field. | 90 | * @BLK_ZONE_REP_CAPACITY: Output only. Indicates that zone descriptors in a |
| 91 | * zone report have a valid capacity field. | ||
| 92 | * @BLK_ZONE_REP_CACHED: Input only. Indicates that the zone report should be | ||
| 93 | * generated using cached zone information. In this case, | ||
| 94 | * the implicit open, explicit open and closed zone | ||
| 95 | * conditions are all reported with the | ||
| 96 | * BLK_ZONE_COND_ACTIVE condition. | ||
| 80 | */ | 97 | */ |
| 81 | enum blk_zone_report_flags { | 98 | enum blk_zone_report_flags { |
| 82 | BLK_ZONE_REP_CAPACITY = (1 << 0), | 99 | /* Output flags */ |
| 100 | BLK_ZONE_REP_CAPACITY = (1U << 0), | ||
| 101 | |||
| 102 | /* Input flags */ | ||
| 103 | BLK_ZONE_REP_CACHED = (1U << 31), | ||
| 83 | }; | 104 | }; |
| 84 | 105 | ||
| 85 | /** | 106 | /** |
| @@ -122,6 +143,10 @@ struct blk_zone { · 36 unmodified lines | |||
| 122 | * @sector: starting sector of report | 143 | * @sector: starting sector of report |
| 123 | * @nr_zones: IN maximum / OUT actual | 144 | * @nr_zones: IN maximum / OUT actual |
| 124 | * @flags: one or more flags as defined by enum blk_zone_report_flags. | 145 | * @flags: one or more flags as defined by enum blk_zone_report_flags. |
| 146 | * @flags: one or more flags as defined by enum blk_zone_report_flags. | ||
| 147 | * With BLKREPORTZONE, this field is ignored as an input and is valid | ||
| 148 | * only as an output. Using BLKREPORTZONEV2, this field is used as both | ||
| 149 | * input and output. | ||
| 125 | * @zones: Space to hold @nr_zones @zones entries on reply. | 150 | * @zones: Space to hold @nr_zones @zones entries on reply. |
| 126 | * | 151 | * |
| 127 | * The array of at most @nr_zones must follow this structure in memory. | 152 | * The array of at most @nr_zones must follow this structure in memory. |
| @@ -148,9 +173,19 @@ struct blk_zone_range { · 20 unmodified lines | |||
| 148 | /** | 173 | /** |
| 149 | * Zoned block device ioctl's: | 174 | * Zoned block device ioctl's: |
| 150 | * | 175 | * |
| 151 | * @BLKREPORTZONE: Get zone information. Takes a zone report as argument. | 176 | * @BLKREPORTZONE: Get zone information from a zoned device. Takes a zone report |
| 152 | * The zone report will start from the zone containing the | 177 | * as argument. The zone report will start from the zone |
| 153 | * sector specified in the report request structure. | 178 | * containing the sector specified in struct blk_zone_report. |
| 179 | * The flags field of struct blk_zone_report is used as an | ||
| 180 | * output only and ignored as an input. | ||
| 181 | * DEPRECATED, use BLKREPORTZONEV2 instead. | ||
| 182 | * @BLKREPORTZONEV2: Same as @BLKREPORTZONE but uses the flags field of | ||
| 183 | * struct blk_zone_report as an input, allowing to get a zone | ||
| 184 | * report using cached zone information if the flag | ||
| 185 | * BLK_ZONE_REP_CACHED is set. In such case, the zone report | ||
| 186 | * may include zones with the condition @BLK_ZONE_COND_ACTIVE | ||
| 187 | * (c.f. the description of this condition above for more | ||
| 188 | * details). | ||
| 154 | * @BLKRESETZONE: Reset the write pointer of the zones in the specified | 189 | * @BLKRESETZONE: Reset the write pointer of the zones in the specified |
| 155 | * sector range. The sector range must be zone aligned. | 190 | * sector range. The sector range must be zone aligned. |
| 156 | * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors. | 191 | * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors. |
| @@ -169,5 +204,6 @@ struct blk_zone_range { · 12 unmodified lines | |||
| 169 | #define BLKOPENZONE _IOW(0x12, 134, struct blk_zone_range) | 204 | #define BLKOPENZONE _IOW(0x12, 134, struct blk_zone_range) |
| 170 | #define BLKCLOSEZONE _IOW(0x12, 135, struct blk_zone_range) | 205 | #define BLKCLOSEZONE _IOW(0x12, 135, struct blk_zone_range) |
| 171 | #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) | 206 | #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) |
| 207 | #define BLKREPORTZONEV2 _IOWR(0x12, 142, struct blk_zone_report) | ||
| 172 | 208 | ||
| 173 | #endif /* _UAPI_BLKZONED_H */ | 209 | #endif /* _UAPI_BLKZONED_H */ |
| @@ -1026,6 +1026,7 @@ enum bpf_map_type { · 1025 unmodified lines | |||
| 1026 | BPF_MAP_TYPE_USER_RINGBUF, | 1026 | BPF_MAP_TYPE_USER_RINGBUF, |
| 1027 | BPF_MAP_TYPE_CGRP_STORAGE, | 1027 | BPF_MAP_TYPE_CGRP_STORAGE, |
| 1028 | BPF_MAP_TYPE_ARENA, | 1028 | BPF_MAP_TYPE_ARENA, |
| 1029 | BPF_MAP_TYPE_INSN_ARRAY, | ||
| 1029 | __MAX_BPF_MAP_TYPE | 1030 | __MAX_BPF_MAP_TYPE |
| 1030 | }; | 1031 | }; |
| 1031 | 1032 | ||
| @@ -1430,6 +1431,9 @@ enum { · 398 unmodified lines | |||
| 1430 | 1431 | ||
| 1431 | /* Do not translate kernel bpf_arena pointers to user pointers */ | 1432 | /* Do not translate kernel bpf_arena pointers to user pointers */ |
| 1432 | BPF_F_NO_USER_CONV = (1U << 18), | 1433 | BPF_F_NO_USER_CONV = (1U << 18), |
| 1434 | |||
| 1435 | /* Enable BPF ringbuf overwrite mode */ | ||
| 1436 | BPF_F_RB_OVERWRITE = (1U << 19), | ||
| 1433 | }; | 1437 | }; |
| 1434 | 1438 | ||
| 1435 | /* Flags for BPF_PROG_QUERY. */ | 1439 | /* Flags for BPF_PROG_QUERY. */ |
| @@ -5618,7 +5622,7 @@ union bpf_attr { · 4182 unmodified lines | |||
| 5618 | * Return | 5622 | * Return |
| 5619 | * *sk* if casting is valid, or **NULL** otherwise. | 5623 | * *sk* if casting is valid, or **NULL** otherwise. |
| 5620 | * | 5624 | * |
| 5621 | * long bpf_dynptr_from_mem(void *data, u32 size, u64 flags, struct bpf_dynptr *ptr) | 5625 | * long bpf_dynptr_from_mem(void *data, u64 size, u64 flags, struct bpf_dynptr *ptr) |
| 5622 | * Description | 5626 | * Description |
| 5623 | * Get a dynptr to local memory *data*. | 5627 | * Get a dynptr to local memory *data*. |
| 5624 | * | 5628 | * |
| @@ -5661,7 +5665,7 @@ union bpf_attr { · 36 unmodified lines | |||
| 5661 | * Return | 5665 | * Return |
| 5662 | * Nothing. Always succeeds. | 5666 | * Nothing. Always succeeds. |
| 5663 | * | 5667 | * |
| 5664 | * long bpf_dynptr_read(void *dst, u32 len, const struct bpf_dynptr *src, u32 offset, u64 flags) | 5668 | * long bpf_dynptr_read(void *dst, u64 len, const struct bpf_dynptr *src, u64 offset, u64 flags) |
| 5665 | * Description | 5669 | * Description |
| 5666 | * Read *len* bytes from *src* into *dst*, starting from *offset* | 5670 | * Read *len* bytes from *src* into *dst*, starting from *offset* |
| 5667 | * into *src*. | 5671 | * into *src*. |
| @@ -5671,7 +5675,7 @@ union bpf_attr { · 3 unmodified lines | |||
| 5671 | * of *src*'s data, -EINVAL if *src* is an invalid dynptr or if | 5675 | * of *src*'s data, -EINVAL if *src* is an invalid dynptr or if |
| 5672 | * *flags* is not 0. | 5676 | * *flags* is not 0. |
| 5673 | * | 5677 | * |
| 5674 | * long bpf_dynptr_write(const struct bpf_dynptr *dst, u32 offset, void *src, u32 len, u64 flags) | 5678 | * long bpf_dynptr_write(const struct bpf_dynptr *dst, u64 offset, void *src, u64 len, u64 flags) |
| 5675 | * Description | 5679 | * Description |
| 5676 | * Write *len* bytes from *src* into *dst*, starting from *offset* | 5680 | * Write *len* bytes from *src* into *dst*, starting from *offset* |
| 5677 | * into *dst*. | 5681 | * into *dst*. |
| @@ -5692,7 +5696,7 @@ union bpf_attr { · 14 unmodified lines | |||
| 5692 | * is a read-only dynptr or if *flags* is not correct. For skb-type dynptrs, | 5696 | * is a read-only dynptr or if *flags* is not correct. For skb-type dynptrs, |
| 5693 | * other errors correspond to errors returned by **bpf_skb_store_bytes**\ (). | 5697 | * other errors correspond to errors returned by **bpf_skb_store_bytes**\ (). |
| 5694 | * | 5698 | * |
| 5695 | * void *bpf_dynptr_data(const struct bpf_dynptr *ptr, u32 offset, u32 len) | 5699 | * void *bpf_dynptr_data(const struct bpf_dynptr *ptr, u64 offset, u64 len) |
| 5696 | * Description | 5700 | * Description |
| 5697 | * Get a pointer to the underlying dynptr data. | 5701 | * Get a pointer to the underlying dynptr data. |
| 5698 | * | 5702 | * |
| @@ -6231,6 +6235,7 @@ enum { · 532 unmodified lines | |||
| 6231 | BPF_RB_RING_SIZE = 1, | 6235 | BPF_RB_RING_SIZE = 1, |
| 6232 | BPF_RB_CONS_POS = 2, | 6236 | BPF_RB_CONS_POS = 2, |
| 6233 | BPF_RB_PROD_POS = 3, | 6237 | BPF_RB_PROD_POS = 3, |
| 6238 | BPF_RB_OVERWRITE_POS = 4, | ||
| 6234 | }; | 6239 | }; |
| 6235 | 6240 | ||
| 6236 | /* BPF ring buffer constants */ | 6241 | /* BPF ring buffer constants */ |
| @@ -7200,6 +7205,8 @@ enum { · 963 unmodified lines | |||
| 7200 | TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */ | 7205 | TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */ |
| 7201 | TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */ | 7206 | TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */ |
| 7202 | SK_BPF_CB_FLAGS = 1009, /* Get or set sock ops flags in socket */ | 7207 | SK_BPF_CB_FLAGS = 1009, /* Get or set sock ops flags in socket */ |
| 7208 | SK_BPF_BYPASS_PROT_MEM = 1010, /* Get or Set sk->sk_bypass_prot_mem */ | ||
| 7209 | |||
| 7203 | }; | 7210 | }; |
| 7204 | 7211 | ||
| 7205 | enum { | 7212 | enum { |
| @@ -7645,4 +7652,24 @@ enum bpf_kfunc_flags { · 439 unmodified lines | |||
| 7645 | BPF_F_PAD_ZEROS = (1ULL << 0), | 7652 | BPF_F_PAD_ZEROS = (1ULL << 0), |
| 7646 | }; | 7653 | }; |
| 7647 | 7654 | ||
| 7655 | /* | ||
| 7656 | * Values of a BPF_MAP_TYPE_INSN_ARRAY entry must be of this type. | ||
| 7657 | * | ||
| 7658 | * Before the map is used the orig_off field should point to an | ||
| 7659 | * instruction inside the program being loaded. The other fields | ||
| 7660 | * must be set to 0. | ||
| 7661 | * | ||
| 7662 | * After the program is loaded, the xlated_off will be adjusted | ||
| 7663 | * by the verifier to point to the index of the original instruction | ||
| 7664 | * in the xlated program. If the instruction is deleted, it will | ||
| 7665 | * be set to (u32)-1. The jitted_off will be set to the corresponding | ||
| 7666 | * offset in the jitted image of the program. | ||
| 7667 | */ | ||
| 7668 | struct bpf_insn_array_value { | ||
| 7669 | __u32 orig_off; | ||
| 7670 | __u32 xlated_off; | ||
| 7671 | __u32 jitted_off; | ||
| 7672 | __u32 :32; | ||
| 7673 | }; | ||
| 7674 | |||
| 7648 | #endif /* _UAPI__LINUX_BPF_H__ */ | 7675 | #endif /* _UAPI__LINUX_BPF_H__ */ |
| @@ -1099,6 +1099,12 @@ enum btrfs_err_code { · 1098 unmodified lines | |||
| 1099 | BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, | 1099 | BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, |
| 1100 | }; | 1100 | }; |
| 1101 | 1101 | ||
| 1102 | /* Flags for IOC_SHUTDOWN, must match XFS_FSOP_GOING_FLAGS_* flags. */ | ||
| 1103 | #define BTRFS_SHUTDOWN_FLAGS_DEFAULT 0x0 | ||
| 1104 | #define BTRFS_SHUTDOWN_FLAGS_LOGFLUSH 0x1 | ||
| 1105 | #define BTRFS_SHUTDOWN_FLAGS_NOLOGFLUSH 0x2 | ||
| 1106 | #define BTRFS_SHUTDOWN_FLAGS_LAST 0x3 | ||
| 1107 | |||
| 1102 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ | 1108 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 1103 | struct btrfs_ioctl_vol_args) | 1109 | struct btrfs_ioctl_vol_args) |
| 1104 | #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ | 1110 | #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ |
| @@ -1220,6 +1226,9 @@ enum btrfs_err_code { · 115 unmodified lines | |||
| 1220 | #define BTRFS_IOC_SUBVOL_SYNC_WAIT _IOW(BTRFS_IOCTL_MAGIC, 65, \ | 1226 | #define BTRFS_IOC_SUBVOL_SYNC_WAIT _IOW(BTRFS_IOCTL_MAGIC, 65, \ |
| 1221 | struct btrfs_ioctl_subvol_wait) | 1227 | struct btrfs_ioctl_subvol_wait) |
| 1222 | 1228 | ||
| 1229 | /* Shutdown ioctl should follow XFS's interfaces, thus not using btrfs magic. */ | ||
| 1230 | #define BTRFS_IOC_SHUTDOWN _IOR('X', 125, __u32) | ||
| 1231 | |||
| 1223 | #ifdef __cplusplus | 1232 | #ifdef __cplusplus |
| 1224 | } | 1233 | } |
| 1225 | #endif | 1234 | #endif |
| @@ -5,6 +5,7 @@ · 4 unmodified lines | |||
| 5 | * Definitions for the CAN netlink interface | 5 | * Definitions for the CAN netlink interface |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> | 7 | * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> |
| 8 | * Copyright (c) 2021-2025 Vincent Mailhol <mailhol@kernel.org> | ||
| 8 | * | 9 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the version 2 of the GNU General Public License | 11 | * it under the terms of the version 2 of the GNU General Public License |
| @@ -103,6 +104,11 @@ struct can_ctrlmode { · 92 unmodified lines | |||
| 103 | #define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */ | 104 | #define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */ |
| 104 | #define CAN_CTRLMODE_TDC_AUTO 0x200 /* FD transceiver automatically calculates TDCV */ | 105 | #define CAN_CTRLMODE_TDC_AUTO 0x200 /* FD transceiver automatically calculates TDCV */ |
| 105 | #define CAN_CTRLMODE_TDC_MANUAL 0x400 /* FD TDCV is manually set up by user */ | 106 | #define CAN_CTRLMODE_TDC_MANUAL 0x400 /* FD TDCV is manually set up by user */ |
| 107 | #define CAN_CTRLMODE_RESTRICTED 0x800 /* Restricted operation mode */ | ||
| 108 | #define CAN_CTRLMODE_XL 0x1000 /* CAN XL mode */ | ||
| 109 | #define CAN_CTRLMODE_XL_TDC_AUTO 0x2000 /* XL transceiver automatically calculates TDCV */ | ||
| 110 | #define CAN_CTRLMODE_XL_TDC_MANUAL 0x4000 /* XL TDCV is manually set up by user */ | ||
| 111 | #define CAN_CTRLMODE_XL_TMS 0x8000 /* Transceiver Mode Switching */ | ||
| 106 | 112 | ||
| 107 | /* | 113 | /* |
| 108 | * CAN device statistics | 114 | * CAN device statistics |
| @@ -138,6 +144,11 @@ enum { · 29 unmodified lines | |||
| 138 | IFLA_CAN_BITRATE_MAX, | 144 | IFLA_CAN_BITRATE_MAX, |
| 139 | IFLA_CAN_TDC, /* FD */ | 145 | IFLA_CAN_TDC, /* FD */ |
| 140 | IFLA_CAN_CTRLMODE_EXT, | 146 | IFLA_CAN_CTRLMODE_EXT, |
| 147 | IFLA_CAN_XL_DATA_BITTIMING, | ||
| 148 | IFLA_CAN_XL_DATA_BITTIMING_CONST, | ||
| 149 | IFLA_CAN_XL_DATA_BITRATE_CONST, | ||
| 150 | IFLA_CAN_XL_TDC, | ||
| 151 | IFLA_CAN_XL_PWM, | ||
| 141 | 152 | ||
| 142 | /* add new constants above here */ | 153 | /* add new constants above here */ |
| 143 | __IFLA_CAN_MAX, | 154 | __IFLA_CAN_MAX, |
| @@ -179,6 +190,29 @@ enum { · 35 unmodified lines | |||
| 179 | IFLA_CAN_CTRLMODE_MAX = __IFLA_CAN_CTRLMODE - 1 | 190 | IFLA_CAN_CTRLMODE_MAX = __IFLA_CAN_CTRLMODE - 1 |
| 180 | }; | 191 | }; |
| 181 | 192 | ||
| 193 | /* | ||
| 194 | * CAN FD/XL Pulse-Width Modulation (PWM) | ||
| 195 | * | ||
| 196 | * Please refer to struct can_pwm_const and can_pwm in | ||
| 197 | * include/linux/can/bittiming.h for further details. | ||
| 198 | */ | ||
| 199 | enum { | ||
| 200 | IFLA_CAN_PWM_UNSPEC, | ||
| 201 | IFLA_CAN_PWM_PWMS_MIN, /* u32 */ | ||
| 202 | IFLA_CAN_PWM_PWMS_MAX, /* u32 */ | ||
| 203 | IFLA_CAN_PWM_PWML_MIN, /* u32 */ | ||
| 204 | IFLA_CAN_PWM_PWML_MAX, /* u32 */ | ||
| 205 | IFLA_CAN_PWM_PWMO_MIN, /* u32 */ | ||
| 206 | IFLA_CAN_PWM_PWMO_MAX, /* u32 */ | ||
| 207 | IFLA_CAN_PWM_PWMS, /* u32 */ | ||
| 208 | IFLA_CAN_PWM_PWML, /* u32 */ | ||
| 209 | IFLA_CAN_PWM_PWMO, /* u32 */ | ||
| 210 | |||
| 211 | /* add new constants above here */ | ||
| 212 | __IFLA_CAN_PWM, | ||
| 213 | IFLA_CAN_PWM_MAX = __IFLA_CAN_PWM - 1 | ||
| 214 | }; | ||
| 215 | |||
| 182 | /* u16 termination range: 1..65535 Ohms */ | 216 | /* u16 termination range: 1..65535 Ohms */ |
| 183 | #define CAN_TERMINATION_DISABLED 0 | 217 | #define CAN_TERMINATION_DISABLED 0 |
| 184 | 218 | ||
| @@ -181,6 +181,7 @@ enum devlink_sb_threshold_type { · 180 unmodified lines | |||
| 181 | enum devlink_eswitch_mode { | 181 | enum devlink_eswitch_mode { |
| 182 | DEVLINK_ESWITCH_MODE_LEGACY, | 182 | DEVLINK_ESWITCH_MODE_LEGACY, |
| 183 | DEVLINK_ESWITCH_MODE_SWITCHDEV, | 183 | DEVLINK_ESWITCH_MODE_SWITCHDEV, |
| 184 | DEVLINK_ESWITCH_MODE_SWITCHDEV_INACTIVE, | ||
| 184 | }; | 185 | }; |
| 185 | 186 | ||
| 186 | enum devlink_eswitch_inline_mode { | 187 | enum devlink_eswitch_inline_mode { |
| @@ -638,6 +639,9 @@ enum devlink_attr { · 451 unmodified lines | |||
| 638 | 639 | ||
| 639 | DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD, /* u64 */ | 640 | DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD, /* u64 */ |
| 640 | 641 | ||
| 642 | DEVLINK_ATTR_PARAM_VALUE_DEFAULT, /* dynamic */ | ||
| 643 | DEVLINK_ATTR_PARAM_RESET_DEFAULT, /* flag */ | ||
| 644 | |||
| 641 | /* Add new attributes above here, update the spec in | 645 | /* Add new attributes above here, update the spec in |
| 642 | * Documentation/netlink/specs/devlink.yaml and re-generate | 646 | * Documentation/netlink/specs/devlink.yaml and re-generate |
| 643 | * net/devlink/netlink_gen.c. | 647 | * net/devlink/netlink_gen.c. |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/dpll.yaml */ | 3 | /* Documentation/netlink/specs/dpll.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_DPLL_H | 7 | #ifndef _UAPI_LINUX_DPLL_H |
| 7 | #define _UAPI_LINUX_DPLL_H | 8 | #define _UAPI_LINUX_DPLL_H |
| @@ -251,6 +252,7 @@ enum dpll_a_pin { · 243 unmodified lines | |||
| 251 | DPLL_A_PIN_ESYNC_FREQUENCY_SUPPORTED, | 252 | DPLL_A_PIN_ESYNC_FREQUENCY_SUPPORTED, |
| 252 | DPLL_A_PIN_ESYNC_PULSE, | 253 | DPLL_A_PIN_ESYNC_PULSE, |
| 253 | DPLL_A_PIN_REFERENCE_SYNC, | 254 | DPLL_A_PIN_REFERENCE_SYNC, |
| 255 | DPLL_A_PIN_PHASE_ADJUST_GRAN, | ||
| 254 | 256 | ||
| 255 | __DPLL_A_PIN_MAX, | 257 | __DPLL_A_PIN_MAX, |
| 256 | DPLL_A_PIN_MAX = (__DPLL_A_PIN_MAX - 1) | 258 | DPLL_A_PIN_MAX = (__DPLL_A_PIN_MAX - 1) |
| @@ -0,0 +1,62 @@ | |||
| 1 | /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ | ||
| 2 | /* Do not edit directly, auto-generated from: */ | ||
| 3 | /* Documentation/netlink/specs/em.yaml */ | ||
| 4 | /* YNL-GEN uapi header */ | ||
| 5 | |||
| 6 | #ifndef _UAPI_LINUX_ENERGY_MODEL_H | ||
| 7 | #define _UAPI_LINUX_ENERGY_MODEL_H | ||
| 8 | |||
| 9 | #define EM_FAMILY_NAME "em" | ||
| 10 | #define EM_FAMILY_VERSION 1 | ||
| 11 | |||
| 12 | enum { | ||
| 13 | EM_A_PDS_PD = 1, | ||
| 14 | |||
| 15 | __EM_A_PDS_MAX, | ||
| 16 | EM_A_PDS_MAX = (__EM_A_PDS_MAX - 1) | ||
| 17 | }; | ||
| 18 | |||
| 19 | enum { | ||
| 20 | EM_A_PD_PAD = 1, | ||
| 21 | EM_A_PD_PD_ID, | ||
| 22 | EM_A_PD_FLAGS, | ||
| 23 | EM_A_PD_CPUS, | ||
| 24 | |||
| 25 | __EM_A_PD_MAX, | ||
| 26 | EM_A_PD_MAX = (__EM_A_PD_MAX - 1) | ||
| 27 | }; | ||
| 28 | |||
| 29 | enum { | ||
| 30 | EM_A_PD_TABLE_PD_ID = 1, | ||
| 31 | EM_A_PD_TABLE_PS, | ||
| 32 | |||
| 33 | __EM_A_PD_TABLE_MAX, | ||
| 34 | EM_A_PD_TABLE_MAX = (__EM_A_PD_TABLE_MAX - 1) | ||
| 35 | }; | ||
| 36 | |||
| 37 | enum { | ||
| 38 | EM_A_PS_PAD = 1, | ||
| 39 | EM_A_PS_PERFORMANCE, | ||
| 40 | EM_A_PS_FREQUENCY, | ||
| 41 | EM_A_PS_POWER, | ||
| 42 | EM_A_PS_COST, | ||
| 43 | EM_A_PS_FLAGS, | ||
| 44 | |||
| 45 | __EM_A_PS_MAX, | ||
| 46 | EM_A_PS_MAX = (__EM_A_PS_MAX - 1) | ||
| 47 | }; | ||
| 48 | |||
| 49 | enum { | ||
| 50 | EM_CMD_GET_PDS = 1, | ||
| 51 | EM_CMD_GET_PD_TABLE, | ||
| 52 | EM_CMD_PD_CREATED, | ||
| 53 | EM_CMD_PD_UPDATED, | ||
| 54 | EM_CMD_PD_DELETED, | ||
| 55 | |||
| 56 | __EM_CMD_MAX, | ||
| 57 | EM_CMD_MAX = (__EM_CMD_MAX - 1) | ||
| 58 | }; | ||
| 59 | |||
| 60 | #define EM_MCGRP_EVENT "event" | ||
| 61 | |||
| 62 | #endif /* _UAPI_LINUX_ENERGY_MODEL_H */ | ||
| @@ -2077,6 +2077,10 @@ enum ethtool_link_mode_bit_indices { · 2076 unmodified lines | |||
| 2077 | ETHTOOL_LINK_MODE_800000baseDR4_2_Full_BIT = 118, | 2077 | ETHTOOL_LINK_MODE_800000baseDR4_2_Full_BIT = 118, |
| 2078 | ETHTOOL_LINK_MODE_800000baseSR4_Full_BIT = 119, | 2078 | ETHTOOL_LINK_MODE_800000baseSR4_Full_BIT = 119, |
| 2079 | ETHTOOL_LINK_MODE_800000baseVR4_Full_BIT = 120, | 2079 | ETHTOOL_LINK_MODE_800000baseVR4_Full_BIT = 120, |
| 2080 | ETHTOOL_LINK_MODE_1600000baseCR8_Full_BIT = 121, | ||
| 2081 | ETHTOOL_LINK_MODE_1600000baseKR8_Full_BIT = 122, | ||
| 2082 | ETHTOOL_LINK_MODE_1600000baseDR8_Full_BIT = 123, | ||
| 2083 | ETHTOOL_LINK_MODE_1600000baseDR8_2_Full_BIT = 124, | ||
| 2080 | 2084 | ||
| 2081 | /* must be last entry */ | 2085 | /* must be last entry */ |
| 2082 | __ETHTOOL_LINK_MODE_MASK_NBITS | 2086 | __ETHTOOL_LINK_MODE_MASK_NBITS |
| @@ -2190,6 +2194,7 @@ enum ethtool_link_mode_bit_indices { · 107 unmodified lines | |||
| 2190 | #define SPEED_200000 200000 | 2194 | #define SPEED_200000 200000 |
| 2191 | #define SPEED_400000 400000 | 2195 | #define SPEED_400000 400000 |
| 2192 | #define SPEED_800000 800000 | 2196 | #define SPEED_800000 800000 |
| 2197 | #define SPEED_1600000 1600000 | ||
| 2193 | 2198 | ||
| 2194 | #define SPEED_UNKNOWN -1 | 2199 | #define SPEED_UNKNOWN -1 |
| 2195 | 2200 | ||
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/ethtool.yaml */ | 3 | /* Documentation/netlink/specs/ethtool.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H | 7 | #ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H |
| 7 | #define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H | 8 | #define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H |
| @@ -803,6 +804,39 @@ enum { · 795 unmodified lines | |||
| 803 | ETHTOOL_A_PSE_NTF_MAX = (__ETHTOOL_A_PSE_NTF_CNT - 1) | 804 | ETHTOOL_A_PSE_NTF_MAX = (__ETHTOOL_A_PSE_NTF_CNT - 1) |
| 804 | }; | 805 | }; |
| 805 | 806 | ||
| 807 | enum { | ||
| 808 | ETHTOOL_A_MSE_CAPABILITIES_MAX_AVERAGE_MSE = 1, | ||
| 809 | ETHTOOL_A_MSE_CAPABILITIES_MAX_PEAK_MSE, | ||
| 810 | ETHTOOL_A_MSE_CAPABILITIES_REFRESH_RATE_PS, | ||
| 811 | ETHTOOL_A_MSE_CAPABILITIES_NUM_SYMBOLS, | ||
| 812 | |||
| 813 | __ETHTOOL_A_MSE_CAPABILITIES_CNT, | ||
| 814 | ETHTOOL_A_MSE_CAPABILITIES_MAX = (__ETHTOOL_A_MSE_CAPABILITIES_CNT - 1) | ||
| 815 | }; | ||
| 816 | |||
| 817 | enum { | ||
| 818 | ETHTOOL_A_MSE_SNAPSHOT_AVERAGE_MSE = 1, | ||
| 819 | ETHTOOL_A_MSE_SNAPSHOT_PEAK_MSE, | ||
| 820 | ETHTOOL_A_MSE_SNAPSHOT_WORST_PEAK_MSE, | ||
| 821 | |||
| 822 | __ETHTOOL_A_MSE_SNAPSHOT_CNT, | ||
| 823 | ETHTOOL_A_MSE_SNAPSHOT_MAX = (__ETHTOOL_A_MSE_SNAPSHOT_CNT - 1) | ||
| 824 | }; | ||
| 825 | |||
| 826 | enum { | ||
| 827 | ETHTOOL_A_MSE_HEADER = 1, | ||
| 828 | ETHTOOL_A_MSE_CAPABILITIES, | ||
| 829 | ETHTOOL_A_MSE_CHANNEL_A, | ||
| 830 | ETHTOOL_A_MSE_CHANNEL_B, | ||
| 831 | ETHTOOL_A_MSE_CHANNEL_C, | ||
| 832 | ETHTOOL_A_MSE_CHANNEL_D, | ||
| 833 | ETHTOOL_A_MSE_WORST_CHANNEL, | ||
| 834 | ETHTOOL_A_MSE_LINK, | ||
| 835 | |||
| 836 | __ETHTOOL_A_MSE_CNT, | ||
| 837 | ETHTOOL_A_MSE_MAX = (__ETHTOOL_A_MSE_CNT - 1) | ||
| 838 | }; | ||
| 839 | |||
| 806 | enum { | 840 | enum { |
| 807 | ETHTOOL_MSG_USER_NONE = 0, | 841 | ETHTOOL_MSG_USER_NONE = 0, |
| 808 | ETHTOOL_MSG_STRSET_GET = 1, | 842 | ETHTOOL_MSG_STRSET_GET = 1, |
| @@ -855,6 +889,7 @@ enum { · 46 unmodified lines | |||
| 855 | ETHTOOL_MSG_RSS_SET, | 889 | ETHTOOL_MSG_RSS_SET, |
| 856 | ETHTOOL_MSG_RSS_CREATE_ACT, | 890 | ETHTOOL_MSG_RSS_CREATE_ACT, |
| 857 | ETHTOOL_MSG_RSS_DELETE_ACT, | 891 | ETHTOOL_MSG_RSS_DELETE_ACT, |
| 892 | ETHTOOL_MSG_MSE_GET, | ||
| 858 | 893 | ||
| 859 | __ETHTOOL_MSG_USER_CNT, | 894 | __ETHTOOL_MSG_USER_CNT, |
| 860 | ETHTOOL_MSG_USER_MAX = (__ETHTOOL_MSG_USER_CNT - 1) | 895 | ETHTOOL_MSG_USER_MAX = (__ETHTOOL_MSG_USER_CNT - 1) |
| @@ -915,6 +950,7 @@ enum { · 54 unmodified lines | |||
| 915 | ETHTOOL_MSG_RSS_CREATE_ACT_REPLY, | 950 | ETHTOOL_MSG_RSS_CREATE_ACT_REPLY, |
| 916 | ETHTOOL_MSG_RSS_CREATE_NTF, | 951 | ETHTOOL_MSG_RSS_CREATE_NTF, |
| 917 | ETHTOOL_MSG_RSS_DELETE_NTF, | 952 | ETHTOOL_MSG_RSS_DELETE_NTF, |
| 953 | ETHTOOL_MSG_MSE_GET_REPLY, | ||
| 918 | 954 | ||
| 919 | __ETHTOOL_MSG_KERNEL_CNT, | 955 | __ETHTOOL_MSG_KERNEL_CNT, |
| 920 | ETHTOOL_MSG_KERNEL_MAX = (__ETHTOOL_MSG_KERNEL_CNT - 1) | 956 | ETHTOOL_MSG_KERNEL_MAX = (__ETHTOOL_MSG_KERNEL_CNT - 1) |
| @@ -4,6 +4,7 @@ · 3 unmodified lines | |||
| 4 | 4 | ||
| 5 | #include <asm/fcntl.h> | 5 | #include <asm/fcntl.h> |
| 6 | #include <linux/openat2.h> | 6 | #include <linux/openat2.h> |
| 7 | #include <linux/types.h> | ||
| 7 | 8 | ||
| 8 | #define F_SETLEASE (F_LINUX_SPECIFIC_BASE + 0) | 9 | #define F_SETLEASE (F_LINUX_SPECIFIC_BASE + 0) |
| 9 | #define F_GETLEASE (F_LINUX_SPECIFIC_BASE + 1) | 10 | #define F_GETLEASE (F_LINUX_SPECIFIC_BASE + 1) |
| @@ -79,6 +80,17 @@ · 69 unmodified lines | |||
| 79 | */ | 80 | */ |
| 80 | #define RWF_WRITE_LIFE_NOT_SET RWH_WRITE_LIFE_NOT_SET | 81 | #define RWF_WRITE_LIFE_NOT_SET RWH_WRITE_LIFE_NOT_SET |
| 81 | 82 | ||
| 83 | /* Set/Get delegations */ | ||
| 84 | #define F_GETDELEG (F_LINUX_SPECIFIC_BASE + 15) | ||
| 85 | #define F_SETDELEG (F_LINUX_SPECIFIC_BASE + 16) | ||
| 86 | |||
| 87 | /* Argument structure for F_GETDELEG and F_SETDELEG */ | ||
| 88 | struct delegation { | ||
| 89 | __u32 d_flags; /* Must be 0 */ | ||
| 90 | __u16 d_type; /* F_RDLCK, F_WRLCK, F_UNLCK */ | ||
| 91 | __u16 __pad; /* Must be 0 */ | ||
| 92 | }; | ||
| 93 | |||
| 82 | /* | 94 | /* |
| 83 | * Types of directory notifications that may be requested. | 95 | * Types of directory notifications that may be requested. |
| 84 | */ | 96 | */ |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/fou.yaml */ | 3 | /* Documentation/netlink/specs/fou.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_FOU_H | 7 | #ifndef _UAPI_LINUX_FOU_H |
| 7 | #define _UAPI_LINUX_FOU_H | 8 | #define _UAPI_LINUX_FOU_H |
| @@ -298,8 +298,9 @@ struct file_attr { · 297 unmodified lines | |||
| 298 | #define BLKROTATIONAL _IO(0x12,126) | 298 | #define BLKROTATIONAL _IO(0x12,126) |
| 299 | #define BLKZEROOUT _IO(0x12,127) | 299 | #define BLKZEROOUT _IO(0x12,127) |
| 300 | #define BLKGETDISKSEQ _IOR(0x12,128,__u64) | 300 | #define BLKGETDISKSEQ _IOR(0x12,128,__u64) |
| 301 | /* 130-136 are used by zoned block device ioctls (uapi/linux/blkzoned.h) */ | 301 | /* 130-136 and 142 are used by zoned block device ioctls (uapi/linux/blkzoned.h) */ |
| 302 | /* 137-141 are used by blk-crypto ioctls (uapi/linux/blk-crypto.h) */ | 302 | /* 137-141 are used by blk-crypto ioctls (uapi/linux/blk-crypto.h) */ |
| 303 | #define BLKTRACESETUP2 _IOWR(0x12, 142, struct blk_user_trace_setup2) | ||
| 303 | 304 | ||
| 304 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ | 305 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ |
| 305 | #define FIBMAP _IO(0x00,1) /* bmap access */ | 306 | #define FIBMAP _IO(0x00,1) /* bmap access */ |
| @@ -0,0 +1,104 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | |||
| 3 | /*************************************************************************** | ||
| 4 | * copyright : (C) 2002 by Frank Mori Hess | ||
| 5 | ***************************************************************************/ | ||
| 6 | |||
| 7 | #ifndef _GPIB_H | ||
| 8 | #define _GPIB_H | ||
| 9 | |||
| 10 | #define GPIB_MAX_NUM_BOARDS 16 | ||
| 11 | #define GPIB_MAX_NUM_DESCRIPTORS 0x1000 | ||
| 12 | |||
| 13 | enum ibsta_bit_numbers { | ||
| 14 | DCAS_NUM = 0, | ||
| 15 | DTAS_NUM = 1, | ||
| 16 | LACS_NUM = 2, | ||
| 17 | TACS_NUM = 3, | ||
| 18 | ATN_NUM = 4, | ||
| 19 | CIC_NUM = 5, | ||
| 20 | REM_NUM = 6, | ||
| 21 | LOK_NUM = 7, | ||
| 22 | CMPL_NUM = 8, | ||
| 23 | EVENT_NUM = 9, | ||
| 24 | SPOLL_NUM = 10, | ||
| 25 | RQS_NUM = 11, | ||
| 26 | SRQI_NUM = 12, | ||
| 27 | END_NUM = 13, | ||
| 28 | TIMO_NUM = 14, | ||
| 29 | ERR_NUM = 15 | ||
| 30 | }; | ||
| 31 | |||
| 32 | /* IBSTA status bits (returned by all functions) */ | ||
| 33 | enum ibsta_bits { | ||
| 34 | DCAS = (1 << DCAS_NUM), /* device clear state */ | ||
| 35 | DTAS = (1 << DTAS_NUM), /* device trigger state */ | ||
| 36 | LACS = (1 << LACS_NUM), /* GPIB interface is addressed as Listener */ | ||
| 37 | TACS = (1 << TACS_NUM), /* GPIB interface is addressed as Talker */ | ||
| 38 | ATN = (1 << ATN_NUM), /* Attention is asserted */ | ||
| 39 | CIC = (1 << CIC_NUM), /* GPIB interface is Controller-in-Charge */ | ||
| 40 | REM = (1 << REM_NUM), /* remote state */ | ||
| 41 | LOK = (1 << LOK_NUM), /* lockout state */ | ||
| 42 | CMPL = (1 << CMPL_NUM), /* I/O is complete */ | ||
| 43 | EVENT = (1 << EVENT_NUM), /* DCAS, DTAS, or IFC has occurred */ | ||
| 44 | SPOLL = (1 << SPOLL_NUM), /* board serial polled by busmaster */ | ||
| 45 | RQS = (1 << RQS_NUM), /* Device requesting service */ | ||
| 46 | SRQI = (1 << SRQI_NUM), /* SRQ is asserted */ | ||
| 47 | END = (1 << END_NUM), /* EOI or EOS encountered */ | ||
| 48 | TIMO = (1 << TIMO_NUM), /* Time limit on I/O or wait function exceeded */ | ||
| 49 | ERR = (1 << ERR_NUM), /* Function call terminated on error */ | ||
| 50 | |||
| 51 | device_status_mask = ERR | TIMO | END | CMPL | RQS, | ||
| 52 | board_status_mask = ERR | TIMO | END | CMPL | SPOLL | | ||
| 53 | EVENT | LOK | REM | CIC | ATN | TACS | LACS | DTAS | DCAS | SRQI, | ||
| 54 | }; | ||
| 55 | |||
| 56 | /* End-of-string (EOS) modes for use with ibeos */ | ||
| 57 | |||
| 58 | enum eos_flags { | ||
| 59 | EOS_MASK = 0x1c00, | ||
| 60 | REOS = 0x0400, /* Terminate reads on EOS */ | ||
| 61 | XEOS = 0x800, /* assert EOI when EOS char is sent */ | ||
| 62 | BIN = 0x1000 /* Do 8-bit compare on EOS */ | ||
| 63 | }; | ||
| 64 | |||
| 65 | /* GPIB Bus Control Lines bit vector */ | ||
| 66 | enum bus_control_line { | ||
| 67 | VALID_DAV = 0x01, | ||
| 68 | VALID_NDAC = 0x02, | ||
| 69 | VALID_NRFD = 0x04, | ||
| 70 | VALID_IFC = 0x08, | ||
| 71 | VALID_REN = 0x10, | ||
| 72 | VALID_SRQ = 0x20, | ||
| 73 | VALID_ATN = 0x40, | ||
| 74 | VALID_EOI = 0x80, | ||
| 75 | VALID_ALL = 0xff, | ||
| 76 | BUS_DAV = 0x0100, /* DAV line status bit */ | ||
| 77 | BUS_NDAC = 0x0200, /* NDAC line status bit */ | ||
| 78 | BUS_NRFD = 0x0400, /* NRFD line status bit */ | ||
| 79 | BUS_IFC = 0x0800, /* IFC line status bit */ | ||
| 80 | BUS_REN = 0x1000, /* REN line status bit */ | ||
| 81 | BUS_SRQ = 0x2000, /* SRQ line status bit */ | ||
| 82 | BUS_ATN = 0x4000, /* ATN line status bit */ | ||
| 83 | BUS_EOI = 0x8000 /* EOI line status bit */ | ||
| 84 | }; | ||
| 85 | |||
| 86 | enum ppe_bits { | ||
| 87 | PPC_DISABLE = 0x10, | ||
| 88 | PPC_SENSE = 0x8, /* parallel poll sense bit */ | ||
| 89 | PPC_DIO_MASK = 0x7 | ||
| 90 | }; | ||
| 91 | |||
| 92 | enum { | ||
| 93 | request_service_bit = 0x40, | ||
| 94 | }; | ||
| 95 | |||
| 96 | enum gpib_events { | ||
| 97 | EVENT_NONE = 0, | ||
| 98 | EVENT_DEV_TRG = 1, | ||
| 99 | EVENT_DEV_CLR = 2, | ||
| 100 | EVENT_IFC = 3 | ||
| 101 | }; | ||
| 102 | |||
| 103 | #endif /* _GPIB_H */ | ||
| 104 | |||
| @@ -0,0 +1,167 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | |||
| 3 | /*************************************************************************** | ||
| 4 | * copyright : (C) 2002 by Frank Mori Hess | ||
| 5 | ***************************************************************************/ | ||
| 6 | |||
| 7 | #ifndef _GPIB_IOCTL_H | ||
| 8 | #define _GPIB_IOCTL_H | ||
| 9 | |||
| 10 | #include <asm/ioctl.h> | ||
| 11 | #include <linux/types.h> | ||
| 12 | |||
| 13 | #define GPIB_CODE 160 | ||
| 14 | |||
| 15 | struct gpib_board_type_ioctl { | ||
| 16 | char name[100]; | ||
| 17 | }; | ||
| 18 | |||
| 19 | /* argument for read/write/command ioctls */ | ||
| 20 | struct gpib_read_write_ioctl { | ||
| 21 | __u64 buffer_ptr; | ||
| 22 | __u32 requested_transfer_count; | ||
| 23 | __u32 completed_transfer_count; | ||
| 24 | __s32 end; /* end flag return for reads, end io suppression request for cmd*/ | ||
| 25 | __s32 handle; | ||
| 26 | }; | ||
| 27 | |||
| 28 | struct gpib_open_dev_ioctl { | ||
| 29 | __u32 handle; | ||
| 30 | __u32 pad; | ||
| 31 | __s32 sad; | ||
| 32 | __u32 is_board; | ||
| 33 | }; | ||
| 34 | |||
| 35 | struct gpib_close_dev_ioctl { | ||
| 36 | __u32 handle; | ||
| 37 | }; | ||
| 38 | |||
| 39 | struct gpib_serial_poll_ioctl { | ||
| 40 | __u32 pad; | ||
| 41 | __s32 sad; | ||
| 42 | __u8 status_byte; | ||
| 43 | __u8 padding[3]; /* align to 32 bit boundary */ | ||
| 44 | }; | ||
| 45 | |||
| 46 | struct gpib_eos_ioctl { | ||
| 47 | __s32 eos; | ||
| 48 | __s32 eos_flags; | ||
| 49 | }; | ||
| 50 | |||
| 51 | struct gpib_wait_ioctl { | ||
| 52 | __s32 handle; | ||
| 53 | __s32 wait_mask; | ||
| 54 | __s32 clear_mask; | ||
| 55 | __s32 set_mask; | ||
| 56 | __s32 ibsta; | ||
| 57 | __s32 pad; | ||
| 58 | __s32 sad; | ||
| 59 | __u32 usec_timeout; | ||
| 60 | }; | ||
| 61 | |||
| 62 | struct gpib_online_ioctl { | ||
| 63 | __u64 init_data_ptr; | ||
| 64 | __s32 init_data_length; | ||
| 65 | __s32 online; | ||
| 66 | }; | ||
| 67 | |||
| 68 | struct gpib_spoll_bytes_ioctl { | ||
| 69 | __u32 num_bytes; | ||
| 70 | __u32 pad; | ||
| 71 | __s32 sad; | ||
| 72 | }; | ||
| 73 | |||
| 74 | struct gpib_board_info_ioctl { | ||
| 75 | __u32 pad; | ||
| 76 | __s32 sad; | ||
| 77 | __s32 parallel_poll_configuration; | ||
| 78 | __s32 autopolling; | ||
| 79 | __s32 is_system_controller; | ||
| 80 | __u32 t1_delay; | ||
| 81 | unsigned ist : 1; | ||
| 82 | unsigned no_7_bit_eos : 1; | ||
| 83 | unsigned padding :30; /* align to 32 bit boundary */ | ||
| 84 | }; | ||
| 85 | |||
| 86 | struct gpib_select_pci_ioctl { | ||
| 87 | __s32 pci_bus; | ||
| 88 | __s32 pci_slot; | ||
| 89 | }; | ||
| 90 | |||
| 91 | struct gpib_ppoll_config_ioctl { | ||
| 92 | __u8 config; | ||
| 93 | unsigned set_ist : 1; | ||
| 94 | unsigned clear_ist : 1; | ||
| 95 | unsigned padding :22; /* align to 32 bit boundary */ | ||
| 96 | }; | ||
| 97 | |||
| 98 | struct gpib_pad_ioctl { | ||
| 99 | __u32 handle; | ||
| 100 | __u32 pad; | ||
| 101 | }; | ||
| 102 | |||
| 103 | struct gpib_sad_ioctl { | ||
| 104 | __u32 handle; | ||
| 105 | __s32 sad; | ||
| 106 | }; | ||
| 107 | |||
| 108 | /* select a piece of hardware to attach by its sysfs device path */ | ||
| 109 | struct gpib_select_device_path_ioctl { | ||
| 110 | char device_path[0x1000]; | ||
| 111 | }; | ||
| 112 | |||
| 113 | /* update status byte and request service */ | ||
| 114 | struct gpib_request_service2 { | ||
| 115 | __u8 status_byte; | ||
| 116 | __u8 padding[3]; /* align to 32 bit boundary */ | ||
| 117 | __s32 new_reason_for_service; | ||
| 118 | }; | ||
| 119 | |||
| 120 | /* Standard functions. */ | ||
| 121 | enum gpib_ioctl { | ||
| 122 | IBRD = _IOWR(GPIB_CODE, 100, struct gpib_read_write_ioctl), | ||
| 123 | IBWRT = _IOWR(GPIB_CODE, 101, struct gpib_read_write_ioctl), | ||
| 124 | IBCMD = _IOWR(GPIB_CODE, 102, struct gpib_read_write_ioctl), | ||
| 125 | IBOPENDEV = _IOWR(GPIB_CODE, 3, struct gpib_open_dev_ioctl), | ||
| 126 | IBCLOSEDEV = _IOW(GPIB_CODE, 4, struct gpib_close_dev_ioctl), | ||
| 127 | IBWAIT = _IOWR(GPIB_CODE, 5, struct gpib_wait_ioctl), | ||
| 128 | IBRPP = _IOWR(GPIB_CODE, 6, __u8), | ||
| 129 | |||
| 130 | IBSIC = _IOW(GPIB_CODE, 9, __u32), | ||
| 131 | IBSRE = _IOW(GPIB_CODE, 10, __s32), | ||
| 132 | IBGTS = _IO(GPIB_CODE, 11), | ||
| 133 | IBCAC = _IOW(GPIB_CODE, 12, __s32), | ||
| 134 | IBLINES = _IOR(GPIB_CODE, 14, __s16), | ||
| 135 | IBPAD = _IOW(GPIB_CODE, 15, struct gpib_pad_ioctl), | ||
| 136 | IBSAD = _IOW(GPIB_CODE, 16, struct gpib_sad_ioctl), | ||
| 137 | IBTMO = _IOW(GPIB_CODE, 17, __u32), | ||
| 138 | IBRSP = _IOWR(GPIB_CODE, 18, struct gpib_serial_poll_ioctl), | ||
| 139 | IBEOS = _IOW(GPIB_CODE, 19, struct gpib_eos_ioctl), | ||
| 140 | IBRSV = _IOW(GPIB_CODE, 20, __u8), | ||
| 141 | CFCBASE = _IOW(GPIB_CODE, 21, __u64), | ||
| 142 | CFCIRQ = _IOW(GPIB_CODE, 22, __u32), | ||
| 143 | CFCDMA = _IOW(GPIB_CODE, 23, __u32), | ||
| 144 | CFCBOARDTYPE = _IOW(GPIB_CODE, 24, struct gpib_board_type_ioctl), | ||
| 145 | |||
| 146 | IBMUTEX = _IOW(GPIB_CODE, 26, __s32), | ||
| 147 | IBSPOLL_BYTES = _IOWR(GPIB_CODE, 27, struct gpib_spoll_bytes_ioctl), | ||
| 148 | IBPPC = _IOW(GPIB_CODE, 28, struct gpib_ppoll_config_ioctl), | ||
| 149 | IBBOARD_INFO = _IOR(GPIB_CODE, 29, struct gpib_board_info_ioctl), | ||
| 150 | |||
| 151 | IBQUERY_BOARD_RSV = _IOR(GPIB_CODE, 31, __s32), | ||
| 152 | IBSELECT_PCI = _IOWR(GPIB_CODE, 32, struct gpib_select_pci_ioctl), | ||
| 153 | IBEVENT = _IOR(GPIB_CODE, 33, __s16), | ||
| 154 | IBRSC = _IOW(GPIB_CODE, 34, __s32), | ||
| 155 | IB_T1_DELAY = _IOW(GPIB_CODE, 35, __u32), | ||
| 156 | IBLOC = _IO(GPIB_CODE, 36), | ||
| 157 | |||
| 158 | IBAUTOSPOLL = _IOW(GPIB_CODE, 38, __s16), | ||
| 159 | IBONL = _IOW(GPIB_CODE, 39, struct gpib_online_ioctl), | ||
| 160 | IBPP2_SET = _IOW(GPIB_CODE, 40, __s16), | ||
| 161 | IBPP2_GET = _IOR(GPIB_CODE, 41, __s16), | ||
| 162 | IBSELECT_DEVICE_PATH = _IOW(GPIB_CODE, 43, struct gpib_select_device_path_ioctl), | ||
| 163 | /* 44 was IBSELECT_SERIAL_NUMBER */ | ||
| 164 | IBRSV2 = _IOW(GPIB_CODE, 45, struct gpib_request_service2) | ||
| 165 | }; | ||
| 166 | |||
| 167 | #endif /* _GPIB_IOCTL_H */ | ||
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/handshake.yaml */ | 3 | /* Documentation/netlink/specs/handshake.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_HANDSHAKE_H | 7 | #ifndef _UAPI_LINUX_HANDSHAKE_H |
| 7 | #define _UAPI_LINUX_HANDSHAKE_H | 8 | #define _UAPI_LINUX_HANDSHAKE_H |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | |||
| 36 | * | 36 | * |
| 37 | * Only if I2C_FUNC_NOSTART is set: | 37 | * Only if I2C_FUNC_NOSTART is set: |
| 38 | * %I2C_M_NOSTART: skip repeated start sequence | 38 | * %I2C_M_NOSTART: skip repeated start sequence |
| 39 | 39 | * | |
| 40 | * Only if I2C_FUNC_PROTOCOL_MANGLING is set: | 40 | * Only if I2C_FUNC_PROTOCOL_MANGLING is set: |
| 41 | * %I2C_M_NO_RD_ACK: in a read message, master ACK/NACK bit is skipped | 41 | * %I2C_M_NO_RD_ACK: in a read message, master ACK/NACK bit is skipped |
| 42 | * %I2C_M_IGNORE_NAK: treat NACK from client as ACK | 42 | * %I2C_M_IGNORE_NAK: treat NACK from client as ACK |
| @@ -92,6 +92,9 @@ · 91 unmodified lines | |||
| 92 | #define ETH_P_ETHERCAT 0x88A4 /* EtherCAT */ | 92 | #define ETH_P_ETHERCAT 0x88A4 /* EtherCAT */ |
| 93 | #define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */ | 93 | #define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */ |
| 94 | #define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */ | 94 | #define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */ |
| 95 | #define ETH_P_MXLGSW 0x88C3 /* Infineon Technologies Corporate Research ST | ||
| 96 | * Used by MaxLinear GSW DSA | ||
| 97 | */ | ||
| 95 | #define ETH_P_PREAUTH 0x88C7 /* 802.11 Preauthentication */ | 98 | #define ETH_P_PREAUTH 0x88C7 /* 802.11 Preauthentication */ |
| 96 | #define ETH_P_TIPC 0x88CA /* TIPC */ | 99 | #define ETH_P_TIPC 0x88CA /* TIPC */ |
| 97 | #define ETH_P_LLDP 0x88CC /* Link Layer Discovery Protocol */ | 100 | #define ETH_P_LLDP 0x88CC /* Link Layer Discovery Protocol */ |
| @@ -114,6 +117,7 @@ · 16 unmodified lines | |||
| 114 | #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 117 | #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 115 | #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 118 | #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 116 | #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 119 | #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 120 | #define ETH_P_YT921X 0x9988 /* Motorcomm YT921x DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ | ||
| 117 | #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ | 121 | #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 118 | #define ETH_P_DSA_8021Q 0xDADB /* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ | 122 | #define ETH_P_DSA_8021Q 0xDADB /* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 119 | #define ETH_P_DSA_A5PSW 0xE001 /* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */ | 123 | #define ETH_P_DSA_A5PSW 0xE001 /* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/team.yaml */ | 3 | /* Documentation/netlink/specs/team.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_IF_TEAM_H | 7 | #ifndef _UAPI_LINUX_IF_TEAM_H |
| 7 | #define _UAPI_LINUX_IF_TEAM_H | 8 | #define _UAPI_LINUX_IF_TEAM_H |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | |||
| 27 | #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ | 27 | #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ |
| 28 | #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ | 28 | #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ |
| 29 | #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ | 29 | #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ |
| 30 | #define INPUT_PROP_HAPTIC_TOUCHPAD 0x07 /* is a haptic touchpad */ | 30 | #define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ |
| 31 | 31 | ||
| 32 | #define INPUT_PROP_MAX 0x1f | 32 | #define INPUT_PROP_MAX 0x1f |
| 33 | #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) | 33 | #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) |
| @@ -231,6 +231,12 @@ enum io_uring_sqe_flags_bit { · 230 unmodified lines | |||
| 231 | */ | 231 | */ |
| 232 | #define IORING_SETUP_CQE_MIXED (1U << 18) | 232 | #define IORING_SETUP_CQE_MIXED (1U << 18) |
| 233 | 233 | ||
| 234 | /* | ||
| 235 | * Allow both 64b and 128b SQEs. If a 128b SQE is posted, it will have | ||
| 236 | * a 128b opcode. | ||
| 237 | */ | ||
| 238 | #define IORING_SETUP_SQE_MIXED (1U << 19) | ||
| 239 | |||
| 234 | enum io_uring_op { | 240 | enum io_uring_op { |
| 235 | IORING_OP_NOP, | 241 | IORING_OP_NOP, |
| 236 | IORING_OP_READV, | 242 | IORING_OP_READV, |
| @@ -295,6 +301,8 @@ enum io_uring_op { · 58 unmodified lines | |||
| 295 | IORING_OP_READV_FIXED, | 301 | IORING_OP_READV_FIXED, |
| 296 | IORING_OP_WRITEV_FIXED, | 302 | IORING_OP_WRITEV_FIXED, |
| 297 | IORING_OP_PIPE, | 303 | IORING_OP_PIPE, |
| 304 | IORING_OP_NOP128, | ||
| 305 | IORING_OP_URING_CMD128, | ||
| 298 | 306 | ||
| 299 | /* this goes last, obviously */ | 307 | /* this goes last, obviously */ |
| 300 | IORING_OP_LAST, | 308 | IORING_OP_LAST, |
| @@ -689,6 +697,9 @@ enum io_uring_register_op { · 388 unmodified lines | |||
| 689 | /* query various aspects of io_uring, see linux/io_uring/query.h */ | 697 | /* query various aspects of io_uring, see linux/io_uring/query.h */ |
| 690 | IORING_REGISTER_QUERY = 35, | 698 | IORING_REGISTER_QUERY = 35, |
| 691 | 699 | ||
| 700 | /* auxiliary zcrx configuration, see enum zcrx_ctrl_op */ | ||
| 701 | IORING_REGISTER_ZCRX_CTRL = 36, | ||
| 702 | |||
| 692 | /* this goes last */ | 703 | /* this goes last */ |
| 693 | IORING_REGISTER_LAST, | 704 | IORING_REGISTER_LAST, |
| 694 | 705 | ||
| @@ -998,6 +1009,7 @@ enum io_uring_socket_op { · 303 unmodified lines | |||
| 998 | SOCKET_URING_OP_GETSOCKOPT, | 1009 | SOCKET_URING_OP_GETSOCKOPT, |
| 999 | SOCKET_URING_OP_SETSOCKOPT, | 1010 | SOCKET_URING_OP_SETSOCKOPT, |
| 1000 | SOCKET_URING_OP_TX_TIMESTAMP, | 1011 | SOCKET_URING_OP_TX_TIMESTAMP, |
| 1012 | SOCKET_URING_OP_GETSOCKNAME, | ||
| 1001 | }; | 1013 | }; |
| 1002 | 1014 | ||
| 1003 | /* | 1015 | /* |
| @@ -1052,6 +1064,10 @@ struct io_uring_zcrx_area_reg { · 48 unmodified lines | |||
| 1052 | __u64 __resv2[2]; | 1064 | __u64 __resv2[2]; |
| 1053 | }; | 1065 | }; |
| 1054 | 1066 | ||
| 1067 | enum zcrx_reg_flags { | ||
| 1068 | ZCRX_REG_IMPORT = 1, | ||
| 1069 | }; | ||
| 1070 | |||
| 1055 | /* | 1071 | /* |
| 1056 | * Argument for IORING_REGISTER_ZCRX_IFQ | 1072 | * Argument for IORING_REGISTER_ZCRX_IFQ |
| 1057 | */ | 1073 | */ |
| @@ -1070,6 +1086,33 @@ struct io_uring_zcrx_ifq_reg { · 12 unmodified lines | |||
| 1070 | __u64 __resv[3]; | 1086 | __u64 __resv[3]; |
| 1071 | }; | 1087 | }; |
| 1072 | 1088 | ||
| 1089 | enum zcrx_ctrl_op { | ||
| 1090 | ZCRX_CTRL_FLUSH_RQ, | ||
| 1091 | ZCRX_CTRL_EXPORT, | ||
| 1092 | |||
| 1093 | __ZCRX_CTRL_LAST, | ||
| 1094 | }; | ||
| 1095 | |||
| 1096 | struct zcrx_ctrl_flush_rq { | ||
| 1097 | __u64 __resv[6]; | ||
| 1098 | }; | ||
| 1099 | |||
| 1100 | struct zcrx_ctrl_export { | ||
| 1101 | __u32 zcrx_fd; | ||
| 1102 | __u32 __resv1[11]; | ||
| 1103 | }; | ||
| 1104 | |||
| 1105 | struct zcrx_ctrl { | ||
| 1106 | __u32 zcrx_id; | ||
| 1107 | __u32 op; /* see enum zcrx_ctrl_op */ | ||
| 1108 | __u64 __resv[2]; | ||
| 1109 | |||
| 1110 | union { | ||
| 1111 | struct zcrx_ctrl_export zc_export; | ||
| 1112 | struct zcrx_ctrl_flush_rq zc_flush; | ||
| 1113 | }; | ||
| 1114 | }; | ||
| 1115 | |||
| 1073 | #ifdef __cplusplus | 1116 | #ifdef __cplusplus |
| 1074 | } | 1117 | } |
| 1075 | #endif | 1118 | #endif |
| @@ -18,6 +18,8 @@ struct io_uring_query_hdr { · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | enum { | 19 | enum { |
| 20 | IO_URING_QUERY_OPCODES = 0, | 20 | IO_URING_QUERY_OPCODES = 0, |
| 21 | IO_URING_QUERY_ZCRX = 1, | ||
| 22 | IO_URING_QUERY_SCQ = 2, | ||
| 21 | 23 | ||
| 22 | __IO_URING_QUERY_MAX, | 24 | __IO_URING_QUERY_MAX, |
| 23 | }; | 25 | }; |
| @@ -41,4 +43,26 @@ struct io_uring_query_opcode { · 17 unmodified lines | |||
| 41 | __u32 __pad; | 43 | __u32 __pad; |
| 42 | }; | 44 | }; |
| 43 | 45 | ||
| 46 | struct io_uring_query_zcrx { | ||
| 47 | /* Bitmask of supported ZCRX_REG_* flags, */ | ||
| 48 | __u64 register_flags; | ||
| 49 | /* Bitmask of all supported IORING_ZCRX_AREA_* flags */ | ||
| 50 | __u64 area_flags; | ||
| 51 | /* The number of supported ZCRX_CTRL_* opcodes */ | ||
| 52 | __u32 nr_ctrl_opcodes; | ||
| 53 | __u32 __resv1; | ||
| 54 | /* The refill ring header size */ | ||
| 55 | __u32 rq_hdr_size; | ||
| 56 | /* The alignment for the header */ | ||
| 57 | __u32 rq_hdr_alignment; | ||
| 58 | __u64 __resv2; | ||
| 59 | }; | ||
| 60 | |||
| 61 | struct io_uring_query_scq { | ||
| 62 | /* The SQ/CQ rings header size */ | ||
| 63 | __u64 hdr_size; | ||
| 64 | /* The alignment for the header */ | ||
| 65 | __u64 hdr_alignment; | ||
| 66 | }; | ||
| 67 | |||
| 44 | #endif | 68 | #endif |
| @@ -450,6 +450,16 @@ struct iommu_hwpt_vtd_s1 { · 449 unmodified lines | |||
| 450 | * nested domain will translate the same as the nesting parent. The S1 will | 450 | * nested domain will translate the same as the nesting parent. The S1 will |
| 451 | * install a Context Descriptor Table pointing at userspace memory translated | 451 | * install a Context Descriptor Table pointing at userspace memory translated |
| 452 | * by the nesting parent. | 452 | * by the nesting parent. |
| 453 | * | ||
| 454 | * It's suggested to allocate a vDEVICE object carrying vSID and then re-attach | ||
| 455 | * the nested domain, as soon as the vSID is available in the VMM level: | ||
| 456 | * | ||
| 457 | * - when Cfg=translate, a vDEVICE must be allocated prior to attaching to the | ||
| 458 | * allocated nested domain, as CD/ATS invalidations and vevents need a vSID. | ||
| 459 | * - when Cfg=bypass/abort, a vDEVICE is not enforced during the nested domain | ||
| 460 | * attachment, to support a GBPA case where VM sets CR0.SMMUEN=0. However, if | ||
| 461 | * VM sets CR0.SMMUEN=1 while missing a vDEVICE object, kernel would fail to | ||
| 462 | * report events to the VM. E.g. F_TRANSLATION when guest STE.Cfg=abort. | ||
| 453 | */ | 463 | */ |
| 454 | struct iommu_hwpt_arm_smmuv3 { | 464 | struct iommu_hwpt_arm_smmuv3 { |
| 455 | __aligned_le64 ste[2]; | 465 | __aligned_le64 ste[2]; |
| @@ -52,7 +52,7 @@ struct isst_if_cpu_map { · 51 unmodified lines | |||
| 52 | /** | 52 | /** |
| 53 | * struct isst_if_cpu_maps - structure for CPU map IOCTL | 53 | * struct isst_if_cpu_maps - structure for CPU map IOCTL |
| 54 | * @cmd_count: Number of CPU mapping command in cpu_map[] | 54 | * @cmd_count: Number of CPU mapping command in cpu_map[] |
| 55 | * @cpu_map[]: Holds one or more CPU map data structure | 55 | * @cpu_map: Holds one or more CPU map data structure |
| 56 | * | 56 | * |
| 57 | * This structure used with ioctl ISST_IF_GET_PHY_ID to send | 57 | * This structure used with ioctl ISST_IF_GET_PHY_ID to send |
| 58 | * one or more CPU mapping commands. Here IOCTL return value indicates | 58 | * one or more CPU mapping commands. Here IOCTL return value indicates |
| @@ -82,8 +82,8 @@ struct isst_if_io_reg { · 23 unmodified lines | |||
| 82 | 82 | ||
| 83 | /** | 83 | /** |
| 84 | * struct isst_if_io_regs - structure for IO register commands | 84 | * struct isst_if_io_regs - structure for IO register commands |
| 85 | * @cmd_count: Number of io reg commands in io_reg[] | 85 | * @req_count: Number of io reg commands in io_reg[] |
| 86 | * @io_reg[]: Holds one or more io_reg command structure | 86 | * @io_reg: Holds one or more io_reg command structure |
| 87 | * | 87 | * |
| 88 | * This structure used with ioctl ISST_IF_IO_CMD to send | 88 | * This structure used with ioctl ISST_IF_IO_CMD to send |
| 89 | * one or more read/write commands to PUNIT. Here IOCTL return value | 89 | * one or more read/write commands to PUNIT. Here IOCTL return value |
| @@ -120,7 +120,7 @@ struct isst_if_mbox_cmd { · 30 unmodified lines | |||
| 120 | /** | 120 | /** |
| 121 | * struct isst_if_mbox_cmds - structure for mailbox commands | 121 | * struct isst_if_mbox_cmds - structure for mailbox commands |
| 122 | * @cmd_count: Number of mailbox commands in mbox_cmd[] | 122 | * @cmd_count: Number of mailbox commands in mbox_cmd[] |
| 123 | * @mbox_cmd[]: Holds one or more mbox commands | 123 | * @mbox_cmd: Holds one or more mbox commands |
| 124 | * | 124 | * |
| 125 | * This structure used with ioctl ISST_IF_MBOX_COMMAND to send | 125 | * This structure used with ioctl ISST_IF_MBOX_COMMAND to send |
| 126 | * one or more mailbox commands to PUNIT. Here IOCTL return value | 126 | * one or more mailbox commands to PUNIT. Here IOCTL return value |
| @@ -152,7 +152,7 @@ struct isst_if_msr_cmd { · 25 unmodified lines | |||
| 152 | /** | 152 | /** |
| 153 | * struct isst_if_msr_cmds - structure for msr commands | 153 | * struct isst_if_msr_cmds - structure for msr commands |
| 154 | * @cmd_count: Number of mailbox commands in msr_cmd[] | 154 | * @cmd_count: Number of mailbox commands in msr_cmd[] |
| 155 | * @msr_cmd[]: Holds one or more msr commands | 155 | * @msr_cmd: Holds one or more msr commands |
| 156 | * | 156 | * |
| 157 | * This structure used with ioctl ISST_IF_MSR_COMMAND to send | 157 | * This structure used with ioctl ISST_IF_MSR_COMMAND to send |
| 158 | * one or more MSR commands. IOCTL return value indicates number of | 158 | * one or more MSR commands. IOCTL return value indicates number of |
| @@ -167,8 +167,9 @@ struct isst_if_msr_cmds { · 8 unmodified lines | |||
| 167 | * struct isst_core_power - Structure to get/set core_power feature | 167 | * struct isst_core_power - Structure to get/set core_power feature |
| 168 | * @get_set: 0: Get, 1: Set | 168 | * @get_set: 0: Get, 1: Set |
| 169 | * @socket_id: Socket/package id | 169 | * @socket_id: Socket/package id |
| 170 | * @power_domain: Power Domain id | 170 | * @power_domain_id: Power Domain id |
| 171 | * @enable: Feature enable status | 171 | * @enable: Feature enable status |
| 172 | * @supported: Power domain supports SST_CP interface | ||
| 172 | * @priority_type: Priority type for the feature (ordered/proportional) | 173 | * @priority_type: Priority type for the feature (ordered/proportional) |
| 173 | * | 174 | * |
| 174 | * Structure to get/set core_power feature state using IOCTL | 175 | * Structure to get/set core_power feature state using IOCTL |
| @@ -187,11 +188,11 @@ struct isst_core_power { · 12 unmodified lines | |||
| 187 | * struct isst_clos_param - Structure to get/set clos praram | 188 | * struct isst_clos_param - Structure to get/set clos praram |
| 188 | * @get_set: 0: Get, 1: Set | 189 | * @get_set: 0: Get, 1: Set |
| 189 | * @socket_id: Socket/package id | 190 | * @socket_id: Socket/package id |
| 190 | * @power_domain: Power Domain id | 191 | * @power_domain_id: Power Domain id |
| 191 | * clos: Clos ID for the parameters | 192 | * @clos: Clos ID for the parameters |
| 192 | * min_freq_mhz: Minimum frequency in MHz | 193 | * @min_freq_mhz: Minimum frequency in MHz |
| 193 | * max_freq_mhz: Maximum frequency in MHz | 194 | * @max_freq_mhz: Maximum frequency in MHz |
| 194 | * prop_prio: Proportional priority from 0-15 | 195 | * @prop_prio: Proportional priority from 0-15 |
| 195 | * | 196 | * |
| 196 | * Structure to get/set per clos property using IOCTL | 197 | * Structure to get/set per clos property using IOCTL |
| 197 | * ISST_IF_CLOS_PARAM. | 198 | * ISST_IF_CLOS_PARAM. |
| @@ -209,7 +210,7 @@ struct isst_clos_param { · 11 unmodified lines | |||
| 209 | /** | 210 | /** |
| 210 | * struct isst_if_clos_assoc - Structure to assign clos to a CPU | 211 | * struct isst_if_clos_assoc - Structure to assign clos to a CPU |
| 211 | * @socket_id: Socket/package id | 212 | * @socket_id: Socket/package id |
| 212 | * @power_domain: Power Domain id | 213 | * @power_domain_id: Power Domain id |
| 213 | * @logical_cpu: CPU number | 214 | * @logical_cpu: CPU number |
| 214 | * @clos: Clos ID to assign to the logical CPU | 215 | * @clos: Clos ID to assign to the logical CPU |
| 215 | * | 216 | * |
| @@ -228,6 +229,7 @@ struct isst_if_clos_assoc { · 12 unmodified lines | |||
| 228 | * @get_set: Request is for get or set | 229 | * @get_set: Request is for get or set |
| 229 | * @punit_cpu_map: Set to 1 if the CPU number is punit numbering not | 230 | * @punit_cpu_map: Set to 1 if the CPU number is punit numbering not |
| 230 | * Linux CPU number | 231 | * Linux CPU number |
| 232 | * @assoc_info: CLOS data for this CPU | ||
| 231 | * | 233 | * |
| 232 | * Structure used to get/set associate CPUs to clos using IOCTL | 234 | * Structure used to get/set associate CPUs to clos using IOCTL |
| 233 | * ISST_IF_CLOS_ASSOC. | 235 | * ISST_IF_CLOS_ASSOC. |
| @@ -257,7 +259,7 @@ struct isst_tpmi_instance_count { · 23 unmodified lines | |||
| 257 | /** | 259 | /** |
| 258 | * struct isst_perf_level_info - Structure to get information on SST-PP levels | 260 | * struct isst_perf_level_info - Structure to get information on SST-PP levels |
| 259 | * @socket_id: Socket/package id | 261 | * @socket_id: Socket/package id |
| 260 | * @power_domain: Power Domain id | 262 | * @power_domain_id: Power Domain id |
| 261 | * @logical_cpu: CPU number | 263 | * @logical_cpu: CPU number |
| 262 | * @clos: Clos ID to assign to the logical CPU | 264 | * @clos: Clos ID to assign to the logical CPU |
| 263 | * @max_level: Maximum performance level supported by the platform | 265 | * @max_level: Maximum performance level supported by the platform |
| @@ -267,8 +269,8 @@ struct isst_tpmi_instance_count { · 3 unmodified lines | |||
| 267 | * @feature_state: SST-BF and SST-TF (enabled/disabled) status at current level | 269 | * @feature_state: SST-BF and SST-TF (enabled/disabled) status at current level |
| 268 | * @locked: SST-PP performance level change is locked/unlocked | 270 | * @locked: SST-PP performance level change is locked/unlocked |
| 269 | * @enabled: SST-PP feature is enabled or not | 271 | * @enabled: SST-PP feature is enabled or not |
| 270 | * @sst-tf_support: SST-TF support status at this level | 272 | * @sst_tf_support: SST-TF support status at this level |
| 271 | * @sst-bf_support: SST-BF support status at this level | 273 | * @sst_bf_support: SST-BF support status at this level |
| 272 | * | 274 | * |
| 273 | * Structure to get SST-PP details using IOCTL ISST_IF_PERF_LEVELS. | 275 | * Structure to get SST-PP details using IOCTL ISST_IF_PERF_LEVELS. |
| 274 | */ | 276 | */ |
| @@ -289,7 +291,7 @@ struct isst_perf_level_info { · 14 unmodified lines | |||
| 289 | /** | 291 | /** |
| 290 | * struct isst_perf_level_control - Structure to set SST-PP level | 292 | * struct isst_perf_level_control - Structure to set SST-PP level |
| 291 | * @socket_id: Socket/package id | 293 | * @socket_id: Socket/package id |
| 292 | * @power_domain: Power Domain id | 294 | * @power_domain_id: Power Domain id |
| 293 | * @level: level to set | 295 | * @level: level to set |
| 294 | * | 296 | * |
| 295 | * Structure used change SST-PP level using IOCTL ISST_IF_PERF_SET_LEVEL. | 297 | * Structure used change SST-PP level using IOCTL ISST_IF_PERF_SET_LEVEL. |
| @@ -303,7 +305,7 @@ struct isst_perf_level_control { · 7 unmodified lines | |||
| 303 | /** | 305 | /** |
| 304 | * struct isst_perf_feature_control - Structure to activate SST-BF/SST-TF | 306 | * struct isst_perf_feature_control - Structure to activate SST-BF/SST-TF |
| 305 | * @socket_id: Socket/package id | 307 | * @socket_id: Socket/package id |
| 306 | * @power_domain: Power Domain id | 308 | * @power_domain_id: Power Domain id |
| 307 | * @feature: bit 0 = SST-BF state, bit 1 = SST-TF state | 309 | * @feature: bit 0 = SST-BF state, bit 1 = SST-TF state |
| 308 | * | 310 | * |
| 309 | * Structure used to enable SST-BF/SST-TF using IOCTL ISST_IF_PERF_SET_FEATURE. | 311 | * Structure used to enable SST-BF/SST-TF using IOCTL ISST_IF_PERF_SET_FEATURE. |
| @@ -320,7 +322,7 @@ struct isst_perf_feature_control { · 10 unmodified lines | |||
| 320 | /** | 322 | /** |
| 321 | * struct isst_perf_level_data_info - Structure to get SST-PP level details | 323 | * struct isst_perf_level_data_info - Structure to get SST-PP level details |
| 322 | * @socket_id: Socket/package id | 324 | * @socket_id: Socket/package id |
| 323 | * @power_domain: Power Domain id | 325 | * @power_domain_id: Power Domain id |
| 324 | * @level: SST-PP level for which caller wants to get information | 326 | * @level: SST-PP level for which caller wants to get information |
| 325 | * @tdp_ratio: TDP Ratio | 327 | * @tdp_ratio: TDP Ratio |
| 326 | * @base_freq_mhz: Base frequency in MHz | 328 | * @base_freq_mhz: Base frequency in MHz |
| @@ -341,8 +343,8 @@ struct isst_perf_feature_control { · 14 unmodified lines | |||
| 341 | * @pm_fabric_freq_mhz: Fabric (Uncore) minimum frequency | 343 | * @pm_fabric_freq_mhz: Fabric (Uncore) minimum frequency |
| 342 | * @max_buckets: Maximum trl buckets | 344 | * @max_buckets: Maximum trl buckets |
| 343 | * @max_trl_levels: Maximum trl levels | 345 | * @max_trl_levels: Maximum trl levels |
| 344 | * @bucket_core_counts[TRL_MAX_BUCKETS]: Number of cores per bucket | 346 | * @bucket_core_counts: Number of cores per bucket |
| 345 | * @trl_freq_mhz[TRL_MAX_LEVELS][TRL_MAX_BUCKETS]: maximum frequency | 347 | * @trl_freq_mhz: maximum frequency |
| 346 | * for a bucket and trl level | 348 | * for a bucket and trl level |
| 347 | * | 349 | * |
| 348 | * Structure used to get information on frequencies and TDP for a SST-PP | 350 | * Structure used to get information on frequencies and TDP for a SST-PP |
| @@ -402,7 +404,7 @@ struct isst_perf_level_fabric_info { · 53 unmodified lines | |||
| 402 | /** | 404 | /** |
| 403 | * struct isst_perf_level_cpu_mask - Structure to get SST-PP level CPU mask | 405 | * struct isst_perf_level_cpu_mask - Structure to get SST-PP level CPU mask |
| 404 | * @socket_id: Socket/package id | 406 | * @socket_id: Socket/package id |
| 405 | * @power_domain: Power Domain id | 407 | * @power_domain_id: Power Domain id |
| 406 | * @level: SST-PP level for which caller wants to get information | 408 | * @level: SST-PP level for which caller wants to get information |
| 407 | * @punit_cpu_map: Set to 1 if the CPU number is punit numbering not | 409 | * @punit_cpu_map: Set to 1 if the CPU number is punit numbering not |
| 408 | * Linux CPU number. If 0 CPU buffer is copied to user space | 410 | * Linux CPU number. If 0 CPU buffer is copied to user space |
| @@ -430,7 +432,7 @@ struct isst_perf_level_cpu_mask { · 21 unmodified lines | |||
| 430 | /** | 432 | /** |
| 431 | * struct isst_base_freq_info - Structure to get SST-BF frequencies | 433 | * struct isst_base_freq_info - Structure to get SST-BF frequencies |
| 432 | * @socket_id: Socket/package id | 434 | * @socket_id: Socket/package id |
| 433 | * @power_domain: Power Domain id | 435 | * @power_domain_id: Power Domain id |
| 434 | * @level: SST-PP level for which caller wants to get information | 436 | * @level: SST-PP level for which caller wants to get information |
| 435 | * @high_base_freq_mhz: High priority CPU base frequency | 437 | * @high_base_freq_mhz: High priority CPU base frequency |
| 436 | * @low_base_freq_mhz: Low priority CPU base frequency | 438 | * @low_base_freq_mhz: Low priority CPU base frequency |
| @@ -453,9 +455,11 @@ struct isst_base_freq_info { · 16 unmodified lines | |||
| 453 | /** | 455 | /** |
| 454 | * struct isst_turbo_freq_info - Structure to get SST-TF frequencies | 456 | * struct isst_turbo_freq_info - Structure to get SST-TF frequencies |
| 455 | * @socket_id: Socket/package id | 457 | * @socket_id: Socket/package id |
| 456 | * @power_domain: Power Domain id | 458 | * @power_domain_id: Power Domain id |
| 457 | * @level: SST-PP level for which caller wants to get information | 459 | * @level: SST-PP level for which caller wants to get information |
| 458 | * @max_clip_freqs: Maximum number of low priority core clipping frequencies | 460 | * @max_clip_freqs: Maximum number of low priority core clipping frequencies |
| 461 | * @max_buckets: Maximum trl buckets | ||
| 462 | * @max_trl_levels: Maximum trl levels | ||
| 459 | * @lp_clip_freq_mhz: Clip frequencies per trl level | 463 | * @lp_clip_freq_mhz: Clip frequencies per trl level |
| 460 | * @bucket_core_counts: Maximum number of cores for a bucket | 464 | * @bucket_core_counts: Maximum number of cores for a bucket |
| 461 | * @trl_freq_mhz: Frequencies per trl level for each bucket | 465 | * @trl_freq_mhz: Frequencies per trl level for each bucket |
| @@ -179,6 +179,7 @@ struct kvm_xen_exit { · 178 unmodified lines | |||
| 179 | #define KVM_EXIT_LOONGARCH_IOCSR 38 | 179 | #define KVM_EXIT_LOONGARCH_IOCSR 38 |
| 180 | #define KVM_EXIT_MEMORY_FAULT 39 | 180 | #define KVM_EXIT_MEMORY_FAULT 39 |
| 181 | #define KVM_EXIT_TDX 40 | 181 | #define KVM_EXIT_TDX 40 |
| 182 | #define KVM_EXIT_ARM_SEA 41 | ||
| 182 | 183 | ||
| 183 | /* For KVM_EXIT_INTERNAL_ERROR */ | 184 | /* For KVM_EXIT_INTERNAL_ERROR */ |
| 184 | /* Emulate instruction failed. */ | 185 | /* Emulate instruction failed. */ |
| @@ -473,6 +474,14 @@ struct kvm_run { · 288 unmodified lines | |||
| 473 | } setup_event_notify; | 474 | } setup_event_notify; |
| 474 | }; | 475 | }; |
| 475 | } tdx; | 476 | } tdx; |
| 477 | /* KVM_EXIT_ARM_SEA */ | ||
| 478 | struct { | ||
| 479 | #define KVM_EXIT_ARM_SEA_FLAG_GPA_VALID (1ULL << 0) | ||
| 480 | __u64 flags; | ||
| 481 | __u64 esr; | ||
| 482 | __u64 gva; | ||
| 483 | __u64 gpa; | ||
| 484 | } arm_sea; | ||
| 476 | /* Fix the size of the union. */ | 485 | /* Fix the size of the union. */ |
| 477 | char padding[256]; | 486 | char padding[256]; |
| 478 | }; | 487 | }; |
| @@ -963,6 +972,8 @@ struct kvm_enable_cap { · 484 unmodified lines | |||
| 963 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 | 972 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 |
| 964 | #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243 | 973 | #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243 |
| 965 | #define KVM_CAP_GUEST_MEMFD_FLAGS 244 | 974 | #define KVM_CAP_GUEST_MEMFD_FLAGS 244 |
| 975 | #define KVM_CAP_ARM_SEA_TO_USER 245 | ||
| 976 | #define KVM_CAP_S390_USER_OPEREXEC 246 | ||
| 966 | 977 | ||
| 967 | struct kvm_irq_routing_irqchip { | 978 | struct kvm_irq_routing_irqchip { |
| 968 | __u32 irqchip; | 979 | __u32 irqchip; |
| @@ -0,0 +1,216 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | |||
| 3 | /* | ||
| 4 | * Userspace interface for /dev/liveupdate | ||
| 5 | * Live Update Orchestrator | ||
| 6 | * | ||
| 7 | * Copyright (c) 2025, Google LLC. | ||
| 8 | * Pasha Tatashin <pasha.tatashin@soleen.com> | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef _UAPI_LIVEUPDATE_H | ||
| 12 | #define _UAPI_LIVEUPDATE_H | ||
| 13 | |||
| 14 | #include <linux/ioctl.h> | ||
| 15 | #include <linux/types.h> | ||
| 16 | |||
| 17 | /** | ||
| 18 | * DOC: General ioctl format | ||
| 19 | * | ||
| 20 | * The ioctl interface follows a general format to allow for extensibility. Each | ||
| 21 | * ioctl is passed in a structure pointer as the argument providing the size of | ||
| 22 | * the structure in the first u32. The kernel checks that any structure space | ||
| 23 | * beyond what it understands is 0. This allows userspace to use the backward | ||
| 24 | * compatible portion while consistently using the newer, larger, structures. | ||
| 25 | * | ||
| 26 | * ioctls use a standard meaning for common errnos: | ||
| 27 | * | ||
| 28 | * - ENOTTY: The IOCTL number itself is not supported at all | ||
| 29 | * - E2BIG: The IOCTL number is supported, but the provided structure has | ||
| 30 | * non-zero in a part the kernel does not understand. | ||
| 31 | * - EOPNOTSUPP: The IOCTL number is supported, and the structure is | ||
| 32 | * understood, however a known field has a value the kernel does not | ||
| 33 | * understand or support. | ||
| 34 | * - EINVAL: Everything about the IOCTL was understood, but a field is not | ||
| 35 | * correct. | ||
| 36 | * - ENOENT: A provided token does not exist. | ||
| 37 | * - ENOMEM: Out of memory. | ||
| 38 | * - EOVERFLOW: Mathematics overflowed. | ||
| 39 | * | ||
| 40 | * As well as additional errnos, within specific ioctls. | ||
| 41 | */ | ||
| 42 | |||
| 43 | /* The ioctl type, documented in ioctl-number.rst */ | ||
| 44 | #define LIVEUPDATE_IOCTL_TYPE 0xBA | ||
| 45 | |||
| 46 | /* The maximum length of session name including null termination */ | ||
| 47 | #define LIVEUPDATE_SESSION_NAME_LENGTH 64 | ||
| 48 | |||
| 49 | /* The /dev/liveupdate ioctl commands */ | ||
| 50 | enum { | ||
| 51 | LIVEUPDATE_CMD_BASE = 0x00, | ||
| 52 | LIVEUPDATE_CMD_CREATE_SESSION = LIVEUPDATE_CMD_BASE, | ||
| 53 | LIVEUPDATE_CMD_RETRIEVE_SESSION = 0x01, | ||
| 54 | }; | ||
| 55 | |||
| 56 | /* ioctl commands for session file descriptors */ | ||
| 57 | enum { | ||
| 58 | LIVEUPDATE_CMD_SESSION_BASE = 0x40, | ||
| 59 | LIVEUPDATE_CMD_SESSION_PRESERVE_FD = LIVEUPDATE_CMD_SESSION_BASE, | ||
| 60 | LIVEUPDATE_CMD_SESSION_RETRIEVE_FD = 0x41, | ||
| 61 | LIVEUPDATE_CMD_SESSION_FINISH = 0x42, | ||
| 62 | }; | ||
| 63 | |||
| 64 | /** | ||
| 65 | * struct liveupdate_ioctl_create_session - ioctl(LIVEUPDATE_IOCTL_CREATE_SESSION) | ||
| 66 | * @size: Input; sizeof(struct liveupdate_ioctl_create_session) | ||
| 67 | * @fd: Output; The new file descriptor for the created session. | ||
| 68 | * @name: Input; A null-terminated string for the session name, max | ||
| 69 | * length %LIVEUPDATE_SESSION_NAME_LENGTH including termination | ||
| 70 | * character. | ||
| 71 | * | ||
| 72 | * Creates a new live update session for managing preserved resources. | ||
| 73 | * This ioctl can only be called on the main /dev/liveupdate device. | ||
| 74 | * | ||
| 75 | * Return: 0 on success, negative error code on failure. | ||
| 76 | */ | ||
| 77 | struct liveupdate_ioctl_create_session { | ||
| 78 | __u32 size; | ||
| 79 | __s32 fd; | ||
| 80 | __u8 name[LIVEUPDATE_SESSION_NAME_LENGTH]; | ||
| 81 | }; | ||
| 82 | |||
| 83 | #define LIVEUPDATE_IOCTL_CREATE_SESSION \ | ||
| 84 | _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_CREATE_SESSION) | ||
| 85 | |||
| 86 | /** | ||
| 87 | * struct liveupdate_ioctl_retrieve_session - ioctl(LIVEUPDATE_IOCTL_RETRIEVE_SESSION) | ||
| 88 | * @size: Input; sizeof(struct liveupdate_ioctl_retrieve_session) | ||
| 89 | * @fd: Output; The new file descriptor for the retrieved session. | ||
| 90 | * @name: Input; A null-terminated string identifying the session to retrieve. | ||
| 91 | * The name must exactly match the name used when the session was | ||
| 92 | * created in the previous kernel. | ||
| 93 | * | ||
| 94 | * Retrieves a handle (a new file descriptor) for a preserved session by its | ||
| 95 | * name. This is the primary mechanism for a userspace agent to regain control | ||
| 96 | * of its preserved resources after a live update. | ||
| 97 | * | ||
| 98 | * The userspace application provides the null-terminated `name` of a session | ||
| 99 | * it created before the live update. If a preserved session with a matching | ||
| 100 | * name is found, the kernel instantiates it and returns a new file descriptor | ||
| 101 | * in the `fd` field. This new session FD can then be used for all file-specific | ||
| 102 | * operations, such as restoring individual file descriptors with | ||
| 103 | * LIVEUPDATE_SESSION_RETRIEVE_FD. | ||
| 104 | * | ||
| 105 | * It is the responsibility of the userspace application to know the names of | ||
| 106 | * the sessions it needs to retrieve. If no session with the given name is | ||
| 107 | * found, the ioctl will fail with -ENOENT. | ||
| 108 | * | ||
| 109 | * This ioctl can only be called on the main /dev/liveupdate device when the | ||
| 110 | * system is in the LIVEUPDATE_STATE_UPDATED state. | ||
| 111 | */ | ||
| 112 | struct liveupdate_ioctl_retrieve_session { | ||
| 113 | __u32 size; | ||
| 114 | __s32 fd; | ||
| 115 | __u8 name[LIVEUPDATE_SESSION_NAME_LENGTH]; | ||
| 116 | }; | ||
| 117 | |||
| 118 | #define LIVEUPDATE_IOCTL_RETRIEVE_SESSION \ | ||
| 119 | _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_RETRIEVE_SESSION) | ||
| 120 | |||
| 121 | /* Session specific IOCTLs */ | ||
| 122 | |||
| 123 | /** | ||
| 124 | * struct liveupdate_session_preserve_fd - ioctl(LIVEUPDATE_SESSION_PRESERVE_FD) | ||
| 125 | * @size: Input; sizeof(struct liveupdate_session_preserve_fd) | ||
| 126 | * @fd: Input; The user-space file descriptor to be preserved. | ||
| 127 | * @token: Input; An opaque, unique token for preserved resource. | ||
| 128 | * | ||
| 129 | * Holds parameters for preserving a file descriptor. | ||
| 130 | * | ||
| 131 | * User sets the @fd field identifying the file descriptor to preserve | ||
| 132 | * (e.g., memfd, kvm, iommufd, VFIO). The kernel validates if this FD type | ||
| 133 | * and its dependencies are supported for preservation. If validation passes, | ||
| 134 | * the kernel marks the FD internally and *initiates the process* of preparing | ||
| 135 | * its state for saving. The actual snapshotting of the state typically occurs | ||
| 136 | * during the subsequent %LIVEUPDATE_IOCTL_PREPARE execution phase, though | ||
| 137 | * some finalization might occur during freeze. | ||
| 138 | * On successful validation and initiation, the kernel uses the @token | ||
| 139 | * field with an opaque identifier representing the resource being preserved. | ||
| 140 | * This token confirms the FD is targeted for preservation and is required for | ||
| 141 | * the subsequent %LIVEUPDATE_SESSION_RETRIEVE_FD call after the live update. | ||
| 142 | * | ||
| 143 | * Return: 0 on success (validation passed, preservation initiated), negative | ||
| 144 | * error code on failure (e.g., unsupported FD type, dependency issue, | ||
| 145 | * validation failed). | ||
| 146 | */ | ||
| 147 | struct liveupdate_session_preserve_fd { | ||
| 148 | __u32 size; | ||
| 149 | __s32 fd; | ||
| 150 | __aligned_u64 token; | ||
| 151 | }; | ||
| 152 | |||
| 153 | #define LIVEUPDATE_SESSION_PRESERVE_FD \ | ||
| 154 | _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_PRESERVE_FD) | ||
| 155 | |||
| 156 | /** | ||
| 157 | * struct liveupdate_session_retrieve_fd - ioctl(LIVEUPDATE_SESSION_RETRIEVE_FD) | ||
| 158 | * @size: Input; sizeof(struct liveupdate_session_retrieve_fd) | ||
| 159 | * @fd: Output; The new file descriptor representing the fully restored | ||
| 160 | * kernel resource. | ||
| 161 | * @token: Input; An opaque, token that was used to preserve the resource. | ||
| 162 | * | ||
| 163 | * Retrieve a previously preserved file descriptor. | ||
| 164 | * | ||
| 165 | * User sets the @token field to the value obtained from a successful | ||
| 166 | * %LIVEUPDATE_IOCTL_FD_PRESERVE call before the live update. On success, | ||
| 167 | * the kernel restores the state (saved during the PREPARE/FREEZE phases) | ||
| 168 | * associated with the token and populates the @fd field with a new file | ||
| 169 | * descriptor referencing the restored resource in the current (new) kernel. | ||
| 170 | * This operation must be performed *before* signaling completion via | ||
| 171 | * %LIVEUPDATE_IOCTL_FINISH. | ||
| 172 | * | ||
| 173 | * Return: 0 on success, negative error code on failure (e.g., invalid token). | ||
| 174 | */ | ||
| 175 | struct liveupdate_session_retrieve_fd { | ||
| 176 | __u32 size; | ||
| 177 | __s32 fd; | ||
| 178 | __aligned_u64 token; | ||
| 179 | }; | ||
| 180 | |||
| 181 | #define LIVEUPDATE_SESSION_RETRIEVE_FD \ | ||
| 182 | _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_RETRIEVE_FD) | ||
| 183 | |||
| 184 | /** | ||
| 185 | * struct liveupdate_session_finish - ioctl(LIVEUPDATE_SESSION_FINISH) | ||
| 186 | * @size: Input; sizeof(struct liveupdate_session_finish) | ||
| 187 | * @reserved: Input; Must be zero. Reserved for future use. | ||
| 188 | * | ||
| 189 | * Signals the completion of the restoration process for a retrieved session. | ||
| 190 | * This is the final operation that should be performed on a session file | ||
| 191 | * descriptor after a live update. | ||
| 192 | * | ||
| 193 | * This ioctl must be called once all required file descriptors for the session | ||
| 194 | * have been successfully retrieved (using %LIVEUPDATE_SESSION_RETRIEVE_FD) and | ||
| 195 | * are fully restored from the userspace and kernel perspective. | ||
| 196 | * | ||
| 197 | * Upon success, the kernel releases its ownership of the preserved resources | ||
| 198 | * associated with this session. This allows internal resources to be freed, | ||
| 199 | * typically by decrementing reference counts on the underlying preserved | ||
| 200 | * objects. | ||
| 201 | * | ||
| 202 | * If this operation fails, the resources remain preserved in memory. Userspace | ||
| 203 | * may attempt to call finish again. The resources will otherwise be reset | ||
| 204 | * during the next live update cycle. | ||
| 205 | * | ||
| 206 | * Return: 0 on success, negative error code on failure. | ||
| 207 | */ | ||
| 208 | struct liveupdate_session_finish { | ||
| 209 | __u32 size; | ||
| 210 | __u32 reserved; | ||
| 211 | }; | ||
| 212 | |||
| 213 | #define LIVEUPDATE_SESSION_FINISH \ | ||
| 214 | _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_FINISH) | ||
| 215 | |||
| 216 | #endif /* _UAPI_LIVEUPDATE_H */ | ||
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/lockd.yaml */ | 3 | /* Documentation/netlink/specs/lockd.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_LOCKD_NETLINK_H | 7 | #ifndef _UAPI_LINUX_LOCKD_NETLINK_H |
| 7 | #define _UAPI_LINUX_LOCKD_NETLINK_H | 8 | #define _UAPI_LINUX_LOCKD_NETLINK_H |
| @@ -103,5 +103,6 @@ · 102 unmodified lines | |||
| 103 | #define DEVMEM_MAGIC 0x454d444d /* "DMEM" */ | 103 | #define DEVMEM_MAGIC 0x454d444d /* "DMEM" */ |
| 104 | #define SECRETMEM_MAGIC 0x5345434d /* "SECM" */ | 104 | #define SECRETMEM_MAGIC 0x5345434d /* "SECM" */ |
| 105 | #define PID_FS_MAGIC 0x50494446 /* "PIDF" */ | 105 | #define PID_FS_MAGIC 0x50494446 /* "PIDF" */ |
| 106 | #define GUEST_MEMFD_MAGIC 0x474d454d /* "GMEM" */ | ||
| 106 | 107 | ||
| 107 | #endif /* __LINUX_MAGIC_H__ */ | 108 | #endif /* __LINUX_MAGIC_H__ */ |
| @@ -0,0 +1,35 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ | ||
| 2 | /* | ||
| 3 | * Copyright (C) 2022-2025 HiSilicon Limited. | ||
| 4 | */ | ||
| 5 | |||
| 6 | #ifndef _UAPI_DMA_BENCHMARK_H | ||
| 7 | #define _UAPI_DMA_BENCHMARK_H | ||
| 8 | |||
| 9 | #include <linux/types.h> | ||
| 10 | |||
| 11 | #define DMA_MAP_BENCHMARK _IOWR('d', 1, struct map_benchmark) | ||
| 12 | #define DMA_MAP_MAX_THREADS 1024 | ||
| 13 | #define DMA_MAP_MAX_SECONDS 300 | ||
| 14 | #define DMA_MAP_MAX_TRANS_DELAY (10 * NSEC_PER_MSEC) | ||
| 15 | |||
| 16 | #define DMA_MAP_BIDIRECTIONAL 0 | ||
| 17 | #define DMA_MAP_TO_DEVICE 1 | ||
| 18 | #define DMA_MAP_FROM_DEVICE 2 | ||
| 19 | |||
| 20 | struct map_benchmark { | ||
| 21 | __u64 avg_map_100ns; /* average map latency in 100ns */ | ||
| 22 | __u64 map_stddev; /* standard deviation of map latency */ | ||
| 23 | __u64 avg_unmap_100ns; /* as above */ | ||
| 24 | __u64 unmap_stddev; | ||
| 25 | __u32 threads; /* how many threads will do map/unmap in parallel */ | ||
| 26 | __u32 seconds; /* how long the test will last */ | ||
| 27 | __s32 node; /* which numa node this benchmark will run on */ | ||
| 28 | __u32 dma_bits; /* DMA addressing capability */ | ||
| 29 | __u32 dma_dir; /* DMA data direction */ | ||
| 30 | __u32 dma_trans_ns; /* time for DMA transmission in ns */ | ||
| 31 | __u32 granule; /* how many PAGE_SIZE will do map/unmap once a time */ | ||
| 32 | __u8 expansion[76]; /* For future use */ | ||
| 33 | }; | ||
| 34 | |||
| 35 | #endif /* _UAPI_DMA_BENCHMARK_H */ | ||
| @@ -116,10 +116,24 @@ · 115 unmodified lines | |||
| 116 | #define MDIO_CTRL1_SPEED10G (MDIO_CTRL1_SPEEDSELEXT | 0x00) | 116 | #define MDIO_CTRL1_SPEED10G (MDIO_CTRL1_SPEEDSELEXT | 0x00) |
| 117 | /* 10PASS-TS/2BASE-TL */ | 117 | /* 10PASS-TS/2BASE-TL */ |
| 118 | #define MDIO_CTRL1_SPEED10P2B (MDIO_CTRL1_SPEEDSELEXT | 0x04) | 118 | #define MDIO_CTRL1_SPEED10P2B (MDIO_CTRL1_SPEEDSELEXT | 0x04) |
| 119 | /* Note: the MDIO_CTRL1_SPEED_XXX values for everything past 10PASS-TS/2BASE-TL | ||
| 120 | * do not match between the PCS and PMA values. Any additions past this point | ||
| 121 | * should be PMA or PCS specific. The following 2 defines are workarounds for | ||
| 122 | * values added before this was caught. They should be considered deprecated. | ||
| 123 | */ | ||
| 124 | #define MDIO_CTRL1_SPEED2_5G MDIO_PMA_CTRL1_SPEED2_5G | ||
| 125 | #define MDIO_CTRL1_SPEED5G MDIO_PMA_CTRL1_SPEED5G | ||
| 126 | /* 100 Gb/s */ | ||
| 127 | #define MDIO_PCS_CTRL1_SPEED100G (MDIO_CTRL1_SPEEDSELEXT | 0x10) | ||
| 128 | /* 25 Gb/s */ | ||
| 129 | #define MDIO_PCS_CTRL1_SPEED25G (MDIO_CTRL1_SPEEDSELEXT | 0x14) | ||
| 130 | /* 50 Gb/s */ | ||
| 131 | #define MDIO_PCS_CTRL1_SPEED50G (MDIO_CTRL1_SPEEDSELEXT | 0x18) | ||
| 119 | /* 2.5 Gb/s */ | 132 | /* 2.5 Gb/s */ |
| 120 | #define MDIO_CTRL1_SPEED2_5G (MDIO_CTRL1_SPEEDSELEXT | 0x18) | 133 | #define MDIO_PMA_CTRL1_SPEED2_5G (MDIO_CTRL1_SPEEDSELEXT | 0x18) |
| 121 | /* 5 Gb/s */ | 134 | /* 5 Gb/s */ |
| 122 | #define MDIO_CTRL1_SPEED5G (MDIO_CTRL1_SPEEDSELEXT | 0x1c) | 135 | #define MDIO_PMA_CTRL1_SPEED5G (MDIO_CTRL1_SPEEDSELEXT | 0x1c) |
| 136 | |||
| 123 | 137 | ||
| 124 | /* Status register 1. */ | 138 | /* Status register 1. */ |
| 125 | #define MDIO_STAT1_LPOWERABLE 0x0002 /* Low-power ability */ | 139 | #define MDIO_STAT1_LPOWERABLE 0x0002 /* Low-power ability */ |
| @@ -133,6 +147,11 @@ · 7 unmodified lines | |||
| 133 | #define MDIO_AN_STAT1_PAGE 0x0040 /* Page received */ | 147 | #define MDIO_AN_STAT1_PAGE 0x0040 /* Page received */ |
| 134 | #define MDIO_AN_STAT1_XNP 0x0080 /* Extended next page status */ | 148 | #define MDIO_AN_STAT1_XNP 0x0080 /* Extended next page status */ |
| 135 | 149 | ||
| 150 | /* Device Identifier 2 */ | ||
| 151 | #define MDIO_DEVID2_OUI 0xfc00 /* OUI Portion of PHY ID */ | ||
| 152 | #define MDIO_DEVID2_MODEL_NUM 0x03f0 /* Manufacturer's Model Number */ | ||
| 153 | #define MDIO_DEVID2_REV_NUM 0x000f /* Revision Number */ | ||
| 154 | |||
| 136 | /* Speed register. */ | 155 | /* Speed register. */ |
| 137 | #define MDIO_SPEED_10G 0x0001 /* 10G capable */ | 156 | #define MDIO_SPEED_10G 0x0001 /* 10G capable */ |
| 138 | #define MDIO_PMA_SPEED_2B 0x0002 /* 2BASE-TL capable */ | 157 | #define MDIO_PMA_SPEED_2B 0x0002 /* 2BASE-TL capable */ |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #define MEDIA_BUS_FMT_FIXED 0x0001 | 35 | #define MEDIA_BUS_FMT_FIXED 0x0001 |
| 36 | 36 | ||
| 37 | /* RGB - next is 0x1028 */ | 37 | /* RGB - next is 0x1029 */ |
| 38 | #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 | 38 | #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 |
| 39 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 | 39 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 |
| 40 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 | 40 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 |
| @@ -74,6 +74,7 @@ · 33 unmodified lines | |||
| 74 | #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO 0x1021 | 74 | #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO 0x1021 |
| 75 | #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 | 75 | #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 |
| 76 | #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a | 76 | #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a |
| 77 | #define MEDIA_BUS_FMT_RGB202020_1X60 0x1028 | ||
| 77 | 78 | ||
| 78 | /* YUV (including grey) - next is 0x202f */ | 79 | /* YUV (including grey) - next is 0x202f */ |
| 79 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 | 80 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 |
| @@ -123,7 +124,7 @@ · 43 unmodified lines | |||
| 123 | #define MEDIA_BUS_FMT_YUV16_1X48 0x202a | 124 | #define MEDIA_BUS_FMT_YUV16_1X48 0x202a |
| 124 | #define MEDIA_BUS_FMT_UYYVYY16_0_5X48 0x202b | 125 | #define MEDIA_BUS_FMT_UYYVYY16_0_5X48 0x202b |
| 125 | 126 | ||
| 126 | /* Bayer - next is 0x3021 */ | 127 | /* Bayer - next is 0x3025 */ |
| 127 | #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 | 128 | #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 |
| 128 | #define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013 | 129 | #define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013 |
| 129 | #define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002 | 130 | #define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002 |
| @@ -156,6 +157,10 @@ · 26 unmodified lines | |||
| 156 | #define MEDIA_BUS_FMT_SGBRG16_1X16 0x301e | 157 | #define MEDIA_BUS_FMT_SGBRG16_1X16 0x301e |
| 157 | #define MEDIA_BUS_FMT_SGRBG16_1X16 0x301f | 158 | #define MEDIA_BUS_FMT_SGRBG16_1X16 0x301f |
| 158 | #define MEDIA_BUS_FMT_SRGGB16_1X16 0x3020 | 159 | #define MEDIA_BUS_FMT_SRGGB16_1X16 0x3020 |
| 160 | #define MEDIA_BUS_FMT_SBGGR20_1X20 0x3021 | ||
| 161 | #define MEDIA_BUS_FMT_SGBRG20_1X20 0x3022 | ||
| 162 | #define MEDIA_BUS_FMT_SGRBG20_1X20 0x3023 | ||
| 163 | #define MEDIA_BUS_FMT_SRGGB20_1X20 0x3024 | ||
| 159 | 164 | ||
| 160 | /* JPEG compressed formats - next is 0x4002 */ | 165 | /* JPEG compressed formats - next is 0x4002 */ |
| 161 | #define MEDIA_BUS_FMT_JPEG_1X8 0x4001 | 166 | #define MEDIA_BUS_FMT_JPEG_1X8 0x4001 |
| @@ -6,8 +6,13 @@ · 5 unmodified lines | |||
| 6 | #ifndef _UAPI_C3_ISP_CONFIG_H_ | 6 | #ifndef _UAPI_C3_ISP_CONFIG_H_ |
| 7 | #define _UAPI_C3_ISP_CONFIG_H_ | 7 | #define _UAPI_C3_ISP_CONFIG_H_ |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | ||
| 10 | #include <linux/build_bug.h> | ||
| 11 | #endif /* __KERNEL__ */ | ||
| 9 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 10 | 13 | ||
| 14 | #include <linux/media/v4l2-isp.h> | ||
| 15 | |||
| 11 | /* | 16 | /* |
| 12 | * Frames are split into zones of almost equal width and height - a zone is a | 17 | * Frames are split into zones of almost equal width and height - a zone is a |
| 13 | * rectangular tile of a frame. The metering blocks within the ISP collect | 18 | * rectangular tile of a frame. The metering blocks within the ISP collect |
| @@ -141,7 +146,7 @@ struct c3_isp_stats_info { · 127 unmodified lines | |||
| 141 | * @C3_ISP_PARAMS_BUFFER_V0: First version of C3 ISP parameters block | 146 | * @C3_ISP_PARAMS_BUFFER_V0: First version of C3 ISP parameters block |
| 142 | */ | 147 | */ |
| 143 | enum c3_isp_params_buffer_version { | 148 | enum c3_isp_params_buffer_version { |
| 144 | C3_ISP_PARAMS_BUFFER_V0, | 149 | C3_ISP_PARAMS_BUFFER_V0 = V4L2_ISP_PARAMS_VERSION_V0, |
| 145 | }; | 150 | }; |
| 146 | 151 | ||
| 147 | /** | 152 | /** |
| @@ -176,62 +181,23 @@ enum c3_isp_params_block_type { · 28 unmodified lines | |||
| 176 | C3_ISP_PARAMS_BLOCK_SENTINEL | 181 | C3_ISP_PARAMS_BLOCK_SENTINEL |
| 177 | }; | 182 | }; |
| 178 | 183 | ||
| 179 | #define C3_ISP_PARAMS_BLOCK_FL_DISABLE (1U << 0) | 184 | /* For backward compatibility */ |
| 180 | #define C3_ISP_PARAMS_BLOCK_FL_ENABLE (1U << 1) | 185 | #define C3_ISP_PARAMS_BLOCK_FL_DISABLE V4L2_ISP_PARAMS_FL_BLOCK_DISABLE |
| 186 | #define C3_ISP_PARAMS_BLOCK_FL_ENABLE V4L2_ISP_PARAMS_FL_BLOCK_ENABLE | ||
| 181 | 187 | ||
| 182 | /** | 188 | /** |
| 183 | * struct c3_isp_params_block_header - C3 ISP parameter block header | 189 | * c3_isp_params_block_header - C3 ISP parameter block header |
| 184 | * | 190 | * |
| 185 | * This structure represents the common part of all the ISP configuration | 191 | * This structure represents the common part of all the ISP configuration |
| 186 | * blocks. Each parameters block shall embed an instance of this structure type | 192 | * blocks and is identical to :c:type:`v4l2_isp_params_block_header`. |
| 187 | * as its first member, followed by the block-specific configuration data. The | ||
| 188 | * driver inspects this common header to discern the block type and its size and | ||
| 189 | * properly handle the block content by casting it to the correct block-specific | ||
| 190 | * type. | ||
| 191 | * | 193 | * |
| 192 | * The @type field is one of the values enumerated by | 194 | * The type field is one of the values enumerated by |
| 193 | * :c:type:`c3_isp_params_block_type` and specifies how the data should be | 195 | * :c:type:`c3_isp_params_block_type` and specifies how the data should be |
| 194 | * interpreted by the driver. The @size field specifies the size of the | 196 | * interpreted by the driver. |
| 195 | * parameters block and is used by the driver for validation purposes. The | ||
| 196 | * @flags field is a bitmask of per-block flags C3_ISP_PARAMS_FL*. | ||
| 197 | * | ||
| 198 | * When userspace wants to disable an ISP block the | ||
| 199 | * C3_ISP_PARAMS_BLOCK_FL_DISABLED bit should be set in the @flags field. In | ||
| 200 | * this case userspace may optionally omit the remainder of the configuration | ||
| 201 | * block, which will be ignored by the driver. | ||
| 202 | * | ||
| 203 | * When a new configuration of an ISP block needs to be applied userspace | ||
| 204 | * shall fully populate the ISP block and omit setting the | ||
| 205 | * C3_ISP_PARAMS_BLOCK_FL_DISABLED bit in the @flags field. | ||
| 206 | * | ||
| 207 | * Userspace is responsible for correctly populating the parameters block header | ||
| 208 | * fields (@type, @flags and @size) and the block-specific parameters. | ||
| 209 | * | ||
| 210 | * For example: | ||
| 211 | * | ||
| 212 | * .. code-block:: c | ||
| 213 | * | 197 | * |
| 214 | * void populate_pst_gamma(struct c3_isp_params_block_header *block) { | 198 | * The flags field is a bitmask of per-block flags C3_ISP_PARAMS_FL_*. |
| 215 | * struct c3_isp_params_pst_gamma *gamma = | ||
| 216 | * (struct c3_isp_params_pst_gamma *)block; | ||
| 217 | * | ||
| 218 | * gamma->header.type = C3_ISP_PARAMS_BLOCK_PST_GAMMA; | ||
| 219 | * gamma->header.flags = C3_ISP_PARAMS_BLOCK_FL_ENABLE; | ||
| 220 | * gamma->header.size = sizeof(*gamma); | ||
| 221 | * | ||
| 222 | * for (unsigned int i = 0; i < 129; i++) | ||
| 223 | * gamma->pst_gamma_lut[i] = i; | ||
| 224 | * } | ||
| 225 | * | ||
| 226 | * @type: The parameters block type from :c:type:`c3_isp_params_block_type` | ||
| 227 | * @flags: A bitmask of block flags | ||
| 228 | * @size: Size (in bytes) of the parameters block, including this header | ||
| 229 | */ | 199 | */ |
| 230 | struct c3_isp_params_block_header { | 200 | #define c3_isp_params_block_header v4l2_isp_params_block_header |
| 231 | __u16 type; | ||
| 232 | __u16 flags; | ||
| 233 | __u32 size; | ||
| 234 | }; | ||
| 235 | 201 | ||
| 236 | /** | 202 | /** |
| 237 | * struct c3_isp_params_awb_gains - Gains for auto-white balance | 203 | * struct c3_isp_params_awb_gains - Gains for auto-white balance |
| @@ -498,26 +464,10 @@ struct c3_isp_params_blc { · 260 unmodified lines | |||
| 498 | /** | 464 | /** |
| 499 | * struct c3_isp_params_cfg - C3 ISP configuration parameters | 465 | * struct c3_isp_params_cfg - C3 ISP configuration parameters |
| 500 | * | 466 | * |
| 501 | * This struct contains the configuration parameters of the C3 ISP | 467 | * This is the driver-specific implementation of |
| 502 | * algorithms, serialized by userspace into an opaque data buffer. Each | 468 | * :c:type:`v4l2_isp_params_buffer`. |
| 503 | * configuration parameter block is represented by a block-specific structure | 469 | * |
| 504 | * which contains a :c:type:`c3_isp_param_block_header` entry as first | 470 | * Currently only C3_ISP_PARAM_BUFFER_V0 is supported. |
| 505 | * member. Userspace populates the @data buffer with configuration parameters | ||
| 506 | * for the blocks that it intends to configure. As a consequence, the data | ||
| 507 | * buffer effective size changes according to the number of ISP blocks that | ||
| 508 | * userspace intends to configure. | ||
| 509 | * | ||
| 510 | * The parameters buffer is versioned by the @version field to allow modifying | ||
| 511 | * and extending its definition. Userspace should populate the @version field to | ||
| 512 | * inform the driver about the version it intends to use. The driver will parse | ||
| 513 | * and handle the @data buffer according to the data layout specific to the | ||
| 514 | * indicated revision and return an error if the desired revision is not | ||
| 515 | * supported. | ||
| 516 | * | ||
| 517 | * For each ISP block that userspace wants to configure, a block-specific | ||
| 518 | * structure is appended to the @data buffer, one after the other without gaps | ||
| 519 | * in between nor overlaps. Userspace shall populate the @total_size field with | ||
| 520 | * the effective size, in bytes, of the @data buffer. | ||
| 521 | * | 471 | * |
| 522 | * The expected memory layout of the parameters buffer is:: | 472 | * The expected memory layout of the parameters buffer is:: |
| 523 | * | 473 | * |
| @@ -561,4 +511,10 @@ struct c3_isp_params_cfg { · 37 unmodified lines | |||
| 561 | __u8 data[C3_ISP_PARAMS_MAX_SIZE]; | 511 | __u8 data[C3_ISP_PARAMS_MAX_SIZE]; |
| 562 | }; | 512 | }; |
| 563 | 513 | ||
| 514 | #ifdef __KERNEL__ | ||
| 515 | /* Make sure the header is type-convertible to the generic v4l2 params one */ | ||
| 516 | static_assert((sizeof(struct c3_isp_params_cfg) - C3_ISP_PARAMS_MAX_SIZE) == | ||
| 517 | sizeof(struct v4l2_isp_params_buffer)); | ||
| 518 | #endif /* __KERNEL__ */ | ||
| 519 | |||
| 564 | #endif | 520 | #endif |
| @@ -0,0 +1,794 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* | ||
| 3 | * ARM Mali-C55 ISP Driver - Userspace API | ||
| 4 | * | ||
| 5 | * Copyright (C) 2023 Ideas on Board Oy | ||
| 6 | */ | ||
| 7 | |||
| 8 | #ifndef __UAPI_MALI_C55_CONFIG_H | ||
| 9 | #define __UAPI_MALI_C55_CONFIG_H | ||
| 10 | |||
| 11 | #include <linux/types.h> | ||
| 12 | #include <linux/v4l2-controls.h> | ||
| 13 | #include <linux/media/v4l2-isp.h> | ||
| 14 | |||
| 15 | #define V4L2_CID_MALI_C55_CAPABILITIES (V4L2_CID_USER_MALI_C55_BASE + 0x0) | ||
| 16 | #define MALI_C55_GPS_PONG (1U << 0) | ||
| 17 | #define MALI_C55_GPS_WDR (1U << 1) | ||
| 18 | #define MALI_C55_GPS_COMPRESSION (1U << 2) | ||
| 19 | #define MALI_C55_GPS_TEMPER (1U << 3) | ||
| 20 | #define MALI_C55_GPS_SINTER_LITE (1U << 4) | ||
| 21 | #define MALI_C55_GPS_SINTER (1U << 5) | ||
| 22 | #define MALI_C55_GPS_IRIDIX_LTM (1U << 6) | ||
| 23 | #define MALI_C55_GPS_IRIDIX_GTM (1U << 7) | ||
| 24 | #define MALI_C55_GPS_CNR (1U << 8) | ||
| 25 | #define MALI_C55_GPS_FRSCALER (1U << 9) | ||
| 26 | #define MALI_C55_GPS_DS_PIPE (1U << 10) | ||
| 27 | |||
| 28 | /* | ||
| 29 | * Frames are split into zones of almost equal width and height - a zone is a | ||
| 30 | * rectangular tile of a frame. The metering blocks within the ISP collect | ||
| 31 | * aggregated statistics per zone. A maximum of 15x15 zones can be configured, | ||
| 32 | * and so the statistics buffer within the hardware is sized to accommodate | ||
| 33 | * that. | ||
| 34 | * | ||
| 35 | * The utilised number of zones is runtime configurable. | ||
| 36 | */ | ||
| 37 | #define MALI_C55_MAX_ZONES (15 * 15) | ||
| 38 | |||
| 39 | /** | ||
| 40 | * struct mali_c55_ae_1024bin_hist - Auto Exposure 1024-bin histogram statistics | ||
| 41 | * | ||
| 42 | * @bins: 1024 element array of 16-bit pixel counts. | ||
| 43 | * | ||
| 44 | * The 1024-bin histogram module collects image-global but zone-weighted | ||
| 45 | * intensity distributions of pixels in fixed-width bins. The modules can be | ||
| 46 | * configured into different "plane modes" which affect the contents of the | ||
| 47 | * collected statistics. In plane mode 0, pixel intensities are taken regardless | ||
| 48 | * of colour plane into a single 1024-bin histogram with a bin width of 4. In | ||
| 49 | * plane mode 1, four 256-bin histograms with a bin width of 16 are collected - | ||
| 50 | * one for each CFA colour plane. In plane modes 4, 5, 6 and 7 two 512-bin | ||
| 51 | * histograms with a bin width of 8 are collected - in each mode one of the | ||
| 52 | * colour planes is collected into the first histogram and all the others are | ||
| 53 | * combined into the second. The histograms are stored consecutively in the bins | ||
| 54 | * array. | ||
| 55 | * | ||
| 56 | * The 16-bit pixel counts are stored as a 4-bit exponent in the most | ||
| 57 | * significant bits followed by a 12-bit mantissa. Conversion to a usable | ||
| 58 | * format can be done according to the following pseudo-code:: | ||
| 59 | * | ||
| 60 | * if (e == 0) { | ||
| 61 | * bin = m * 2; | ||
| 62 | * } else { | ||
| 63 | * bin = (m + 4096) * 2^e | ||
| 64 | * } | ||
| 65 | * | ||
| 66 | * where | ||
| 67 | * e is the exponent value in range 0..15 | ||
| 68 | * m is the mantissa value in range 0..4095 | ||
| 69 | * | ||
| 70 | * The pixels used in calculating the statistics can be masked using three | ||
| 71 | * methods: | ||
| 72 | * | ||
| 73 | * 1. Pixels can be skipped in X and Y directions independently. | ||
| 74 | * 2. Minimum/Maximum intensities can be configured | ||
| 75 | * 3. Zones can be differentially weighted, including 0 weighted to mask them | ||
| 76 | * | ||
| 77 | * The data for this histogram can be collected from different tap points in the | ||
| 78 | * ISP depending on configuration - after the white balance or digital gain | ||
| 79 | * blocks, or immediately after the input crossbar. | ||
| 80 | */ | ||
| 81 | struct mali_c55_ae_1024bin_hist { | ||
| 82 | __u16 bins[1024]; | ||
| 83 | } __attribute__((packed)); | ||
| 84 | |||
| 85 | /** | ||
| 86 | * struct mali_c55_ae_5bin_hist - Auto Exposure 5-bin histogram statistics | ||
| 87 | * | ||
| 88 | * @hist0: 16-bit normalised pixel count for the 0th intensity bin | ||
| 89 | * @hist1: 16-bit normalised pixel count for the 1st intensity bin | ||
| 90 | * @hist3: 16-bit normalised pixel count for the 3rd intensity bin | ||
| 91 | * @hist4: 16-bit normalised pixel count for the 4th intensity bin | ||
| 92 | * | ||
| 93 | * The ISP generates a 5-bin histogram of normalised pixel counts within bins of | ||
| 94 | * pixel intensity for each of 225 possible zones within a frame. The centre bin | ||
| 95 | * of the histogram for each zone is not available from the hardware and must be | ||
| 96 | * calculated by subtracting the values of hist0, hist1, hist3 and hist4 from | ||
| 97 | * 0xffff as in the following equation: | ||
| 98 | * | ||
| 99 | * hist2 = 0xffff - (hist0 + hist1 + hist3 + hist4) | ||
| 100 | */ | ||
| 101 | struct mali_c55_ae_5bin_hist { | ||
| 102 | __u16 hist0; | ||
| 103 | __u16 hist1; | ||
| 104 | __u16 hist3; | ||
| 105 | __u16 hist4; | ||
| 106 | } __attribute__((packed)); | ||
| 107 | |||
| 108 | /** | ||
| 109 | * struct mali_c55_awb_average_ratios - Auto White Balance colour ratios | ||
| 110 | * | ||
| 111 | * @avg_rg_gr: Average R/G or G/R ratio in Q4.8 format. | ||
| 112 | * @avg_bg_br: Average B/G or B/R ratio in Q4.8 format. | ||
| 113 | * @num_pixels: The number of pixels used in the AWB calculation | ||
| 114 | * | ||
| 115 | * The ISP calculates and collects average colour ratios for each zone in an | ||
| 116 | * image and stores them in Q4.8 format (the lowest 8 bits are fractional, with | ||
| 117 | * bits [11:8] representing the integer). The exact ratios collected (either | ||
| 118 | * R/G, B/G or G/R, B/R) are configurable through the parameters buffer. The | ||
| 119 | * value of the 4 high bits is undefined. | ||
| 120 | */ | ||
| 121 | struct mali_c55_awb_average_ratios { | ||
| 122 | __u16 avg_rg_gr; | ||
| 123 | __u16 avg_bg_br; | ||
| 124 | __u32 num_pixels; | ||
| 125 | } __attribute__((packed)); | ||
| 126 | |||
| 127 | /** | ||
| 128 | * struct mali_c55_af_statistics - Auto Focus edge and intensity statistics | ||
| 129 | * | ||
| 130 | * @intensity_stats: Packed mantissa and exponent value for pixel intensity | ||
| 131 | * @edge_stats: Packed mantissa and exponent values for edge intensity | ||
| 132 | * | ||
| 133 | * The ISP collects the squared sum of pixel intensities for each zone within a | ||
| 134 | * configurable Region of Interest on the frame. Additionally, the same data are | ||
| 135 | * collected after being passed through a bandpass filter which removes high and | ||
| 136 | * low frequency components - these are referred to as the edge statistics. | ||
| 137 | * | ||
| 138 | * The intensity and edge statistics for a zone can be used to calculate the | ||
| 139 | * contrast information for a zone | ||
| 140 | * | ||
| 141 | * C = E2 / I2 | ||
| 142 | * | ||
| 143 | * Where I2 is the intensity statistic for a zone and E2 is the edge statistic | ||
| 144 | * for that zone. Optimum focus is reached when C is at its maximum. | ||
| 145 | * | ||
| 146 | * The intensity and edge statistics are stored packed into a non-standard 16 | ||
| 147 | * bit floating point format, where the 7 most significant bits represent the | ||
| 148 | * exponent and the 9 least significant bits the mantissa. This format can be | ||
| 149 | * unpacked with the following pseudocode:: | ||
| 150 | * | ||
| 151 | * if (e == 0) { | ||
| 152 | * x = m; | ||
| 153 | * } else { | ||
| 154 | * x = 2^e-1 * (m + 2^9) | ||
| 155 | * } | ||
| 156 | * | ||
| 157 | * where | ||
| 158 | * e is the exponent value in range 0..127 | ||
| 159 | * m is the mantissa value in range 0..511 | ||
| 160 | */ | ||
| 161 | struct mali_c55_af_statistics { | ||
| 162 | __u16 intensity_stats; | ||
| 163 | __u16 edge_stats; | ||
| 164 | } __attribute__((packed)); | ||
| 165 | |||
| 166 | /** | ||
| 167 | * struct mali_c55_stats_buffer - 3A statistics for the mali-c55 ISP | ||
| 168 | * | ||
| 169 | * @ae_1024bin_hist: 1024-bin frame-global pixel intensity histogram | ||
| 170 | * @iridix_1024bin_hist: Post-Iridix block 1024-bin histogram | ||
| 171 | * @ae_5bin_hists: 5-bin pixel intensity histograms for AEC | ||
| 172 | * @reserved1: Undefined buffer space | ||
| 173 | * @awb_ratios: Color balance ratios for Auto White Balance | ||
| 174 | * @reserved2: Undefined buffer space | ||
| 175 | * @af_statistics: Pixel intensity statistics for Auto Focus | ||
| 176 | * @reserved3: Undefined buffer space | ||
| 177 | * | ||
| 178 | * This struct describes the metering statistics space in the Mali-C55 ISP's | ||
| 179 | * hardware in its entirety. The space between each defined area is marked as | ||
| 180 | * "unknown" and may not be 0, but should not be used. The @ae_5bin_hists, | ||
| 181 | * @awb_ratios and @af_statistics members are arrays of statistics per-zone. | ||
| 182 | * The zones are arranged in the array in raster order starting from the top | ||
| 183 | * left corner of the image. | ||
| 184 | */ | ||
| 185 | |||
| 186 | struct mali_c55_stats_buffer { | ||
| 187 | struct mali_c55_ae_1024bin_hist ae_1024bin_hist; | ||
| 188 | struct mali_c55_ae_1024bin_hist iridix_1024bin_hist; | ||
| 189 | struct mali_c55_ae_5bin_hist ae_5bin_hists[MALI_C55_MAX_ZONES]; | ||
| 190 | __u32 reserved1[14]; | ||
| 191 | struct mali_c55_awb_average_ratios awb_ratios[MALI_C55_MAX_ZONES]; | ||
| 192 | __u32 reserved2[14]; | ||
| 193 | struct mali_c55_af_statistics af_statistics[MALI_C55_MAX_ZONES]; | ||
| 194 | __u32 reserved3[15]; | ||
| 195 | } __attribute__((packed)); | ||
| 196 | |||
| 197 | /** | ||
| 198 | * enum mali_c55_param_buffer_version - Mali-C55 parameters block versioning | ||
| 199 | * | ||
| 200 | * @MALI_C55_PARAM_BUFFER_V1: First version of Mali-C55 parameters block | ||
| 201 | */ | ||
| 202 | enum mali_c55_param_buffer_version { | ||
| 203 | MALI_C55_PARAM_BUFFER_V1, | ||
| 204 | }; | ||
| 205 | |||
| 206 | /** | ||
| 207 | * enum mali_c55_param_block_type - Enumeration of Mali-C55 parameter blocks | ||
| 208 | * | ||
| 209 | * This enumeration defines the types of Mali-C55 parameters block. Each block | ||
| 210 | * configures a specific processing block of the Mali-C55 ISP. The block | ||
| 211 | * type allows the driver to correctly interpret the parameters block data. | ||
| 212 | * | ||
| 213 | * It is the responsibility of userspace to correctly set the type of each | ||
| 214 | * parameters block. | ||
| 215 | * | ||
| 216 | * @MALI_C55_PARAM_BLOCK_SENSOR_OFFS: Sensor pre-shading black level offset | ||
| 217 | * @MALI_C55_PARAM_BLOCK_AEXP_HIST: Auto-exposure 1024-bin histogram | ||
| 218 | * configuration | ||
| 219 | * @MALI_C55_PARAM_BLOCK_AEXP_IHIST: Post-Iridix auto-exposure 1024-bin | ||
| 220 | * histogram configuration | ||
| 221 | * @MALI_C55_PARAM_BLOCK_AEXP_HIST_WEIGHTS: Auto-exposure 1024-bin histogram | ||
| 222 | * weighting | ||
| 223 | * @MALI_C55_PARAM_BLOCK_AEXP_IHIST_WEIGHTS: Post-Iridix auto-exposure 1024-bin | ||
| 224 | * histogram weighting | ||
| 225 | * @MALI_C55_PARAM_BLOCK_DIGITAL_GAIN: Digital gain | ||
| 226 | * @MALI_C55_PARAM_BLOCK_AWB_GAINS: Auto-white balance gains | ||
| 227 | * @MALI_C55_PARAM_BLOCK_AWB_CONFIG: Auto-white balance statistics config | ||
| 228 | * @MALI_C55_PARAM_BLOCK_AWB_GAINS_AEXP: Auto-white balance gains for AEXP-0 tap | ||
| 229 | * @MALI_C55_PARAM_MESH_SHADING_CONFIG : Mesh shading tables configuration | ||
| 230 | * @MALI_C55_PARAM_MESH_SHADING_SELECTION: Mesh shading table selection | ||
| 231 | */ | ||
| 232 | enum mali_c55_param_block_type { | ||
| 233 | MALI_C55_PARAM_BLOCK_SENSOR_OFFS, | ||
| 234 | MALI_C55_PARAM_BLOCK_AEXP_HIST, | ||
| 235 | MALI_C55_PARAM_BLOCK_AEXP_IHIST, | ||
| 236 | MALI_C55_PARAM_BLOCK_AEXP_HIST_WEIGHTS, | ||
| 237 | MALI_C55_PARAM_BLOCK_AEXP_IHIST_WEIGHTS, | ||
| 238 | MALI_C55_PARAM_BLOCK_DIGITAL_GAIN, | ||
| 239 | MALI_C55_PARAM_BLOCK_AWB_GAINS, | ||
| 240 | MALI_C55_PARAM_BLOCK_AWB_CONFIG, | ||
| 241 | MALI_C55_PARAM_BLOCK_AWB_GAINS_AEXP, | ||
| 242 | MALI_C55_PARAM_MESH_SHADING_CONFIG, | ||
| 243 | MALI_C55_PARAM_MESH_SHADING_SELECTION, | ||
| 244 | }; | ||
| 245 | |||
| 246 | /** | ||
| 247 | * struct mali_c55_params_sensor_off_preshading - offset subtraction for each | ||
| 248 | * color channel | ||
| 249 | * | ||
| 250 | * Provides removal of the sensor black level from the sensor data. Separate | ||
| 251 | * offsets are provided for each of the four Bayer component color channels | ||
| 252 | * which are defaulted to R, Gr, Gb, B. | ||
| 253 | * | ||
| 254 | * header.type should be set to MALI_C55_PARAM_BLOCK_SENSOR_OFFS from | ||
| 255 | * :c:type:`mali_c55_param_block_type` for this block. | ||
| 256 | * | ||
| 257 | * @header: The Mali-C55 parameters block header | ||
| 258 | * @chan00: Offset for color channel 00 (default: R) | ||
| 259 | * @chan01: Offset for color channel 01 (default: Gr) | ||
| 260 | * @chan10: Offset for color channel 10 (default: Gb) | ||
| 261 | * @chan11: Offset for color channel 11 (default: B) | ||
| 262 | */ | ||
| 263 | struct mali_c55_params_sensor_off_preshading { | ||
| 264 | struct v4l2_isp_params_block_header header; | ||
| 265 | __u32 chan00; | ||
| 266 | __u32 chan01; | ||
| 267 | __u32 chan10; | ||
| 268 | __u32 chan11; | ||
| 269 | }; | ||
| 270 | |||
| 271 | /** | ||
| 272 | * enum mali_c55_aexp_hist_tap_points - Tap points for the AEXP histogram | ||
| 273 | * @MALI_C55_AEXP_HIST_TAP_WB: After static white balance | ||
| 274 | * @MALI_C55_AEXP_HIST_TAP_FS: After WDR Frame Stitch | ||
| 275 | * @MALI_C55_AEXP_HIST_TAP_TPG: After the test pattern generator | ||
| 276 | */ | ||
| 277 | enum mali_c55_aexp_hist_tap_points { | ||
| 278 | MALI_C55_AEXP_HIST_TAP_WB = 0, | ||
| 279 | MALI_C55_AEXP_HIST_TAP_FS, | ||
| 280 | MALI_C55_AEXP_HIST_TAP_TPG, | ||
| 281 | }; | ||
| 282 | |||
| 283 | /** | ||
| 284 | * enum mali_c55_aexp_skip_x - Horizontal pixel skipping | ||
| 285 | * @MALI_C55_AEXP_SKIP_X_EVERY_2ND: Collect every 2nd pixel horizontally | ||
| 286 | * @MALI_C55_AEXP_SKIP_X_EVERY_3RD: Collect every 3rd pixel horizontally | ||
| 287 | * @MALI_C55_AEXP_SKIP_X_EVERY_4TH: Collect every 4th pixel horizontally | ||
| 288 | * @MALI_C55_AEXP_SKIP_X_EVERY_5TH: Collect every 5th pixel horizontally | ||
| 289 | * @MALI_C55_AEXP_SKIP_X_EVERY_8TH: Collect every 8th pixel horizontally | ||
| 290 | * @MALI_C55_AEXP_SKIP_X_EVERY_9TH: Collect every 9th pixel horizontally | ||
| 291 | */ | ||
| 292 | enum mali_c55_aexp_skip_x { | ||
| 293 | MALI_C55_AEXP_SKIP_X_EVERY_2ND, | ||
| 294 | MALI_C55_AEXP_SKIP_X_EVERY_3RD, | ||
| 295 | MALI_C55_AEXP_SKIP_X_EVERY_4TH, | ||
| 296 | MALI_C55_AEXP_SKIP_X_EVERY_5TH, | ||
| 297 | MALI_C55_AEXP_SKIP_X_EVERY_8TH, | ||
| 298 | MALI_C55_AEXP_SKIP_X_EVERY_9TH | ||
| 299 | }; | ||
| 300 | |||
| 301 | /** | ||
| 302 | * enum mali_c55_aexp_skip_y - Vertical pixel skipping | ||
| 303 | * @MALI_C55_AEXP_SKIP_Y_ALL: Collect every single pixel vertically | ||
| 304 | * @MALI_C55_AEXP_SKIP_Y_EVERY_2ND: Collect every 2nd pixel vertically | ||
| 305 | * @MALI_C55_AEXP_SKIP_Y_EVERY_3RD: Collect every 3rd pixel vertically | ||
| 306 | * @MALI_C55_AEXP_SKIP_Y_EVERY_4TH: Collect every 4th pixel vertically | ||
| 307 | * @MALI_C55_AEXP_SKIP_Y_EVERY_5TH: Collect every 5th pixel vertically | ||
| 308 | * @MALI_C55_AEXP_SKIP_Y_EVERY_8TH: Collect every 8th pixel vertically | ||
| 309 | * @MALI_C55_AEXP_SKIP_Y_EVERY_9TH: Collect every 9th pixel vertically | ||
| 310 | */ | ||
| 311 | enum mali_c55_aexp_skip_y { | ||
| 312 | MALI_C55_AEXP_SKIP_Y_ALL, | ||
| 313 | MALI_C55_AEXP_SKIP_Y_EVERY_2ND, | ||
| 314 | MALI_C55_AEXP_SKIP_Y_EVERY_3RD, | ||
| 315 | MALI_C55_AEXP_SKIP_Y_EVERY_4TH, | ||
| 316 | MALI_C55_AEXP_SKIP_Y_EVERY_5TH, | ||
| 317 | MALI_C55_AEXP_SKIP_Y_EVERY_8TH, | ||
| 318 | MALI_C55_AEXP_SKIP_Y_EVERY_9TH | ||
| 319 | }; | ||
| 320 | |||
| 321 | /** | ||
| 322 | * enum mali_c55_aexp_row_column_offset - Start from the first or second row or | ||
| 323 | * column | ||
| 324 | * @MALI_C55_AEXP_FIRST_ROW_OR_COL: Start from the first row / column | ||
| 325 | * @MALI_C55_AEXP_SECOND_ROW_OR_COL: Start from the second row / column | ||
| 326 | */ | ||
| 327 | enum mali_c55_aexp_row_column_offset { | ||
| 328 | MALI_C55_AEXP_FIRST_ROW_OR_COL = 1, | ||
| 329 | MALI_C55_AEXP_SECOND_ROW_OR_COL = 2, | ||
| 330 | }; | ||
| 331 | |||
| 332 | /** | ||
| 333 | * enum mali_c55_aexp_hist_plane_mode - Mode for the AEXP Histograms | ||
| 334 | * @MALI_C55_AEXP_HIST_COMBINED: All color planes in one 1024-bin histogram | ||
| 335 | * @MALI_C55_AEXP_HIST_SEPARATE: Each color plane in one 256-bin histogram with a bin width of 16 | ||
| 336 | * @MALI_C55_AEXP_HIST_FOCUS_00: Top left plane in the first bank, rest in second bank | ||
| 337 | * @MALI_C55_AEXP_HIST_FOCUS_01: Top right plane in the first bank, rest in second bank | ||
| 338 | * @MALI_C55_AEXP_HIST_FOCUS_10: Bottom left plane in the first bank, rest in second bank | ||
| 339 | * @MALI_C55_AEXP_HIST_FOCUS_11: Bottom right plane in the first bank, rest in second bank | ||
| 340 | * | ||
| 341 | * In the "focus" modes statistics are collected into two 512-bin histograms | ||
| 342 | * with a bin width of 8. One colour plane is in the first histogram with the | ||
| 343 | * remainder combined into the second. The four options represent which of the | ||
| 344 | * four positions in a bayer pattern are the focused plane. | ||
| 345 | */ | ||
| 346 | enum mali_c55_aexp_hist_plane_mode { | ||
| 347 | MALI_C55_AEXP_HIST_COMBINED = 0, | ||
| 348 | MALI_C55_AEXP_HIST_SEPARATE = 1, | ||
| 349 | MALI_C55_AEXP_HIST_FOCUS_00 = 4, | ||
| 350 | MALI_C55_AEXP_HIST_FOCUS_01 = 5, | ||
| 351 | MALI_C55_AEXP_HIST_FOCUS_10 = 6, | ||
| 352 | MALI_C55_AEXP_HIST_FOCUS_11 = 7, | ||
| 353 | }; | ||
| 354 | |||
| 355 | /** | ||
| 356 | * struct mali_c55_params_aexp_hist - configuration for AEXP metering hists | ||
| 357 | * | ||
| 358 | * This struct allows users to configure the 1024-bin AEXP histograms. Broadly | ||
| 359 | * speaking the parameters allow you to mask particular regions of the image and | ||
| 360 | * to select different kinds of histogram. | ||
| 361 | * | ||
| 362 | * The skip_x, offset_x, skip_y and offset_y fields allow users to ignore or | ||
| 363 | * mask pixels in the frame by their position relative to the top left pixel. | ||
| 364 | * First, the skip_y, offset_x and offset_y fields define which of the pixels | ||
| 365 | * within each 2x2 region will be counted in the statistics. | ||
| 366 | * | ||
| 367 | * If skip_y == 0 then two pixels from each covered region will be counted. If | ||
| 368 | * both offset_x and offset_y are zero, then the two left-most pixels in each | ||
| 369 | * 2x2 pixel region will be counted. Setting offset_x = 1 will discount the top | ||
| 370 | * left pixel and count the top right pixel. Setting offset_y = 1 will discount | ||
| 371 | * the bottom left pixel and count the bottom right pixel. | ||
| 372 | * | ||
| 373 | * If skip_y != 0 then only a single pixel from each region covered by the | ||
| 374 | * pattern will be counted. In this case offset_x controls whether the pixel | ||
| 375 | * that's counted is in the left (if offset_x == 0) or right (if offset_x == 1) | ||
| 376 | * column and offset_y controls whether the pixel that's counted is in the top | ||
| 377 | * (if offset_y == 0) or bottom (if offset_y == 1) row. | ||
| 378 | * | ||
| 379 | * The skip_x and skip_y fields control how the 2x2 pixel region is repeated | ||
| 380 | * across the image data. The first instance of the region is always in the top | ||
| 381 | * left of the image data. The skip_x field controls how many pixels are ignored | ||
| 382 | * in the x direction before the pixel masking region is repeated. The skip_y | ||
| 383 | * field controls how many pixels are ignored in the y direction before the | ||
| 384 | * pixel masking region is repeated. | ||
| 385 | * | ||
| 386 | * These fields can be used to reduce the number of pixels counted for the | ||
| 387 | * statistics, but it's important to be careful to configure them correctly. | ||
| 388 | * Some combinations of values will result in colour components from the input | ||
| 389 | * data being ignored entirely, for example in the following configuration: | ||
| 390 | * | ||
| 391 | * skip_x = 0 | ||
| 392 | * offset_x = 0 | ||
| 393 | * skip_y = 0 | ||
| 394 | * offset_y = 0 | ||
| 395 | * | ||
| 396 | * Only the R and Gb components of RGGB data that was input would be collected. | ||
| 397 | * Similarly in the following configuration: | ||
| 398 | * | ||
| 399 | * skip_x = 0 | ||
| 400 | * offset_x = 0 | ||
| 401 | * skip_y = 1 | ||
| 402 | * offset_y = 1 | ||
| 403 | * | ||
| 404 | * Only the Gb component of RGGB data that was input would be collected. To | ||
| 405 | * correct things such that all 4 colour components were included it would be | ||
| 406 | * necessary to set the skip_x and skip_y fields in a way that resulted in all | ||
| 407 | * four colour components being collected: | ||
| 408 | * | ||
| 409 | * skip_x = 1 | ||
| 410 | * offset_x = 0 | ||
| 411 | * skip_y = 1 | ||
| 412 | * offset_y = 1 | ||
| 413 | * | ||
| 414 | * header.type should be set to one of either MALI_C55_PARAM_BLOCK_AEXP_HIST or | ||
| 415 | * MALI_C55_PARAM_BLOCK_AEXP_IHIST from :c:type:`mali_c55_param_block_type`. | ||
| 416 | * | ||
| 417 | * @header: The Mali-C55 parameters block header | ||
| 418 | * @skip_x: Horizontal decimation. See enum mali_c55_aexp_skip_x | ||
| 419 | * @offset_x: Skip the first column, or not. See enum mali_c55_aexp_row_column_offset | ||
| 420 | * @skip_y: Vertical decimation. See enum mali_c55_aexp_skip_y | ||
| 421 | * @offset_y: Skip the first row, or not. See enum mali_c55_aexp_row_column_offset | ||
| 422 | * @scale_bottom: Scale pixels in bottom half of intensity range: 0=1x ,1=2x, 2=4x, 4=8x, 4=16x | ||
| 423 | * @scale_top: scale pixels in top half of intensity range: 0=1x ,1=2x, 2=4x, 4=8x, 4=16x | ||
| 424 | * @plane_mode: Plane separation mode. See enum mali_c55_aexp_hist_plane_mode | ||
| 425 | * @tap_point: Tap point for histogram from enum mali_c55_aexp_hist_tap_points. | ||
| 426 | * This parameter is unused for the post-Iridix Histogram | ||
| 427 | */ | ||
| 428 | struct mali_c55_params_aexp_hist { | ||
| 429 | struct v4l2_isp_params_block_header header; | ||
| 430 | __u8 skip_x; | ||
| 431 | __u8 offset_x; | ||
| 432 | __u8 skip_y; | ||
| 433 | __u8 offset_y; | ||
| 434 | __u8 scale_bottom; | ||
| 435 | __u8 scale_top; | ||
| 436 | __u8 plane_mode; | ||
| 437 | __u8 tap_point; | ||
| 438 | }; | ||
| 439 | |||
| 440 | /** | ||
| 441 | * struct mali_c55_params_aexp_weights - Array of weights for AEXP metering | ||
| 442 | * | ||
| 443 | * This struct allows users to configure the weighting for both of the 1024-bin | ||
| 444 | * AEXP histograms. The pixel data collected for each zone is multiplied by the | ||
| 445 | * corresponding weight from this array, which may be zero if the intention is | ||
| 446 | * to mask off the zone entirely. | ||
| 447 | * | ||
| 448 | * header.type should be set to one of either MALI_C55_PARAM_BLOCK_AEXP_HIST_WEIGHTS | ||
| 449 | * or MALI_C55_PARAM_BLOCK_AEXP_IHIST_WEIGHTS from :c:type:`mali_c55_param_block_type`. | ||
| 450 | * | ||
| 451 | * @header: The Mali-C55 parameters block header | ||
| 452 | * @nodes_used_horiz: Number of active zones horizontally [0..15] | ||
| 453 | * @nodes_used_vert: Number of active zones vertically [0..15] | ||
| 454 | * @zone_weights: Zone weighting. Index is row*col where 0,0 is the top | ||
| 455 | * left zone continuing in raster order. Each zone can be | ||
| 456 | * weighted in the range [0..15]. The number of rows and | ||
| 457 | * columns is defined by @nodes_used_vert and | ||
| 458 | * @nodes_used_horiz | ||
| 459 | */ | ||
| 460 | struct mali_c55_params_aexp_weights { | ||
| 461 | struct v4l2_isp_params_block_header header; | ||
| 462 | __u8 nodes_used_horiz; | ||
| 463 | __u8 nodes_used_vert; | ||
| 464 | __u8 zone_weights[MALI_C55_MAX_ZONES]; | ||
| 465 | }; | ||
| 466 | |||
| 467 | /** | ||
| 468 | * struct mali_c55_params_digital_gain - Digital gain value | ||
| 469 | * | ||
| 470 | * This struct carries a digital gain value to set in the ISP. | ||
| 471 | * | ||
| 472 | * header.type should be set to MALI_C55_PARAM_BLOCK_DIGITAL_GAIN from | ||
| 473 | * :c:type:`mali_c55_param_block_type` for this block. | ||
| 474 | * | ||
| 475 | * @header: The Mali-C55 parameters block header | ||
| 476 | * @gain: The digital gain value to apply, in Q5.8 format. | ||
| 477 | */ | ||
| 478 | struct mali_c55_params_digital_gain { | ||
| 479 | struct v4l2_isp_params_block_header header; | ||
| 480 | __u16 gain; | ||
| 481 | }; | ||
| 482 | |||
| 483 | /** | ||
| 484 | * enum mali_c55_awb_stats_mode - Statistics mode for AWB | ||
| 485 | * @MALI_C55_AWB_MODE_GRBR: Statistics collected as Green/Red and Blue/Red ratios | ||
| 486 | * @MALI_C55_AWB_MODE_RGBG: Statistics collected as Red/Green and Blue/Green ratios | ||
| 487 | */ | ||
| 488 | enum mali_c55_awb_stats_mode { | ||
| 489 | MALI_C55_AWB_MODE_GRBR = 0, | ||
| 490 | MALI_C55_AWB_MODE_RGBG, | ||
| 491 | }; | ||
| 492 | |||
| 493 | /** | ||
| 494 | * struct mali_c55_params_awb_gains - Gain settings for auto white balance | ||
| 495 | * | ||
| 496 | * This struct allows users to configure the gains for auto-white balance. There | ||
| 497 | * are four gain settings corresponding to each colour channel in the bayer | ||
| 498 | * domain. Although named generically, the association between the gain applied | ||
| 499 | * and the colour channel is done automatically within the ISP depending on the | ||
| 500 | * input format, and so the following mapping always holds true:: | ||
| 501 | * | ||
| 502 | * gain00 = R | ||
| 503 | * gain01 = Gr | ||
| 504 | * gain10 = Gb | ||
| 505 | * gain11 = B | ||
| 506 | * | ||
| 507 | * All of the gains are stored in Q4.8 format. | ||
| 508 | * | ||
| 509 | * header.type should be set to one of either MALI_C55_PARAM_BLOCK_AWB_GAINS or | ||
| 510 | * MALI_C55_PARAM_BLOCK_AWB_GAINS_AEXP from :c:type:`mali_c55_param_block_type`. | ||
| 511 | * | ||
| 512 | * @header: The Mali-C55 parameters block header | ||
| 513 | * @gain00: Multiplier for colour channel 00 | ||
| 514 | * @gain01: Multiplier for colour channel 01 | ||
| 515 | * @gain10: Multiplier for colour channel 10 | ||
| 516 | * @gain11: Multiplier for colour channel 11 | ||
| 517 | */ | ||
| 518 | struct mali_c55_params_awb_gains { | ||
| 519 | struct v4l2_isp_params_block_header header; | ||
| 520 | __u16 gain00; | ||
| 521 | __u16 gain01; | ||
| 522 | __u16 gain10; | ||
| 523 | __u16 gain11; | ||
| 524 | }; | ||
| 525 | |||
| 526 | /** | ||
| 527 | * enum mali_c55_params_awb_tap_points - Tap points for the AWB statistics | ||
| 528 | * @MALI_C55_AWB_STATS_TAP_PF: Immediately after the Purple Fringe block | ||
| 529 | * @MALI_C55_AWB_STATS_TAP_CNR: Immediately after the CNR block | ||
| 530 | */ | ||
| 531 | enum mali_c55_params_awb_tap_points { | ||
| 532 | MALI_C55_AWB_STATS_TAP_PF = 0, | ||
| 533 | MALI_C55_AWB_STATS_TAP_CNR, | ||
| 534 | }; | ||
| 535 | |||
| 536 | /** | ||
| 537 | * struct mali_c55_params_awb_config - Stats settings for auto-white balance | ||
| 538 | * | ||
| 539 | * This struct allows the configuration of the statistics generated for auto | ||
| 540 | * white balance. Pixel intensity limits can be set to exclude overly bright or | ||
| 541 | * dark regions of an image from the statistics entirely. Colour ratio minima | ||
| 542 | * and maxima can be set to discount pixels who's ratios fall outside the | ||
| 543 | * defined boundaries; there are two sets of registers to do this - the | ||
| 544 | * "min/max" ratios which bound a region and the "high/low" ratios which further | ||
| 545 | * trim the upper and lower ratios. For example with the boundaries configured | ||
| 546 | * as follows, only pixels whos colour ratios falls into the region marked "A" | ||
| 547 | * would be counted:: | ||
| 548 | * | ||
| 549 | * cr_high | ||
| 550 | * 2.0 | | | ||
| 551 | * | cb_max --> _________________________v_____ | ||
| 552 | * 1.8 | | \ | | ||
| 553 | * | | \ | | ||
| 554 | * 1.6 | | \ | | ||
| 555 | * | | \ | | ||
| 556 | * c 1.4 | cb_low -->|\ A \|<-- cb_high | ||
| 557 | * b | | \ | | ||
| 558 | * 1.2 | | \ | | ||
| 559 | * r | | \ | | ||
| 560 | * a 1.0 | cb_min --> |____\_________________________| | ||
| 561 | * t | ^ ^ ^ | ||
| 562 | * i 0.8 | | | | | ||
| 563 | * o | cr_min | cr_max | ||
| 564 | * s 0.6 | | | ||
| 565 | * | cr_low | ||
| 566 | * 0.4 | | ||
| 567 | * | | ||
| 568 | * 0.2 | | ||
| 569 | * | | ||
| 570 | * 0.0 |_______________________________________________________________ | ||
| 571 | * 0.0 0.2 0.4 0.6 0.8 1.0 1.2 1.4 1.6 1.8 2.0 | ||
| 572 | * cr ratios | ||
| 573 | * | ||
| 574 | * header.type should be set to MALI_C55_PARAM_BLOCK_AWB_CONFIG from | ||
| 575 | * :c:type:`mali_c55_param_block_type` for this block. | ||
| 576 | * | ||
| 577 | * @header: The Mali-C55 parameters block header | ||
| 578 | * @tap_point: The tap point from enum mali_c55_params_awb_tap_points | ||
| 579 | * @stats_mode: AWB statistics collection mode, see :c:type:`mali_c55_awb_stats_mode` | ||
| 580 | * @white_level: Upper pixel intensity (I.E. raw pixel values) limit | ||
| 581 | * @black_level: Lower pixel intensity (I.E. raw pixel values) limit | ||
| 582 | * @cr_max: Maximum R/G ratio (Q4.8 format) | ||
| 583 | * @cr_min: Minimum R/G ratio (Q4.8 format) | ||
| 584 | * @cb_max: Maximum B/G ratio (Q4.8 format) | ||
| 585 | * @cb_min: Minimum B/G ratio (Q4.8 format) | ||
| 586 | * @nodes_used_horiz: Number of active zones horizontally [0..15] | ||
| 587 | * @nodes_used_vert: Number of active zones vertically [0..15] | ||
| 588 | * @cr_high: R/G ratio trim high (Q4.8 format) | ||
| 589 | * @cr_low: R/G ratio trim low (Q4.8 format) | ||
| 590 | * @cb_high: B/G ratio trim high (Q4.8 format) | ||
| 591 | * @cb_low: B/G ratio trim low (Q4.8 format) | ||
| 592 | */ | ||
| 593 | struct mali_c55_params_awb_config { | ||
| 594 | struct v4l2_isp_params_block_header header; | ||
| 595 | __u8 tap_point; | ||
| 596 | __u8 stats_mode; | ||
| 597 | __u16 white_level; | ||
| 598 | __u16 black_level; | ||
| 599 | __u16 cr_max; | ||
| 600 | __u16 cr_min; | ||
| 601 | __u16 cb_max; | ||
| 602 | __u16 cb_min; | ||
| 603 | __u8 nodes_used_horiz; | ||
| 604 | __u8 nodes_used_vert; | ||
| 605 | __u16 cr_high; | ||
| 606 | __u16 cr_low; | ||
| 607 | __u16 cb_high; | ||
| 608 | __u16 cb_low; | ||
| 609 | }; | ||
| 610 | |||
| 611 | #define MALI_C55_NUM_MESH_SHADING_ELEMENTS 3072 | ||
| 612 | |||
| 613 | /** | ||
| 614 | * struct mali_c55_params_mesh_shading_config - Mesh shading configuration | ||
| 615 | * | ||
| 616 | * The mesh shading correction module allows programming a separate table of | ||
| 617 | * either 16x16 or 32x32 node coefficients for 3 different light sources. The | ||
| 618 | * final correction coefficients applied are computed by blending the | ||
| 619 | * coefficients from two tables together. | ||
| 620 | * | ||
| 621 | * A page of 1024 32-bit integers is associated to each colour channel, with | ||
| 622 | * pages stored consecutively in memory. Each 32-bit integer packs 3 8-bit | ||
| 623 | * correction coefficients for a single node, one for each of the three light | ||
| 624 | * sources. The 8 most significant bits are unused. The following table | ||
| 625 | * describes the layout:: | ||
| 626 | * | ||
| 627 | * +----------- Page (Colour Plane) 0 -------------+ | ||
| 628 | * | @mesh[i] | Mesh Point | Bits | Light Source | | ||
| 629 | * +-----------+------------+-------+--------------+ | ||
| 630 | * | 0 | 0,0 | 16,23 | LS2 | | ||
| 631 | * | | | 08-15 | LS1 | | ||
| 632 | * | | | 00-07 | LS0 | | ||
| 633 | * +-----------+------------+-------+--------------+ | ||
| 634 | * | 1 | 0,1 | 16,23 | LS2 | | ||
| 635 | * | | | 08-15 | LS1 | | ||
| 636 | * | | | 00-07 | LS0 | | ||
| 637 | * +-----------+------------+-------+--------------+ | ||
| 638 | * | ... | ... | ... | ... | | ||
| 639 | * +-----------+------------+-------+--------------+ | ||
| 640 | * | 1023 | 31,31 | 16,23 | LS2 | | ||
| 641 | * | | | 08-15 | LS1 | | ||
| 642 | * | | | 00-07 | LS0 | | ||
| 643 | * +----------- Page (Colour Plane) 1 -------------+ | ||
| 644 | * | @mesh[i] | Mesh Point | Bits | Light Source | | ||
| 645 | * +-----------+------------+-------+--------------+ | ||
| 646 | * | 1024 | 0,0 | 16,23 | LS2 | | ||
| 647 | * | | | 08-15 | LS1 | | ||
| 648 | * | | | 00-07 | LS0 | | ||
| 649 | * +-----------+------------+-------+--------------+ | ||
| 650 | * | 1025 | 0,1 | 16,23 | LS2 | | ||
| 651 | * | | | 08-15 | LS1 | | ||
| 652 | * | | | 00-07 | LS0 | | ||
| 653 | * +-----------+------------+-------+--------------+ | ||
| 654 | * | ... | ... | ... | ... | | ||
| 655 | * +-----------+------------+-------+--------------+ | ||
| 656 | * | 2047 | 31,31 | 16,23 | LS2 | | ||
| 657 | * | | | 08-15 | LS1 | | ||
| 658 | * | | | 00-07 | LS0 | | ||
| 659 | * +----------- Page (Colour Plane) 2 -------------+ | ||
| 660 | * | @mesh[i] | Mesh Point | Bits | Light Source | | ||
| 661 | * +-----------+------------+-------+--------------+ | ||
| 662 | * | 2048 | 0,0 | 16,23 | LS2 | | ||
| 663 | * | | | 08-15 | LS1 | | ||
| 664 | * | | | 00-07 | LS0 | | ||
| 665 | * +-----------+------------+-------+--------------+ | ||
| 666 | * | 2049 | 0,1 | 16,23 | LS2 | | ||
| 667 | * | | | 08-15 | LS1 | | ||
| 668 | * | | | 00-07 | LS0 | | ||
| 669 | * +-----------+------------+-------+--------------+ | ||
| 670 | * | ... | ... | ... | ... | | ||
| 671 | * +-----------+------------+-------+--------------+ | ||
| 672 | * | 3071 | 31,31 | 16,23 | LS2 | | ||
| 673 | * | | | 08-15 | LS1 | | ||
| 674 | * | | | 00-07 | LS0 | | ||
| 675 | * +-----------+------------+-------+--------------+ | ||
| 676 | * | ||
| 677 | * The @mesh_scale member determines the precision and minimum and maximum gain. | ||
| 678 | * For example if @mesh_scale is 0 and therefore selects 0 - 2x gain, a value of | ||
| 679 | * 0 in a coefficient means 0.0 gain, a value of 128 means 1.0 gain and 255 | ||
| 680 | * means 2.0 gain. | ||
| 681 | * | ||
| 682 | * header.type should be set to MALI_C55_PARAM_MESH_SHADING_CONFIG from | ||
| 683 | * :c:type:`mali_c55_param_block_type` for this block. | ||
| 684 | * | ||
| 685 | * @header: The Mali-C55 parameters block header | ||
| 686 | * @mesh_show: Output the mesh data rather than image data | ||
| 687 | * @mesh_scale: Set the precision and maximum gain range of mesh shading | ||
| 688 | * - 0 = 0-2x gain | ||
| 689 | * - 1 = 0-4x gain | ||
| 690 | * - 2 = 0-8x gain | ||
| 691 | * - 3 = 0-16x gain | ||
| 692 | * - 4 = 1-2x gain | ||
| 693 | * - 5 = 1-3x gain | ||
| 694 | * - 6 = 1-5x gain | ||
| 695 | * - 7 = 1-9x gain | ||
| 696 | * @mesh_page_r: Mesh page select for red colour plane [0..2] | ||
| 697 | * @mesh_page_g: Mesh page select for green colour plane [0..2] | ||
| 698 | * @mesh_page_b: Mesh page select for blue colour plane [0..2] | ||
| 699 | * @mesh_width: Number of horizontal nodes minus 1 [15,31] | ||
| 700 | * @mesh_height: Number of vertical nodes minus 1 [15,31] | ||
| 701 | * @mesh: Mesh shading correction tables | ||
| 702 | */ | ||
| 703 | struct mali_c55_params_mesh_shading_config { | ||
| 704 | struct v4l2_isp_params_block_header header; | ||
| 705 | __u8 mesh_show; | ||
| 706 | __u8 mesh_scale; | ||
| 707 | __u8 mesh_page_r; | ||
| 708 | __u8 mesh_page_g; | ||
| 709 | __u8 mesh_page_b; | ||
| 710 | __u8 mesh_width; | ||
| 711 | __u8 mesh_height; | ||
| 712 | __u32 mesh[MALI_C55_NUM_MESH_SHADING_ELEMENTS]; | ||
| 713 | }; | ||
| 714 | |||
| 715 | /** enum mali_c55_params_mesh_alpha_bank - Mesh shading table bank selection | ||
| 716 | * @MALI_C55_MESH_ALPHA_BANK_LS0_AND_LS1 - Select Light Sources 0 and 1 | ||
| 717 | * @MALI_C55_MESH_ALPHA_BANK_LS1_AND_LS2 - Select Light Sources 1 and 2 | ||
| 718 | * @MALI_C55_MESH_ALPHA_BANK_LS0_AND_LS2 - Select Light Sources 0 and 2 | ||
| 719 | */ | ||
| 720 | enum mali_c55_params_mesh_alpha_bank { | ||
| 721 | MALI_C55_MESH_ALPHA_BANK_LS0_AND_LS1 = 0, | ||
| 722 | MALI_C55_MESH_ALPHA_BANK_LS1_AND_LS2 = 1, | ||
| 723 | MALI_C55_MESH_ALPHA_BANK_LS0_AND_LS2 = 4 | ||
| 724 | }; | ||
| 725 | |||
| 726 | /** | ||
| 727 | * struct mali_c55_params_mesh_shading_selection - Mesh table selection | ||
| 728 | * | ||
| 729 | * The module computes the final correction coefficients by blending the ones | ||
| 730 | * from two light source tables, which are selected (independently for each | ||
| 731 | * colour channel) by the @mesh_alpha_bank_r/g/b fields. | ||
| 732 | * | ||
| 733 | * The final blended coefficients for each node are calculated using the | ||
| 734 | * following equation: | ||
| 735 | * | ||
| 736 | * Final coefficient = (a * LS\ :sub:`b`\ + (256 - a) * LS\ :sub:`a`\) / 256 | ||
| 737 | * | ||
| 738 | * Where a is the @mesh_alpha_r/g/b value, and LS\ :sub:`a`\ and LS\ :sub:`b`\ | ||
| 739 | * are the node cofficients for the two tables selected by the | ||
| 740 | * @mesh_alpha_bank_r/g/b value. | ||
| 741 | * | ||
| 742 | * The scale of the applied correction may also be controlled by tuning the | ||
| 743 | * @mesh_strength member. This is a modifier to the final coefficients which can | ||
| 744 | * be used to globally reduce the gains applied. | ||
| 745 | * | ||
| 746 | * header.type should be set to MALI_C55_PARAM_MESH_SHADING_SELECTION from | ||
| 747 | * :c:type:`mali_c55_param_block_type` for this block. | ||
| 748 | * | ||
| 749 | * @header: The Mali-C55 parameters block header | ||
| 750 | * @mesh_alpha_bank_r: Red mesh table select (c:type:`enum mali_c55_params_mesh_alpha_bank`) | ||
| 751 | * @mesh_alpha_bank_g: Green mesh table select (c:type:`enum mali_c55_params_mesh_alpha_bank`) | ||
| 752 | * @mesh_alpha_bank_b: Blue mesh table select (c:type:`enum mali_c55_params_mesh_alpha_bank`) | ||
| 753 | * @mesh_alpha_r: Blend coefficient for R [0..255] | ||
| 754 | * @mesh_alpha_g: Blend coefficient for G [0..255] | ||
| 755 | * @mesh_alpha_b: Blend coefficient for B [0..255] | ||
| 756 | * @mesh_strength: Mesh strength in Q4.12 format [0..4096] | ||
| 757 | */ | ||
| 758 | struct mali_c55_params_mesh_shading_selection { | ||
| 759 | struct v4l2_isp_params_block_header header; | ||
| 760 | __u8 mesh_alpha_bank_r; | ||
| 761 | __u8 mesh_alpha_bank_g; | ||
| 762 | __u8 mesh_alpha_bank_b; | ||
| 763 | __u8 mesh_alpha_r; | ||
| 764 | __u8 mesh_alpha_g; | ||
| 765 | __u8 mesh_alpha_b; | ||
| 766 | __u16 mesh_strength; | ||
| 767 | }; | ||
| 768 | |||
| 769 | /** | ||
| 770 | * define MALI_C55_PARAMS_MAX_SIZE - Maximum size of all Mali C55 Parameters | ||
| 771 | * | ||
| 772 | * Though the parameters for the Mali-C55 are passed as optional blocks, the | ||
| 773 | * driver still needs to know the absolute maximum size so that it can allocate | ||
| 774 | * a buffer sized appropriately to accommodate userspace attempting to set all | ||
| 775 | * possible parameters in a single frame. | ||
| 776 | * | ||
| 777 | * Some structs are in this list multiple times. Where that's the case, it just | ||
| 778 | * reflects the fact that the same struct can be used with multiple different | ||
| 779 | * header types from :c:type:`mali_c55_param_block_type`. | ||
| 780 | */ | ||
| 781 | #define MALI_C55_PARAMS_MAX_SIZE \ | ||
| 782 | (sizeof(struct mali_c55_params_sensor_off_preshading) + \ | ||
| 783 | sizeof(struct mali_c55_params_aexp_hist) + \ | ||
| 784 | sizeof(struct mali_c55_params_aexp_weights) + \ | ||
| 785 | sizeof(struct mali_c55_params_aexp_hist) + \ | ||
| 786 | sizeof(struct mali_c55_params_aexp_weights) + \ | ||
| 787 | sizeof(struct mali_c55_params_digital_gain) + \ | ||
| 788 | sizeof(struct mali_c55_params_awb_gains) + \ | ||
| 789 | sizeof(struct mali_c55_params_awb_config) + \ | ||
| 790 | sizeof(struct mali_c55_params_awb_gains) + \ | ||
| 791 | sizeof(struct mali_c55_params_mesh_shading_config) + \ | ||
| 792 | sizeof(struct mali_c55_params_mesh_shading_selection)) | ||
| 793 | |||
| 794 | #endif /* __UAPI_MALI_C55_CONFIG_H */ | ||
| @@ -0,0 +1,102 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* | ||
| 3 | * Video4Linux2 generic ISP parameters and statistics support | ||
| 4 | * | ||
| 5 | * Copyright (C) 2025 Ideas On Board Oy | ||
| 6 | * Author: Jacopo Mondi <jacopo.mondi@ideasonboard.com> | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _UAPI_V4L2_ISP_H_ | ||
| 10 | #define _UAPI_V4L2_ISP_H_ | ||
| 11 | |||
| 12 | #include <linux/stddef.h> | ||
| 13 | #include <linux/types.h> | ||
| 14 | |||
| 15 | /** | ||
| 16 | * enum v4l2_isp_params_version - V4L2 ISP parameters versioning | ||
| 17 | * | ||
| 18 | * @V4L2_ISP_PARAMS_VERSION_V0: First version of the V4L2 ISP parameters format | ||
| 19 | * (for compatibility) | ||
| 20 | * @V4L2_ISP_PARAMS_VERSION_V1: First version of the V4L2 ISP parameters format | ||
| 21 | * | ||
| 22 | * V0 and V1 are identical in order to support drivers compatible with the V4L2 | ||
| 23 | * ISP parameters format already upstreamed which use either 0 or 1 as their | ||
| 24 | * versioning identifier. Both V0 and V1 refers to the first version of the | ||
| 25 | * V4L2 ISP parameters format. | ||
| 26 | * | ||
| 27 | * Future revisions of the V4L2 ISP parameters format should start from the | ||
| 28 | * value of 2. | ||
| 29 | */ | ||
| 30 | enum v4l2_isp_params_version { | ||
| 31 | V4L2_ISP_PARAMS_VERSION_V0 = 0, | ||
| 32 | V4L2_ISP_PARAMS_VERSION_V1 | ||
| 33 | }; | ||
| 34 | |||
| 35 | #define V4L2_ISP_PARAMS_FL_BLOCK_DISABLE (1U << 0) | ||
| 36 | #define V4L2_ISP_PARAMS_FL_BLOCK_ENABLE (1U << 1) | ||
| 37 | |||
| 38 | /* | ||
| 39 | * Reserve the first 8 bits for V4L2_ISP_PARAMS_FL_* flag. | ||
| 40 | * | ||
| 41 | * Driver-specific flags should be defined as: | ||
| 42 | * #define DRIVER_SPECIFIC_FLAG0 ((1U << V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(0)) | ||
| 43 | * #define DRIVER_SPECIFIC_FLAG1 ((1U << V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(1)) | ||
| 44 | */ | ||
| 45 | #define V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(n) ((n) + 8) | ||
| 46 | |||
| 47 | /** | ||
| 48 | * struct v4l2_isp_params_block_header - V4L2 extensible parameters block header | ||
| 49 | * @type: The parameters block type (driver-specific) | ||
| 50 | * @flags: A bitmask of block flags (driver-specific) | ||
| 51 | * @size: Size (in bytes) of the parameters block, including this header | ||
| 52 | * | ||
| 53 | * This structure represents the common part of all the ISP configuration | ||
| 54 | * blocks. Each parameters block shall embed an instance of this structure type | ||
| 55 | * as its first member, followed by the block-specific configuration data. | ||
| 56 | * | ||
| 57 | * The @type field is an ISP driver-specific value that identifies the block | ||
| 58 | * type. The @size field specifies the size of the parameters block. | ||
| 59 | * | ||
| 60 | * The @flags field is a bitmask of per-block flags V4L2_PARAMS_ISP_FL_* and | ||
| 61 | * driver-specific flags specified by the driver header. | ||
| 62 | */ | ||
| 63 | struct v4l2_isp_params_block_header { | ||
| 64 | __u16 type; | ||
| 65 | __u16 flags; | ||
| 66 | __u32 size; | ||
| 67 | } __attribute__((aligned(8))); | ||
| 68 | |||
| 69 | /** | ||
| 70 | * struct v4l2_isp_params_buffer - V4L2 extensible parameters configuration | ||
| 71 | * @version: The parameters buffer version (driver-specific) | ||
| 72 | * @data_size: The configuration data effective size, excluding this header | ||
| 73 | * @data: The configuration data | ||
| 74 | * | ||
| 75 | * This structure contains the configuration parameters of the ISP algorithms, | ||
| 76 | * serialized by userspace into a data buffer. Each configuration parameter | ||
| 77 | * block is represented by a block-specific structure which contains a | ||
| 78 | * :c:type:`v4l2_isp_params_block_header` entry as first member. Userspace | ||
| 79 | * populates the @data buffer with configuration parameters for the blocks that | ||
| 80 | * it intends to configure. As a consequence, the data buffer effective size | ||
| 81 | * changes according to the number of ISP blocks that userspace intends to | ||
| 82 | * configure and is set by userspace in the @data_size field. | ||
| 83 | * | ||
| 84 | * The parameters buffer is versioned by the @version field to allow modifying | ||
| 85 | * and extending its definition. Userspace shall populate the @version field to | ||
| 86 | * inform the driver about the version it intends to use. The driver will parse | ||
| 87 | * and handle the @data buffer according to the data layout specific to the | ||
| 88 | * indicated version and return an error if the desired version is not | ||
| 89 | * supported. | ||
| 90 | * | ||
| 91 | * For each ISP block that userspace wants to configure, a block-specific | ||
| 92 | * structure is appended to the @data buffer, one after the other without gaps | ||
| 93 | * in between. Userspace shall populate the @data_size field with the effective | ||
| 94 | * size, in bytes, of the @data buffer. | ||
| 95 | */ | ||
| 96 | struct v4l2_isp_params_buffer { | ||
| 97 | __u32 version; | ||
| 98 | __u32 data_size; | ||
| 99 | __u8 data[] __counted_by(data_size); | ||
| 100 | }; | ||
| 101 | |||
| 102 | #endif /* _UAPI_V4L2_ISP_H_ */ | ||
| @@ -197,7 +197,7 @@ struct statmount { · 196 unmodified lines | |||
| 197 | */ | 197 | */ |
| 198 | struct mnt_id_req { | 198 | struct mnt_id_req { |
| 199 | __u32 size; | 199 | __u32 size; |
| 200 | __u32 spare; | 200 | __u32 mnt_ns_fd; |
| 201 | __u64 mnt_id; | 201 | __u64 mnt_id; |
| 202 | __u64 param; | 202 | __u64 param; |
| 203 | __u64 mnt_ns_id; | 203 | __u64 mnt_ns_id; |
| @@ -70,7 +70,8 @@ struct mptcp_info { · 69 unmodified lines | |||
| 70 | __u64 mptcpi_bytes_acked; | 70 | __u64 mptcpi_bytes_acked; |
| 71 | __u8 mptcpi_subflows_total; | 71 | __u8 mptcpi_subflows_total; |
| 72 | __u8 mptcpi_endp_laminar_max; | 72 | __u8 mptcpi_endp_laminar_max; |
| 73 | __u8 reserved[2]; | 73 | __u8 mptcpi_endp_fullmesh_max; |
| 74 | __u8 reserved; | ||
| 74 | __u32 mptcpi_last_data_sent; | 75 | __u32 mptcpi_last_data_sent; |
| 75 | __u32 mptcpi_last_data_recv; | 76 | __u32 mptcpi_last_data_recv; |
| 76 | __u32 mptcpi_last_ack_recv; | 77 | __u32 mptcpi_last_ack_recv; |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/mptcp_pm.yaml */ | 3 | /* Documentation/netlink/specs/mptcp_pm.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_MPTCP_PM_H | 7 | #ifndef _UAPI_LINUX_MPTCP_PM_H |
| 7 | #define _UAPI_LINUX_MPTCP_PM_H | 8 | #define _UAPI_LINUX_MPTCP_PM_H |
| @@ -26,6 +26,7 @@ enum { · 25 unmodified lines | |||
| 26 | MSHV_PT_BIT_LAPIC, | 26 | MSHV_PT_BIT_LAPIC, |
| 27 | MSHV_PT_BIT_X2APIC, | 27 | MSHV_PT_BIT_X2APIC, |
| 28 | MSHV_PT_BIT_GPA_SUPER_PAGES, | 28 | MSHV_PT_BIT_GPA_SUPER_PAGES, |
| 29 | MSHV_PT_BIT_CPU_AND_XSAVE_FEATURES, | ||
| 29 | MSHV_PT_BIT_COUNT, | 30 | MSHV_PT_BIT_COUNT, |
| 30 | }; | 31 | }; |
| 31 | 32 | ||
| @@ -41,6 +42,8 @@ enum { · 9 unmodified lines | |||
| 41 | * @pt_flags: Bitmask of 1 << MSHV_PT_BIT_* | 42 | * @pt_flags: Bitmask of 1 << MSHV_PT_BIT_* |
| 42 | * @pt_isolation: MSHV_PT_ISOLATION_* | 43 | * @pt_isolation: MSHV_PT_ISOLATION_* |
| 43 | * | 44 | * |
| 45 | * This is the initial/v1 version for backward compatibility. | ||
| 46 | * | ||
| 44 | * Returns a file descriptor to act as a handle to a guest partition. | 47 | * Returns a file descriptor to act as a handle to a guest partition. |
| 45 | * At this point the partition is not yet initialized in the hypervisor. | 48 | * At this point the partition is not yet initialized in the hypervisor. |
| 46 | * Some operations must be done with the partition in this state, e.g. setting | 49 | * Some operations must be done with the partition in this state, e.g. setting |
| @@ -52,6 +55,37 @@ struct mshv_create_partition { · 5 unmodified lines | |||
| 52 | __u64 pt_isolation; | 55 | __u64 pt_isolation; |
| 53 | }; | 56 | }; |
| 54 | 57 | ||
| 58 | #define MSHV_NUM_CPU_FEATURES_BANKS 2 | ||
| 59 | |||
| 60 | /** | ||
| 61 | * struct mshv_create_partition_v2 | ||
| 62 | * | ||
| 63 | * This is extended version of the above initial MSHV_CREATE_PARTITION | ||
| 64 | * ioctl and allows for following additional parameters: | ||
| 65 | * | ||
| 66 | * @pt_num_cpu_fbanks: Must be set to MSHV_NUM_CPU_FEATURES_BANKS. | ||
| 67 | * @pt_cpu_fbanks: Disabled processor feature banks array. | ||
| 68 | * @pt_disabled_xsave: Disabled xsave feature bits. | ||
| 69 | * | ||
| 70 | * pt_cpu_fbanks and pt_disabled_xsave are passed through as-is to the create | ||
| 71 | * partition hypercall. | ||
| 72 | * | ||
| 73 | * Returns : same as above original mshv_create_partition | ||
| 74 | */ | ||
| 75 | struct mshv_create_partition_v2 { | ||
| 76 | __u64 pt_flags; | ||
| 77 | __u64 pt_isolation; | ||
| 78 | __u16 pt_num_cpu_fbanks; | ||
| 79 | __u8 pt_rsvd[6]; /* MBZ */ | ||
| 80 | __u64 pt_cpu_fbanks[MSHV_NUM_CPU_FEATURES_BANKS]; | ||
| 81 | __u64 pt_rsvd1[2]; /* MBZ */ | ||
| 82 | #if defined(__x86_64__) | ||
| 83 | __u64 pt_disabled_xsave; | ||
| 84 | #else | ||
| 85 | __u64 pt_rsvd2; /* MBZ */ | ||
| 86 | #endif | ||
| 87 | } __packed; | ||
| 88 | |||
| 55 | /* /dev/mshv */ | 89 | /* /dev/mshv */ |
| 56 | #define MSHV_CREATE_PARTITION _IOW(MSHV_IOCTL, 0x00, struct mshv_create_partition) | 90 | #define MSHV_CREATE_PARTITION _IOW(MSHV_IOCTL, 0x00, struct mshv_create_partition) |
| 57 | 91 | ||
| @@ -89,7 +123,7 @@ enum { · 31 unmodified lines | |||
| 89 | * @rsvd: MBZ | 123 | * @rsvd: MBZ |
| 90 | * | 124 | * |
| 91 | * Map or unmap a region of userspace memory to Guest Physical Addresses (GPA). | 125 | * Map or unmap a region of userspace memory to Guest Physical Addresses (GPA). |
| 92 | * Mappings can't overlap in GPA space or userspace. | 126 | * Mappings can't overlap in GPA space. |
| 93 | * To unmap, these fields must match an existing mapping. | 127 | * To unmap, these fields must match an existing mapping. |
| 94 | */ | 128 | */ |
| 95 | struct mshv_user_mem_region { | 129 | struct mshv_user_mem_region { |
| @@ -288,4 +322,84 @@ struct mshv_get_set_vp_state { · 192 unmodified lines | |||
| 288 | * #define MSHV_ROOT_HVCALL _IOWR(MSHV_IOCTL, 0x07, struct mshv_root_hvcall) | 322 | * #define MSHV_ROOT_HVCALL _IOWR(MSHV_IOCTL, 0x07, struct mshv_root_hvcall) |
| 289 | */ | 323 | */ |
| 290 | 324 | ||
| 325 | /* Structure definitions, macros and IOCTLs for mshv_vtl */ | ||
| 326 | |||
| 327 | #define MSHV_CAP_CORE_API_STABLE 0x0 | ||
| 328 | #define MSHV_CAP_REGISTER_PAGE 0x1 | ||
| 329 | #define MSHV_CAP_VTL_RETURN_ACTION 0x2 | ||
| 330 | #define MSHV_CAP_DR6_SHARED 0x3 | ||
| 331 | #define MSHV_MAX_RUN_MSG_SIZE 256 | ||
| 332 | |||
| 333 | struct mshv_vp_registers { | ||
| 334 | __u32 count; /* supports only 1 register at a time */ | ||
| 335 | __u32 reserved; /* Reserved for alignment or future use */ | ||
| 336 | __u64 regs_ptr; /* pointer to struct hv_register_assoc */ | ||
| 337 | }; | ||
| 338 | |||
| 339 | struct mshv_vtl_set_eventfd { | ||
| 340 | __s32 fd; | ||
| 341 | __u32 flag; | ||
| 342 | }; | ||
| 343 | |||
| 344 | struct mshv_vtl_signal_event { | ||
| 345 | __u32 connection_id; | ||
| 346 | __u32 flag; | ||
| 347 | }; | ||
| 348 | |||
| 349 | struct mshv_vtl_sint_post_msg { | ||
| 350 | __u64 message_type; | ||
| 351 | __u32 connection_id; | ||
| 352 | __u32 payload_size; /* Must not exceed HV_MESSAGE_PAYLOAD_BYTE_COUNT */ | ||
| 353 | __u64 payload_ptr; /* pointer to message payload (bytes) */ | ||
| 354 | }; | ||
| 355 | |||
| 356 | struct mshv_vtl_ram_disposition { | ||
| 357 | __u64 start_pfn; | ||
| 358 | __u64 last_pfn; | ||
| 359 | }; | ||
| 360 | |||
| 361 | struct mshv_vtl_set_poll_file { | ||
| 362 | __u32 cpu; | ||
| 363 | __u32 fd; | ||
| 364 | }; | ||
| 365 | |||
| 366 | struct mshv_vtl_hvcall_setup { | ||
| 367 | __u64 bitmap_array_size; /* stores number of bytes */ | ||
| 368 | __u64 allow_bitmap_ptr; | ||
| 369 | }; | ||
| 370 | |||
| 371 | struct mshv_vtl_hvcall { | ||
| 372 | __u64 control; /* Hypercall control code */ | ||
| 373 | __u64 input_size; /* Size of the input data */ | ||
| 374 | __u64 input_ptr; /* Pointer to the input struct */ | ||
| 375 | __u64 status; /* Status of the hypercall (output) */ | ||
| 376 | __u64 output_size; /* Size of the output data */ | ||
| 377 | __u64 output_ptr; /* Pointer to the output struct */ | ||
| 378 | }; | ||
| 379 | |||
| 380 | struct mshv_sint_mask { | ||
| 381 | __u8 mask; | ||
| 382 | __u8 reserved[7]; | ||
| 383 | }; | ||
| 384 | |||
| 385 | /* /dev/mshv device IOCTL */ | ||
| 386 | #define MSHV_CHECK_EXTENSION _IOW(MSHV_IOCTL, 0x00, __u32) | ||
| 387 | |||
| 388 | /* vtl device */ | ||
| 389 | #define MSHV_CREATE_VTL _IOR(MSHV_IOCTL, 0x1D, char) | ||
| 390 | #define MSHV_ADD_VTL0_MEMORY _IOW(MSHV_IOCTL, 0x21, struct mshv_vtl_ram_disposition) | ||
| 391 | #define MSHV_SET_POLL_FILE _IOW(MSHV_IOCTL, 0x25, struct mshv_vtl_set_poll_file) | ||
| 392 | #define MSHV_RETURN_TO_LOWER_VTL _IO(MSHV_IOCTL, 0x27) | ||
| 393 | #define MSHV_GET_VP_REGISTERS _IOWR(MSHV_IOCTL, 0x05, struct mshv_vp_registers) | ||
| 394 | #define MSHV_SET_VP_REGISTERS _IOW(MSHV_IOCTL, 0x06, struct mshv_vp_registers) | ||
| 395 | |||
| 396 | /* VMBus device IOCTLs */ | ||
| 397 | #define MSHV_SINT_SIGNAL_EVENT _IOW(MSHV_IOCTL, 0x22, struct mshv_vtl_signal_event) | ||
| 398 | #define MSHV_SINT_POST_MESSAGE _IOW(MSHV_IOCTL, 0x23, struct mshv_vtl_sint_post_msg) | ||
| 399 | #define MSHV_SINT_SET_EVENTFD _IOW(MSHV_IOCTL, 0x24, struct mshv_vtl_set_eventfd) | ||
| 400 | #define MSHV_SINT_PAUSE_MESSAGE_STREAM _IOW(MSHV_IOCTL, 0x25, struct mshv_sint_mask) | ||
| 401 | |||
| 402 | /* hv_hvcall device */ | ||
| 403 | #define MSHV_HVCALL_SETUP _IOW(MSHV_IOCTL, 0x1E, struct mshv_vtl_hvcall_setup) | ||
| 404 | #define MSHV_HVCALL _IOWR(MSHV_IOCTL, 0x1F, struct mshv_vtl_hvcall) | ||
| 291 | #endif | 405 | #endif |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/net_shaper.yaml */ | 3 | /* Documentation/netlink/specs/net_shaper.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_NET_SHAPER_H | 7 | #ifndef _UAPI_LINUX_NET_SHAPER_H |
| 7 | #define _UAPI_LINUX_NET_SHAPER_H | 8 | #define _UAPI_LINUX_NET_SHAPER_H |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/netdev.yaml */ | 3 | /* Documentation/netlink/specs/netdev.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_NETDEV_H | 7 | #ifndef _UAPI_LINUX_NETDEV_H |
| 7 | #define _UAPI_LINUX_NETDEV_H | 8 | #define _UAPI_LINUX_NETDEV_H |
| @@ -80,6 +81,7 @@ enum netdev_qstats_scope { · 72 unmodified lines | |||
| 80 | enum netdev_napi_threaded { | 81 | enum netdev_napi_threaded { |
| 81 | NETDEV_NAPI_THREADED_DISABLED, | 82 | NETDEV_NAPI_THREADED_DISABLED, |
| 82 | NETDEV_NAPI_THREADED_ENABLED, | 83 | NETDEV_NAPI_THREADED_ENABLED, |
| 84 | NETDEV_NAPI_THREADED_BUSY_POLL, | ||
| 83 | }; | 85 | }; |
| 84 | 86 | ||
| 85 | enum { | 87 | enum { |
| @@ -881,7 +881,7 @@ enum nft_exthdr_flags { · 880 unmodified lines | |||
| 881 | * enum nft_exthdr_op - nf_tables match options | 881 | * enum nft_exthdr_op - nf_tables match options |
| 882 | * | 882 | * |
| 883 | * @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers | 883 | * @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers |
| 884 | * @NFT_EXTHDR_OP_TCP: match against tcp options | 884 | * @NFT_EXTHDR_OP_TCPOPT: match against tcp options |
| 885 | * @NFT_EXTHDR_OP_IPV4: match against ipv4 options | 885 | * @NFT_EXTHDR_OP_IPV4: match against ipv4 options |
| 886 | * @NFT_EXTHDR_OP_SCTP: match against sctp chunks | 886 | * @NFT_EXTHDR_OP_SCTP: match against sctp chunks |
| 887 | * @NFT_EXTHDR_OP_DCCP: match against dccp otions | 887 | * @NFT_EXTHDR_OP_DCCP: match against dccp otions |
| @@ -1200,7 +1200,7 @@ enum nft_ct_attributes { · 312 unmodified lines | |||
| 1200 | #define NFTA_CT_MAX (__NFTA_CT_MAX - 1) | 1200 | #define NFTA_CT_MAX (__NFTA_CT_MAX - 1) |
| 1201 | 1201 | ||
| 1202 | /** | 1202 | /** |
| 1203 | * enum nft_flow_attributes - ct offload expression attributes | 1203 | * enum nft_offload_attributes - ct offload expression attributes |
| 1204 | * @NFTA_FLOW_TABLE_NAME: flow table name (NLA_STRING) | 1204 | * @NFTA_FLOW_TABLE_NAME: flow table name (NLA_STRING) |
| 1205 | */ | 1205 | */ |
| 1206 | enum nft_offload_attributes { | 1206 | enum nft_offload_attributes { |
| @@ -1410,7 +1410,7 @@ enum nft_reject_types { · 203 unmodified lines | |||
| 1410 | }; | 1410 | }; |
| 1411 | 1411 | ||
| 1412 | /** | 1412 | /** |
| 1413 | * enum nft_reject_code - Generic reject codes for IPv4/IPv6 | 1413 | * enum nft_reject_inet_code - Generic reject codes for IPv4/IPv6 |
| 1414 | * | 1414 | * |
| 1415 | * @NFT_REJECT_ICMPX_NO_ROUTE: no route to host / network unreachable | 1415 | * @NFT_REJECT_ICMPX_NO_ROUTE: no route to host / network unreachable |
| 1416 | * @NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable | 1416 | * @NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable |
| @@ -1480,9 +1480,9 @@ enum nft_nat_attributes { · 63 unmodified lines | |||
| 1480 | /** | 1480 | /** |
| 1481 | * enum nft_tproxy_attributes - nf_tables tproxy expression netlink attributes | 1481 | * enum nft_tproxy_attributes - nf_tables tproxy expression netlink attributes |
| 1482 | * | 1482 | * |
| 1483 | * NFTA_TPROXY_FAMILY: Target address family (NLA_U32: nft_registers) | 1483 | * @NFTA_TPROXY_FAMILY: Target address family (NLA_U32: nft_registers) |
| 1484 | * NFTA_TPROXY_REG_ADDR: Target address register (NLA_U32: nft_registers) | 1484 | * @NFTA_TPROXY_REG_ADDR: Target address register (NLA_U32: nft_registers) |
| 1485 | * NFTA_TPROXY_REG_PORT: Target port register (NLA_U32: nft_registers) | 1485 | * @NFTA_TPROXY_REG_PORT: Target port register (NLA_U32: nft_registers) |
| 1486 | */ | 1486 | */ |
| 1487 | enum nft_tproxy_attributes { | 1487 | enum nft_tproxy_attributes { |
| 1488 | NFTA_TPROXY_UNSPEC, | 1488 | NFTA_TPROXY_UNSPEC, |
| @@ -1783,7 +1783,7 @@ enum nft_synproxy_attributes { · 294 unmodified lines | |||
| 1783 | #define NFTA_SYNPROXY_MAX (__NFTA_SYNPROXY_MAX - 1) | 1783 | #define NFTA_SYNPROXY_MAX (__NFTA_SYNPROXY_MAX - 1) |
| 1784 | 1784 | ||
| 1785 | /** | 1785 | /** |
| 1786 | * enum nft_device_attributes - nf_tables device netlink attributes | 1786 | * enum nft_devices_attributes - nf_tables device netlink attributes |
| 1787 | * | 1787 | * |
| 1788 | * @NFTA_DEVICE_NAME: name of this device (NLA_STRING) | 1788 | * @NFTA_DEVICE_NAME: name of this device (NLA_STRING) |
| 1789 | * @NFTA_DEVICE_PREFIX: device name prefix, a simple wildcard (NLA_STRING) | 1789 | * @NFTA_DEVICE_PREFIX: device name prefix, a simple wildcard (NLA_STRING) |
| @@ -41,13 +41,13 @@ · 40 unmodified lines | |||
| 41 | 41 | ||
| 42 | /** | 42 | /** |
| 43 | * struct ip6t_srh - SRH match options | 43 | * struct ip6t_srh - SRH match options |
| 44 | * @ next_hdr: Next header field of SRH | 44 | * @next_hdr: Next header field of SRH |
| 45 | * @ hdr_len: Extension header length field of SRH | 45 | * @hdr_len: Extension header length field of SRH |
| 46 | * @ segs_left: Segments left field of SRH | 46 | * @segs_left: Segments left field of SRH |
| 47 | * @ last_entry: Last entry field of SRH | 47 | * @last_entry: Last entry field of SRH |
| 48 | * @ tag: Tag field of SRH | 48 | * @tag: Tag field of SRH |
| 49 | * @ mt_flags: match options | 49 | * @mt_flags: match options |
| 50 | * @ mt_invflags: Invert the sense of match options | 50 | * @mt_invflags: Invert the sense of match options |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | struct ip6t_srh { | 53 | struct ip6t_srh { |
| @@ -62,19 +62,19 @@ struct ip6t_srh { · 8 unmodified lines | |||
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * struct ip6t_srh1 - SRH match options (revision 1) | 64 | * struct ip6t_srh1 - SRH match options (revision 1) |
| 65 | * @ next_hdr: Next header field of SRH | 65 | * @next_hdr: Next header field of SRH |
| 66 | * @ hdr_len: Extension header length field of SRH | 66 | * @hdr_len: Extension header length field of SRH |
| 67 | * @ segs_left: Segments left field of SRH | 67 | * @segs_left: Segments left field of SRH |
| 68 | * @ last_entry: Last entry field of SRH | 68 | * @last_entry: Last entry field of SRH |
| 69 | * @ tag: Tag field of SRH | 69 | * @tag: Tag field of SRH |
| 70 | * @ psid_addr: Address of previous SID in SRH SID list | 70 | * @psid_addr: Address of previous SID in SRH SID list |
| 71 | * @ nsid_addr: Address of NEXT SID in SRH SID list | 71 | * @nsid_addr: Address of NEXT SID in SRH SID list |
| 72 | * @ lsid_addr: Address of LAST SID in SRH SID list | 72 | * @lsid_addr: Address of LAST SID in SRH SID list |
| 73 | * @ psid_msk: Mask of previous SID in SRH SID list | 73 | * @psid_msk: Mask of previous SID in SRH SID list |
| 74 | * @ nsid_msk: Mask of next SID in SRH SID list | 74 | * @nsid_msk: Mask of next SID in SRH SID list |
| 75 | * @ lsid_msk: MAsk of last SID in SRH SID list | 75 | * @lsid_msk: MAsk of last SID in SRH SID list |
| 76 | * @ mt_flags: match options | 76 | * @mt_flags: match options |
| 77 | * @ mt_invflags: Invert the sense of match options | 77 | * @mt_invflags: Invert the sense of match options |
| 78 | */ | 78 | */ |
| 79 | 79 | ||
| 80 | struct ip6t_srh1 { | 80 | struct ip6t_srh1 { |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/nfsd.yaml */ | 3 | /* Documentation/netlink/specs/nfsd.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_NFSD_NETLINK_H | 7 | #ifndef _UAPI_LINUX_NFSD_NETLINK_H |
| 7 | #define _UAPI_LINUX_NFSD_NETLINK_H | 8 | #define _UAPI_LINUX_NFSD_NETLINK_H |
| @@ -84,7 +84,6 @@ enum iwl_vendor_auth_akm_mode { · 83 unmodified lines | |||
| 84 | * | 84 | * |
| 85 | * @NUM_IWL_MVM_VENDOR_ATTR: number of vendor attributes | 85 | * @NUM_IWL_MVM_VENDOR_ATTR: number of vendor attributes |
| 86 | * @MAX_IWL_MVM_VENDOR_ATTR: highest vendor attribute number | 86 | * @MAX_IWL_MVM_VENDOR_ATTR: highest vendor attribute number |
| 87 | |||
| 88 | */ | 87 | */ |
| 89 | enum iwl_mvm_vendor_attr { | 88 | enum iwl_mvm_vendor_attr { |
| 90 | __IWL_MVM_VENDOR_ATTR_INVALID = 0x00, | 89 | __IWL_MVM_VENDOR_ATTR_INVALID = 0x00, |
| @@ -67,4 +67,62 @@ struct nsfs_file_handle { · 66 unmodified lines | |||
| 67 | #define NSFS_FILE_HANDLE_SIZE_VER0 16 /* sizeof first published struct */ | 67 | #define NSFS_FILE_HANDLE_SIZE_VER0 16 /* sizeof first published struct */ |
| 68 | #define NSFS_FILE_HANDLE_SIZE_LATEST sizeof(struct nsfs_file_handle) /* sizeof latest published struct */ | 68 | #define NSFS_FILE_HANDLE_SIZE_LATEST sizeof(struct nsfs_file_handle) /* sizeof latest published struct */ |
| 69 | 69 | ||
| 70 | enum init_ns_id { | ||
| 71 | IPC_NS_INIT_ID = 1ULL, | ||
| 72 | UTS_NS_INIT_ID = 2ULL, | ||
| 73 | USER_NS_INIT_ID = 3ULL, | ||
| 74 | PID_NS_INIT_ID = 4ULL, | ||
| 75 | CGROUP_NS_INIT_ID = 5ULL, | ||
| 76 | TIME_NS_INIT_ID = 6ULL, | ||
| 77 | NET_NS_INIT_ID = 7ULL, | ||
| 78 | MNT_NS_INIT_ID = 8ULL, | ||
| 79 | #ifdef __KERNEL__ | ||
| 80 | NS_LAST_INIT_ID = MNT_NS_INIT_ID, | ||
| 81 | #endif | ||
| 82 | }; | ||
| 83 | |||
| 84 | enum ns_type { | ||
| 85 | TIME_NS = (1ULL << 7), /* CLONE_NEWTIME */ | ||
| 86 | MNT_NS = (1ULL << 17), /* CLONE_NEWNS */ | ||
| 87 | CGROUP_NS = (1ULL << 25), /* CLONE_NEWCGROUP */ | ||
| 88 | UTS_NS = (1ULL << 26), /* CLONE_NEWUTS */ | ||
| 89 | IPC_NS = (1ULL << 27), /* CLONE_NEWIPC */ | ||
| 90 | USER_NS = (1ULL << 28), /* CLONE_NEWUSER */ | ||
| 91 | PID_NS = (1ULL << 29), /* CLONE_NEWPID */ | ||
| 92 | NET_NS = (1ULL << 30), /* CLONE_NEWNET */ | ||
| 93 | }; | ||
| 94 | |||
| 95 | /** | ||
| 96 | * struct ns_id_req - namespace ID request structure | ||
| 97 | * @size: size of this structure | ||
| 98 | * @spare: reserved for future use | ||
| 99 | * @filter: filter mask | ||
| 100 | * @ns_id: last namespace id | ||
| 101 | * @user_ns_id: owning user namespace ID | ||
| 102 | * | ||
| 103 | * Structure for passing namespace ID and miscellaneous parameters to | ||
| 104 | * statns(2) and listns(2). | ||
| 105 | * | ||
| 106 | * For statns(2) @param represents the request mask. | ||
| 107 | * For listns(2) @param represents the last listed mount id (or zero). | ||
| 108 | */ | ||
| 109 | struct ns_id_req { | ||
| 110 | __u32 size; | ||
| 111 | __u32 spare; | ||
| 112 | __u64 ns_id; | ||
| 113 | struct /* listns */ { | ||
| 114 | __u32 ns_type; | ||
| 115 | __u32 spare2; | ||
| 116 | __u64 user_ns_id; | ||
| 117 | }; | ||
| 118 | }; | ||
| 119 | |||
| 120 | /* | ||
| 121 | * Special @user_ns_id value that can be passed to listns() | ||
| 122 | */ | ||
| 123 | #define LISTNS_CURRENT_USER 0xffffffffffffffff /* Caller's userns */ | ||
| 124 | |||
| 125 | /* List of all ns_id_req versions. */ | ||
| 126 | #define NS_ID_REQ_SIZE_VER0 32 /* sizeof first published struct */ | ||
| 127 | |||
| 70 | #endif /* __LINUX_NSFS_H */ | 128 | #endif /* __LINUX_NSFS_H */ |
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/ovpn.yaml */ | 3 | /* Documentation/netlink/specs/ovpn.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_OVPN_H | 7 | #ifndef _UAPI_LINUX_OVPN_H |
| 7 | #define _UAPI_LINUX_OVPN_H | 8 | #define _UAPI_LINUX_OVPN_H |
| @@ -503,6 +503,7 @@ · 502 unmodified lines | |||
| 503 | #define PCI_EXP_DEVCAP_PWR_VAL 0x03fc0000 /* Slot Power Limit Value */ | 503 | #define PCI_EXP_DEVCAP_PWR_VAL 0x03fc0000 /* Slot Power Limit Value */ |
| 504 | #define PCI_EXP_DEVCAP_PWR_SCL 0x0c000000 /* Slot Power Limit Scale */ | 504 | #define PCI_EXP_DEVCAP_PWR_SCL 0x0c000000 /* Slot Power Limit Scale */ |
| 505 | #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */ | 505 | #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */ |
| 506 | #define PCI_EXP_DEVCAP_TEE 0x40000000 /* TEE I/O (TDISP) Support */ | ||
| 506 | #define PCI_EXP_DEVCTL 0x08 /* Device Control */ | 507 | #define PCI_EXP_DEVCTL 0x08 /* Device Control */ |
| 507 | #define PCI_EXP_DEVCTL_CERE 0x0001 /* Correctable Error Reporting En. */ | 508 | #define PCI_EXP_DEVCTL_CERE 0x0001 /* Correctable Error Reporting En. */ |
| 508 | #define PCI_EXP_DEVCTL_NFERE 0x0002 /* Non-Fatal Error Reporting Enable */ | 509 | #define PCI_EXP_DEVCTL_NFERE 0x0002 /* Non-Fatal Error Reporting Enable */ |
| @@ -754,6 +755,8 @@ · 245 unmodified lines | |||
| 754 | #define PCI_EXT_CAP_ID_NPEM 0x29 /* Native PCIe Enclosure Management */ | 755 | #define PCI_EXT_CAP_ID_NPEM 0x29 /* Native PCIe Enclosure Management */ |
| 755 | #define PCI_EXT_CAP_ID_PL_32GT 0x2A /* Physical Layer 32.0 GT/s */ | 756 | #define PCI_EXT_CAP_ID_PL_32GT 0x2A /* Physical Layer 32.0 GT/s */ |
| 756 | #define PCI_EXT_CAP_ID_DOE 0x2E /* Data Object Exchange */ | 757 | #define PCI_EXT_CAP_ID_DOE 0x2E /* Data Object Exchange */ |
| 758 | #define PCI_EXT_CAP_ID_DEV3 0x2F /* Device 3 Capability/Control/Status */ | ||
| 759 | #define PCI_EXT_CAP_ID_IDE 0x30 /* Integrity and Data Encryption */ | ||
| 757 | #define PCI_EXT_CAP_ID_PL_64GT 0x31 /* Physical Layer 64.0 GT/s */ | 760 | #define PCI_EXT_CAP_ID_PL_64GT 0x31 /* Physical Layer 64.0 GT/s */ |
| 758 | #define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_64GT | 761 | #define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_64GT |
| 759 | 762 | ||
| @@ -1244,9 +1247,95 @@ · 484 unmodified lines | |||
| 1244 | /* Deprecated old name, replaced with PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE */ | 1247 | /* Deprecated old name, replaced with PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE */ |
| 1245 | #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE | 1248 | #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE |
| 1246 | 1249 | ||
| 1250 | /* Device 3 Extended Capability */ | ||
| 1251 | #define PCI_DEV3_CAP 0x04 /* Device 3 Capabilities Register */ | ||
| 1252 | #define PCI_DEV3_CTL 0x08 /* Device 3 Control Register */ | ||
| 1253 | #define PCI_DEV3_STA 0x0c /* Device 3 Status Register */ | ||
| 1254 | #define PCI_DEV3_STA_SEGMENT 0x8 /* Segment Captured (end-to-end flit-mode detected) */ | ||
| 1255 | |||
| 1247 | /* Compute Express Link (CXL r3.1, sec 8.1.5) */ | 1256 | /* Compute Express Link (CXL r3.1, sec 8.1.5) */ |
| 1248 | #define PCI_DVSEC_CXL_PORT 3 | 1257 | #define PCI_DVSEC_CXL_PORT 3 |
| 1249 | #define PCI_DVSEC_CXL_PORT_CTL 0x0c | 1258 | #define PCI_DVSEC_CXL_PORT_CTL 0x0c |
| 1250 | #define PCI_DVSEC_CXL_PORT_CTL_UNMASK_SBR 0x00000001 | 1259 | #define PCI_DVSEC_CXL_PORT_CTL_UNMASK_SBR 0x00000001 |
| 1251 | 1260 | ||
| 1261 | /* Integrity and Data Encryption Extended Capability */ | ||
| 1262 | #define PCI_IDE_CAP 0x04 | ||
| 1263 | #define PCI_IDE_CAP_LINK 0x1 /* Link IDE Stream Supported */ | ||
| 1264 | #define PCI_IDE_CAP_SELECTIVE 0x2 /* Selective IDE Streams Supported */ | ||
| 1265 | #define PCI_IDE_CAP_FLOWTHROUGH 0x4 /* Flow-Through IDE Stream Supported */ | ||
| 1266 | #define PCI_IDE_CAP_PARTIAL_HEADER_ENC 0x8 /* Partial Header Encryption Supported */ | ||
| 1267 | #define PCI_IDE_CAP_AGGREGATION 0x10 /* Aggregation Supported */ | ||
| 1268 | #define PCI_IDE_CAP_PCRC 0x20 /* PCRC Supported */ | ||
| 1269 | #define PCI_IDE_CAP_IDE_KM 0x40 /* IDE_KM Protocol Supported */ | ||
| 1270 | #define PCI_IDE_CAP_SEL_CFG 0x80 /* Selective IDE for Config Request Support */ | ||
| 1271 | #define PCI_IDE_CAP_ALG __GENMASK(12, 8) /* Supported Algorithms */ | ||
| 1272 | #define PCI_IDE_CAP_ALG_AES_GCM_256 0 /* AES-GCM 256 key size, 96b MAC */ | ||
| 1273 | #define PCI_IDE_CAP_LINK_TC_NUM __GENMASK(15, 13) /* Link IDE TCs */ | ||
| 1274 | #define PCI_IDE_CAP_SEL_NUM __GENMASK(23, 16) /* Supported Selective IDE Streams */ | ||
| 1275 | #define PCI_IDE_CAP_TEE_LIMITED 0x1000000 /* TEE-Limited Stream Supported */ | ||
| 1276 | #define PCI_IDE_CTL 0x08 | ||
| 1277 | #define PCI_IDE_CTL_FLOWTHROUGH_IDE 0x4 /* Flow-Through IDE Stream Enabled */ | ||
| 1278 | |||
| 1279 | #define PCI_IDE_LINK_STREAM_0 0xc /* First Link Stream Register Block */ | ||
| 1280 | #define PCI_IDE_LINK_BLOCK_SIZE 8 | ||
| 1281 | /* Link IDE Stream block, up to PCI_IDE_CAP_LINK_TC_NUM */ | ||
| 1282 | #define PCI_IDE_LINK_CTL_0 0x00 /* First Link Control Register Offset in block */ | ||
| 1283 | #define PCI_IDE_LINK_CTL_EN 0x1 /* Link IDE Stream Enable */ | ||
| 1284 | #define PCI_IDE_LINK_CTL_TX_AGGR_NPR __GENMASK(3, 2) /* Tx Aggregation Mode NPR */ | ||
| 1285 | #define PCI_IDE_LINK_CTL_TX_AGGR_PR __GENMASK(5, 4) /* Tx Aggregation Mode PR */ | ||
| 1286 | #define PCI_IDE_LINK_CTL_TX_AGGR_CPL __GENMASK(7, 6) /* Tx Aggregation Mode CPL */ | ||
| 1287 | #define PCI_IDE_LINK_CTL_PCRC_EN 0x100 /* PCRC Enable */ | ||
| 1288 | #define PCI_IDE_LINK_CTL_PART_ENC __GENMASK(13, 10) /* Partial Header Encryption Mode */ | ||
| 1289 | #define PCI_IDE_LINK_CTL_ALG __GENMASK(18, 14) /* Selection from PCI_IDE_CAP_ALG */ | ||
| 1290 | #define PCI_IDE_LINK_CTL_TC __GENMASK(21, 19) /* Traffic Class */ | ||
| 1291 | #define PCI_IDE_LINK_CTL_ID __GENMASK(31, 24) /* Stream ID */ | ||
| 1292 | #define PCI_IDE_LINK_STS_0 0x4 /* First Link Status Register Offset in block */ | ||
| 1293 | #define PCI_IDE_LINK_STS_STATE __GENMASK(3, 0) /* Link IDE Stream State */ | ||
| 1294 | #define PCI_IDE_LINK_STS_IDE_FAIL 0x80000000 /* IDE fail message received */ | ||
| 1295 | |||
| 1296 | /* Selective IDE Stream block, up to PCI_IDE_CAP_SELECTIVE_STREAMS_NUM */ | ||
| 1297 | /* Selective IDE Stream Capability Register */ | ||
| 1298 | #define PCI_IDE_SEL_CAP 0x00 | ||
| 1299 | #define PCI_IDE_SEL_CAP_ASSOC_NUM __GENMASK(3, 0) | ||
| 1300 | /* Selective IDE Stream Control Register */ | ||
| 1301 | #define PCI_IDE_SEL_CTL 0x04 | ||
| 1302 | #define PCI_IDE_SEL_CTL_EN 0x1 /* Selective IDE Stream Enable */ | ||
| 1303 | #define PCI_IDE_SEL_CTL_TX_AGGR_NPR __GENMASK(3, 2) /* Tx Aggregation Mode NPR */ | ||
| 1304 | #define PCI_IDE_SEL_CTL_TX_AGGR_PR __GENMASK(5, 4) /* Tx Aggregation Mode PR */ | ||
| 1305 | #define PCI_IDE_SEL_CTL_TX_AGGR_CPL __GENMASK(7, 6) /* Tx Aggregation Mode CPL */ | ||
| 1306 | #define PCI_IDE_SEL_CTL_PCRC_EN 0x100 /* PCRC Enable */ | ||
| 1307 | #define PCI_IDE_SEL_CTL_CFG_EN 0x200 /* Selective IDE for Configuration Requests */ | ||
| 1308 | #define PCI_IDE_SEL_CTL_PART_ENC __GENMASK(13, 10) /* Partial Header Encryption Mode */ | ||
| 1309 | #define PCI_IDE_SEL_CTL_ALG __GENMASK(18, 14) /* Selection from PCI_IDE_CAP_ALG */ | ||
| 1310 | #define PCI_IDE_SEL_CTL_TC __GENMASK(21, 19) /* Traffic Class */ | ||
| 1311 | #define PCI_IDE_SEL_CTL_DEFAULT 0x400000 /* Default Stream */ | ||
| 1312 | #define PCI_IDE_SEL_CTL_TEE_LIMITED 0x800000 /* TEE-Limited Stream */ | ||
| 1313 | #define PCI_IDE_SEL_CTL_ID __GENMASK(31, 24) /* Stream ID */ | ||
| 1314 | #define PCI_IDE_SEL_CTL_ID_MAX 255 | ||
| 1315 | /* Selective IDE Stream Status Register */ | ||
| 1316 | #define PCI_IDE_SEL_STS 0x08 | ||
| 1317 | #define PCI_IDE_SEL_STS_STATE __GENMASK(3, 0) /* Selective IDE Stream State */ | ||
| 1318 | #define PCI_IDE_SEL_STS_STATE_INSECURE 0 | ||
| 1319 | #define PCI_IDE_SEL_STS_STATE_SECURE 2 | ||
| 1320 | #define PCI_IDE_SEL_STS_IDE_FAIL 0x80000000 /* IDE fail message received */ | ||
| 1321 | /* IDE RID Association Register 1 */ | ||
| 1322 | #define PCI_IDE_SEL_RID_1 0x0c | ||
| 1323 | #define PCI_IDE_SEL_RID_1_LIMIT __GENMASK(23, 8) | ||
| 1324 | /* IDE RID Association Register 2 */ | ||
| 1325 | #define PCI_IDE_SEL_RID_2 0x10 | ||
| 1326 | #define PCI_IDE_SEL_RID_2_VALID 0x1 | ||
| 1327 | #define PCI_IDE_SEL_RID_2_BASE __GENMASK(23, 8) | ||
| 1328 | #define PCI_IDE_SEL_RID_2_SEG __GENMASK(31, 24) | ||
| 1329 | /* Selective IDE Address Association Register Block, up to PCI_IDE_SEL_CAP_ASSOC_NUM */ | ||
| 1330 | #define PCI_IDE_SEL_ADDR_BLOCK_SIZE 12 | ||
| 1331 | #define PCI_IDE_SEL_ADDR_1(x) (20 + (x) * PCI_IDE_SEL_ADDR_BLOCK_SIZE) | ||
| 1332 | #define PCI_IDE_SEL_ADDR_1_VALID 0x1 | ||
| 1333 | #define PCI_IDE_SEL_ADDR_1_BASE_LOW __GENMASK(19, 8) | ||
| 1334 | #define PCI_IDE_SEL_ADDR_1_LIMIT_LOW __GENMASK(31, 20) | ||
| 1335 | /* IDE Address Association Register 2 is "Memory Limit Upper" */ | ||
| 1336 | #define PCI_IDE_SEL_ADDR_2(x) (24 + (x) * PCI_IDE_SEL_ADDR_BLOCK_SIZE) | ||
| 1337 | /* IDE Address Association Register 3 is "Memory Base Upper" */ | ||
| 1338 | #define PCI_IDE_SEL_ADDR_3(x) (28 + (x) * PCI_IDE_SEL_ADDR_BLOCK_SIZE) | ||
| 1339 | #define PCI_IDE_SEL_BLOCK_SIZE(nr_assoc) (20 + PCI_IDE_SEL_ADDR_BLOCK_SIZE * (nr_assoc)) | ||
| 1340 | |||
| 1252 | #endif /* LINUX_PCI_REGS_H */ | 1341 | #endif /* LINUX_PCI_REGS_H */ |
| @@ -382,6 +382,7 @@ enum perf_event_read_format { · 381 unmodified lines | |||
| 382 | #define PERF_ATTR_SIZE_VER6 120 /* Add: aux_sample_size */ | 382 | #define PERF_ATTR_SIZE_VER6 120 /* Add: aux_sample_size */ |
| 383 | #define PERF_ATTR_SIZE_VER7 128 /* Add: sig_data */ | 383 | #define PERF_ATTR_SIZE_VER7 128 /* Add: sig_data */ |
| 384 | #define PERF_ATTR_SIZE_VER8 136 /* Add: config3 */ | 384 | #define PERF_ATTR_SIZE_VER8 136 /* Add: config3 */ |
| 385 | #define PERF_ATTR_SIZE_VER9 144 /* add: config4 */ | ||
| 385 | 386 | ||
| 386 | /* | 387 | /* |
| 387 | * 'struct perf_event_attr' contains various attributes that define | 388 | * 'struct perf_event_attr' contains various attributes that define |
| @@ -463,7 +464,9 @@ struct perf_event_attr { · 75 unmodified lines | |||
| 463 | inherit_thread : 1, /* children only inherit if cloned with CLONE_THREAD */ | 464 | inherit_thread : 1, /* children only inherit if cloned with CLONE_THREAD */ |
| 464 | remove_on_exec : 1, /* event is removed from task on exec */ | 465 | remove_on_exec : 1, /* event is removed from task on exec */ |
| 465 | sigtrap : 1, /* send synchronous SIGTRAP on event */ | 466 | sigtrap : 1, /* send synchronous SIGTRAP on event */ |
| 466 | __reserved_1 : 26; | 467 | defer_callchain: 1, /* request PERF_RECORD_CALLCHAIN_DEFERRED records */ |
| 468 | defer_output : 1, /* output PERF_RECORD_CALLCHAIN_DEFERRED records */ | ||
| 469 | __reserved_1 : 24; | ||
| 467 | 470 | ||
| 468 | union { | 471 | union { |
| 469 | __u32 wakeup_events; /* wake up every n events */ | 472 | __u32 wakeup_events; /* wake up every n events */ |
| @@ -543,6 +546,7 @@ struct perf_event_attr { · 73 unmodified lines | |||
| 543 | __u64 sig_data; | 546 | __u64 sig_data; |
| 544 | 547 | ||
| 545 | __u64 config3; /* extension of config2 */ | 548 | __u64 config3; /* extension of config2 */ |
| 549 | __u64 config4; /* extension of config3 */ | ||
| 546 | }; | 550 | }; |
| 547 | 551 | ||
| 548 | /* | 552 | /* |
| @@ -1239,6 +1243,22 @@ enum perf_event_type { · 690 unmodified lines | |||
| 1239 | */ | 1243 | */ |
| 1240 | PERF_RECORD_AUX_OUTPUT_HW_ID = 21, | 1244 | PERF_RECORD_AUX_OUTPUT_HW_ID = 21, |
| 1241 | 1245 | ||
| 1246 | /* | ||
| 1247 | * This user callchain capture was deferred until shortly before | ||
| 1248 | * returning to user space. Previous samples would have kernel | ||
| 1249 | * callchains only and they need to be stitched with this to make full | ||
| 1250 | * callchains. | ||
| 1251 | * | ||
| 1252 | * struct { | ||
| 1253 | * struct perf_event_header header; | ||
| 1254 | * u64 cookie; | ||
| 1255 | * u64 nr; | ||
| 1256 | * u64 ips[nr]; | ||
| 1257 | * struct sample_id sample_id; | ||
| 1258 | * }; | ||
| 1259 | */ | ||
| 1260 | PERF_RECORD_CALLCHAIN_DEFERRED = 22, | ||
| 1261 | |||
| 1242 | PERF_RECORD_MAX, /* non-ABI */ | 1262 | PERF_RECORD_MAX, /* non-ABI */ |
| 1243 | }; | 1263 | }; |
| 1244 | 1264 | ||
| @@ -1269,6 +1289,7 @@ enum perf_callchain_context { · 24 unmodified lines | |||
| 1269 | PERF_CONTEXT_HV = (__u64)-32, | 1289 | PERF_CONTEXT_HV = (__u64)-32, |
| 1270 | PERF_CONTEXT_KERNEL = (__u64)-128, | 1290 | PERF_CONTEXT_KERNEL = (__u64)-128, |
| 1271 | PERF_CONTEXT_USER = (__u64)-512, | 1291 | PERF_CONTEXT_USER = (__u64)-512, |
| 1292 | PERF_CONTEXT_USER_DEFERRED = (__u64)-640, | ||
| 1272 | 1293 | ||
| 1273 | PERF_CONTEXT_GUEST = (__u64)-2048, | 1294 | PERF_CONTEXT_GUEST = (__u64)-2048, |
| 1274 | PERF_CONTEXT_GUEST_KERNEL = (__u64)-2176, | 1295 | PERF_CONTEXT_GUEST_KERNEL = (__u64)-2176, |
| @@ -26,8 +26,12 @@ · 25 unmodified lines | |||
| 26 | #define PIDFD_INFO_CGROUPID (1UL << 2) /* Always returned if available, even if not requested */ | 26 | #define PIDFD_INFO_CGROUPID (1UL << 2) /* Always returned if available, even if not requested */ |
| 27 | #define PIDFD_INFO_EXIT (1UL << 3) /* Only returned if requested. */ | 27 | #define PIDFD_INFO_EXIT (1UL << 3) /* Only returned if requested. */ |
| 28 | #define PIDFD_INFO_COREDUMP (1UL << 4) /* Only returned if requested. */ | 28 | #define PIDFD_INFO_COREDUMP (1UL << 4) /* Only returned if requested. */ |
| 29 | #define PIDFD_INFO_SUPPORTED_MASK (1UL << 5) /* Want/got supported mask flags */ | ||
| 30 | #define PIDFD_INFO_COREDUMP_SIGNAL (1UL << 6) /* Always returned if PIDFD_INFO_COREDUMP is requested. */ | ||
| 29 | 31 | ||
| 30 | #define PIDFD_INFO_SIZE_VER0 64 /* sizeof first published struct */ | 32 | #define PIDFD_INFO_SIZE_VER0 64 /* sizeof first published struct */ |
| 33 | #define PIDFD_INFO_SIZE_VER1 72 /* sizeof second published struct */ | ||
| 34 | #define PIDFD_INFO_SIZE_VER2 80 /* sizeof third published struct */ | ||
| 31 | 35 | ||
| 32 | /* | 36 | /* |
| 33 | * Values for @coredump_mask in pidfd_info. | 37 | * Values for @coredump_mask in pidfd_info. |
| @@ -91,8 +95,11 @@ struct pidfd_info { · 57 unmodified lines | |||
| 91 | __u32 fsuid; | 95 | __u32 fsuid; |
| 92 | __u32 fsgid; | 96 | __u32 fsgid; |
| 93 | __s32 exit_code; | 97 | __s32 exit_code; |
| 94 | __u32 coredump_mask; | 98 | struct /* coredump info */ { |
| 95 | __u32 __spare1; | 99 | __u32 coredump_mask; |
| 100 | __u32 coredump_signal; | ||
| 101 | }; | ||
| 102 | __u64 supported_mask; /* Mask flags that this kernel supports */ | ||
| 96 | }; | 103 | }; |
| 97 | 104 | ||
| 98 | #define PIDFS_IOCTL_MAGIC 0xFF | 105 | #define PIDFS_IOCTL_MAGIC 0xFF |
| @@ -56,6 +56,18 @@ struct pr_clear { · 55 unmodified lines | |||
| 56 | __u32 __pad; | 56 | __u32 __pad; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | struct pr_read_keys { | ||
| 60 | __u32 generation; | ||
| 61 | __u32 num_keys; | ||
| 62 | __u64 keys_ptr; | ||
| 63 | }; | ||
| 64 | |||
| 65 | struct pr_read_reservation { | ||
| 66 | __u64 key; | ||
| 67 | __u32 generation; | ||
| 68 | __u32 type; | ||
| 69 | }; | ||
| 70 | |||
| 59 | #define PR_FL_IGNORE_KEY (1 << 0) /* ignore existing key */ | 71 | #define PR_FL_IGNORE_KEY (1 << 0) /* ignore existing key */ |
| 60 | 72 | ||
| 61 | #define IOC_PR_REGISTER _IOW('p', 200, struct pr_registration) | 73 | #define IOC_PR_REGISTER _IOW('p', 200, struct pr_registration) |
| @@ -64,5 +76,7 @@ struct pr_clear { · 2 unmodified lines | |||
| 64 | #define IOC_PR_PREEMPT _IOW('p', 203, struct pr_preempt) | 76 | #define IOC_PR_PREEMPT _IOW('p', 203, struct pr_preempt) |
| 65 | #define IOC_PR_PREEMPT_ABORT _IOW('p', 204, struct pr_preempt) | 77 | #define IOC_PR_PREEMPT_ABORT _IOW('p', 204, struct pr_preempt) |
| 66 | #define IOC_PR_CLEAR _IOW('p', 205, struct pr_clear) | 78 | #define IOC_PR_CLEAR _IOW('p', 205, struct pr_clear) |
| 79 | #define IOC_PR_READ_KEYS _IOWR('p', 206, struct pr_read_keys) | ||
| 80 | #define IOC_PR_READ_RESERVATION _IOR('p', 207, struct pr_read_reservation) | ||
| 67 | 81 | ||
| 68 | #endif /* _UAPI_PR_H */ | 82 | #endif /* _UAPI_PR_H */ |
| @@ -47,32 +47,32 @@ typedef enum { · 46 unmodified lines | |||
| 47 | * with possible values from the specification. | 47 | * with possible values from the specification. |
| 48 | */ | 48 | */ |
| 49 | SEV_RET_NO_FW_CALL = -1, | 49 | SEV_RET_NO_FW_CALL = -1, |
| 50 | SEV_RET_SUCCESS = 0, | 50 | SEV_RET_SUCCESS = 0, |
| 51 | SEV_RET_INVALID_PLATFORM_STATE, | 51 | SEV_RET_INVALID_PLATFORM_STATE = 0x0001, |
| 52 | SEV_RET_INVALID_GUEST_STATE, | 52 | SEV_RET_INVALID_GUEST_STATE = 0x0002, |
| 53 | SEV_RET_INAVLID_CONFIG, | 53 | SEV_RET_INAVLID_CONFIG = 0x0003, |
| 54 | SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG, | 54 | SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG, |
| 55 | SEV_RET_INVALID_LEN, | 55 | SEV_RET_INVALID_LEN = 0x0004, |
| 56 | SEV_RET_ALREADY_OWNED, | 56 | SEV_RET_ALREADY_OWNED = 0x0005, |
| 57 | SEV_RET_INVALID_CERTIFICATE, | 57 | SEV_RET_INVALID_CERTIFICATE = 0x0006, |
| 58 | SEV_RET_POLICY_FAILURE, | 58 | SEV_RET_POLICY_FAILURE = 0x0007, |
| 59 | SEV_RET_INACTIVE, | 59 | SEV_RET_INACTIVE = 0x0008, |
| 60 | SEV_RET_INVALID_ADDRESS, | 60 | SEV_RET_INVALID_ADDRESS = 0x0009, |
| 61 | SEV_RET_BAD_SIGNATURE, | 61 | SEV_RET_BAD_SIGNATURE = 0x000A, |
| 62 | SEV_RET_BAD_MEASUREMENT, | 62 | SEV_RET_BAD_MEASUREMENT = 0x000B, |
| 63 | SEV_RET_ASID_OWNED, | 63 | SEV_RET_ASID_OWNED = 0x000C, |
| 64 | SEV_RET_INVALID_ASID, | 64 | SEV_RET_INVALID_ASID = 0x000D, |
| 65 | SEV_RET_WBINVD_REQUIRED, | 65 | SEV_RET_WBINVD_REQUIRED = 0x000E, |
| 66 | SEV_RET_DFFLUSH_REQUIRED, | 66 | SEV_RET_DFFLUSH_REQUIRED = 0x000F, |
| 67 | SEV_RET_INVALID_GUEST, | 67 | SEV_RET_INVALID_GUEST = 0x0010, |
| 68 | SEV_RET_INVALID_COMMAND, | 68 | SEV_RET_INVALID_COMMAND = 0x0011, |
| 69 | SEV_RET_ACTIVE, | 69 | SEV_RET_ACTIVE = 0x0012, |
| 70 | SEV_RET_HWSEV_RET_PLATFORM, | 70 | SEV_RET_HWSEV_RET_PLATFORM = 0x0013, |
| 71 | SEV_RET_HWSEV_RET_UNSAFE, | 71 | SEV_RET_HWSEV_RET_UNSAFE = 0x0014, |
| 72 | SEV_RET_UNSUPPORTED, | 72 | SEV_RET_UNSUPPORTED = 0x0015, |
| 73 | SEV_RET_INVALID_PARAM, | 73 | SEV_RET_INVALID_PARAM = 0x0016, |
| 74 | SEV_RET_RESOURCE_LIMIT, | 74 | SEV_RET_RESOURCE_LIMIT = 0x0017, |
| 75 | SEV_RET_SECURE_DATA_INVALID, | 75 | SEV_RET_SECURE_DATA_INVALID = 0x0018, |
| 76 | SEV_RET_INVALID_PAGE_SIZE = 0x0019, | 76 | SEV_RET_INVALID_PAGE_SIZE = 0x0019, |
| 77 | SEV_RET_INVALID_PAGE_STATE = 0x001A, | 77 | SEV_RET_INVALID_PAGE_STATE = 0x001A, |
| 78 | SEV_RET_INVALID_MDATA_ENTRY = 0x001B, | 78 | SEV_RET_INVALID_MDATA_ENTRY = 0x001B, |
| @@ -87,6 +87,22 @@ typedef enum { · 8 unmodified lines | |||
| 87 | SEV_RET_RESTORE_REQUIRED = 0x0025, | 87 | SEV_RET_RESTORE_REQUIRED = 0x0025, |
| 88 | SEV_RET_RMP_INITIALIZATION_FAILED = 0x0026, | 88 | SEV_RET_RMP_INITIALIZATION_FAILED = 0x0026, |
| 89 | SEV_RET_INVALID_KEY = 0x0027, | 89 | SEV_RET_INVALID_KEY = 0x0027, |
| 90 | SEV_RET_SHUTDOWN_INCOMPLETE = 0x0028, | ||
| 91 | SEV_RET_INCORRECT_BUFFER_LENGTH = 0x0030, | ||
| 92 | SEV_RET_EXPAND_BUFFER_LENGTH_REQUEST = 0x0031, | ||
| 93 | SEV_RET_SPDM_REQUEST = 0x0032, | ||
| 94 | SEV_RET_SPDM_ERROR = 0x0033, | ||
| 95 | SEV_RET_SEV_STATUS_ERR_IN_DEV_CONN = 0x0035, | ||
| 96 | SEV_RET_SEV_STATUS_INVALID_DEV_CTX = 0x0036, | ||
| 97 | SEV_RET_SEV_STATUS_INVALID_TDI_CTX = 0x0037, | ||
| 98 | SEV_RET_SEV_STATUS_INVALID_TDI = 0x0038, | ||
| 99 | SEV_RET_SEV_STATUS_RECLAIM_REQUIRED = 0x0039, | ||
| 100 | SEV_RET_IN_USE = 0x003A, | ||
| 101 | SEV_RET_SEV_STATUS_INVALID_DEV_STATE = 0x003B, | ||
| 102 | SEV_RET_SEV_STATUS_INVALID_TDI_STATE = 0x003C, | ||
| 103 | SEV_RET_SEV_STATUS_DEV_CERT_CHANGED = 0x003D, | ||
| 104 | SEV_RET_SEV_STATUS_RESYNC_REQ = 0x003E, | ||
| 105 | SEV_RET_SEV_STATUS_RESPONSE_TOO_LARGE = 0x003F, | ||
| 90 | SEV_RET_MAX, | 106 | SEV_RET_MAX, |
| 91 | } sev_ret_code; | 107 | } sev_ret_code; |
| 92 | 108 | ||
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | /* Do not edit directly, auto-generated from: */ | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | /* Documentation/netlink/specs/psp.yaml */ | 3 | /* Documentation/netlink/specs/psp.yaml */ |
| 4 | /* YNL-GEN uapi header */ | 4 | /* YNL-GEN uapi header */ |
| 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ | ||
| 5 | 6 | ||
| 6 | #ifndef _UAPI_LINUX_PSP_H | 7 | #ifndef _UAPI_LINUX_PSP_H |
| 7 | #define _UAPI_LINUX_PSP_H | 8 | #define _UAPI_LINUX_PSP_H |
| @@ -45,6 +46,23 @@ enum { · 37 unmodified lines | |||
| 45 | PSP_A_KEYS_MAX = (__PSP_A_KEYS_MAX - 1) | 46 | PSP_A_KEYS_MAX = (__PSP_A_KEYS_MAX - 1) |
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 49 | enum { | ||
| 50 | PSP_A_STATS_DEV_ID = 1, | ||
| 51 | PSP_A_STATS_KEY_ROTATIONS, | ||
| 52 | PSP_A_STATS_STALE_EVENTS, | ||
| 53 | PSP_A_STATS_RX_PACKETS, | ||
| 54 | PSP_A_STATS_RX_BYTES, | ||
| 55 | PSP_A_STATS_RX_AUTH_FAIL, | ||
| 56 | PSP_A_STATS_RX_ERROR, | ||
| 57 | PSP_A_STATS_RX_BAD, | ||
| 58 | PSP_A_STATS_TX_PACKETS, | ||
| 59 | PSP_A_STATS_TX_BYTES, | ||
| 60 | PSP_A_STATS_TX_ERROR, | ||
| 61 | |||
| 62 | __PSP_A_STATS_MAX, | ||
| 63 | PSP_A_STATS_MAX = (__PSP_A_STATS_MAX - 1) | ||
| 64 | }; | ||
| 65 | |||
| 48 | enum { | 66 | enum { |
| 49 | PSP_CMD_DEV_GET = 1, | 67 | PSP_CMD_DEV_GET = 1, |
| 50 | PSP_CMD_DEV_ADD_NTF, | 68 | PSP_CMD_DEV_ADD_NTF, |
| @@ -55,6 +73,7 @@ enum { · 4 unmodified lines | |||
| 55 | PSP_CMD_KEY_ROTATE_NTF, | 73 | PSP_CMD_KEY_ROTATE_NTF, |
| 56 | PSP_CMD_RX_ASSOC, | 74 | PSP_CMD_RX_ASSOC, |
| 57 | PSP_CMD_TX_ASSOC, | 75 | PSP_CMD_TX_ASSOC, |
| 76 | PSP_CMD_GET_STATS, | ||
| 58 | 77 | ||
| 59 | __PSP_CMD_MAX, | 78 | __PSP_CMD_MAX, |
| 60 | PSP_CMD_MAX = (__PSP_CMD_MAX - 1) | 79 | PSP_CMD_MAX = (__PSP_CMD_MAX - 1) |
| @@ -291,7 +291,8 @@ struct mdp_superblock_1 { · 290 unmodified lines | |||
| 291 | __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ | 291 | __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ |
| 292 | __le32 sb_csum; /* checksum up to devs[max_dev] */ | 292 | __le32 sb_csum; /* checksum up to devs[max_dev] */ |
| 293 | __le32 max_dev; /* size of devs[] array to consider */ | 293 | __le32 max_dev; /* size of devs[] array to consider */ |
| 294 | __u8 pad3[64-32]; /* set to 0 when writing */ | 294 | __le32 logical_block_size; /* same as q->limits->logical_block_size */ |
| 295 | __u8 pad3[64-36]; /* set to 0 when writing */ | ||
| 295 | 296 | ||
| 296 | /* device state information. Indexed by dev_number. | 297 | /* device state information. Indexed by dev_number. |
| 297 | * 2 bytes per device | 298 | * 2 bytes per device |
| @@ -7,8 +7,13 @@ · 6 unmodified lines | |||
| 7 | #ifndef _UAPI_RKISP1_CONFIG_H | 7 | #ifndef _UAPI_RKISP1_CONFIG_H |
| 8 | #define _UAPI_RKISP1_CONFIG_H | 8 | #define _UAPI_RKISP1_CONFIG_H |
| 9 | 9 | ||
| 10 | #ifdef __KERNEL__ | ||
| 11 | #include <linux/build_bug.h> | ||
| 12 | #endif /* __KERNEL__ */ | ||
| 10 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 11 | 14 | ||
| 15 | #include <linux/media/v4l2-isp.h> | ||
| 16 | |||
| 12 | /* Defect Pixel Cluster Detection */ | 17 | /* Defect Pixel Cluster Detection */ |
| 13 | #define RKISP1_CIF_ISP_MODULE_DPCC (1U << 0) | 18 | #define RKISP1_CIF_ISP_MODULE_DPCC (1U << 0) |
| 14 | /* Black Level Subtraction */ | 19 | /* Black Level Subtraction */ |
| @@ -1158,79 +1163,26 @@ enum rkisp1_ext_params_block_type { · 1143 unmodified lines | |||
| 1158 | RKISP1_EXT_PARAMS_BLOCK_TYPE_WDR, | 1163 | RKISP1_EXT_PARAMS_BLOCK_TYPE_WDR, |
| 1159 | }; | 1164 | }; |
| 1160 | 1165 | ||
| 1161 | #define RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE (1U << 0) | 1166 | /* For backward compatibility */ |
| 1162 | #define RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE (1U << 1) | 1167 | #define RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE V4L2_ISP_PARAMS_FL_BLOCK_DISABLE |
| 1168 | #define RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE V4L2_ISP_PARAMS_FL_BLOCK_ENABLE | ||
| 1163 | 1169 | ||
| 1164 | /* A bitmask of parameters blocks supported on the current hardware. */ | 1170 | /* A bitmask of parameters blocks supported on the current hardware. */ |
| 1165 | #define RKISP1_CID_SUPPORTED_PARAMS_BLOCKS (V4L2_CID_USER_RKISP1_BASE + 0x01) | 1171 | #define RKISP1_CID_SUPPORTED_PARAMS_BLOCKS (V4L2_CID_USER_RKISP1_BASE + 0x01) |
| 1166 | 1172 | ||
| 1167 | /** | 1173 | /** |
| 1168 | * struct rkisp1_ext_params_block_header - RkISP1 extensible parameters block | 1174 | * rkisp1_ext_params_block_header - RkISP1 extensible parameters block header |
| 1169 | * header | ||
| 1170 | * | 1175 | * |
| 1171 | * This structure represents the common part of all the ISP configuration | 1176 | * This structure represents the common part of all the ISP configuration |
| 1172 | * blocks. Each parameters block shall embed an instance of this structure type | 1177 | * blocks and is identical to :c:type:`v4l2_isp_params_block_header`. |
| 1173 | * as its first member, followed by the block-specific configuration data. The | ||
| 1174 | * driver inspects this common header to discern the block type and its size and | ||
| 1175 | * properly handle the block content by casting it to the correct block-specific | ||
| 1176 | * type. | ||
| 1177 | * | 1178 | * |
| 1178 | * The @type field is one of the values enumerated by | 1179 | * The type field is one of the values enumerated by |
| 1179 | * :c:type:`rkisp1_ext_params_block_type` and specifies how the data should be | 1180 | * :c:type:`rkisp1_ext_params_block_type` and specifies how the data should be |
| 1180 | * interpreted by the driver. The @size field specifies the size of the | 1181 | * interpreted by the driver. |
| 1181 | * parameters block and is used by the driver for validation purposes. | ||
| 1182 | * | ||
| 1183 | * The @flags field is a bitmask of per-block flags RKISP1_EXT_PARAMS_FL_*. | ||
| 1184 | * | ||
| 1185 | * When userspace wants to configure and enable an ISP block it shall fully | ||
| 1186 | * populate the block configuration and set the | ||
| 1187 | * RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE bit in the @flags field. | ||
| 1188 | * | ||
| 1189 | * When userspace simply wants to disable an ISP block the | ||
| 1190 | * RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE bit should be set in @flags field. The | ||
| 1191 | * driver ignores the rest of the block configuration structure in this case. | ||
| 1192 | * | ||
| 1193 | * If a new configuration of an ISP block has to be applied userspace shall | ||
| 1194 | * fully populate the ISP block configuration and omit setting the | ||
| 1195 | * RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE and RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE bits | ||
| 1196 | * in the @flags field. | ||
| 1197 | * | ||
| 1198 | * Setting both the RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE and | ||
| 1199 | * RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE bits in the @flags field is not allowed | ||
| 1200 | * and not accepted by the driver. | ||
| 1201 | * | ||
| 1202 | * Userspace is responsible for correctly populating the parameters block header | ||
| 1203 | * fields (@type, @flags and @size) and the block-specific parameters. | ||
| 1204 | * | ||
| 1205 | * For example: | ||
| 1206 | * | 1182 | * |
| 1207 | * .. code-block:: c | 1183 | * The flags field is a bitmask of per-block flags RKISP1_EXT_PARAMS_FL_*. |
| 1208 | * | ||
| 1209 | * void populate_bls(struct rkisp1_ext_params_block_header *block) { | ||
| 1210 | * struct rkisp1_ext_params_bls_config *bls = | ||
| 1211 | * (struct rkisp1_ext_params_bls_config *)block; | ||
| 1212 | * | ||
| 1213 | * bls->header.type = RKISP1_EXT_PARAMS_BLOCK_ID_BLS; | ||
| 1214 | * bls->header.flags = RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE; | ||
| 1215 | * bls->header.size = sizeof(*bls); | ||
| 1216 | * | ||
| 1217 | * bls->config.enable_auto = 0; | ||
| 1218 | * bls->config.fixed_val.r = blackLevelRed_; | ||
| 1219 | * bls->config.fixed_val.gr = blackLevelGreenR_; | ||
| 1220 | * bls->config.fixed_val.gb = blackLevelGreenB_; | ||
| 1221 | * bls->config.fixed_val.b = blackLevelBlue_; | ||
| 1222 | * } | ||
| 1223 | * | ||
| 1224 | * @type: The parameters block type, see | ||
| 1225 | * :c:type:`rkisp1_ext_params_block_type` | ||
| 1226 | * @flags: A bitmask of block flags | ||
| 1227 | * @size: Size (in bytes) of the parameters block, including this header | ||
| 1228 | */ | 1184 | */ |
| 1229 | struct rkisp1_ext_params_block_header { | 1185 | #define rkisp1_ext_params_block_header v4l2_isp_params_block_header |
| 1230 | __u16 type; | ||
| 1231 | __u16 flags; | ||
| 1232 | __u32 size; | ||
| 1233 | }; | ||
| 1234 | 1186 | ||
| 1235 | /** | 1187 | /** |
| 1236 | * struct rkisp1_ext_params_bls_config - RkISP1 extensible params BLS config | 1188 | * struct rkisp1_ext_params_bls_config - RkISP1 extensible params BLS config |
| @@ -1588,27 +1540,14 @@ struct rkisp1_ext_params_wdr_config { · 351 unmodified lines | |||
| 1588 | * @RKISP1_EXT_PARAM_BUFFER_V1: First version of RkISP1 extensible parameters | 1540 | * @RKISP1_EXT_PARAM_BUFFER_V1: First version of RkISP1 extensible parameters |
| 1589 | */ | 1541 | */ |
| 1590 | enum rksip1_ext_param_buffer_version { | 1542 | enum rksip1_ext_param_buffer_version { |
| 1591 | RKISP1_EXT_PARAM_BUFFER_V1 = 1, | 1543 | RKISP1_EXT_PARAM_BUFFER_V1 = V4L2_ISP_PARAMS_VERSION_V1, |
| 1592 | }; | 1544 | }; |
| 1593 | 1545 | ||
| 1594 | /** | 1546 | /** |
| 1595 | * struct rkisp1_ext_params_cfg - RkISP1 extensible parameters configuration | 1547 | * struct rkisp1_ext_params_cfg - RkISP1 extensible parameters configuration |
| 1596 | * | 1548 | * |
| 1597 | * This struct contains the configuration parameters of the RkISP1 ISP | 1549 | * This is the driver-specific implementation of |
| 1598 | * algorithms, serialized by userspace into a data buffer. Each configuration | 1550 | * :c:type:`v4l2_isp_params_buffer`. |
| 1599 | * parameter block is represented by a block-specific structure which contains a | ||
| 1600 | * :c:type:`rkisp1_ext_params_block_header` entry as first member. Userspace | ||
| 1601 | * populates the @data buffer with configuration parameters for the blocks that | ||
| 1602 | * it intends to configure. As a consequence, the data buffer effective size | ||
| 1603 | * changes according to the number of ISP blocks that userspace intends to | ||
| 1604 | * configure and is set by userspace in the @data_size field. | ||
| 1605 | * | ||
| 1606 | * The parameters buffer is versioned by the @version field to allow modifying | ||
| 1607 | * and extending its definition. Userspace shall populate the @version field to | ||
| 1608 | * inform the driver about the version it intends to use. The driver will parse | ||
| 1609 | * and handle the @data buffer according to the data layout specific to the | ||
| 1610 | * indicated version and return an error if the desired version is not | ||
| 1611 | * supported. | ||
| 1612 | * | 1551 | * |
| 1613 | * Currently the single RKISP1_EXT_PARAM_BUFFER_V1 version is supported. | 1552 | * Currently the single RKISP1_EXT_PARAM_BUFFER_V1 version is supported. |
| 1614 | * When a new format version will be added, a mechanism for userspace to query | 1553 | * When a new format version will be added, a mechanism for userspace to query |
| @@ -1624,11 +1563,6 @@ enum rksip1_ext_param_buffer_version { · 9 unmodified lines | |||
| 1624 | * the maximum value represents the blocks supported by the kernel driver, | 1563 | * the maximum value represents the blocks supported by the kernel driver, |
| 1625 | * independently of the device instance. | 1564 | * independently of the device instance. |
| 1626 | * | 1565 | * |
| 1627 | * For each ISP block that userspace wants to configure, a block-specific | ||
| 1628 | * structure is appended to the @data buffer, one after the other without gaps | ||
| 1629 | * in between nor overlaps. Userspace shall populate the @data_size field with | ||
| 1630 | * the effective size, in bytes, of the @data buffer. | ||
| 1631 | * | ||
| 1632 | * The expected memory layout of the parameters buffer is:: | 1566 | * The expected memory layout of the parameters buffer is:: |
| 1633 | * | 1567 | * |
| 1634 | * +-------------------- struct rkisp1_ext_params_cfg -------------------+ | 1568 | * +-------------------- struct rkisp1_ext_params_cfg -------------------+ |
| @@ -1678,4 +1612,11 @@ struct rkisp1_ext_params_cfg { · 43 unmodified lines | |||
| 1678 | __u8 data[RKISP1_EXT_PARAMS_MAX_SIZE]; | 1612 | __u8 data[RKISP1_EXT_PARAMS_MAX_SIZE]; |
| 1679 | }; | 1613 | }; |
| 1680 | 1614 | ||
| 1615 | #ifdef __KERNEL__ | ||
| 1616 | /* Make sure the header is type-convertible to the generic v4l2 params one */ | ||
| 1617 | static_assert((sizeof(struct rkisp1_ext_params_cfg) - | ||
| 1618 | RKISP1_EXT_PARAMS_MAX_SIZE) == | ||
| 1619 | sizeof(struct v4l2_isp_params_buffer)); | ||
| 1620 | #endif /* __KERNEL__ */ | ||
| 1621 | |||
| 1681 | #endif /* _UAPI_RKISP1_CONFIG_H */ | 1622 | #endif /* _UAPI_RKISP1_CONFIG_H */ |
| @@ -114,20 +114,13 @@ struct rseq { · 113 unmodified lines | |||
| 114 | /* | 114 | /* |
| 115 | * Restartable sequences flags field. | 115 | * Restartable sequences flags field. |
| 116 | * | 116 | * |
| 117 | * This field should only be updated by the thread which | 117 | * This field was initially intended to allow event masking for |
| 118 | * registered this data structure. Read by the kernel. | 118 | * single-stepping through rseq critical sections with debuggers. |
| 119 | * Mainly used for single-stepping through rseq critical sections | 119 | * The kernel does not support this anymore and the relevant bits |
| 120 | * with debuggers. | 120 | * are checked for being always false: |
| 121 | * | 121 | * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT |
| 122 | * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT | 122 | * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL |
| 123 | * Inhibit instruction sequence block restart on preemption | 123 | * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE |
| 124 | * for this thread. | ||
| 125 | * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL | ||
| 126 | * Inhibit instruction sequence block restart on signal | ||
| 127 | * delivery for this thread. | ||
| 128 | * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE | ||
| 129 | * Inhibit instruction sequence block restart on migration for | ||
| 130 | * this thread. | ||
| 131 | */ | 124 | */ |
| 132 | __u32 flags; | 125 | __u32 flags; |
| 133 | 126 | ||
| @@ -249,8 +249,9 @@ struct tee_ioctl_param { · 248 unmodified lines | |||
| 249 | * @cancel_id: [in] Cancellation id, a unique value to identify this request | 249 | * @cancel_id: [in] Cancellation id, a unique value to identify this request |
| 250 | * @session: [out] Session id | 250 | * @session: [out] Session id |
| 251 | * @ret: [out] return value | 251 | * @ret: [out] return value |
| 252 | * @ret_origin [out] origin of the return value | 252 | * @ret_origin: [out] origin of the return value |
| 253 | * @num_params [in] number of parameters following this struct | 253 | * @num_params: [in] number of &struct tee_ioctl_param entries in @params |
| 254 | * @params: array of ioctl parameters | ||
| 254 | */ | 255 | */ |
| 255 | struct tee_ioctl_open_session_arg { | 256 | struct tee_ioctl_open_session_arg { |
| 256 | __u8 uuid[TEE_IOCTL_UUID_LEN]; | 257 | __u8 uuid[TEE_IOCTL_UUID_LEN]; |
| @@ -276,14 +277,14 @@ struct tee_ioctl_open_session_arg { · 19 unmodified lines | |||
| 276 | struct tee_ioctl_buf_data) | 277 | struct tee_ioctl_buf_data) |
| 277 | 278 | ||
| 278 | /** | 279 | /** |
| 279 | * struct tee_ioctl_invoke_func_arg - Invokes a function in a Trusted | 280 | * struct tee_ioctl_invoke_arg - Invokes a function in a Trusted Application |
| 280 | * Application | ||
| 281 | * @func: [in] Trusted Application function, specific to the TA | 281 | * @func: [in] Trusted Application function, specific to the TA |
| 282 | * @session: [in] Session id | 282 | * @session: [in] Session id |
| 283 | * @cancel_id: [in] Cancellation id, a unique value to identify this request | 283 | * @cancel_id: [in] Cancellation id, a unique value to identify this request |
| 284 | * @ret: [out] return value | 284 | * @ret: [out] return value |
| 285 | * @ret_origin [out] origin of the return value | 285 | * @ret_origin: [out] origin of the return value |
| 286 | * @num_params [in] number of parameters following this struct | 286 | * @num_params: [in] number of parameters following this struct |
| 287 | * @params: array of ioctl parameters | ||
| 287 | */ | 288 | */ |
| 288 | struct tee_ioctl_invoke_arg { | 289 | struct tee_ioctl_invoke_arg { |
| 289 | __u32 func; | 290 | __u32 func; |
| @@ -338,7 +339,8 @@ struct tee_ioctl_close_session_arg { · 48 unmodified lines | |||
| 338 | /** | 339 | /** |
| 339 | * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function | 340 | * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function |
| 340 | * @func: [in] supplicant function | 341 | * @func: [in] supplicant function |
| 341 | * @num_params [in/out] number of parameters following this struct | 342 | * @num_params: [in/out] number of &struct tee_ioctl_param entries in @params |
| 343 | * @params: array of ioctl parameters | ||
| 342 | * | 344 | * |
| 343 | * @num_params is the number of params that tee-supplicant has room to | 345 | * @num_params is the number of params that tee-supplicant has room to |
| 344 | * receive when input, @num_params is the number of actual params | 346 | * receive when input, @num_params is the number of actual params |
| @@ -363,7 +365,8 @@ struct tee_iocl_supp_recv_arg { · 18 unmodified lines | |||
| 363 | /** | 365 | /** |
| 364 | * struct tee_iocl_supp_send_arg - Send a response to a received request | 366 | * struct tee_iocl_supp_send_arg - Send a response to a received request |
| 365 | * @ret: [out] return value | 367 | * @ret: [out] return value |
| 366 | * @num_params [in] number of parameters following this struct | 368 | * @num_params: [in] number of &struct tee_ioctl_param entries in @params |
| 369 | * @params: array of ioctl parameters | ||
| 367 | */ | 370 | */ |
| 368 | struct tee_iocl_supp_send_arg { | 371 | struct tee_iocl_supp_send_arg { |
| 369 | __u32 ret; | 372 | __u32 ret; |
| @@ -454,11 +457,13 @@ struct tee_ioctl_shm_register_fd_data { · 84 unmodified lines | |||
| 454 | */ | 457 | */ |
| 455 | 458 | ||
| 456 | /** | 459 | /** |
| 457 | * struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application | 460 | * struct tee_ioctl_object_invoke_arg - Invokes an object in a |
| 461 | * Trusted Application | ||
| 458 | * @id: [in] Object id | 462 | * @id: [in] Object id |
| 459 | * @op: [in] Object operation, specific to the object | 463 | * @op: [in] Object operation, specific to the object |
| 460 | * @ret: [out] return value | 464 | * @ret: [out] return value |
| 461 | * @num_params: [in] number of parameters following this struct | 465 | * @num_params: [in] number of parameters following this struct |
| 466 | * @params: array of ioctl parameters | ||
| 462 | */ | 467 | */ |
| 463 | struct tee_ioctl_object_invoke_arg { | 468 | struct tee_ioctl_object_invoke_arg { |
| 464 | __u64 id; | 469 | __u64 id; |
| @@ -41,6 +41,7 @@ · 40 unmodified lines | |||
| 41 | #define TLS_RX 2 /* Set receive parameters */ | 41 | #define TLS_RX 2 /* Set receive parameters */ |
| 42 | #define TLS_TX_ZEROCOPY_RO 3 /* TX zerocopy (only sendfile now) */ | 42 | #define TLS_TX_ZEROCOPY_RO 3 /* TX zerocopy (only sendfile now) */ |
| 43 | #define TLS_RX_EXPECT_NO_PAD 4 /* Attempt opportunistic zero-copy */ | 43 | #define TLS_RX_EXPECT_NO_PAD 4 /* Attempt opportunistic zero-copy */ |
| 44 | #define TLS_TX_MAX_PAYLOAD_LEN 5 /* Maximum plaintext size */ | ||
| 44 | 45 | ||
| 45 | /* Supported versions */ | 46 | /* Supported versions */ |
| 46 | #define TLS_VERSION_MINOR(ver) ((ver) & 0xFF) | 47 | #define TLS_VERSION_MINOR(ver) ((ver) & 0xFF) |
| @@ -194,6 +195,7 @@ enum { · 147 unmodified lines | |||
| 194 | TLS_INFO_RXCONF, | 195 | TLS_INFO_RXCONF, |
| 195 | TLS_INFO_ZC_RO_TX, | 196 | TLS_INFO_ZC_RO_TX, |
| 196 | TLS_INFO_RX_NO_PAD, | 197 | TLS_INFO_RX_NO_PAD, |
| 198 | TLS_INFO_TX_MAX_PAYLOAD_LEN, | ||
| 197 | __TLS_INFO_MAX, | 199 | __TLS_INFO_MAX, |
| 198 | }; | 200 | }; |
| 199 | #define TLS_INFO_MAX (__TLS_INFO_MAX - 1) | 201 | #define TLS_INFO_MAX (__TLS_INFO_MAX - 1) |
| @@ -104,8 +104,10 @@ struct usb_cdc_union_desc { · 103 unmodified lines | |||
| 104 | __u8 bDescriptorSubType; | 104 | __u8 bDescriptorSubType; |
| 105 | 105 | ||
| 106 | __u8 bMasterInterface0; | 106 | __u8 bMasterInterface0; |
| 107 | __u8 bSlaveInterface0; | 107 | union { |
| 108 | /* ... and there could be other slave interfaces */ | 108 | __u8 bSlaveInterface0; |
| 109 | __DECLARE_FLEX_ARRAY(__u8, bSlaveInterfaces); | ||
| 110 | }; | ||
| 109 | } __attribute__ ((packed)); | 111 | } __attribute__ ((packed)); |
| 110 | 112 | ||
| 111 | /* "Country Selection Functional Descriptor" from CDC spec 5.2.3.9 */ | 113 | /* "Country Selection Functional Descriptor" from CDC spec 5.2.3.9 */ |
| @@ -115,8 +117,10 @@ struct usb_cdc_country_functional_desc { · 3 unmodified lines | |||
| 115 | __u8 bDescriptorSubType; | 117 | __u8 bDescriptorSubType; |
| 116 | 118 | ||
| 117 | __u8 iCountryCodeRelDate; | 119 | __u8 iCountryCodeRelDate; |
| 118 | __le16 wCountyCode0; | 120 | union { |
| 119 | /* ... and there can be a lot of country codes */ | 121 | __le16 wCountryCode0; |
| 122 | __DECLARE_FLEX_ARRAY(__le16, wCountryCodes); | ||
| 123 | }; | ||
| 120 | } __attribute__ ((packed)); | 124 | } __attribute__ ((packed)); |
| 121 | 125 | ||
| 122 | /* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */ | 126 | /* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */ |
| @@ -228,6 +228,12 @@ enum v4l2_colorfx { · 227 unmodified lines | |||
| 228 | */ | 228 | */ |
| 229 | #define V4L2_CID_USER_RKISP1_BASE (V4L2_CID_USER_BASE + 0x1220) | 229 | #define V4L2_CID_USER_RKISP1_BASE (V4L2_CID_USER_BASE + 0x1220) |
| 230 | 230 | ||
| 231 | /* | ||
| 232 | * The base for the Arm Mali-C55 ISP driver controls. | ||
| 233 | * We reserve 16 controls for this driver | ||
| 234 | */ | ||
| 235 | #define V4L2_CID_USER_MALI_C55_BASE (V4L2_CID_USER_BASE + 0x1230) | ||
| 236 | |||
| 231 | /* MPEG-class control IDs */ | 237 | /* MPEG-class control IDs */ |
| 232 | /* The MPEG controls are applicable to all codec controls | 238 | /* The MPEG controls are applicable to all codec controls |
| 233 | * and the 'MPEG' part of the define is historical */ | 239 | * and the 'MPEG' part of the define is historical */ |
| @@ -14,6 +14,7 @@ · 13 unmodified lines | |||
| 14 | 14 | ||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/ioctl.h> | 16 | #include <linux/ioctl.h> |
| 17 | #include <linux/stddef.h> | ||
| 17 | 18 | ||
| 18 | #define VFIO_API_VERSION 0 | 19 | #define VFIO_API_VERSION 0 |
| 19 | 20 | ||
| @@ -1478,6 +1479,33 @@ struct vfio_device_feature_bus_master { · 1458 unmodified lines | |||
| 1478 | }; | 1479 | }; |
| 1479 | #define VFIO_DEVICE_FEATURE_BUS_MASTER 10 | 1480 | #define VFIO_DEVICE_FEATURE_BUS_MASTER 10 |
| 1480 | 1481 | ||
| 1482 | /** | ||
| 1483 | * Upon VFIO_DEVICE_FEATURE_GET create a dma_buf fd for the | ||
| 1484 | * regions selected. | ||
| 1485 | * | ||
| 1486 | * open_flags are the typical flags passed to open(2), eg O_RDWR, O_CLOEXEC, | ||
| 1487 | * etc. offset/length specify a slice of the region to create the dmabuf from. | ||
| 1488 | * nr_ranges is the total number of (P2P DMA) ranges that comprise the dmabuf. | ||
| 1489 | * | ||
| 1490 | * flags should be 0. | ||
| 1491 | * | ||
| 1492 | * Return: The fd number on success, -1 and errno is set on failure. | ||
| 1493 | */ | ||
| 1494 | #define VFIO_DEVICE_FEATURE_DMA_BUF 11 | ||
| 1495 | |||
| 1496 | struct vfio_region_dma_range { | ||
| 1497 | __u64 offset; | ||
| 1498 | __u64 length; | ||
| 1499 | }; | ||
| 1500 | |||
| 1501 | struct vfio_device_feature_dma_buf { | ||
| 1502 | __u32 region_index; | ||
| 1503 | __u32 open_flags; | ||
| 1504 | __u32 flags; | ||
| 1505 | __u32 nr_ranges; | ||
| 1506 | struct vfio_region_dma_range dma_ranges[] __counted_by(nr_ranges); | ||
| 1507 | }; | ||
| 1508 | |||
| 1481 | /* -------- API for Type1 VFIO IOMMU -------- */ | 1509 | /* -------- API for Type1 VFIO IOMMU -------- */ |
| 1482 | 1510 | ||
| 1483 | /** | 1511 | /** |
| @@ -884,6 +884,10 @@ struct v4l2_pix_format { · 883 unmodified lines | |||
| 884 | #define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C') /* PiSP FE configuration */ | 884 | #define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C') /* PiSP FE configuration */ |
| 885 | #define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S') /* PiSP FE stats */ | 885 | #define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S') /* PiSP FE stats */ |
| 886 | 886 | ||
| 887 | /* Vendor specific - used for Arm Mali-C55 ISP */ | ||
| 888 | #define V4L2_META_FMT_MALI_C55_PARAMS v4l2_fourcc('C', '5', '5', 'P') /* ARM Mali-C55 Parameters */ | ||
| 889 | #define V4L2_META_FMT_MALI_C55_STATS v4l2_fourcc('C', '5', '5', 'S') /* ARM Mali-C55 3A Statistics */ | ||
| 890 | |||
| 887 | #ifdef __KERNEL__ | 891 | #ifdef __KERNEL__ |
| 888 | /* | 892 | /* |
| 889 | * Line-based metadata formats. Remember to update v4l_fill_fmtdesc() when | 893 | * Line-based metadata formats. Remember to update v4l_fill_fmtdesc() when |
| @@ -40,7 +40,7 @@ · 39 unmodified lines | |||
| 40 | #define _LINUX_VIRTIO_PCI_H | 40 | #define _LINUX_VIRTIO_PCI_H |
| 41 | 41 | ||
| 42 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 43 | #include <linux/kernel.h> | 43 | #include <linux/const.h> |
| 44 | 44 | ||
| 45 | #ifndef VIRTIO_PCI_NO_LEGACY | 45 | #ifndef VIRTIO_PCI_NO_LEGACY |
| 46 | 46 | ||
| @@ -15,4 +15,13 @@ struct vmcoredd_header { · 14 unmodified lines | |||
| 15 | __u8 dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Device dump's name */ | 15 | __u8 dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Device dump's name */ |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | enum hwerr_error_type { | ||
| 19 | HWERR_RECOV_CPU, | ||
| 20 | HWERR_RECOV_MEMORY, | ||
| 21 | HWERR_RECOV_PCI, | ||
| 22 | HWERR_RECOV_CXL, | ||
| 23 | HWERR_RECOV_OTHERS, | ||
| 24 | HWERR_RECOV_MAX, | ||
| 25 | }; | ||
| 26 | |||
| 18 | #endif /* _UAPI_VMCORE_H */ | 27 | #endif /* _UAPI_VMCORE_H */ |
| @@ -1,156 +1,31 @@ | |||
| 1 | /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */ | 1 | /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ |
| 2 | /* | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. | 3 | /* Documentation/netlink/specs/wireguard.yaml */ |
| 4 | * | 4 | /* YNL-GEN uapi header */ |
| 5 | * Documentation | 5 | /* To regenerate run: tools/net/ynl/ynl-regen.sh */ |
| 6 | * ============= | ||
| 7 | * | ||
| 8 | * The below enums and macros are for interfacing with WireGuard, using generic | ||
| 9 | * netlink, with family WG_GENL_NAME and version WG_GENL_VERSION. It defines two | ||
| 10 | * methods: get and set. Note that while they share many common attributes, | ||
| 11 | * these two functions actually accept a slightly different set of inputs and | ||
| 12 | * outputs. | ||
| 13 | * | ||
| 14 | * WG_CMD_GET_DEVICE | ||
| 15 | * ----------------- | ||
| 16 | * | ||
| 17 | * May only be called via NLM_F_REQUEST | NLM_F_DUMP. The command should contain | ||
| 18 | * one but not both of: | ||
| 19 | * | ||
| 20 | * WGDEVICE_A_IFINDEX: NLA_U32 | ||
| 21 | * WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1 | ||
| 22 | * | ||
| 23 | * The kernel will then return several messages (NLM_F_MULTI) containing the | ||
| 24 | * following tree of nested items: | ||
| 25 | * | ||
| 26 | * WGDEVICE_A_IFINDEX: NLA_U32 | ||
| 27 | * WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1 | ||
| 28 | * WGDEVICE_A_PRIVATE_KEY: NLA_EXACT_LEN, len WG_KEY_LEN | ||
| 29 | * WGDEVICE_A_PUBLIC_KEY: NLA_EXACT_LEN, len WG_KEY_LEN | ||
| 30 | * WGDEVICE_A_LISTEN_PORT: NLA_U16 | ||
| 31 | * WGDEVICE_A_FWMARK: NLA_U32 | ||
| 32 | * WGDEVICE_A_PEERS: NLA_NESTED | ||
| 33 | * 0: NLA_NESTED | ||
| 34 | * WGPEER_A_PUBLIC_KEY: NLA_EXACT_LEN, len WG_KEY_LEN | ||
| 35 | * WGPEER_A_PRESHARED_KEY: NLA_EXACT_LEN, len WG_KEY_LEN | ||
| 36 | * WGPEER_A_ENDPOINT: NLA_MIN_LEN(struct sockaddr), struct sockaddr_in or struct sockaddr_in6 | ||
| 37 | * WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL: NLA_U16 | ||
| 38 | * WGPEER_A_LAST_HANDSHAKE_TIME: NLA_EXACT_LEN, struct __kernel_timespec | ||
| 39 | * WGPEER_A_RX_BYTES: NLA_U64 | ||
| 40 | * WGPEER_A_TX_BYTES: NLA_U64 | ||
| 41 | * WGPEER_A_ALLOWEDIPS: NLA_NESTED | ||
| 42 | * 0: NLA_NESTED | ||
| 43 | * WGALLOWEDIP_A_FAMILY: NLA_U16 | ||
| 44 | * WGALLOWEDIP_A_IPADDR: NLA_MIN_LEN(struct in_addr), struct in_addr or struct in6_addr | ||
| 45 | * WGALLOWEDIP_A_CIDR_MASK: NLA_U8 | ||
| 46 | * 0: NLA_NESTED | ||
| 47 | * ... | ||
| 48 | * 0: NLA_NESTED | ||
| 49 | * ... | ||
| 50 | * ... | ||
| 51 | * WGPEER_A_PROTOCOL_VERSION: NLA_U32 | ||
| 52 | * 0: NLA_NESTED | ||
| 53 | * ... | ||
| 54 | * ... | ||
| 55 | * | ||
| 56 | * It is possible that all of the allowed IPs of a single peer will not | ||
| 57 | * fit within a single netlink message. In that case, the same peer will | ||
| 58 | * be written in the following message, except it will only contain | ||
| 59 | * WGPEER_A_PUBLIC_KEY and WGPEER_A_ALLOWEDIPS. This may occur several | ||
| 60 | * times in a row for the same peer. It is then up to the receiver to | ||
| 61 | * coalesce adjacent peers. Likewise, it is possible that all peers will | ||
| 62 | * not fit within a single message. So, subsequent peers will be sent | ||
| 63 | * in following messages, except those will only contain WGDEVICE_A_IFNAME | ||
| 64 | * and WGDEVICE_A_PEERS. It is then up to the receiver to coalesce these | ||
| 65 | * messages to form the complete list of peers. | ||
| 66 | * | ||
| 67 | * Since this is an NLA_F_DUMP command, the final message will always be | ||
| 68 | * NLMSG_DONE, even if an error occurs. However, this NLMSG_DONE message | ||
| 69 | * contains an integer error code. It is either zero or a negative error | ||
| 70 | * code corresponding to the errno. | ||
| 71 | * | ||
| 72 | * WG_CMD_SET_DEVICE | ||
| 73 | * ----------------- | ||
| 74 | * | ||
| 75 | * May only be called via NLM_F_REQUEST. The command should contain the | ||
| 76 | * following tree of nested items, containing one but not both of | ||
| 77 | * WGDEVICE_A_IFINDEX and WGDEVICE_A_IFNAME: | ||
| 78 | * | ||
| 79 | * WGDEVICE_A_IFINDEX: NLA_U32 | ||
| 80 | * WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1 | ||
| 81 | * WGDEVICE_A_FLAGS: NLA_U32, 0 or WGDEVICE_F_REPLACE_PEERS if all current | ||
| 82 | * peers should be removed prior to adding the list below. | ||
| 83 | * WGDEVICE_A_PRIVATE_KEY: len WG_KEY_LEN, all zeros to remove | ||
| 84 | * WGDEVICE_A_LISTEN_PORT: NLA_U16, 0 to choose randomly | ||
| 85 | * WGDEVICE_A_FWMARK: NLA_U32, 0 to disable | ||
| 86 | * WGDEVICE_A_PEERS: NLA_NESTED | ||
| 87 | * 0: NLA_NESTED | ||
| 88 | * WGPEER_A_PUBLIC_KEY: len WG_KEY_LEN | ||
| 89 | * WGPEER_A_FLAGS: NLA_U32, 0 and/or WGPEER_F_REMOVE_ME if the | ||
| 90 | * specified peer should not exist at the end of the | ||
| 91 | * operation, rather than added/updated and/or | ||
| 92 | * WGPEER_F_REPLACE_ALLOWEDIPS if all current allowed | ||
| 93 | * IPs of this peer should be removed prior to adding | ||
| 94 | * the list below and/or WGPEER_F_UPDATE_ONLY if the | ||
| 95 | * peer should only be set if it already exists. | ||
| 96 | * WGPEER_A_PRESHARED_KEY: len WG_KEY_LEN, all zeros to remove | ||
| 97 | * WGPEER_A_ENDPOINT: struct sockaddr_in or struct sockaddr_in6 | ||
| 98 | * WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL: NLA_U16, 0 to disable | ||
| 99 | * WGPEER_A_ALLOWEDIPS: NLA_NESTED | ||
| 100 | * 0: NLA_NESTED | ||
| 101 | * WGALLOWEDIP_A_FAMILY: NLA_U16 | ||
| 102 | * WGALLOWEDIP_A_IPADDR: struct in_addr or struct in6_addr | ||
| 103 | * WGALLOWEDIP_A_CIDR_MASK: NLA_U8 | ||
| 104 | * WGALLOWEDIP_A_FLAGS: NLA_U32, WGALLOWEDIP_F_REMOVE_ME if | ||
| 105 | * the specified IP should be removed; | ||
| 106 | * otherwise, this IP will be added if | ||
| 107 | * it is not already present. | ||
| 108 | * 0: NLA_NESTED | ||
| 109 | * ... | ||
| 110 | * 0: NLA_NESTED | ||
| 111 | * ... | ||
| 112 | * ... | ||
| 113 | * WGPEER_A_PROTOCOL_VERSION: NLA_U32, should not be set or used at | ||
| 114 | * all by most users of this API, as the | ||
| 115 | * most recent protocol will be used when | ||
| 116 | * this is unset. Otherwise, must be set | ||
| 117 | * to 1. | ||
| 118 | * 0: NLA_NESTED | ||
| 119 | * ... | ||
| 120 | * ... | ||
| 121 | * | ||
| 122 | * It is possible that the amount of configuration data exceeds that of | ||
| 123 | * the maximum message length accepted by the kernel. In that case, several | ||
| 124 | * messages should be sent one after another, with each successive one | ||
| 125 | * filling in information not contained in the prior. Note that if | ||
| 126 | * WGDEVICE_F_REPLACE_PEERS is specified in the first message, it probably | ||
| 127 | * should not be specified in fragments that come after, so that the list | ||
| 128 | * of peers is only cleared the first time but appended after. Likewise for | ||
| 129 | * peers, if WGPEER_F_REPLACE_ALLOWEDIPS is specified in the first message | ||
| 130 | * of a peer, it likely should not be specified in subsequent fragments. | ||
| 131 | * | ||
| 132 | * If an error occurs, NLMSG_ERROR will reply containing an errno. | ||
| 133 | */ | ||
| 134 | 6 | ||
| 135 | #ifndef _WG_UAPI_WIREGUARD_H | 7 | #ifndef _UAPI_LINUX_WIREGUARD_H |
| 136 | #define _WG_UAPI_WIREGUARD_H | 8 | #define _UAPI_LINUX_WIREGUARD_H |
| 137 | 9 | ||
| 138 | #define WG_GENL_NAME "wireguard" | 10 | #define WG_GENL_NAME "wireguard" |
| 139 | #define WG_GENL_VERSION 1 | 11 | #define WG_GENL_VERSION 1 |
| 140 | 12 | ||
| 141 | #define WG_KEY_LEN 32 | 13 | #define WG_KEY_LEN 32 |
| 142 | 14 | ||
| 143 | enum wg_cmd { | 15 | enum wgdevice_flag { |
| 144 | WG_CMD_GET_DEVICE, | 16 | WGDEVICE_F_REPLACE_PEERS = 1, |
| 145 | WG_CMD_SET_DEVICE, | ||
| 146 | __WG_CMD_MAX | ||
| 147 | }; | 17 | }; |
| 148 | #define WG_CMD_MAX (__WG_CMD_MAX - 1) | ||
| 149 | 18 | ||
| 150 | enum wgdevice_flag { | 19 | enum wgpeer_flag { |
| 151 | WGDEVICE_F_REPLACE_PEERS = 1U << 0, | 20 | WGPEER_F_REMOVE_ME = 1, |
| 152 | __WGDEVICE_F_ALL = WGDEVICE_F_REPLACE_PEERS | 21 | WGPEER_F_REPLACE_ALLOWEDIPS = 2, |
| 22 | WGPEER_F_UPDATE_ONLY = 4, | ||
| 23 | }; | ||
| 24 | |||
| 25 | enum wgallowedip_flag { | ||
| 26 | WGALLOWEDIP_F_REMOVE_ME = 1, | ||
| 153 | }; | 27 | }; |
| 28 | |||
| 154 | enum wgdevice_attribute { | 29 | enum wgdevice_attribute { |
| 155 | WGDEVICE_A_UNSPEC, | 30 | WGDEVICE_A_UNSPEC, |
| 156 | WGDEVICE_A_IFINDEX, | 31 | WGDEVICE_A_IFINDEX, |
| @@ -161,17 +36,11 @@ enum wgdevice_attribute { · 4 unmodified lines | |||
| 161 | WGDEVICE_A_LISTEN_PORT, | 36 | WGDEVICE_A_LISTEN_PORT, |
| 162 | WGDEVICE_A_FWMARK, | 37 | WGDEVICE_A_FWMARK, |
| 163 | WGDEVICE_A_PEERS, | 38 | WGDEVICE_A_PEERS, |
| 39 | |||
| 164 | __WGDEVICE_A_LAST | 40 | __WGDEVICE_A_LAST |
| 165 | }; | 41 | }; |
| 166 | #define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1) | 42 | #define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1) |
| 167 | 43 | ||
| 168 | enum wgpeer_flag { | ||
| 169 | WGPEER_F_REMOVE_ME = 1U << 0, | ||
| 170 | WGPEER_F_REPLACE_ALLOWEDIPS = 1U << 1, | ||
| 171 | WGPEER_F_UPDATE_ONLY = 1U << 2, | ||
| 172 | __WGPEER_F_ALL = WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS | | ||
| 173 | WGPEER_F_UPDATE_ONLY | ||
| 174 | }; | ||
| 175 | enum wgpeer_attribute { | 44 | enum wgpeer_attribute { |
| 176 | WGPEER_A_UNSPEC, | 45 | WGPEER_A_UNSPEC, |
| 177 | WGPEER_A_PUBLIC_KEY, | 46 | WGPEER_A_PUBLIC_KEY, |
| @@ -184,22 +53,28 @@ enum wgpeer_attribute { · 6 unmodified lines | |||
| 184 | WGPEER_A_TX_BYTES, | 53 | WGPEER_A_TX_BYTES, |
| 185 | WGPEER_A_ALLOWEDIPS, | 54 | WGPEER_A_ALLOWEDIPS, |
| 186 | WGPEER_A_PROTOCOL_VERSION, | 55 | WGPEER_A_PROTOCOL_VERSION, |
| 56 | |||
| 187 | __WGPEER_A_LAST | 57 | __WGPEER_A_LAST |
| 188 | }; | 58 | }; |
| 189 | #define WGPEER_A_MAX (__WGPEER_A_LAST - 1) | 59 | #define WGPEER_A_MAX (__WGPEER_A_LAST - 1) |
| 190 | 60 | ||
| 191 | enum wgallowedip_flag { | ||
| 192 | WGALLOWEDIP_F_REMOVE_ME = 1U << 0, | ||
| 193 | __WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME | ||
| 194 | }; | ||
| 195 | enum wgallowedip_attribute { | 61 | enum wgallowedip_attribute { |
| 196 | WGALLOWEDIP_A_UNSPEC, | 62 | WGALLOWEDIP_A_UNSPEC, |
| 197 | WGALLOWEDIP_A_FAMILY, | 63 | WGALLOWEDIP_A_FAMILY, |
| 198 | WGALLOWEDIP_A_IPADDR, | 64 | WGALLOWEDIP_A_IPADDR, |
| 199 | WGALLOWEDIP_A_CIDR_MASK, | 65 | WGALLOWEDIP_A_CIDR_MASK, |
| 200 | WGALLOWEDIP_A_FLAGS, | 66 | WGALLOWEDIP_A_FLAGS, |
| 67 | |||
| 201 | __WGALLOWEDIP_A_LAST | 68 | __WGALLOWEDIP_A_LAST |
| 202 | }; | 69 | }; |
| 203 | #define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1) | 70 | #define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1) |
| 204 | 71 | ||
| 205 | #endif /* _WG_UAPI_WIREGUARD_H */ | 72 | enum wg_cmd { |
| 73 | WG_CMD_GET_DEVICE, | ||
| 74 | WG_CMD_SET_DEVICE, | ||
| 75 | |||
| 76 | __WG_CMD_MAX | ||
| 77 | }; | ||
| 78 | #define WG_CMD_MAX (__WG_CMD_MAX - 1) | ||
| 79 | |||
| 80 | #endif /* _UAPI_LINUX_WIREGUARD_H */ | ||
| @@ -60,7 +60,7 @@ struct snd_cea_861_aud_if { · 59 unmodified lines | |||
| 60 | unsigned char db2_sf_ss; /* sample frequency and size */ | 60 | unsigned char db2_sf_ss; /* sample frequency and size */ |
| 61 | unsigned char db3; /* not used, all zeros */ | 61 | unsigned char db3; /* not used, all zeros */ |
| 62 | unsigned char db4_ca; /* channel allocation code */ | 62 | unsigned char db4_ca; /* channel allocation code */ |
| 63 | unsigned char db5_dminh_lsv; /* downmix inhibit & level-shit values */ | 63 | unsigned char db5_dminh_lsv; /* downmix inhibit & level-shift values */ |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | /**************************************************************************** | 66 | /**************************************************************************** |
| @@ -21,6 +21,7 @@ enum avs_tplg_token { · 20 unmodified lines | |||
| 21 | AVS_TKN_MANIFEST_NUM_BINDINGS_U32 = 8, | 21 | AVS_TKN_MANIFEST_NUM_BINDINGS_U32 = 8, |
| 22 | AVS_TKN_MANIFEST_NUM_CONDPATH_TMPLS_U32 = 9, | 22 | AVS_TKN_MANIFEST_NUM_CONDPATH_TMPLS_U32 = 9, |
| 23 | AVS_TKN_MANIFEST_NUM_INIT_CONFIGS_U32 = 10, | 23 | AVS_TKN_MANIFEST_NUM_INIT_CONFIGS_U32 = 10, |
| 24 | AVS_TKN_MANIFEST_NUM_NHLT_CONFIGS_U32 = 11, | ||
| 24 | 25 | ||
| 25 | /* struct avs_tplg_library */ | 26 | /* struct avs_tplg_library */ |
| 26 | AVS_TKN_LIBRARY_ID_U32 = 101, | 27 | AVS_TKN_LIBRARY_ID_U32 = 101, |
| @@ -124,6 +125,7 @@ enum avs_tplg_token { · 97 unmodified lines | |||
| 124 | AVS_TKN_MOD_KCONTROL_ID_U32 = 1707, | 125 | AVS_TKN_MOD_KCONTROL_ID_U32 = 1707, |
| 125 | AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32 = 1708, | 126 | AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32 = 1708, |
| 126 | AVS_TKN_MOD_INIT_CONFIG_ID_U32 = 1709, | 127 | AVS_TKN_MOD_INIT_CONFIG_ID_U32 = 1709, |
| 128 | AVS_TKN_MOD_NHLT_CONFIG_ID_U32 = 1710, | ||
| 127 | 129 | ||
| 128 | /* struct avs_tplg_path_template */ | 130 | /* struct avs_tplg_path_template */ |
| 129 | AVS_TKN_PATH_TMPL_ID_U32 = 1801, | 131 | AVS_TKN_PATH_TMPL_ID_U32 = 1801, |
| @@ -160,6 +162,10 @@ enum avs_tplg_token { · 30 unmodified lines | |||
| 160 | AVS_TKN_INIT_CONFIG_ID_U32 = 2401, | 162 | AVS_TKN_INIT_CONFIG_ID_U32 = 2401, |
| 161 | AVS_TKN_INIT_CONFIG_PARAM_U8 = 2402, | 163 | AVS_TKN_INIT_CONFIG_PARAM_U8 = 2402, |
| 162 | AVS_TKN_INIT_CONFIG_LENGTH_U32 = 2403, | 164 | AVS_TKN_INIT_CONFIG_LENGTH_U32 = 2403, |
| 165 | |||
| 166 | /* struct avs_tplg_nhlt_config */ | ||
| 167 | AVS_TKN_NHLT_CONFIG_ID_U32 = 2501, | ||
| 168 | AVS_TKN_NHLT_CONFIG_SIZE_U32 = 2502, | ||
| 163 | }; | 169 | }; |
| 164 | 170 | ||
| 165 | #endif | 171 | #endif |