From: Michael Mueller <mimu@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org, kvm@vger.kernel.org,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Gleb Natapov <gleb@kernel.org>, Alexander Graf <agraf@suse.de>,
Christian Borntraeger <borntraeger@de.ibm.com>,
"Jason J. Herne" <jjherne@linux.vnet.ibm.com>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Michael Mueller <mimu@linux.vnet.ibm.com>,
Andreas Faerber <afaerber@suse.de>,
Richard Henderson <rth@twiddle.net>,
Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>
Subject: [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization
Date: Mon, 30 Mar 2015 16:28:23 +0200 [thread overview]
Message-ID: <1427725708-52100-11-git-send-email-mimu@linux.vnet.ibm.com> (raw)
In-Reply-To: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com>
This patch implements routine s390_cpu_model_init(). It is called by the
realize function during instantiation of an cpu object. Its task is to
initialize the current accelerator with the properties of the selected
processor model.
Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com>
---
target-s390x/cpu-models.c | 37 +++++++++++++++++++++++++++++++++++++
target-s390x/cpu-models.h | 4 ++++
target-s390x/cpu.c | 1 +
3 files changed, 42 insertions(+)
diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c
index 8a877d3..ba873ea 100644
--- a/target-s390x/cpu-models.c
+++ b/target-s390x/cpu-models.c
@@ -111,6 +111,7 @@ typedef struct ParmAddrAddrModeMask {
} ParmAddrAddrModeMask;
static GSList *s390_cpu_aliases;
+static bool cpu_models_used;
/* compare order of two cpu classes for ascending sort */
gint s390_cpu_class_asc_order_compare(gconstpointer a, gconstpointer b)
@@ -670,3 +671,39 @@ uint64_t *s390_current_fac_list_mask(void)
return s390_fac_list_mask_by_machine(mc->name);
}
#endif
+
+/**
+ * s390_cpu_model_init:
+ * @cc: S390 CPU class
+ *
+ * This function intitializes the current accelerator with processor
+ * related properties.
+ *
+ * Since: 2.4
+ */
+void s390_cpu_model_init(S390CPUClass *cc)
+{
+ S390ProcessorProps proc;
+
+ /* none cpu model case */
+ if (!strcmp(object_class_get_name(OBJECT_CLASS(cc)), TYPE_S390_CPU)) {
+ return;
+ }
+
+ /* accelerator already prepared */
+ if (cpu_models_used) {
+ return;
+ }
+
+ proc.cpuid = cpuid(cc->proc);
+ proc.ibc = cc->proc.ibc;
+ bitmap_zero(proc.fac_list, FAC_LIST_ARCH_S390_SIZE_UINT1);
+ bitmap_copy(proc.fac_list, cc->fac_list[ACCEL_CURRENT],
+ FAC_LIST_CPU_S390_SIZE_UINT1);
+
+ if (kvm_enabled()) {
+ if (!kvm_s390_set_processor_props(&proc)) {
+ cpu_models_used = true;
+ }
+ }
+}
diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h
index 9562088..fe3997f 100644
--- a/target-s390x/cpu-models.h
+++ b/target-s390x/cpu-models.h
@@ -45,6 +45,9 @@
#define type_cpuid(x) ((uint64_t)((x) & 0xffff) << 16)
#define id_cpuid(x) ((uint64_t)((x) & 0xffffff) << 32)
#define ver_cpuid(x) ((uint64_t)((x) & 0xff) << 56)
+#define cpuid(x) (ver_cpuid(x.ver) | \
+ id_cpuid(x.id) | \
+ type_cpuid(x.type))
#define oldest_ibc(x) (((uint32_t)(x) >> 16) & 0xfff)
#define newest_ibc(x) ((uint32_t)(x) & 0xfff)
@@ -108,6 +111,7 @@ void s390_cpu_list_entry(gpointer data, gpointer user_data);
bool s390_cpu_classes_initialized(void);
uint64_t *s390_fac_list_mask_by_machine(const char *name);
uint64_t *s390_current_fac_list_mask(void);
+void s390_cpu_model_init(S390CPUClass *cc);
extern uint64_t qemu_s390_fac_list_mask[];
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index c33f05e..829945d 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -180,6 +180,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
CPUState *cs = CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
+ s390_cpu_model_init(scc);
s390_cpu_gdb_init(cs);
qemu_init_vcpu(cs);
#if !defined(CONFIG_USER_ONLY)
--
1.8.3.1
next prev parent reply other threads:[~2015-03-30 14:30 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 14:28 [PATCH v4 00/15] s390x cpu model implementation Michael Mueller
2015-03-30 14:28 ` [PATCH v4 01/15] Introduce stub routine cpu_desc_avail Michael Mueller
2015-03-30 14:28 ` [PATCH v4 02/15] target-s390x: Introduce cpu facilities Michael Mueller
2015-03-30 14:28 ` [PATCH v4 03/15] target-s390x: Generate facility defines per cpu model Michael Mueller
2015-03-30 14:28 ` [PATCH v4 04/15] target-s390x: Introduce cpu models Michael Mueller
2015-03-30 14:28 ` [PATCH v4 05/15] target-s390x: Define cpu model specific facility lists Michael Mueller
2015-03-30 14:28 ` [PATCH v4 06/15] target-s390x: Add cpu model alias definition routines Michael Mueller
2015-03-30 14:28 ` [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h Michael Mueller
2015-03-30 19:36 ` Christian Borntraeger
2015-03-31 7:25 ` Michael Mueller
2015-03-30 14:28 ` [PATCH v4 08/15] target-s390x: Add KVM VM attribute interface for cpu models Michael Mueller
2015-03-30 14:28 ` [PATCH v4 09/15] target-s390x: Add cpu class initialization routines Michael Mueller
2015-03-30 14:28 ` Michael Mueller [this message]
2015-03-30 19:33 ` [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization Eduardo Habkost
2015-03-31 10:26 ` [Qemu-devel] " Michael Mueller
2015-03-30 14:28 ` [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model Michael Mueller
2015-03-30 19:50 ` Eduardo Habkost
2015-03-31 9:10 ` [Qemu-devel] " Michael Mueller
2015-03-30 20:17 ` Eduardo Habkost
2015-03-30 20:20 ` [Qemu-devel] " Eric Blake
2015-03-31 13:16 ` Eduardo Habkost
2015-03-31 11:21 ` Michael Mueller
2015-03-31 18:28 ` Eduardo Habkost
2015-03-30 20:19 ` Eric Blake
2015-03-31 7:56 ` Michael Mueller
2015-03-31 18:35 ` Eduardo Habkost
2015-03-31 20:09 ` Michael Mueller
2015-04-01 13:01 ` Eduardo Habkost
2015-04-01 16:31 ` [Qemu-devel] " Michael Mueller
2015-04-01 16:59 ` Eduardo Habkost
2015-04-01 19:05 ` Michael Mueller
2015-04-01 19:10 ` Michael Mueller
2015-04-01 23:05 ` Eduardo Habkost
2015-04-02 7:09 ` Michael Mueller
2015-04-02 15:15 ` Eduardo Habkost
2015-03-30 14:28 ` [PATCH v4 12/15] Add optional parameters to QMP command query-cpu-definitions Michael Mueller
2015-03-30 20:28 ` [Qemu-devel] " Eric Blake
2015-03-31 7:42 ` Michael Mueller
2015-03-31 19:46 ` Eduardo Habkost
2015-03-31 19:50 ` Eric Blake
2015-03-31 20:22 ` [Qemu-devel] " Michael Mueller
2015-03-30 14:28 ` [PATCH v4 13/15] target-s390x: Extend " Michael Mueller
2015-03-30 19:54 ` Eduardo Habkost
2015-03-30 14:28 ` [PATCH v4 14/15] target-s390x: Introduce facility test routine Michael Mueller
2015-03-30 14:28 ` [PATCH v4 15/15] target-s390x: Enable cpu model usage Michael Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427725708-52100-11-git-send-email-mimu@linux.vnet.ibm.com \
--to=mimu@linux.vnet.ibm.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=daniel.hansel@linux.vnet.ibm.com \
--cc=ehabkost@redhat.com \
--cc=gleb@kernel.org \
--cc=jjherne@linux.vnet.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).