Message ID | 20180723201748.25573-10-mdroth@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDB9B1822 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCFE628478 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B176528481; Mon, 23 Jul 2018 20:20:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3CFD528478 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:20:24 +0000 (UTC) Received: from localhost ([::1]:36333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1fhhJf-0002sK-BN for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jul 2018 16:20:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhI1-0001HX-Sq for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:18:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhHz-00024g-NJ for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:18:41 -0400 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:34577) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhHz-00023r-IX; Mon, 23 Jul 2018 16:18:39 -0400 Received: by mail-oi0-x243.google.com with SMTP id 13-v6so3495952ois.1; Mon, 23 Jul 2018 13:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ExvIWzSONOdIBZmzBeL/6fry0hzqjLnSz60uSmmUi4U=; b=DnA+PW+lnnxk7uUy5LzDNHze6ckVDuFNlT6ULvfJcNcfCBh9xKCQtVLOkCH6thXSX7 aBGeh0oBwBunS9FQnacm/UbCawrJykzwqHXpDa9eXE0lGs5bG/JBwx79QqaL6yKN/k9o 8vHD//o2VOUqM6/eeLJEK69l+eepZaj2k4FzRng8fm/r5+LAOePHXXw91B95Dkno0bB/ MR2v4s8pLR1IKhGTN/F9gFfNQaHQafQc2X0WJkjxMNi1XyHyo3q/pX7X/TGsOVMo1TGX bUic0LmU5jAErmcqBIuZdPyNpM8xML3mpikOBEYT/oTjLGW5XDGCq+giw6jwSdK3gPhq 3/eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ExvIWzSONOdIBZmzBeL/6fry0hzqjLnSz60uSmmUi4U=; b=aOLSeHIHJxrNGtxpysbEMw9STvE3Qyd0ou3FCmLhHYyaS0hHxkhDB7bLC/g1C611if fye/9pAcFpm+/6N2rkxfWYUvgXv96JuUT3QFR5Lku/1O63NEIT9/X4yXlrHUPR+DD/fH UYN0/euJ4VphyF8YtiRA8tX+OJZlH+eKcISU5mEPYSPyWlcIRv0lx3ojo3EJicL4nG1l PE/iPyHH8+SuSaOTFAqQLRCRfWy4GPtkJcloYVEnfSma5xdwVY1WKdwek/FCf4ei+9zp ljbvNn3zv7S3OI62zhpTpaaILS72zVz8uFdtV9+orGbn0qmNImIi0SSQqg1uxSKzFuQo Kdcg== X-Gm-Message-State: AOUpUlGBKuJseo3nDn3fR/fVEejMFj86z4VW7Th+eOcauybyxemZ6xiS 78tfkEi6nbzEeP1aOQMOC82sS5g0MSE= X-Google-Smtp-Source: AAOMgpew6ELUyY7QJskX+qaJLtZuDFZdiBxPBPP9xo/0BrU5bh+MWSemJpI0ptyVS5UGQBYtQo/m5Q== X-Received: by 2002:aca:6141:: with SMTP id v62-v6mr321949oib.240.1532377118370; Mon, 23 Jul 2018 13:18:38 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id m3-v6sm7176380oif.26.2018.07.23.13.18.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:18:37 -0700 (PDT) From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:16:18 -0500 Message-Id: <20180723201748.25573-10-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::243 Subject: [Qemu-devel] [PATCH 09/99] spapr: don't advertise radix GTSE if max-compat-cpu < power9 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: David Gibson <david@gibson.dropbear.id.au>, qemu-stable@nongnu.org, Greg Kurz <groug@kaod.org> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Patch Round-up for stable 2.12.1, freeze on 2018-07-30
|
expand
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a81570e7c8..092ec2498c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2392,6 +2392,7 @@ static void spapr_machine_init(MachineState *machine) long load_limit, fw_size; char *filename; Error *resize_hpt_err = NULL; + PowerPCCPU *first_ppc_cpu; msi_nonbroken = true; @@ -2484,11 +2485,6 @@ static void spapr_machine_init(MachineState *machine) } spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY); - if (!kvm_enabled() || kvmppc_has_cap_mmu_radix()) { - /* KVM and TCG always allow GTSE with radix... */ - spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE); - } - /* ... but not with hash (currently). */ /* advertise support for dedicated HP event source to guests */ if (spapr->use_hotplug_event_source) { @@ -2503,6 +2499,15 @@ static void spapr_machine_init(MachineState *machine) /* init CPUs */ spapr_init_cpus(spapr); + first_ppc_cpu = POWERPC_CPU(first_cpu); + if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) && + ppc_check_compat(first_ppc_cpu, CPU_POWERPC_LOGICAL_3_00, 0, + spapr->max_compat_pvr)) { + /* KVM and TCG always allow GTSE with radix... */ + spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE); + } + /* ... but not with hash (currently). */ + if (kvm_enabled()) { /* Enable H_LOGICAL_CI_* so SLOF can talk to in-kernel devices */ kvmppc_enable_logical_ci_hcalls();