From nobody Thu May 2 11:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502121271243977.224141346238; Mon, 7 Aug 2017 08:54:31 -0700 (PDT) Received: from localhost ([::1]:38096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekMP-0000ns-Os for importer@patchew.org; Mon, 07 Aug 2017 11:54:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekKT-0007xg-0v for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dekKO-0005n3-Cv for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:29 -0400 Received: from mel.act-europe.fr ([2a02:2ab8:224:1::a0a:d2]:44797 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dekKO-0005m6-7I for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:24 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id CE71F8135D; Mon, 7 Aug 2017 17:52:22 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kWNWCQnvq5wV; Mon, 7 Aug 2017 17:52:22 +0200 (CEST) Received: from localhost.localdomain.localdomain (unknown [IPv6:2a01:e35:87f0:3180:2b18:7e65:c33:7f62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 5044481362; Mon, 7 Aug 2017 17:52:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: david@gibson.dropbear.id.au, agraf@suse.de Date: Mon, 7 Aug 2017 17:50:45 +0200 Message-Id: <1502121048-1816-2-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> References: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2a02:2ab8:224:1::a0a:d2 Subject: [Qemu-devel] [PATCH for-2.11 1/4] booke206: fix booke206_tlbnps for mav 2.0 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: frederic.konrad@adacore.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This fixes booke206_tlbnps for MAV 2.0 by checking the MMUCFG register and return directly the right tlbnps instead of computing it from non existing field. Signed-off-by: KONRAD Frederic --- target/ppc/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 6ee2a26..d2faea9 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2472,10 +2472,10 @@ static inline ppcmas_tlb_t *booke206_get_tlbm(CPUPP= CState *env, const int tlbn, /* returns bitmap of supported page sizes for a given TLB */ static inline uint32_t booke206_tlbnps(CPUPPCState *env, const int tlbn) { - bool mav2 =3D false; uint32_t ret =3D 0; =20 - if (mav2) { + if ((env->spr[SPR_MMUCFG] & MMUCFG_MAVN) =3D=3D MMUCFG_MAVN_V2) { + /* MAV2 */ ret =3D env->spr[SPR_BOOKE_TLB0PS + tlbn]; } else { uint32_t tlbncfg =3D env->spr[SPR_BOOKE_TLB0CFG + tlbn]; --=20 1.8.3.1 From nobody Thu May 2 11:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502121458471578.3571729131852; Mon, 7 Aug 2017 08:57:38 -0700 (PDT) Received: from localhost ([::1]:38125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekPR-0003Q2-9U for importer@patchew.org; Mon, 07 Aug 2017 11:57:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekKT-0007xo-8q for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dekKO-0005nI-Ha for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:29 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:54226 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dekKO-0005mT-Bq; Mon, 07 Aug 2017 11:52:24 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 6154E81362; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DohHUu2vYBfe; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) Received: from localhost.localdomain.localdomain (unknown [IPv6:2a01:e35:87f0:3180:2b18:7e65:c33:7f62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id DA6C58135E; Mon, 7 Aug 2017 17:52:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: david@gibson.dropbear.id.au, agraf@suse.de Date: Mon, 7 Aug 2017 17:50:46 +0200 Message-Id: <1502121048-1816-3-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> References: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH for-2.11 2/4] booke206: fix tlbnps for fixed size TLB 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: frederic.konrad@adacore.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some OS don't populate the TSIZE field when using a fixed size TLB which re= sult in a 1KB TLB. When the TLB is a fixed size TLB the TSIZE field should be ignored. Fix this wrong behavior with MAV 2.0. Signed-off-by: KONRAD Frederic --- target/ppc/cpu.h | 22 ++++++++++++++++++++++ target/ppc/mmu_helper.c | 16 ++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index d2faea9..32a44a8 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2490,6 +2490,28 @@ static inline uint32_t booke206_tlbnps(CPUPPCState *= env, const int tlbn) return ret; } =20 +static inline void booke206_fixed_size_tlbn(CPUPPCState *env, const int tl= bn, + ppcmas_tlb_t *tlb) +{ + uint8_t i; + int32_t tsize =3D -1; + + for (i =3D 0; i < 32; i++) { + if ((env->spr[SPR_BOOKE_TLB0PS + tlbn]) & (1ULL << i)) { + if (tsize =3D=3D -1) { + tsize =3D i; + } else { + return; + } + } + } + + /* TLBnPS unimplemented? Odd.. */ + assert(tsize !=3D -1); + tlb->mas1 &=3D ~MAS1_TSIZE_MASK; + tlb->mas1 |=3D ((uint32_t)tsize) << MAS1_TSIZE_SHIFT; +} + #endif =20 static inline bool msr_is_64bit(CPUPPCState *env, target_ulong msr) diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index f06b938..2a1f990 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -2632,12 +2632,16 @@ void helper_booke206_tlbwe(CPUPPCState *env) env->spr[SPR_BOOKE_MAS3]; tlb->mas1 =3D env->spr[SPR_BOOKE_MAS1]; =20 - /* MAV 1.0 only */ - if (!(tlbncfg & TLBnCFG_AVAIL)) { - /* force !AVAIL TLB entries to correct page size */ - tlb->mas1 &=3D ~MAS1_TSIZE_MASK; - /* XXX can be configured in MMUCSR0 */ - tlb->mas1 |=3D (tlbncfg & TLBnCFG_MINSIZE) >> 12; + if ((env->spr[SPR_MMUCFG] & MMUCFG_MAVN) =3D=3D MMUCFG_MAVN_V2) { + /* For TLB which has a fixed size TSIZE is ignored with MAV2 */ + booke206_fixed_size_tlbn(env, tlbn, tlb); + } else { + if (!(tlbncfg & TLBnCFG_AVAIL)) { + /* force !AVAIL TLB entries to correct page size */ + tlb->mas1 &=3D ~MAS1_TSIZE_MASK; + /* XXX can be configured in MMUCSR0 */ + tlb->mas1 |=3D (tlbncfg & TLBnCFG_MINSIZE) >> 12; + } } =20 /* Make a mask from TLB size to discard invalid bits in EPN field */ --=20 1.8.3.1 From nobody Thu May 2 11:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502121583203819.2073127488632; Mon, 7 Aug 2017 08:59:43 -0700 (PDT) Received: from localhost ([::1]:38136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekRQ-0005Gb-4L for importer@patchew.org; Mon, 07 Aug 2017 11:59:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekKT-0007y6-Un for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dekKP-0005nj-69 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:30 -0400 Received: from mel.act-europe.fr ([2a02:2ab8:224:1::a0a:d2]:44810 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dekKO-0005mt-W5 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:25 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id E956281363; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n9UOJrLC1h6z; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) Received: from localhost.localdomain.localdomain (unknown [IPv6:2a01:e35:87f0:3180:2b18:7e65:c33:7f62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 6D8188135E; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: david@gibson.dropbear.id.au, agraf@suse.de Date: Mon, 7 Aug 2017 17:50:47 +0200 Message-Id: <1502121048-1816-4-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> References: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2a02:2ab8:224:1::a0a:d2 Subject: [Qemu-devel] [PATCH for-2.11 3/4] booke206: allow to specify an mmucfg value at the init 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: frederic.konrad@adacore.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This allows to init the MMUCFG SPR with a non NULL value. Signed-off-by: KONRAD Frederic --- target/ppc/translate_init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 01723bd..2627cbe 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -1842,7 +1842,7 @@ static inline uint32_t gen_tlbncfg(uint32_t assoc, ui= nt32_t minsize, =20 /* BookE 2.06 storage control registers */ static void gen_spr_BookE206(CPUPPCState *env, uint32_t mas_mask, - uint32_t *tlbncfg) + uint32_t *tlbncfg, uint32_t mmucfg) { #if !defined(CONFIG_USER_ONLY) const char *mas_names[8] =3D { @@ -1886,7 +1886,7 @@ static void gen_spr_BookE206(CPUPPCState *env, uint32= _t mas_mask, spr_register(env, SPR_MMUCFG, "MMUCFG", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, SPR_NOACCESS, - 0x00000000); /* TOFIX */ + mmucfg); switch (env->nb_ways) { case 4: spr_register(env, SPR_BOOKE_TLB3CFG, "TLB3CFG", @@ -4615,7 +4615,7 @@ static void init_proc_e200(CPUPPCState *env) &spr_read_spefscr, &spr_write_spefscr, 0x00000000); /* Memory management */ - gen_spr_BookE206(env, 0x0000005D, NULL); + gen_spr_BookE206(env, 0x0000005D, NULL, 0); /* XXX : not implemented */ spr_register(env, SPR_HID0, "HID0", SPR_NOACCESS, SPR_NOACCESS, @@ -4900,6 +4900,7 @@ static void init_proc_e500(CPUPPCState *env, int vers= ion) | 0x0020; /* 32 kb */ uint32_t l1cfg1 =3D 0x3800 /* 8 ways */ | 0x0020; /* 32 kb */ + uint32_t mmucfg =3D 0; #if !defined(CONFIG_USER_ONLY) int i; #endif @@ -4974,7 +4975,7 @@ static void init_proc_e500(CPUPPCState *env, int vers= ion) default: cpu_abort(CPU(cpu), "Unknown CPU: " TARGET_FMT_lx "\n", env->spr[S= PR_PVR]); } - gen_spr_BookE206(env, 0x000000DF, tlbncfg); + gen_spr_BookE206(env, 0x000000DF, tlbncfg, mmucfg); /* XXX : not implemented */ spr_register(env, SPR_HID0, "HID0", SPR_NOACCESS, SPR_NOACCESS, --=20 1.8.3.1 From nobody Thu May 2 11:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150212130635373.8655702798792; Mon, 7 Aug 2017 08:55:06 -0700 (PDT) Received: from localhost ([::1]:38099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekMz-0001OM-63 for importer@patchew.org; Mon, 07 Aug 2017 11:55:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekKU-0007yG-Sl for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dekKP-0005oH-Nr for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:52:30 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:54238 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dekKP-0005nX-EF; Mon, 07 Aug 2017 11:52:25 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 857F981367; Mon, 7 Aug 2017 17:52:24 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id itwlRPF_Y6FT; Mon, 7 Aug 2017 17:52:24 +0200 (CEST) Received: from localhost.localdomain.localdomain (unknown [IPv6:2a01:e35:87f0:3180:2b18:7e65:c33:7f62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 019EA8135E; Mon, 7 Aug 2017 17:52:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: david@gibson.dropbear.id.au, agraf@suse.de Date: Mon, 7 Aug 2017 17:50:48 +0200 Message-Id: <1502121048-1816-5-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> References: <1502121048-1816-1-git-send-email-frederic.konrad@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH for-2.11 4/4] ppc64: introduce e6500 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: frederic.konrad@adacore.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This introduces e6500 core. Signed-off-by: KONRAD Frederic --- target/ppc/cpu-models.c | 2 + target/ppc/cpu-models.h | 1 + target/ppc/translate_init.c | 91 +++++++++++++++++++++++++++++++++++++++++= +++- 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 4d3e635..e0d9faf 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -693,6 +693,8 @@ #ifdef TARGET_PPC64 POWERPC_DEF_SVR("e5500", "e5500", CPU_POWERPC_e5500, POWERPC_SVR_E500, e5500) + POWERPC_DEF_SVR("e6500", "e6500", + CPU_POWERPC_e6500, POWERPC_SVR_E500, e6500) #endif /* PowerPC e500 microcontrollers = */ POWERPC_DEF_SVR("MPC8533_v10", "MPC8533 v1.0", diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index b563c45..eaa6849 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -346,6 +346,7 @@ enum { CPU_POWERPC_e500v2_v30 =3D 0x80210030, CPU_POWERPC_e500mc =3D 0x80230020, CPU_POWERPC_e5500 =3D 0x80240020, + CPU_POWERPC_e6500 =3D 0x80400020, /* MPC85xx microcontrollers */ #define CPU_POWERPC_MPC8533_v10 CPU_POWERPC_e500v2_v21 #define CPU_POWERPC_MPC8533_v11 CPU_POWERPC_e500v2_v22 diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 2627cbe..9d2b050 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -4888,6 +4888,7 @@ enum fsl_e500_version { fsl_e500v2, fsl_e500mc, fsl_e5500, + fsl_e6500, }; =20 static void init_proc_e500(CPUPPCState *env, int version) @@ -4922,6 +4923,9 @@ static void init_proc_e500(CPUPPCState *env, int vers= ion) case fsl_e5500: ivor_mask =3D 0x000003FE0000FFFFULL; break; + case fsl_e6500: + ivor_mask =3D 0x000003FF0000FFFFULL; + break; } gen_spr_BookE(env, ivor_mask); gen_spr_usprg3(env); @@ -4954,6 +4958,12 @@ static void init_proc_e500(CPUPPCState *env, int ver= sion) tlbncfg[0] =3D gen_tlbncfg(4, 1, 1, 0, 512); tlbncfg[1] =3D gen_tlbncfg(64, 1, 12, TLBnCFG_AVAIL | TLBnCFG_IPRO= T, 64); break; + case fsl_e6500: + mmucfg =3D 0x6510B45; + env->nb_pids =3D 1; + tlbncfg[0] =3D 0x08052400; + tlbncfg[1] =3D 0x40028040; + break; default: cpu_abort(CPU(cpu), "Unknown CPU: " TARGET_FMT_lx "\n", env->spr[S= PR_PVR]); } @@ -4972,6 +4982,12 @@ static void init_proc_e500(CPUPPCState *env, int ver= sion) l1cfg0 |=3D 0x1000000; /* 64 byte cache block size */ l1cfg1 |=3D 0x1000000; /* 64 byte cache block size */ break; + case fsl_e6500: + env->dcache_line_size =3D 32; + env->icache_line_size =3D 32; + l1cfg0 |=3D 0x0F83820; + l1cfg1 |=3D 0x0B83820; + break; default: cpu_abort(CPU(cpu), "Unknown CPU: " TARGET_FMT_lx "\n", env->spr[S= PR_PVR]); } @@ -5050,7 +5066,7 @@ static void init_proc_e500(CPUPPCState *env, int vers= ion) &spr_read_generic, SPR_NOACCESS, 0x00000000); /* XXX better abstract into Emb.xxx features */ - if (version =3D=3D fsl_e5500) { + if ((version =3D=3D fsl_e5500) || (version =3D=3D fsl_e6500)) { spr_register(env, SPR_BOOKE_EPCR, "EPCR", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, @@ -5062,6 +5078,30 @@ static void init_proc_e500(CPUPPCState *env, int ver= sion) ivpr_mask =3D (target_ulong)~0xFFFFULL; } =20 + if (version =3D=3D fsl_e6500) { + spr_register(env, SPR_BOOKE_SPRG8, "SPRG8", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + 0x00000000); + spr_register(env, SPR_BOOKE_SPRG9, "SPRG9", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + 0x00000000); + /* Thread identification */ + spr_register(env, SPR_TIR, "TIR", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, SPR_NOACCESS, + 0x00000000); + spr_register(env, SPR_BOOKE_TLB0PS, "TLB0PS", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, SPR_NOACCESS, + 0x00000004); + spr_register(env, SPR_BOOKE_TLB1PS, "TLB1PS", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, SPR_NOACCESS, + 0x7FFFFFFC); + } + #if !defined(CONFIG_USER_ONLY) env->nb_tlb =3D 0; env->tlb_type =3D TLB_MAS; @@ -5254,6 +5294,55 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) pcc->flags =3D POWERPC_FLAG_CE | POWERPC_FLAG_DE | POWERPC_FLAG_PMM | POWERPC_FLAG_BUS_CLK; } + +static void init_proc_e6500(CPUPPCState *env) +{ + init_proc_e500(env, fsl_e6500); +} + +POWERPC_FAMILY(e6500)(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); + + dc->desc =3D "e6500 core"; + pcc->init_proc =3D init_proc_e6500; + pcc->check_pow =3D check_pow_none; + pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_MFTB | + PPC_WRTEE | PPC_RFDI | PPC_RFMCI | + PPC_CACHE | PPC_CACHE_LOCK | PPC_CACHE_ICBI | + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | + PPC_FLOAT | PPC_FLOAT_FRES | + PPC_FLOAT_FRSQRTE | PPC_FLOAT_FSEL | + PPC_FLOAT_STFIWX | PPC_WAIT | + PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | + PPC_64B | PPC_POPCNTB | PPC_POPCNTWD | PPC_ALTIVEC; + pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 |= \ + PPC2_FP_CVT_S64 | PPC2_ATOMIC_ISA206; + pcc->msr_mask =3D (1ull << MSR_CM) | + (1ull << MSR_GS) | + (1ull << MSR_UCLE) | + (1ull << MSR_CE) | + (1ull << MSR_EE) | + (1ull << MSR_PR) | + (1ull << MSR_FP) | + (1ull << MSR_ME) | + (1ull << MSR_FE0) | + (1ull << MSR_DE) | + (1ull << MSR_FE1) | + (1ull << MSR_IS) | + (1ull << MSR_DS) | + (1ull << MSR_PX) | + (1ull << MSR_RI) | + (1ull << MSR_VR); + pcc->mmu_model =3D POWERPC_MMU_BOOKE206; + pcc->excp_model =3D POWERPC_EXCP_BOOKE; + pcc->bus_model =3D PPC_FLAGS_INPUT_BookE; + pcc->bfd_mach =3D bfd_mach_ppc_e500; + pcc->flags =3D POWERPC_FLAG_CE | POWERPC_FLAG_DE | + POWERPC_FLAG_PMM | POWERPC_FLAG_BUS_CLK | POWERPC_FLAG_VR= E; +} + #endif =20 /* Non-embedded PowerPC = */ --=20 1.8.3.1