On Fri, 15 Nov 2019 15:53:49 +0800
Tao Xu <tao3...@intel.com> wrote:
> From: Liu Jingqi <jingqi....@intel.com>
>
> This structure describes the memory access latency and bandwidth
> information from various memory access initiator proximity domains.
> The latency and bandwidth numbers represented in this structure
> correspond to rated latency and bandwidth for the platform.
> The software could use this information as hint for optimization.
>
> Signed-off-by: Liu Jingqi <jingqi....@intel.com>
> Signed-off-by: Tao Xu <tao3...@intel.com>
> ---
>
> Changes in v16:
> - Add more description for lb_length (Igor)
> - Drop entry_list and calculate entries in this patch (Igor)
>
> Changes in v13:
> - Calculate the entries in a new patch.
> ---
> hw/acpi/hmat.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 104 insertions(+), 1 deletion(-)
>
> diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c
> index 9ff79308a4..ed19ebed2f 100644
> --- a/hw/acpi/hmat.c
> +++ b/hw/acpi/hmat.c
> @@ -25,8 +25,10 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "sysemu/numa.h"
> #include "hw/acpi/hmat.h"
> +#include "qemu/error-report.h"
do you really need this header in this patch?
modulo above nit, patch looks good so
with above fixed (if necessary)
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
>
> /*
> * ACPI 6.3:
> @@ -67,11 +69,89 @@ static void build_hmat_mpda(GArray *table_data, uint16_t
> flags,
> build_append_int_noprefix(table_data, 0, 8);
> }
>
> +/*
> + * ACPI 6.3: 5.2.27.4 System Locality Latency and Bandwidth Information
> + * Structure: Table 5-146
> + */
> +static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *hmat_lb,
> + uint32_t num_initiator, uint32_t num_target,
> + uint32_t *initiator_list)
> +{
> + int i, index;
> + HMAT_LB_Data *lb_data;
> + uint16_t *entry_list;
> + uint32_t base;
> + /* Length in bytes for entire structure */
> + uint32_t lb_length
> + = 32 /* Table length upto and including Entry Base Unit */
> + + 4 * num_initiator /* Initiator Proximity Domain List */
> + + 4 * num_target /* Target Proximity Domain List */
> + + 2 * num_initiator * num_target; /* Latency or Bandwidth Entries */
> +
> + /* Type */
> + build_append_int_noprefix(table_data, 1, 2);
> + /* Reserved */
> + build_append_int_noprefix(table_data, 0, 2);
> + /* Length */
> + build_append_int_noprefix(table_data, lb_length, 4);
> + /* Flags: Bits [3:0] Memory Hierarchy, Bits[7:4] Reserved */
> + assert(!(hmat_lb->hierarchy >> 4));
> + build_append_int_noprefix(table_data, hmat_lb->hierarchy, 1);
> + /* Data Type */
> + build_append_int_noprefix(table_data, hmat_lb->data_type, 1);
> + /* Reserved */
> + build_append_int_noprefix(table_data, 0, 2);
> + /* Number of Initiator Proximity Domains (s) */
> + build_append_int_noprefix(table_data, num_initiator, 4);
> + /* Number of Target Proximity Domains (t) */
> + build_append_int_noprefix(table_data, num_target, 4);
> + /* Reserved */
> + build_append_int_noprefix(table_data, 0, 4);
> +
> + /* Entry Base Unit */
> + if (hmat_lb->data_type <= HMAT_LB_DATA_WRITE_LATENCY) {
> + /* Convert latency base from nanoseconds to picosecond */
> + base = hmat_lb->base * 1000;
> + } else {
> + /* Convert bandwidth base from Byte to Megabyte */
> + base = hmat_lb->base / MiB;
> + }
> + build_append_int_noprefix(table_data, base, 8);
> +
> + /* Initiator Proximity Domain List */
> + for (i = 0; i < num_initiator; i++) {
> + build_append_int_noprefix(table_data, initiator_list[i], 4);
> + }
> +
> + /* Target Proximity Domain List */
> + for (i = 0; i < num_target; i++) {
> + build_append_int_noprefix(table_data, i, 4);
> + }
> +
> + /* Latency or Bandwidth Entries */
> + entry_list = g_malloc0(hmat_lb->list->len * sizeof(uint16_t));
> + for (i = 0; i < hmat_lb->list->len; i++) {
> + lb_data = &g_array_index(hmat_lb->list, HMAT_LB_Data, i);
> + index = lb_data->initiator * num_target + lb_data->target;
> +
> + entry_list[index] = (uint16_t)(lb_data->data / hmat_lb->base);
> + }
> +
> + for (i = 0; i < num_initiator * num_target; i++) {
> + build_append_int_noprefix(table_data, entry_list[i], 2);
> + }
> +
> + g_free(entry_list);
> +}
> +
> /* Build HMAT sub table structures */
> static void hmat_build_table_structs(GArray *table_data, NumaState
> *numa_state)
> {
> uint16_t flags;
> - int i;
> + uint32_t num_initiator = 0;
> + uint32_t initiator_list[MAX_NODES];
> + int i, hierarchy, type;
> + HMAT_LB_Info *hmat_lb;
>
> for (i = 0; i < numa_state->num_nodes; i++) {
> flags = 0;
> @@ -82,6 +162,29 @@ static void hmat_build_table_structs(GArray *table_data,
> NumaState *numa_state)
>
> build_hmat_mpda(table_data, flags, numa_state->nodes[i].initiator,
> i);
> }
> +
> + for (i = 0; i < numa_state->num_nodes; i++) {
> + if (numa_state->nodes[i].has_cpu) {
> + initiator_list[num_initiator++] = i;
> + }
> + }
> +
> + /*
> + * ACPI 6.3: 5.2.27.4 System Locality Latency and Bandwidth Information
> + * Structure: Table 5-146
> + */
> + for (hierarchy = HMAT_LB_MEM_MEMORY;
> + hierarchy <= HMAT_LB_MEM_CACHE_3RD_LEVEL; hierarchy++) {
> + for (type = HMAT_LB_DATA_ACCESS_LATENCY;
> + type <= HMAT_LB_DATA_WRITE_BANDWIDTH; type++) {
> + hmat_lb = numa_state->hmat_lb[hierarchy][type];
> +
> + if (hmat_lb) {
> + build_hmat_lb(table_data, hmat_lb, num_initiator,
> + numa_state->num_nodes, initiator_list);
> + }
> + }
> + }
> }
>
> void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState
> *numa_state)
