From patchwork Thu Oct 11 20:31:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10637389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B67AF112B for ; Thu, 11 Oct 2018 20:33:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FFA827CEA for ; Thu, 11 Oct 2018 20:33:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 911202C05E; Thu, 11 Oct 2018 20:33:33 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 09F9E27CEA for ; Thu, 11 Oct 2018 20:33:32 +0000 (UTC) Received: from localhost ([::1]:36986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAheF-0007oM-UR for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Oct 2018 16:33:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAhcd-0006cg-55 for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAhcY-0006UF-5H for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:51 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:44543) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAhcX-0006TF-NR for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1539289921; x=1570825921; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=jAA8S5g03P9ndaGPFkUzvSSEHyZtXKtl4SyPDoBd9VY=; b=aJZ46mkX0jql4ateJunblOuPLyew2LLL3m8a3iDticHlvEWIJak2XzW7 Nvnrj9GUzsTP1FoxP70H3Cccu1CoeRUHZk7Ml3emLIv0jnusSkcE+sMOs n+Bjsh4DgptXGCpmoz5Q0cL21jN17VImLMBtq3Gjt4Ym72dWw3BmFzC5C Busp8xV2S9cR5qQG3VUTn99f3NLJQzGDpcV0h0xXp9Bf4MCZ1OltZt+33 dPfC1Wk779FMaMroShhLgfvLST/Z2EZW9mU39oPyBymFKOrfz+R0xvE8g x4OcARpnG1Q/VZjgWlOQnL1FWb/xLemF9aOJRVq6hKE1B44BB9IqcphLo A==; X-IronPort-AV: E=Sophos;i="5.54,369,1534780800"; d="scan'208";a="189450643" Received: from mail-sn1nam02lp0022.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.22]) by ob1.hgst.iphmx.com with ESMTP; 12 Oct 2018 04:31:58 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jAA8S5g03P9ndaGPFkUzvSSEHyZtXKtl4SyPDoBd9VY=; b=X9tNi3PRa8x3I7NQnhH3fVGXnC+KhrOm4fdpf1ium8dhAANafEJskUbaoB051Qoc8UHFLB/Qtz6EvfGc9ouFWTBtwPXGh7TfOo7e2INFdd0h5lIQKi2mH7pX6OYlXwITq/+13GJb7vVg0GbdUC/BYVeCGS5T+/obkP51yJwQ/n4= Received: from CY4PR04MB0392.namprd04.prod.outlook.com (10.173.188.145) by CY4PR04MB0454.namprd04.prod.outlook.com (10.173.189.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Thu, 11 Oct 2018 20:31:38 +0000 Received: from CY4PR04MB0392.namprd04.prod.outlook.com ([fe80::ddab:bdc2:6bc7:6d22]) by CY4PR04MB0392.namprd04.prod.outlook.com ([fe80::ddab:bdc2:6bc7:6d22%6]) with mapi id 15.20.1228.020; Thu, 11 Oct 2018 20:31:38 +0000 From: Alistair Francis To: "peter.maydell@linaro.org" Thread-Topic: [PULL 00/10] riscv-pullreq queue Thread-Index: AQHUYaFp0ilW63rnpEeBlp4idGV/og== Date: Thu, 11 Oct 2018 20:31:38 +0000 Message-ID: <20181011203115.18666-1-alistair.francis@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 x-clientproxiedby: SG2PR01CA0126.apcprd01.prod.exchangelabs.com (2603:1096:4:40::30) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR04MB0454; 6:F3MPili9SU6WAiMXKJG34CtnDJL5Vxi2I25OHhnC3Fxayw9zXyEIQ0aDSLISKOP3POHomogGdMJMybbHfSKAkubKzVpev+GofL7j2g3C8ZONTMHZ/35H3hPBPr1A2pgN8wgLNIVCBLcfXgM10BqbUpVZkcADX/v4Usb9mhMQrtUmdw9dL7wfQ2De/1xS5VQN8RniXHKfQ7WXi4YOA5BDpW202uEFeUs2MV+vDaYJ10N4SGOXyFbr9TQA3LOhFzPg90+Z6egXelpRW7JYj5We1atF7raDSdIYOIKs3+EdhGe0A/ilgZcOJygBI1CySXcBf4Y6kzOYGaaac+Lew+SrPQOVAOMn0aJdxUsI8LvZBMuBlOl+j1T0Loj8/Cj1xyPbMt6awfYa6K9RVJiB+tR/h28kLGBwt8zGZrgBsd3znsslS8MNzo4PFdQ+FQjm1uLrJWzUgabvh8pYYLEyWa0R0g==; 5:6Z78/NJCeCjOl9DsIqkrzURG+5WOasMJ/YRlcA0jUCyR0wP6yiZSMzOO+I7WFfYgpFsyjuFKeQkMNRghNaVcy/tsBjuAJVAnNlT6hKQ+CojzLDSUoItL3jueND0OPIVtchnjbyVy9lF8atUogvm9/T0YZIgCZTnzfXdVk1ccJAE=; 7:78c5YpgQN7Y0024K+dpwXyASwc4rgRHCUasFGsfF3N95lmHI0K/361ShedciSdXwWxH3l2BJFFGWtZHTZ1ZyDrj8S6AdYUa+3RWJDj32VmzbOwQDDoVmro7gvCkC1aL45t+okDmxePLiOEpaGfNseyY63puWVyOfmo09NHarU/TcUx38eep+rfD4esLNVLsDRK6m0qF1XM/wLTllSxzz1MQTZwMkEoTTdG5wmgGIPRE2giFz4l5qZZ5WB0Bd4Lr5 x-ms-office365-filtering-correlation-id: ab834868-1866-4143-42ab-08d62fb88b20 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0454; x-ms-traffictypediagnostic: CY4PR04MB0454: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(166708455590820)(21532816269658); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:CY4PR04MB0454; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0454; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(39860400002)(376002)(366004)(396003)(199004)(189003)(71190400001)(71200400001)(2906002)(26005)(2900100001)(316002)(478600001)(6436002)(54906003)(14454004)(36756003)(53936002)(6512007)(5640700003)(6486002)(66066001)(81156014)(2351001)(8936002)(476003)(7736002)(72206003)(8676002)(50226002)(105586002)(86362001)(106356001)(99286004)(14444005)(2616005)(186003)(1076002)(3846002)(6116002)(5250100002)(2501003)(52116002)(6916009)(256004)(97736004)(25786009)(4326008)(4001150100001)(68736007)(386003)(486006)(44832011)(5660300001)(102836004)(305945005)(81166006)(6506007); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0454; H:CY4PR04MB0392.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: kXWOiuI4wGv3m1s35mjstkZyje3EJMttAb+jEzciOm3eshfubEhbHZYiVH6UCJdUcv1eRg6AFHMZAvlk6OOLeX0k6J/Xn3exLOITtapzwKrwmWBiaasKwXQTtBoN291BpbAxrDYnO51lI8ynI41/Fwsi6984gMFJxV5FSymjFuCCkhKxGPsGflzG9FCq+XIULuujtmbBHOyVEx9GJf9sYVR+SqLsT12SAbr1UBwhFOfBHZxcS61IKdbgcb//S6EMgILMW/1UvOj3HgvoMN3IEu30jbZViK03J6GpsjSf/F5DachvWa4yE42jnDLaCG/pAC54eCHeRnzMjip+YUJDJB8g7fwhL2eDb0PrKNowU50= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab834868-1866-4143-42ab-08d62fb88b20 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 20:31:38.1725 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0454 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PULL 00/10] riscv-pullreq queue 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: Alistair Francis , "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The following changes since commit 75e50c80e051423a6f55a34ee4a1eec842444a5b: Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging (2018-10-11 10:43:37 +0100) are available in the Git repository at: git@github.com:alistair23/qemu.git tags/pull-riscv-pullreq-20181011 for you to fetch changes up to f39e645c5f5e9f2b3d41e9c1ad84caae1829cce2: RISC-V: Don't add NULL bootargs to device-tree (2018-10-11 10:30:26 -0700) ---------------------------------------------------------------- riscv: Connect PCIe and apply some misc patches Connect PCIe to the RISC-V virt machine and SiFive U machines. There are also some patches that I have cherry picked from Michael's RISC-V tree that are ready to be applied. ---------------------------------------------------------------- Alistair Francis (5): hw/riscv/virt: Increase the number of interrupts hw/riscv/virt: Connect the gpex PCIe riscv: Enable VGA and PCIE_VGA hw/riscv/sifive_u: Connect the Xilinx PCIe hw/riscv/virt: Connect a VirtIO net PCIe device Michael Clark (5): RISC-V: Allow setting and clearing multiple irqs RISC-V: Move non-ops from op_helper to cpu_helper RISC-V: Update CSR and interrupt definitions RISC-V: Add missing free for plic_hart_config RISC-V: Don't add NULL bootargs to device-tree default-configs/riscv32-softmmu.mak | 10 +- default-configs/riscv64-softmmu.mak | 10 +- hw/riscv/sifive_clint.c | 8 +- hw/riscv/sifive_plic.c | 4 +- hw/riscv/sifive_u.c | 68 +++- hw/riscv/spike.c | 6 +- hw/riscv/virt.c | 78 +++- include/hw/riscv/sifive_u.h | 4 +- include/hw/riscv/virt.h | 6 +- target/riscv/Makefile.objs | 2 +- target/riscv/cpu.c | 6 +- target/riscv/cpu.h | 22 +- target/riscv/cpu_bits.h | 683 +++++++++++++++++--------------- target/riscv/{helper.c => cpu_helper.c} | 35 +- target/riscv/op_helper.c | 34 +- 15 files changed, 599 insertions(+), 377 deletions(-) rename target/riscv/{helper.c => cpu_helper.c} (95%)