1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=2#post1823327
http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=3#post1843626
--- usr/src/nv/Makefile.kbuild
+++ usr/src/nv.2990799/Makefile.kbuild
@@ -185,14 +185,16 @@
acquire_console_sem \
kmem_cache_create \
on_each_cpu \
- smp_call_function
+ smp_call_function \
+ acpi_evaluate_integer
else
COMPILE_TESTS = \
remap_page_range \
vmap \
change_page_attr \
i2c_adapter \
- smp_call_function
+ smp_call_function \
+ acpi_evaluate_integer
endif
#
--- usr/src/nv/Makefile.nvidia
+++ usr/src/nv.2990799/Makefile.nvidia
@@ -59,7 +59,8 @@
vmap \
change_page_attr \
i2c_adapter \
- smp_call_function
+ smp_call_function \
+ acpi_evaluate_integer
DEFINES+=$(EXTRA_DEFINES)
--- usr/src/nv/conftest.sh
+++ usr/src/nv.2990799/conftest.sh
@@ -67,6 +67,8 @@
}
build_cflags() {
+ ARCH=`uname -m | sed -e 's/i.86/i386/'`
+
BASE_CFLAGS="-D__KERNEL__ \
-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
-nostdinc -isystem $ISYSTEM"
@@ -80,16 +82,20 @@
test_xen
if [ "$OUTPUT" != "$SOURCES" ]; then
- ARCH=`uname -m | sed -e 's/i.86/i386/'`
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
fi
else
MACH_CFLAGS="-I$HEADERS/asm/mach-default"
+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
fi
@@ -97,6 +103,9 @@
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
fi
@@ -858,7 +867,7 @@
if [ -f conftest$$.o ]; then
rm -f conftest$$.o
- echo "#undef NV_ON_EACH_CPU" >> conftest.h
+ echo "#undef NV_ON_EACH_CPU_PRESENT" >> conftest.h
return
fi
@@ -897,6 +906,57 @@
fi
;;
+ acpi_evaluate_integer)
+ #
+ # Determine if the acpi_evaluate_integer() function is
+ # present and the type of its 'data' argument.
+ #
+
+ echo "$CONFTEST_PREAMBLE
+ #include <acpi/acpi_bus.h>
+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
+ struct acpi_object_list *l, unsigned long long *d) {
+ return AE_OK;
+ }" > conftest$$.c
+
+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+ rm -f conftest$$.c
+
+ if [ -f conftest$$.o ]; then
+ rm -f conftest$$.o
+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
+ echo "typedef unsigned long long nv_acpi_integer_t;" >> conftest.h
+ return
+ fi
+
+ echo "$CONFTEST_PREAMBLE
+ #include <acpi/acpi_bus.h>
+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
+ struct acpi_object_list *l, unsigned long *d) {
+ return AE_OK;
+ }" > conftest$$.c
+
+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+ rm -f conftest$$.c
+
+ if [ -f conftest$$.o ]; then
+ rm -f conftest$$.o
+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
+ return
+ else
+ #
+ # We can't report a compile test failure here because
+ # this is a catch-all for both kernels that don't
+ # have acpi_evaluate_integer() and kernels that have
+ # broken header files that make it impossible to
+ # tell if the function is present.
+ #
+ echo "#undef NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
+ fi
+ ;;
+
esac
}
--- usr/src/nv/nvacpi.c
+++ usr/src/nv.2990799/nvacpi.c
@@ -136,7 +136,7 @@
struct acpi_object_list control_argument_list = { 0, NULL };
nv_stack_t *sp = NULL;
struct list_head *node, *next;
- unsigned long device_id = 0;
+ nv_acpi_integer_t device_id = 0;
int device_counter = 0;
NV_KMEM_CACHE_ALLOC_STACK(sp);
@@ -158,11 +158,9 @@
os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t));
- // assign driver data structure ptr to this device
- acpi_driver_data(device) = pNvAcpiObject;
-
- // store a device reference in our object
+ device->driver_data = pNvAcpiObject;
pNvAcpiObject->device = device;
+
pNvAcpiObject->sp = sp;
// grab handles to all the important nodes representing devices
@@ -306,7 +304,7 @@
*/
nv_acpi_t *pNvAcpiObject = data;
u32 event_val = 0;
- unsigned long state;
+ nv_acpi_integer_t state;
int status = 0;
int device_counter = 0;
|
GitWeb