From patchwork Sun May 10 21:01:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283046 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 B6DB3C38A2A for ; Sun, 10 May 2020 21:03:26 +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 84B25206F5 for ; Sun, 10 May 2020 21:03:26 +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="bnUq7SQB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84B25206F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXt6b-00016k-KX for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:03:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt4r-00073R-59 for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:37 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:45333) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt4q-00015R-C1 for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:36 -0400 Received: by mail-ej1-x642.google.com with SMTP id yc10so4296672ejb.12 for ; Sun, 10 May 2020 14:01:36 -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 :mime-version:content-transfer-encoding; bh=4xpV43cJtjJhTGNuwU3vJ0xowPTiH8xsSOamwFx2umU=; b=bnUq7SQBGH34mmIjPwfHTqyfQJgChk3LmtgX5yjF65dLb9TtSZTGYvvq7uE/hBrUNQ wTPW77ZkABLX2VaCFgv3JFTzERV/NT6hiR12lYYQCL/xkpwWSriKWVmrazuCNaCZToOn x7Ra7cfCSUBq26b1P3dMXxTs8NSGJL1pr6XPkUfHnjdN3gmUBOVOyYBMlFBbz10tckc1 gLqK8X/CYtF296Or792cXLHmnzPTnhCE+M1KY/IuiOdiwwyIAsVoTHzQgsU70CdZ5h64 bDauYsN4fNmZwc8fObJiKsdzRRapZ94uadf8B439AsWFRu/0bHvuOXe2zr5/MNJie04x Or6w== 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:mime-version:content-transfer-encoding; bh=4xpV43cJtjJhTGNuwU3vJ0xowPTiH8xsSOamwFx2umU=; b=OOapKkevyfUjxQFnStpCfTtmm7/q6SumUGghw2Oea6xHdGeSzMNxHinI6C/38U9/LT HSh5k85rzUixoxENsqULIVJyjidNnfMxLQZ0tlD+4vSYBy5dkXq5aC+m8JOHJkCjcdDt kdbuOig9mIF9MN6XahLoKbnKvMprqymZROu2795TeWyC7gHGGgJlO+/3QnDN8TRth4sM i0wNzm+h/OCjs1WTHwBivIe74ZA9/bxpctVJscsm5rdytTUJVFVGec45+x9M4MHtBLPR EkUr96QEVO/ZrSTXM5jeIayMG9NMC8qfyq5mOG6bPlSykbA8A8H/vquF2T0rLllH6A2/ wqzA== X-Gm-Message-State: AGi0PuYjN3GIgETDTVDQNhPp7AEkwQkz91FC9Lffm4ZJwsZa0wf2CIXb x3QsXkrBhRXBkH/wRzB5U7VW1z/SHC8= X-Google-Smtp-Source: APiQypL169Auu2EzRXblkbgLNKZEeT9/XxpJvoDVptfurJvOEQAO166ziZU+o+hapoT/jHfz7eJ2hg== X-Received: by 2002:a17:906:ca14:: with SMTP id jt20mr10164192ejb.233.1589144494588; Sun, 10 May 2020 14:01:34 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/12] MAINTAINERS: Add Huacai Chen as fuloong2e co-maintainer Date: Sun, 10 May 2020 23:01:17 +0200 Message-Id: <20200510210128.18343-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Huacai Chen I submitted the MIPS/fuloong2e support about ten years ago, and after that I became a MIPS kernel developer. Last year, Philippe Mathieu- Daudé asked me that whether I can be a reviewer of MIPS/fuloong2e, and I promised that I will do some QEMU work in the next year (i.e., 2020 and later). I think now (and also in future) I can have some spare time, so I can finally do some real work on QEMU/MIPS. And if possible, I hope I can be a co-maintainer of MIPS/fuloong2e. Cc: Jiaxun Yang Signed-off-by: Huacai Chen Message-Id: <1586337380-25217-3-git-send-email-chenhc@lemote.com> [PMD: Added Jiaxun Yang as reviewer] Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1f84e3ae2c..aa5c54c75a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1075,8 +1075,10 @@ S: Obsolete F: hw/mips/mips_r4k.c Fulong 2E +M: Huacai Chen M: Philippe Mathieu-Daudé M: Aleksandar Markovic +R: Jiaxun Yang S: Odd Fixes F: hw/mips/mips_fulong2e.c F: hw/isa/vt82c686.c From patchwork Sun May 10 21:01:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283044 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 574CDC54E8D for ; Sun, 10 May 2020 21:05:07 +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 231BA206F5 for ; Sun, 10 May 2020 21:05:07 +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="eBtQpJEI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 231BA206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXt8E-00043q-7K for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:05:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt4s-00076L-Da for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:38 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:34440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt4r-00015X-QP for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:38 -0400 Received: by mail-ej1-x642.google.com with SMTP id s9so6209888eju.1 for ; Sun, 10 May 2020 14:01:37 -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 :mime-version:content-transfer-encoding; bh=INiH/hiJ+WGtAmJUDmdS9OFn2OmFj310/NQ1BEXJmuM=; b=eBtQpJEI8y+EPVT4bZvJ612r7SrP/j8NZ7Wpj2Sej94Xm7r9qyPUMjQWuK1bkObWt+ JeiS1LQEPxtmBOaqmHdT7ahxTUnN1Y9ujKs2J4KMuPio3xwBEPzo/bongGLfqO5fkgWQ JZ2ciQySh9UzaIzGXR2XCw96Qm1Kh+NEPSHxDGIgj/rzGIgYo0N0AKhYgjmsyms6r/vk +VwYrASuI7bXQgdBGpmXxfZNzw2KvKNAoKhGss8SIXuujHlt90Pfrbg4NK720+8f8kYJ kXbxbLdOZ6P6rOzYrRml322Zg7kR4U9MM4xD9y7Co7aXWkYaO6ORLG/F5r4VsuBhZSPY Q7+A== 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:mime-version:content-transfer-encoding; bh=INiH/hiJ+WGtAmJUDmdS9OFn2OmFj310/NQ1BEXJmuM=; b=cvZ/odkCMh1T39X4BBM5wpIXrpXhFLw8ZY1fgauGQWp6t7gzwMQjOv6YjD7m/4VXK2 JyanLwtJZnlE0uKuwVZH2kqAcUxmiqjHQbW2ujiS2N+Y5AQuMRD5MJDP1+rWKZROVHt5 MomZjJy4WHz59lTC93itZlbGgfVCELy2wlrpwMByuZX9OIQPR+KImcmEvbH0q6Jg+HBX 6qYBgAGJfyb1PrXfBvu2Nm/+MTvp5l6oenRb7+zu1tMVriR8NrDJ9//UbqzKtg2cIC+/ RnwA5lTg9/vtHHvMJycsmu/2G9YYNE+dkGfjDnQdEoJnm5yg01tKm1sW/g1Jzk4Psigy EFRg== X-Gm-Message-State: AGi0PuYkCSzJrcZ+EO+No7EDpiiq3OATwfXiOYYYOtuEa8cU3CdhglBy V4hbsqQ0FB8qiNmT0vMf6qWr8ZgaVhs= X-Google-Smtp-Source: APiQypIYFmVrFBhF4Mr4GGBHzBLgGzbzSybB5vkCOD8Wm5HPr79ytmmjYoHeLBL5r8QnQQCTrgzb4A== X-Received: by 2002:a17:906:2b96:: with SMTP id m22mr10561807ejg.330.1589144496393; Sun, 10 May 2020 14:01:36 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/12] hw/mips/fuloong2e: Rename PMON BIOS name Date: Sun, 10 May 2020 23:01:18 +0200 Message-Id: <20200510210128.18343-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" I'm not sure where 'pmon_fulong2e.bin' comes from. As I always found this bios named 'pmon_2e.bin', rename the definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mips_fulong2e.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index ef02d54b33..f067fa9720 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -69,7 +69,7 @@ * 2, use "Bonito2edev" to replace "dir_corresponding_to_your_target_hardware" * in the "Compile Guide". */ -#define FULONG_BIOSNAME "pmon_fulong2e.bin" +#define FULONG_BIOSNAME "pmon_2e.bin" /* PCI SLOT in fulong 2e */ #define FULONG2E_VIA_SLOT 5 From patchwork Sun May 10 21:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283045 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 EE95BC54E8E for ; Sun, 10 May 2020 21:03:28 +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 BF98F2080C for ; Sun, 10 May 2020 21:03:28 +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="UkhvGcaf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF98F2080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXt6d-0001Do-Sn for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:03:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt4x-0007FI-W4 for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:44 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:34855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt4x-00016G-9h for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:43 -0400 Received: by mail-ed1-x541.google.com with SMTP id h15so3897782edv.2 for ; Sun, 10 May 2020 14:01:42 -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 :mime-version:content-transfer-encoding; bh=+8JRvFNRcXTIFmUjOpwGkhhocKvXrzubaGtLH/+phWc=; b=UkhvGcafC1WLA02XEgfJwZaDnXKTne00koNyzc+xMEbN8enfImt8rE9jv+NWE8Zqgp bIZAxNlYfRxGNotOpEK5zut0hhorXZUUiVtrEvwlA3xxYwJVC2FeKzIwsUzj9eYvnQSf OalBe3zDrNIz0fTkjSD4MDP3mRf8vrlq1DkiEck+5areTakJLzUcMwd5qy08N9S3y/7B OszKaJbQc11xsikJrj8hLZGhyaD9zQh/JT1l1vBvCmty0PR1jLwYQrQnY+QzC/22rNfZ FsVGOcInzu5FelFTbOGkfzOWv0+/9kMXM+uVP9NxR0ZBVmWPFRKzankKbfJWx/PFH7H+ 3Hrg== 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:mime-version:content-transfer-encoding; bh=+8JRvFNRcXTIFmUjOpwGkhhocKvXrzubaGtLH/+phWc=; b=rinDKnazgqHpfQBjv1/vJ1uzFcbgstswFOSicvYivC7IlptiHPeiICWvZacKTm9d1X GwpsY2ursJYshpYPyOHNTSjoL6QvzTY9m1p39/SuCHsACSG9Icxcv1BIh3BQ89txfahw wtuMbDUC5cfJ5e750oDpIYmoq1tR3PmIuDzCUBebsuNARFIQNVb3zCDk2xgr3UirMdgC 8SIOw3o+wU8l4pUMwvHjTlRhWcPB6dpFLPYnK0hq5iUBdI7Jx/zcj9x9U5JP22IXiP6a VgefZ79VoCxbasNagutvw546qd/8gNYQVThLKNYFjdxKP8nkpKYf3TDkQ4Ep9j5aIc8w vAQA== X-Gm-Message-State: AGi0PuaMvXzK5w7zewWdN9witGyE3vDRyNv89o3prPmYzIycTzd69Uh+ owNlmObbL1ca+mwGlK/Xo6ffH33M1Jg= X-Google-Smtp-Source: APiQypIsdAbUhiN+KoO/9H7cEVcnhsqu+LzqhQZvQrMQ5bfNUC6Gvz6cvQDpev7Q/gf5SWkKJcY24Q== X-Received: by 2002:a50:8b42:: with SMTP id l60mr10567401edl.55.1589144501743; Sun, 10 May 2020 14:01:41 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/12] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge Date: Sun, 10 May 2020 23:01:21 +0200 Message-Id: <20200510210128.18343-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , Jiaxun Yang , Aleksandar Markovic , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/Kconfig | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/Makefile.objs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index cd38546689..67d39c56a4 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -43,6 +43,7 @@ config JAZZ config FULOONG bool + select PCI_BONITO config MIPS_CPS bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 9642c77e98..8db41edc7e 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -55,3 +55,7 @@ config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS select MSI_NONBROKEN + +config PCI_BONITO + select PCI + bool diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 8c87e8494d..e422e0aca0 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o -common-obj-$(CONFIG_FULONG) += bonito.o +common-obj-$(CONFIG_PCI_BONITO) += bonito.o common-obj-$(CONFIG_PCI_I440FX) += i440fx.o common-obj-$(CONFIG_XEN_IGD_PASSTHROUGH) += xen_igd_pt.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o From patchwork Sun May 10 21:01:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283043 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 E0C6EC38A2A for ; Sun, 10 May 2020 21:07:28 +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 A89F3206F5 for ; Sun, 10 May 2020 21:07:28 +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="R6blrxJL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A89F3206F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXtAV-0008Cr-S5 for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:07:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt4z-0007JW-S5 for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:47 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:42067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt4z-00016T-4V for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:45 -0400 Received: by mail-ed1-x541.google.com with SMTP id s10so6189419edy.9 for ; Sun, 10 May 2020 14:01:44 -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 :mime-version:content-transfer-encoding; bh=BXdTrm0G7e8AJaMl1cQX+rO0kJVj/ZnPckUe++HqUug=; b=R6blrxJLXjFopvNoqjcbWyGA0Tx2C5Ho57LJOBFAsi+UIoBntgsouUwP4NedlHP+41 FSR1g4zzpWnWamBjfUrzJHvI7kMXm+QqVRmPR568ef4cTn8xPjjhDl0o8wOox3piyp4q txJnM4lkPNs9egQm/EeJj1qdfllhzkx0pfQRxJOt7cxjI3UdWA1KJDOXi2JaNftCDxOj uM4j3gF8sf5nxRoaLvV9Oo0noJBA/hlaO/D7Ihc6R9zAm9dKtpsWTElFtApC5+orKIvq dsPO7Wgi4jPxaVFtX2Zn6OcFp/4+B96Vz4Rx2DRPWpw2h95kIv59HJKAqZUW2eq8hG0A 0SYw== 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:mime-version:content-transfer-encoding; bh=BXdTrm0G7e8AJaMl1cQX+rO0kJVj/ZnPckUe++HqUug=; b=LE3FNNEzRSPBR51cRPOAxvqjmtaazhlTOx4m7x8zW/k1QdECdKA/+4GSDM0+nNW2uX 6levq8PE/9TUxtTt2gnP3IhbDiHjWbXhGSYseq2Utq2dQf15T5FukXIWvEegciE2JcKB t14zGQLJfYW9LZxEj6pkkARGaSNATD06Dk3QpHKRHAxGgQvgwbzcm7O9a8jrCGDiw8ne AZtYkT+4AhpFo+U0vgNLp+wuS85hZTfzeM4V8lPV8cdcmRxNESy6I9pxNWNKXtRqG3Ty dAeNf974ObCMK/V2VQucwf7crp27TdUoIbLp9q6xIgTJusGU6F/HOILRPcTtrzcnLtBe glkQ== X-Gm-Message-State: AGi0PuafQL3wtkPi+ZtKBstJNvmbWZYQWMXUwWygJQTZHfEYOHlRzq9X TO+97BPsewdUj5/6lY60ujK1+nwZ2iA= X-Google-Smtp-Source: APiQypJd3X5j25RzbHX5+Dee748Upsxfeezlggd4uhxe70bm5KdIiYOjCNeBzNFcibw5/D/KWT5KXQ== X-Received: by 2002:a05:6402:1d1c:: with SMTP id dg28mr10856953edb.315.1589144503742; Sun, 10 May 2020 14:01:43 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/12] hw/pci-host/bonito: Fix DPRINTF() format strings Date: Sun, 10 May 2020 23:01:22 +0200 Message-Id: <20200510210128.18343-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/bonito.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index b9bfe3c417..10ead31e4f 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -239,7 +239,7 @@ static void bonito_writel(void *opaque, hwaddr addr, saddr = addr >> 2; - DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", + DPRINTF("bonito_writel "TARGET_FMT_plx" val %lx saddr %x\n", addr, val, saddr); switch (saddr) { case BONITO_BONPONCFG: @@ -327,7 +327,7 @@ static void bonito_pciconf_writel(void *opaque, hwaddr addr, PCIBonitoState *s = opaque; PCIDevice *d = PCI_DEVICE(s); - DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %x\n", addr, val); + DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %lx\n", addr, val); d->config_write(d, addr, val, 4); } @@ -474,7 +474,7 @@ static void bonito_spciconf_write(void *opaque, hwaddr addr, uint64_t val, uint32_t pciaddr; uint16_t status; - DPRINTF("bonito_spciconf_write "TARGET_FMT_plx" size %d val %x\n", + DPRINTF("bonito_spciconf_write "TARGET_FMT_plx" size %d val %lx\n", addr, size, val); pciaddr = bonito_sbridge_pciaddr(s, addr); From patchwork Sun May 10 21:01:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283042 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 74E88C38A2A for ; Sun, 10 May 2020 21:09:32 +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 3CB0B206F5 for ; Sun, 10 May 2020 21:09:32 +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="aTKTgX8u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CB0B206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXtCV-0001at-CV for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:09:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt57-0007WI-1G for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:53 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:36240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt55-00016w-D9 for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:51 -0400 Received: by mail-ed1-x543.google.com with SMTP id b91so1984992edf.3 for ; Sun, 10 May 2020 14:01:50 -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 :mime-version:content-transfer-encoding; bh=mmHaPOER59FIZy5I04bKapXn8WezFDdBC08nDY63Daw=; b=aTKTgX8uydWqTwDfZ1S7QC+Viz74HDPSWAhviukCF7EIBQoWiuJ9wrAju1LZaHXY+P sXBYs+PUTK55dWNv1jZsPhAHDTI8UZVutX2wVJBpYSfhX1+Vjdwu+7/I/I90b9P03bk8 yw1DtZo7WBX3xIiyjyBJ5V9jaoD5UzBCjaT+WuaFgPMbjcUAAgPxBBL3R2cRl1KZ7Yns 0qBLoEN8L3GAuc8u3vdsgFeyjdK9s2JZKb7yVqpmS5lG5og1RKxCLQCitEAhYWe6Gii6 CblRirU3MqoYqgDCbdLvyb7PC0tw5GF2d1jWO9eUydcOa0rPyhe1HfW/kVgKi+22ffUm rt9A== 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:mime-version:content-transfer-encoding; bh=mmHaPOER59FIZy5I04bKapXn8WezFDdBC08nDY63Daw=; b=cX2gBavKQnc7rCt7UOw0ftNOyaWv0QmMJ4CVxaAjPbnO+9/bUvLwv4+72QarVGweFc Gs/bWr4XGbqKm4mcfTAjoRlgmgE+GcToBun9AR7dH64Q758+7zX9uDE40RNqgYafs2tq S4S+oKnk+2Ea1SqLsPXpOsH/2ZN7hGmHRPLQLEl6nSpCDy1LG+T3D5/dk84ZXTJylH++ 2dhJvSbLXmWVHNwHHWBPJ9+gZ1D4nLMRHltA1zKZEaFysiRQ+MtDpPUD2oaLv8N72oVR CB9AW3VhaMiLpLnGgci0kDkdyUFm22AZv9yBlg9pD6yP8Ogr80Uf3xxx9zFkjnCLA6zK jrCQ== X-Gm-Message-State: AOAM53152yTGYyyGggHkO+IdA5WvkQvYZESa9UbFaQBt6jbWUemwT82a j2UqHoOyhD1fQOUt0aaxioKJuuEot2w= X-Google-Smtp-Source: ABdhPJzj2Cgl5x65+MPo3TFEj/K9OFbF8B+Z+SQUf1uo1la3eBMBqL0lKll6HgHV7GYU3T5daaUeTw== X-Received: by 2002:a50:fd15:: with SMTP id i21mr50855eds.104.1589144509247; Sun, 10 May 2020 14:01:49 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/12] hw/pci-host/bonito: Map the different PCI ranges more detailled Date: Sun, 10 May 2020 23:01:25 +0200 Message-Id: <20200510210128.18343-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Better describe the Bonito64 MEM HI/LO and I/O PCI ranges, add more PCI regions as unimplemented. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/bonito.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 9761780f44..90a6c52a38 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -39,6 +39,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "hw/pci/pci.h" #include "hw/irq.h" @@ -82,7 +83,7 @@ #define BONITO_PCILO1_BASE 0x14000000 #define BONITO_PCILO2_BASE 0x18000000 #define BONITO_PCIHI_BASE 0x20000000 -#define BONITO_PCIHI_SIZE 0x20000000 +#define BONITO_PCIHI_SIZE 0x60000000 #define BONITO_PCIHI_TOP (BONITO_PCIHI_BASE + BONITO_PCIHI_SIZE - 1) #define BONITO_PCIIO_BASE 0x1fd00000 #define BONITO_PCIIO_BASE_VA 0xbfd00000 @@ -606,13 +607,25 @@ static void bonito_pcihost_realize(DeviceState *dev, Error **errp) PCIHostState *phb = PCI_HOST_BRIDGE(dev); BonitoState *bs = BONITO_PCI_HOST_BRIDGE(dev); - memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCILO_SIZE); + memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_SIZE); phb->bus = pci_register_root_bus(DEVICE(dev), "pci", pci_bonito_set_irq, pci_bonito_map_irq, dev, &bs->pci_mem, get_system_io(), 0x28, 32, TYPE_PCI_BUS); - memory_region_add_subregion(get_system_memory(), BONITO_PCILO_BASE, - &bs->pci_mem); + + MemoryRegion *pcimem_lo_alias = g_new(MemoryRegion, 3); + for (size_t i = 0; i < 3; i++) { + char *name = g_strdup_printf("pci.lomem%zu", i); + + memory_region_init_alias(&pcimem_lo_alias[i], NULL, name, + &bs->pci_mem, i * 64 * MiB, 64 * MiB); + memory_region_add_subregion(get_system_memory(), + BONITO_PCILO_BASE + i * 64 * MiB, + &pcimem_lo_alias[i]); + g_free(name); + } + + create_unimplemented_device("pci.io", 0x1fd00000, 1 * MiB); } static void bonito_realize(PCIDevice *dev, Error **errp) @@ -620,6 +633,7 @@ static void bonito_realize(PCIDevice *dev, Error **errp) PCIBonitoState *s = PCI_BONITO(dev); SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost); PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost); + BonitoState *bs = BONITO_PCI_HOST_BRIDGE(s->pcihost); /* * Bonito North Bridge, built on FPGA, @@ -652,6 +666,7 @@ static void bonito_realize(PCIDevice *dev, Error **errp) sysbus_init_mmio(sysbus, &s->iomem_ldma); sysbus_mmio_map(sysbus, 3, 0x1fe00200); + /* PCI copier */ memory_region_init_io(&s->iomem_cop, OBJECT(s), &bonito_cop_ops, s, "cop", 0x100); sysbus_init_mmio(sysbus, &s->iomem_cop); @@ -669,6 +684,13 @@ static void bonito_realize(PCIDevice *dev, Error **errp) sysbus_init_mmio(sysbus, &s->bonito_localio); sysbus_mmio_map(sysbus, 6, BONITO_DEV_BASE); + MemoryRegion *pcimem_alias = g_new(MemoryRegion, 1); + memory_region_init_alias(pcimem_alias, NULL, "pci.mem.alias", + &bs->pci_mem, 0, BONITO_PCIHI_SIZE); + memory_region_add_subregion(get_system_memory(), + 0x20000000ul, pcimem_alias); + create_unimplemented_device("PCI_2", 0x80000000ul, 2 * GiB); /* pci_hi */ + /* set the default value of north bridge pci config */ pci_set_word(dev->config + PCI_COMMAND, 0x0000); pci_set_word(dev->config + PCI_STATUS, 0x0000); From patchwork Sun May 10 21:01:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283041 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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 A202AC38A2A for ; Sun, 10 May 2020 21:11:50 +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 6B50F20801 for ; Sun, 10 May 2020 21:11:50 +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="sylXiCRa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B50F20801 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXtEj-0004Zn-IS for qemu-devel@archiver.kernel.org; Sun, 10 May 2020 17:11:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt5B-0007fP-3G for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:57 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:38812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt59-00017R-Eu for qemu-devel@nongnu.org; Sun, 10 May 2020 17:01:55 -0400 Received: by mail-ej1-x641.google.com with SMTP id a2so6200865ejx.5 for ; Sun, 10 May 2020 14:01:55 -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 :mime-version:content-transfer-encoding; bh=ayYsOE2ekE5zXVDs2oP9hlJpdQM4y7RMHn3xiibRt4E=; b=sylXiCRa4NluLp9RptVwUNHWKqcEojov0WI71qgh0bHeSPwrm9Ef3+AS6D7kjthYKs UL+a5VY8SBujp9GY7TQfOjoDReY0K6gX8i8nPp4M8cXZax9sKKp+yCQEm/SzTk3GrqRU ncN3Jw+ULmatyfypyUwBwRJu4QZC//TzhMM5W5yvskhHGpMfhf3CSWV51u45GyM1SYjh 4TxkQrHXEBPW2raqBHV8jRqGfzrf6M0Dt7ScH8SZchD2N211L7m1io8+ez+54ARKAs1q IyUrwXzjfy08gU/FiSs+dIRa7DT1Vwb+8Yff6jtIWOO40NrUL9iW0o4On7O4KSll9uOh 86Nw== 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:mime-version:content-transfer-encoding; bh=ayYsOE2ekE5zXVDs2oP9hlJpdQM4y7RMHn3xiibRt4E=; b=JRTagMUs62cpul9bQgM8NbohXMy11nIDXXuC1uloOFtWM94D+zAYeJ2hFdMP/fU6m5 MVbnFmrMm94VDbl/vMmpR0Tompy9/+PkOe7J8r13L39G7/6lJH8DVVntFh4q+w5dFrBh was2VT4ootkvr6Hr05akl0BtTvLTyMVNWbRPRtjfFXwWasS3Lz/fOZMFRGkld3np89cy csH3OJ3ai8uA64slpBvNfiTnJ7ScQdNiQ0vjp6Q3X2a2btyS2ohNsuLEGscnPWYGnXqm /jnvbLMnGVMG3/n3EiRWezVq5bmFy8RIpPj6uBoR4JGOoL6QJ+CsBdN4gthtZS/bSM7K U/IA== X-Gm-Message-State: AGi0PuYTuMnPMXgkAu6wUk5YAsltEl6M8iFt7Zs0unYzg+Msk/6F1pgQ 5ybuhayc7VSbuuPXooZQxBwo0gRO4x4= X-Google-Smtp-Source: APiQypKnETHJa0KI2o/OOQ2J86zPQr7AH3gg3oq8xZwaso8MXX+FP7p7G56cEbwg64D0jbfPJgbTIA== X-Received: by 2002:a17:906:17c1:: with SMTP id u1mr10929661eje.47.1589144513942; Sun, 10 May 2020 14:01:53 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d15sm921152ejr.50.2020.05.10.14.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 14:01:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/12] hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32 Date: Sun, 10 May 2020 23:01:27 +0200 Message-Id: <20200510210128.18343-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510210128.18343-1-f4bug@amsat.org> References: <20200510210128.18343-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Thomas Huth , Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Describe some Config registers fields with the registerfields API. Use the FIELD_DP32() macro to set the BONGENCFG register bits at reset. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/bonito.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 335c7787eb..86aceb333a 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -50,6 +50,7 @@ #include "sysemu/runstate.h" #include "exec/address-spaces.h" #include "hw/misc/unimp.h" +#include "hw/registerfields.h" /* #define DEBUG_BONITO */ @@ -112,8 +113,19 @@ /* Power on register */ #define BONITO_BONPONCFG (0x00 >> 2) /* 0x100 */ + +/* PCI configuration register */ #define BONITO_BONGENCFG_OFFSET 0x4 #define BONITO_BONGENCFG (BONITO_BONGENCFG_OFFSET >> 2) /*0x104 */ +REG32(BONGENCFG, 0x104) +FIELD(BONGENCFG, DEBUGMODE, 0, 1) +FIELD(BONGENCFG, SNOOP, 1, 1) +FIELD(BONGENCFG, CPUSELFRESET, 2, 1) +FIELD(BONGENCFG, BYTESWAP, 6, 1) +FIELD(BONGENCFG, UNCACHED, 7, 1) +FIELD(BONGENCFG, PREFETCH, 8, 1) +FIELD(BONGENCFG, WRITEBEHIND, 9, 1) +FIELD(BONGENCFG, PCIQUEUE, 12, 1) /* 2. IO & IDE configuration */ #define BONITO_IODEVCFG (0x08 >> 2) /* 0x108 */ @@ -577,11 +589,18 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int irq_num) static void bonito_reset(void *opaque) { PCIBonitoState *s = opaque; + uint32_t val = 0; /* set the default value of north bridge registers */ s->regs[BONITO_BONPONCFG] = 0xc40; - s->regs[BONITO_BONGENCFG] = 0x1384; + val = FIELD_DP32(val, BONGENCFG, PCIQUEUE, 1); + val = FIELD_DP32(val, BONGENCFG, WRITEBEHIND, 1); + val = FIELD_DP32(val, BONGENCFG, PREFETCH, 1); + val = FIELD_DP32(val, BONGENCFG, UNCACHED, 1); + val = FIELD_DP32(val, BONGENCFG, CPUSELFRESET, 1); + s->regs[BONITO_BONGENCFG] = val; + s->regs[BONITO_IODEVCFG] = 0x2bff8010; s->regs[BONITO_SDCFG] = 0x255e0091;