Skip to contentSkip to conversation

intel_cacheinfo: remove MAX_CACHE_LEAVES limit

PATCH In review Siddha, Suresh B 2 participants 3 messages Sep 19, 2005 – Sep 21, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 intel_cacheinfo: remove MAX_CACHE_LEAVES limit

Remove the MAX_CACHE_LEAVES limit from the routine which calculates the number of cache levels using cpuid(4)

Cc Venkatesh Pallipadi <[email protected]>
arch/i386/kernel/cpu/intel_cacheinfo.c +6 -12
@@ -117,7 +117,6 @@ struct _cpuid4_info {
 	cpumask_t shared_cpu_map;
 };
 
-#define MAX_CACHE_LEAVES		4
 static unsigned short			num_cache_leaves;
 
 static int __devinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
@@ -144,20 +143,15 @@ static int __init find_num_cache_leaves(
 {
 	unsigned int		eax, ebx, ecx, edx;
 	union _cpuid4_leaf_eax	cache_eax;
-	int 			i;
-	int 			retval;
+	int 			i = -1;
 
-	retval = MAX_CACHE_LEAVES;
-	/* Do cpuid(4) loop to find out num_cache_leaves */
-	for (i = 0; i < MAX_CACHE_LEAVES; i++) {
+	do {
+		++i;
+		/* Do cpuid(4) loop to find out num_cache_leaves */
 		cpuid_count(4, i, &eax, &ebx, &ecx, &edx);
 		cache_eax.full = eax;
-		if (cache_eax.split.type == CACHE_TYPE_NULL) {
-			retval = i;
-			break;
-		}
-	}
-	return retval;
+	} while (cache_eax.split.type != CACHE_TYPE_NULL);
+	return i;
 }
 
 unsigned int __devinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
#1 lore raw
Quoted 3 lines · Suresh B

Remove the MAX_CACHE_LEAVES limit from the routine which calculates the number of cache levels using cpuid(4)

Why? Why was the code there originally, and why is it required that it be removed, and why is it safe to remove it?

(IOW: your description of this patch is inadequate: it describes what was done, but not why it was done).

Thanks.

#2 lore raw
Quoted 10 lines · Andrew Morton
Quoted 3 lines · Suresh B

Remove the MAX_CACHE_LEAVES limit from the routine which calculates the number of cache levels using cpuid(4)

Why? Why was the code there originally, and why is it required that it be removed, and why is it safe to remove it?

(IOW: your description of this patch is inadequate: it describes what was done, but not why it was done).

oops! Initial internal version of Venki's cpuid(4) deterministic cache parameter identification patch used static arrays of size MAX_CACHE_LEAVES. Final patch which made to the base used dynamic array allocation, with this MAX_CACHE_LEAVES limit hunk still in place.

cpuid(4) already has a mechanism to find out the number of cache levels implemented and there is no need for this hardcoded MAX_CACHE_LEAVES limit.

thanks,
suresh