github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

HV: RDT: merge struct rdt_cache and rdt_membw in to a union

Browse Source 
A RDT resource could be CAT or MBA, so only one of struct rdt_cache and struct rdt_membw
would be used at a time. They should be a union.
This commit merge struct rdt_cache and struct rdt_membw in to a union res.

Tracked-On: #4604
Signed-off-by: Yan, Like <like.yan@intel.com>
Reviewed-by: Vijay Dhanraj <vijay.dhanraj@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com
This commit is contained in:
Yan, Like 2020-04-24 09:59:15 +08:00 committed by wenlingz
parent bfe2a1c525
commit f774ee1fba
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hypervisor/arch/x86/rdt.c
View File

@ -19,7 +19,7 @@
static struct rdt_info res_cap_info[RDT_NUM_RESOURCES] = { static struct rdt_info res_cap_info[RDT_NUM_RESOURCES] = {
[RDT_RESOURCE_L3] = { [RDT_RESOURCE_L3] = {
.cache = { .res.cache = {
.bitmask = 0U, .bitmask = 0U,
.cbm_len = 0U, .cbm_len = 0U,
}, },
@ -29,7 +29,7 @@ static struct rdt_info res_cap_info[RDT_NUM_RESOURCES] = {
.platform_clos_array = NULL .platform_clos_array = NULL
}, },
[RDT_RESOURCE_L2] = { [RDT_RESOURCE_L2] = {
.cache = { .res.cache = {
.bitmask = 0U, .bitmask = 0U,
.cbm_len = 0U, .cbm_len = 0U,
}, },
@ -39,7 +39,7 @@ static struct rdt_info res_cap_info[RDT_NUM_RESOURCES] = {
.platform_clos_array = NULL .platform_clos_array = NULL
}, },
[RDT_RESOURCE_MBA] = { [RDT_RESOURCE_MBA] = {
.membw = { .res.membw = {
.mba_max = 0U, .mba_max = 0U,
.delay_linear = true, .delay_linear = true,
}, },
@ -67,8 +67,8 @@ static void rdt_read_cat_capability(int res)
* CPUID.(EAX=0x10,ECX=ResID):EDX[15:0] reports the maximun CLOS supported * CPUID.(EAX=0x10,ECX=ResID):EDX[15:0] reports the maximun CLOS supported
*/ */
cpuid_subleaf(CPUID_RDT_ALLOCATION, res_cap_info[res].res_id, &eax, &ebx, &ecx, &edx); cpuid_subleaf(CPUID_RDT_ALLOCATION, res_cap_info[res].res_id, &eax, &ebx, &ecx, &edx);
res_cap_info[res].cache.cbm_len = (uint16_t)((eax & 0x1fU) + 1U); res_cap_info[res].res.cache.cbm_len = (uint16_t)((eax & 0x1fU) + 1U);
res_cap_info[res].cache.bitmask = ebx; res_cap_info[res].res.cache.bitmask = ebx;
res_cap_info[res].clos_max = (uint16_t)(edx & 0xffffU) + 1U; res_cap_info[res].clos_max = (uint16_t)(edx & 0xffffU) + 1U;
} }
@ -82,8 +82,8 @@ static void rdt_read_mba_capability(int res)
* CPUID.(EAX=0x10,ECX=ResID):EDX[15:0] reports the maximun CLOS supported * CPUID.(EAX=0x10,ECX=ResID):EDX[15:0] reports the maximun CLOS supported
*/ */
cpuid_subleaf(CPUID_RDT_ALLOCATION, res_cap_info[res].res_id, &eax, &ebx, &ecx, &edx); cpuid_subleaf(CPUID_RDT_ALLOCATION, res_cap_info[res].res_id, &eax, &ebx, &ecx, &edx);
res_cap_info[res].membw.mba_max = (uint16_t)((eax & 0xfffU) + 1U); res_cap_info[res].res.membw.mba_max = (uint16_t)((eax & 0xfffU) + 1U);
res_cap_info[res].membw.delay_linear = ((ecx & 0x4U) != 0U) ? true : false; res_cap_info[res].res.membw.delay_linear = ((ecx & 0x4U) != 0U) ? true : false;
res_cap_info[res].clos_max = (uint16_t)(edx & 0xffffU) + 1U; res_cap_info[res].clos_max = (uint16_t)(edx & 0xffffU) + 1U;
} }
@ -152,7 +152,7 @@ static bool setup_res_clos_msr(uint16_t pcpu_id, uint16_t res, struct platform_c
switch (res) { switch (res) {
case RDT_RESOURCE_L3: case RDT_RESOURCE_L3:
case RDT_RESOURCE_L2: case RDT_RESOURCE_L2:
if ((fls32(res_clos_info->clos_mask) >= res_cap_info[res].cache.cbm_len) || if ((fls32(res_clos_info->clos_mask) >= res_cap_info[res].res.cache.cbm_len) ||
(res_clos_info->msr_index != (res_cap_info[res].msr_base + i))) { (res_clos_info->msr_index != (res_cap_info[res].msr_base + i))) {
ret = false; ret = false;
pr_err("Fix CLOS %d mask=0x%x and(/or) MSR index=0x%x for Res_ID %d in board.c", pr_err("Fix CLOS %d mask=0x%x and(/or) MSR index=0x%x for Res_ID %d in board.c",
@ -162,7 +162,7 @@ static bool setup_res_clos_msr(uint16_t pcpu_id, uint16_t res, struct platform_c
} }
break; break;
case RDT_RESOURCE_MBA: case RDT_RESOURCE_MBA:
if ((res_clos_info->mba_delay > res_cap_info[res].membw.mba_max) || if ((res_clos_info->mba_delay > res_cap_info[res].res.membw.mba_max) ||
(res_clos_info->msr_index != (res_cap_info[res].msr_base + i))) { (res_clos_info->msr_index != (res_cap_info[res].msr_base + i))) {
ret = false; ret = false;
pr_err("Fix CLOS %d delay=0x%x and(/or) MSR index=0x%x for Res_ID %d in board.c", pr_err("Fix CLOS %d delay=0x%x and(/or) MSR index=0x%x for Res_ID %d in board.c",

16
hypervisor/include/arch/x86/rdt.h
View File

@ -23,21 +23,19 @@ enum {
extern const uint16_t hv_clos; extern const uint16_t hv_clos;
extern const uint16_t platform_clos_num; extern const uint16_t platform_clos_num;
struct rdt_cache { /* The intel Resource Director Tech(RDT) based Allocation Tech support */
struct rdt_info {
union {
struct {
uint32_t bitmask; /* A bitmask where each set bit indicates the corresponding cache way uint32_t bitmask; /* A bitmask where each set bit indicates the corresponding cache way
may be used by other entities in the platform (e.g. GPU) */ may be used by other entities in the platform (e.g. GPU) */
uint16_t cbm_len; /* Length of Cache mask in bits */ uint16_t cbm_len; /* Length of Cache mask in bits */
}; } cache;
struct rdt_membw { struct rdt_membw {
uint16_t mba_max; /* Max MBA delay throttling value supported */ uint16_t mba_max; /* Max MBA delay throttling value supported */
bool delay_linear; /* True if memory B/W delay is in linear scale */ bool delay_linear; /* True if memory B/W delay is in linear scale */
}; } membw;
} res;
/* The intel Resource Director Tech(RDT) based Allocation Tech support */
struct rdt_info {
struct rdt_cache cache;
struct rdt_membw membw;
uint16_t clos_max; /* Maximum CLOS supported, 0 indicates resource is not supported.*/ uint16_t clos_max; /* Maximum CLOS supported, 0 indicates resource is not supported.*/
uint32_t res_id; uint32_t res_id;
uint32_t msr_base; /* MSR base to program clos mask*/ uint32_t msr_base; /* MSR base to program clos mask*/