diff options
author | Jan Beulich <jbeulich@novell.com> | 2006-12-06 20:14:09 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:09 -0500 |
commit | 365bff806e9faba000fb4956c7486fbf3a746d96 (patch) | |
tree | cdd34beaabbc21b49a3786589679632690a84026 /arch/i386/kernel/cpu/mtrr/cyrix.c | |
parent | eab724e5df17af0ed0dac03da8f75aa336c31206 (diff) |
[PATCH] i386: fix MTRR code
Until not so long ago, there were system log messages pointing to
inconsistent MTRR setup of the video frame buffer caused by the way vesafb
and X worked. While vesafb was fixed meanwhile, I believe fixing it there
only hides a shortcoming in the MTRR code itself, in that that code is not
symmetric with respect to the ordering of attempts to set up two (or more)
regions where one contains the other. In the current shape, it permits
only setting up sub-regions of pre-exisiting ones. The patch below makes
this symmetric.
While working on that I noticed a few more inconsistencies in that code,
namely
- use of 'unsigned int' for sizes in many, but not all places (the patch
is converting this to use 'unsigned long' everywhere, which specifically
might be necessary for x86-64 once a processor supporting more than 44
physical address bits would become available)
- the code to correct inconsistent settings during secondary processor
startup tried (if necessary) to correct, among other things, the value
in IA32_MTRR_DEF_TYPE, however the newly computed value would never get
used (i.e. stored in the respective MSR)
- the generic range validation code checked that the end of the
to-be-added range would be above 1MB; the value checked should have been
the start of the range
- when contained regions are detected, previously this was allowed only
when the old region was uncacheable; this can be symmetric (i.e. the new
region can also be uncacheable) and even further as per Intel's
documentation write-trough and write-back for either region is also
compatible with the respective opposite in the other
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/cpu/mtrr/cyrix.c')
-rw-r--r-- | arch/i386/kernel/cpu/mtrr/cyrix.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/i386/kernel/cpu/mtrr/cyrix.c index 9027a987006b..0737a596db43 100644 --- a/arch/i386/kernel/cpu/mtrr/cyrix.c +++ b/arch/i386/kernel/cpu/mtrr/cyrix.c | |||
@@ -9,7 +9,7 @@ int arr3_protected; | |||
9 | 9 | ||
10 | static void | 10 | static void |
11 | cyrix_get_arr(unsigned int reg, unsigned long *base, | 11 | cyrix_get_arr(unsigned int reg, unsigned long *base, |
12 | unsigned int *size, mtrr_type * type) | 12 | unsigned long *size, mtrr_type * type) |
13 | { | 13 | { |
14 | unsigned long flags; | 14 | unsigned long flags; |
15 | unsigned char arr, ccr3, rcr, shift; | 15 | unsigned char arr, ccr3, rcr, shift; |
@@ -77,7 +77,7 @@ cyrix_get_arr(unsigned int reg, unsigned long *base, | |||
77 | } | 77 | } |
78 | 78 | ||
79 | static int | 79 | static int |
80 | cyrix_get_free_region(unsigned long base, unsigned long size) | 80 | cyrix_get_free_region(unsigned long base, unsigned long size, int replace_reg) |
81 | /* [SUMMARY] Get a free ARR. | 81 | /* [SUMMARY] Get a free ARR. |
82 | <base> The starting (base) address of the region. | 82 | <base> The starting (base) address of the region. |
83 | <size> The size (in bytes) of the region. | 83 | <size> The size (in bytes) of the region. |
@@ -86,9 +86,24 @@ cyrix_get_free_region(unsigned long base, unsigned long size) | |||
86 | { | 86 | { |
87 | int i; | 87 | int i; |
88 | mtrr_type ltype; | 88 | mtrr_type ltype; |
89 | unsigned long lbase; | 89 | unsigned long lbase, lsize; |
90 | unsigned int lsize; | ||
91 | 90 | ||
91 | switch (replace_reg) { | ||
92 | case 7: | ||
93 | if (size < 0x40) | ||
94 | break; | ||
95 | case 6: | ||
96 | case 5: | ||
97 | case 4: | ||
98 | return replace_reg; | ||
99 | case 3: | ||
100 | if (arr3_protected) | ||
101 | break; | ||
102 | case 2: | ||
103 | case 1: | ||
104 | case 0: | ||
105 | return replace_reg; | ||
106 | } | ||
92 | /* If we are to set up a region >32M then look at ARR7 immediately */ | 107 | /* If we are to set up a region >32M then look at ARR7 immediately */ |
93 | if (size > 0x2000) { | 108 | if (size > 0x2000) { |
94 | cyrix_get_arr(7, &lbase, &lsize, <ype); | 109 | cyrix_get_arr(7, &lbase, &lsize, <ype); |
@@ -214,7 +229,7 @@ static void cyrix_set_arr(unsigned int reg, unsigned long base, | |||
214 | 229 | ||
215 | typedef struct { | 230 | typedef struct { |
216 | unsigned long base; | 231 | unsigned long base; |
217 | unsigned int size; | 232 | unsigned long size; |
218 | mtrr_type type; | 233 | mtrr_type type; |
219 | } arr_state_t; | 234 | } arr_state_t; |
220 | 235 | ||