Other serial driver work wants to build on patches now in 4.2-rc4 so merge the branch so this can properly happen.
Showing the changes to include/uapi (5 of 274 files). Show all
Unified · Split
| @@ -614,6 +614,8 @@ struct drm_amdgpu_info_device { · 613 unmodified lines | |||
| 614 | uint32_t vram_type; | 614 | uint32_t vram_type; |
| 615 | /** video memory bit width*/ | 615 | /** video memory bit width*/ |
| 616 | uint32_t vram_bit_width; | 616 | uint32_t vram_bit_width; |
| 617 | /* vce harvesting instance */ | ||
| 618 | uint32_t vce_harvest_config; | ||
| 617 | }; | 619 | }; |
| 618 | 620 | ||
| 619 | struct drm_amdgpu_info_hw_ip { | 621 | struct drm_amdgpu_info_hw_ip { |
| @@ -1070,6 +1070,14 @@ struct drm_i915_reg_read { · 1069 unmodified lines | |||
| 1070 | __u64 offset; | 1070 | __u64 offset; |
| 1071 | __u64 val; /* Return value */ | 1071 | __u64 val; /* Return value */ |
| 1072 | }; | 1072 | }; |
| 1073 | /* Known registers: | ||
| 1074 | * | ||
| 1075 | * Render engine timestamp - 0x2358 + 64bit - gen7+ | ||
| 1076 | * - Note this register returns an invalid value if using the default | ||
| 1077 | * single instruction 8byte read, in order to workaround that use | ||
| 1078 | * offset (0x2538 | 1) instead. | ||
| 1079 | * | ||
| 1080 | */ | ||
| 1073 | 1081 | ||
| 1074 | struct drm_i915_reset_stats { | 1082 | struct drm_i915_reset_stats { |
| 1075 | __u32 ctx_id; | 1083 | __u32 ctx_id; |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | /* The feature bitmap for virtio net */ | 34 | /* The feature bitmap for virtio net */ |
| 35 | #define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */ | 35 | #define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */ |
| 36 | #define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */ | 36 | #define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */ |
| 37 | #define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 /* Dynamic offload configuration. */ | ||
| 37 | #define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */ | 38 | #define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */ |
| 38 | #define VIRTIO_NET_F_GUEST_TSO4 7 /* Guest can handle TSOv4 in. */ | 39 | #define VIRTIO_NET_F_GUEST_TSO4 7 /* Guest can handle TSOv4 in. */ |
| 39 | #define VIRTIO_NET_F_GUEST_TSO6 8 /* Guest can handle TSOv6 in. */ | 40 | #define VIRTIO_NET_F_GUEST_TSO6 8 /* Guest can handle TSOv6 in. */ |
| @@ -226,4 +227,19 @@ struct virtio_net_ctrl_mq { · 186 unmodified lines | |||
| 226 | #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1 | 227 | #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1 |
| 227 | #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000 | 228 | #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000 |
| 228 | 229 | ||
| 230 | /* | ||
| 231 | * Control network offloads | ||
| 232 | * | ||
| 233 | * Reconfigures the network offloads that Guest can handle. | ||
| 234 | * | ||
| 235 | * Available with the VIRTIO_NET_F_CTRL_GUEST_OFFLOADS feature bit. | ||
| 236 | * | ||
| 237 | * Command data format matches the feature bit mask exactly. | ||
| 238 | * | ||
| 239 | * See VIRTIO_NET_F_GUEST_* for the list of offloads | ||
| 240 | * that can be enabled/disabled. | ||
| 241 | */ | ||
| 242 | #define VIRTIO_NET_CTRL_GUEST_OFFLOADS 5 | ||
| 243 | #define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET 0 | ||
| 244 | |||
| 229 | #endif /* _LINUX_VIRTIO_NET_H */ | 245 | #endif /* _LINUX_VIRTIO_NET_H */ |
| @@ -157,6 +157,12 @@ struct virtio_pci_common_cfg { · 156 unmodified lines | |||
| 157 | __le32 queue_used_hi; /* read-write */ | 157 | __le32 queue_used_hi; /* read-write */ |
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | /* Fields in VIRTIO_PCI_CAP_PCI_CFG: */ | ||
| 161 | struct virtio_pci_cfg_cap { | ||
| 162 | struct virtio_pci_cap cap; | ||
| 163 | __u8 pci_cfg_data[4]; /* Data for BAR access. */ | ||
| 164 | }; | ||
| 165 | |||
| 160 | /* Macro versions of offsets for the Old Timers! */ | 166 | /* Macro versions of offsets for the Old Timers! */ |
| 161 | #define VIRTIO_PCI_CAP_VNDR 0 | 167 | #define VIRTIO_PCI_CAP_VNDR 0 |
| 162 | #define VIRTIO_PCI_CAP_NEXT 1 | 168 | #define VIRTIO_PCI_CAP_NEXT 1 |
| @@ -31,6 +31,9 @@ · 30 unmodified lines | |||
| 31 | * SUCH DAMAGE. | 31 | * SUCH DAMAGE. |
| 32 | * | 32 | * |
| 33 | * Copyright Rusty Russell IBM Corporation 2007. */ | 33 | * Copyright Rusty Russell IBM Corporation 2007. */ |
| 34 | #ifndef __KERNEL__ | ||
| 35 | #include <stdint.h> | ||
| 36 | #endif | ||
| 34 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 35 | #include <linux/virtio_types.h> | 38 | #include <linux/virtio_types.h> |
| 36 | 39 | ||
| @@ -143,7 +146,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, · 106 unmodified lines | |||
| 143 | vr->num = num; | 146 | vr->num = num; |
| 144 | vr->desc = p; | 147 | vr->desc = p; |
| 145 | vr->avail = p + num*sizeof(struct vring_desc); | 148 | vr->avail = p + num*sizeof(struct vring_desc); |
| 146 | vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__virtio16) | 149 | vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16) |
| 147 | + align-1) & ~(align - 1)); | 150 | + align-1) & ~(align - 1)); |
| 148 | } | 151 | } |
| 149 | 152 | ||