Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932533AbbDMN6U (ORCPT ); Mon, 13 Apr 2015 09:58:20 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:33042 "EHLO e06smtp16.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754283AbbDMN5L (ORCPT ); Mon, 13 Apr 2015 09:57:11 -0400 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 v5 13/17] target-s390x: Prepare accelerator during S390 CPU object realization Date: Mon, 13 Apr 2015 15:56:32 +0200 Message-Id: <1428933396-37887-14-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428933396-37887-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1428933396-37887-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041313-0025-0000-0000-000004B13604 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3068 Lines: 92 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 | 30 ++++++++++++++++++++++++++++++ target-s390x/cpu-models.h | 4 ++++ target-s390x/cpu.c | 1 + 3 files changed, 35 insertions(+) diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c index 07039c0..fa74a8a 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -670,3 +670,33 @@ 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 = { + .cpuid = cpuid(cc->proc), + .ibc = cc->proc.ibc, + }; + + /* none cpu model case */ + if (!proc.cpuid) { + return; + } + + 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()) { + kvm_s390_set_processor_props(&proc); + } +} diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h index 00454d3..c24550b 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) @@ -88,6 +91,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); #ifdef CONFIG_KVM int kvm_s390_get_processor_props(S390ProcessorProps *prop); diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index cbab627..65dee3e 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -184,6 +184,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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/