Cross-merge networking fixes after downstream PR (net-6.18-rc6). No conflicts, adjacent changes in: drivers/net/phy/micrel.c 96a9178a29a6 ("net: phy: micrel: lan8814 fix reset of the QSGMII interface") 61b7ade9ba8c ("net: phy: micrel: Add support for non PTP SKUs for lan8814") and a trivial one in tools/testing/selftests/drivers/net/Makefile.
Showing the changes to include/uapi (2 of 303 files). Show all
Unified · Split
| @@ -979,14 +979,20 @@ extern "C" { · 978 unmodified lines | |||
| 979 | * 2 = Gob Height 8, Turing+ Page Kind mapping | 979 | * 2 = Gob Height 8, Turing+ Page Kind mapping |
| 980 | * 3 = Reserved for future use. | 980 | * 3 = Reserved for future use. |
| 981 | * | 981 | * |
| 982 | * 22:22 s Sector layout. On Tegra GPUs prior to Xavier, there is a further | 982 | * 22:22 s Sector layout. There is a further bit remapping step that occurs |
| 983 | * bit remapping step that occurs at an even lower level than the | 983 | * 26:27 at an even lower level than the page kind and block linear |
| 984 | * page kind and block linear swizzles. This causes the layout of | 984 | * swizzles. This causes the bit arrangement of surfaces in memory |
| 985 | * surfaces mapped in those SOC's GPUs to be incompatible with the | 985 | * to differ subtly, and prevents direct sharing of surfaces between |
| 986 | * equivalent mapping on other GPUs in the same system. | 986 | * GPUs with different layouts. |
| 987 | * | 987 | * |
| 988 | * 0 = Tegra K1 - Tegra Parker/TX2 Layout. | 988 | * 0 = Tegra K1 - Tegra Parker/TX2 Layout |
| 989 | * 1 = Desktop GPU and Tegra Xavier+ Layout | 989 | * 1 = Pre-GB20x, GB20x 32+ bpp, GB10, Tegra Xavier-Orin Layout |
| 990 | * 2 = GB20x(Blackwell 2)+ 8 bpp surface layout | ||
| 991 | * 3 = GB20x(Blackwell 2)+ 16 bpp surface layout | ||
| 992 | * 4 = Reserved for future use. | ||
| 993 | * 5 = Reserved for future use. | ||
| 994 | * 6 = Reserved for future use. | ||
| 995 | * 7 = Reserved for future use. | ||
| 990 | * | 996 | * |
| 991 | * 25:23 c Lossless Framebuffer Compression type. | 997 | * 25:23 c Lossless Framebuffer Compression type. |
| 992 | * | 998 | * |
| @@ -1001,7 +1007,7 @@ extern "C" { · 8 unmodified lines | |||
| 1001 | * 6 = Reserved for future use | 1007 | * 6 = Reserved for future use |
| 1002 | * 7 = Reserved for future use | 1008 | * 7 = Reserved for future use |
| 1003 | * | 1009 | * |
| 1004 | * 55:25 - Reserved for future use. Must be zero. | 1010 | * 55:28 - Reserved for future use. Must be zero. |
| 1005 | */ | 1011 | */ |
| 1006 | #define DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D(c, s, g, k, h) \ | 1012 | #define DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D(c, s, g, k, h) \ |
| 1007 | fourcc_mod_code(NVIDIA, (0x10 | \ | 1013 | fourcc_mod_code(NVIDIA, (0x10 | \ |
| @@ -1009,6 +1015,7 @@ extern "C" { · 1 unmodified line | |||
| 1009 | (((k) & 0xff) << 12) | \ | 1015 | (((k) & 0xff) << 12) | \ |
| 1010 | (((g) & 0x3) << 20) | \ | 1016 | (((g) & 0x3) << 20) | \ |
| 1011 | (((s) & 0x1) << 22) | \ | 1017 | (((s) & 0x1) << 22) | \ |
| 1018 | (((s) & 0x6) << 25) | \ | ||
| 1012 | (((c) & 0x7) << 23))) | 1019 | (((c) & 0x7) << 23))) |
| 1013 | 1020 | ||
| 1014 | /* To grandfather in prior block linear format modifiers to the above layout, | 1021 | /* To grandfather in prior block linear format modifiers to the above layout, |
| @@ -689,9 +689,6 @@ enum io_uring_register_op { · 688 unmodified lines | |||
| 689 | /* query various aspects of io_uring, see linux/io_uring/query.h */ | 689 | /* query various aspects of io_uring, see linux/io_uring/query.h */ |
| 690 | IORING_REGISTER_QUERY = 35, | 690 | IORING_REGISTER_QUERY = 35, |
| 691 | 691 | ||
| 692 | /* return zcrx buffers back into circulation */ | ||
| 693 | IORING_REGISTER_ZCRX_REFILL = 36, | ||
| 694 | |||
| 695 | /* this goes last */ | 692 | /* this goes last */ |
| 696 | IORING_REGISTER_LAST, | 693 | IORING_REGISTER_LAST, |
| 697 | 694 | ||
| @@ -1073,15 +1070,6 @@ struct io_uring_zcrx_ifq_reg { · 375 unmodified lines | |||
| 1073 | __u64 __resv[3]; | 1070 | __u64 __resv[3]; |
| 1074 | }; | 1071 | }; |
| 1075 | 1072 | ||
| 1076 | struct io_uring_zcrx_sync_refill { | ||
| 1077 | __u32 zcrx_id; | ||
| 1078 | /* the number of entries to return */ | ||
| 1079 | __u32 nr_entries; | ||
| 1080 | /* pointer to an array of struct io_uring_zcrx_rqe */ | ||
| 1081 | __u64 rqes; | ||
| 1082 | __u64 __resv[2]; | ||
| 1083 | }; | ||
| 1084 | |||
| 1085 | #ifdef __cplusplus | 1073 | #ifdef __cplusplus |
| 1086 | } | 1074 | } |
| 1087 | #endif | 1075 | #endif |