From patchwork Fri Oct 13 13:49:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 10004775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A422760360 for ; Fri, 13 Oct 2017 13:51:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 968EC29079 for ; Fri, 13 Oct 2017 13:51:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B8382907F; Fri, 13 Oct 2017 13:51:28 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 4A58829079 for ; Fri, 13 Oct 2017 13:51:28 +0000 (UTC) Received: from localhost ([::1]:50419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e30N5-0007zQ-Bg for patchwork-qemu-devel@patchwork.kernel.org; Fri, 13 Oct 2017 09:51:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e30Lc-0007wY-7b for qemu-devel@nongnu.org; Fri, 13 Oct 2017 09:49:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e30Lb-0006c9-Kr for qemu-devel@nongnu.org; Fri, 13 Oct 2017 09:49:56 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:43639) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e30Lb-0006bR-Eb for qemu-devel@nongnu.org; Fri, 13 Oct 2017 09:49:55 -0400 Received: by mail-pf0-x243.google.com with SMTP id a8so9858498pfc.0 for ; Fri, 13 Oct 2017 06:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HgFEK5+JxpY7RqBsayZHnG+hiUdQe0Uku0JP7Q084wY=; b=lVpTx7fMur1OP4/CRqyz7fQna9I99A9xnxv2bLxvVa6MstaLQKIyNA2O9GHObcvcLi y6nmz8JFAMGKuQysS/d9nWPZoiu4uhFT/3QQhcQfD3xP3kiAKpvqMFJrxmsCb108f/Hc YK/7Bqqg97sR8gC6wh5kqRrb083yR1THmXWJa+yYULjoQbT4MuEP8bObRhviR30vRARU nE4/P+2VGMp4jDniD29yCQYJrM3TEawxTHlsSgrtNKm9J1fJYc23EfJgSdTN7iqnf+r9 jacAnQukYEvZTNCJNeONIxaym3BR9I8P2/YHDHYtw/YpltdXUYz9nT6Z74/EfnpmDBy2 3uIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HgFEK5+JxpY7RqBsayZHnG+hiUdQe0Uku0JP7Q084wY=; b=krzYracqR9UM3Vmx0lzDwKLS8/JmppdZsBnBG16xTEwyf9DuhNEJrM5P5ENEibz74Y HXUDArrz9lYE651xQFAfS5b3oNs5k2zmti0pt923rZmtYcUFm7l2Stx3yLK0Jei8QRKW Ay7YUPo6kPete0R6swyF9X8qR2C7mDPwczo/HpvYRdVnA8sN9BQeA7EBw77sBsnIA868 QY5OtUZ/hVzvEKWGyo4fjNCfMS4a/R/L1bTH9jpnijo2GFVjIp/ap14gnr+PG7yH/WWE kyeKI/kFqLG5fcjYIIJNaFM4FAC2+CppxAF95F34Oce6yfLao+TwJwpKxJOdSwfyQJkn LZjg== X-Gm-Message-State: AMCzsaWlGr6TKnFDGKrO4kZmrvxHK+iqnkm/DDJ2Rfb6sVapx9Q14sY+ AdpOMqyx9tKxFIoU+x/lI5qzazjQ X-Google-Smtp-Source: AOwi7QDiy4kFL07Zl1cM6xeOXXkMss/o/9NsSTvt2Z8xseIKvSJqhY6pY/Q9GRThv7mewPT+P6yZgg== X-Received: by 10.159.218.69 with SMTP id x5mr1444971plv.4.1507902594316; Fri, 13 Oct 2017 06:49:54 -0700 (PDT) Received: from localhost (g248.61-45-56.ppp.wakwak.ne.jp. [61.45.56.248]) by smtp.gmail.com with ESMTPSA id p90sm2731105pfj.157.2017.10.13.06.49.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Oct 2017 06:49:53 -0700 (PDT) From: Stafford Horne To: QEMU Development Date: Fri, 13 Oct 2017 22:49:27 +0900 Message-Id: <20171013134930.32547-3-shorne@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171013134930.32547-1-shorne@gmail.com> References: <20171013134930.32547-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v2 2/5] target/openrisc: Make coreid and numcores variable 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: Stafford Horne , Openrisc , Richard Henderson , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Previously coreid and numcores were hard coded as 0 and 1 respectively as OpenRISC QEMU did not have multicore support. Multicore support is now being added so these registers need to have configured values. Signed-off-by: Stafford Horne Reviewed-by: Richard Henderson --- target/openrisc/sys_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index abdef5d6a5..dc6e5cc7f2 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exception.h" +#include "sysemu/sysemu.h" #define TO_SPR(group, number) (((group) << 11) + (number)) @@ -249,10 +250,10 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, return env->esr; case TO_SPR(0, 128): /* COREID */ - return 0; + return cpu->parent_obj.cpu_index; case TO_SPR(0, 129): /* NUMCORES */ - return 1; + return max_cpus; case TO_SPR(0, 1024) ... TO_SPR(0, 1024 + (16 * 32)): /* Shadow GPRs */ idx = (spr - 1024);