summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2018-02-16 17:17:27 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-02-24 00:53:19 -0500
commitc991410874e1c4164404b33060b31bf2d99d1ae6 (patch)
tree4b162cb15a8fb6d4441182e17b97d4737a25d358 /drivers
parented36c605451ee703c2714e26a87982428b16b26c (diff)
gpu: nvgpu: Abstract kernel_restart()
This function is used in gk20a.c to handle catastrophic error conditions but is Linux specific. As such, implement an abstraction for this in driver_common.c and expose the API in nvgpu_common.h. JIRA NVGPU-525 Signed-off-by: Alex Waterman <alexw@nvidia.com> Change-Id: Ie2e417d30af5ff7db76f4d2d5b97ec96c386bd04 Reviewed-on: https://git-master.nvidia.com/r/1662543 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: Deepak Nibade <dnibade@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/common/linux/driver_common.c6
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c4
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index b3333e37..9029366f 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -14,6 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include <linux/reboot.h>
17#include <linux/dma-mapping.h> 18#include <linux/dma-mapping.h>
18#include <linux/mm.h> 19#include <linux/mm.h>
19#include <uapi/linux/nvgpu.h> 20#include <uapi/linux/nvgpu.h>
@@ -37,6 +38,11 @@
37 38
38#define EMC3D_DEFAULT_RATIO 750 39#define EMC3D_DEFAULT_RATIO 750
39 40
41void nvgpu_kernel_restart(void *cmd)
42{
43 kernel_restart(cmd);
44}
45
40static void nvgpu_init_vars(struct gk20a *g) 46static void nvgpu_init_vars(struct gk20a *g)
41{ 47{
42 struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); 48 struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 868792c0..6aae851e 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -22,8 +22,6 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <linux/reboot.h>
26
27#include <nvgpu/nvgpu_common.h> 25#include <nvgpu/nvgpu_common.h>
28#include <nvgpu/kmem.h> 26#include <nvgpu/kmem.h>
29#include <nvgpu/allocator.h> 27#include <nvgpu/allocator.h>
@@ -61,7 +59,7 @@ void __nvgpu_check_gpu_state(struct gk20a *g)
61 if (boot_0 == 0xffffffff) { 59 if (boot_0 == 0xffffffff) {
62 nvgpu_err(g, "GPU has disappeared from bus!!"); 60 nvgpu_err(g, "GPU has disappeared from bus!!");
63 nvgpu_err(g, "Rebooting system!!"); 61 nvgpu_err(g, "Rebooting system!!");
64 kernel_restart(NULL); 62 nvgpu_kernel_restart(NULL);
65 } 63 }
66} 64}
67 65
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h
index 50e8c8f1..34660516 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h
@@ -31,4 +31,6 @@ int nvgpu_probe(struct gk20a *g,
31 const char *interface_name, 31 const char *interface_name,
32 struct class *class); 32 struct class *class);
33 33
34void nvgpu_kernel_restart(void *cmd);
35
34#endif 36#endif