From patchwork Mon Sep 26 17:49:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 675308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sjYm807F4z9s65 for ; Tue, 27 Sep 2016 05:23:35 +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=1FE7G+GN; dkim-atps=neutral Received: from localhost ([::1]:46313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bobUd-0004Wc-Vr for incoming@patchwork.ozlabs.org; Mon, 26 Sep 2016 15:23:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bobTx-0004Ef-JW for qemu-devel@nongnu.org; Mon, 26 Sep 2016 15:22:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bobTu-0004EP-BO for qemu-devel@nongnu.org; Mon, 26 Sep 2016 15:22:29 -0400 Received: from mail-co1nam03on0070.outbound.protection.outlook.com ([104.47.40.70]:35776 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bobTu-0004Dp-22 for qemu-devel@nongnu.org; Mon, 26 Sep 2016 15:22:26 -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=jBIPbaKo8X7d3Fdmvg9Ek3Sk5t3759IkWNk3HGlQm0c=; b=1FE7G+GNNj/Qe85d3enfSODTmzjEG1WhOUMeaSrZZ3onCNEt6ua/lpt6v8e3TfG2Urn2Fs8uczsJkn7mXmz9dJvFUKPEJFJ8hLo4KGDTbr4UUQRrGNDP4ko2cuKx9Dp1qt3WBJCOeDLwhtyXPIkePStWwqMGA1yiz0/jSNb4uLI= Received: from CY1PR0201CA0010.namprd02.prod.outlook.com (10.163.30.148) by MWHPR02MB2896.namprd02.prod.outlook.com (10.175.50.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Mon, 26 Sep 2016 17:50:43 +0000 Received: from SN1NAM02FT034.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by CY1PR0201CA0010.outlook.office365.com (2a01:111:e400:58b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Mon, 26 Sep 2016 17:50:43 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by SN1NAM02FT034.mail.protection.outlook.com (10.152.72.141) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Mon, 26 Sep 2016 17:50:43 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:38738 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1boa38-0001ai-HS; Mon, 26 Sep 2016 10:50:42 -0700 Received: from [127.0.0.1] (port=35565 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1boa38-0003RI-EL; Mon, 26 Sep 2016 10:50:42 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u8QHhXWI026810; Mon, 26 Sep 2016 10:43:33 -0700 Received: from [172.19.74.182] (port=45852 helo=xsjalistai50.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1boa37-0003RF-Ou; Mon, 26 Sep 2016 10:50:41 -0700 From: Alistair Francis To: , , Date: Mon, 26 Sep 2016 10:49:33 -0700 Message-ID: <33bf2d28326d22875602234b8b15cf56fb678333.1474911607.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.7.4 X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-22600.006 X-TM-AS-Result: No--5.163-7.0-31-10 X-imss-scan-details: No--5.163-7.0-31-10 X-TMASE-MatchedRID: rzY+bqBadmvD5Q7f7wyexMnUT+eskUQPefRUDjfKfTqdYFRaUAqcE8Ht HEmxq9+YVuP44bfDgDXyb36D8XbVhSkos4L2dgO+A9lly13c/gGZ2scyRQcer19eTSR8I6duUl8 +I/XKXOdRUHsj/YINIP1/2RbvJIzKSJvHZYIIxMhH+PTjR9EWklctRqnPrLuBmyiLZetSf8mfop 0ytGwvXiq2rl3dzGQ1iMxD00/EOHOXrSMPIW+NNa7dtdwCUZEl/TmN7fs81LsShl7jYi/ukg== X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.96; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8676002)(81166006)(81156014)(86362001)(105606002)(189998001)(50986999)(229853001)(36756003)(2201001)(118296001)(107886002)(626004)(305945005)(5001770100001)(106466001)(4001430100002)(50466002)(5003940100001)(48376002)(7846002)(356003)(71366001)(8936002)(586003)(64026002)(33646002)(92566002)(4326007)(2906002)(9786002)(85426001)(50226002)(11100500001)(47776003)(19580395003)(19580405001)(5660300001)(77096005)(87936001)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB2896; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT034; 1:nPfNF5IqL9I4gl5WWVeUafjsOzFlVZl5mtHEei/8gk18rqw9lNZjN19EKzy6Olv4viBCqyvKMPGuEcy9+zaz/wwfj5wB0Y2AIWsrc67FMGT80xzfLb8L+BUTb2giYHgmYbfxsIadv2D3yUr4u0lPCWdAf8Qrn3H2f32S1o17LyecrEgJkcghqUt7LHGYdnrt4/R29ypBqOSqgZu0dXW8nw7KZOSyILGfdaGlaEj4gddBXlMx3ArADExmCbeQsvOdtAMtwkCxXUATCoeR1QNhFyvCB8hs3d6PW+UJR+t8IkJPXY5TP6sFePedyKApBctdgOShgBfQ/cn6YVCGIwLDbEILAXb48a1DASLrL27/Hr5wPk1yAitfYdHI3WpoGprzw4aYoTa5y9PM2sS7mXQY/ViUyjAD3IhBfbAf7VUPrw1dajzeRict9GJexzlS53CJrljOLOfxnELeOiEgnAxWvWpF4EQyRpxazHQMVIa3GpPX7iCjaIDuGqj3ybL0iko98HzGJs1Cq7rmQYS+zxpN0qZAp6/Xcbjspnnt9/SShZ0HocxzhAQaEj5cGJnel4jbv9p3rTFCf0NW2oW3EO8sSyr6pKqsCqg9x1sm8ErAiVQ= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c11c1bb9-9752-4f88-81d1-08d3e635a326 X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2896; 2:WExyiwHe8anVI0JpK0fapS7xZatKlp1bRgaxwAHddY6GLHSSRxxSOo/u0guKEUCIuVQapp4YoEpvZyGz1JKXBe0UA/ILhMjCYqkFnxv/pYiUnBxLWJGZwjktzRCEgkHx9SS3CCH2Ve29myg9JaO5mW+4wa6pOdOzjhp3NWaEaFhpU2muuffgOM48TF0fj7sB; 3:OVZCdZKsxvgfML5trRxkemSzP7F37RE6/UpxqDbuRn7X//oP4DqikCRCqkDvJKISi9U+cnyt12JcOLW+LRFcy208VBLvheFOIWZIOKBKwlrAT/k7/4MHmPVxUP0Y+yfdL5lZJKHsELI6SGFLDd7TbLSm5GnX4A1s9dqRXxa32Rro/Y/zda0ZxLHDRPSm/ApMXtJYoWvG1sOnTlqVdkDvbaXWGfuJslhMe+OmN6kzUe0=; 25:fH5T0H5JdtsC2492nVA4cUOakPRqF6VtqWEBaN2D/m5AG4txrh0mo3ZDWTxbwRbqcv7rikxuKyXzFrmp8PnWSHB76wZL2U7OmUJJeDK0rpyakRYWFigjbH2RKye/hABW4UPkMjtzNIRBlcYSX7ASV+MTwxcxNVaHU0MB+Vs4Rp0Cnidp7MX1HeMTjDrmU9hqCvn0IbfXCDX+622RM/M6M4pUJqx8oevVKELmaLgQ0UKDROaE84F3fGvuOJ+8C4zi3KBOoOSl70I1oBwHOyGRC29rxOpQri6k6qwS+NYSeAtvV1g+k8dP3BaQe2nNOJK6SP6LDhlCE9vdGuncLs71e3gzCpS/xZh3M+hoBpHjDNq+FoU+0DZ4ETF+cxuOPLQz3PEUdF2nGBVnl69B9hk9bEvVMA8+Frjjm9pTcDdutng= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:MWHPR02MB2896; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2896; 31:4kdXTJeq/1a6HpMiNmoq48oBqtu4Uo4sLvgVFKXHaQGjS/CEOhBF9U1zGFVIeuCBalvpql+2U+SuCQyCaIuKrxhpRw1DWe0UgoUIvOY7EGBP4uowQ/3Y/3P+PW5e/nuDFYC7iKBZI6hf9+zXKShuhfvo6wX+9BwTVpcemKrVuYmQvkPEA+APkUEjc3c8Pn1/xX8E7f0xLLNFICOUqWmUcFhiig0DD3DkeMv4ffqY2tI=; 20:AgJH1wtvKJTqpIo58Y3vYjT5NU3+h1irnqS7xejaqyQ6jLpwKzaH4tcGUi5sUFJ4ikrHiIcmYRKjG42VaXXy1YgqoOXyof2dfmZ4IjJ2D7F61PW0ORdDD95nQiR3zRs53d3KtHxMeQxpBJLq5B/XuINr4kEIqss6rNIoRzB0Ad18Ohuds/AESRyyBdSIqYFamR4ZDquYkkS4KWLMlrlgShsLJc3eFEsQ0zWH7iIlxBdQqVKSqG2jJIU+ZxHryk/ASisbu2VLIeiGWGBCKRKUoMcquoR5ITruX+Csd7gUieC7bM4qXNWiMLKC5HThYEgbvyoQN/7xYn7HiZ/YZzR78gD6YEPHIvOu9mBKV4xm2jJp6PDlfSFFvanNVW2kYyCbHK4HEA40pm2XNnBEXSkIt28S09vDbN6i2NbHAYbxu1IzDKBozQC5Z/zHkoYE8NgKvtiDqG6c60KByUiDofGRmtabyZ0a0YHFbctfEdCmIk4X2D1KY/Qp86uqQRcOSta/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(13023025)(13015025)(13017025)(13018025)(13024025)(5005006)(3002001)(10201501046)(6055026); SRVR:MWHPR02MB2896; BCL:0; PCL:0; RULEID:; SRVR:MWHPR02MB2896; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2896; 4:04oz1xPJ9JKZKHVIHl+2vOBgVjnjErFQi0Wk8PIvOZkaXYzyvl1M6uzDd8BbyPsF59LuyXw5WdUWGLev2PKXaw2vNiGk5NNEGVHK8kvl5s5pW3d2RHiqLpUqujw6VPtEWlMJxvo92P3bUndSLQ7LDje7uxD8sLD/vU/afZQQBEC5yRtLNlobyO1wN8x6SIF8TIbMy5N80Qki2Hn5fqf3Ct4QLEDz+VvMATKO8Om/3wL+wDg7dHdZpqKywxpOI4LUZUgcSUjZJzVetHcBZSyDDIXiZwiO6QhHV5Zuyf41obn3S1PMWajfW06SUjTxD/oKmsrS4zEQ6VS/Ye22d1rn2BuAf8A25+zZH4psPYV0uHO+CGXAC9fEg01lrn7DV2sr+nkaAnFVtc6XkII8LQ9fenVT3pPqQnX2WVib0vOQgJOZsPBYbp1UzjN/FcKyAxffLlHA2x9ChYgPs2MVQizraqdtQ3RjoOY6wwLDQrWxFt15C/rcqc3+UtCcIeXneF33UBVAKZkDfMw+iKZKOTl3ycMuD+lWcSlfisWcPV5iNcY= X-Forefront-PRVS: 00770C4423 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB2896; 23:MEm8K1Idl55KamPnHVH6cLTrrH/CjdieMy/eS8/pf?= =?us-ascii?Q?M9sLxQUwp3PJl240k0Wk2ouRuCbZ/O/38NtjsPzV0NFccIdQh6B2SkIYN+aS?= =?us-ascii?Q?dPzG7YXD+msaWxt7dn69Qkp9ElLwd87dba0Y6v/wCWadiCxXSVrAK4e3tmLp?= =?us-ascii?Q?hJpvhgcb3MVBiw1csumyj+nk9jrEwKXi4Ese/JpBMvYDxNcZyTkRRtNCbsoS?= =?us-ascii?Q?l5+YbnL8pCdp9YAMPanlw7IlzWD7SBq4PY4ySFDTr4ok8mmLtz5VPB2pKygh?= =?us-ascii?Q?UWzSY1s8+S251hvtIDscYMIOVucbxsk/dJuUb/42WCRB6y9oN0DQhLG8tubP?= =?us-ascii?Q?Uvg2u3d3v9lNUheCiJ99e4PNV8NtUvVpL2qyrJrLQVq7rtORSB5QvP95t7wz?= =?us-ascii?Q?BSbY5yPd7hnDQ7VAu9EeCXNfCe1C5aOxy/sbQbLlbQjOhHOoBF6rBzqe+RSF?= =?us-ascii?Q?D0K3VIvFmqIcad7P0b2HBSbiTjjyZTJ/kaR/uoGt6dds9AXvaEGWqagITvsf?= =?us-ascii?Q?zVWjY89gN26qCs1FuFhRpdvlzzRZdlDTB1SqcCQibf0fkV5bh7WvBRAHycYs?= =?us-ascii?Q?HaHmbeGzJemJ+/WJa23Z/BiJDycJduKVdyFcl5v/av4H8yMm0lAF8R1KqWen?= =?us-ascii?Q?nA99K0gGFOePFysDxUYY5K8TM3dgj4m4TpptXxq8+5dD+DbTdipHrWVHLE4E?= =?us-ascii?Q?1jd/eT0okS1DczXYKpiHb4W2pQay/vsRwqvVnwq68Q5fnf+feepAMYfn4WZp?= =?us-ascii?Q?y+ANhXHeVrYWDCL8YWhajW8d94+AoUafHn4d+X+J/g0owbGC2kIqwyVH0NVS?= =?us-ascii?Q?Pvf6QORUYeG/cOReVPXYcTKlsd5UHgFaQkNmKdVgQo+h4LXWaZldrBiSDBOg?= =?us-ascii?Q?Suzb5W3kfAFJOufEXY3x68mbNgVutLtrotropjAqOTPxxHcRLw42slOsvMYi?= =?us-ascii?Q?MSv/CuPAcJYKp7ESlK22Y5d7AsFpfD+/+yzu55bWZhkUq7x1ENLGJlO0TTrA?= =?us-ascii?Q?3EqaNlxRCMz0i55HqUPaUYC1YaD+fUDwzpMniHdPqdNWpdIVFK9mrxOnntBE?= =?us-ascii?Q?JRhXE1uCKZIK/swXTIK5Ymw4yKaEjm83LKBi8/UEyxh5SZA0vhCLtaEcvjCq?= =?us-ascii?Q?qq7JwuNuIZ+hFZJBdpQ/0r0KfKoT/xRNce7m9vjIInDj7GZawd3QEyNi6U8t?= =?us-ascii?Q?ZfyjkUnuHQIbOrQxl49VqqRN0gGOn3Jkz+5?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2896; 6:7KGTPaMy0pc3L+Cg6TQc+gFgOb3fGIeLx2JP4XZXJXgTHfnAUkVRFdsht1PJvfQOhEiWEwDzZtn4Ar6vFWYOwjSwFCR9KovbSh0n0OG8o7bbJSPXsjTe1tpco/g9X5qFpFsq+8aGhzOwLTcb6ISnmGNxSeEQuuGPdTF2NLotzg/f6YoOtOdPvxuLvMk4KTeS+7cSNDenvpA0petAG3ttqmErIU8wTN7zVGOSZzgZIrfgtRMQKPffaZW2gh21Le0nJbyoOYhNKY/uznWfjVMACunoa7iNwjsz1f53ibI4RS+jVPnOS+mQ1yEgZmTgJk5o0rHOnTd7mwHdHbOmRkgnyw==; 5:kvvVAMb+U0vkEjflo01zwlArR+/VcmwhUtQb2FhHf4s6JW5lP6ZKFZEgwU24hn8j1LeakJv1gqtElV1W9FJleaE3P6i2T0iKW0+aWjDg8rk/XubChxN9T+m3FSd3ScfZo56AbQ5AACB7KRGF3TxyMA==; 24:61E7KVLQxEccVo5P9MToQm7tf2lRmsAKn4mL8buPhTc1UBWBsZni3O/1f143AhZcaztPTA315XytCiE8nGWBfgoAoss8mGdYNlN3oU2bM/0=; 7:cZPCyHySBNl2pL6fYX45cFZcKrx5hshziB64mEy3YB+7+ffSX131HHeTwdPlledoaQL9WENZGGOx7H+NTZTRXI8FaJ1A5pA4LSkHZKlIFuV25/qtihKJHHLQpquR759l6M075toflet2+f8LE2oTpMG0jqlvRnJ23RtDdlYL45qVcz2PbHOxN6ghZaPgYee101YgUx3Hy+I1EtdrIRcE2sVf0dcjL9M6A1WLb7OdHZnyoK5IzRIMaDprt77oYqTLhP6pEbR6yrZX/joy0nwxOQtNAoN4nu+mZ0qQA8j6TTeRR6PFujBN63Ht9Io1KFm8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2016 17:50:43.1893 (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.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2896 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.70 Subject: [Qemu-devel] [PATCH v1 1/1] cadence_gem: Fix priority queue out of bounds access X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" There was an error with some of the register implementation assuming there are 16 priority queues supported when the IP only supports 8. This patch corrects the registers to only support 8 queues. Signed-off-by: Alistair Francis Reported-by: Paolo Bonzini --- Thanks to Paolo for pointing this out. hw/net/cadence_gem.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 8618e7a..7915732 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -147,25 +147,19 @@ #define GEM_INT_Q1_MASK (0x00000640 / 4) #define GEM_TRANSMIT_Q1_PTR (0x00000440 / 4) -#define GEM_TRANSMIT_Q15_PTR (GEM_TRANSMIT_Q1_PTR + 14) +#define GEM_TRANSMIT_Q7_PTR (GEM_TRANSMIT_Q1_PTR + 6) #define GEM_RECEIVE_Q1_PTR (0x00000480 / 4) -#define GEM_RECEIVE_Q15_PTR (GEM_RECEIVE_Q1_PTR + 14) +#define GEM_RECEIVE_Q7_PTR (GEM_RECEIVE_Q1_PTR + 6) #define GEM_INT_Q1_ENABLE (0x00000600 / 4) #define GEM_INT_Q7_ENABLE (GEM_INT_Q1_ENABLE + 6) -#define GEM_INT_Q8_ENABLE (0x00000660 / 4) -#define GEM_INT_Q15_ENABLE (GEM_INT_Q8_ENABLE + 7) #define GEM_INT_Q1_DISABLE (0x00000620 / 4) #define GEM_INT_Q7_DISABLE (GEM_INT_Q1_DISABLE + 6) -#define GEM_INT_Q8_DISABLE (0x00000680 / 4) -#define GEM_INT_Q15_DISABLE (GEM_INT_Q8_DISABLE + 7) #define GEM_INT_Q1_MASK (0x00000640 / 4) #define GEM_INT_Q7_MASK (GEM_INT_Q1_MASK + 6) -#define GEM_INT_Q8_MASK (0x000006A0 / 4) -#define GEM_INT_Q15_MASK (GEM_INT_Q8_MASK + 7) #define GEM_SCREENING_TYPE1_REGISTER_0 (0x00000500 / 4) @@ -1372,13 +1366,13 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val, case GEM_RXQBASE: s->rx_desc_addr[0] = val; break; - case GEM_RECEIVE_Q1_PTR ... GEM_RECEIVE_Q15_PTR: + case GEM_RECEIVE_Q1_PTR ... GEM_RECEIVE_Q7_PTR: s->rx_desc_addr[offset - GEM_RECEIVE_Q1_PTR + 1] = val; break; case GEM_TXQBASE: s->tx_desc_addr[0] = val; break; - case GEM_TRANSMIT_Q1_PTR ... GEM_TRANSMIT_Q15_PTR: + case GEM_TRANSMIT_Q1_PTR ... GEM_TRANSMIT_Q7_PTR: s->tx_desc_addr[offset - GEM_TRANSMIT_Q1_PTR + 1] = val; break; case GEM_RXSTATUS: @@ -1392,10 +1386,6 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val, s->regs[GEM_INT_Q1_MASK + offset - GEM_INT_Q1_ENABLE] &= ~val; gem_update_int_status(s); break; - case GEM_INT_Q8_ENABLE ... GEM_INT_Q15_ENABLE: - s->regs[GEM_INT_Q8_MASK + offset - GEM_INT_Q8_ENABLE] &= ~val; - gem_update_int_status(s); - break; case GEM_IDR: s->regs[GEM_IMR] |= val; gem_update_int_status(s); @@ -1404,10 +1394,6 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val, s->regs[GEM_INT_Q1_MASK + offset - GEM_INT_Q1_DISABLE] |= val; gem_update_int_status(s); break; - case GEM_INT_Q8_DISABLE ... GEM_INT_Q15_DISABLE: - s->regs[GEM_INT_Q8_MASK + offset - GEM_INT_Q8_DISABLE] |= val; - gem_update_int_status(s); - break; case GEM_SPADDR1LO: case GEM_SPADDR2LO: case GEM_SPADDR3LO: