From nobody Sat May 4 00:35:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zoho.com; dkim=fail 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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149186822713073.92857837890188; Mon, 10 Apr 2017 16:50:27 -0700 (PDT) Received: from localhost ([::1]:36491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj4k-0004TC-7Y for importer@patchew.org; Mon, 10 Apr 2017 19:50:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj0y-0001dc-Mi for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxj0v-0002UB-Ie for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:32 -0400 Received: from mail-dm3nam03on0059.outbound.protection.outlook.com ([104.47.41.59]:19907 helo=NAM03-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxj0v-0002Td-9b for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:29 -0400 Received: from BY2PR02CA0033.namprd02.prod.outlook.com (10.141.216.23) by BLUPR02MB1187.namprd02.prod.outlook.com (10.163.80.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 23:46:25 +0000 Received: from BL2NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by BY2PR02CA0033.outlook.office365.com (2a01:111:e400:2c40::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 23:46:25 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT038.mail.protection.outlook.com (10.152.77.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 23:46:24 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35367 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0q-0001GL-BP; Mon, 10 Apr 2017 16:46:24 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxj0q-0000VX-8Z; Mon, 10 Apr 2017 16:46:24 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3ANkDkB001547; Mon, 10 Apr 2017 16:46:13 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0d-0000Sz-V0; Mon, 10 Apr 2017 16:46:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=r9gunxYQxOhd8po0Ur0Fv9uqjNHEQ9bPzm1MpNJ3lq8=; b=oo8K50GGvGUjFLk8atiQTM2TxkF3hLWi7YDqG++PtBpggSnSQLbaCwNHHhJyy+lgT7BlcVHgohGVZnxMxKWmXbS3+SzY7nHGalE6OM7g7/C6E1gXYNjfpV3coepw5Kf6M41VCAsVFT7HO7L5Ywb1uY/wv6HhFQu80ycECh42BWM= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; amsat.org; dkim=none (message not signed) header.d=none;amsat.org; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: , Date: Mon, 10 Apr 2017 16:43:44 -0700 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39840400002)(39860400002)(39450400003)(39850400002)(39400400002)(39410400002)(2980300002)(438002)(199003)(189002)(9170700003)(2870700001)(54906002)(9786002)(36756003)(6666003)(47776003)(5820100001)(38730400002)(2950100002)(50466002)(77096006)(5660300001)(305945005)(50226002)(36386004)(2906002)(50986999)(76176999)(8936002)(118296001)(39060400002)(356003)(8676002)(81166006)(33646002)(106466001)(189998001)(4326008)(23676002)(63266004)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1187; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; MLV:ovrnspm; A:1; MX:1; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT038; 1:3Bfol77f0odb7yC8c777W/oplFg9CZkoNrdeQwrSFcBXKI9bWIVy7D4Abdh9pTC31fcG5hRZYbNjtBvt5OrTKxJ0c0HalTa69mO++RloRJ+Qdm4xWUgQ5lEmd3MfzHtjlbc1Hheo3ymOabpTdPManqvyxZIYikoaVAOHLlE6JAcA057QjjnSjGILGnFyfqax26CupPxmv8fQ1X6bw8dZwnWeguBOS2LMmKRebuCJ70mIpLTlZ2Jt2YdABTGRcJDckDV0feHmUyRVETLd3+zh52SePxZtU9qtsEHlpsk0qyvVAqs0o+zgasMA9wuhAAnIyPQKCwtXyTl9Syzwt9efBpXvUxYRAvYNoxexQC7uZcmy3k8/bJTfdG6828fUuK7dTRzjX+dPN7pJL7Mz16rMCXi58Ra2KduHuISmF0pU/vXioB3Ul9uyk9RvPA6O9MWV8hQbgJpjd4yZZ0QwPAIvP5+hZTYIdwT5nllJrXXsvPQpMt1oNcVsFVaTmhT3nCskVg3U35lzfkzrhZN3JpObuJD/DXUuE6SARTSCDON9guBK378OZ2mQiW6hEnK3Y/4ZXz402etNtL/0paXVXofIFfW7KaBi/tDbBx93Dn7W0Hg= X-MS-Office365-Filtering-Correlation-Id: 1b099c44-0be5-4f2e-6156-08d4806bccb5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR02MB1187; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 3:qDA3DXmIFxE4F6QqNpn/74WNkpdZFVYTO0lcCSxXgqjiIHTiZVS3bEGImVKSItpLHmQdzd52uQAUcWKEVHaeIXKpJHwtAgiYIKVcRT04fgZZO7vcPeCC1OPndoLRks7deA1JZmVhipI88qtmNDPbiNIKAzqjWMTV5kvV0QNmATZSqCvl0ZzJ8wBiq9HuHsasRM45IOBZD+KtCTzS5fD/Vlt6fhSvJAeTFxLirENopOC4ZKu/A5aME+i1RBaG4IhazPMRbK0mgIqSZRSln6m2rpwqO7iaLCeJ6FpXD4K2uFLjV97IQ653oQsPPP8ccNQBvPZLGKwauzKmjexuq5XktWqT/QUy4BY+u6s50toWoHU0UOQitQWHXVJtrn3uw4IhdjyMhg63i9R/EfGui6jjVxuXePDKfE3LThaC9kNjkD8S66Ageb6bBS9EZjRef6FATZhsA2B5yRQvvJ2hokZKxZFND7lHXeD/OiGhbPRTpwxOByhomo/ZsiUXJmomKFlCMWaE7vw1F+HPSrPeP74kIA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 25:FJSYH06129Q8nVbH3ON7yfRA4HtFGhtMBulUcmpeYkECUS/Q4rMFgNtWvejG6/71PWChC5kPXdnoNGv7GLVq8LL0TioiC160IIg/doY6QA8AwWKlUJj2dbt2BBhYUrJC6jZnXDMzSg58eNsEHPNLh3TJQG5xmdSwvv3iQoArO+psTyQ52E9O+snjn99t8tw7yoMLyWM99lQ5o2hVZRCd3c3DLDJNDUSetRd5+GdpzeiScGbS4m15xZ3Jru4tDz51GQic1YPGAIq5Q346efvOrHml1ZKPokN7Hvm/x9CXY6nPhJs8UgcyBZDnP+J/MxEhnxPHJRM8Qb/HdNSusSZ/L2fwidU60uRddFzoE1+7CPTqcn/ZxhgF4VNLLbwaWtSfht90CkBU2Kq282IuLqp7FNqlljj674BYD6ckuPAISum9i0VKBfF8qCvx+FKcfs/bVyEq6fBC4SnwsdRKSTfn/g==; 31:GsBRqQLW2Lg4vBm9UUE3KLauhb/XajgKtCu5R7eR5eQEBIupgjBNekskxX/Jy4IwS/JywEAb3pDo3E2cvoRkijXEeWXsYqkuK8okMZO1zb1jEtDDMiEFUPHUFOedq+1+1Wkv01DIDZCHssJQLNBMOpqR/PkQs7JMyOtbZqp4DV/bAo6hYyOkfrdtMe4FjC4/5hNfJPnG8HDizx2cWsYmdj2/eRMbPS8qvIWNfIRNTFOidJyy4FKwZGCP9yTEHxwx0YMjp9IGAmIPm63Y7XPmtXpAx8YVg8AEPMaMq6L2nj8= X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 20:9pTJE9YhnKCuFcQt/pWssjP0OTFq5iQO3B6a17liO1WXNl6OtGh02O0Uk8YV3Nd7uZvgsyjSFlAOhKwWEBjojD0eGSJ2HlNOlwidlCtF05CglU73wEukQUXPvbvUQqmbxzIpPqsx/cOI/T80NZL+VjivRHHBLRJ/DFeDdAyuJeW/xmW0eECCgCNld4lX5F3Qw8abIqehF4yGr8FkWsyX74d/otaFGWrs6Tjgnc5MshCzVTMBeIcmPzhLJyB5soV45IlCVldwsE9mVfQOC4PVNXDQDJazBxWQ2PASO8H7WBV5QrOmWkzIKICIq5teaD1guA0pmOY/yYQGH1k02iivk8kaZjcIqzGpLE+J0j7CIrBvJ3sHqgKbAbozV3/RxslkeLBv89NtfPOD/7Yyw7e0I2zVhMGcIqzKRd0Tx4Uyn05S5zQWAJOdAT3hEWjY408vmsK+6jw++R0f7O3DjGaKeABzmD7JVrB3JjsrvRs8g2zGCFEoeU0tqVAaUgwtCPAE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(13015025)(5005006)(13017025)(13018025)(13024025)(13023025)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(6072148); SRVR:BLUPR02MB1187; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB1187; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 4:TcQjSQpAPWoRDOQb+diZse+QhRWT9LRXDgXXooQL7l0Cd2Z2N9kCP313QADqw7jLFhxZPevSjvLr9wfp+4zRsWfjFZupAqz+RbpMwP6+hlCP+7NE/xXyvUfjDdhP/zysgc58ZQrmYD9DMClk8gRvqdOsxf4cfsqCmXfHfjoBxuxpXGFbMbDgpoOJiqLmVkWStZnSg2N476dKfmbo1zu8bcwSA+Il7hxPXJdxemuI6wQtigyoeUbEZDcvJIwfxfMfh/y4JGMjYX99GlEx3f256n2hvBdP+YTOSrJQ+zaC6E+joc2YeMq+mj+il/fYOnp86iWcQSNu7PhD0uVnbC0wAUCuVPaj5iCa7j3evGCmNSYtsGWCRRbvDKRrLgaYs/6aYMMrbWEoLTrgOKJWEiTlFQpNr8OwpGG1UGF2WiNQyxEH4FBHpbRGnCVNcIE0DhHzvbzcwNTSnq7FXX3gpEyiY87yGoHpCAbKThL9s0B0z79FjLpvRpIIvNB82M1KaIGCDi1wcKonA5yLGdWIkffnZxMn4NqKjTuIik+Uyg0duzRsAygWIoBxbQpFXg4hekvR5cnNOREML1UGtPp5/ljkI85hkSkdaWlgCiPecV+ejoVktxxgzDx3g00B0yXFr7k1R5rQL8IgqZloXRV5/CyQ92ZM/X8YDqdmjSfvcjZBl7RsQGM0cZ6wC5BrZmiBIsdbX75/EqZLMa1Yz+cSZ6/s3k7NYYYrTR2jt3XGhdDrmbht4b9ADH9CP6LVbF+66xw9RikY7msefyUXKfX2q5oUmCSChdYhbX3HoEiVL9M0OH3WRidIYRC0CMnlXXqpGE7ozgY2GryFRuinVKqnqDlSiva66/T1fxMRO6mKAjTeXpDTWyYthp2yaZNO1o6jQnmR X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1187; 23:55q7llcdZC2GNlOo9TepVDKdIJeohn5kvLr6qhiFz?= =?us-ascii?Q?erGhse57pm/eMvzeFm4TlR8gFCVpd+aO91b4WRt1mB5blUfC8elTtCo7e9D6?= =?us-ascii?Q?Q3n1XOA4FfzJx/z1G1yMybJ0sA2tny7gcRByMBGkPgugn42ZBn0RQMngOLyR?= =?us-ascii?Q?0EPE0UWOOu+NPJoS8fCf1BfL0zbDFPtAJuAeKz8iVrTewqVdUtFbmvorUDzj?= =?us-ascii?Q?KPa/l3uSgqFIDwBHgqG5Iv4ToSm04+KKSgVcyrkdDqNrtG7mgLtumXkLbCJ4?= =?us-ascii?Q?RCk+4UDTbYqBsHOTCofjsdmH30OQfNKuvZJQiRlDDGQqElJ5cxVvDXOJ+xC5?= =?us-ascii?Q?7K6fRQ2t2Vnl/fDoX7tsOZNV/LIWhi2saGK3GztCUZTIxswUnKoD+HzD17IE?= =?us-ascii?Q?LN08MKkylyIQuaTduV0f4FXEDiTfaOZnpGgBOfOJsLG3Meo7eCsrfydLxVLu?= =?us-ascii?Q?eNJBTq65fMYN/bmd1sHcYFQOk7C9GBSy49jvwaa0PJm9EF7FaNzX+SHaMREp?= =?us-ascii?Q?UCA0XYTdxxV19xAMf47ME3K5czDmNq7Xa7VfKz6vvKcgcfEmqf6CGrg3xkGV?= =?us-ascii?Q?PbHg3Dk3v/cvIqUhcK4HTTrLdnzlLaQeP6Vw4Lw3d/7Fr61twEMuytz+jOyQ?= =?us-ascii?Q?X8KPI/UJ1NuMeaErPdbqAPBUliFCRdnC6iTa0NEn4kS61MLoZLyG3pOismT7?= =?us-ascii?Q?KyvMY7PzIRaLczToTluTZBYSeu8h7cQkdO0o7tiMLAgQ0dONOuWPic3TyiOo?= =?us-ascii?Q?AE2am+aqGfwjTrgIneeYXAqwjfeylbPYvS1m31Rq3hSkMNM2O7qObOLROqWj?= =?us-ascii?Q?t63qekSzqZ5EsKQMgIoBLk1KSt3SRf7bRkfqdFFk2NuGMf1dGaCtDYtdiGiK?= =?us-ascii?Q?fQ5ADiNWoU+sd4ReqTW3TlHrY38prEbkJe4uAm05CUs9GvTlAGhxoi1fNYEl?= =?us-ascii?Q?q1p1cGHcRnWjx7zyQNGct3oX3SlUy3evxI7g4ALcnTggWae+RVecCNKNXx81?= =?us-ascii?Q?BkgY5ACngKRDdrQBK2YLwKk7e/ER/PW5lAFI7xBb/o+oNG2berUeOS6b/Sp6?= =?us-ascii?Q?O1rnSQyS6ud3tChLfUX9I3gEy2wz/oN7gStP/cg8WltGR8/3Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 6:CKBopFfxZfUib+EQYrd981noZTIBumTxAkl7eh+Mgs3D13I5FASjDE++Kg/aIsx2F7SlVPwaL6xLYJOWHVuOGLRfcfzgbZR33WlNH+tNPIeQ0Fng2NAOTBEqY0OMfYRXeJxdHo1Unhk13Y+52QUtSe38bTLozO8Xz3EsONCfiCtUEk2iT2woBeqV9owFxA84b54UamG29jRV3hE51Bvhj7uSK+gghk4upp4uwOAEHBOEiraEbZFSEtgGgrFGXwT8ILlg3v87W6bIhxRassd5qyA6bkJxiMSWgA1of00UYM46nZU/n5h3ngJM/oA9oxh9FAipWP0y94ccBKhEXFOrLJxZo3G3evLQyCmOugakrRkcMw6JnmZakD1dgmKrbISyTOoqriEnf1+xlM9l5qZ1qM6nefzgPuAZmUweLZsvNsrAuA8/0O/wNXjI+IBkiqex3RNQ03jVofjvccLXC+B7wwr11XlzMGy2TO4t/nJ3Pws=; 5:cVsCMzp9//SVl58Zoymz+i2TzVdf9TZEuZxrOq0TdrXDqo4ByxVLpiyyIwk7xsZdCeHkjNwqR+tgQCJ7ws0DDIaMRDHoBD4k/csjX7S1Wshb4E8MPPbUlprxkbOLO34D2+MXYJrFsitLwRX5rBm+4Fz8kW8VAr8pDzltRWvMuoA=; 24:GHDf015uC00ARbWRL0vCAGNd4/HjqAz9n86YruytkAVxSgCQMPfBWhuprn3s6APt37ibfsYv35MCJHUohznI0jOr9nPWBbfI11QnjW1Nbow= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1187; 7:yUQRV8jD+PZo0LD2zM8FQiTU7KuPod4x2UsVbE/HbaPzbXFO1x6hvuLKc6SMFm7LuJdsK8bYy62a/+4RHYHo2lLFfZ2DxEWaoRPdcZniLSbZzoZrDLWh+3blGb25ZkvFS2+Q8cge/20imhLH61eiFD+1/6vHcHAQQ5Cc+1pOwM5NammGz3XV3lumQzVEHLqnp0WcTaHmU4NbCF7vhS9lWqAfOBH8cnl7iC5SCHbaq3G2wuz4WKmwMHvS1UN2+IiqSle4GHlS525k3/VXLgs44TiJYLRMqA7fyJ2BncmQWdy6ZVkY+pFPi0qg83zjtpJKyy9JbGwejFdq/65E5cPoIA== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 23:46:24.8502 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB1187 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.59 Subject: [Qemu-devel] [PATCH v2 1/5] cadence_gem: Read the correct queue descriptor 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, f4bug@amsat.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Read the correct descriptor instead of hardcoding the first (q=3D0). Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/net/cadence_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index d4de8ad..17c229d 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -790,8 +790,8 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q) { DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr[q]); /* read current descriptor */ - cpu_physical_memory_read(s->rx_desc_addr[0], - (uint8_t *)s->rx_desc[0], sizeof(s->rx_desc[0= ])); + cpu_physical_memory_read(s->rx_desc_addr[q], + (uint8_t *)s->rx_desc[q], sizeof(s->rx_desc[q= ])); =20 /* Descriptor owned by software ? */ if (rx_desc_get_ownership(s->rx_desc[q]) =3D=3D 1) { --=20 2.9.3 From nobody Sat May 4 00:35:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zoho.com; dkim=fail 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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491868106625574.5943785822715; Mon, 10 Apr 2017 16:48:26 -0700 (PDT) Received: from localhost ([::1]:36479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj2n-0002r5-El for importer@patchew.org; Mon, 10 Apr 2017 19:48:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj0y-0001dU-Dz for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxj0v-0002U4-5s for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:32 -0400 Received: from mail-by2nam03on0083.outbound.protection.outlook.com ([104.47.42.83]:40224 helo=NAM03-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxj0u-0002TJ-RI for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:29 -0400 Received: from CY1PR0201CA0032.namprd02.prod.outlook.com (10.163.30.170) by BN1PR0201MB0721.namprd02.prod.outlook.com (10.160.169.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Mon, 10 Apr 2017 23:46:25 +0000 Received: from BL2NAM02FT032.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::205) by CY1PR0201CA0032.outlook.office365.com (2a01:111:e400:58b9::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 23:46:25 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT032.mail.protection.outlook.com (10.152.77.169) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 23:46:25 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0q-0006A1-Ap; Mon, 10 Apr 2017 16:46:24 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxj0q-0000VX-6m; Mon, 10 Apr 2017 16:46:24 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3ANkElB001571; Mon, 10 Apr 2017 16:46:14 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0g-0000Tf-Ct; Mon, 10 Apr 2017 16:46:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=c9QGBfbiGhZFBTmtxmqGMz1NjRlteuN8V2w2KvA8F7M=; b=GmwNUVdgPJf3nSrR8miA/4wHywglyDVoMYGwHRZNDRx6XdSSxQ8UFXayubFMHfNjLPF/zHR2RcZl2YilH2/kY9hYu34GtyWyrXNtZODLW5VnDugwWX7qjHTFJmLnoonvr082h86WZ+f7tXPHXeelcXIX4LpkyHdXbpuqO6r92AY= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; amsat.org; dkim=none (message not signed) header.d=none;amsat.org; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Alistair Francis To: , Date: Mon, 10 Apr 2017 16:43:46 -0700 Message-ID: <9de95c8340d929759282037a301fc69e77a97f5b.1491865973.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39840400002)(39450400003)(39400400002)(39850400002)(39410400002)(39860400002)(2980300002)(438002)(189002)(199003)(9170700003)(8936002)(63266004)(50226002)(76176999)(36386004)(50986999)(48376002)(36756003)(50466002)(33646002)(81166006)(8676002)(106466001)(54906002)(2950100002)(118296001)(47776003)(4326008)(39060400002)(38730400002)(77096006)(6666003)(9786002)(5660300001)(305945005)(356003)(189998001)(2906002)(5003940100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0201MB0721; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-83.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT032; 1:QezLCSKBlzQsMzbLzuV0WK7rCz3erqEHBFSjVZPLJKc3l1RdyjJ1nGclH8ecqGMLNBNduUifGRIBS6BwearZZ5I5QaK6WTR7A61WtIqB0nHbc4hxbUtsC77B/+nUxWb9EjkcSmev9csyOmuZO7dqHqwHb1QEYlxl4uiRI4SQm8v603rzFdjPeogzyI0OxtXGMO15tVH4vOozjN+VFjQPWfUbwDdo3C9jcLS9AiWkPzOCXDgBX0+UV3+DLdc8ZcQMnVWQRP5iRHMc+0if7n6ilmQo10B+9OA9z2vtphuT+q46QZKnEdwLJOzhy5Yqptsqeg/EIgd3PLMihk23qO6Xc9HE7S8nslxEF28vgTd0JTE93mgrjpSAIn0KCfeyjx41tK8jD0JEcVKlQCEH2vswkZZ0hrQFGsuA1NdJHvdgcHRW6AeUELmSrWOZa6jgkdTsUi8mSjd2ZIFuf2qHurOUyCiU33+w/mNmPmal68BJOCVXsqDilDZ4PA337zJBtVjsdSATwmEWAAP10ouMMacpvCY4P/i8jvMcQeY36zVVoMRWOpPKv68kFWi9ETgIpqNx1tYvMm7imehe8ClaEh69evF4fD1zXbBMC5361zeOHTA= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3354801e-b574-48e3-19bf-08d4806bccd8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:BN1PR0201MB0721; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 3:qWekdOKKfYOh7zX33goftzCxzUyEOs95CcQ6RnuLgKl/TzQQah0UTQ/2GHfNbPI3+aX0cz6WiIiHIhPnV5twmPzJn959tF8DjWEuwEKQfxnCMa7slWi8iok1/sX1xI5DMJgZx2rhtn9j20Ny+kReNN9GPhBrinulalrlNYsq7bex6lFn3ebiWHzZhQBOkQzszfaEVCtIsw/ekp4p+1CtFgkhLvQdnaam716nIAEQqaXIfYL4iZP7xU6Hv4CTwlDuWmaeEaGfKOnEtpa/MpcXKgoxWzfpBKQc9IrsLhEZIeG264D1M3fmuvDfdf1ConfHa4mjrI16XqTP9lI6YmYUf0/IUCnPNIoHJUkFvSTaeSAnN8Lh8ilBDrxxFAcFpg63LtqncRW/aE59a49sCpjZ00cjOiSnMjyECYNlUJR/WbSAPjWniS3eWQQl57zftM7pn2u9ku7S2LE3UKK0FR+jzxi9wAmLBWMgGxH9pDtq1XpppDhvnEcEVLqmvMI9sxoi X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 25:Hie5luhi8upnnOC/fVUSs1idCMBWHtYAk6jWRmagjH8jKNZ+UQNu/9Qj8+tkTKIeAWxal2uNLSaFG5UuW+zrSFlmpGZdhj8kqo0M1IpkHeNGQwO+ol+jIGOShJaneXxko8Dt7pM6bm/Ot22JolFtXV73y2iRr3chVQ4SbLC+MT1QfPoLKkyiKPKAR/iNQglqZ/1VwSTEFfKqINNVKSocR3Sr8BEXqpxYibCz/LZEwsTDvl1KUig8GymbltIORNQ9vLEUipdVjL1pGx5C055Fl1SCZqn1YliCB5kstaJ4Bay/0lPndjNXCsQEbTrMqJ+su5FJeuVypiyc134hJCm2NueLGs4hkFuJHJ7wwxc8wxihEHUvIGRlQ5Va/uRmrs8yp/xvWwHcjoQoaqvKgetk1JMo00j0j5ztXWV1ANOi+a2ao0JuRdxYaFBzKYayQXg1X1PedFy8fMhBct2HFMeg/A==; 31:fxO/hT5DacehYMIWOSmNIfS4wtEcfyMrNh30g+PP8+MYphlVOWpzq+goVAIiIh76TlfVVundStsgtu7slHL5I1dhL+d5WcobU1T5YIfP2f8n0j71TfO/qSKJKo8WZ2Fyjp1uXODtjIgLfGJLz+x0ynH2iXbJpf6tBdcqx354uVmlHOMwqp0gS9AqTW7uiudiJ7zES4X2ywvYQfnEdNRRgB5tFqpbuojZ3CP+h7jGbX8vPIToMhcI0m0u4mNdmaP9PMPzPVBdPkldQDQVjfWrMQ== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 20:YTg5pCwrFPtBIkxlNSi2fTsykulRN7C8IMXBuJHBQzEne5CK+sW6uIuwOnIy/XSL3if+Cwg1S4VQ1f+P9cLhD8l31pKxsow1XyuD3Qtti71arQM0Cb85qKQSD3g4iBUAeDEuhprBqGrJW9KWZTeAgM9wV5q720V2O775ojWwUok44EoxQZTV9hzk4eiUNftXz3bV9YSIEYjH9qJN4EmPi4kfqXpP1t1J17An/9xQSOuj+sytPz0NAtoW22LzwapYK7Z6wHfREmwK7QL844bfqEPY1KfSP2NhUTj8r20ID6W6CyWF+MUtiWAcPcAgA3RnN1GYm7SGlvtqHLCJGxXZxKOB0Pv+lxAh/XQO4MY0jY2D23mbpJnWgwqSAMBkpLmN2fi1OADlcOpvNsYdxHUM7E2z4jhDAu2F9WKKmnIFEQg4yCDXabDqRTqD8kvGtHJNuTb0VJ3opgbAvsQ1/xWP+CXn74wlbmAt/fS0j9aiCrk5Vsj2ie9V9Tz/Nhmn09IC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(13015025)(13017025)(13023025)(13018025)(13024025)(3002001)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123555025)(20161123562025)(6072148); SRVR:BN1PR0201MB0721; BCL:0; PCL:0; RULEID:; SRVR:BN1PR0201MB0721; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 4:kIjvMce0vkxTVcl7npFOQoRMzku4IdMryQTtMzNSvtWG1t/nmfqKt36iUNNU0z2M25k1KWNpUSNtuLVbdRC2nUle2z2WHHFBCQMRLHsA1K4AdghxKnbotitYDFoIxnEv3G4XtzurNKlhrRutVA1umOr6K7+dxvVlbzkxFLgkcxbkWpwSBBRKC+Uw0JHipSQjviynMr96TuwFAso4r/h50Z7u+MrjiFC7adltuwT1JzP4Am0rtxFtq70bD4G//Yd9A8eY09tB+KBDas+ROa/SqylUSVST3o8bevsO1Ta5gBVaXV1yXzJEsflFHh5DsIk1FG3MSqL8xgthiVJ19WG25KW1Sho3GcJj9IICdbARPLwVK0XzjXeQjYXfsTEt+47+Uh5dXcNo93xgZWXQHN7qf+jASegAt6IizMCfIqT6wzpb3Rd3MpwHEwXGZVFvV8bHmLhkqeMR43U48bufDwGuiHEcsjFy6Zo2djX/rtUE8dWbM7QPtqM+bKLIiaWQXRo/Pk8laALGGu2P+STqC+bbIxrQ/kth2vJe10U6OgoXHVwPYWd4izvWjiIrqghNkdi3Q/tNlFJuuQtJejxep5/aM1OmHJhMOhbEI6yIqH2Kud8+WLf0QIQIrM3fe7BypgyEMLKchhMbjZrOqbQydWJA0GYaNCGLKdvt9UyzjeJKSTLl/Sul6l0AsyUUun1Q9X4CwahU2m/OBfA8kYU9dzmiXU0h6fJY7wqRxY3Q34mQa2R2Ex1xzT6w4WXQvyyxLcQiUNwDiZjrEeOjNVnUkFv5j6JdqUdU2mNYZstxeeYOawGScwf7+2SvgLWDMWvwEqt2/HeEMymwc1KAeoiKHUYuk4D43gBzi9gnzuTQbWoJXiQZNLaiIkVoCou/PzCJq/On X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0201MB0721; 23:p2JPNO9z3rUG+4H5+qhsElcvIFn4cxoIWdZdpNF?= =?us-ascii?Q?MElJJA7bZJSulsOCa6JFdp582RdPA0iek5MxDRQFhv06ddCs7XXeFxmqTwd8?= =?us-ascii?Q?ADaHRtNcqIZyjbo3UxWbEqA1WZ/8gP64moW+LX4R/Q14CT02B93+lkkfqudE?= =?us-ascii?Q?9QWR1wVBBs/7E5VgwqnzysEPO/DZpv4zg0tIeSh2qp2sWmlzD4s6j2IuyZFt?= =?us-ascii?Q?M93MapxF5eAGft7S/dlUiQ3FdnD7csb4HOL1ZkPY0BOrKSy164PO7JPDsJVZ?= =?us-ascii?Q?I+lIEkP6Z2wO+wcQYrRsbyoSqH8o5cwmOuRQkQ3cRhI8SlfKXyD09UAgm8aB?= =?us-ascii?Q?a6K65eDpU+o7vuDCyScLeG8WjysDVicNHU3R8S0EUx8nExgokIt2Pb3MJv9x?= =?us-ascii?Q?wq6u5Fa1yhINYsFsyZm5p3kSQRBNRZmnI1vBQoSTzGrgKqvqKt09oK6iBVH2?= =?us-ascii?Q?465z9neBIENztJ9+ZUEWi2alE6Ptsf7fh+ZFZevnjOat9iTRObENRn7vjpk7?= =?us-ascii?Q?8LOqW9YXVzJWZMlkc3XcA5XVeRRz6D3fDhfMTFHojoMfLJKmhi5hbRH9tFT+?= =?us-ascii?Q?LnUZUzMBiyHuDVm0ShvXvxvtUNr43NXK2naV2TObi1zBqjY2g1GTSB8vboE7?= =?us-ascii?Q?b6uiSZPcAVU6dcrwpWe1kmj3rujq0VqVAi0jPPePuBnI4nfSD87QvzdIkfc8?= =?us-ascii?Q?mlR4TmK9sIE3zIxjwMp2PeeUDnzZ/nTdmhXAzhLwAMmTXwlNjPVzOjXfXI3P?= =?us-ascii?Q?uTUbGnm2mPHj9AzSO7K9iOSBrL2KEUfNX37hlLMN1T/MQifjrxSFRZPwwXo3?= =?us-ascii?Q?Ne6lbPH8POP76cQtmeBsavC4vgBYbmuLsCgHmcY86iZSLEQ4sHdgJkQQDlSC?= =?us-ascii?Q?lFVAlc4AIjXH6XmrmeS4XaTBMQEcmd8cPFDirZh64Au5e8yQYbe92JWrLHAv?= =?us-ascii?Q?0npeqori2qRLVS6n0AnylYk3axIZbwKPpsQO/1tp1BgE+OEjZRsfpk1H95H8?= =?us-ascii?Q?7S8D1PI3oswxnqtxqiLwVnM7M2wRw0OTVAqqpvEAXLXoKR9HF3D+Icfb1O6a?= =?us-ascii?Q?8LbetMnY0lJMd/K/YPhUkjagY0P5j?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 6:IHhFjBQ1YEVaPyU0V+kqZB5URqxotQyf6rqjCsL77txM966Ad34FkBtbibQSoLhOSnD52wVrYYm1wBUiSyVO7GkJmRMYNig1FgDXqUfH6hNwkqyzp+umGaOsBTCQsiQIsLZQvQkgDOQc1TjopNNJXtKLs1OIe+GPAVtnIpep+GGW4xDtsqsF1I03RxvlMb2AT+3Ih67Clb+f1CKtRXokUY1BW8qRLvqflG4HpxauusM5/wvBxpkYVCqtYXpI9TFQf/4acarnfK2h9s9B+Odq5Uga90+Is2DaTr7RkKQXSMAgT48S4A08mnaEs0I1Myh/aJWfHJMXDR4DIVvXqEaSVM1Cd7TrwIDXQGFZo+3sc3tiOzaU9S9DQtoTWYfrg8tv3u6b+DJ1D8J3g4MFE9bdi2j7J03xe9nrHpphxUGlsPOf7qX3FQG9dNMPESkBVmKntdVvEH/fbMYmZmIXDVOi+zzPGMRihlVRUaELCQFL43w=; 5:EIkFar+ZXNBLSk60jAJmmy6aunKEDllY9CLsxrTuun1rlp+2LF2ZAD17Y81FCz/VI1tiIpFOCq+7bL6dNSa1Zp8vZY0vJ8S3bGDy4rMoyvfa5z/gd8eQBqfdhzrN9zB7L869AdYbu0NkutCf3CA7htnRXBm2elIIP79Ltz2+3rQ=; 24:oJU8F6oOY/4hDAGpJwWM4vZrg85ppGOdPOuv5WjYsRRQhg+LX4+wGYiHIP2NpDw93HrjfGuC0A4tq12GEj2oJafZ06vncoiBkuKsvAqPcUo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0721; 7:h5DZeUi7n1H37Lb7gBDnCP4Ns9/u05MxSHJkc2QNKj2uA5/HJEd7gc8mgrroGpGsRHDqdt2Gw7q/7Sl4PjIWDufecazVOHDZhPLPgqvZoJCR7Lq2nOW+/aq9u1pWAI1U+0WeOkAvamteqPozIQdA/1u1Y0AgHxM5oCtdF0aYmkSkYgembcMzFAyqaXZg6FhGzCOuDfKQL96t8qkTQOdwMzk5vUCoiHORwuSSLGU4crWtWG4ufOVYhW48prOWUK6CGZ+wJujZsYFIGhS2TVMR4txGFarpMWnPJ6hRd9JNSU5qO3d+hFGObdAM3GwcQjYFdB7M86gSLENyqc3WYey7Ow== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 23:46:25.0934 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0201MB0721 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.83 Subject: [Qemu-devel] [PATCH v2 2/5] cadence_gem: Correct the multi-queue can rx logic 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, f4bug@amsat.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Correct the buffer descriptor busy logic to work correctly when using multiple queues. Signed-off-by: Alistair Francis --- hw/net/cadence_gem.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 17c229d..a66a9cc 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -481,14 +481,17 @@ static int gem_can_receive(NetClientState *nc) } =20 for (i =3D 0; i < s->num_priority_queues; i++) { - if (rx_desc_get_ownership(s->rx_desc[i]) =3D=3D 1) { - if (s->can_rx_state !=3D 2) { - s->can_rx_state =3D 2; - DB_PRINT("can't receive - busy buffer descriptor (q%d) 0x%= x\n", - i, s->rx_desc_addr[i]); - } - return 0; + if (rx_desc_get_ownership(s->rx_desc[i]) !=3D 1) { + break; + } + }; + + if (i =3D=3D s->num_priority_queues) { + if (s->can_rx_state !=3D 2) { + s->can_rx_state =3D 2; + DB_PRINT("can't receive - all the buffer descriptors are busy\= n"); } + return 0; } =20 if (s->can_rx_state !=3D 0) { --=20 2.9.3 From nobody Sat May 4 00:35:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zoho.com; dkim=fail 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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491868108203593.405253762116; Mon, 10 Apr 2017 16:48:28 -0700 (PDT) Received: from localhost ([::1]:36480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj2p-0002rr-6C for importer@patchew.org; Mon, 10 Apr 2017 19:48:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj0x-0001cy-HF for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxj0u-0002TY-DO for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:31 -0400 Received: from mail-bn3nam01on0064.outbound.protection.outlook.com ([104.47.33.64]:28076 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxj0u-0002TA-4U for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:28 -0400 Received: from MWHPR02CA0013.namprd02.prod.outlook.com (10.168.209.151) by MWHPR02MB2591.namprd02.prod.outlook.com (10.168.205.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 23:46:26 +0000 Received: from BL2NAM02FT023.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR02CA0013.outlook.office365.com (2603:10b6:300:4b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 23:46:25 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT023.mail.protection.outlook.com (10.152.77.72) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 23:46:24 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35381 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0q-0001GR-IQ; Mon, 10 Apr 2017 16:46:24 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxj0q-0000VX-FC; Mon, 10 Apr 2017 16:46:24 -0700 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3ANkGdd001599; Mon, 10 Apr 2017 16:46:17 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0i-0000UF-QG; Mon, 10 Apr 2017 16:46:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mnGbK9yeTXoSG2/q1sggl5ZlBaKd6IsswfCHs+51Btk=; b=desUGqHXFTfg2N9DJ42rW3tOq4usNsBGK0czPP5qq//b5w4FTTBCC6FiioPh2JCG/AQhiPW1WNBUzQY+U7fbjDb8xhiseUS9AGWNavGjDUqCYafFCqZ0nJI8rwLZpmmoAvSowqmkY0tsRSCYmDC8t0WVnzhIB4QhZMYosR+o494= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; amsat.org; dkim=none (message not signed) header.d=none;amsat.org; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: , Date: Mon, 10 Apr 2017 16:43:49 -0700 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39840400002)(39860400002)(39450400003)(39400400002)(39410400002)(2980300002)(438002)(189002)(199003)(9170700003)(9786002)(356003)(5660300001)(305945005)(4326008)(36386004)(5003940100001)(38730400002)(189998001)(39060400002)(47776003)(2906002)(8676002)(48376002)(6666003)(2950100002)(8936002)(81166006)(50466002)(50226002)(76176999)(77096006)(118296001)(36756003)(63266004)(50986999)(106466001)(33646002)(54906002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB2591; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT023; 1:TzSw5kMZ5oVqGi8NyiK4EIGEgCEw1OJCTTekulnJJ1LOAaWWnq2zBMK4rN5KFqq25dwA/9qg+8R7L+nJFVnXtW29NpQSpiE4E/3QJppD3R4IT6jZmI3PodlX6eYoqlm0RHhJ7/jhqZsj9CDM6wPajav36JICBfBC6sCqn+PuGFWjkKNcy85E10KIyspMNIr9Qq/5s7Eq+xT3jJjGLI7J/y6/nBySkak+R/eWJU0eoTRwsMnKgI513GlGsNQCgFNjeHb6I2c6cxM4C8YTr5fEE+kK60FmIfpqipbiQKcTbV9vrNdvT7gGsjt5IgUmPrMjH5GzZtEORSUMdsMrBqH78bswWpVQZN2YddElqFAPRpCUl0bj57YiH4WdtaDg9+GgYlq1pGrxXwEd2u0GbanycVwD95WaOLwNcCn4/PD4v55HLZpE0t1BKJHhjpWggsZTSD5Vfa/IdWxtpsW1K9qcOJs7Nf4IFUZz2I7dBm6F8K//TCKlkhPGOzdpgi4xqALUuK9FJHJhlKr97FZjtb5x6cmu36uJoc1i+hQDo0nbVwb3g9LvNcjLQZXJ6kT10cF0CqC3gHBKkFBZuArd9gQf2gEPRMNvKS5V6fJbK4seAkE= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 355a2fcf-30ef-4dfd-f7bc-08d4806bccc5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR02MB2591; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 3:+Yk1baEGmgdHTyxN3jnDSZrb3cUB+YAq3dNaI5iAbvnR/aKlf5pdxvwZoq7WwY+ujweoG7Q1RzENBeLeFyIHbA1d7z7lrgt5nxbYq6Ctm4FS2BIUVcH3eLKLAJlRjRMwomITu4fk4dvNHi5Dry+O5jMu3xtdIzfTQWj6WYsgPK4snq852z4tt+AUtEaUwnYwYdPyHqGpBmlBG60SjFG2hlPHgdt1WEGncLSHjbB1TZ3TDYhUoaSYwdG8Pj5wUWMxNX0d/5tzBPC/tEqVFNMuDNS5JOXM04PCtOcZM4E33dh6siwinPmEDctAkUF6Nw+LPKZvpY8EiUZhkIL96urgsqLTX8GvwQH0GCXuY7nq+2LftlX/XxOuCgZIeP8+PQFanPXdl79eZpkGFnNsCm4fbUei91x8QFkB9TduH81lVarGlnXKDoZESc/d81vtd1ksEhKptfnacQFMWk8fSaK2eboPObnFJ0dj+b7ABSzIB5dCF+WofxX5/95kf4Bb2rePSUQFLptjSMQ1FdRvkI+urw== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 25:T/Fidsj7Oxm0suNprhRYnxuxirSMk2fDi1FDm9QNSUZqCkRAd+E0NjovgTw3Yjo3aajGGs6jkGMzV1EZ9bai8OmCOxCvLqyzn8lrgB22xh7yOHA0ccBN5VdrERQjMEO9e5EY8appQHvl6mjiULboX7x0IBh6WDgKzmpRD/tdTHV73wY+CCm340rH8YPJm5pHW0jNZPV3Y8SEoaqzDU31G6ArhTeBf5FTvPfY+jai5yVbkqRAL/Jz0vvWjHfaFnRlMOnrlr1NmjKbVleOI2XvU58uzFifUCU89I1sdtxryJ231a7a8Wl0VtUlTQCsaJzX5V/ywrk2j1fEjkwjUJDthjDGH3jRbk4/6tUNOx/Rx56p5vtd6q3hb7wMj9mawhhZ6lGPfwECG8Xp7ffD0P1Hx5SyttzUOt5fEoi+p4qNt/p7zvpqO5B16dydmC94ElHYRPUX8YY2tH5PqNnyGM/eVw==; 31:AJS+6ID0Dqux4jCnmh1uEXUXZPLW0xaxlHfKKeRoPn7AummxmZnw0ANEC8wKE+Uq69yUFAgyUj7D0tsy47QIB96w7YCkqA1yUaJthK7Iz9gZCLwE4JfLdsYjZR2gKcu17PjExGu6Z92blcZtmKwBLL0a90XxKobznUY+BJh2C9zCaeR3K2XmdrNPS+G8RVnTefdnN9yag9TWZCIM2z2Io6SeorHyAZw0EDJ9ki4ZFQZZlGBTZ5oeG1noH9+jNPo/8dCLZfHsTzT3EQJ+6lLaOQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 20:clM8jSd7zbLPMsDgVxIOvrY+PDuYddGitXSj8ZAbw6lcMegEcmQddI3mbfK2L6lb2DjN178Hw9l2MMnowwYNHAurIGy3B/BJI+E17T4guxDYzyVbjOZpaYndyzisch7fNixA6A86uOqnaxNsvS1Xsfr7NIQkxJSwv84r1NZQCNG5pJZOAsDYrlwVBNwl/KfC7T0JY/o19Vmp/hBtz+CL7jkqh+uu2TQJKHj8+ZV7cILJ5Bxqbzph0gzBqWas/enTQq+W6WjJUvOxcWeatertJEMZdTJsQnbOwoUppxK2ulttvUYjSVQkxX5oybqXbjhTp3jWY3CMQ3uQvfSvHh6z4Itkv3jRYFlD2VRUGVW6KCbLs2QxNHrfm/TMEKnOzkPblLdx5AUtYypD+/Ubjj3ebeJ5xL4X+6RBq1TZnLsBR4uCpJczq7ZHIG8sPGxiTOlWZVj84KXO2FopfRbydhUKSDZqu4UKuJNs+zjmHJn0y9N8Epbc8tpVPlv8DyJv6Qs9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(8121501046)(5005006)(13017025)(13018025)(13024025)(13023025)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(6072148); SRVR:MWHPR02MB2591; BCL:0; PCL:0; RULEID:; SRVR:MWHPR02MB2591; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 4:vdn2DBPm30T2e/5aDm5YIR3eI3yIqzm/6tpeKN6vA9zgI1BF3x5LQ4t+taSpJ5VPdislSM6fVslafR5h4iynx2FEsXqDGDiEj7DYk9Nz6/tPXlqma2LRzP3B9g8IRtl5SYe0Ys/PdMOPKiAvCt6fxU+CmqvNSo6WUoB37VnQub1mE4sXLngnkGMTfOPh9BvO6YkO3ClU8AaCzSJwGALyfkV4MRrbFCNryoVlKux+JN/zwG1qp1Yu+46KRAxAgNJaiULmjxk/EKJBn6Pfkf1gYZ09aIhDf8zTyN/PtfN0uSOEOeXl9HIcv+ScwSaWwbpPr4VlPHBi+k1h9GhllIslZnNQhJE7us+53nXmWcel0XjAjjTrpYPP5qPHc9gXVmrK8T7Dt5tUniMt2kUrw3caBuHEI6VVUv+ocXqPcYrIfgsyBikT3dHqrEdNbZT/cxagaTaVq4JdZhsBB6x7mEYxYqogkrFje8sBlFytCZcIhwYKMLGUQVVMAu9t0wPqgd9W9IWV9b2yL20ywVRe0PucTtk2E+OxxL55JDGhqRRkbnTY2I9FsStBOwfqLY3p8PEfoSwRpoxpH5s9vSornDAulYVyvi9lxmGuUTD2PnXXVHqQsMPx6ngoRqXpcvTyG9bcHj0DUCwquajv+lwpPrbbKx6dAVSJnF0Esl4dxuh5Ss5Dq4yyMXWKSSjw+kAUtzDDRSETZq/My2dpeTlNvTdGag9jwo48ISKsVvVXIjeScnAj5MiEccn/Rk536U5H3xWb9IsQ0QbwoJS1YmwPTwQxsKnCxVpfDM+xjr3kGuMUjZoCnv+vF0URTgv1GlngoWiolAGRxQV40+a/maB1b4SjTnufy5+SkilWYG4EblUQJdoycqaek/PMa9lGM9NhrFEuht+yejGi+wqoo0TrRrAm+hWa4hfhjZvRc8dYvUkcoEc= X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB2591; 23:VmnLE3fUD6U5fUjTT9yJ2TvBgFXJkKZLdPERcGIuj?= =?us-ascii?Q?YS4Z4XnNZ0Xm86OlgQN9ix/Dp0nIifRjr8pp+vka0oL9leHuUVs23JU+CJtj?= =?us-ascii?Q?oQEsx6b74i5v85CurhnbTbMOv8GijR1VTAU0te+KtUC03lBEmmBb87dM0qfg?= =?us-ascii?Q?JZF3Ty5aV3VF6fZz6AngbI2jSmpMIRDYlCuuDdb7Zgr6EepfpABNyOWNu+ii?= =?us-ascii?Q?msSe/ZZMrtyEMU6Tv1CVwubiNp7eyYcG8Knth5Bixg8lQXvrhJSXeqvaRtp2?= =?us-ascii?Q?Jagr9YsQ+SfW/uVMKa2pEolvJGmMw3YN2M0WHPXFHUv6ko6PZsfPG8uPBjB0?= =?us-ascii?Q?zdm/nnDQK73AZ2f+jZ7ihy12Gblkr5EA19n7uk2YeGVeatjFxNHKYHo/dVoS?= =?us-ascii?Q?7E0df0FYVmltCgpD2PAZxMt76wvpK51Ub18qaMk00lv+z6PRIvLz63FSxXId?= =?us-ascii?Q?BF/lxl6cfQVz7E/VSG70Gs4suSkz6xwnyEDYPKRtPAb8oOXJifLKOB7m1Deg?= =?us-ascii?Q?02CDkeIOdDdzeCjic7nXwDefS91JGqPymZG2SBV3xLBHNciIkzMPiPsbFV12?= =?us-ascii?Q?rvf1+qzUKWulEONRd9BA0rrun90Jt7YwXwvO5n58Iv7XAOFEVwKWynflPtnP?= =?us-ascii?Q?5ZDuP9EnxZxn3VVr1rR+HNQJPA2Vdr9iK8oHhRVvpT1OJjEcj8EMH+cDVXY8?= =?us-ascii?Q?IdMGtrqUWHT17o8iB3oeCxzkVi83RqKXl85HDj1tGvK66nEfn+HGVLMRnjkS?= =?us-ascii?Q?zMxIuT6yYm88j/jBmf17ABFBiioqcnNXKZa/cC93YEYRnEemMoqZGTAn7P2T?= =?us-ascii?Q?lwTfO+iwW1JAh0/5+wQstpzexxz9tUoRGHp8iuOdNOeOy5cD/vFV294krkeF?= =?us-ascii?Q?7b0FPScqex9CNWveIeuvfVLWn+tcK7kS76Tj0c5Y2NxXCLo23QRjfzfvn5pn?= =?us-ascii?Q?D5YOfNOyVFaHC8eI8gmotv8DIYocIFgVPj4KDk354y2c6JzEYWrYweaPvFda?= =?us-ascii?Q?Ve+ba1JI1AByuKPsqjUt+QIFvi/fZkiJVsVNn5NHN5gCyYIQvDgXka5f+IWU?= =?us-ascii?Q?hUl46IWlQeZp/iJ8o+z+pk4yvt0?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 6:TRWha9dex/c38YQyLKovB5+AhTfPOYuqoanifY8QLFPR4WBPKbQKOrRrUfzZR7gDCaYrBJ1GC9tCfWfSEJLuwBoGYief2s8cWgNGA0Hwd0DHUTbZ+3AfuxIqu2k5p9VlDdUtdT2i+G5kyVCJRIQwR7bjqWS0rfhV4ba+zaLnVuWH6/5BneLHZsK0AUBTGoOFvcwzs/WxRkjwMwSIW5L60z3JItEIGR6ohRghzmiQVKc7emavrBzLUD2z3GR5rWoE+6V9d1jxxEhLyoewmoEf4vfwPXcojNrFaTIHUw8XZbdJEjGHMooykQbHAc4WTbuyHSrRUJw8rXZeQ5ho0XPry6djmGMFxdmwO/ZrCI23YvxkCuPB31GO/YPPzf55Dym5EYia7bIOtUAtsAfvny/6KSFoJsgh36fZVznFrgl3um0bdWJdIKVQLPvCfZmBwhI2VQQ6Tauhkd1oaWAR8Uc/XPa91ySrrYaiwDgxLWI9UZI=; 5:7x9czFmiOT6qFhHN62u6dGsLgU77DpciyY9Qwrx9uXeACkJIEiix5EtF1sl1QV+mswv97G+wCWaiUYZSRxApj+TivLd+/G/y7qtKGlLPJjJbcP39no0XbNNnWuGl+6Yw19GyMY0Ov87kTD4+7Gy1EXxS7OB7gNbETq1jY/5SW1s=; 24:QH0G17zLoRLXFHPB3nhNDqO1Vpoj2ty8n80RWQW1Zw3i7WE0jCbQWcVV3xYTIooL+Vlz8NQofNJ/tMQYhKsuMVhICnQF38GBhG6jOQxuv9w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2591; 7:jokRZybVuasL04udxpMHvOx0RTaNvfbwkzrvPq5FXqvezgj6bxad4xYL7WzeMPwBd7FJGnUHdDgobu0CyZOvCs62hgdCtaJNksx/894T9woSVKyzNsOHCKkZEa5GLJ+WDe4/xhhzQFtXrQjLWCGXnbr2CmlLy5XWjYn0OrjLQt+cXQhSKz3ZkkFrRWzTY/pVvmRl6upd/FgKENmWP7qi1wGK3M1+9c5jc9gqAM+C8k3LJadWMPkPNsMwl8lFU3hpRWVI2ChT4xxvdVrT9g5IYshTZ+MP67vdGhJQ9pR0e15QS5U5caaaHE5Wg2Bs1uyu39SCLsFPnT3awHGIBmlNTg== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 23:46:24.9589 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2591 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.64 Subject: [Qemu-devel] [PATCH v2 3/5] cadence_gem: Correct the interupt logic 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, f4bug@amsat.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch fixes two mistakes in the interrupt logic. First we only trigger single-queue or multi-queue interrupts if the status register is set. This logic was already used for non multi-queue interrupts but it also applies to multi-queue interrupts. Secondly we need to lower the interrupts if the ISR isn't set. As part of this we can remove the other interrupt lowering logic and consolidate it inside gem_update_int_status(). Signed-off-by: Alistair Francis --- hw/net/cadence_gem.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index a66a9cc..fc3a184 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -509,7 +509,18 @@ static void gem_update_int_status(CadenceGEMState *s) { int i; =20 - if ((s->num_priority_queues =3D=3D 1) && s->regs[GEM_ISR]) { + if (!s->regs[GEM_ISR]) { + /* ISR isn't set, clear all the interrupts */ + for (i =3D 0; i < s->num_priority_queues; ++i) { + qemu_set_irq(s->irq[i], 0); + } + return; + } + + /* If we get here we know s->regs[GEM_ISR] is set, so we don't need to + * check it again. + */ + if (s->num_priority_queues =3D=3D 1) { /* No priority queues, just trigger the interrupt */ DB_PRINT("asserting int.\n"); qemu_set_irq(s->irq[0], 1); @@ -1274,7 +1285,6 @@ static uint64_t gem_read(void *opaque, hwaddr offset,= unsigned size) { CadenceGEMState *s; uint32_t retval; - int i; s =3D (CadenceGEMState *)opaque; =20 offset >>=3D 2; @@ -1285,9 +1295,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset,= unsigned size) switch (offset) { case GEM_ISR: DB_PRINT("lowering irqs on ISR read\n"); - for (i =3D 0; i < s->num_priority_queues; ++i) { - qemu_set_irq(s->irq[i], 0); - } + gem_update_int_status(s); break; case GEM_PHYMNTNC: if (retval & GEM_PHYMNTNC_OP_R) { --=20 2.9.3 From nobody Sat May 4 00:35:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zoho.com; dkim=fail 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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149186821220368.2191007877492; Mon, 10 Apr 2017 16:50:12 -0700 (PDT) Received: from localhost ([::1]:36485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj4V-0004HS-9y for importer@patchew.org; Mon, 10 Apr 2017 19:50:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj0x-0001dA-S7 for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxj0u-0002Tk-Gu for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:31 -0400 Received: from mail-bn3nam01on0069.outbound.protection.outlook.com ([104.47.33.69]:40425 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxj0u-0002TL-BI for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:28 -0400 Received: from MWHPR02CA0053.namprd02.prod.outlook.com (10.164.133.42) by BN3PR02MB1192.namprd02.prod.outlook.com (10.162.168.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 23:46:26 +0000 Received: from BL2NAM02FT043.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by MWHPR02CA0053.outlook.office365.com (2603:10b6:301:60::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 23:46:26 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT043.mail.protection.outlook.com (10.152.77.95) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 23:46:26 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35395 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0r-0001GX-6f; Mon, 10 Apr 2017 16:46:25 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxj0r-0000VX-2e; Mon, 10 Apr 2017 16:46:25 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3ANkJGp001625; Mon, 10 Apr 2017 16:46:19 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0l-0000Ul-9D; Mon, 10 Apr 2017 16:46:19 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zjp0qFgjCF7AViQt6Ceb7ba4G1apq6Po8ooGQMOw5I8=; b=2kset+De4xxAbAdj6dXKxUz27gQ3pmXSH+GgM8EshEi9pTCFyiT42h5qDw5puljP7Se0XlVTGQfsWphmVswdCv5eH1inmuFt/4I+nAWyKrKtZlMpakkGl/VNCgGck3imEV+0oeex2LshbrE7wi2ubF3ihFlZNGNNxd8mjmzFxco= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; amsat.org; dkim=none (message not signed) header.d=none;amsat.org; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: , Date: Mon, 10 Apr 2017 16:43:51 -0700 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39450400003)(39860400002)(39840400002)(39410400002)(39850400002)(39400400002)(2980300002)(438002)(189002)(199003)(9170700003)(356003)(38730400002)(54906002)(6666003)(36756003)(9786002)(50226002)(2870700001)(33646002)(118296001)(8676002)(8936002)(2906002)(77096006)(81166006)(2950100002)(106466001)(575784001)(63266004)(50466002)(305945005)(23676002)(4326008)(76176999)(50986999)(189998001)(36386004)(39060400002)(5820100001)(5660300001)(47776003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR02MB1192; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT043; 1:iNJpvd3jDbYtZOh5FVHxvh5iaUn9Cibusc0p4mZhn0/oxfukvtAZ9KrS/ILpHqX7oajf8gIBTY7UY/iWSNHXbrpTSBP3enkB+k9ezjTOfHkd1sFH3mE37742Wfm8WwOfzkM3mSZ5jkckX6TP/Hgy3TnprM9+shDTMXYdYZpvKMFSklSYM6OeRFzrf/+UTqG8YkOmzfMFkU/i3VEcB1kCpX++0BMSDKFZjNfFI/rFdSuzPszEQdT4WNGCfncD+qMxFwaP/A2IPCoAjMN/D1fAiNo2cVy5hoxgJjnZK/QCtk+Uy1yDElHhtNsyzQTYyG/CaxQWmLxw1/qMa9jM4hs6qQVj+nSM/99/MvcrG9WjIA38cEL2ueYVlKf5bGRcBeP2B/L4onPzdzwdz/+jtttl7sW4dbxCZef3JjFKVpWBLF4imqp6F1t5xRfG5dcld4qAHtc0HEoG4QSS6/FbJjZcdXv/jyzIJzvsDCy/kNa7na0nHl9HQS51xu/BZNLd5f37UgFO0623e6qHXXrR/YyAmkpONfZII/X4anFqBMNVNWajkfljszPa7MswmZtzc7JRV6OwjMdEQaWpvni+Xv5+cCBP6C3FitaKevfyJ9l7Ccc= X-MS-Office365-Filtering-Correlation-Id: 41183c50-b464-451f-2a63-08d4806bcd67 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:BN3PR02MB1192; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 3:fmvBpTljmXBCh5ae8A+BTsDhxUEWGXy1V1M1YKTJjNXy7Fp60bSY+BoClfFRWaFtpDjuRyFyYtVNXTipAj+U2ZgWYBBkSwzQFGjQPNU90IVQJTER9A1U9VDp8utKerNpoRvHbKiLHBO2wp68diAxDJsZLkfAsnzYZgS0O3fzQ6eC1Or0zzw9CAoJPDDZPGM1myL3B6dPz/izPsBdKy5ccOyi23Hl/L9SjAscM1jTnZKlBrAD1h0O5ZVm/UO96UluqMXD0aWle6PiskAB9wcyVzoKK58J/AUYMp75VkUE166PGjV/M1RHy1bGXr7e7vkRdfN0ZceWyRdecakeQQBjuQOYZOXTGC9DZXsYGj7fEjS80Sf5+aBoSv2O5nTARQ8KrpHnPxa6oEmNY4kmuEuuyLDjr4sQbcr7TeJatEIwJPClzOee3BvUdAzb60an1icF9TC8jJrpLJamTST9KtFG6iiTIqht/JtA7YR5kliVMGKjbkVYKB3ZgdHqUxCZyxUQ X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 25:WEm2odbXixH4962QgnjYTmdDwOfqbmnC0hULmDTwqH2u7YmytngaWfEMXX6zXhQ7mMuk9hsxELShQtYLdbdRJ3Jq4koahMSMXT2OQ3sothm4QqXkOyB38U40IDX9WTNrB5VDPAy4Jv9QIXM0UhiaI6aFpZGsZzbKcT8QB3eQEoHAetwHYFAf7BE6b/YaLkGYtZzd9RscFmXv4q0epxePfxzQP2jwoSHYXHelZla5NUjCyBXp/PEmmg8O3oIt1VTHFLtUzJqkzblYtgF3TRF3v/BeX+ZlIaZmpBXMQStGo1VMDNx/D2jOgYk+Vhyy5KAu0xIviwZaFcA1ust2kV12QcgNXe1V/VreQsao889U40Ms+QSv1h4BtZF9ydiwoUysTXBrPDQutdYFZX6N6yYcZ2uapaEFYB6sCPM1AWLyhk48eb85+PyjH1iHUFy7ZhG4d1dhJPYkc+hJWyuKfCNL4w==; 31:D34ipgOiiqe3iY44GLIhoeUNTd9CWH17LEsuMEVUm6/W7cNmf3hordhlZJY+074SCKSzinCMPxRZc3K+MW/+f9SlNUF8ECYzinn4GCYfGgH6N66mraRZZvKA1+dC2h+/mqLtrUg7sXsRy2zYq9pFjAfFyFEfMmUHsdXLus++RqJ871ZsJsu+axILO3np1BVY+tMccvBybdT65fX0apKvVpNGcQXtl1rzjkmA3GVvuXJhIq1V7QeZRT5iGKhUe2/nhoD4f35XSpLMzk10DLfN7Z0ExZ5ZmySgydDm1W05YmM= X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 20:HvlrDkyV9KAOND8ehPucp/gtSJwD57zBFsJcP1WodRgnsrd/2imIceys4R4PQ9pt8nLs8oE5EdiLUxCm5OxFSej0lmpLqmgCZ1jY2+Kluuir8I48U5h4Ib0+d0ISYUdFkOlEtDAaETVKv3c0vaNM5HHg53HbQtXkDEz6lZQOfdnnsAK62vyoZXTNlU2qf32Wd14Vi0Y0nTagFZOxivzTrSxEhl/0rHMcT2nfwhyBartm/SS3MBoMgtKaSx2bLJKGToafAyjAUDTabwkivEqQKMo3zgke+iuvfnweKcXFsxeqRosdp3qoFvHcQSIlPE7rOXF6gnE3Zoo6PZvY4FFd/asPx70qpC+xMKPLUfmM18JydT7Ae67kGHTTUvqH87naJtDI5wlJQuvo9lAFPcQUEXmV39B0YFH2AOnHYImA+CPQFxg/5BjwXi1DYWT+yFYElrGV15CadzsdP3rKAWwCruzbRXByHw4tSyHrx+3vel2liHw3rvkqGcRDpYzr5YLe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(13015025)(5005006)(13017025)(13018025)(13024025)(13023025)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123560025)(20161123562025)(6072148); SRVR:BN3PR02MB1192; BCL:0; PCL:0; RULEID:; SRVR:BN3PR02MB1192; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 4:FBHOyLuYIoy32lREY++ePgpR+XaRczmY9iMvsSF3WL60NcpJZTGWS7gmY/pHUurbU/JA2+pciVbgMOIll6Obq9jQNd96pVI7ansFLiemBOwV+UQCHDrbhaJ0a+NFu9Y/1jiI3I/0R0zNtqC+qOMLO9NbGaqRNDSA2v+WchRTRK159Lc5+K4vq3SGGTTw6cE62jmQjQBh2AUda6lyLsMr0XepMFM3dSvi3sLEGPf+k3OlkcQVsvfEosmGYkpIFKzQshzRddLVmszkD3lk6m/lqg6y8ayBV3AK5K4xYSJy3m8IwPAzVlZaTLHZ/irniSwXnXJwUA+OnaWGNAsIGCkVJbB/+3q88xV7sKT+qwaGlwwYRLCyPGW+ZlErF5d9j2kNvnSFUOmQ8oNNxYhnDL+2zEpwu04WDGA6/LV0EfIJTC4Ndg7HD1726Kz1CH+RhWvcaC5Sx0LqzqnlDcQcaOiw0vXvVj6s3VE96vPsHGE6yzuin1KaNL+8nvgn+SgcwbfZNFPLD8zjJ2otGUyGk5bXSiCprn5FzrH4WcJmGL35b3mOAKfNlPzp3HXwjnwaT57eIBzIREyCHCPeCFhB9UqfmZcl+aaz0Y1UGFYlcjECtzYpkyqhicKigpf1QSabbGi8jLUYHU542NYiFasORTzmZ1jeLIhOxex1trQQ005WgQFwwMXwpglMuw5On/Sv993H0C1Z6zAMQ08KibYXAP6yZ2v+C9U3w+JslkVL/C6+ZSNPH6BtNoO73EeECkeod7TYmWUdcHmK3OL7/BTvI8TTW7g0ecV7zWrCXN1ih7dUPsknF+gbzEst4K6y4FeCPlWICGdj7o+E2Lpz1CGOtHRqgZTcylz7mvHR3NHniH8m4AWB3iXZpo/FUA9dzBPqXWBB X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR02MB1192; 23:w3CXO5f9lj4pkBExImOcUnemB8t+a1Qdn0jr3kX0e?= =?us-ascii?Q?z6elBv8l2ch4gZ17NibN5nrJTsz7XZlYZwftefHlBTlpIFHXSjo6W+JWDDhH?= =?us-ascii?Q?x6wJpK8wOuZrSm86wv6R2qtKtuk4A+5Wuu8Ve0IwQ6SUEdbxeTFkaVIUON81?= =?us-ascii?Q?nc2TB1uSwDDZ0JnYNI3ixEgcLLmmdfAUAWJP1RGYZ3cPIZPHaTFGooarAgzG?= =?us-ascii?Q?cA3gN1T1tt5YIU8PfH/FWcgBu5nC5gU4ISfDrkVg0AMpLa5t6Lh4m9wtHsmS?= =?us-ascii?Q?l4fDji/K6a22pDx0Q1SaLSuwflrrxEB0rWQ3qMLFpEdKlqGb5tlzDjqNVZE7?= =?us-ascii?Q?PuEujVo9CDCIitfL7smgyQ2OyiPk9d+ZdYvLRC0xMC0eapTzJbfQ1x2SyGdx?= =?us-ascii?Q?T9FjGQDjaEjQyV3UadEN0V96qgU09igwxLjJYKH8yGmqXz4MNezyAT8jfFp8?= =?us-ascii?Q?M0QBXOvRDNFsS9hNv3FqZM+z/QFvX3R17m0vdr901p5OUr9auQVM1fjLuhj1?= =?us-ascii?Q?+EG7es8sghpgH0j7uC/fz01z+Tk2ZF6Spjqi4VNVrWx15jdjLngD3uG6sFkj?= =?us-ascii?Q?3EhOTAyHlkC63mE9oFNq7YveHNz9lg67L3fbZ3UBZc4B3PFAw4AuMs0Dr1Bp?= =?us-ascii?Q?FaHm2RZg2/DNhumNY6jgnT1s5zr2Yzl3HPvyN3raxNCT1DG5lY6PB6l77JjU?= =?us-ascii?Q?bOkaL9ofSbOJ2q8aQgCtMOevFf2CI6eYXqL1dFxqbWMWHSFpAr1QRtPTV/gd?= =?us-ascii?Q?ED2uvDS1hpAq6icbBbeFeglPN6c5/h7cNsEthOMOvMGoh3Tvrr+poQfErJg6?= =?us-ascii?Q?ujRbpcKuI9QzxUen+VCnsZtJzgVV6FoDTxiht56wfEYxvEIN+NBeR9p8DGxA?= =?us-ascii?Q?fCqK+duMdB64nyK0hZEoAxTmIb2jxKpqZWAcPBvs2Ij7WSdmkkwp+H4VzKSt?= =?us-ascii?Q?gdfQ5GqtH6O0YsROpVvgunTVonnI4lu1282W3EJWkGjASB7HotOWKwbeBGLE?= =?us-ascii?Q?Zdk9MaaPl/llXJboz0wn1eLCiKn0tCenPg3ueqbTUNEhYmZ2F1jyKHfEQbAo?= =?us-ascii?Q?QoNcAkByZHYezOYgq3BLB+2elm0iM5+nLp+fLd0Qmik9TezkoUpiVMcI9hn2?= =?us-ascii?Q?HUvWP5YDrE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 6:aVqeujmQVjRLCsFRdPOcqJ2r/BI9+u2FmagaqdEJXXxfC8fp6QhumjEgn1SWPFGPDiAagFyZlVjrKqTZEBdATB98MGR1sSU1+Tk6MXR9LM2kkbF2j2HRk7fQ0Jzsna6uJwx9bSdP5MeTKqIRFD/6gVNINMyLg7fBeTZ+fw+bbLB6VIr1Co0hUWX0DQm/h0ZUnwYaYZFz/mKKIx0oN8iQdxiYJ7Gl/uQFADRqmjGILzTDQJTLfevMfmB/5ElFofPIwNnIrSgBn8Dkfj/fcmOKUc/Jhh0L85cwC6cfqfrfF0dorSU4vzNkY6cB4QoI9HbvhxcWGrGpbIVmqkLCdnlshTkSw3EaTRFVVrSa9fcIaPqTzXoI91AIRHYDD4ZL3RKjwd2FYN9Y+agRatnUO9uUAL0JQClANpcw0KFyuhFxjGIyj03xNeTUTxIi6diZOHhgDqi07C1an1fnltaj+TMADQsDOWxC+ed327+/CPHwBu8=; 5:LhG2/HXcj6TlXh7aWw0jk4jnTXg150chRWn1b4Nuco5iY8MPeJ7ON0wQWaa2o3VXGrSOlUatnqYcyXMXWSv7t6B7S+vmOim3FuKBekCuLwExP3rkoZtH4gy7OpbchNRNzRuSqGYrT8WuAclqQ4LsRuM2T+ucIEhUMn2nk32qJ6w=; 24:0iYDLv3atcpFcCYHg8NM05VHVIksGPjfWPercath0XT0y/yUGMp/3FsYMmxqByzL2hMXV/d0uqKazILC8n/16HryjS5QuuciXSk1R0Udjwk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1192; 7:LYlo/xkFAPKNu9OhYDwUF+dLGAc90Uf5K+Pgo7JR8l6OlMkOI6KFnGjJVBdWy5fPseUM/3NAUqFPCBFJWZcjt7RXoQxfCQAKj+mrPy0nxe8KLlzw3SHZrJq+xMz8sH5AhNAxizzKhPXHAkqVvqY4FZBvpGd29LglUJMRwjQI+UPbAcBzoQSBIfMBZuQz4etgW6eHhkE2U20X6swgIDSmZI5dYSQZdHTiEIobzEz18TABJiX7qanQZwoD7ZIkIzqHz73xDZXKBho2rcPUn+KYBnL6fR3fFzJ+VOJjBftlQW9e4d/xmv+CBqbuIwsbQEHNMXFThMYLNLk7C2dhMEWkqg== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 23:46:26.0153 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR02MB1192 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.69 Subject: [Qemu-devel] [PATCH v2 4/5] cadence_gem: Make the revision a property 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, f4bug@amsat.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Expose the Cadence GEM revision as a property. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/net/cadence_gem.c | 6 +++++- include/hw/net/cadence_gem.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index fc3a184..fe0a49f 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -300,6 +300,8 @@ #define DESC_1_RX_SOF 0x00004000 #define DESC_1_RX_EOF 0x00008000 =20 +#define GEM_MODID_VALUE 0x00020118 + static inline unsigned tx_desc_get_buffer(unsigned *desc) { return desc[0]; @@ -1223,7 +1225,7 @@ static void gem_reset(DeviceState *d) s->regs[GEM_TXPAUSE] =3D 0x0000ffff; s->regs[GEM_TXPARTIALSF] =3D 0x000003ff; s->regs[GEM_RXPARTIALSF] =3D 0x000003ff; - s->regs[GEM_MODID] =3D 0x00020118; + s->regs[GEM_MODID] =3D s->revision; s->regs[GEM_DESCONF] =3D 0x02500111; s->regs[GEM_DESCONF2] =3D 0x2ab13fff; s->regs[GEM_DESCONF5] =3D 0x002f2145; @@ -1519,6 +1521,8 @@ static const VMStateDescription vmstate_cadence_gem = =3D { =20 static Property gem_properties[] =3D { DEFINE_NIC_PROPERTIES(CadenceGEMState, conf), + DEFINE_PROP_UINT32("revision", CadenceGEMState, revision, + GEM_MODID_VALUE), DEFINE_PROP_UINT8("num-priority-queues", CadenceGEMState, num_priority_queues, 1), DEFINE_PROP_UINT8("num-type1-screeners", CadenceGEMState, diff --git a/include/hw/net/cadence_gem.h b/include/hw/net/cadence_gem.h index c469ffe..35de622 100644 --- a/include/hw/net/cadence_gem.h +++ b/include/hw/net/cadence_gem.h @@ -50,6 +50,7 @@ typedef struct CadenceGEMState { uint8_t num_priority_queues; uint8_t num_type1_screeners; uint8_t num_type2_screeners; + uint32_t revision; =20 /* GEM registers backing store */ uint32_t regs[CADENCE_GEM_MAXREG]; --=20 2.9.3 From nobody Sat May 4 00:35:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zoho.com; dkim=fail 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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491868104793433.7184133939546; Mon, 10 Apr 2017 16:48:24 -0700 (PDT) Received: from localhost ([::1]:36478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj2l-0002p0-L5 for importer@patchew.org; Mon, 10 Apr 2017 19:48:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj0x-0001dE-TQ for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxj0u-0002Tq-I1 for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:31 -0400 Received: from mail-bn3nam01on0067.outbound.protection.outlook.com ([104.47.33.67]:53600 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxj0u-0002TK-BP for qemu-devel@nongnu.org; Mon, 10 Apr 2017 19:46:28 -0400 Received: from BN6PR02CA0036.namprd02.prod.outlook.com (10.173.146.150) by BLUPR02MB1188.namprd02.prod.outlook.com (10.163.80.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 23:46:25 +0000 Received: from SN1NAM02FT059.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by BN6PR02CA0036.outlook.office365.com (2603:10b6:404:5f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 23:46:25 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT059.mail.protection.outlook.com (10.152.72.177) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 23:46:24 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0q-0006A7-G0; Mon, 10 Apr 2017 16:46:24 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxj0q-0000VX-Bl; Mon, 10 Apr 2017 16:46:24 -0700 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3ANkL8x001653; Mon, 10 Apr 2017 16:46:22 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxj0n-0000VJ-OE; Mon, 10 Apr 2017 16:46:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=d4IrzhXXFGMXpPnPgPeFFNqGqRf69d5kUJHcyuRKBxo=; b=yV0gG9eK9cX+L+bF4WWq5VpAqPwLofA1nJ75KqcPSD+LecO3z0RKcZy7Cc4FTCwU8RNVVlDKGj8DPOGvBEfj8/Eoy+dFI9L+P7aeeEPdukhC4BY9YaSObLfi/VLScqWGuqYACWr/gxX1oSVY1Dhp4upXIFU5E8Lam/B+KO9/fNA= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; amsat.org; dkim=none (message not signed) header.d=none;amsat.org; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Alistair Francis To: , Date: Mon, 10 Apr 2017 16:43:54 -0700 Message-ID: <0ff9f1a1baedd57b469f2a30a58c28b806050d86.1491865973.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39450400003)(39860400002)(39840400002)(39410400002)(39400400002)(39850400002)(2980300002)(438002)(189002)(199003)(9170700003)(36386004)(33646002)(48376002)(63266004)(77096006)(36756003)(81166006)(8676002)(9786002)(5003940100001)(189998001)(50466002)(76176999)(50986999)(4326008)(5660300001)(38730400002)(305945005)(2906002)(6666003)(2950100002)(118296001)(106466001)(54906002)(50226002)(39060400002)(8936002)(47776003)(356003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1188; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-83.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT059; 1:HyF8zWStRYXkwysoDx5IWOaimCNsvixvboAzDmpPyQFWnebVNJ/kNJ0DU+f6hzz+JDQ808gl8FhvpwHXsb/8b9ORTrflv+mefCXpBFQDFop7HTjzwElYVxBtIIZbto4HyJnahYiT+GHosmcB9fS+9g4ZC45wB40EDPwwBBXIYFCBVXJw7IlSb3Y1c2tk2VPH4djNDt4FfAEp/XmI4lK/nN3yOpffvrcmmhofGsZMy79AT9fqGniZLSmRqFa1I55r8ZE1g8wBfr7bT96BWAFRt8YZzw+x1Ftg557Qo312lX1GYGxAvUCbvr6mzgYEL31dHrHZzCSSwjukWTIqIkczu5l+Lwd6H6Up8Oq9Bhp1OtSXGf+owkwDUgw/+rvBe7Elceeyl068GKnE6jg+VMlKVVh+6Bmp18ZRQk8DmJKpA1/+xIytIdcex7RKlfOKJ7D4YJn9soN58yQorII0C/0DaWXmH8b4Fl1hrGdHTu/P754MUNOsM5DV6ohSbXIusIkErR35hE8VQUltx1zMtQbOvwoLvtR58BMfA+alryFLVVCrsoAJwDmoJH61jZdIbbEVmRkZ6XEeqqSEa3GEVCA617bTC4GgMdkYdlyTxG+10uM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 10769b7a-5e57-4d8d-57ad-08d4806bcccd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:BLUPR02MB1188; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 3:DjnBjEzIy0PaMkXvdrFhRA/hcBW4aQaYLL2amwV9kJ/1j4T1FKll+YANBB01xJJC5Xaea5aUQbs/wjg3zGbsFhRN7pW34nErNkQzmGk9meAh0qLSic3fPzCIHN81zi7g3+CLHVO0FZKpNx3/Ot6b1u6aZQtpzC3ARGUB8edKCDva5stjU4xRFQIYb5VhGuYD9vLcksRJnWT7QfGvzU1cAxYlryBK/QVsA7FmHhuhbeoDe6RO9R5hRxLakzaZxzKNP8sunhuIXIctSLropNdUps3/Orr3s6J+PFRqy/nOIZil+J29kb9/yUpHccI5aPCYKdjXePQhl7Kyvq6+V4RbkNGEw93TKB83/s2vWQuRM88nZZWCiQeexX2oH/ppTy0wYsdL5bIPAF4TYB8k7ct3MKXk2a5ucAdvWLgCZ8gigp1n+matx/zFXodAt/KlviYLX7ynDy+dZfVtyXBXmMCew21XSSQTnYY46kdWcaU3Oqs5vBDtpnqwyfPZAl1OiNue X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 25:wSnKkP999UOsmNyfBNi0aMTeuRZra9PXk8lOWLFZ+Yve6HepDzluaR8Xv39gH7nvTmv1a6Kl2zgS8g2AtJcv2xBPZABcIqryBI1ZXzuozB1xFbQVZMpjDt5tRLpVl198+jp/k6Y+kt+99pBerE/ctBGgsQBC7MDBkjxak1cUaBtqAMtItHtnFWWDnPRiWgEQchMw9k0EfkdiMFFB1ROAP2ytNwByx9O9uLKCchH//Ot9m2RNfTmCfe8kMwULQWQZu+L/8kdm7MwaS05o84RDTccR4oiIP0EORlsKfADAO56ad2EPWMonJNkq7uk5EvQK/0K5uGycbaN+CyU1ficxOYkEMgSl2b/FYDEKnjNw+BuewhSJxGqCrRLb4JUfKbBNHiwMN5mBNuFChef+Mzul+Z7+YdIY+wE3uvDWlFaVHBWdwINo+fGirQQqpQdX2oJ3bUZ3GIgJjDGA0HyeTNNpTA==; 31:X4AfC2tyT+VJtx+2BaGPHzU8Xf0IP+0SRyourG/IgrjEdGjZbd8l9PXSSEnGWEGffH9lPvRbqJOqF9Cq6wXxfHH44ou5j07JbIBZnLWDQkfSISQWBdoEyi58WqBGYh70wLuDuXQYYiSp8cGTdvl1Ap9nY1iplnc3ayilrpAKaMJ1ssjLEgUZ2zwNCP42iJ/opviivalg8nUhmvGPM5gevwjrGRJaAXrnVM5b3rZ8E9jZgGBst1h0SKsa1geM7ttOMDSkFm+gWJoPxe+jjRr1Hg== X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 20:VYtyAG0xBNf31Al4ZCGY5X7lijliELvVmaSrNwkTxWbiD+b0OcV2P39zr883VgYIrcgVMbZC2uNGRb4bwu3HbvT8LWiGuyU0CSredpZ6Ezh/Sijo3lOlPKK3YskmmvEbkxGmIqq64RYSSZCk33QjqZMTjPM7KS5Euqs/qGsWxJvr9l7TLHM8qfCIwGvG0HsUyl3UzzG41gAqNn9l55uqVtV/b/nWrzWRWGO02zXPdY1q2x85GIfSVqgzSdsVkgK2GsNuGkPnC7oYjooppO3Pn2uFxt6JNOfSurSyZ0h69SiPtCZz5fXZxw9+e2TYNMbYKEJwW2XJpYpI6bMSiLbBgiekAy5ZhpMtGPWvtfL5SkQZ6rr/Q5TzgGz0qdV1pQ1gEzbEDJnhpIqwcNH9wNDdKmzskGlrVPQ2bI7m6DEnicRQGyW9KM1CFvJuBW2/KlAOEAz06O1zFZbmKWLZJzVPFM5RJlzBpSp05rRaRCggFCRTXKCAB73XSGWPuNxxJNNM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(8121501046)(5005006)(13017025)(13024025)(13023025)(13018025)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:BLUPR02MB1188; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB1188; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 4:QS6xlqdHZWiFX/i5iYnIx0UkThqFRAsBouE7vhXD798xmOLNvsw4Zfc9dBgnoXm0riw2irlwp8xnfg7Mq54ecUDYKq7RgX4p8wWmbhUpDyYBp9J5rmotdg8GYyfzaUTREgC8Ub9PLIcHYIdNxVm9xQXTTvCZGX7X+3wSHqIYaXtJsx1YRewqUM6cSMEGT77EQccrMG17HnMowhHjRCLf1lk+QI+Ovfdjq9eavlYyvUy0cWWYAuYOGihs9vzBDHF8EBIndAi1FHhgzXn0tugxONrEmtux/mfCbtdeMC32Z7QmQ5hUezsi8r86ZXB1g4evWnmtgtWIVDIi5mEJuBWaWsOmf4Y6jULqQO+XE+HXxVVMmf5jwqyfi7S+zaM+1ZtTzjd/7w+2ZPk+BHHXgPIHuhiHc3YAxAzUlYpuyLgpoxg8yP+E4nm7SAGkTveC+t42n586urvaEVwqi/9rQZYZ25HqUKiMeWgP1z5ojJV21u0eCUdVfRkVmEsG+/kZDYt4VCZgTi//72jRo3syzld1OWGOIPEQjNA9vH2vvP0GQJunPGxzqusTBbvgSUMKgts/qyXKqrZPYKyH5rZ3if32mzzO+3sMpgjRvPV9dKfhFCmYXwWhhLihxYx5ddTyo6SHX+RoNRuB6J+yNa+tYv9A0psQMmkRlyeuK0OXRlPdWpYMPz9MOgApWgmRRt2e8RXENSoVxPcgeF0Sy8pe486cxqfwmOxGmRGAimJwkCgoa7xHGs6c75MbR8ohigMmq/WFdCh+oM9knSMhRcn5I58tedJtU8zeTtypG4ahhV6X7J5ocEJZ3S31pv2ANqs36tMncjB3nZmgOHcyUWbLzGV9RIDzkcoeLPl346L9V3oWRR0FfvnYNGM+K5MxTY++u6Cs X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1188; 23:lFF/6JwFIryKwpdkn9Qq/IY61gPMVuNE3wIc8b6eq?= =?us-ascii?Q?uGzxtBhXWBvpXHDFeCmv/J8Go5kF+Ug7Le3euwLkUKEXiox1eC7xmoPS9BFP?= =?us-ascii?Q?Jt1ESmL8HUgq+e5sAZnMNwicFJpAhYAGdEdLMEY4R3lJ72B302JhE6vbuQsH?= =?us-ascii?Q?AlIAMd24xN42QSViXWxHscvAvuI3RyfMkiah5gT28enFKENKCD3LgwAVu3Nx?= =?us-ascii?Q?1e1ln1eG37s5MuOpRi8vS8wbcduhCn1xA90UyA0+Cv8q54C7vTP0vGyzicjD?= =?us-ascii?Q?g/jNX8NgifY9xnyh1fjZAAbjlRrHS/7pOTa0WLiDGQurr+/MEr63L/2CXGAb?= =?us-ascii?Q?5k5pRJ7UC8lw0d7Yty7Wg+Z3mWtyjehQ6Wk+ErWQkTYoETlu2817GAChE5tF?= =?us-ascii?Q?w4T0cYlhYP6X7N72ZZAP1l0oygi4fEqk5UTuN14npD+y+GK3n8+MkUJzLwQO?= =?us-ascii?Q?vsrvPYEkWGnnKDZCn8/ttP/6cSxAybsChYv0UTtTt5HgItY9jQmHjDeY2509?= =?us-ascii?Q?BzbliSaM59ZFPz0beGEC7dTYGCprZ7Kp3bwEAZep8OMwSKWQpicj/0FByVYO?= =?us-ascii?Q?6GpYjUNZFwFvwCYtt/DJWwpHAxQAqiiZKJ3t08KVXXYI9V3QTGzBMJsL8Asf?= =?us-ascii?Q?X23ecG030++rrVD6WeI/Mdh5FG16xID8igKdJYRsqA+4VIcwBqXKXrkg0IXL?= =?us-ascii?Q?kaL8+krpZIP+r8KOH0qBzNZtA0D+VVq3slK17Mtbm0UKG06YPf1zlDUqmYHv?= =?us-ascii?Q?7TOGMsjMhQ0CV+aGnZn2QlxZhoPbvJkEz3U5TgZ5E2RezrZmmkBNy7LG4YNK?= =?us-ascii?Q?3Xd9T58acW1624SNUUEQjUlVKMlbMU3zyIIE6+jm8zlAT4NiKtKW+y1U+rGY?= =?us-ascii?Q?VAQ7vCvmdsPiuKY9NcCMLRhoc0iA9Ql23fVMk3ShldJf56Q8BGFmYqDsxyyu?= =?us-ascii?Q?EGD0q3771CGKjZu7NG2VSi7I1Y/bS2exdN/YtJz3CEHqsx3hXEhTiVmbGiqM?= =?us-ascii?Q?TWjrOQ+3drN3qbESRgB/96/M4eVX6TWbAAfJ/texr3dUWe5tq1KcLrpMM7+U?= =?us-ascii?Q?DPNWFwOdOVizZ9RXqf5dzW1bYd2?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 6:xgzwNB0835vCTEOCBQjL42spvX6RpAf5PvGx1TaDg5btlYO8MTfmIcuIBZbQboHGEEWlUDUDNgvkW34ApGQwIPniwo8bFl8QY9/TBRpuQVb1FhNKMv2VyT1mfEsD9gRK6UHc1kIZMTwfHtX1oQkbhNULyH2TIBUQfHkazDix1z+DYIQQVFpEiuu7260iNEnIE9RbQl0OKqqPMdrZcgQiJov7tymcnHPd45ajaEU1XBolIR42H6l/6LIaWKC9pBJSBg+9oENruVoqgsQOAAT+O4mNMU3qqvGU2Gf/oEqYxgCVLBFIDd0W90qxzoRaBoVSs1ta5M18oIjNMiU2PL3Z59dKxLphDEclrw2KkjDihrMKfRluzNI5dfMN0o8gBxtAMFJs05CNfjwZqu8tP0YK94bktV7yYd38KfQZ6+CGO3ix1jxyvdMnacWVpD02vIzrBnsSgVNE4R9J/f+k6nb+8VuLxlFIVN0Z3GKmcdc7CNk=; 5:pwi0k5hqHaTu2I8lmgaVv8MRXnqufewJeM7wsI45TGsGyGJWguOT4lW6v+oE3Z4HVSud7HhtNjdyErN3eq2cm5u1BVuP2i6+n09QhCjOuug/zBKigbqUG73Szyer/geP76GlUfU8D3dBCF98zU773NaT01PRDnw95a85X6+MxJc=; 24:fX3OHTfQGekSvu/1yKT2r+Htp7UXOAdM9g5tc8Ot5GS1izm5UaSkFX5Cw5SroOEUggRAee1foRS3mTBgEvG2wcd+oRy3mKp0EFEvKasuDHI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1188; 7:DHfqTWbTFUpOhWIfXxwShat9n8BnLj227D/cbJGsuHfdbvEMzQHM/J0ojfMMIdtJyDyPQn74XBefN4cG+REh9h5Eu8N8Wkwqu13Z/tcxVccug5V86IbrxrFYdkk/4+Nwmch8cpCvs+3TvnOoJwrs6vYl0jDhoCA/1Qc7SMS7h8U+Ecvwvwib3G74jiMjkJici1hwB+DDJfYKIIlC/4xXqUNsPCjcJyAgeSqfNBrWJ4QrZRvabmvzmKaplLwwz4LfuKmBZbmJpsdoQPXRyHWLcDo6/Lq5KzD7xHQ6HpMpjNrHeoMEWF/owfrqiSP6wjqXOxsWmzj1CSY/3dYs154sNw== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 23:46:24.9760 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB1188 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.67 Subject: [Qemu-devel] [PATCH v2 5/5] xlnx-zynqmp: Set the Cadence GEM revision 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, f4bug@amsat.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: 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 Reviewed-by: Peter Maydell --- hw/arm/xlnx-zynqmp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index bc4e66b..e41b6fe 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -30,6 +30,8 @@ #define ARM_PHYS_TIMER_PPI 30 #define ARM_VIRT_TIMER_PPI 27 =20 +#define GEM_REVISION 0x40070106 + #define GIC_BASE_ADDR 0xf9000000 #define GIC_DIST_ADDR 0xf9010000 #define GIC_CPU_ADDR 0xf9020000 @@ -334,8 +336,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) qemu_check_nic_model(nd, TYPE_CADENCE_GEM); qdev_set_nic_properties(DEVICE(&s->gem[i]), nd); } + object_property_set_int(OBJECT(&s->gem[i]), GEM_REVISION, "revisio= n", + &error_abort); object_property_set_int(OBJECT(&s->gem[i]), 2, "num-priority-queue= s", - &error_abort); + &error_abort); object_property_set_bool(OBJECT(&s->gem[i]), true, "realized", &er= r); if (err) { error_propagate(errp, err); --=20 2.9.3