VIA C3 cache info.
This commit is contained in:
briggs
parent
824fd59f6d
commit
bd2376263b
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cacheinfo.h,v 1.1 2003/04/25 21:54:30 fvdl Exp $ */
|
||||
/* $NetBSD: cacheinfo.h,v 1.2 2004/08/08 05:16:16 briggs Exp $ */
|
||||
|
||||
#ifndef _X86_CACHEINFO_H
|
||||
#define _X86_CACHEINFO_H
|
||||
|
|
@ -27,6 +27,7 @@ struct cpu_info;
|
|||
const struct x86_cache_info *cache_info_lookup(const struct x86_cache_info *,
|
||||
u_int8_t);
|
||||
void amd_cpu_cacheinfo(struct cpu_info *);
|
||||
void via_cpu_cacheinfo(struct cpu_info *);
|
||||
void x86_print_cacheinfo(struct cpu_info *);
|
||||
|
||||
/*
|
||||
|
|
@ -107,4 +108,46 @@ void x86_print_cacheinfo(struct cpu_info *);
|
|||
#define AMD_L2_ECX_C_LPT(x) (((x) >> 8) & 0xf)
|
||||
#define AMD_L2_ECX_C_LS(x) ( (x) & 0xff)
|
||||
|
||||
/*
|
||||
* VIA Cache Info:
|
||||
*
|
||||
* Nehemiah (at least)
|
||||
*
|
||||
* Function 8000.0005 L1 TLB/Cache Information
|
||||
* EAX -- reserved
|
||||
* EBX -- L1 TLB 4K pages
|
||||
* ECX -- L1 D-cache
|
||||
* EDX -- L1 I-cache
|
||||
*
|
||||
* Function 8000.0006 L2 Cache Information
|
||||
* EAX -- reserved
|
||||
* EBX -- reserved
|
||||
* ECX -- L2 Unified cache
|
||||
* EDX -- reserved
|
||||
*/
|
||||
|
||||
/* L1 TLB 4K pages */
|
||||
#define VIA_L1_EBX_DTLB_ASSOC(x) (((x) >> 24) & 0xff)
|
||||
#define VIA_L1_EBX_DTLB_ENTRIES(x) (((x) >> 16) & 0xff)
|
||||
#define VIA_L1_EBX_ITLB_ASSOC(x) (((x) >> 8) & 0xff)
|
||||
#define VIA_L1_EBX_ITLB_ENTRIES(x) ( (x) & 0xff)
|
||||
|
||||
/* L1 Data Cache */
|
||||
#define VIA_L1_ECX_DC_SIZE(x) ((((x) >> 24) & 0xff) * 1024)
|
||||
#define VIA_L1_ECX_DC_ASSOC(x) (((x) >> 16) & 0xff)
|
||||
#define VIA_L1_ECX_DC_LPT(x) (((x) >> 8) & 0xff)
|
||||
#define VIA_L1_ECX_DC_LS(x) ( (x) & 0xff)
|
||||
|
||||
/* L1 Instruction Cache */
|
||||
#define VIA_L1_EDX_IC_SIZE(x) ((((x) >> 24) & 0xff) * 1024)
|
||||
#define VIA_L1_EDX_IC_ASSOC(x) (((x) >> 16) & 0xff)
|
||||
#define VIA_L1_EDX_IC_LPT(x) (((x) >> 8) & 0xff)
|
||||
#define VIA_L1_EDX_IC_LS(x) ( (x) & 0xff)
|
||||
|
||||
/* L2 Cache */
|
||||
#define VIA_L2_ECX_C_SIZE(x) ((((x) >> 16) & 0xffff) * 1024)
|
||||
#define VIA_L2_ECX_C_ASSOC(x) (((x) >> 12) & 0xf)
|
||||
#define VIA_L2_ECX_C_LPT(x) (((x) >> 8) & 0xf)
|
||||
#define VIA_L2_ECX_C_LS(x) ( (x) & 0xff)
|
||||
|
||||
#endif /* _X86_CACHEINFO_H */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cacheinfo.c,v 1.4 2004/07/04 00:21:55 mycroft Exp $ */
|
||||
/* $NetBSD: cacheinfo.c,v 1.5 2004/08/08 05:16:16 briggs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: cacheinfo.c,v 1.4 2004/07/04 00:21:55 mycroft Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cacheinfo.c,v 1.5 2004/08/08 05:16:16 briggs Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -251,6 +251,78 @@ amd_cpu_cacheinfo(struct cpu_info *ci)
|
|||
cai->cai_associativity = 0; /* XXX Unknown/reserved */
|
||||
}
|
||||
|
||||
void
|
||||
via_cpu_cacheinfo(struct cpu_info *ci)
|
||||
{
|
||||
struct x86_cache_info *cai;
|
||||
int family, model, stepping;
|
||||
u_int descs[4];
|
||||
u_int lfunc;
|
||||
|
||||
family = (ci->ci_signature >> 8) & 15;
|
||||
model = CPUID2MODEL(ci->ci_signature);
|
||||
stepping = CPUID2STEPPING(ci->ci_signature);
|
||||
|
||||
/*
|
||||
* Determine the largest extended function value.
|
||||
*/
|
||||
CPUID(0x80000000, descs[0], descs[1], descs[2], descs[3]);
|
||||
lfunc = descs[0];
|
||||
|
||||
/*
|
||||
* Determine L1 cache/TLB info.
|
||||
*/
|
||||
if (lfunc < 0x80000005) {
|
||||
/* No L1 cache info available. */
|
||||
return;
|
||||
}
|
||||
|
||||
CPUID(0x80000005, descs[0], descs[1], descs[2], descs[3]);
|
||||
|
||||
cai = &ci->ci_cinfo[CAI_ITLB];
|
||||
cai->cai_totalsize = VIA_L1_EBX_ITLB_ENTRIES(descs[1]);
|
||||
cai->cai_associativity = VIA_L1_EBX_ITLB_ASSOC(descs[1]);
|
||||
cai->cai_linesize = (4 * 1024);
|
||||
|
||||
cai = &ci->ci_cinfo[CAI_DTLB];
|
||||
cai->cai_totalsize = VIA_L1_EBX_DTLB_ENTRIES(descs[1]);
|
||||
cai->cai_associativity = VIA_L1_EBX_DTLB_ASSOC(descs[1]);
|
||||
cai->cai_linesize = (4 * 1024);
|
||||
|
||||
cai = &ci->ci_cinfo[CAI_DCACHE];
|
||||
cai->cai_totalsize = VIA_L1_ECX_DC_SIZE(descs[2]);
|
||||
cai->cai_associativity = VIA_L1_ECX_DC_ASSOC(descs[2]);
|
||||
cai->cai_linesize = VIA_L1_EDX_IC_LS(descs[2]);
|
||||
if (model == 9 && stepping == 8) {
|
||||
/* Erratum: stepping 8 reports 4 when it should be 2 */
|
||||
cai->cai_associativity = 2;
|
||||
}
|
||||
|
||||
cai = &ci->ci_cinfo[CAI_ICACHE];
|
||||
cai->cai_totalsize = VIA_L1_EDX_IC_SIZE(descs[3]);
|
||||
cai->cai_associativity = VIA_L1_EDX_IC_ASSOC(descs[3]);
|
||||
cai->cai_linesize = VIA_L1_EDX_IC_LS(descs[3]);
|
||||
if (model == 9 && stepping == 8) {
|
||||
/* Erratum: stepping 8 reports 4 when it should be 2 */
|
||||
cai->cai_associativity = 2;
|
||||
}
|
||||
|
||||
/*
|
||||
* Determine L2 cache/TLB info.
|
||||
*/
|
||||
if (lfunc < 0x80000006) {
|
||||
/* No L2 cache info available. */
|
||||
return;
|
||||
}
|
||||
|
||||
CPUID(0x80000006, descs[0], descs[1], descs[2], descs[3]);
|
||||
|
||||
cai = &ci->ci_cinfo[CAI_L2CACHE];
|
||||
cai->cai_totalsize = VIA_L2_ECX_C_SIZE(descs[2]);
|
||||
cai->cai_associativity = VIA_L2_ECX_C_ASSOC(descs[2]);
|
||||
cai->cai_linesize = VIA_L2_ECX_C_LS(descs[2]);
|
||||
}
|
||||
|
||||
void
|
||||
x86_print_cacheinfo(struct cpu_info *ci)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue