Merge series from Cezary Rojewski <cezary.rojewski@intel.com>: The avs-driver continues to be utilized on more recent Intel machines. As TGL-based (cAVS 2.5) e.g.: RPL, inherit most of the functionality from previous platforms: SKL <- APL <- CNL <- ICL <- TGL rather than putting everything into a single file, the platform-specific bits are split into cnl/icl/tgl.c files instead. Makes the division clear and code easier to maintain. Layout of the patchset: First are two changes combined together address the sound-clipping problem, present when only one stream is running - specifically one CAPTURE stream. Follow up is naming-scheme adjustment for some of the existing functions what improves code incohesiveness. As existing IPC/IRQ code operates solely on cAVS 1.5 architecture, it needs no abstraction. The situation changes when newer platforms come into the picture. Thus the next two patches abstract the existing IPC/IRQ handlers so that majority of the common code can be re-used. The ICCMAX change stands out a bit - the AudioDSP firmware loading procedure differs on ICL-based platforms (and onwards) and having a separate commit makes the situation clear to the developers who are going to support the solution from LTS perspective. For that reason I decided not to merge it into the commit introducing the icl.c file.
Showing the changes to include/uapi (5 of 1210 files). Show all
Unified · Split
| @@ -305,6 +305,7 @@ struct drm_ivpu_submit { · 304 unmodified lines | ||
| 305 | 305 | |
| 306 | 306 | /* drm_ivpu_bo_wait job status codes */ |
| 307 | 307 | #define DRM_IVPU_JOB_STATUS_SUCCESS 0 |
| 308 | +#define DRM_IVPU_JOB_STATUS_ABORTED 256 | |
| 308 | 309 | |
| 309 | 310 | /** |
| 310 | 311 | * struct drm_ivpu_bo_wait - Wait for BO to become inactive |
| @@ -91,8 +91,6 @@ enum iio_modifier { · 90 unmodified lines | ||
| 91 | 91 | IIO_MOD_CO2, |
| 92 | 92 | IIO_MOD_VOC, |
| 93 | 93 | IIO_MOD_LIGHT_UV, |
| 94 | − IIO_MOD_LIGHT_UVA, | |
| 95 | − IIO_MOD_LIGHT_UVB, | |
| 96 | 94 | IIO_MOD_LIGHT_DUV, |
| 97 | 95 | IIO_MOD_PM1, |
| 98 | 96 | IIO_MOD_PM2P5, |
| @@ -107,6 +105,8 @@ enum iio_modifier { · 8 unmodified lines | ||
| 107 | 105 | IIO_MOD_PITCH, |
| 108 | 106 | IIO_MOD_YAW, |
| 109 | 107 | IIO_MOD_ROLL, |
| 108 | + IIO_MOD_LIGHT_UVA, | |
| 109 | + IIO_MOD_LIGHT_UVB, | |
| 110 | 110 | }; |
| 111 | 111 | |
| 112 | 112 | enum iio_event_type { |
| @@ -285,9 +285,11 @@ enum nft_rule_attributes { · 284 unmodified lines | ||
| 285 | 285 | /** |
| 286 | 286 | * enum nft_rule_compat_flags - nf_tables rule compat flags |
| 287 | 287 | * |
| 288 | + * @NFT_RULE_COMPAT_F_UNUSED: unused | |
| 288 | 289 | * @NFT_RULE_COMPAT_F_INV: invert the check result |
| 289 | 290 | */ |
| 290 | 291 | enum nft_rule_compat_flags { |
| 292 | + NFT_RULE_COMPAT_F_UNUSED = (1 << 0), | |
| 291 | 293 | NFT_RULE_COMPAT_F_INV = (1 << 1), |
| 292 | 294 | NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, |
| 293 | 295 | }; |
| @@ -145,12 +145,13 @@ struct serial_rs485 { · 144 unmodified lines | ||
| 145 | 145 | #define SER_RS485_ENABLED _BITUL(0) |
| 146 | 146 | #define SER_RS485_RTS_ON_SEND _BITUL(1) |
| 147 | 147 | #define SER_RS485_RTS_AFTER_SEND _BITUL(2) |
| 148 | −#define SER_RS485_RX_DURING_TX _BITUL(3) | |
| 149 | −#define SER_RS485_TERMINATE_BUS _BITUL(4) | |
| 150 | −#define SER_RS485_ADDRB _BITUL(5) | |
| 151 | −#define SER_RS485_ADDR_RECV _BITUL(6) | |
| 152 | −#define SER_RS485_ADDR_DEST _BITUL(7) | |
| 153 | −#define SER_RS485_MODE_RS422 _BITUL(8) | |
| 148 | +/* Placeholder for bit 3: SER_RS485_RTS_BEFORE_SEND, which isn't used anymore */ | |
| 149 | +#define SER_RS485_RX_DURING_TX _BITUL(4) | |
| 150 | +#define SER_RS485_TERMINATE_BUS _BITUL(5) | |
| 151 | +#define SER_RS485_ADDRB _BITUL(6) | |
| 152 | +#define SER_RS485_ADDR_RECV _BITUL(7) | |
| 153 | +#define SER_RS485_ADDR_DEST _BITUL(8) | |
| 154 | +#define SER_RS485_MODE_RS422 _BITUL(9) | |
| 154 | 155 | |
| 155 | 156 | __u32 delay_rts_before_send; |
| 156 | 157 | __u32 delay_rts_after_send; |
| @@ -31,7 +31,10 @@ struct ioctl_gntalloc_alloc_gref { · 30 unmodified lines | ||
| 31 | 31 | __u64 index; |
| 32 | 32 | /* The grant references of the newly created grant, one per page */ |
| 33 | 33 | /* Variable size, depending on count */ |
| 34 | − __u32 gref_ids[1]; | |
| 34 | + union { | |
| 35 | + __u32 gref_ids[1]; | |
| 36 | + __DECLARE_FLEX_ARRAY(__u32, gref_ids_flex); | |
| 37 | + }; | |
| 35 | 38 | }; |
| 36 | 39 | |
| 37 | 40 | #define GNTALLOC_FLAG_WRITABLE 1 |