From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:a111:0:0:0:0:0 with SMTP id o17-v6csp2037382wro; Sun, 4 Nov 2018 17:54:05 -0800 (PST) X-Google-Smtp-Source: AJdET5eIH3OEnibr6mkyhq6ioLykJp7/PiPpkmmYhm7z90yGlvnZhAzSBzcqa4Bu0Zl5Ry29lbfv X-Received: by 2002:aed:3f22:: with SMTP id p31mr9567681qtf.185.1541382845685; Sun, 04 Nov 2018 17:54:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541382845; cv=none; d=google.com; s=arc-20160816; b=J3jAybmqwEUxOyds00Hus8EwbYvKd3p2G24ia1Iyjq0odR0aVPz6ulyJCKr+6PnoHA pxWvGcXODlWu2PnVGzp2/uNfVUf9WxZcEO8c7uW+dUZ3k/g5/B8ava1DVy+tONiHQSNp cY4YZqielhTHtBjeX9KgxoXVcuuSg7KZp+s4dw8F50XlT0m8T8q5oqbQvrnBUu8wY4dH cAsFmbfqvSswA2eDw72p5KGulKRbB2GI5OurknCuGIf+NmtKfcQkZ65oCni+Lj2E/nqo tLTAPZozFq/MWbzBTjYy0U+xEGMgGNjDb1uG68Aub8YBPM7iiBW9klvaIZmbeJwEgQr+ uMqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=4tWCWwouHyeilRf6DFS0h52a8nCBmQ3v5WMUtGP/dd8=; b=cO5wILKbGW1YrDdTfDdfV/iG1aj837fXQW5JWYmxye9DkYaVKcT+kcADTPJLpRAD/R Vgflsg3EfAcFaZEAMwrgYX5o2nfUpNvj6w8EMIJAh72RhRXGkC3JnqAloSd7hSNgQmc3 h0ilDURv3GZgP/J9wiTAJOpFg8qmBgM+ywXmEorIjH4kIzCdf/U3JReF0U3cK+epskA6 wvqUkMC3+duijr1AFqVWGBBd+f1P5VApgRTEU3uHsFo2mSFJECZ6WJ8yxn5RnG6bizaS Z6Yw2YEip3c69RjnwtMQ0jASW8fk9x0Nsdgv/lWxbVYS0B2XIKtoG3y2aJzP0l8H22cX qA2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y12si4511535qth.357.2018.11.04.17.54.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 04 Nov 2018 17:54:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([::1]:60910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJU5d-00024W-5e for alex.bennee@linaro.org; Sun, 04 Nov 2018 20:54:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTv2-00086m-53 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTux-0003CP-7X for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:08 -0500 Received: from mga18.intel.com ([134.134.136.126]:7994) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJTuv-0003BH-CD; Sun, 04 Nov 2018 20:43:03 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 17:42:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,466,1534834800"; d="scan'208";a="277074430" Received: from emurphy1-mobl1.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.26.250]) by fmsmga005.fm.intel.com with ESMTP; 04 Nov 2018 17:42:53 -0800 From: Samuel Ortiz To: qemu-devel@nongnu.org Date: Mon, 5 Nov 2018 02:40:38 +0100 Message-Id: <20181105014047.26447-16-sameo@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH v5 15/24] hw: i386: Export the i386 ACPI SRAT build method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: iSyb0uIDcxDV This is the standard way of building SRAT on x86 platfoms. But future machine types could decide to define their own custom SRAT build method through the ACPI builder methods. Moreover, we will also need to reach build_srat() from outside of acpi-build in order to use it as the ACPI builder SRAT build method. Signed-off-by: Samuel Ortiz --- hw/i386/acpi-build.h | 5 +++++ hw/i386/acpi-build.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h index 065a1d8250..d73c41fe8f 100644 --- a/hw/i386/acpi-build.h +++ b/hw/i386/acpi-build.h @@ -4,6 +4,11 @@ #include "hw/acpi/acpi.h" +/* ACPI SRAT (Static Resource Affinity Table) build method for x86 */ +void +build_srat(GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *acpi_conf); + void acpi_setup(MachineState *machine, AcpiConfiguration *acpi_conf); #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1ef1a38441..673c5dfafc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1615,7 +1615,7 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) #define HOLE_640K_START (640 * KiB) #define HOLE_640K_END (1 * MiB) -static void +void build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine, AcpiConfiguration *acpi_conf) { -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: [PATCH v5 15/24] hw: i386: Export the i386 ACPI SRAT build method Date: Mon, 5 Nov 2018 02:40:38 +0100 Message-ID: <20181105014047.26447-16-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gJTuu-00049s-N4 for xen-devel@lists.xenproject.org; Mon, 05 Nov 2018 01:43:00 +0000 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org VGhpcyBpcyB0aGUgc3RhbmRhcmQgd2F5IG9mIGJ1aWxkaW5nIFNSQVQgb24geDg2IHBsYXRmb21z LiBCdXQgZnV0dXJlCm1hY2hpbmUgdHlwZXMgY291bGQgZGVjaWRlIHRvIGRlZmluZSB0aGVpciBv d24gY3VzdG9tIFNSQVQgYnVpbGQgbWV0aG9kCnRocm91Z2ggdGhlIEFDUEkgYnVpbGRlciBtZXRo b2RzLgpNb3Jlb3Zlciwgd2Ugd2lsbCBhbHNvIG5lZWQgdG8gcmVhY2ggYnVpbGRfc3JhdCgpIGZy b20gb3V0c2lkZSBvZgphY3BpLWJ1aWxkIGluIG9yZGVyIHRvIHVzZSBpdCBhcyB0aGUgQUNQSSBi dWlsZGVyIFNSQVQgYnVpbGQgbWV0aG9kLgoKU2lnbmVkLW9mZi1ieTogU2FtdWVsIE9ydGl6IDxz YW1lb0BsaW51eC5pbnRlbC5jb20+Ci0tLQogaHcvaTM4Ni9hY3BpLWJ1aWxkLmggfCA1ICsrKysr CiBody9pMzg2L2FjcGktYnVpbGQuYyB8IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmgg Yi9ody9pMzg2L2FjcGktYnVpbGQuaAppbmRleCAwNjVhMWQ4MjUwLi5kNzNjNDFmZThmIDEwMDY0 NAotLS0gYS9ody9pMzg2L2FjcGktYnVpbGQuaAorKysgYi9ody9pMzg2L2FjcGktYnVpbGQuaApA QCAtNCw2ICs0LDExIEBACiAKICNpbmNsdWRlICJody9hY3BpL2FjcGkuaCIKIAorLyogQUNQSSBT UkFUIChTdGF0aWMgUmVzb3VyY2UgQWZmaW5pdHkgVGFibGUpIGJ1aWxkIG1ldGhvZCBmb3IgeDg2 ICovCit2b2lkCitidWlsZF9zcmF0KEdBcnJheSAqdGFibGVfZGF0YSwgQklPU0xpbmtlciAqbGlu a2VyLAorICAgICAgICAgICBNYWNoaW5lU3RhdGUgKm1hY2hpbmUsIEFjcGlDb25maWd1cmF0aW9u ICphY3BpX2NvbmYpOworCiB2b2lkIGFjcGlfc2V0dXAoTWFjaGluZVN0YXRlICptYWNoaW5lLCBB Y3BpQ29uZmlndXJhdGlvbiAqYWNwaV9jb25mKTsKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9ody9p Mzg2L2FjcGktYnVpbGQuYyBiL2h3L2kzODYvYWNwaS1idWlsZC5jCmluZGV4IDFlZjFhMzg0NDEu LjY3M2M1ZGZhZmMgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvYWNwaS1idWlsZC5jCisrKyBiL2h3L2kz ODYvYWNwaS1idWlsZC5jCkBAIC0xNjE1LDcgKzE2MTUsNyBAQCBidWlsZF90cG0yKEdBcnJheSAq dGFibGVfZGF0YSwgQklPU0xpbmtlciAqbGlua2VyLCBHQXJyYXkgKnRjcGFsb2cpCiAjZGVmaW5l IEhPTEVfNjQwS19TVEFSVCAgKDY0MCAqIEtpQikKICNkZWZpbmUgSE9MRV82NDBLX0VORCAgICgx ICogTWlCKQogCi1zdGF0aWMgdm9pZAordm9pZAogYnVpbGRfc3JhdChHQXJyYXkgKnRhYmxlX2Rh dGEsIEJJT1NMaW5rZXIgKmxpbmtlciwKICAgICAgICAgICAgTWFjaGluZVN0YXRlICptYWNoaW5l LCBBY3BpQ29uZmlndXJhdGlvbiAqYWNwaV9jb25mKQogewotLSAKMi4xOS4xCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTv2-00086m-53 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTux-0003CP-7X for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:08 -0500 From: Samuel Ortiz Date: Mon, 5 Nov 2018 02:40:38 +0100 Message-Id: <20181105014047.26447-16-sameo@linux.intel.com> In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 15/24] hw: i386: Export the i386 ACPI SRAT build method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost This is the standard way of building SRAT on x86 platfoms. But future machine types could decide to define their own custom SRAT build method through the ACPI builder methods. Moreover, we will also need to reach build_srat() from outside of acpi-build in order to use it as the ACPI builder SRAT build method. Signed-off-by: Samuel Ortiz --- hw/i386/acpi-build.h | 5 +++++ hw/i386/acpi-build.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h index 065a1d8250..d73c41fe8f 100644 --- a/hw/i386/acpi-build.h +++ b/hw/i386/acpi-build.h @@ -4,6 +4,11 @@ #include "hw/acpi/acpi.h" +/* ACPI SRAT (Static Resource Affinity Table) build method for x86 */ +void +build_srat(GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *acpi_conf); + void acpi_setup(MachineState *machine, AcpiConfiguration *acpi_conf); #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1ef1a38441..673c5dfafc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1615,7 +1615,7 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) #define HOLE_640K_START (640 * KiB) #define HOLE_640K_END (1 * MiB) -static void +void build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine, AcpiConfiguration *acpi_conf) { -- 2.19.1