From patchwork Fri Aug 23 05:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11110597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F30E8174A for ; Fri, 23 Aug 2019 05:32:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA0482166E for ; Fri, 23 Aug 2019 05:32:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WkvoQeyE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA0482166E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i12Bp-0000jX-8k for patchwork-qemu-devel@patchwork.kernel.org; Fri, 23 Aug 2019 01:32:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44897) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i11rJ-00047u-7h for qemu-devel@nongnu.org; Fri, 23 Aug 2019 01:11:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i11rH-0002ad-QD for qemu-devel@nongnu.org; Fri, 23 Aug 2019 01:11:33 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:43398) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i11rH-0002Zz-Jy; Fri, 23 Aug 2019 01:11:31 -0400 Received: by mail-pf1-x442.google.com with SMTP id v12so5644684pfn.10; Thu, 22 Aug 2019 22:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CF5LAXvqy27pBaxWSa0qEfSbtTDWiQsPKTDnUOQ/efE=; b=WkvoQeyEKkUMD/O4pglKlwnzCF/ehhZjMV4qiGmuALexWQaqfyiTxT4CsJyv1Navsi bPj9aNC6l0n1DNcdcmoU5pbzb5RzT0J6t6THLOUQNXR7kbchj7mwhF0mHz7Asu6w5kWr uSRdbNKDXhYEieslGAKaPROzOUtuhuv8mjhkTceOQr2A88tCPrc3udgNuRdB5pGErc94 JC/kd3RwIa7TDsuZ8gwKLkzeOupUC87QxsR6froKQ6mkI13F/bAy+G6Tp5BpI2S45uRx Y3w+FTR/yNy/wecrsgV7wpfM+cu4q87a4o+mn1ZIbcdW3Cdenx1GD0nK41iMLfsyCpG+ LCrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CF5LAXvqy27pBaxWSa0qEfSbtTDWiQsPKTDnUOQ/efE=; b=sd7Jw3JQztiuplYRtXzc7tLawz3awyR9U2boPNarRzpKqZV9+5cPyjoOUtVbFMo5nB +5Pxzm4EPeBn6pHI23GoljtQjH3n6RJdce6JQpLqP5qn3wQ5h92eLzDXl+pPT5rdMkEX 5Wsiox4cnd9uImLGslDL0sJNFkmsw3tlR3FOv97yVtS8jC6EbWnnmVavU/4Dt68iRIAU nrkvNGG/bl05Spp5HV2lzkschgHT+ZQeENC0ln4vlwZNsTAyuSWsaC2x9mIAY3IKHLCQ eiUx+40hAdz/r5sYw26axDJ0i+eTIQDgoIB4H4qdumDm3OOM/gveug1eGMw9u1YsKCME zdKg== X-Gm-Message-State: APjAAAWapkJp/Bdws5xrnpqweZjFQBMAy7UIYVrP79377+Fe/b2DaSKy z/8mGe7eOxgV9CPMuvZs0Lo= X-Google-Smtp-Source: APXvYqxAeLxr7ViLPCN3OlJR1toD7w77B5rUyY1crgWABRd0pyXh2PYj42CqKVNzCTk3q4qMHXaFWg== X-Received: by 2002:a17:90a:bd0b:: with SMTP id y11mr3120737pjr.141.1566537090846; Thu, 22 Aug 2019 22:11:30 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id v189sm1122527pfv.176.2019.08.22.22.11.29 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Aug 2019 22:11:30 -0700 (PDT) From: Bin Meng To: Alistair Francis , Palmer Dabbelt , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Thu, 22 Aug 2019 22:10:52 -0700 Message-Id: <1566537069-22741-14-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1566537069-22741-1-git-send-email-bmeng.cn@gmail.com> References: <1566537069-22741-1-git-send-email-bmeng.cn@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH v5 13/30] riscv: Add a sifive_cpu.h to include both E and U cpu type defines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Group SiFive E and U cpu type defines into one header file. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None include/hw/riscv/sifive_cpu.h | 31 +++++++++++++++++++++++++++++++ include/hw/riscv/sifive_e.h | 7 +------ include/hw/riscv/sifive_u.h | 7 +------ 3 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 include/hw/riscv/sifive_cpu.h diff --git a/include/hw/riscv/sifive_cpu.h b/include/hw/riscv/sifive_cpu.h new file mode 100644 index 0000000..1367996 --- /dev/null +++ b/include/hw/riscv/sifive_cpu.h @@ -0,0 +1,31 @@ +/* + * SiFive CPU types + * + * Copyright (c) 2017 SiFive, Inc. + * Copyright (c) 2019 Bin Meng + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef HW_SIFIVE_CPU_H +#define HW_SIFIVE_CPU_H + +#if defined(TARGET_RISCV32) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 +#elif defined(TARGET_RISCV64) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 +#endif + +#endif /* HW_SIFIVE_CPU_H */ diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index d175b24..e17cdfd 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -19,6 +19,7 @@ #ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H +#include "hw/riscv/sifive_cpu.h" #include "hw/riscv/sifive_gpio.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" @@ -83,10 +84,4 @@ enum { #define SIFIVE_E_PLIC_CONTEXT_BASE 0x200000 #define SIFIVE_E_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 -#elif defined(TARGET_RISCV64) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 -#endif - #endif diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 892f0ee..4abc621 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -20,6 +20,7 @@ #define HW_SIFIVE_U_H #include "hw/net/cadence_gem.h" +#include "hw/riscv/sifive_cpu.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc" #define RISCV_U_SOC(obj) \ @@ -77,10 +78,4 @@ enum { #define SIFIVE_U_PLIC_CONTEXT_BASE 0x200000 #define SIFIVE_U_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 -#elif defined(TARGET_RISCV64) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 -#endif - #endif