From patchwork Mon Apr 10 23:43:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 749286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w26NQ6jK0z9sN7 for ; Tue, 11 Apr 2017 09:49:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="2kset+De"; dkim-atps=neutral Received: from localhost ([::1]:36481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxj3k-0003PP-De for incoming@patchwork.ozlabs.org; Mon, 10 Apr 2017 19:49:24 -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 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= 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 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 (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; 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 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Expose the Cadence GEM revision as a property. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé 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 +#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] = 0x0000ffff; s->regs[GEM_TXPARTIALSF] = 0x000003ff; s->regs[GEM_RXPARTIALSF] = 0x000003ff; - s->regs[GEM_MODID] = 0x00020118; + s->regs[GEM_MODID] = s->revision; s->regs[GEM_DESCONF] = 0x02500111; s->regs[GEM_DESCONF2] = 0x2ab13fff; s->regs[GEM_DESCONF5] = 0x002f2145; @@ -1519,6 +1521,8 @@ static const VMStateDescription vmstate_cadence_gem = { static Property gem_properties[] = { 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; /* GEM registers backing store */ uint32_t regs[CADENCE_GEM_MAXREG];