105 lines
3 KiB
Diff
105 lines
3 KiB
Diff
From d270372bf8abcf45409b30cdb33069280527b0ff Mon Sep 17 00:00:00 2001
|
|
From: Alberto Milone <alberto.milone@canonical.com>
|
|
Date: Wed, 15 Feb 2017 18:01:02 +0100
|
|
Subject: [PATCH 1/1] Add support for Linux 4.10
|
|
|
|
---
|
|
nv-linux.h | 5 +++++
|
|
nv-pat.c | 40 ++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 45 insertions(+)
|
|
|
|
diff --git kernel/nv-linux.h kernel/nv-linux.h
|
|
index b46e71f..3081c06 100644
|
|
--- kernel/nv-linux.h
|
|
+++ kernel/nv-linux.h
|
|
@@ -1895,8 +1895,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
|
|
|
|
#else
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
|
return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
|
|
pages, vmas);
|
|
+#else
|
|
+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
|
|
+ pages, vmas, NULL);
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
diff --git kernel/nv-pat.c kernel/nv-pat.c
|
|
index e71e81c..d742789 100644
|
|
--- kernel/nv-pat.c
|
|
+++ kernel/nv-pat.c
|
|
@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
|
|
}
|
|
|
|
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
|
static int
|
|
nv_kern_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
|
{
|
|
@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
|
|
.notifier_call = nv_kern_cpu_callback,
|
|
.priority = 0
|
|
};
|
|
+#else
|
|
+static int nvidia_cpu_online(unsigned int hcpu)
|
|
+{
|
|
+ unsigned int cpu = get_cpu();
|
|
+ if (cpu == hcpu)
|
|
+ nv_setup_pat_entries(NULL);
|
|
+ else
|
|
+ NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
|
|
+
|
|
+ put_cpu();
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int nvidia_cpu_down_prep(unsigned int hcpu)
|
|
+{
|
|
+ unsigned int cpu = get_cpu();
|
|
+ if (cpu == hcpu)
|
|
+ nv_restore_pat_entries(NULL);
|
|
+ else
|
|
+ NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1);
|
|
+
|
|
+ put_cpu();
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
#endif
|
|
|
|
int nv_init_pat_support(nv_stack_t *sp)
|
|
@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
|
|
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
|
if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
|
|
{
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
|
if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
|
|
+#else
|
|
+ if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
|
|
+ "gpu/nvidia:online",
|
|
+ nvidia_cpu_online,
|
|
+ nvidia_cpu_down_prep) != 0)
|
|
+#endif
|
|
{
|
|
nv_disable_pat_support();
|
|
nv_printf(NV_DBG_ERRORS,
|
|
@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)
|
|
{
|
|
nv_disable_pat_support();
|
|
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
|
unregister_hotcpu_notifier(&nv_hotcpu_nfb);
|
|
+#else
|
|
+ cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
|
|
+#endif
|
|
#endif
|
|
}
|
|
}
|
|
--
|
|
2.7.4
|
|
|