From patchwork Mon Mar 30 14:28:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Mueller X-Patchwork-Id: 6121631 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0AB419F1BE for ; Mon, 30 Mar 2015 14:32:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C4AB20386 for ; Mon, 30 Mar 2015 14:32:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 253A920373 for ; Mon, 30 Mar 2015 14:32:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481AbbC3OcS (ORCPT ); Mon, 30 Mar 2015 10:32:18 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:52125 "EHLO e06smtp14.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbbC3O2t (ORCPT ); Mon, 30 Mar 2015 10:28:49 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 30 Mar 2015 15:28:48 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 30 Mar 2015 15:28:46 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id A45AC17D8062; Mon, 30 Mar 2015 15:29:15 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2UESjLO62980126; Mon, 30 Mar 2015 14:28:45 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2UESiof015283; Mon, 30 Mar 2015 08:28:45 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2UESdiC014992; Mon, 30 Mar 2015 08:28:44 -0600 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Michael Mueller , Andreas Faerber , Richard Henderson , Daniel Hansel Subject: [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization Date: Mon, 30 Mar 2015 16:28:23 +0200 Message-Id: <1427725708-52100-11-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033014-0017-0000-0000-0000038C64C6 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)