From a2ceb5ec310be53227a1e2f7755c1d8ca47e3723 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Fri, 9 Mar 2018 14:05:32 -0800 Subject: gpu: nvgpu: Abstract PCI header usage The mclk code for gp106 requires access to the PCI device ID headers in Linux. This patch makes it so that the mclk code does not need to directly include the Linux headers. This allows us to compile and link the dGPU chips code in the user space unit testing framework. JIRA NVGPU-525 Change-Id: I89e2fa7fbb3b67f061e026e48a374951e7934aa5 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1673823 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/mclk_gp106.c | 3 +-- drivers/gpu/nvgpu/include/nvgpu/pci.h | 39 +++++++++++++++++++++++++++++ drivers/gpu/nvgpu/include/nvgpu/posix/pci.h | 28 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/nvgpu/include/nvgpu/pci.h create mode 100644 drivers/gpu/nvgpu/include/nvgpu/posix/pci.h (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index 1e3e0de8..44f0b1d9 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c @@ -20,8 +20,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include - +#include #include #include #include diff --git a/drivers/gpu/nvgpu/include/nvgpu/pci.h b/drivers/gpu/nvgpu/include/nvgpu/pci.h new file mode 100644 index 00000000..6b5c1310 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/pci.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __NVGPU_PCI_H__ +#define __NVGPU_PCI_H__ + +#ifdef __KERNEL__ +#include +#elif defined(__NVGPU_POSIX__) +#include +#else +/* + * In case someone tries to use this without implementing support! QNX currently + * does it's own thing with regard to PCI so they don't need this, but just in + * case they accidentally include this. + */ +#error "Build bug: need PCI headers!" +#endif + +#endif diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/pci.h b/drivers/gpu/nvgpu/include/nvgpu/posix/pci.h new file mode 100644 index 00000000..cd9fc149 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/posix/pci.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __NVGPU_POSIX_PCI_H__ +#define __NVGPU_POSIX_PCI_H__ + +#define PCI_VENDOR_ID_NVIDIA 0x10de + +#endif -- cgit v1.2.2