From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565503700928.7173776934319; Wed, 29 Aug 2018 10:58:23 -0700 (PDT) Received: from localhost ([::1]:44332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4jT-00049m-Cv for importer@patchew.org; Wed, 29 Aug 2018 13:58:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4hn-0001YX-7Z for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4hh-00045B-LE for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:35 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:12683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4hh-00044h-BE for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:29 -0400 Received: from mail-bn3nam01lp0183.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.183]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:56:28 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 29 Aug 2018 17:56:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565390; x=1567101390; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uJ7jgo9RsPUtkEsJH8ArOOdO4ODpLH7TDFpV/X6kGi4=; b=Kik1QA7xRr/+1uSTQAmtJyV3WmcueoB0KgBW5bdQ+eUE2Wtcsc5VEG0+ aP9rVtU/WVs6OnC5B8200xbDFuFJChCfuJCspMMheNg0b9A2eltpwS6oT ZQ3y9pg/toBY/j9VKTIPqhHAK0cccOZUruFFlHiMVQ8lSHwDX1I4AjKt+ FVtA7Ty5kxT2b5ed+HP8PpmkTF8JGXQ3xm+M09dVrJMDasT0gt28ZGMfb VwNMM/cvHSXGSGDHS9r/xSnWOjd20kidyMXT9XhxltUQrwMatr9t+mMas iRA/v8sQrszGon/s4eI6x/XOhusky8/A3GJ6A1N1aD22qcwedHsF5N5JM Q==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="88653343" 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=1R8cvhmxJG01iNyNR3VXa2P8Ada99u5rB9veeCdcBl4=; b=ba8FjAa+MWEN4lFQHJr4tJqLOXO5gDeiFIBGFPrErTnmeZfiGlO8zMZPdT+jvWBpUjOPM8DuHwvPj9sIK2BxcfzaZTkvuo7WimraQ14RVHQCESO3lgYNynk/4szwBhay4zLoQAEyq1G7lmhp2AsGStVPTPX7PUa3iWA+In/JvJQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:56:18 -0700 Message-Id: <534ecb78a2478b7d9a72e7f4cd7f90423bcbec01.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0029.namprd04.prod.outlook.com (2603:10b6:a03:40::42) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79ab8c00-994d-4c0f-886e-08d60dd8bd72 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:qm4HgFHojFcAj4OmgMzjjBhk9//dg2p4bnPnXKNl31aPznp5pVQcCi+g7DeY6PzaYGet4+kB8VjgnuyV1+gNKh4afXbSSYGawV1J7HvCdsF7n2WqNLN5FpIRAqoXFOijxeWXaSHwa4x6puRQnizZqx1antHock9QJ8gDB4xTEFBRK10hxe7kYYSSkkk84UfPK+tsM0DhjYdDDKZZ86rPg56UW5SZipOAsgKDZ70TmiHmEaRG+ZlJmNkn26wMS3qa; 25:TDO1iG2FddEoHgznNw33OD3u4VTPIItqmcIVNMtUXXhdZ+2Q7UGFeVOz/oumS+JZ8/YvjagKvRGzxSqV39OnfVIqs0zBq/m+T77quhRpkvtkLXGi9Z8b9cjY3ZogYYtV/2KSF1E0nKH0KWoh6p1pgR+6nS2ygMoGTfMlZF8DUrO9PK4ea3SMfDpwGD8ZsFcRXvA5H9PBqnZfJ2/bj1J+ET4ZRNB4SPLb7pULdmjp2+cM8GfVUC266MkzvqwOv87gcSAYW1cDLWkPAJuNmpvXDUsKjkTrU4LwqhbjLff3epBfDmTxXrm71hsx5HoLOP3fi7H3rV3v4IpPJFv3DboR/Q==; 31:/Y+5Mckmn9oL66G77bq22IKCftGUElvqPPDe6eoUsV123udStTeKh9NYbGCS2WIgRyoxu3MsjJLlzFdy42oqQxtMJmXiWG6AhONi0ty78fG+UIFwt0ppfpV2gdYbv/VQ04RfKCfUU2B96Am/gr8vt8r6Zeh4eRMDx7TaFpP9GoNBFRaux9TZMseZuLO4P10DrWbVpau1DRdiLH8pFrHssV2ArF0Pg0dVaLcjvTcdkkQ= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:HjfnueUaXW5oVxxvjpqiGxHgdMmujEBqtJfAAJfjm+8zXRedaOG82bJYYoXwmJl0ZL4MooHjSVj1Up3JVk2gaMvgi8SOFiGf2PO79Bci2Tnd4k0/tZTkUc49ty5mgx8SjtwyfVTnqo8DluDySpqJFhxWk97Rm1xrATPPbzpMNimAyFvgcMbCPMQLT/FkvKU6Pnd20fM8lmuRREL4OhjLhjHhIerxWMIn5/C6uhdMuC25hNtom6/XQaGd2M9LD9hlcOcNMTKG2lH6kxYSDY5gKoRgUCBunf7feo8aX4TlPpY6zM/MplAHWhODNJ87iOv1Gds9oO2gKd0UdEu8w5N8IApmDejHW6Un1CAvADF/ivM+ziZiDSm2mLLil8MVSmtq8DQHQgp30Q4XbMe22JRu4nKp+BovWseI1O/IUgFYcaxlWCcF8YA82TCpTHP28xPFeeSFwkgy3qk10OEOvQUhn91VvT6O8ip8FVUsOemnsJAoUMmbHIGZu1X/miBZVFql; 4:8dw4cjV7kYQwdk8cMJOGtfaO/Uma8OsEujlfX5JqqI7RGCpBV37QSjLpYGe+ZVcvN4OuxLx7EXafMe0PHrfnwmQHyvzAVCEpfMt0OXxlWii4T0tD4NF5QDlNwIenG3HwDKw9UN0z6XCUkQ9xWxtRUqrLco5euKKuR1Bg03rrFIBVl+y6/WJKsy5bRf3pLnkUh0pV8fePWttVshIEmMD1qtHC27GufbOSVVWlUkDSLhEke6fa5peEMPy5gpePjjBf3mWVJSIAxbvAvY2KHGlAtQ== 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(346002)(376002)(396003)(199004)(189003)(50226002)(486006)(446003)(11346002)(5660300001)(476003)(6506007)(44832011)(2616005)(118296001)(386003)(305945005)(956004)(26005)(105586002)(16526019)(186003)(6666003)(39060400002)(106356001)(2870700001)(97736004)(2906002)(8936002)(6486002)(76176011)(47776003)(316002)(8676002)(478600001)(23676004)(68736007)(50466002)(25786009)(81166006)(86362001)(6116002)(6512007)(14444005)(72206003)(7736002)(53936002)(4326008)(52116002)(66066001)(3846002)(81156014)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjA0TUIwNDAxOzIzOkJrSTIvQUtxRFFyUndLU1hiRHRyWmlEcHJx?= =?utf-8?B?Q2czQjg1SmxnNlBNK1JFZGZNVFNZV1p6OTRZR09Kd2dXR3BpUHFsV3k4aDV2?= =?utf-8?B?VVVXTEF1cEJaNDNodGlHU1p2d3ZlYVZETTlQcSsvcTJPOHBib2p5ZllidThT?= =?utf-8?B?Qk14TElWNHQ1U2NyZFBjNWQ0d3IxaDNtREx6US9QUlJ5U2YyaUpvRGNpMmtr?= =?utf-8?B?dkp4dFl3emZqdERQRE1nR2sraTB5dnQ4UGFiMklrZDR1ejgweUdsSEIwSkFx?= =?utf-8?B?ZVdRRndDeVBSSE9MM2FhaUJUNmZSbnh3VENlclJvd0l5SXZrZXZneVdSVGtY?= =?utf-8?B?RkhlY3ZWREVDclV4Q01DcEZTYTROYjMxdzdqQXd4TzFxTm16ZzNVbitzR2N1?= =?utf-8?B?TjBHeEFpT1FpeTdTcmRKNlYwdHQ0eTM1Tmd1L1h6UDRJV1NLVnZRTm9kcUFE?= =?utf-8?B?QjZWbWVoMTA5c1lCVkgxZ3BTekJ0OFJWaFVJOFlEdWZzWkVSaEZPczhNSEZT?= =?utf-8?B?VTJvNVFWMHd3S2RoTmtKeEJidHhaSEFMMnpsQjQrYUhLMjgwT0x5U0UyaUxh?= =?utf-8?B?NUhPd1NTV0YybmdMRkt1QjdvUEt0S01UVm9LZ21YbXJjL0dJQlVWNk9wTzBJ?= =?utf-8?B?YXVQVllrSXRiT1hnbHd1L1V2Q1BTWmZhZnRraU5KYzZZM0hZbG5nWUJZZjd6?= =?utf-8?B?c2ZRUjNzb1ByY2RvbmRPSWJCdW9YeWVVeUFvaFFkbng1czRvSWFaV1NBVm43?= =?utf-8?B?Nm1qZ0pMZG1qV2xRMnliZGdhNGpOQ2RFU2lwNHhpRWJHTWRyOXk1SURPbi9C?= =?utf-8?B?S2tkaU5wZSs1bGxydWYvLzFmcERWKzQ1S01LcHJNUlBWdGNudENQSU05cHM2?= =?utf-8?B?eHd1RnVscHFqOHFIVnR0TnNMdkErUmdLVlpsbFl6T3RiVWN4YTBGOHE2TEpF?= =?utf-8?B?d1g5b0xKRHNwUC9TYnpXM25KcnJ3MkNpWmJNaFlQcG43TGdyYXNMbEFIZnRk?= =?utf-8?B?cnJlQzlvbDdFLzNreTFqb1dGM25GNlBNeHZlL3JXR0N6UXF5RVNJV3NBdTB1?= =?utf-8?B?REF5OEtTMy9remszNUdrSkhYek51eUZYckNTaUw3bThPcXFJZ0FmNGxTdnNG?= =?utf-8?B?R0E4Z3RsT1FmZHFUS2sxclBQMW1IS0lOUzQvbjVYaXRXTjhwdC9KeDRVOEFa?= =?utf-8?B?NVk1cXhvVUlhZ1R2UHh2WXR4dXZuSDBLRlVwUUFPWHlocTRRM09YK2tseDBE?= =?utf-8?B?cnhFS2dsWm1CRzFnKyt4K2tlTStzVlFBVE5hV3I1Zlk2cFNON0t4QUx4enBZ?= =?utf-8?B?Z3ltbVpHMlRsaEg1bWIxQ2xkeXExaitmK2JYejd1Zkp0eGloR3hTd3ZNSDZa?= =?utf-8?B?aXNjVTNGNmU2bWZaS2tXaWlnTUVJQ2JVT00rWDNHcm1wQU5sV01Va1RqTWRQ?= =?utf-8?B?UUZOclBNNFU3WE95YXRrb2d4Uk9ZaTVKNHNkNXh1cGV1OExrMDFtZktqQkg4?= =?utf-8?B?Zy8raFNwdTRIOG03V0Q4VUdSeHFWOGwzZVNDTHBpODNuNFUzd3pnL1lxQ05J?= =?utf-8?B?SjFRSWpINW9WYzlmMHJTV3MrWHZZV2ZvT1YyQzZVNFJhN3dKQzFHUXJzS0xa?= =?utf-8?B?QWU2N3ByQlhzdFREQXIwZkVMV3pvWkNQZy9aQ3E5b0tFL1dzL3pMOURGU1hI?= =?utf-8?Q?YST8EfMTbZo8AN9YrU=3D?= X-Microsoft-Antispam-Message-Info: FCRYuWbD/i4N+dGtmkVxtBCpQoV/9ZvGlZg+2s3cVWi8lklacqes52GAEKSuSbxVtiRt+iMTOM2jEXF1+txfAip3cCdxPjjRuIhpYKzYd/8FuqURW8aOn9RPDLVM1wV92uYnlggcD0Hc/9WISocSfQMbt6x2OpTfvBlg+k1nTEfl1SAeYXycpEq6bCa37IiMIbRF2dl68EVShqXNWwbIJYDM6n01TQpR5XZsMH1V2B4PagRwG0SFvISkw6rHvguU8XeUm6kTFZv4jL7O2WmKnaq+jBG2Td3Qv3GphRyCOqVoA1tcnMzjHCLyeDNVYBsfaivXmG4TA4MVM474ViJvyeUgwslaVF5CiAGkP0vU/0M= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:w48izR8DUAqx6kx8YbyqnWIIUSDEPkt2x9vx52ki2nGdm1id4+H1hT47lnwFCVpJg242vSzwXpCIuIG+HOaSoefshMVKSChdMzkHJbFFE8xLDHIWgjJzmanD6C9OgWa7G9b1MxkbS2rM1b9GbBtrWQbOF/tZSYDhJOr9qZvI7+37fcZcMIuN+v1mgqhExJ2rtTMP0OSyu3VqIqB0wyU+I5b9AUIjfPpOft5Y9GQqT7DGQIGTMQldf7yhwQvXylEadUZvS3r+VpxnVA/tYfm6Yk9JN+PWP79jCfFuKQLMFCXY3NOEaPxVuwQ9puBk6zVQWHV+N1/bF4KDP0Falgbe6ybRUcXdVmaMK+dx2r6NDyrjxOC3DA3AduJ+0++tKel7GpK+bgPSJKsIrGH8milfIenGcD/ddFVGLizK6elpPVUCdhhpax2hfmluOnPQp63t5+vPosu8f63FoQ23HKJsDQ==; 5:6z/HhtmPVNPI2F/7oVvwBhJNg0qHP4sB5xvlmAGtyV/hA+yGSLxzhfaC4OhFwcXfsnTXE6bzDTI2FYckLLSqeZjekFFqp/GNln3p116uJqSPNSRGaLHy/yGA4XpKhs46+Ko8efDXHQAQUmVcSbDrulF/043wB+1FvjWqZZeyOo8=; 7:+EMpt7EQonzvKzjoqDba7T0BW3+LpjlEgT5KOZIZfijLKMzwDpDvUP9oQlqkDxlpTXWQBZh2CBgu4fgP+5k/wWtJBT32G2nXFKVt28QKbJbvu4AT1H2I6AtDG11fqF98UZDCF1Sb4U/99bXK1hOgn8C7R+h6Ca4E5mX7+/SRaDZzkZEEDWnGad660jkmqMyN2MupKWROZyAzjlWVT9AgjgxAzoU6OH7OQ4evjWyYaw5Z6EIYBXoqbaeIJDhIL8Ci SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:56:26.0281 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79ab8c00-994d-4c0f-886e-08d60dd8bd72 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH v4 1/7] hw/riscv/virtio: Set the soc device tree node as a simple-bus 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 To allow Linux to enumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 248bbdffd3..e8ba4d192d 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -121,7 +121,7 @@ static void *create_fdt(RISCVVirtState *s, const struct= MemmapEntry *memmap, =20 qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "riscv-virtio-soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); =20 --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565523539324.17401495076774; Wed, 29 Aug 2018 10:58:43 -0700 (PDT) Received: from localhost ([::1]:44333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4jn-0004RG-0l for importer@patchew.org; Wed, 29 Aug 2018 13:58:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4hy-0001gl-NY for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4ht-0004H3-9B for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:46 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:2215) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4ht-0004EQ-0A for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:41 -0400 Received: from mail-by2nam05lp0242.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([216.32.181.242]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:56:39 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by MWHPR04MB0398.namprd04.prod.outlook.com (2603:10b6:300:70::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.15; Wed, 29 Aug 2018 17:56:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565401; x=1567101401; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=benC03lmwJIzz9c5DVIbfQZP27HsrixbgMqUukS8D7A=; b=nyBRlVtcZPalXYRwOa4h7fJ/Ml6mnC9RvFGUYztQo3YYEpwlPLZ2ffhz GGLdlfOPCmw4dGJq2U4QsRkMOA6RYCJ6r/cVNY9NpRHvWho7N7mXuLrqR 4kfgGF4SezCxxICUSKWbHyQZ2LTD2TXPOmNGOt684ApJvj9vGZfkjhn9G ALorbFC01fzBeGgSTeHtaCyFf8/ZGlts7t/Teqp5ngKDDZBn1leAXEiwz S4R7e8iN0TNU5kNEhB/h6oCsFUkViP2Xqm/ePYNHb3F08RCYhCwK5jrPC Bcn3gRB95bmvJYJqLdnrHi4VFpsuXQ6b71/t6H3By74rBArlQM4Qm6+As Q==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="90193700" 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=FMmbsWZNTUCz7r+VpzW/JVIhqn9uiPAkQYQHQwDEcs4=; b=DVWgxDOkDuzRoHhd/VDcxxuMgK/2LzK6HSt1GPpWZoEAkKYH3VsKFDKzdLkI9iNpMLLqHRUXvfchoNORZ955YLQ1QZclZxpSwB+hmZPjzpe1inUD+NsiHf5+tC2Z7Cez1MmgMhFVmcAoKV4TgYJYhszzZUVKFO9FuxC8G/miAyc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:56:28 -0700 Message-Id: <49a3344977c4953bc7d341cc22fae36c0258e8a6.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0009.namprd04.prod.outlook.com (2603:10b6:a03:40::22) To MWHPR04MB0398.namprd04.prod.outlook.com (2603:10b6:300:70::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b16094e0-e21e-47b6-ef3c-08d60dd8c41a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0398; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0398; 3:JBchmrzY6DXIt/esfFq+9PQj0mAqyHOT0HeKmy1qLC2rFZ325yTppNt+qWFdfhBMy8k4igH5g/kO0B/cqDEvKJIjxrSROuB/zk0GLegNyQpyy3u4YRCdtwa578RZVnyrZL+IUYaYpJu9Yc97Km4AHBGX63rhp4j1uv4UNHq8LCzZxRCJdixo1VlGtyPoQH9GDVv243cJ4ekQdsC4uLo6P825vnhfrRwmBJviOjd76LaLjPdlsAAPUmLHmWzlFM52; 25:/nuaywO8/gpVeggkpAEDldUl58z90K33q+SWdkiAmuNx6gcIeSe3yv9HkcBynlg8fDfyWFEzBnb6P3xHh2AfhcTSAgdJJruTX3v2tynZx+ChU4j1OAOUJEALPWW9F2TcJSN1rS2ky8PVqsaOlsZv90KlU2peptvajRzLmg0nFkYcPSYwaIzUdF6ijC+oibTSK7iCZ9UY2VTT8kl6KEG81CFwgF0dvVpslXS4Lz8GEnoIB5D9T7xBEsVT2Pcpb61pvGzjM2jaznjTl4UWYxVSzR4FZ7QFZpfQ1Zy4KC7wpJtmFT0GviL8Wke8kGX1cIZgEYKMOrBPSuZOSDP5qg2y6A==; 31:ncQDha3LBoYMza923iIEUnniw6YtFifGZmH2UR+rmoQwUOJnPvcB0n9zjq52EQcFaFJatGlh4ecpewANlGBp5/T7VITQQsWTG/00tmlA03VdCiLJhrdWpni3kNiD6i+rho7SuoVXvLvXl7P0R0negrrUjLm+BWt5GFk8cT4j92WjmTZrYRHFbpUM0NIsV5gqxFFH87F8VkEyt4gaif2kWtTNqSvfTINi0U04+C/AOYQ= X-MS-TrafficTypeDiagnostic: MWHPR04MB0398: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0398; 20:QB0+xXa7qmdvMipY6Xsx//ORVjPzz8AeZoW/KhQpGp1OsH6eL25LLKvRkppuWwMlbb+ZhkLtXaDgGxdMAh2mDa24B21IBDXRmrQgbztbiXhcp4WqhT57Cr+rS27VOddKexMcf8GFN3V2xS9OxICp18SA0FxTbSstSTOlMKB6TJ+d0uO6KXVoB2nWNxhXliB84BPeqJ/yTWBdLm/gg+SrjuXm2VxsmLRGCfxUiOz8C7lx5/9skzOwZJ7HfWcPZcNfq/2jQOXJciCgG2UY5z3S9KiYrpYVJDrI9WubHePZdObUvaxZYThwFVw5d/k3+I7XJ7j7yIokiRGd0WjvM2E/CXhTQ140VKhNzuR42PFP5IhKg/31ojCtDEEKdG1z1zJ84yYuu9ffGpcHlWJwZ330+a/mRYj6UAfIPQ5Fd8EQoqs2FhFTKUwfeaGs3043rXGKRYry7ztBcAUEIkRJPLOPY3jFHCKUn7SkFxPG7oMhdTIci7nnTBGS1iifToekbDj/; 4:QGhTx6/MedZLIgINxbPGzOUA7N/SUahAzqb7zjxzUyY9xE1/5ftYGqydz8OjPYgd9XFx1xuGIZHaZpuUo8ubboL6Uzs3Jem6hZDUDkcdgsMR4NBK1abwzblXkweD+daXDHb9ChLIkUXIe4+DMy5rPuQSkOrdTIoMLujq5pxgXwKYUGxM1ZYDNsAuA1/RK6j+dR8OYF+9D8qrZ3ESDIG9afdjLxSK7Vbr1jeCqsRpSI3yq92gwAiMAinjKyAsZeju0iTM94dyHWVSrRAJtvVyZw== 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)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699016); SRVR:MWHPR04MB0398; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0398; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(376002)(346002)(39860400002)(136003)(189003)(199004)(81166006)(7736002)(81156014)(16586007)(53936002)(386003)(6506007)(6512007)(4326008)(39060400002)(305945005)(11346002)(956004)(6116002)(316002)(478600001)(5660300001)(14444005)(486006)(8676002)(446003)(3846002)(72206003)(36756003)(86362001)(68736007)(2616005)(6666003)(476003)(105586002)(66066001)(16526019)(44832011)(106356001)(47776003)(2906002)(48376002)(76176011)(26005)(51416003)(50226002)(97736004)(186003)(52116002)(6486002)(25786009)(118296001)(50466002)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0398; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0398; 23:Lmvc3iHPeTTfla1G3sWAWFbmkX/m/HrtoyhhUR+sa?= =?us-ascii?Q?p+fsuCawkzqiflAqvlgAETiv+zmApbO6fTxaoqfuiqCh0nK9e04a9zYkKmsr?= =?us-ascii?Q?mCMwE9/pw0pDownaFjKrqoKxE8yyA2vlDRot4CyXoMukuieNdWGkEEd0yZUG?= =?us-ascii?Q?b5p+Su0dfqFc3RkgWgi1jaIi3MZ+Xfh0YR1gslbExEoxIqvN6DAaL+u+x7UJ?= =?us-ascii?Q?tP8Dsxcsi7IyO62LYg687Bv1K9OpwmLs1EURgSR0dfYWzXTacyyywdTgKlhC?= =?us-ascii?Q?U9cN2x7p0fAquy1nmElQzKWU4RennHZhM34sEgI7tx7eBZy8Rbsy5lOSQc1o?= =?us-ascii?Q?CZiuBWQJJsQTNIFvEuWQN+Nf5UQlPgCcJn+oBhZTmFwN0ias468MC+2hSCU8?= =?us-ascii?Q?Yq43dxwbZd4tUuYnsgpiNoH43QmGMsei6LD+5ehCyYaZ4BuCa27U0X1Z0vZz?= =?us-ascii?Q?SDG7lNF1K4xHnBUYtgNPnxgXA51ErvEXJCSiJBduCyI1hnGIw6P+CeHaDE9g?= =?us-ascii?Q?wZAziGZHvyjQmCt+O6p4OmpMupal4GPGC0WIIlZ+bkOADYHh5aehMagwQIAW?= =?us-ascii?Q?dLx1Wb+vaje5sdyRzpCSm3Gdc0QYexzM5A1U5u0kh2suWgNHd5hHJ1artxkc?= =?us-ascii?Q?6nazO7Iu5a2DeIpoqRnmD26StdN/DDLzdT6BIXuYlvkJykZiys6uERLoQWM0?= =?us-ascii?Q?SaHO6lyM9RqBR/9uiCDQsSsjQ2Gmj+Xdv8dPoGM0CdBbzweitadDU44kHlLm?= =?us-ascii?Q?4rxHgK3p643sViaMshfzdA25uWhUkzKT/byF27z2UAfnTUDvXnHA4ISq39RG?= =?us-ascii?Q?QXvHEeDR5Veg2dqdCAOuFqL8qc/lL4dgn9+hHAjHsEXqsRjz9i7+6wEEjCi/?= =?us-ascii?Q?oRV6M8krL9TnRn6panCsQuX6FpvXE1/XlvsXk10zh2IZca/WtdG/5gzpu4bv?= =?us-ascii?Q?bnRTEEPDW7A4UOT7zDpu8roT11Ei50+dD9MpyOMfEaZ8ErcPrCOxFXAf/WMR?= =?us-ascii?Q?w5WVClKnlDHsvGEetmLpUIR0VTwenKwIph+Zhp2QyMVVuLDC8VfzWhwN3PmP?= =?us-ascii?Q?AtYThxcihopt0DceyBhOS9YSoPM5Xd4316aXDw0vEkStawcOVBX5PQgzD/a9?= =?us-ascii?Q?KExg5XlA2eXKhba5ZXIpurUJYYs4TkxX2W0899EAOIrGFDVES635utv3VQnz?= =?us-ascii?Q?vJOdLDOqKAaJZ1wDSO1Pr6diRtK7RhAJJtiVxCWP5giH+5xVenaxlR7y+Jnq?= =?us-ascii?Q?z9SlhHseBy3H9xU1cU=3D?= X-Microsoft-Antispam-Message-Info: ert30GA5O8EYVmlkiiGmSN6NgqsNKNdnnkTyDaPlHDGcTMmmyWUlzIgM0+iACWfsJs2LOUjPGLeds0gbbAdSrAlEwpObpGBgb3SThcT0wNtV3cBMwff5iYToTSR2x1+uqiRxU8Z7dhsT/2mdl0rbK+HqLr45+VUNE/QjLwHXI2lsLq+sRVTOrDQUOqqmZsA3U2tPW+6j/nXuZL6tU1zFB9TbIDNA0D4PIgYUlo1O2xGpacF4WxjewJ+yxu25oZ1GwyJDorY23et3RxRmK6wCCqtFcJfGiUmzRwic3ZarOQFBfXW/TiwOlx6IxqACuMhCT9ryU+5nybtYytj94vadIT05t8OWhnCZ896y2zwhkeI= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0398; 6:BnfVbyxuWHI9vJLpADgOdjkZYrglfEB4Jm4sIyQD3d8QgMDs5v17osHfiShMU+om/md+KvYxVnr2gfF1RkuCsR/6xJyQPsK+EmZDS5v/GIl/9FkE1vvMt1bFw9CZOEBh8C5JXzEVQyemS6554oJElpSaR0ZW0yKjaghH1iVZm9WQBzhc8s/T/s/2CtHop6u1mlFIpFBcM74nmFUwZYl9sjvqQ1LdyS4TQ5wJJXHfEqCbaTVjI7iXI7e/uuzzba3l19gkWb206j8kqb8hjgNYYqTcd27z2B/HVEKrlEvBwD62CczW4psoz/BmKQoI2BQ5KJdeOSLwx7KOjy7Rqx97eit9JQZ9rIEvuLF43FzPy0vxsZgJcgn905BaFC/x8a43jOD053KGDS3mop5dldua6mhlZf3HfxNO0ybe+Qp3/826LxuC1n356MlNoSMlwgNz7ARWGpXWi+jFtqcY6Xm6ig==; 5:QVdXzo6smXkKt8X+/aWAktRnObwslVOEwEQZ5M6iR0Guo6jrSHak4nvhpFIsjli0FegAXuiY8wqCSg+9EUA7RkrLonYQhR150AcCiBiUOo0hBSGGyRGUYMYbcKWydykC0RKEUMFLAHVGNa5Z0ptT//dxL2hIfXTceiBHdF87CB4=; 7:m9N0xwO6FF4JWQiw6TJ7sLIBMYaJEER87A4nPpr0jnGhBFEMjPt9PICOfJVh1/M3/HBKrYqGi41axDD8+g3cYcbQx/wV1ybM69FWS9oLc/nCPwptUfHD1FE4dk50Au2cAYQ1asVY5akreFt45OEjQ8hqdYyWq8DBGEHcVLadO39vfopXtqClUfv9aHniMxs3Qlovc7LllEyWhU+U3pXOczIsw1ehBTn7Jt8q1VMLz+g4P7To45vDrXnlOh3nk0EH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:56:37.1979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b16094e0-e21e-47b6-ef3c-08d60dd8c41a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0398 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 v4 2/7] hw/riscv/spike: Set the soc device tree node as a simple-bus 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To allow Linux to enumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis --- hw/riscv/spike.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index c8c056c50b..eb857c434e 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -90,7 +90,7 @@ static void create_fdt(SpikeState *s, const struct Memmap= Entry *memmap, =20 qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "ucbbar,spike-bare-= soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); =20 --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153556568446310.35470233229205; Wed, 29 Aug 2018 11:01:24 -0700 (PDT) Received: from localhost ([::1]:44352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4mR-0006XG-DV for importer@patchew.org; Wed, 29 Aug 2018 14:01:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4i8-0001lq-3R for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4i3-0004Lh-4H for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:56 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:12718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4i2-0004LJ-Qw for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:56:51 -0400 Received: from mail-bn3nam01lp0179.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.179]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:56:50 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 29 Aug 2018 17:56:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565411; x=1567101411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+/J2hhMfVls7SJP/DEbyHDxBN2Gwa318fTn5co8HZBk=; b=UfQY+8Irb67D9ypJS9LJtoOrhBPEOMZsRDzyfDl1BYcjgSnl12ndRU5X qrwcprNrTDU7w7Zzlpk63JmkQXMQlURH372rbZkTJQZnEVoAhh6fhcz6Z TdekkzgllQsiE1IsTpFq9S3j5kaNx/docti7o6/ynyz2j29SAnGjgHDoq tIqnuwzk4h2bOmgG4qY5isESSIlT4+rklaIxDr/Jj+ZKsmBPLmHf5zbvq WdxNfUe473kWTvNmaaiugvUyyuyMdPh+O98YKmg21FS2LFWvlBCMXnPeb M67EDLp2ExTG8DIJhBgkHyNYQNwLMrAtkCJsjWmCzuzadosHcc5o1/+HM Q==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="88653363" 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=9l+OjGr9O4EjmBS0MXz8BDvQjz/Alw2Nhq2bE6TgyPQ=; b=PcSTEnv1ZuucRyURVBAHMMqA53F9RVmWDzphZSN1YYBgfM3IfznQKe7iZVTyTymsylcuFnE7KBjR9ArfAXcEQGpGYvXjomp6tjcZ/UWe2acJNn9CPalJnG/A+nvpgl7ZcaYO7PTBPnscZvtcJJdsKI+y2/PNP6Izl3QzAbEnxe4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:56:40 -0700 Message-Id: <1a431f6afb9ba9e927cbcac59ed75274ddc80522.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0026.namprd04.prod.outlook.com (2603:10b6:a03:40::39) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cf1cf3f-f531-418b-42c0-08d60dd8ca94 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:JDaqIZlDbgtNarp4HfNC8qNKhPE44lfdZzqt80yYPNkXzARn40yrNdRYFB4izu3QAkoba6sqSoy5+fc8Px+3sJ5RC5+OjeIsObhnHgNLqztkdYp29ZMbHVcgZiAN4znhnqaJrOF2vkjFxSR6OPJn1K3D+rKxUemoIQLKDx9xkiD8oc53cYDl5oAAuM1/Z3MuYqy9iyCMAyHJJDxsbFOT5Gnvw7q2g50bjdFQ2nWHHS+0A1dsi6smq2xkp/cQfon+; 25:Lf9XI771IYxWCWjw8cwk7Cl493gS7OWft9rEavEzSq62oy1bcTdtMGPakD0PWaJekbLJkFCxsV7b1v94zdDObxRhSGD9Uf/9gpI7bXXHwS/kE1EaruTdcD4EAmBp+Njz/E3JbbVKCEslfjbKsSmY8rAUWekkSDx6zR1Fr+CwJ9LPQ2htQ25xCKNPSGSuxuPD2c/3t/hEtrzifIMSCrW0lL8gnMinbxfhEDaK89txzhK7MEPwGRQuchF6grOub+otHkkA6XmysdS7I5Ai7WizM2VlRXPwg1UYkvyrrI6lfmjZk2NxYlhfW7lH3Cb+To2y0SvzxO7Y+A29uIa6YFydVA==; 31:cRdvt9wJmqk0apTS/Dh7BYt+iW4pt/sUpRYsFWCfH157B1diUjvJLa4uXE/A1RzMq9Rfzi2OXrxQcQxHJGNVTCvFFr95I66k9T7ydlE5nU+Y1nohGNSx8CXChwUa8pE/420dcKcwF5/o2BGuERjHLZoihunVFy/N2ZS1JxN8cAKyi39b8JccypSuBobcNOWNLOx8SEi/jixu1IpqvJTEpp0Xcj63Wvr9rwn5iT16q3c= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:Oh+Qk6CTjwzEkEpx7ZDSf4ThmLW6z3aCj2sE9Kq8Tz+tX8OSJWyixrlCdQ/kPv8pNL/vn9Y7mww34zNGc5oswSuIOBlVYg0TzHzeDuCcThwDXJdpiG/ZQl5Yc6bYz6qqbcCfo/mHR/RjbnYjt13+bmgb+P2QnoCt/bs3kI9m5IxWpU6QfKBWZYZzCDxLiEhrhYphGbQP89iVaUwZ694KZvnuIoK+XZD+Gt7/v8XuS4E0dvS+FYzmWYhR94joCOMiyiONJ/IOmd48C113VdPAH4wtFj1g8IOeT1XPRTlRyWXsrr5ojAuHsQFGP1h1oeZS3TWr9ycpYnYMv2z+bZIgHZe+hCuMYx4iXnJZsYlDSNqe94yTzG4iywtXO7MSw01Tbs5VK8U9LekarFloLSyrXa/XAOLcY+b08tMxurHERzjSHHDDLqUmzIm1K5ZtUrnR9nChtsdCHqCWpjgM0wMREXuKBkKxRHMIzSaF7aQNHiYdl1j/cwUsL1r/KGBrgF8p; 4:k63Lr0RM1Sljrj9H7EyjYYk6w84r6qEeernnuIQ6fkKGAaQz2BMG2g1Kd9NeDI58RnFi0lUPKN84qTU3kyuzReW3XthUqIZKY2KlowOIy8nYv40s+hpGQfFGDLgidIyMLArpqw/9bl9hR0popEceaOBycFDlTsuWTrasWX6NRFk+81SfueAGBC76QtRcw62/kN+ktAa6h2x6wobwrcc7vGXzTe1m3mT2LlJj9PmbwdD9k3PgGlOsxA4M2/q58y2cmi6bVdwsuqATz3f02peF1Q== 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(346002)(376002)(396003)(199004)(189003)(50226002)(486006)(446003)(11346002)(5660300001)(476003)(6506007)(44832011)(2616005)(118296001)(386003)(305945005)(956004)(26005)(105586002)(16526019)(186003)(6666003)(39060400002)(106356001)(97736004)(2906002)(8936002)(6486002)(76176011)(47776003)(316002)(8676002)(478600001)(68736007)(50466002)(25786009)(81166006)(86362001)(16586007)(48376002)(6116002)(6512007)(14444005)(72206003)(7736002)(53936002)(51416003)(4326008)(52116002)(66066001)(3846002)(81156014)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0401; 23:8i8hB5mGLpY4WC7DlZky51Y6XDssiDOQs0CPobGgv?= =?us-ascii?Q?wzJf0bI/v0+KNcpWzVoeFz6jAQeIylczslfZK03r3GenqxhS+NZP3NMzBfBG?= =?us-ascii?Q?6W5yg1eQOlvo7shtRI28BXmqTuhJ39Oc4aIT1BzJ9o6Kv6OdM5KF7R+Jd7b+?= =?us-ascii?Q?xheTStyrZgerVFmPOvofOGeWyu47tip3yeyVVhF4MgS7ZlXhGHuE6ofYwwwJ?= =?us-ascii?Q?rBV0kstmTQJG8+LL387tNRooNKzixx+0StW7T3x//ric3fmH+5S7zgzysNrZ?= =?us-ascii?Q?0UfKZWE6dRNHOnxghNldF5I8+71UAZaYZdgF3hpnjFZnQ8BoYsOLmdFRu4mx?= =?us-ascii?Q?hL1B0jVtfcahur9Sar9d8bJzwB+5XIB9DuTHrW5n69iTj+9KLU7JPErFGrsu?= =?us-ascii?Q?eizyMlJIeF4pmk3r0TgMuCQo26IFTvZ4rlev2V9sGlmr5WR/XVZJmfwaWcJU?= =?us-ascii?Q?nJpFQsacn0VzrNiuh4VBtdPfXn9al+jMwv5EYT7/F0LzcxEY3yYachWg5VKg?= =?us-ascii?Q?wRnMb3wCXLHXIAEXbAOjgEbU3lNDGKnzvxSYA3I5q8tTHSMVmOtJqHTxSkoc?= =?us-ascii?Q?QjaqlRQeQc+eIJxa3VGbDBfZKnSa5Eyiwy9MiDxtgynVTEGWwQj+AOaGrz+L?= =?us-ascii?Q?v1efruWSOJGeDqBt4KPALadDw77pr0nLxxdFS7LVdiovLp3joFCO/QrEQNzn?= =?us-ascii?Q?i+rD4L326pQhPRKHscZDAyVp+ZIrdYDqo3GEeR7jFZ/XzKCUB5JM3Eksra+r?= =?us-ascii?Q?5zw/bF09HcPXKe6JPYlsgeh6A1p4E6u0/WzNWbsRyelviiA3GJHjXiSIsz7V?= =?us-ascii?Q?Eukunw3zTexNi8FDGwyrL3NQ5pYgmXjVzcCd4QPdBCCU9sDWidu56z527yDD?= =?us-ascii?Q?YA0sNBupVsxACSbpA6RmlbPKiuNi6DMJ7jbRKMcMlAOisOlAuW7+HJ4b12Cy?= =?us-ascii?Q?fsVzg4w1SfZyXYRGfFCutbSyNNHdbarY1dYXhsOacCrpheb3AsTNQT2pGN5n?= =?us-ascii?Q?u4ugSckO64WN9AIo1usz731/gnsTQ+uPBYLeP3V4a5AATUaSk6B4noF2PeC/?= =?us-ascii?Q?q998UH/l0bMHDDw7u+Er7mmwaefxKk+zQ7z6GoV2aYoz0BdYi7sWk8FJrOdw?= =?us-ascii?Q?Afs8dHdLzON28Ke1C/89sX0QeqZ9PHTjPO2imfwIJdRZ2xeNza2ZRfhCnaGl?= =?us-ascii?Q?YAyV4XkNGm9U708aEolQjFLBr4jjBQiy5DiTqlQjuV+qkVzx/4DC9pdH/1lL?= =?us-ascii?Q?IOSggcK8WNOMhWkuE0=3D?= X-Microsoft-Antispam-Message-Info: 9LtJf9slBmTZYAOhJJTwM4hrVz8yZLXaqAjfYiLCbgfkxButkvYhyJ61goiY74Dt3ktq4SzmCrntIpgjEn3FEGjbkmrbbbByNnsD4fxUWTSk8YnWX/MzZIWWMt3wx1fRvZz6of3SGa4OOBUh8M8gI1UHQwjwElyKicqERhLhOVVj5jmWgOOvMeFFMvkpZQ1BscdeoLHJvbPxqikUvQfVWvbGleELt+YidjT6OsvDiiIgbCIJCmzDh/+6E5GkOG20yIo19A4EdOksLS3YBt96dgkPUZnD/vyHz+MGDtRIEdFMkCMVQcfZX7HawlKtDdLLqs9ItwIvGBC8OshvFQ65xsbNDKKXe/0+u7joPKqZNR4= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:aumftxcX3Oqbl1ToJ0at7ON7+j+OKWLmjbUlYoEyc3QbgayrYPJZH2eTFzWXkYBnvQyPs9gOIVoQ7WnOPnDOmoUd5A8O+vcomq/xQz6/x5z3GJFCdbnc27vvrxuduxHmlZ7lHhUTMKDdNvzvz75HSUl107CUoH6IkKLnhrXZUw0j9si4fSmSj8qO6EFYPdaa+25TUBs9duPSZA/9qOZBVIqAALZ3CFSCBwl+okUanyMe6ygnApK3t8IsdVHo9kvtxx9pV36AuGOlJ/lAW6Lc+zWJE4sdkHNXyAm4ZlXXMk4qk5u8kg6q8aorgsqLbjYnTCfAfsZ88mpkAjLGjE/Och0f5AFYAS01aj0PuCmoYiB21lmY5eua2yVCWr/Sy0+rqE6+WmzFKhlI+hj1d+t2nOzjOikK2L0HkDm3QfrUWjn1zkPdwJKyHTiJTf+qyfI2O9Ot8uKKjw0mAhk/1/5WtA==; 5:jc4aBJgyJ9/o74BqeGenCfrTOzLFXie4Yjdt7F/lVcYl50mpLsiJp4frCwPfjWdyw0VGAjVI21qE/ZS18OW1mjPjtQ50b2h46dNAvYl7RPKVizGwPFuBetVR/s5NCtYrR9L6oxUVZDPpMIgdTAmozDHmGh9YUbxiFzCE3mi4q54=; 7:s/Dx9gd1r873yBAK5ToMyD2NtDMW/NpuRFFb70XqhD2IxLXlXV9OCd+lHjbzO2DtMLqCAC4EG7sClHLEbLRlJWhXYfnRoMBH3QnIJiCtTwrOYBDBZ+7KfAdDcOlcqxAQ3Ek+G7PgzIwZ7BbagA9ldUcj4KEYAJBIxH2gtE5fdOIYiyiVqZ3/v4eokb/S7qW7QZfzPXqDVEp8SaaHGjNG+7qh4icMQxtueM2TepwDyu4wW+651XWQ0dMYklFIpMk6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:56:48.0752 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1cf1cf3f-f531-418b-42c0-08d60dd8ca94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH v4 3/7] 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D 10, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, - VIRTIO_NDEV =3D 10 + VIRTIO_NDEV =3D 0x35 }; =20 enum { --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565847841616.3423134420432; Wed, 29 Aug 2018 11:04:07 -0700 (PDT) Received: from localhost ([::1]:44364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4oz-0001OU-R9 for importer@patchew.org; Wed, 29 Aug 2018 14:04:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4iK-0001w0-9w for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4iE-0004PX-LE for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:07 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:16046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4iE-0004Ok-6b for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:02 -0400 Received: from mail-co1nam05lp0084.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([216.32.181.84]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:57:01 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.14; Wed, 29 Aug 2018 17:56:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565423; x=1567101423; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=qLBdGQ8gqHhV12nJ85RgDrE61SLwWmYdjk+4+36M1IY=; b=MXjTQOA3Wv4ptGQkQsT9scOAYjmSCv8CDVn9yHfP807DkyodGoMfGgHE 14Mae3R2N48INS4zUs+1qCAdFW9sFYWEJvk7fhN6SDPfW4cvApCDmjyo4 7xus1VuhwoQTrzvWuyVjh5HCzzntGObuHVdLaK7mu+mvJwgIi61m2vjF6 7uKk8YO12NlRmnmdda+J/P6fYeKf9vvfuLalEf5fjE64bmpUR144stn4K eoinZNxBPdTreKBLLc/7UuXpBndh/R1YiRqTrMQrPe5jV0Jiz4RYyXg0H ybpyNAAFxfwVYzztJc1442sdRWnR1LY+VjQP0KRLJplEYXvh/hb6gzdOF A==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="92677808" 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=1KCpFDPPs+E3Q+3UnqnGkznHHrv4GxMb+3j+b5XQYsM=; b=ZqVbqrr7S1OfvMuB6vHATnyLIwgGaf9CXuclthx1K9kQpuz4J3904u4c1hCjSuOWGs/N+VyQA5YGha05mAJrqIhrlw4n//xcY70corr0ROJ5srEx9oLEcQCsAEnBz8TuB2glh8f6IeXh98lCxvoiRunl/cANuMo9hzNgVDMBYN8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:56:50 -0700 Message-Id: <70f14a14554067f6caf1abdb27e9aa50f0165ce8.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0025.namprd04.prod.outlook.com (2603:10b6:a03:40::38) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5b47ba3-29ba-4623-f034-08d60dd8d13c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0392; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 3:c8uWbegVXcSY5JdZ9ORfDVict0PKPB5ATV9OA5NPg5givqTeYoKi+1Fy0Cy7mN/4pQof9mLQop5sNSSgOpiz8WHcJKZBNRIOsXc6u/D1+SznlVTpHRV4+TXW8vx2TKiCVq3gUJkDwUwZB8yHjR5kJLhyxPtZUWBWenr6eIAw/6KI5XrBzoCBdfk3asDzxE5lGTB+WcfOwCOZ+E5a29wYPNMAlQRSvOwO6lpJJ2b7nFfdzOvhUXMq72F7EA2yfYD2; 25:aszWpR23hJyLPd34Dop2l8gXDjyCjuMgdKAcwgThehOhxjXrvKjzRXgGIrpyVZMO9Bpo+Qw84qLwDPiQBPxKzwoxksq9lX0yAJ9tRSMynGbmQNVgK5rHqByswZQW9bnIGeTPyguT8rU9BfGGVqye8Uv05qiETYfmfy2mAulM7N9ERKT8hTcAKfDe8aUIAqkUtjm4UU9GBLuksvvV1asYDPgjNkXdRnix4K9cQSTOnsRmEZxpYn3CwVKCiIVSAmV1RxP2xKu5wvNwZxGm3wGgYSCv9EaLt//cQOhYHIqwgpcDUEyzoNvzglwlvFtS9Ef5VDaHq4gVXfy3RqQMVURg4Q==; 31:Go1H3nWnhGY382TjcpbCdNqb3TyJ1UIWjhIvVN8/2/ShiLKiyyVJLaSUdcprh1ReA6GZrJ/FZpnlZr7PIKlE/B/+HLRyNGJivAgQe2DhrTyodl3iFOIm0RDl+Xn1qqAVMmH60t1bbeGo7/Zr9oNnl00klXG4dvPm86znWEr3ZHzYYMu8oYJgToGTy8AU2Oq/n2zdiCy4OdTEiSpRTKzOLwfpe25fDX6lf5HVPQK052s= X-MS-TrafficTypeDiagnostic: CY4PR04MB0392: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 20:e0AW849pJDaQkGcBtfFYMuRzYZWp7XnE2xqtEIBnE7fVOVlhJWC1Aw6vyM0YC2ltBV6aA6mwtdKdJlepUmcTKrZqYxMk9Ak9ypTK0ikAfhri98XBS862G4Z/Mie+j7lFIUZjDuFn/t/WZibtjL4T1bqU8RkgJwVOeJoCiar8hVpeqJetlyKGLcjhurspj2SvJQewYhiObgwlVLyQAAX++SlRrbuWEqoXYGhb2f1XbMF9ODIs0LEo4c8gMMby9IMK7gwp7aFrMRUPr6F+KkSHY0FZwnoMLmU77hvFtTcP19zUntomzfba6bPvx0h3sRhPjlOghe4VodCOqpA8jdjf9VSSeBWmehVrchz2YuKXaJDZFiIqdMOO5wUqwo6MkW7suQkVUtVglqB+BeBYfO7LyZxS9hg5O4NFwvUBuluDnRsETbuoFScLYUMnNTOzeKQpkI1b9VSbOvU4vdnIPU0ICBM7fva788sFQTd2pzn7jmz3PNsf9Kd/Lq9aHQlVpLxP; 4:Lr2LrV52wRP5AeQyCfzyBlSuoesu720ltsARZo+b8il7FB57XPv1JgOSAQD3UmrmHFxHnLhspasPFOZTQcnozVlQtozQB3uu2jGLvkyHpyj1u+H/9M2At76xbfGdafF8VDrs7w2STC25lmHNVUDrfvF3gFB/nCAhcsJD72NGBIRoKKBluo/nWX+NYjHiPyFxhfSqXPTX14LSFjsTowF4nYX7D7wl6u5rK4w7pyppnvPuOaU03sBNF01O4BNcjKpmSnRKAfdDoKVA8sAfHyyFoxNPNDC5vK1NNNrprNHUEL/C+HxnEYytoxK7lsPjwmhO 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)(93006095)(93001095)(10201501046)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699016); SRVR:CY4PR04MB0392; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0392; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(136003)(39860400002)(366004)(396003)(346002)(199004)(189003)(81166006)(76176011)(66066001)(72206003)(316002)(16586007)(50226002)(86362001)(2906002)(51416003)(6486002)(5660300001)(52116002)(68736007)(478600001)(47776003)(97736004)(36756003)(25786009)(8676002)(6116002)(50466002)(105586002)(305945005)(4326008)(118296001)(3846002)(7736002)(186003)(39060400002)(48376002)(11346002)(486006)(6666003)(6512007)(6506007)(106356001)(446003)(81156014)(16526019)(53936002)(476003)(956004)(386003)(2616005)(26005)(14444005)(44832011)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0392; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0392; 23:EWXqSFWAtsYoi5OiWv4k9TvmzQTivaa/tGz97INuY?= =?us-ascii?Q?1sEp5eUFyQpVPVE4zfHQOD5/kbbeD4ocYyewvQZjuLKI8xXVG378RDdBLthP?= =?us-ascii?Q?EfkBTZ1nLs98WDISM+eSTjy0rZi+3Ue/hEku+6FE6nOck2G3/6bNRFkGzW6G?= =?us-ascii?Q?Vc/9peStV4RU4klDGDOeNbgug4trWLvcabL7W1S46Y4rQM1pzFaAzKAFZb8V?= =?us-ascii?Q?bdH6dFwJeKKVQ2FNOLWecZ5tvFZWLSCzYh3YU5L66qh5Kb9PXZBzbelLTgLZ?= =?us-ascii?Q?y3XKVHPBKNbdKdqAlFkgkQnurc1w/zGkRStJYmx4X2hWd6LYSRPtRnfpMJae?= =?us-ascii?Q?LgG8RqInupZWkpkxZ+Skcb19+vUU/2nS70/AMxp9mPjQ/um1OYvffUqzODsn?= =?us-ascii?Q?VBxtpw79D5amTGHKDPZiiYwRihC8Etjzl0XemyN97npGI8i4fgaKzriCkhcH?= =?us-ascii?Q?Fwcjr88i8s76a9uN+QMj0XOpkP0Qgwe560KbYQXnDpzN8Yiq8dOoqXGs2GZE?= =?us-ascii?Q?x2t9ainUp1AdZ9yQ3sIeS2upZSiEfp9oASySgcylxO0OueObDGh6oJaUSiPE?= =?us-ascii?Q?YAlnSW5whYoopGlaGakF17jwmtuOA7hPgRMxwkakX0QoG/8wTVADDPVlUgLq?= =?us-ascii?Q?p5y4/OybtGrcM3ASHUy/GP4N7q9zM88NZPPj49QDNlqJIUyLsxuic03UsW+n?= =?us-ascii?Q?p21MOhPFBxvreyhdJyAbKZh0FAEotm8ktm4aRW2DAVZTWF8/RwanYLZ/MPl0?= =?us-ascii?Q?BzsxQ9f/OK3DhVRkaMT889PDzmsvxcjJHaYM9o2zLanxGu9I0BhWpXSNr7Xy?= =?us-ascii?Q?syVopopMeMGYKxUOijq7RMp9Q+wLQkEowF9Kck5/nHBEU4cO6tCuQhk4GAuy?= =?us-ascii?Q?z+3HXFXj18emCo52RS7XyzZ7Ei/6m7gi+7sGN4KJYY3i/p1LqpU2WWKUlqpg?= =?us-ascii?Q?FpnJeqwOvKlyenOR68MyeVJITr0hXQvqJbsNnObo4V9LqK1AfQPMvO9NWrHj?= =?us-ascii?Q?VQSN8YqgJLMvs5RnFK1gwWIx2wY6bGzqCIJ0hJKVN20xApAQ+mj9aX0dmPxd?= =?us-ascii?Q?x605Ru3x6sgbezg9sS+G4ymqALlIFkGjTG9UMCJzmKmNp8QeMGNfjyrkVVrT?= =?us-ascii?Q?r80IJko8ZJIsBp41i+aJFG1J2RYinncL68dQi3JrGAFVuUeoz1FicAqvh1KU?= =?us-ascii?Q?MjrLdu4lUiUlro5SrnMKG8ikPVR0yqHcYDs5ytZ+D+ugn18puFJQzwoREXzq?= =?us-ascii?Q?dN+MjOs3T3K+imsLgo=3D?= X-Microsoft-Antispam-Message-Info: Hm8AtEKxNHkiM0iDEnAyrOgMoFUY2ETTqkY2MBt7vRrkhXz5xs6pJdIjxGmI06BkLZKkXZYZZX31nZSbXfqZhxtE5yO7RELrb3Bt+vV8F/qY9ugQUOymumJltRzb72yjsJQGlMAoQxsfUoTBxoLR1+7rqjJ7/ftvwG6xp49/c/fs7gp2F89k769Se/fB2e1lXTtWtGGGjbQ8Q7Mz1ALgu+IcQcyDyzdGZG90QdqyBGxWdKzIhrKiYn4Z6IGWyLvSI3xkWFvHTyuZ7jQantiDFLgEd39nLaSjkyyTzDSSSX4mOCrUo0Rj5jeDLaFki4RD/WVY/7XEaOOKo4bf9JltI9lHbi5oKJOUIRwm5fR2WZU= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 6:fXOFRJNZIvduz3oCOo4QwqGIcwxddhEg0gQ+TQQLpD5rtivkVvymAurl1iYjp617FO1KaKcprE1t2hHWs/PUo5OLFlKlbf9zN62kSKBEDnUXte04wyPIpNRIIZHiftE/lhUDi44aGXuNkpYJeIXMT4N/9xHp/MSEhldPn66wRHrejDPZarSb9yYFnsOIkXdQNv1M5kzUo/bUO2KBq51+MAVllnoc/mqbsYr8Y0Uep5vH1EPpQ5ChnZm4e8es3yx/kb4kjCycoalbdhblJVAipNp03bJcByTqlAo1nqw8LckLkmuib+aCpAu90TkYgNnPAA9Vf8fNEQQWz7RQXqArOVv7fzCNEXJubdxtIAT11Y2A+rXWit0fPRvVODyFDFNd0wTbiYRJ1fp82G+Z0DveFD+RvK5c4K95M3cdscl85ldYg5X0G5JiKSFOXrenA3wGWroazZvhwk/MiHNFcaLDqg==; 5:WzSDfqvNgTqA9F39ZTwTDLolcFnRQPGSfZq8rBD1fuGNmPT2XDryRItxf8Fm3qCg6xj+th5THsafrAttTaCpTl8xBkl/AqYpIxcXMUW3l2dGUue93cbx9aP+b1RDr8CGUuD2tPOyvuulqP/TULzmIip7qU3V0lP602rOIxJHL5A=; 7:w7uaQS8NcpUUhVEcBP6FI/n1EYndXh5CNWjGL5wywZcHEgdx0bM/5PzkkN/GPJ+Ad0ghnaBHd6jZYxLYuhHhc6ZK5Qb0e8+FzblO9CQ7wiMKcwtLg+b3ldRMxfAGkXPEgE3/eb0x+tiOB9mrWqt9oS3mBmoPThCqseY7A2++K33vSSwnsfESB8S/Exsfvamwie2YVa4Zn+JZtoeDEaZMBMz3y8/7Sua+II3WVtoBo0o0wcZ0mPYGmYuV8K+eH3zR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:56:59.2001 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5b47ba3-29ba-4623-f034-08d60dd8d13c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0392 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 v4 4/7] 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Connect the gpex PCIe device based on the device tree included in the HiFive Unleashed ROM. Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 3 ++ default-configs/riscv64-softmmu.mak | 3 ++ hw/riscv/virt.c | 58 +++++++++++++++++++++++++++++ include/hw/riscv/virt.h | 4 +- 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 7937c69e22..2c943e2669 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -5,3 +5,6 @@ CONFIG_VIRTIO_MMIO=3Dy include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI=3Dy +CONFIG_PCI_GENERIC=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 7937c69e22..2c943e2669 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -5,3 +5,6 @@ CONFIG_VIRTIO_MMIO=3Dy include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI=3Dy +CONFIG_PCI_GENERIC=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e8ba4d192d..9bdeea38f2 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" =20 #include @@ -55,6 +57,7 @@ static const struct MemmapEntry { [VIRT_UART0] =3D { 0x10000000, 0x100 }, [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, [VIRT_DRAM] =3D { 0x80000000, 0x0 }, + [VIRT_PCIE] =3D { 0x2000000000, 0x4000000 }, }; =20 static uint64_t load_kernel(const char *kernel_filename) @@ -233,6 +236,32 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, g_free(nodename); } =20 + nodename =3D g_strdup_printf("/pci@%lx", + (long) memmap[VIRT_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", + "pci-host-ecam-generic"); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x20, 0x0, 0x0, + memmap[VIRT_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", PCIE_IRQ); + g_free(nodename); + + nodename =3D g_strdup_printf("/pci@%lx/interrupt-controller", + (long) memmap[VIRT_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 =3D g_strdup_printf("/test@%lx", (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(fdt, nodename); @@ -260,6 +289,31 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, return fdt; } =20 + +static inline DeviceState * +gpex_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 =3D qdev_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + + cfg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_add_subregion_overlap(sys_mem, 0, mmio, 0); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); + + return dev; +} + static void riscv_virt_board_init(MachineState *machine) { const struct MemmapEntry *memmap =3D virt_memmap; @@ -382,6 +436,10 @@ static void riscv_virt_board_init(MachineState *machin= e) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } =20 + gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, + memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), tr= ue); + 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..d0129c2ca5 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -38,13 +38,15 @@ enum { VIRT_PLIC, VIRT_UART0, VIRT_VIRTIO, - VIRT_DRAM + VIRT_DRAM, + VIRT_PCIE }; =20 enum { UART0_IRQ =3D 10, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, + PCIE_IRQ =3D 0x20, VIRTIO_NDEV =3D 0x35 }; =20 --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565568741617.0644809991875; Wed, 29 Aug 2018 10:59:28 -0700 (PDT) Received: from localhost ([::1]:44336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4kZ-00053b-Jd for importer@patchew.org; Wed, 29 Aug 2018 13:59:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4iZ-0002fB-7c for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4iT-0004Zy-J6 for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:23 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:58850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4iR-0004WC-Td for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:16 -0400 Received: from mail-cys01nam02lp0048.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([207.46.163.48]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:57:12 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.15; Wed, 29 Aug 2018 17:57:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565435; x=1567101435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=/iT0dh2+iHqkQuObrnPjnA7nDr9xBfZA62hc1eUcqg8=; b=jnmA2foLheghXFVZeErzM9AvQm0gtFobI3cPSrRjF9i3Lrs7Ty/p1nkV ze93ZQLBtp/Gd896kfYJ8sLFNd/QhyA6frJdpcPI8bUMPgwtR/H/K/USj P+NzEF4lgp01ojgZlXN1DJAU2NTvPwf9xLwbbUg7APDNvfmxUiF3A5lqd nKXinTe8ycm3MBlzMecxdONpHVMSEtHL/LDXCNO87lL14VyI+kPF2uzK3 RXlUxshCUEN1kJnhmU6gWVhFuFYe8XN55VMochpViyngrtMLQ2BdFI8g/ zmnPV02AqO29peatRv46pLkQ/tYaWe0CnvjsNDl+ccbViOiO0a9/xTV5Q w==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="192756219" 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=7mLaikaDCPZ00CpYBTV3rzV5jSeoe1OlN9JKlu76Wvc=; b=SLkVaO+lVTYr5qXIFmV19svHgC9ABDaD9ydSYeISjZrSigZvGb7FMNPiiDxXUqSsVQpeWSLg0/mFlXIbjcs0HgjpO4DKrFVXVx6Hht4k6JgPARbeY6C3zwErnjNEaT6Bw46+tPyDJrNCYhdCit/eFMH9s35fpVKGaDCWkc7Dkxg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:57:02 -0700 Message-Id: <5618424968508dacfe02164dd0618bd0d865b8f7.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0036.namprd04.prod.outlook.com (2603:10b6:a03:40::49) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f11e44e1-5e99-46e2-013f-08d60dd8d838 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:/BN33gupbm/T4S/RvztTzAs0fcQVbIMPpUz3Ao6QND0LmM4nMdAb3DsjFWtHeggRyqJzmIi9994yDl3+mUrB3JYRrNfvLg7khr9IxmEiy6CYjjLAYHxD0g3DDD3OyrHFXEJ9+oJEi1oxwVroz3fAIob8XPtmpTBTqsDgslq4oQbtgAWHaUuUEU7gI76e5hpWd/OuiCNpZ/jsg37u6pjnGF/sPDPbhqfR4DcVh9TZC+0LMR17Z+cn9lOH9ZpGe65u; 25:rX/aCJyutPzzyGxVm2yur2MoM4ceNvK+caF1ZH5pml9XHI1vL2i6gTJqVykAJtM/op6Ffu3Js/a7Slobwc6u60I0AvX+SG8dnFS9oWIXDr0gblRgKWvyPe0PLedOpK7rTnyC9mS6AfuZoxVV+Cn5xDEfnziGEppB4fDOPBIWzhvtGMbmEaW0wvp8s204DF8946HVd4NACAlxBEW8ZDBpIBwLROhA0aMBLBr12ESBFrodaTyOvL+VzHbLO9PrMlxFIoHRqMVNoOJGkfAjN6/09GuocsWJnLpxfnXkOtVICeRrgU8lvJ0RBEoPxhjTOmE0PYAi0QhFDDkoCFoVgjducg==; 31:TkOOTEAITNWA4QNjPRG/NrN91EtBhvz7Sd1yar43DgP3b6+Ux1v5kcaQHv8skM7j5Zm0gMtvb/37RMb3ukhJtZjEZEf7kU8RoKWtwu9a1OZ8IvPMo1pl9z5dQxccqvreVxhcs+7dnfy7okut2mOWTMvj4pxkpmCUnLREnov/XsHt+ahq8hfnRWaeXp/OYsTdyieoZg/7VWw79EMi20PEoEHDwwbi98AFMUva7DHrcYI= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:UNtxu/AqOJcLWh5xOgsCpqjG4Y0nV2hT6vWFFeXCQiDKt+ceV9RQagkYGpt5LJ6ZymuMJnFakB0q+noRE02l6yKKDp4orKMZjDnjp72YT+1DrL/PAjVpw88tHmetIA7VL/fNsf7nbRZMveNawrQ3kdFUiha20L7I7meDwG6CMRZtb52/9jKF4VKhFXp/e4yWu7ueRY0MUqIeuSP0WExxWw5ob0Bi0b+Y0tVnCcDnWU/NBgervfHFIW7EPv+nC5HMNRcXNaRRqVNo/4zrgFq9W00UNZzTwkzASNJZhsz4qwJaVhSdUD8Tc8G2F3tziU0mO1arWKJW6RGYxr6tFb4lPvw4/kbBLq0Q3yX0JBZDsAVDRA5rUiSs2MXGmBb9IEgEoKZ+rcUDCWKFv4AyR9nGFtYjQ9XaTmU4iOjUY/Q0s3sP6yUY8zhMX34HxW8hdWKE8MtPSnHlV4kn+JOHED0LiMG93a3v2o5+NXrVao2O5y7kkyuEW5QCQmIXD+Xde6gM; 4:QzEN7369o32uX/BncBoso4Zbhd/db2qpQuF1CQYRsPN864tdrcUYmIv9KgXpL5SPla/o8cDraWsVToLZhs1rDX6/oZl5Ru05hN84l8ygwGXFfAcDxsatQ1Re+pBuWoo4RS+E8l1od6Okb/up83qgoOJmPggGwPsvimFY8onDK2tCZ332Uqns1JmPLpnaTOjdbhO4l5IIMm7FHI0n7F5rVHMMwW4xGkX8qY/4N0/tFi+ErLQ3Ng4RLhnozEkuH9niZor2AltxDYmSdJptp6GxFg== 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)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(396003)(376002)(346002)(136003)(189003)(199004)(956004)(81156014)(8676002)(81166006)(6506007)(5660300001)(68736007)(386003)(66066001)(118296001)(25786009)(4326008)(446003)(39060400002)(106356001)(486006)(47776003)(16526019)(26005)(2616005)(11346002)(44832011)(76176011)(105586002)(478600001)(86362001)(51416003)(2906002)(186003)(316002)(6666003)(476003)(36756003)(3846002)(6116002)(16586007)(305945005)(53936002)(6486002)(48376002)(50226002)(7736002)(8936002)(6512007)(97736004)(52116002)(72206003)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:M3v7dd9YwSaczwqzMVTefaQ7z65KFFEB/GNtE/FU5?= =?us-ascii?Q?BWQ2iR9pvNATXnEwQWXpaew5pJQcH4Tyy03rRyrpbEsGd5pQybt2ghtw4tKq?= =?us-ascii?Q?KizF7Oark8Vqu4D6UG9TMtpotKGXZyfoW4Rz3lRgbwqhTfSSrQ38Oyq3D32h?= =?us-ascii?Q?tVvcYas+5rThnh9SjP64ZIJfQ7ieo4q+xnpIazF9bDtARbmEOodoimYbb4SE?= =?us-ascii?Q?rgFGqUZjObryvoaJIAuaWsWbUi2stjooM+xG5IqwBWbKN8LkuriQtaECQztn?= =?us-ascii?Q?dkgl+iUULO4UHYAJnH4UT8lGuAylUAIfz8a/9UGUq9+qEtvcsfkZE3UGK3xC?= =?us-ascii?Q?lzqf9tiMhogMcelr3l5yy0zcxjzxVWJrEIXGDJAN1j0vIOh+CYcoRd+ibqqj?= =?us-ascii?Q?6iCC2HNRjjieueH98PqZdWS9857L/LpIQUEKp1JVLaGKZOVcINjo2Q387oRi?= =?us-ascii?Q?NJjdjQaIOYXv55CxYvZFWMFJ9ZDifWO7vZIZRBuA/+0hLahYDIIDOzxxhkXE?= =?us-ascii?Q?uH5h4xGggPSHx/UtZkM+Xf/CfaKXqNBXDBFBuBm/vKRVAZx4pVfKLF6ZDQCY?= =?us-ascii?Q?UOyXFVq3mnwLilIZjFt5kybd9DEECCZ7/nh4Q4OMlxawOsIt4CtdRbcx6PXn?= =?us-ascii?Q?j85AfzDNsF5wZk2+FTuCzR97MWji+kGdKkl4Qn7xU1zfVqpp25QgBO5omI0G?= =?us-ascii?Q?Wu0JL7v0NF3p378WINu79DCjRokG5EVp7dty3GApS6YHPdUbfbtHEukleVof?= =?us-ascii?Q?rPgmaBTG3P2R6wQMB5wlrRSgDIK4nlkOOnXmmDhB7QVfO/H0kk/RoG3zwcZN?= =?us-ascii?Q?JGY+JTrdEi4B+2lzlq4Avc+0o07M6vSMa6JnXsJDSUbH02sUoiG42LylZQ8a?= =?us-ascii?Q?cJjfiZYyvxFcCKYVxAvrXAHOahkpgdZQ6M+yffFjsz5JrzkDrA+Fd4vVHccu?= =?us-ascii?Q?73BLFIa204ODALhmOslQ4ZSrdtS2Fj0UpGsnYxuGM0C202wIMQ6MZGNb72lZ?= =?us-ascii?Q?NGq0UMibiFbWLo5hKhcAx/FrdlJ+xrHyfCIAMC3p6yyEt+J0YGF+5FyyQCt2?= =?us-ascii?Q?6knPaCfCuCDTfJ9PTFHxKyst3CqYbQZGtFaBnHFb5QJAruDWP61x+6Qx5Ery?= =?us-ascii?Q?8VF7/ghSgz5guUeYd1AmElXaG2QvQRMKpojlqNBQkkwh+dmFnuehiKlZeUqb?= =?us-ascii?Q?DuRcAv82fsC85PBRr7cT0Hz79clXpucTc+pafj7XEIl290cNx3kXvmbMqM7D?= =?us-ascii?Q?qNDw6FARTdhfKVF3kQ=3D?= X-Microsoft-Antispam-Message-Info: N3dkhmAsc+XahtWL6Lisav0Py14a2OXYpylpz5iRirhVOpjyPKYX9wqyDDhaIjJEKuSmQbpvR7+k/J2j3v6JGG23grT+lYWF/hxsRvIhI1hhDewOIv3/6trl8xLWd5ixp5RZQksSt4CgAwS59E2eBmRut4jvp9gp5m6PT2Nt6F5YGbkLv+QTYLJ0jmlxG6XLg3FU1TwgEp9U1vynHLwsSe1K+8Ze3NUpzq6efsykhCMVrQ84N5e4yBRV6HpqZPBl6UjrtARdhNDD5Q+jojqmD2Bz/DTafgAYAvpPDWJ4AvfFmLO1SvOh4wBFT01mGQbHc0SxqipBP/G78ObXNY2sHCAv/G7c89d3AyUlXbBtaSQ= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:ecHZm4awG4BssKBqxoGUvHLFRSkMbNqZg3cJiV4Nfhth2YugmTihu+snD5eImKsxrRjBe/6THPzlS+AVDJQDbKEZyAsLXLwDb1uHWifUGInLVoSEiWmKJC1EELorZyP5OsWTwOZL80gKPtOCRP98LutpYYNWqwAtIerodkwhNzP+PxSRXnBVd1md7CGHKGKmlWk/FuogqIMV/SC4txFLZ06ij4V2AzfkZRNliepfsO9T7W0OM6IZ5oOuSv7CyD/p0siqKilEYATcg/kokCBA2TogjQkfGmztaMTFLKWFO69kRAQa7zdoNwrTPpDymFuuJWDyhSaU9h/QAYffokWV7AE0FW2VuGENDsR5Zf46Txo9t5WseRGyQ8osyRx+3WIgm9L30coZlw/gdASiTuqxbKWVhqfw8Bqv9tgrpYkNkZ6DM7BX/mzsFBW33mGWrteJK56p5MEabZXE/VmXuH/Kug==; 5:um884OegEgTG1gstrIcSFJz1qII3QCtHB/ih/xcDUKf4I9AQfwhX+uRJbbzx1H6T+Lds3wioP6C/ygNE7A1AmfxjIEurdu1rjDpdtRslR2za3BAQTNaQISImEUdjmASfasHENx/QZG8MW5U0+j4Nt8HyZpvB0B1DAQHDaCcXJgA=; 7:MoNprxazJyVo02cx5DQjOqAdKbLqxX+nRxAymBuxllwOVlZM/fKyovdR8ewoOh873+LJ82hf1P0zBIiwcdKmDzV018lN0VrVDB4webRU2uQnGHNLgFqJPZMbvZdbzDA760cqC/suE6VnRLhaMBjOoYe33UrPo5vdXpQchE1XWDoLnNw2PDEDKS9o62vwKTn01HPY476aU2vOQgFdRY5tUBUDBDwxD1q8b4gMig4pcYe3lmx6kPipRikPd7sC3zmd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:57:10.7276 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f11e44e1-5e99-46e2-013f-08d60dd8d838 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 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 v4 5/7] 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ hw/riscv/virt.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 2c943e2669..fcefa68f1e 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 2c943e2669..fcefa68f1e 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9bdeea38f2..d360d66e42 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -437,8 +437,8 @@ static void riscv_virt_board_init(MachineState *machine) } =20 gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, - memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, - qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), tr= ue); + memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true); =20 serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565649262142.32936293757075; Wed, 29 Aug 2018 11:00:49 -0700 (PDT) Received: from localhost ([::1]:44349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4ls-0006H3-2y for importer@patchew.org; Wed, 29 Aug 2018 14:00:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4ii-0003Be-AT for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4id-0004dS-A5 for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:32 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:64917) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4ic-0004ch-89 for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:26 -0400 Received: from mail-bn3nam01lp0179.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.179]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:57:24 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 29 Aug 2018 17:57:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565447; x=1567101447; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Bqd8ygBRwL+YnoMrFVvbAgKi0xrkPVJVFrYUGN32c/4=; b=WZM2uTNLt7d0r4raLLXSXGwcFEK7mSBHd9b90niLOIA+1ZFcRg9KOVXN AimQ/l4uhUwQqMbayLeg0urXLFiYTtQbN3xp0aH7xntQAO9Ufy81zZ+cf sc1wzV4JFwOEXDp8Um7HfKvlDWiPAL5By3+o/anXj4tAaJoa3x3T8h48B wWyJxr203kpQ6lPbBN/pLQT0Fjtf8VbPHlfEbLqE038Ii2bO4BR1yTNBD ueqCv7KcwJBXgdeqEFrw4zkWeZk6p0w0A2nibhnfSekQBLJJuBx3VxA0B yVyJK5kfCKmq4cQJNnzDYu/vnzIxVXsdJ47orBKQ4/GXghmHfaTIoCwaH g==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="89587403" 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=fIPv4U1e0eF0rATsHrvRJMR5MWy4v8sWWLj29J8jIsQ=; b=P0yLOwpuW+hh6lvT+TuAw+QMVJ48X1PSOGJ5xhOp4K69k6FBOk1713wYzaLjx8xIUwLSyjYPZ1uHRi/ruVym2dI6KrafkjATokPunQIlQQ67IAbpS6jQSNM66KS0Z1TyuIXbk7Se9CNxsflJQ0PRWLbVjT6fXuafXWQXxKNvV4Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:57:13 -0700 Message-Id: <59f754de00349434c7335dc80a123f39549056ac.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0054.namprd06.prod.outlook.com (2603:10b6:104:3::12) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58c8f35c-643d-43ab-5e2e-08d60dd8decc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:bipwE8GhqMAvgyklCTxhVhzKhVoSdW5jU8lBB8bH6UQtSrdeKubkkW5BBXEdEDJsvAPLIUrV+vU6D7PETWe8ib6Kan6tgWUXRVhbNJCuOeYrYAH8c5Dck7z9B77M5P/55oCMMub29oMAW/+Wb2rJiyvxfXstjvPQLO53+EOJMazzxkaRr0ODcDAAi4Qo2xSmbiZWqyC18EmjcPA/M2LdQwRv4nBirpnopGofzTY6RVIt8UTVuxHZtkF3jAWEmDQi; 25:9pNnkRq1xbmtcM+S27N5Li+7UhUggfwbRMr1zU8AQTORu0CGiFhfq6aqiInOQEGWudBfOMnOKBLX9ZNvngEsPSx7Rrud1uf38DSSghgFE/DNfqprQngKZWuWQbaCvsaijEaP/BXPiQahSdpK6zAkMu+tJMzZ0X8MBOc+i9TpCZm7WcdT0716/mzYXyGWB90tJI4XTKtKGtQFvDJHswsdnzXtiSvV60PYsW3eV0tIqXeqv+D3mRYxmokQyFXbJGn53pE//UPcRVwwZXHcnkZjy0+iJiD61Y8liRwFE6ZkugsTXDsMwTXK3GKG6OMUkoRFdp1uK2l7oIEbnUntDdCOcg==; 31:Irz3Ccg57+NmOM0VCL6bvtlHqJm0O0Fu+CErkHaFBnxceHjOlZK8fT81YpBd4IYPfP8OhGKM8Fn6sfBQGXUQkShgnrB05r8VAVZBzLEIHbtfIXuKCpj1PuZ+qe34JaWG531oTDcY2OeKmfrZKtrnlCp3GE2fKQ1AOR/UuBv7PKNSD+SHtPW8hhXgrylB8vZfMW2T8Tzs27n8V1Yf4F7OOoM87v+amS/4rz7J3skLZUs= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:wZFD5XrSb3cAP5kmfMLvQItJOv0ndPy3s+7k4l2pMTVXVCD2uB7XpcAR/aO/Js7RjXkMiVg4jAPCPdMQ3h+MBUrKxbtHmpXtMDmETE6zYzYxapQzisU8am3HzjTbY5EohDR0kqnC7ig2OUdV4fLMVnZIJGbZrGFMzffKth1o4JRlkCjDGd4c9GAdGb6fiJnOWLHY3y+a+BJlG6BnYnwAx7r9v8WKADA20Wj+3fBvZYmSwzsAXOKQav+vN7ooCpuvUFRln6E6MBRVgR5+ZErxSmouLFSqtklaG4713TOkE6yB6c9mUrx1hHOYRn7KaFBJYXWC/arLUZaviKgIA1kOHGMsz7Pod5bCQb7532pnKX1899DWXROVHWSeu1nAow9T5h8wocKsogPCCK3VJC2KDWK8kNzSyRA98TbNL/F8KIEtiPheNGHboY84H+ejwRLZqPZ7culGkfjXbqlhPIrcRMiuKZy7tAkJ8LBBv18W4JMRtrKn4QDL7C55q3FJ7IjS; 4:VFFIomHdDyL1baMPnfvfjBR6Zd85P+XRAXqFsDwihIqnv3t7IkTlVTPIRtjqh4PyQD4jXo4EiQOfndzqinU+rTiuP9OlokMc+NqOqYUD3Mo4rdI3ptyWDqQ8SXRV0H4R36xMQCpJxsPPEwrtU8Xwa0QuaWd7JJJQRpvC6C92L6oanq0+XuM0s8St0xlQPUx+PnhNtrTYlYlJhAzyk/MjZukDLnEvGVYaiSbIF5RWZdV4xQc3V45YcH+0zKkuc28Oh+BQV11Hc0uglowEyYquhTVIHmjmPovuTFBK4WANwRU9WAGsU5F0BuwLFdH2U7UQ 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(346002)(376002)(396003)(199004)(189003)(50226002)(486006)(446003)(11346002)(5660300001)(476003)(6506007)(44832011)(2616005)(118296001)(386003)(305945005)(956004)(26005)(105586002)(16526019)(186003)(6666003)(39060400002)(106356001)(97736004)(2906002)(8936002)(6486002)(76176011)(47776003)(316002)(8676002)(478600001)(68736007)(50466002)(25786009)(81166006)(86362001)(16586007)(48376002)(6116002)(6512007)(14444005)(72206003)(7736002)(53936002)(51416003)(4326008)(52116002)(66066001)(3846002)(81156014)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0401; 23:x6Tv0Mo20gU70YuYXz6g4VShay5/Jvzd5O4P4ispr?= =?us-ascii?Q?W8fEjwyeQ8tO5hBVnZ7QRnxA4AQPjhgE2pv4OrR/cf1o7LDRr4r5Jn980PY8?= =?us-ascii?Q?McEtwGObHlQXoqUxTfTMBfW//PenOvXH+AvQsb6DtvIDjmrH1KCJAwuLjZd5?= =?us-ascii?Q?VUFqZpPBZjXYbZXCxfJNEuOTvIFj2X/JttCQBQ2R2lfG0lUidmIx1V2Yx3K5?= =?us-ascii?Q?AFJMH4cn+UFFcpvkXR97tLi67fTqCFi0imH3ANT0tufcGI8gd34FkTYB5jQx?= =?us-ascii?Q?j9q9py1cklgX7v2LkfmsqeaexWr16rUmVVqNgceFccHqVJHT2HqqZBsiDum+?= =?us-ascii?Q?rxlX/ZhBWQobq7yYpwu0Ugx98ChOH1BlbC6jgzFjVEs3Q5ccxc4A8sUeihDs?= =?us-ascii?Q?4PqJ8XauRmHf96uVam3TG3SiujuGUWYr/y3m1xbSt0YZOyMiszRbGt1EjVVO?= =?us-ascii?Q?Ky2dmMcdOGkOgc1G0AttERttZyM0TCZLj4t8GMZTvZWyOuMb+uPVmgRFqIds?= =?us-ascii?Q?07EhngT4ZIqC0lUwUPCpbThzZCeP1o7srNEzV3EUSJIo1AOvWWKCp25m7WCK?= =?us-ascii?Q?alX9cBOoQ1q64UuIFI2WQKQvEtKMTgAYgOgOcdgWmN0wZP9p3OF28bRJD6Ma?= =?us-ascii?Q?ywsQBywu/Bv6U18yeArxDj7PHX2j34oZPS05grG3Ao1W25HI721QmtEwAQfl?= =?us-ascii?Q?FodplhcnMgy4SLQqZy0MP7m1nA36he0sbwVVktJsUsbng6TJ2eoNiA3BytPQ?= =?us-ascii?Q?M3KBgOTcOfzoJTM2SXzmzzBeUx41VnnYWHhkIcdu7ObflOi/nReOuxFfdP8p?= =?us-ascii?Q?i1kLgQIjGLtgNnVlUoDyKHuTFAQnFm/mswzfmflUscvi4g7F+IaHa5D7HL0v?= =?us-ascii?Q?g9JnOH29L82JwYXneFCgY6zxWFsSuYhd6jC4SGeZCr9UQOcCCTuhnmUvi525?= =?us-ascii?Q?piykr2gfZLDt6G6Hknd/Dx9kDVnmHIPj/vrZDCVA4hkh8hynMUJcqu5seSz8?= =?us-ascii?Q?0kCMsyKKnv7SihpiD9XIKQdX3d9tUwjsdWZm2++jt3qQqLjGjZqq/V9lFqCX?= =?us-ascii?Q?FxZ71rCy/mIvSlNR1t5t5FjugmTjyS4kw7L/69n/ZuuUHhqMXWFx3GBB7gWE?= =?us-ascii?Q?CK4D1Jj0qavnGylIrXXZWYjTPK6KMC0NPELqZx8ti/udAV8jK2hByD3YqOJL?= =?us-ascii?Q?4TXhEku1bVBFhSKQbFbgHHTfoV5MVV7m/+JHfKfPr9HG5l6uCkF60z72uVAY?= =?us-ascii?Q?afkb0KPbdpKUe1GKlI=3D?= X-Microsoft-Antispam-Message-Info: S/28pkDdJuOiltSt/uKhJnUzp767ueb2IIC1ZW8FUSFVP95vfYLi9CrLyPQkRpAGKvH7x2uyBnLweM6N0uyWLbT1w0j1yosFC2xOKzhEH0Dto8udpMd7uPomCZ+LqBUpmtms1y7AQVrKrRuURKfD1U04QWx7w8g3rDcZQGawDA7dYNdaPdXN/TdHU80jcs6NuasYgGpSjWlZ6mE/Bhi9687AXES2ZfQ20N7HC/RgSOsH2UuSJy68JUepMgjWN8BV5YpZcUn+cd2hPJnBPEUAyBXnqyUAQhBTgKe6+IWO/v4AwiYi8cj9YGYIhttElAR+bCoQtlYBjeNkRdRO1nk+D/gfA55AOkuMIPv8aQ+sdNw= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:K8xUZtSyQ5/wFBPBQvyp4oxBL2sQ2RqaGPhstRreJ0OJtPe/jljYu6WcHLqk8ykT4Dc+DV2T6jd+FQNDY5JGqsDU8PGEhmGXZQ6g3I7ZOIhIsWhkhCj8STPSSnCCqLI7AxcF+OcbljbsQtGHv4ImJjvYKbHbMGaKnL+MXAVWMegT6SI3iAClbHKuZKBfSW6WCn/1TMuyECJV/NpFNMfZDn5IM8o0b5PcjELHAZJBG5d4e59nTEAyDr81NmmhJgShfHoYfEmRtp7uX7R5E2rGgg9allioEngWV+JYPDVS3unzDODQGTFnWZtU7/9U+uYTNAJ19Ih2wGctEPSs8SS9h1PWG8xzdXcQZIqYlpoDvUa8vKfZQOd3yaZ3x5WTq80p1AOEa4LlcL5T+AY2eXPQqmhAJYgBm7ihDLZHzX514jZoVncwLfc2hvAp8zffv1EXW12cNDgeBVTiy/YZDsO1hg==; 5:lXFathWPVCTyIDRO2tjqhH3SwP9ZStK0/FB6aqvo6eQybKdEX/Oshj3hJsPGskZ+jWLZLypkWj3qrFQFjsXM+/uhTWCaTGH+DIwHj6tXPBqT9AqWquwEvigzQoLm4rz2g4uY+YoM0BH3P4ynkucksMkuMula0W+hM09SRXjaU40=; 7:CgjRfAext2Xp10StknN1gPawLTv0apsVX7DxH26Hd71bhOOw7djVsvT58nBYaWFYHZtgtOs7rvKCQUhTNd26EGsHC6+UmNdaNnXl6zDj8I/4aKP5D6Ql3FvDms9SgYVP86xfckSzzUucHqP17Pj+TPE1ufH9uX9IduCCMHBW0XlUXa44Pw84q6e83i77DPnEUK9VN0xBA0dFd1pWaQ3Uh3OPvuhYo6RsAWdI7y/6Z1omiUp6BgBKbyyh76Pv5Ggu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:57:21.9973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 58c8f35c-643d-43ab-5e2e-08d60dd8decc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v4 6/7] 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/riscv/sifive_u.c | 64 +++++++++++++++++++++++++++++ include/hw/riscv/sifive_u.h | 4 +- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index fcefa68f1e..35e74bebe9 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_XILINX=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index fcefa68f1e..35e74bebe9 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_XILINX=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 59ae1ce24a..9a8dd8eade 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" =20 #include @@ -61,6 +63,7 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] =3D { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] =3D { 0x80000000, 0x0 }, [SIFIVE_U_GEM] =3D { 0x100900FC, 0x2000 }, + [SIFIVE_U_PCIE] =3D { 0x2000000000, 0x4000000 }, }; =20 #define GEM_REVISION 0x10070109 @@ -218,6 +221,32 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0); g_free(nodename); =20 + nodename =3D 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 =3D 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 =3D g_strdup_printf("/soc/uart@%lx", (long)memmap[SIFIVE_U_UART0].base); qemu_fdt_add_subnode(fdt, nodename); @@ -234,6 +263,37 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, g_free(nodename); } =20 +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 =3D 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 =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio =3D 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 =3D sifive_u_memmap; @@ -373,6 +433,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, 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); } =20 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 }; =20 enum { SIFIVE_U_UART0_IRQ =3D 3, SIFIVE_U_UART1_IRQ =3D 4, + SIFIVE_U_PCIE_IRQ =3D 0x20, SIFIVE_U_GEM_IRQ =3D 0x35 }; =20 --=20 2.17.1 From nobody Wed Nov 5 14:41:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535565787391103.46959680945463; Wed, 29 Aug 2018 11:03:07 -0700 (PDT) Received: from localhost ([::1]:44363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4o3-0000cE-9G for importer@patchew.org; Wed, 29 Aug 2018 14:03:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv4ir-0003mb-Cq for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv4im-0004h2-Dh for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:41 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:12756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv4im-0004ge-5n for qemu-devel@nongnu.org; Wed, 29 Aug 2018 13:57:36 -0400 Received: from mail-bn3nam01lp0181.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.181]) by ob1.hgst.iphmx.com with ESMTP; 30 Aug 2018 01:57:35 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 29 Aug 2018 17:57:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1535565457; x=1567101457; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2fjKQBdMHKUsy48qzx3exFCKJwxSOBFz1FXFe3Cgpzs=; b=jLYxiNYTW7TzCN7WpNrB0pY94wAqMYVNSsvm2gsYYVlfPgwdFelidXCC OCfb5vLX/GicavLfVElvFZkQGNaEieuyJuBKu/5Ah3ha4o1E2OE2eL3bM D4Az8kXPNNxvbMx3ft1wS94BCtwWtKf2iXXETwc4a5E1mQRuB4Osf8D9+ /3/19UKfk7y1cMTLzqsLyAbjdGOpDaPDKKxaYFPwyIN+9qNl5imnPm1+e Rd6Jb8YXW/Jh2948wpYj2cXQsNZKJiyKIf8sOZAQtLAIjmoN7DLelfWSG +wX5V6AvF+wXP4yUF82dzvAoB03EVTAooJfs0zVD9V5gJjStuWads+r4a Q==; X-IronPort-AV: E=Sophos;i="5.53,304,1531756800"; d="scan'208";a="88653395" 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=XfWeiPF2deYL/D+Le99lxvxfD4hzo5xJ8cIMde4ubPY=; b=l2ukO5SrmvAEyAqlz8KAKOeBGKybtlADPUGg5SW3d2TwOJUMB3ecdIkW0dPUx8rF/YqAQ3aG/vi3DVGdhxY3i+MHYg7DTIYiJMByDrRx0nM2HVtP723UFePb8u4wNtUTGElWRgIbfntdwT00crr1IZ+5U8S2y+DdH+68utM0W/4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 29 Aug 2018 10:57:25 -0700 Message-Id: <8f2b50188d14e9cc43f5c9a7b34061ffc76c411f.1535565338.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0069.namprd06.prod.outlook.com (2603:10b6:104:3::27) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 723fdd20-b74a-4a05-9db3-08d60dd8e55f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:y8CQ3iUaGJn+Nakd5xDqcbi+ydtZk0E2ASEU//iDr5BsCjGMTbQMGCkL3w468UmCJHHnetOGNW1+5+tZE2x4JeRRuI6yKoBkO6eamorTZ7wODHSG0saoxIJKsTmTYCklOg5DxJim4QAS5eAeiUhmL39zlg1h3UODF9njo8nYwKqqssBRm2m+8M91LA2i5tQp8EgBLccmcTcq1t4EyBktAkv1MhvFOwHu2dXGPWI5DTlbFydBI69Euu2HNXCW4PK5; 25:8Nc5FEKEMtFLh3LdsHqkpcWutsA/LevPTQNVkj7rJ+cPKpdIZvotl+H9uoG2Nk5EHm4kJ46J2TxXmeXzubKRAiKylMekI5jXFkVJHZXcCPRLGECbkgd9HwmUalBsCktgOMyzvjZ5vxknVY+2neLd+JTi7YyKqgGN3HFpMpcxwdvRirNcT77z4N34r4tIcYxNJzSQQkPFJPcad8DSxg18w70ezjmpYRUi4wzwKigmwRDBtm5cG0HR2ln/HF9fScnjP87I68FrgJjH2rBkJKQgo2mAl/G6ERyjGnnwXikdoEjOpuw/d0SHkIc1mcMRvvY4CJUOZwqH2g3dkQENVeNZSw==; 31:oeo5iJVwRYG7NDu3LnQOiYTygWWrPq6JcHhf7KKdd5To9huYSzgCde2iQUU7CxDWBmdSgpEmsdOXIdmMuQpWl0QN8HFstl4XmP7uHcrjJBYmxcRZtHedh7a3yU1ESOIEs6aH5XU5VJf8kha8eyu+/HRT0EbPlZ7w3Q2sMWGzk5ZZ/T5elcYlFV76fqHC++0iG9lr9DbFl5Z0GsHuQ7rx01Um7Yy96yiXz4V8kbS/8Lk= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:rdUQeBH5WAYTzuhrMkexpF2kaL3cluUSVnbMg1Tx0qoaELkCzylGyYEjTTM676XkAJZp2i2AhH1okhArichOb7zYg/v2dzGG1Jcauzqvq3ln+YcJd0z3xGa98Auwa0OEWU0XKfkB4678hdXNyvhmmipZ2X/YlsimqKX79zORYvCdP1Pzn//tpWTleWUrhDp243dEQsajnsJoF+n0nyTKSkKQNTn0zOze4QEfrsf0nLrOwm9i2UZ7rEJVp5vdlvxyFGiK6VQqutdcpZtLUfC75Ezb6FGohaGSEtsi1xS5sdYD4+Py/+96Cmix096UtvdqUO4vXuBL0EV+myYmkVYbHJL2EsJR5WNmxnjAXc58+0XhQhEXyKM9ZtDq+RVo2SsiaIr9QpkJ4hz50iV5oB3K7MHJ4BuCIhZ3ylAcml2P3BOVkeGCy4DMi6SMVqMwDajXGXiZflrjdbbrP+nyD2PevKFYgWwwOVGMQTiGNjWBGlYOa8OC6fh7/gmaGLhEgpLG; 4:xcuOwja/PNfI5VNgq8Vi1QVuVbBMaEDiUOHhjI2Qa2PKoo2n6S0cyeAElmfiIApI0YLyhaBNFYehC085M53T2UVaFfbSiyx6y8JgQct1+pMma8HIbBu9KLkK8DPXw1UxpXhSkoUr0Dl/Rxy1qY2sjkb9miyvEPjrH/TaUemkZzTn4N7sg+jNJ59GBORDDgtr3uK1VNOlp0hkIjp+9iiEKS3FtFhm6zwQReoXJiVg9MZ+JonVzcNcNE51/dy9z/Qzpw5KQnt1Wd+/Ll1yZ4ZcR2KVc9tOP1VkOYkvYco/gkUc1KNGqvR5NfQL/w17fIHU 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(346002)(376002)(396003)(199004)(189003)(50226002)(486006)(446003)(11346002)(5660300001)(476003)(6506007)(44832011)(2616005)(118296001)(386003)(305945005)(956004)(26005)(105586002)(16526019)(186003)(6666003)(39060400002)(106356001)(97736004)(2906002)(8936002)(6486002)(76176011)(47776003)(316002)(8676002)(478600001)(68736007)(50466002)(25786009)(81166006)(86362001)(16586007)(48376002)(6116002)(6512007)(72206003)(7736002)(53936002)(51416003)(4326008)(52116002)(66066001)(3846002)(81156014)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0401; 23:cLY5N20WD5vmf/43NUocdwjpHqjshMu8PbsEh/wbD?= =?us-ascii?Q?/zJ6zSZ1dlNWBqFIxThFeVvI/pUgyjU2efgjVmIEIFu59s+UlTVDuojo6y+O?= =?us-ascii?Q?tg3SaSkScUIj34IFzu0nJsosgqM1smP4we/rjYQ8FKzwDpH0y5f6swy+aNZd?= =?us-ascii?Q?LKHQu3ecsrvrS6C3fkDGc2l9N6VWAmWyXv/Ajig/eeeLcfiAXd/qkdG2vYKe?= =?us-ascii?Q?VKGallm61xG+jilkuSI2pUbGub82ByorD3UNaXw4OtM8NYee78y7IFp3zHSg?= =?us-ascii?Q?wutUa5f5p8tpWnDsg2/LxK/YeolQZPAMtUftJ6C+6anM7l35DaELGazx3D28?= =?us-ascii?Q?SBG4f/p5gXD7LNwWohlT30AEygGmPQWSIIogKOEukHEYBMunBrvdHb7nWpkh?= =?us-ascii?Q?uB1QP7TMDA1UTyXACqp4OFz0+YSmZNd5mLBn2jgAwQ8szCJ+AHF0eng/TwGa?= =?us-ascii?Q?pYXbiPsFeh1lhiqKDILPxrJ1rRei81RRBeriJZhIld8dS9JA6AO1b9+tx1cY?= =?us-ascii?Q?Enxc2J1S8qUnuxUg7cSxYI6XsnMDTnnWEI7NQGBqwE352fSFZMOC8GrvbP5i?= =?us-ascii?Q?SelhDS3DLV73/7Dq90d4egT9HR7PX+aeWqmjWg+EjPTFjqKxTzB6coa9tgrT?= =?us-ascii?Q?CWKUGzHtlqSnKKqNHS0Fb+aiINiSoI22FPmkvY62N2xDkaw01zES93TfUCKN?= =?us-ascii?Q?TLVO/gdYPZ/BTQ/hAPxqGRH3SSMPFzmSCuLSokYFh+a2p99uEIAgBgFQ1xkn?= =?us-ascii?Q?8BjNCKkYYqPdFsCZqwog2iHAhzcKQkAaGQI12HEyr85uFF6UJIUg9fdlYaPS?= =?us-ascii?Q?nL25MNi33sfAb5SbS3NqHEW87PxHs9KLPoV6M1bsrz6t+fUGnhr9IF556nQM?= =?us-ascii?Q?xACoHDGZlF9Gtqo9K8OmLs2wiKvHQDeYvHEC68LLnl7pSjL3HqlWpFUGG2t1?= =?us-ascii?Q?qrB2r0pmST+s1VDJtlUDnJUmRhYjKFUqX4Yt74VqkfQBEwUSoh2V5x5Y0sEk?= =?us-ascii?Q?/DX6+kqtV3mOUyiOYe3JSwILXfG8s8BuWCmiawXt4VGUdKEXmhpfFNBO+Psp?= =?us-ascii?Q?ZWSK6KGYxahZFQzXJHXKltEHmvwwazAKkeKNzSNdSSjYZuzFW0JPeQr3+ZGP?= =?us-ascii?Q?AJvptI/aFVysfAkQemXFSqxW9EDJQ64NdJwfn5kMXkBIjg8d/k0sJCWXHoL2?= =?us-ascii?Q?iSWaPMWV9i6UadWAECiKaRH3Q7z0ojLN/8wseDkStaBx5fQrjUkb4cTAS2LI?= =?us-ascii?Q?CeU+fRe2bpFOugyIr8=3D?= X-Microsoft-Antispam-Message-Info: VhmVjG9jcey8n3ITRsiAWKIWU3b8OO3Jhq/sW8XVtJUe58oxgAfhNzMzs7dkayDgXl9FxIf/aFzsLYL+vSTl9mdT/yeX8eX5OcALgLfxnGcjaADAnUaCg+8SMpkNBEMbaqL4Iei3QfYJrGe2DB9xT9fDIQ9XrDjUFIa4ONXmWFrDWRahCPw4ElaX+v+XYNHQWjnSxtDxL9CPwDyOwxfrpWmHxwALALDXmt5cjVkeAonvbi+GZh4cw6FUnf7iOK6yzwJC1P5jx93tMg8SWtctljp9QWAtjXTs8JlKWeLIIYRmWggIu2kuZGkf8tDH+FiMH/EzSs6GxyNim1l0B2HITNTjpP+KHZeM/w+ZlKGzIlI= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:cN307S9N/ppEkchjR7VHULEuoWh6B3ElYFo75PYPWvXIB1HBYld0rcOmtNwMSg7fJHJ+z/NHVfOccTYwS6nPv+6v+AxMETIjWBh6Agiw3HT1sIYW9LXWFiy31cfwIqm/wO6QPKG1DED72S4CeNiMd+6DcVvg/IKrtNb/Kr4/8MpYLhD5D3xDIETesE+l1DNl9zy8veNXJJPAni1R94558s+NJNveyGnnW4NnwJ7O/Lh+g1GV078/sMsvtJT9S1PTvGtLNU5q+L0OHB/85kbNWiEwelZKQMDNS3VFnIlJhfNM1HrxJLvm+Sc1BP5EQje2LU6JexP0IaNZ5R2KWK5lOfZ+3g6FOadu5CG2Ry3IS3+e1sx0tp7F8ooUmiEbbuEiBtYj4ORjwyJaK2ndfMfVPKIBxGw/scq/E0iRC2mPWpnEw0Xb3YqW4XOg70eeZfF8Vv8AyYF0OaBaO1Gf6ZTuTA==; 5:ca2TFtYgh97hSimyuEqZTMq2xvbQit9eUbLt+Po+FC0Nhe1aMEhFuW5OrqbAxatt/LMQxsuVGvEJv4pTZARgwfmmIvaRvgC3CYEQKw6nw08hAj5ylb+FAUHUOcBc5L6pOO5kcTl7Yiw8v8Ks9i7ILllrAUe140VsByqhW1QBPds=; 7:p3fcyyXmrxZ508wCTyz70QyOqLmxLoZrUylI0VFCGE8DnDDhlbgSU/e5nxjg4UdPIhPKxqhcgawUYDgXSusXS6+5Gtns9AzL2107psrnWFCdWutsxINs0YHrs6YGJ6L/OXOeHVUX3XPCVm+k4SE24XJBq+VFX2ZsYoczP/btID8o3+K3p/Qt1PSfK6MmiUkm7ONZNR55Apd0BqHao7pbcHuYWDSECk/gaGzQJzQxz+of2Y5HlBXclnqgPDCcTB83 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 17:57:33.0443 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 723fdd20-b74a-4a05-9db3-08d60dd8e55f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH v4 7/7] 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/riscv/virt.c | 20 +++++++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 35e74bebe9..6e19fdc935 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=3Dy CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy CONFIG_PCI_XILINX=3Dy +CONFIG_VIRTIO_PCI=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 35e74bebe9..6e19fdc935 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=3Dy CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy CONFIG_PCI_XILINX=3Dy +CONFIG_VIRTIO_PCI=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d360d66e42..faca8e3d42 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" @@ -322,6 +323,8 @@ static void riscv_virt_board_init(MachineState *machine) MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + DeviceState *dev; + PCIBus *pci_bus; char *plic_hart_config; size_t plic_hart_config_len; int i; @@ -436,9 +439,20 @@ static void riscv_virt_board_init(MachineState *machin= e) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } =20 - gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, - memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, - qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true); + dev =3D gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, + memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true= ); + pci_bus =3D PCI_HOST_BRIDGE(dev)->bus; + + for (i =3D 0; i < nb_nics; i++) { + NICInfo *nd =3D &nd_table[i]; + + if (!nd->model) { + nd->model =3D g_strdup("virtio"); + } + + pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); + } =20 serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, --=20 2.17.1