From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DATE_IN_PAST_12_24, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EDBDECDE20 for ; Wed, 11 Sep 2019 08:55:04 +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 5516D21A4C for ; Wed, 11 Sep 2019 08:55:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5516D21A4C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7yP0-00076L-Ct for qemu-devel@archiver.kernel.org; Wed, 11 Sep 2019 04:55:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57632) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7xwH-0008ED-UL for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:25:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7xwG-0006nb-Ib for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:25:21 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:52265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7xwG-0006nK-Ct for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:25:20 -0400 Received: by mail-wm1-f44.google.com with SMTP id t17so2328267wmi.2 for ; Wed, 11 Sep 2019 01:25:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=Yjyg0NrpwLuGQ7qLdff8UjTsM3h30sEKXkKsPatOXKo=; b=UO3INIpmbBOxz0O+wPrH4x0pJmuExAPoJqfEO+vduyDm7s5X4KeJ8fFVbQVIkCls2A hbWmk2cShQMw6uauKbjTU3qr4kOM1q4lbk6fuYEZF/oizY/swd0TUQcA7y0fCFrFfQIF BAhsw1xqYHIv2B+Ul1vOwHnvsVs54gjRP9Ex6zGovghoDS36/zir4EWnqByG9hUXnkU3 Hd/v5q3mxNxfjOMGdPvbEc3KANs4hEGf4CSBdlFFBDNPsEiw7jyYc+wJCorvEMqSMpKq OA9wuaKyyodcg2xRMsTFZjy4KH+iEx71mLTzlEtozirD3pf4FtYewegGZrmCA2juReKe SRmg== X-Gm-Message-State: APjAAAV948ZXw14BxUW0NjkrjYzJvl3iKbO99XvQ/63JKKvH4vHwJ8hV poBQaBQ10qrLr2KjTeD1u/Nseg== X-Google-Smtp-Source: APXvYqxjte6I1fhTeD+leFOMvbhhk0FJg/VwPum7J3VLU8rNMdiEimmHjtL8F2+ChG1EjBK3XU/UaQ== X-Received: by 2002:a1c:80d0:: with SMTP id b199mr2837886wmd.102.1568190319132; Wed, 11 Sep 2019 01:25:19 -0700 (PDT) Received: from localhost ([148.69.85.38]) by smtp.gmail.com with ESMTPSA id v4sm31601457wrg.56.2019.09.11.01.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 01:25:18 -0700 (PDT) Date: Tue, 10 Sep 2019 12:04:58 -0700 Message-Id: <20190910190513.21160-33-palmer@sifive.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190910190513.21160-1-palmer@sifive.com> References: <20190910190513.21160-1-palmer@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.44 Subject: [Qemu-devel] [PULL 32/47] riscv: sifive_u: Update PLIC hart topology configuration string 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: , Cc: qemu-riscv@nongnu.org, Palmer Dabbelt , qemu-devel@nongnu.org, Fabien Chouteau , Alistair Francis , Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng With heterogeneous harts config, the PLIC hart topology configuration string are "M,MS,.." because of the monitor hart #0. Suggested-by: Fabien Chouteau Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Signed-off-by: Palmer Dabbelt --- hw/riscv/sifive_u.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 6c4634dcac..713c451e85 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -424,10 +424,11 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) plic_hart_config = g_malloc0(plic_hart_config_len); for (i = 0; i < ms->smp.cpus; i++) { if (i != 0) { - strncat(plic_hart_config, ",", plic_hart_config_len); + strncat(plic_hart_config, "," SIFIVE_U_PLIC_HART_CONFIG, + plic_hart_config_len); + } else { + strncat(plic_hart_config, "M", plic_hart_config_len); } - strncat(plic_hart_config, SIFIVE_U_PLIC_HART_CONFIG, - plic_hart_config_len); plic_hart_config_len -= (strlen(SIFIVE_U_PLIC_HART_CONFIG) + 1); } -- 2.21.0