Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'vfio-v5.0-rc4' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- cleanup licenses in new files (Thomas Gleixner)
- cleanup new compiler warnings (Alexey Kardashevskiy)
* tag 'vfio-v5.0-rc4' of git://github.com/awilliam/linux-vfio:
vfio-pci/nvlink2: Fix ancient gcc warnings
vfio/pci: Cleanup license mess
+17
-25
+1
-5
drivers/vfio/pci/trace.h
+1
-5
drivers/vfio/pci/trace.h
···
1
-
/* SPDX-License-Identifier: GPL-2.0+ */
1
+
/* SPDX-License-Identifier: GPL-2.0-only */
2
2
/*
3
3
* VFIO PCI mmap/mmap_fault tracepoints
4
4
*
5
5
* Copyright (C) 2018 IBM Corp. All rights reserved.
6
6
* Author: Alexey Kardashevskiy <aik@ozlabs.ru>
7
-
*
8
-
* This program is free software; you can redistribute it and/or modify
9
-
* it under the terms of the GNU General Public License version 2 as
10
-
* published by the Free Software Foundation.
11
7
*/
12
8
13
9
#undef TRACE_SYSTEM
+16
-20
drivers/vfio/pci/vfio_pci_nvlink2.c
+16
-20
drivers/vfio/pci/vfio_pci_nvlink2.c
···
1
-
// SPDX-License-Identifier: GPL-2.0+
1
+
// SPDX-License-Identifier: GPL-2.0-only
2
2
/*
3
3
* VFIO PCI NVIDIA Whitherspoon GPU support a.k.a. NVLink2.
4
4
*
5
5
* Copyright (C) 2018 IBM Corp. All rights reserved.
6
6
* Author: Alexey Kardashevskiy <aik@ozlabs.ru>
7
-
*
8
-
* This program is free software; you can redistribute it and/or modify
9
-
* it under the terms of the GNU General Public License version 2 as
10
-
* published by the Free Software Foundation.
11
7
*
12
8
* Register an on-GPU RAM region for cacheable access.
13
9
*
···
174
178
struct vfio_pci_region *region, struct vfio_info_cap *caps)
175
179
{
176
180
struct vfio_pci_nvgpu_data *data = region->data;
177
-
struct vfio_region_info_cap_nvlink2_ssatgt cap = { 0 };
178
-
179
-
cap.header.id = VFIO_REGION_INFO_CAP_NVLINK2_SSATGT;
180
-
cap.header.version = 1;
181
-
cap.tgt = data->gpu_tgt;
181
+
struct vfio_region_info_cap_nvlink2_ssatgt cap = {
182
+
.header.id = VFIO_REGION_INFO_CAP_NVLINK2_SSATGT,
183
+
.header.version = 1,
184
+
.tgt = data->gpu_tgt
185
+
};
182
186
183
187
return vfio_info_add_capability(caps, &cap.header, sizeof(cap));
184
188
}
···
361
365
struct vfio_pci_region *region, struct vfio_info_cap *caps)
362
366
{
363
367
struct vfio_pci_npu2_data *data = region->data;
364
-
struct vfio_region_info_cap_nvlink2_ssatgt captgt = { 0 };
365
-
struct vfio_region_info_cap_nvlink2_lnkspd capspd = { 0 };
368
+
struct vfio_region_info_cap_nvlink2_ssatgt captgt = {
369
+
.header.id = VFIO_REGION_INFO_CAP_NVLINK2_SSATGT,
370
+
.header.version = 1,
371
+
.tgt = data->gpu_tgt
372
+
};
373
+
struct vfio_region_info_cap_nvlink2_lnkspd capspd = {
374
+
.header.id = VFIO_REGION_INFO_CAP_NVLINK2_LNKSPD,
375
+
.header.version = 1,
376
+
.link_speed = data->link_speed
377
+
};
366
378
int ret;
367
-
368
-
captgt.header.id = VFIO_REGION_INFO_CAP_NVLINK2_SSATGT;
369
-
captgt.header.version = 1;
370
-
captgt.tgt = data->gpu_tgt;
371
-
372
-
capspd.header.id = VFIO_REGION_INFO_CAP_NVLINK2_LNKSPD;
373
-
capspd.header.version = 1;
374
-
capspd.link_speed = data->link_speed;
375
379
376
380
ret = vfio_info_add_capability(caps, &captgt.header, sizeof(captgt));
377
381
if (ret)