From patchwork Wed Nov 21 17:02:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692853 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 EC39914BD for ; Wed, 21 Nov 2018 17:08:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4E302C4F8 for ; Wed, 21 Nov 2018 17:08:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8B9D2C534; Wed, 21 Nov 2018 17:08:08 +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 46E542C4F8 for ; Wed, 21 Nov 2018 17:08:08 +0000 (UTC) Received: from localhost ([::1]:40374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVyx-0000z5-09 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:08:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVu7-0005Jj-Q3 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVu3-0008SH-CN for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:07 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:21533) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVtl-0007bD-94; Wed, 21 Nov 2018 12:02:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819765; x=1574355765; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8eToc+l7a1UdYY4yQAUWHjfHiF8PpPTPWHbrUVhZmnM=; b=XL9PWL39YD2/hzkoh8qvra+05MUzuHW+EUW/H35fhnWoLlRMTN+w7BPT KmEtM32jZ9WalfNgeSSyURf6IuZUBzPaxcxASItdOCN0bjEa/MlpFSaFO b0TYgQvlSia//tifd+ayjWiKlP9i4C4ZvISyh/Gw+67/vjLDMfl0CHNB8 sxgMQanURqh+Yc7I1tUKf81IgUZIa2J5uSIBAuGr6Rk9qxYi6cgkVheQg e/nRMvikONqeN/RFGsZHYwYbSRV9HWO4QhQnoqLzvxc32whg5Q9qO1iUA 9schvCLE0LGywsTvm2HPDgP1ZszjMoOzq089TmErBOY2cLbf/prOHeGfp w==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="96547363" Received: from mail-co1nam05lp0080.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([216.32.181.80]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:02:20 +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=iGfif8BGFsVH46YZN5D3urTN6h79U8PWMGTpqvdy4eM=; b=lDn1ED0AS/hekYXim2ZjuJFkQU4c532clAcAkoHgeDwdsklPhL/ykto6U+0JFnj6WarH5Zqt5tktF+gFFxm+Po68fs065CEr5wrbFM2PGvFTHTIYh9BXlJR6u4lBn+OOr1xdvst2trmVTGZNE0i91+4OE6r8I5nYtg85/osQfMU= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:02:17 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:02:17 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 1/6] hw/riscv/virt: Increase the number of interrupts Thread-Index: AQHUgbv1UUmY9RApZkWp4OUt71d3vw== Date: Wed, 21 Nov 2018 17:02:17 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR11CA0061.namprd11.prod.outlook.com (2603:10b6:a03:80::38) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) 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; MWHPR04MB1249; 6:XUzmtHwD18H53SAyaKltjtn7PHP2jD+1fhncwToK2Z2ikD5twXqS3ldZ8oN2FsGwzJ1t+gylkDfhfyD76I/n3EozIDgQHSugzb2kGb1YIMrclJUIDa9T5ZWren1LuuU5kfwW5zs+nSRbIlqgKqBJDDl47zIhzgDbMqnS+pLD22dOKubVt7Wrkht7UT1ulcbp0QFVvLDFGEj0gfkkav0+R+AUt/r+1z110LS5OyyRUNwE3SkQzwr5JPh6Sm5O5ynxTIkkvx7mZC3ozbLEmEizvaUNhtIGkgaAPggLpIDHdNOliZHaoYDn6yg+qS87TAxZ2Mpy0mmMN6V0GkrhayCgklXmfFHE0AT+P+36CPFqxCI7SP5MsmBtVclLjoF8/co6V3AzwsAtSIub6K5b6P2AxD7oUHMSHHEc4v4aZ3R4OCQtbPoDGWBi/B5h0bkOTv2V9+4v1XoHtnzzpiAZZkn5ZQ==; 5:h5Mx+LWiOxNIrIEzUUTJOAX514QnjznDeyhZOSX3mM1WqWXU4j4G8W4IdzmcQjqYvztYcJzPe61C6/3d2tzq4WJ0kgGUbUefy8L+16jUIAeLorngxI/2OimS85TUo48uf5C9rgf5HLY9scbrKvdDjAC/Vc98zWpwkHoLT5P5n1A=; 7:uIzasH64H6xrO05fKGWDP1UE8a2ZmvfOR6mU/oAyu/5N+EQPTRN6MhEXkq5EV1Q1erDUK4N+nG0Ts7B/Idm7XzZV4sni+tTmcCsJtBu0pSRGJOOx+795uCnjNdKm9oCSgVlQ1cTTTTKdwwW0cppHsQ== x-ms-office365-filtering-correlation-id: 73752c8c-7b6f-4b0b-a7ee-08d64fd31776 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201703061421075)(201703161042150)(20161123564045)(6042181)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(189003)(199004)(36756003)(72206003)(14444005)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(498600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: a1B8fgq54BjvBRqHPDpNTx9v9nxC9S15ssXEjLn9CI1axvOpkfyU5GOpckJnV/fDLZh/ET93iHpWefwzukfpFpKstN19x6BOLntp4h44lDmZbbLysnN8Jt8OQyNy29vWVXYzTUOrxWNyQw1qn+1cEbg6TCRXfKNfalYaytEZR9A8JhL3xv6DuSEBaj9GtpoJ3K3bnwHfnDrRv8q0yl+pP84H4qRb9jWL3NZb3U6Fh2dWRyOoGyBZLRgBXJhglaeoQaL6uxI+dmtSlwqjzCdOB4xht9ldtMOIkWcUnW80DtSapkmu6l5h3L7y4zOYK9FDGxMhEdk+seuwpIZRHnTOCGvLSBTVj7EQjWc9AeGpzAY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73752c8c-7b6f-4b0b-a7ee-08d64fd31776 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:02:17.5006 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PATCH for-3.2 v7 1/6] hw/riscv/virt: Increase the number of interrupts 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Increase the number of interrupts to match the HiFive Unleashed board. Signed-off-by: Alistair Francis --- include/hw/riscv/virt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 91163d6cbf..7cb2742070 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -45,7 +45,7 @@ enum { UART0_IRQ = 10, VIRTIO_IRQ = 1, /* 1 to 8 */ VIRTIO_COUNT = 8, - VIRTIO_NDEV = 10 + VIRTIO_NDEV = 0x35 }; enum { From patchwork Wed Nov 21 17:02:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692859 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 7399413BB for ; Wed, 21 Nov 2018 17:10:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52DCA2C5AC for ; Wed, 21 Nov 2018 17:10:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 479F72C5C0; Wed, 21 Nov 2018 17:10:58 +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 C9C752C5AC for ; Wed, 21 Nov 2018 17:10:57 +0000 (UTC) Received: from localhost ([::1]:40396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPW1g-0003Dd-BP for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:10:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVuC-0005Ni-Au for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVu6-0000BF-Gm for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:12 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:21533) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVtr-0007bD-Bk; Wed, 21 Nov 2018 12:02:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819771; x=1574355771; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=dAZDrGQXSe+UN9sYvkBrJKTDlVGYZ5v2BxmgTl+oHSQ=; b=XVUNHcqk2nEIEl417O9R8Je5WU0aS3FwJDIJ7GSYI+zVVQF+PEwoCY1r rCSx/8DWmz8w7iewta0eJsCLhdQ/NSDCnMezAl0t9p8plappCzIRcIkeE mLhIUtclNdVXnGswx6MUsRCRf5muLHXOG9QxdrSSo6MxOmS9QX9jag43g ypEtbLxyPS2Xu7Pr2173fKIBwhJPZ4yBX2S+hPoZWFiB+QOKEflaRMWzJ 8lBM14QNZ32xOkEfagDuEk2ej8hsdI1vEp787lSB0Sgjc6LU8sjbcM20a I+tqhJ6K+bkFVJAYhpS923kD0tUf4NbDquIypzd276jc6tbVkM2LpuATJ g==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="96547367" Received: from mail-co1nam05lp0079.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([216.32.181.79]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:02:28 +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=84xrGFUm5oTeDV7kPfDdQQsZck0I5In5HVHAMEPrROU=; b=fPfyjrVGpjBZaUb995u0W5z0KhKNYESCMuDDDqOF4TF3GqOkwuA+plyRghe8yygW+6C+t2Q/eTlb24NEC2u84FVNUMOZh9xodCVaev5r9cC1MjH0yJgBR/KLrA4hpJxI9NpvSOhHatr5x+MbaFfAZovG25tBG7PQbnjOO/qhaWY= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:02:26 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:02:26 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 2/6] hw/riscv/virt: Adjust memory layout spacing Thread-Index: AQHUgbv6uT+1D6loLEqXSa299QMvDQ== Date: Wed, 21 Nov 2018 17:02:26 +0000 Message-ID: <005f96f5dbffd4c2e370f8b0ee102d3b477e19b0.1542819633.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR11CA0054.namprd11.prod.outlook.com (2603:10b6:a03:80::31) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) 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; MWHPR04MB1249; 6:J/DzHVC4A7ktAW+RMmhdjxde8K5lGtD8eqJYj2d7aIXPLsXCeOppMDFDfxIJlomXFZTz74IghObSzEeL1GHI+kiSNPSGfkgyrtHbSrTK/VQ8+olx5AUGcHAm0KeiL1wrAyn2VLPA0GVcMdON6M9g8wcyn6o347pIaf6i3LOPEMLrDk3rydyDvFkQsrNxuHomsJ5hW4E2NulPI6i91Oj+fs6W4y5VycKCbiW+k0TAsfzCmahTQoFBpH+QgEqaTGkdg6LGb0Fp+9FIin/B0R4KXxGSKNWVTATXpDyNlT962mauyvV5OhNC8aZ1GbSIkgfpQtLrqJg2EPjAlMgopIubvepDPCndjk4LExDlLSM9KVnHHQJnwCU3L8oiSLIWTYs4Ru09Ro1XBicAmMeb2W3ZPU90+p37GQQbR54IstgbJGjSGeb/1/0CpVWLcjCcOL6CNxyTjKUYlII4ylcGxGtZCA==; 5:7izBW3w3WdHgntt865hURK0Gl05aSiXgOqhFv2RMpTgDMNlN4pQDB3ltoe6UCg8mRK1dYg6k3DVu4O6//mcpdhmoXBSUdaDM4deVc3aHD7iuLYB+RnnnvavLFflH2cMyI1LXLspkQraa54Hl89gckiqwS6psBr5vLydnMa1bq+c=; 7:a04X9852i3SJiiuIUem4vHjh5aSfaMKkErAQumk9o7YpNHmJuLY7ThKqJB6iFAnv9C9V2BJvUPBkwNpF+jxspEVQzGEVLoCBMqdFhCOIiIXuDHaun/4Av48R+bu7LrX+gAUKba8yq2u0ZkSh8d731A== x-ms-office365-filtering-correlation-id: 3556e5e1-75c5-4b4e-a5bf-08d64fd31ce4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(36756003)(72206003)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(478600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(316002)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: fWmAUhhyouMjnfdfx1XjlBVgzZk1hRGUCrOqS35gOM3CeCeOVXt85H3kgMeasquoyAbLYnpAyjnFzin5ihYbf/YS33khQX/g/+wdXUeAROPL7ZvzBwxDziJl6cr3rozqDqzfaCV1myE9urk9d4g4JYPc46fgfE4I3AiZwRirZUeFZpwDy7sNUBZGfjUfFEmBQfLa2xwUh6pINzKUioxWmrFVW9mczxXipa/wFplGYJKNluKpANLEOBmG06THQvaIU0qJ1r5NCNouOcN13CM4Q8U5p9pyy/O/haNkMne5jer91mrbnFEJiqTnVT2YULDGrblJE+U9WJwIbxqwpbxMOmLFqVQPcdDGWEF90imGHaI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3556e5e1-75c5-4b4e-a5bf-08d64fd31ce4 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:02:26.4069 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PATCH for-3.2 v7 2/6] hw/riscv/virt: Adjust memory layout spacing 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe --- hw/riscv/virt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 2b38f89070..6b6fa39aaa 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -47,14 +47,14 @@ static const struct MemmapEntry { hwaddr base; hwaddr size; } virt_memmap[] = { - [VIRT_DEBUG] = { 0x0, 0x100 }, - [VIRT_MROM] = { 0x1000, 0x11000 }, - [VIRT_TEST] = { 0x100000, 0x1000 }, - [VIRT_CLINT] = { 0x2000000, 0x10000 }, - [VIRT_PLIC] = { 0xc000000, 0x4000000 }, - [VIRT_UART0] = { 0x10000000, 0x100 }, - [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, - [VIRT_DRAM] = { 0x80000000, 0x0 }, + [VIRT_DEBUG] = { 0x0, 0x100 }, + [VIRT_MROM] = { 0x1000, 0x11000 }, + [VIRT_TEST] = { 0x100000, 0x1000 }, + [VIRT_CLINT] = { 0x2000000, 0x10000 }, + [VIRT_PLIC] = { 0xc000000, 0x4000000 }, + [VIRT_UART0] = { 0x10000000, 0x100 }, + [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, + [VIRT_DRAM] = { 0x80000000, 0x0 }, }; static uint64_t load_kernel(const char *kernel_filename) From patchwork Wed Nov 21 17:02:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692847 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 63DCB14BD for ; Wed, 21 Nov 2018 17:04:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E2AB2C2E1 for ; Wed, 21 Nov 2018 17:04:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 420DE2C46B; Wed, 21 Nov 2018 17:04:52 +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 576182C2E1 for ; Wed, 21 Nov 2018 17:04:51 +0000 (UTC) Received: from localhost ([::1]:40346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVvm-0006s0-Dg for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:04:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVu1-00059W-Ow for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVtw-0007wV-In for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:01 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:7633) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVth-0007YZ-HU; Wed, 21 Nov 2018 12:02:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819761; x=1574355761; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=sZ/F/KrmZnWQxH/2pmUo5z8HZwh44Nf1s8iLMybSOV0=; b=alJY/9MqZOcoAwyN6kQkl/ylnzVUt8fcX27Tfm+FEKFCubtjYVLiW5u3 crJZ+qH/g8sYwh+W9zWigOLlEPFemCBdGb7YmHBINGaBciVGwOs4c8lIH TXw8fjU5Nd3ItdYLQzYDPZE3hEDUickyj5Bec7Fy1+ZEDj+o1HOUUV7fg 47E9cIBcm2ZaNIjMiKphEhVS3RSBrFGeimAWXBA/yeMjUUu5zpT9XyThe VIQFtc5YVJBRXcz8HvPk1jIX1YZ/jGqcn/MwiQyoFsOpYV0J89n/JCPAT NFzNOkIkfHTvRo1RtvtcqarDUpHo7wQG+fgu0KpsBcCxDzmSSANtln91H Q==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="99635134" Received: from mail-bn3nam04lp0118.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([216.32.180.118]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:02:38 +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=/WFqTLQ4OoyoIzyFn3gRYj7U4SSmnr/fDua1IkvMgDA=; b=jimEVoiDpLkevuFlIhQrU/VZPc7ouNT5EjkCQVKX2NzHbJfBQGxZ92TAP43kL6oVAcC1ArWYAseGgbH2Pl9tjoqoiT+e2xwQLraGhLF2vEFWcceBpuiB763+F6hFODKqqZVpLyforyELEZnuRaeicysNpZqzQENMeZUEEGYDW+E= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:02:35 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:02:35 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 3/6] hw/riscv/virt: Connect the gpex PCIe Thread-Index: AQHUgbwAirzMApFMVUWELtk7/NvUaA== Date: Wed, 21 Nov 2018 17:02:35 +0000 Message-ID: <86e2120f18412152ed2994b72bd874120b86d749.1542819633.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR11CA0065.namprd11.prod.outlook.com (2603:10b6:a03:80::42) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) 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; MWHPR04MB1249; 6:8GyDWCzEO7Czz6b59PQkYZ7jOqZXToAODQDaV8IKqRfN1ShNZzr1xFDpMizPdtLQCz/RVZqpZ9w34ObhgCgqwH4a6LTJx6bscWg8/ApjNE65b10Cyd32nHPrMKl8eJnhfdccZ+XfX+O+BHTC2uom3+vkD+8GtsJh+b1/TFcCWK1yj4JBI8izSP5y5lx/xS4h9BFbzxXvezgaB/apuirtFVIPK5+/IBc+m/d2YpbLbDDmxzGF2k1VQBhuEZRQyh50LysfZaTUYVyNeBrizH0Dk7tLWEvSnBp/vU2tvk/x3PIrom1LW8hjFw0yE1XbyQM9XrayaybyQsx42zJ07lbdPJAdlUF6ys2CMABfTUK5EHxqDwFE1XxxKwWZTKnCm9HZn+SeRyH7h7HI+M4/r6K1qFTrgFnJj47WX4VM2uESz9jsHGb3K+iby9EpGR/UdlKAL5QZ0EY0D0xyu90YhwmuYg==; 5:Ja38WbSNjybHt6mRWdbsw5GiP7gcvkgL6PWt93rOfh9rvSQGRBLPrXAi6r6d09ujANTDz54FiqB+u6BaU0irYYlWP96m702UVLd/JtHi2hZ0P1TIolz9x6l8nVJrZTvcFOcpznCDNuzemcVLXSWqUCwSRQlv1ectuakCv0gw4rQ=; 7:Ovj1iLzDsomMvlFab14DH5TGBNpcYRZ/mnYNuEsJ77K/qknN90TVUbISf+RpmCyDz5xa8VezTyFvisMS3q4jN0MuF8zXjkdk+dUxzvso+BU9fv9cGlzEWAXpeaQKU7V+eJlzTCzaRL8KpTpYSgXDdg== x-ms-office365-filtering-correlation-id: d43a4b43-ff51-4dfe-05f8-08d64fd32255 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(21532816269658); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(36756003)(72206003)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(478600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(316002)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: xe3pW+3+ZmrpxF+99Us3P4aLkB1xTfykIN+5dmH+byI34tmuNzJCyHeBh/aUAGK3jkBvvNnpl+qtU7IC2n2XCOTGYSU1Aos0GRwTuiPSyNy1uHdxq1aSvc07tf5BO7eNcJWnR1YRezyZZDeOfvJdzjw9XPu/h5aaJbLp/pQ9II2tG83CaamJ/CFuRXQxv9AHTZBWbMsT3OjvE2V3zAyKLriwy7QQsWBPsSUjK4+YKY69ee+PL4qVQxWX8fGZi830bvnKVITLRtaMpR3c2HWW/WSGlLQP1808APcCCk6AjBXer1dHJ2qIZ485LGQgcDq0fMWB+cR+ramEm9bHLPtW9tDw0d6JQ1e/RZk86xr6r9A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: d43a4b43-ff51-4dfe-05f8-08d64fd32255 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:02:35.5163 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH for-3.2 v7 3/6] hw/riscv/virt: Connect the gpex PCIe 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Connect the gpex PCIe device based on the device tree included in the HiFive Unleashed ROM. Signed-off-by: Alistair Francis Signed-off-by: Logan Gunthorpe Reviewed-by: Logan Gunthorpe --- default-configs/riscv32-softmmu.mak | 6 +- default-configs/riscv64-softmmu.mak | 6 +- hw/riscv/virt.c | 131 +++++++++++++++++++++++++++- include/hw/riscv/virt.h | 13 ++- 4 files changed, 152 insertions(+), 4 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 7937c69e22..3e3d195f37 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,7 +1,11 @@ # Default configuration for riscv-softmmu +include pci.mak + CONFIG_SERIAL=y CONFIG_VIRTIO_MMIO=y -include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI_GENERIC=y +CONFIG_PCI_XILINX=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 7937c69e22..3e3d195f37 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,7 +1,11 @@ # Default configuration for riscv-softmmu +include pci.mak + CONFIG_SERIAL=y CONFIG_VIRTIO_MMIO=y -include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI_GENERIC=y +CONFIG_PCI_XILINX=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 6b6fa39aaa..e7f0716fb6 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -39,6 +39,8 @@ #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "exec/address-spaces.h" +#include "hw/pci/pci.h" +#include "hw/pci-host/gpex.h" #include "elf.h" #include @@ -55,6 +57,9 @@ static const struct MemmapEntry { [VIRT_UART0] = { 0x10000000, 0x100 }, [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, [VIRT_DRAM] = { 0x80000000, 0x0 }, + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, + [VIRT_PCIE_PIO] = { 0x03000000, 0x00010000 }, + [VIRT_PCIE_ECAM] = { 0x30000000, 0x10000000 }, }; static uint64_t load_kernel(const char *kernel_filename) @@ -98,6 +103,51 @@ static hwaddr load_initrd(const char *filename, uint64_t mem_size, return *start + size; } +static void create_pcie_irq_map(void *fdt, char *nodename, + uint32_t plic_phandle) +{ + int pin, dev; + uint32_t + full_irq_map[GPEX_NUM_IRQS * GPEX_NUM_IRQS * FDT_INT_MAP_WIDTH] = {}; + uint32_t *irq_map = full_irq_map; + + /* This code creates a standard swizzle of interrupts such that + * each device's first interrupt is based on it's PCI_SLOT number. + * (See pci_swizzle_map_irq_fn()) + * + * We only need one entry per interrupt in the table (not one per + * possible slot) seeing the interrupt-map-mask will allow the table + * to wrap to any number of devices. + */ + for (dev = 0; dev < GPEX_NUM_IRQS; dev++) { + int devfn = dev * 0x8; + + for (pin = 0; pin < GPEX_NUM_IRQS; pin++) { + int irq_nr = PCIE_IRQ + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_IRQS); + int i = 0; + + irq_map[i] = cpu_to_be32(devfn << 8); + + i += FDT_PCI_ADDR_CELLS; + irq_map[i] = cpu_to_be32(pin + 1); + + i += FDT_PCI_INT_CELLS; + irq_map[i++] = cpu_to_be32(plic_phandle); + + i += FDT_PLIC_ADDR_CELLS; + irq_map[i] = cpu_to_be32(irq_nr); + + irq_map += FDT_INT_MAP_WIDTH; + } + } + + qemu_fdt_setprop(fdt, nodename, "interrupt-map", + full_irq_map, sizeof(full_irq_map)); + + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-map-mask", + 0x1800, 0, 0, 0x7); +} + static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, uint64_t mem_size, const char *cmdline) { @@ -203,7 +253,10 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, nodename = g_strdup_printf("/soc/interrupt-controller@%lx", (long)memmap[VIRT_PLIC].base); qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", 1); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", + FDT_PLIC_ADDR_CELLS); + qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", + FDT_PLIC_INT_CELLS); qemu_fdt_setprop_string(fdt, nodename, "compatible", "riscv,plic0"); qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); qemu_fdt_setprop(fdt, nodename, "interrupts-extended", @@ -233,6 +286,33 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, g_free(nodename); } + nodename = g_strdup_printf("/soc/pci@%lx", + (long) memmap[VIRT_PCIE_ECAM].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", + FDT_PCI_ADDR_CELLS); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", + FDT_PCI_INT_CELLS); + qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0x2); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "pci-host-ecam-generic"); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cell(fdt, nodename, "linux,pci-domain", 0); + qemu_fdt_setprop_cells(fdt, nodename, "bus-range", 0, + memmap[VIRT_PCIE_ECAM].base / + PCIE_MMCFG_SIZE_MIN - 1); + qemu_fdt_setprop(fdt, nodename, "dma-coherent", NULL, 0); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0, memmap[VIRT_PCIE_ECAM].base, + 0, memmap[VIRT_PCIE_ECAM].size); + qemu_fdt_setprop_sized_cells(fdt, nodename, "ranges", + 1, FDT_PCI_RANGE_IOPORT, 2, 0, + 2, memmap[VIRT_PCIE_PIO].base, 2, memmap[VIRT_PCIE_PIO].size, + 1, FDT_PCI_RANGE_MMIO, + 2, memmap[VIRT_PCIE_MMIO].base, + 2, memmap[VIRT_PCIE_MMIO].base, 2, memmap[VIRT_PCIE_MMIO].size); + create_pcie_irq_map(fdt, nodename, plic_phandle); + g_free(nodename); + nodename = g_strdup_printf("/test@%lx", (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(fdt, nodename); @@ -263,6 +343,47 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, return fdt; } + +static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, + hwaddr ecam_base, hwaddr ecam_size, + hwaddr mmio_base, hwaddr mmio_size, + hwaddr pio_base, + DeviceState *plic, bool link_up) +{ + DeviceState *dev; + MemoryRegion *ecam_alias, *ecam_reg; + MemoryRegion *mmio_alias, *mmio_reg; + qemu_irq irq; + int i; + + dev = qdev_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + + ecam_alias = g_new0(MemoryRegion, 1); + ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam", + ecam_reg, 0, ecam_size); + memory_region_add_subregion(get_system_memory(), ecam_base, ecam_alias); + + mmio_alias = g_new0(MemoryRegion, 1); + mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio", + mmio_reg, mmio_base, mmio_size); + memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias); + + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, pio_base); + + for (i = 0; i < GPEX_NUM_IRQS; i++) { + irq = qdev_get_gpio_in(plic, PCIE_IRQ + i); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); + gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ + i); + } + + return dev; +} + static void riscv_virt_board_init(MachineState *machine) { const struct MemmapEntry *memmap = virt_memmap; @@ -385,6 +506,14 @@ static void riscv_virt_board_init(MachineState *machine) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } + gpex_pcie_init(system_memory, + memmap[VIRT_PCIE_ECAM].base, + memmap[VIRT_PCIE_ECAM].size, + memmap[VIRT_PCIE_MMIO].base, + memmap[VIRT_PCIE_MMIO].size, + memmap[VIRT_PCIE_PIO].base, + DEVICE(s->plic), true); + serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, serial_hd(0), DEVICE_LITTLE_ENDIAN); diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 7cb2742070..2cce019aca 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -38,13 +38,17 @@ enum { VIRT_PLIC, VIRT_UART0, VIRT_VIRTIO, - VIRT_DRAM + VIRT_DRAM, + VIRT_PCIE_MMIO, + VIRT_PCIE_PIO, + VIRT_PCIE_ECAM }; enum { UART0_IRQ = 10, VIRTIO_IRQ = 1, /* 1 to 8 */ VIRTIO_COUNT = 8, + PCIE_IRQ = 0x20, /* 32 to 35 */ VIRTIO_NDEV = 0x35 }; @@ -62,6 +66,13 @@ enum { #define VIRT_PLIC_CONTEXT_BASE 0x200000 #define VIRT_PLIC_CONTEXT_STRIDE 0x1000 +#define FDT_PCI_ADDR_CELLS 3 +#define FDT_PCI_INT_CELLS 1 +#define FDT_PLIC_ADDR_CELLS 0 +#define FDT_PLIC_INT_CELLS 1 +#define FDT_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + 1 + \ + FDT_PLIC_ADDR_CELLS + FDT_PLIC_INT_CELLS) + #if defined(TARGET_RISCV32) #define VIRT_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0 #elif defined(TARGET_RISCV64) From patchwork Wed Nov 21 17:02:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692849 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 71A2214BD for ; Wed, 21 Nov 2018 17:05:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C8322C4B7 for ; Wed, 21 Nov 2018 17:05:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FA702C4C3; Wed, 21 Nov 2018 17:05:14 +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 CD0DC2C4B7 for ; Wed, 21 Nov 2018 17:05:13 +0000 (UTC) Received: from localhost ([::1]:40351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVw8-00078F-Sd for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:05:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVu9-0005Le-Aj for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVu3-0008S1-Ap for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:09 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:55584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVtr-0007nv-7K; Wed, 21 Nov 2018 12:02:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819771; x=1574355771; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=HiRR7JSoj/9Xmc0XL3OjejDCyZ8/2qZrhh9xiFs291E=; b=JFKRaqv0kAkxOKIYxfYwd5DjQcXZtjTpmZG1RkhrAO3rBwwKDWYKfgQZ WQBecntyw7iybFQejOeAwXQoTmNBNNU8lPqh3WmPiyBa84iroLYM5xv0F StpF7izZyo/tWtxH06Odzi+kXOJqZr/QH9HrBmr/IXBy7mUsLHB1mLmVb RoN4wsStOoWXPbVOCQOfyqbPiX8YA6GaDuHjziifHQ7tLUVvn/xpbzGV+ 55FqMIzhLW4aYhhJj2LMb5mAzjm52UeQzxK9+v+gUImMnKsrqL3byRsGT DiKxAxHXa/QsDDZwVvacBomxWpM4jiunNvjVMH6KrAK3YTr+ohqwrd2OT w==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="199379996" Received: from mail-bn3nam04lp0114.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([216.32.180.114]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:02:47 +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=HiRR7JSoj/9Xmc0XL3OjejDCyZ8/2qZrhh9xiFs291E=; b=BXyJ0HISQzJR2elztyvgmBB/CfnkGaDy+46wMIt3j1xMkIEZzH8Aw7Nv7aPTQIKxlVQ5W6afibHCGS13nnkKnvaajlN54YrGh3MYJ1Bao9oXN+mdFrBK3W2LTpzgHcM3XbFmVt2tquv5UDADRwxbMq7P/iSAaGW0KwMcF/Ssft4= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:02:45 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:02:45 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 4/6] riscv: Enable VGA and PCIE_VGA Thread-Index: AQHUgbwGeeiJTeh4jEaUpN8PYzmHLw== Date: Wed, 21 Nov 2018 17:02:45 +0000 Message-ID: <4120d0a7e4fe6f3fd6bdd6c084a40a67a48be374.1542819633.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR01CA0015.prod.exchangelabs.com (2603:10b6:a02:80::28) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB1249; 6:l+6V+3uNhqOqPeTRVILyP37JVD4KmrEHOKa4saciQo8To0f50eDJqkyiSxc2LikfNCwoDbIgTxYkMiydj63NMfkjDijM6G8rPCeGKvLDpqkrOGGebCtqtcqXQBxsCjrYQfNheXx1pdLtc5jEUnk0TuvwPPMVzhRmbOimaUsqHNEvmbs30uELI8kl5Pj0T95Qhny0vffCpGQqMlSIsJ3FtaFOWxHL0aVu0nXrgUNpZyjITWRRJ4b79T0/1MvHQGYAI4MOUE6MLLSJZY6QPRxha2x8yCdMvR1dyn3CxSWOJoKI/+bDNMlIpClEwe9mAXaIO2zVHYhTdgI+lStJjPbjLN6NPA8622RN6gDYIbJ+nMZZWF4HgUgvjNvJgqKFiCUu7fEl77txiA7JmIztcaYFBKlKFwlezFOOjPhBmghG526k70cGuD/AW01VUoti/5tIO/joOmstpgnpTcesiI5yFg==; 5:rarF29wCnAGFioBwDB+aEh5WrmNajQC3zchIlBl/B96pSMtf3KE/NgQSOTaUMMt0ZqQEk2J1WMsBA4KJDjSyGz0TMO16UQ7rS2AYMQlTUu/BJPG3+c2J+rnkaFOiYkqhFjw70DA5tpkN1yv0H2+Tk+442w5YqlWAbsyMbdAIZfY=; 7:325c0ixURJvlnWgbr0gj1qUNVLHaGuXnpziMx4yRrPo5wGqIawWsJGORxY+LDL4pJLnBSDu6eRuvuzSbo4YZCilAvmvQTTV2nadI1aBgKS03ZNe0g59xu0udV/6QwrM93+12lKGNy2/AdRlwl+OKTQ== x-ms-office365-filtering-correlation-id: 54d6b998-2444-43be-d5f0-08d64fd32856 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(36756003)(72206003)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(478600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(316002)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: n5+vGIw6P9E+uxP0JMxmghmAR0tg2DLmQWky34+uwbLwuo0SvgHiRBqaFLSWSVJPUVALwEqPcwXhmAu4hHzJv2B7R2hmP6S5X4muLjAnkkHb+emgruTmTa/rj6qF1KsobGTif2zhYjnxCgMKtsNiULjXMYa7mo8voLlycgmq0iKGEMl8n+YQglF4zMD00FZuS2WnJglDgkoil3kroems9ULXCaH2UmdCiG3ftxIQiI1aTx5nIz2Ikf+fgP5/bk6Of794gTBy8ncM5saj+2rGLeJxUQWiLTAOen+i5Lc38sEhQqKwvO8HEjBekr+oY68CdIP1XwhFI9g1akh0dcl7ybPQfjCeEsPsS1GZA0l1HWE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54d6b998-2444-43be-d5f0-08d64fd32856 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:02:45.5945 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for-3.2 v7 4/6] riscv: Enable VGA and PCIE_VGA 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Enable compile support for VGA devices. This allows the user to conenct a display by adding '-device bochs-display -display sdl' to their command line argument. Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ 2 files changed, 6 insertions(+) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 3e3d195f37..05fae82f1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -9,3 +9,6 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 3e3d195f37..05fae82f1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -9,3 +9,6 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y From patchwork Wed Nov 21 17:02:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692857 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 37BE515A7 for ; Wed, 21 Nov 2018 17:08:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20E822C534 for ; Wed, 21 Nov 2018 17:08:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12B222C545; Wed, 21 Nov 2018 17:08:27 +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 EDAB02C534 for ; Wed, 21 Nov 2018 17:08:25 +0000 (UTC) Received: from localhost ([::1]:40376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVzE-0001E9-PQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:08:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVuH-0005Uf-6k for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVuC-0000SS-9x for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:17 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:7648) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVu0-00087a-7X; Wed, 21 Nov 2018 12:03:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819780; x=1574355780; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=t7b+VELoxNMEjmK4ptBlecX8rpRkfoh/6JGfMY+1low=; b=OgKF4sfZvB6EysubSgQv0gvRJF8e4EXdDQFPrSDAs8Uo0PLGJrMKuIhO MmYgVtB4xi+xjpa/0asf/w7FTXJk/nmXH02hTnL/1wf8sNb437ZKvu81i lK2kfpkmXMETCiZcqyYrKrg5ojYSK6WvjNPzO8bpPZGfeG/bocm6rHoAE YC/acTQAZRyRtcoA2t1p5VHn7uISnknwp3I1zyxTl1aKxTSdlmtTMVMxp rShTudjviokRxnpOZG/T38LxnPjsiV8DZypq26alERT5zoOXC7506vcdw 6MKzta0P4zHA08fsDUi/Sj826A00TNFYCDh5OlazpjDQQDvLjVF1lk26e g==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="99635157" Received: from mail-bn3nam04lp0118.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([216.32.180.118]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:02: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=QTWlYzlKVIZqZXrEc7IaDwAkSP8xjTnp0bfVdIoT6Qs=; b=FFNDIm3seoB0ldH9+L70Pl9YM+5wHILVAUchOouH1dgVd0nsIx673jBLh8PQhPckEjCH56Jrzx492Ju5r63aXn4uUoXn80V9/aaCvDnVADPZZGu0iYZb7lLxMy7jOkIYLSZMZoR4bSNHbqxtZOWiUitQCbTVqJsUioxW04QXcto= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:02:54 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:02:54 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 5/6] hw/riscv/sifive_u: Connect the Xilinx PCIe Thread-Index: AQHUgbwLmh5Br8JFYUulQs74tJkUfQ== Date: Wed, 21 Nov 2018 17:02:54 +0000 Message-ID: <85a3fe487514f4cb659ef7e6b88762ebc567c1b8.1542819633.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0107.namprd07.prod.outlook.com (2603:10b6:a03:12b::48) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) 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; MWHPR04MB1249; 6:xF12KUm6bIocqjq/n60ALeXpPHux0OLdAl/9+GTdrHTOgS/2pJC8H1Az7PVn92LPm9Fkj3MqQb4twtsYJg/VzRe3wyv/iRnD7RYMj1auxfrwTNiBtrpl5Ok4fieF4+rrbtKLIUD4JnlcILOnqysVqTn+if3XJvL3q66TIty0Ql7FNqojeie5ZBNGypkl8v5aoU50zXibSs5K8TGv2EMM/Sd+T1kAm9benM/s5i53JuT93QMc/vyrYlmQ24sOarWk3O0dObuY38Q18jLZS7oAK7igL1EQxKk1YsswaGq5hMNmTMcEIe8f0Z09RpWpCdfENe6XOHrBNOFviEsK3huaaATI0DLLzbeYNh2AI2jeZDjv3GPS/t2dTuaN9jgyzc+f1Cwbf0efbFWF0kB1p/FJevmaSOtl6LXioiXlHVdJ8763/0I89btCItpN2PEwf6OOPdVerKdmL7Jzj5uQ4UW3CA==; 5:kc0xRQ7sDTl2c4xOIrIooedZMWcLpdD4k4Mz2w4ld6YQZX/VgjjaEh0Rtynv2Bu2/j+4rpOcjXfLR8vnO8QvWRbBl5UBtQzfK3X9/lbkAblYKoAjHZpmh5P1Xm7vDiVItfBL6SuwKYFZdM1H/PXdtRwDHc4Te/k3wPDPPdgAWJw=; 7:FH8C/Ge45IwOokXZ9FuPjijfyrIVsk0q86fMduDDXLsdBqJj2hIvTXsrzYuXa3eWVhWAZrDslfPc2wAYlXY2j2nwgFkQy/CYjTiFsnQefMNepzxJu455vq+SMnk8Wda+a/pNyT6IXXqsEZ296x6pAw== x-ms-office365-filtering-correlation-id: a2eca09c-b95f-4c93-3624-08d64fd32dc7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(21532816269658); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(36756003)(72206003)(14444005)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(478600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(316002)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: PUwbFZWC/pO3ttLQ5YQB0fk3nbEbwHx/imaJeBf47wzVzBUYtx4AM9CnAwz+547fjK7adwHHBLL/dVGXK2cBxv8I8vZt3iscxj7kMZLn6HuMgOMf6l9H/fAT9rYXswSGx80g1BWys1gGyLzd00es4KFU7lU5WdOrHtML+mY/fVhNJNzmwONYdf35coHlzi2Ol9vsPxAlGxMvmCdRdeuSpTvD5HDmMPlOgn/GMn671Df03YXZEVflHvDYsvdxNdnbrUuCennBqA1lz+MRzdtGLopsPsfgSEd+jMfI8TZBjfB/V8XLImhXlBJrQU2PkTGHsK3eohWQ0a0et21H3JBDEr5yFr1DjW9w603PZBRs8gI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2eca09c-b95f-4c93-3624-08d64fd32dc7 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:02:54.7040 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH for-3.2 v7 5/6] hw/riscv/sifive_u: Connect the Xilinx PCIe 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Connect the Xilinx PCIe device based on the information in the device tree stored in the ROM of the HiFish Unleashed board. Signed-off-by: Alistair Francis --- hw/riscv/sifive_u.c | 64 +++++++++++++++++++++++++++++++++++++ include/hw/riscv/sifive_u.h | 4 ++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index ef07df2442..0c51c61082 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -45,6 +45,8 @@ #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "exec/address-spaces.h" +#include "hw/pci/pci.h" +#include "hw/pci-host/xilinx-pcie.h" #include "elf.h" #include @@ -61,6 +63,7 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] = { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, [SIFIVE_U_GEM] = { 0x100900FC, 0x2000 }, + [SIFIVE_U_PCIE] = { 0x2000000000, 0x4000000 }, }; #define GEM_REVISION 0x10070109 @@ -218,6 +221,32 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0); g_free(nodename); + nodename = g_strdup_printf("/pci@%lx", + (long) memmap[SIFIVE_U_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x3); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0x2); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "xlnx,axi-pcie-host-1.00.a"); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x20, 0x0, 0x0, + memmap[SIFIVE_U_PCIE].size); + qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); + qemu_fdt_setprop_cells(fdt, nodename, "ranges", 0x2000000, 0x0, + 0x40000000, 0x0, 0x40000000, 0x0, 0x20000000); + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", plic_phandle); + qemu_fdt_setprop_cells(fdt, nodename, "interrupts", SIFIVE_U_PCIE_IRQ); + g_free(nodename); + + nodename = g_strdup_printf("/pci@%lx/interrupt-controller", + (long) memmap[SIFIVE_U_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x00); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); + g_free(nodename); + nodename = g_strdup_printf("/soc/uart@%lx", (long)memmap[SIFIVE_U_UART0].base); qemu_fdt_add_subnode(fdt, nodename); @@ -236,6 +265,37 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, g_free(nodename); } +static inline DeviceState * +xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr, + hwaddr cfg_base, uint64_t cfg_size, + hwaddr mmio_base, uint64_t mmio_size, + qemu_irq irq, bool link_up) +{ + DeviceState *dev; + MemoryRegion *cfg, *mmio; + + dev = qdev_create(NULL, TYPE_XILINX_PCIE_HOST); + + qdev_prop_set_uint32(dev, "bus_nr", bus_nr); + qdev_prop_set_uint64(dev, "cfg_base", cfg_base); + qdev_prop_set_uint64(dev, "cfg_size", cfg_size); + qdev_prop_set_uint64(dev, "mmio_base", mmio_base); + qdev_prop_set_uint64(dev, "mmio_size", mmio_size); + qdev_prop_set_bit(dev, "link_up", link_up); + + qdev_init_nofail(dev); + + cfg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_add_subregion_overlap(sys_mem, 0, mmio, 0); + + qdev_connect_gpio_out_named(dev, "interrupt_out", 0, irq); + + return dev; +} + static void riscv_sifive_u_init(MachineState *machine) { const struct MemmapEntry *memmap = sifive_u_memmap; @@ -375,6 +435,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem), 0, memmap[SIFIVE_U_GEM].base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem), 0, plic_gpios[SIFIVE_U_GEM_IRQ]); + + xilinx_pcie_init(system_memory, 0, memmap[SIFIVE_U_PCIE].base, + memmap[SIFIVE_U_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_PCIE_IRQ), true); } static void riscv_sifive_u_machine_init(MachineClass *mc) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index e8b4d9ffa3..e7292ea83b 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -53,12 +53,14 @@ enum { SIFIVE_U_UART0, SIFIVE_U_UART1, SIFIVE_U_DRAM, - SIFIVE_U_GEM + SIFIVE_U_GEM, + SIFIVE_U_PCIE }; enum { SIFIVE_U_UART0_IRQ = 3, SIFIVE_U_UART1_IRQ = 4, + SIFIVE_U_PCIE_IRQ = 0x20, SIFIVE_U_GEM_IRQ = 0x35 }; From patchwork Wed Nov 21 17:03:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10692851 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 636A514BD for ; Wed, 21 Nov 2018 17:07:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43A3C2C503 for ; Wed, 21 Nov 2018 17:07:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3734A2C515; Wed, 21 Nov 2018 17:07:34 +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 AD3AD2C503 for ; Wed, 21 Nov 2018 17:07:33 +0000 (UTC) Received: from localhost ([::1]:40373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVyO-0000YB-UB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 12:07:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVuG-0005Tj-AJ for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVuE-0000Um-A8 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 12:03:16 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:55621) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVu7-0000CO-Rt; Wed, 21 Nov 2018 12:03:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1542819787; x=1574355787; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=kgx7RTicYUE0o9usl93YuneSFsOImfdKfU+OZWxoHwU=; b=PxGO3Rk47nFfMJ0mQa6CrI7WBjijEvMyteEFWieIS45yITS3QnMmFld1 /OcwJ4/U0hIvNfmkAfE/OHK8iP2eXopOmFox78qeJ1vc4DIDkaG5PmVMu k1+K/PbioTjpoyrkQUrFYiOMas2KghIgLFc6XNqxIkPqnPcN2gbJhPjEB XbUZfbwIJb9Fkj2kCvsJpdl1H05Qc7baaAI1Z7Ap5vO6yTDdJ/FKlGYkW b4me3a6lb8+nfC9K1RgRQWzoU4KMiUTSYV+EIXHsFl6iGAn6+fAqDo4z3 PFI/MHleAt0e93jkrnDpI1XK/TVBPyse8xrwcBfCTqDXNywKkg2H8ubK9 g==; X-IronPort-AV: E=Sophos;i="5.56,261,1539619200"; d="scan'208";a="199380026" Received: from mail-dm3nam03lp0023.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.23]) by ob1.hgst.iphmx.com with ESMTP; 22 Nov 2018 01:03:05 +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=K1n5nlduBWaDn/kLUgfbuoedW+C6DTaMt35pJPw1e8A=; b=KUgQvG6uaMIvGAmOddw7kMLxfkm3IHSbUUrjbTh+0piZAG5u+BwGaXlwOB11IxogqI0TClr2w0o/WhJnweTi7I1U7s9l6CrYYH1fJKZEDxPYhJIxPoN+fkcHne/Ma4OIWKaABwADLXl6zpGEBuD5UYI+DxQpI1H7mKeL7Eyr+u8= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1249.namprd04.prod.outlook.com (10.174.175.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.28; Wed, 21 Nov 2018 17:03:03 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::d13d:19d3:fc93:2ec5%9]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 17:03:03 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for-3.2 v7 6/6] hw/riscv/virt: Connect a VirtIO net PCIe device Thread-Index: AQHUgbwQv55PLCBga0SpfETIjY4+tA== Date: Wed, 21 Nov 2018 17:03:03 +0000 Message-ID: <44e7883bd17c6867f0ac488bdab6c880b2420a9b.1542819633.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR03CA0002.namprd03.prod.outlook.com (2603:10b6:a02:a8::15) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB1249; 6:fCJzaSm3sIeTLVnnVZm09/MuwwaOtnH/YxB+k71g9VXPTV3fsxC4IksfJLQCnbXDiB7IF/uz5qA0NXK9BLgoscBBTuHiF6u7ktR938vXTGruqDHZJazB7sqf+FSm+DVNviWHiF/yQXQRTtwB9Oebpn5oYZDF51wMxTZ+KZ6CqTPRADDtrpAsUgZdjrguN04g+awPFQrzzZCFBtFo/3h+w3t25zLiz+Gmksj5dTOAqhS4uC3MID25tRVDwvthmHjfW7pZ9RJu3wCzzeArTsTmsbOiP+RI4uS42abmBBg5/oM2i0P/caqoC9Nf/aS4j76C1GMlhTwg2tkN4OhfxfqFWeSfV7Cefrx5BnxjRbK6AfQuoAMlu33Wipy9CjLGPnKbCdiqudxqIc0mQ3kWXGaOWHJ/Iti9hSxuN01gUOTEZCk3sAlkb+hQHX28Q31pTx34QunCqyZo0Mc+3j5DIE/JLg==; 5:ySq4Bc5nbPz3FAQIJftw1r5EfaZS0/IVnpOalz2NQfRMp/kgE5UZEusUTL9r7C2k5HQgfwYDKur7pdMyVJKrjehuJ2Qpt0x+lLrY8WF1A9ZfAUZRXL4c2KUxzbJeKwq/4CHWlTuF34sHA9MQb4boWo+6EphBg3qkpUrBKV80n10=; 7:rgLukJ2fiwU3DSunQVMCK+RfYgpJ/m5ys0FiL+uQBJP/EzIaYcq49JdjdH559aQ8JZiBxAbWPox8lhgpixDNDeJEdBkQUD9dSw01lwPwGJo+hhDk6k+Yy/sCcFJRurcuhnR/Rb67S5zZojAd2GDdaQ== x-ms-office365-filtering-correlation-id: 836e4944-1f15-4dd1-5b0b-08d64fd3333c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1249; x-ms-traffictypediagnostic: MWHPR04MB1249: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(21532816269658); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1249; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1249; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(36756003)(72206003)(14444005)(97736004)(305945005)(68736007)(2906002)(71200400001)(86362001)(71190400001)(8676002)(7736002)(106356001)(478600001)(105586002)(39060400002)(6512007)(102836004)(3846002)(2900100001)(76176011)(14454004)(25786009)(52116002)(8936002)(118296001)(44832011)(6116002)(186003)(50226002)(6486002)(476003)(66066001)(316002)(2616005)(26005)(5660300001)(486006)(2501003)(81156014)(81166006)(4326008)(386003)(6506007)(110136005)(54906003)(256004)(11346002)(99286004)(446003)(6436002)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1249; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: rx1bIFbmsUM5RxIGE9HwHCgr3ShQq4z96s5JsK0pHckZZELvNtdgb9jw6178HwzbGTosWHTJxoKdcHKsZBLXWtQdcrzSpzEdNgExVAJVArk5AQ8HJPUC3UFQfzeRkPccFXlyQI24V53yvakwMGpoKKbPab+TTj/M3A6U3HYTFy1V43UrLhPQVoiAKnbgzXMM3N16MPerYI9VhvAuH/eQZv7Lut32oUymNnHY4kDV1kAHxAFTUGFPdpnkMTwgjdAwxdg2P2g99det5APx/DQkWCqrY5ulC5JxPeNpFZh/etYDPiFsMtF8zEMS2893cI26NVeSnW629TJeD0WUq+8Cru0UkcYvXU+4fTXXbzOhhQ8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 836e4944-1f15-4dd1-5b0b-08d64fd3333c X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 17:03:03.7978 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1249 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for-3.2 v7 6/6] hw/riscv/virt: Connect a VirtIO net PCIe device 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: "alistair23@gmail.com" , "logang@deltatee.com" , Alistair Francis , "abologna@redhat.com" , "linux@roeck-us.net" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/riscv/virt.c | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 05fae82f1b..bb3dd34606 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y +CONFIG_VIRTIO_PCI=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 05fae82f1b..bb3dd34606 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y +CONFIG_VIRTIO_PCI=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e7f0716fb6..de6924e1c7 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,6 +36,7 @@ #include "hw/riscv/sifive_test.h" #include "hw/riscv/virt.h" #include "chardev/char.h" +#include "net/net.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "exec/address-spaces.h" @@ -392,6 +393,8 @@ static void riscv_virt_board_init(MachineState *machine) MemoryRegion *system_memory = get_system_memory(); MemoryRegion *main_mem = g_new(MemoryRegion, 1); MemoryRegion *mask_rom = g_new(MemoryRegion, 1); + DeviceState *dev; + PCIBus *pci_bus; char *plic_hart_config; size_t plic_hart_config_len; int i; @@ -506,13 +509,24 @@ static void riscv_virt_board_init(MachineState *machine) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } - gpex_pcie_init(system_memory, + dev = gpex_pcie_init(system_memory, memmap[VIRT_PCIE_ECAM].base, memmap[VIRT_PCIE_ECAM].size, memmap[VIRT_PCIE_MMIO].base, memmap[VIRT_PCIE_MMIO].size, memmap[VIRT_PCIE_PIO].base, DEVICE(s->plic), true); + pci_bus = PCI_HOST_BRIDGE(dev)->bus; + + for (i = 0; i < nb_nics; i++) { + NICInfo *nd = &nd_table[i]; + + if (!nd->model) { + nd->model = g_strdup("virtio"); + } + + pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); + } serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193,