From patchwork Tue Apr 11 22:30:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 749687 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 3w2kjD2Bvnz9sNp for ; Wed, 12 Apr 2017 10:06:06 +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="TgCvqypm"; dkim-atps=neutral Received: from localhost ([::1]:41610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cy5nP-00008y-He for incoming@patchwork.ozlabs.org; Tue, 11 Apr 2017 20:06:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cy5n8-00008h-2k for qemu-devel@nongnu.org; Tue, 11 Apr 2017 20:05:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cy5n3-00016Y-3y for qemu-devel@nongnu.org; Tue, 11 Apr 2017 20:05:46 -0400 Received: from mail-bn3nam01on0072.outbound.protection.outlook.com ([104.47.33.72]:44017 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 1cy5n2-00016Q-Ic for qemu-devel@nongnu.org; Tue, 11 Apr 2017 20:05:40 -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=r9gunxYQxOhd8po0Ur0Fv9uqjNHEQ9bPzm1MpNJ3lq8=; b=TgCvqypmiUCCDfzgqY7xxrgBsLALeMwVjKIhvw0WHW9bu5kycv6XgA/jvnsMmC/HSpKA4TKwIixgwOc8fyg+hHQxtRputrAGoeUIKs0BL884Wm590BIHxIg5FSTqg5JPytmUpO8n2wqQEQseUHinWBTYZ/cpn4qfRsA0sGvXJ9A= Received: from MWHPR02CA0019.namprd02.prod.outlook.com (10.168.209.157) by CY4PR02MB2582.namprd02.prod.outlook.com (10.173.41.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 22:32:51 +0000 Received: from BL2NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by MWHPR02CA0019.outlook.office365.com (2603:10b6:300:4b::29) 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; Tue, 11 Apr 2017 22:32:50 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.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 BL2NAM02FT062.mail.protection.outlook.com (10.152.77.57) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 22:32:50 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:43777 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1cy4LB-0005gj-M2; Tue, 11 Apr 2017 15:32:49 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cy4LB-0006Hc-5T; Tue, 11 Apr 2017 15:32:49 -0700 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cy4L9-0006H8-5R; Tue, 11 Apr 2017 15:32:47 -0700 From: Alistair Francis To: , Date: Tue, 11 Apr 2017 15:30:17 -0700 Message-ID: <988b183dcf951856d8b3379f7e911ec95233bbf4.1491947224.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22998.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)(39830400002)(39410400002)(39450400003)(39400400002)(2980300002)(438002)(189002)(199003)(9170700003)(2950100002)(50466002)(305945005)(50986999)(63266004)(8936002)(76176999)(38730400002)(2870700001)(81166006)(54906002)(8676002)(5820100001)(5660300001)(36386004)(33646002)(50226002)(4326008)(6666003)(39060400002)(118296001)(36756003)(77096006)(9786002)(106466001)(2906002)(23676002)(189998001)(356003)(47776003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB2582; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT062; 1:u/P7NrifanHDe6VMrIDAgvF6JQ8wmDX/J0D0c8L7L7oGMdfQfPQx+ZZoAd9frdLKN4j3MulJBw6wgE2oUwqYkA3NhTBilTDIlw3LUEgQtabGIxUJkcWHqihpfgKAEZGoiDOy5xwRkjwnwwof9tF1uhKFLlcbL6G1CMccI30Clv6T40XqulhTHYUU2nsdnFtcn5hIiKZNsSM6BZEv35FeRir2E6z43BPpQm0kGyrx9OkhDe+1Hc1/lld2wmzSbolcCmdLXtyCptAQ5YlbmPSMTpfb2DimNc+GRANEQMUM+YHwZ2f9YpBjGL7I0UFaab3ynBjjGf5HqbRfnBX04EEn9xNsRVv81pIIhq+wuLXjsXTdu9dA9P4NlzrWc8u+v5MFskNYO4/qu+CQ4hf+IQI+lsOKWjdTIBzFHDyHijd86RnOYyfKhU6suDA9M9tQV9fRc8qgJcO3cp/W5kXxri9WFv4YZMkc1+YK+UHFTgRqOXWb1I0YcHEVAOtpaoiUjjTmuoIjZFhlLwSfsXzv8obGsHKxr2P1TQu6XPl8F28tgvKT92xOBOgzsZBUDEqtk0CY X-MS-Office365-Filtering-Correlation-Id: 4e5e976d-fb71-4702-f482-08d4812aafe9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:CY4PR02MB2582; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 3:ahEk5p/jM+Trx3h9qvi4QkbOiayzn3W4ppsTYdeY7cTc6foZ7qu/tOK0VLM3y1D/KkSg5j59BX4hJVwhsO8vyja8yuyhug6Tu7v3tQLZ+V9+aCzp6yWC39re8Qd4qpy1xuS1f/fCxFmaYna5Fp6SR5NKg0TEFafOEgEvWmtRHAMMtZRk9LVwrvtKgeeri9a9WLPef4Pri19fuEBnd/ot5Hx5BhajMzmqbLv7lZn0J/d9/XD27cIu+i8CjQttxegTykl81eAHIFLECsHJPs1r7u0phjCB9ZSQ8QojRdPvmyN/Y1i0GT5w/cpM+HIVwLa3ptEjn6eEgrJOPXMCDvBWDrdrOf1+DFil6cpxUaTOWMlGdDd2RVKj1KmvMJOeFSakjnapyv4i111IxpZ4cRNl6IMPgkG2sKLKrBqzVVaYPzlZ9JnH/t0fQNimD+G+1r4bJ7wEOvoFNECj2mzlyUw8OxCiuOGcc4wK6519VBwKbwsbBjokMUdrFaVKOIcWlKMR X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 25:ZTBQrpMr6U2BcNRs6viPXN8Tdk3X+XUVnDgM+9T4Ucr08SDsxjCF3P13vNgfg0NgylY0SIAoQMUu0WT9sZBOb3hITiTWjTA3MVZd6vF5dH/t4hNCpgUUij0/Q833pKjTUiki29NEuoYHffZe1VOkT+VPYGeiCl6UT0tk3HKVZpjyyxVgA+ZhrXHcznh2Yz0IlenBZKkHbrH5me+Brrbd64e5nwGuytPXl3y59zkt4KlItiV8lpIRydyzY+cKVlHPBXvpTtC7F7Ws/Cuh3KkPIW9crCnMR0QsRus6KDGeH0HyR54KrNb0a9ocUj8ApPYL9tIQ4JbTRTrQg/m9hg0SCIaH6MyBHztxdkrL90tCdX8pS8bAR9mNqgXp+LjVFSeiHs/syMMmWDAWLv2nZBOttg8y6otnYmMwGptk41f2dLzCUUDW9pfim7WYMa0ZmwR3zN2ENjinkPvICNOr9ZYIBQ==; 31:MmcGplpJlgDUyRGd3ra/bWr44ZmQIpDl8aXrg5Otj/0xxXaSjVquh2wUuSkiOoFAzdSYIADQSPKypqXG1Xp7lZIuI4zypFvwB2zQCLoZ4Zr0VUkj5UTu3uyUxH1CzPcXCCjioPO1VfgwOkDLIw9FDq/Ml5DUlPYI8mBbY6+HczQ9j5Ek/Cs1MvoCBVxzP1D21hj0FKl5I7aspzOOMnzqPhJCial3QTmQMyH54wQqVoNslpRnOOwOAApO6jr7vLdcbToGY6MvPMuq+ZTUnqNU/dwV5Em7HJgGoN/kZnHHCFQ= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 20:oBl1//9VaXo5R6AqnaPegeWGfyIuR6nx16LEi1irZCR/h7qp0DWE0ueO5Ccn7ZmgGsXB0u6GlZmakBFrphoiYuiF2nQn/UHkNOjitgxlxWIrcLy8sJt1rOCgNqk9vGpX3Pa3Tf7mzjyKpg8xkifnhm2fpaVhIqc4qBW521jS2qO/T4WoH9VkVt8XM8U3E5NMlgcfv6eBLobsenoMIayXMtt5HGQOnAltjKHiUHVxvNo3J2wHnSquTIvJeE4DXZDlT4YOYO8CDaK/8ccz3ynmkU/P0oL9XGibjnkixjJj0Tdvnei2GEO99CAE+LOstVQaipCsm5qpG2HwUGOv8Fy+GdX1D10F8ueuA+c5Y8owPzNuw23qth5CyGomOZXALm+29VcHKaKMdQFJfiE+kricWGcpoRV1z1GTXCCUTo3K3PeOs22IKwwzHWjqvlpY7jJXWwiLDlMUulDz9OeH27IeYWMi5M2KgvSUqyPPxp1szMWdxVBl71ro7cH4SX40afXD 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)(13018025)(13017025)(13024025)(13023025)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123562025)(20161123560025)(20161123555025)(6072148); SRVR:CY4PR02MB2582; BCL:0; PCL:0; RULEID:; SRVR:CY4PR02MB2582; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 4:Lg2QKERgd31JPkczxGt27pGB/Ql4g/Jkc19R4DbXNiAjhOQ+HOR6l3yubxpGE4e8XNelipOw7rh9R5Obm/JMuzJiyRoA9u4i/bwSVOfMDTFNBXNBO6nJT5aP30uQZuWKM8EjkIsFRzF3XU+f2mZn1V8gvYIOGtDchXtvnZiAJFrlP6QJ0bIVfDWkN0qoVm3legS/gKHIeNnDRRuw9IahQqymZgkoNoKc74WZk07o1eca+02JLzDqF4Km/72M8koR6+ScYwN3+EPg5k/pv1ru6HlpyNYY52B4NPRojRdBF5PMEHddwugCHZW7Ly4qm05M0Bl1VBkYsxLIk8zvBvWjHXeFOt5ky4xmgbuSEAb/js74tLbgWXh2VEjPlE6TW5c5VgkYIJeGh3fGdvPcWO5J8GWY58bgcrrNsDU+gwwkWulTP3hAI6KhN51o/oCMu86/RgNanzJIcYODfCVQ5r3Idij0a2P35uzffZep0Ed2lRoltiI3rImTSYfFCFNOZxyLD2Fl3ns2fGX0u8c+qCDnw6nLegD5lzv3TOq7PmtkgEXvK+wQOLHrYushMnyvXTnBHObTc4hf08AYBaKVEKSlc1YAYJAF7h7cGgJP5DThAL9uQnkixEIoCBl/JpsxL3GKR6TWP2c6avu1KGXxtOJ5aESpO0lFMa1kY2zbjGqerRej8t0IqvKss4KboBtEjaThPS5l/DDed5hm9Wualt+GAHb7lEdrETxJa1CUrT0PD5zgQN1DtscyYXhoV5XmK2wPOkFQKHRUU/swVfZlrI/pWUXiGHBDmf8L1Z3dTJce7uratlDJHJ8yiLfb6mSq8AOkUdNwOQmaRM/EKJFDJJOAxaYaAkhyf6SKkanGS5FS9hMCxmRPa2oZJVrxQxkPHvwX X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB2582; 23:5VRXvqIuIllrZJqqmhfnvK1/AwYqCKEUz1brxm1XM?= =?us-ascii?Q?YlB84xDuUSElC2VsPd05UAC+PZgh7x/p+yR8X+iqDN9i7O6qRE35902F9rAk?= =?us-ascii?Q?/lJcqc/V4qkb08+DKW5ZnqLR5ixztkpjiM9xdc6S605UjDlpe+xiMDyvXHL5?= =?us-ascii?Q?Rg/jRZJw2G9S2eB6So3VFDXP5pWsf4ouCzU3a+leOAmA+Ubjzs+Yx9Bms8Iq?= =?us-ascii?Q?4Iv+s++N9DKvzqEWwNlm6WlR7bnIjzGv7sxq05gJv5eFJ37B5maAU/TN7YfR?= =?us-ascii?Q?w9rkE5bupaPx6/nmknsxMg4YxI8tBpy3Qxvsoh6IIm8Tgiep6/mlBGmaxWuL?= =?us-ascii?Q?XueRwVaN9vv20yp+2hj6dOoOEv4auHtChOSZ97doxm0XOyF/YlfSRL/SO/yz?= =?us-ascii?Q?LReCthTsRYBKCtP7BAA9+rPaJOrAbZEG8IEFhLM3w+C0nkMH+gWvFCCbpJeL?= =?us-ascii?Q?dKx7mv5fXyW37Ca73mnD9GOG/rGIWGQVN5AELqrETC7WQx459hvqslqfO7yW?= =?us-ascii?Q?ml/D7UrAha2uVplxM0329ajbz9CdB0n05t+O9l4C1Fs1XiKPtBF3l/dQwltg?= =?us-ascii?Q?IHpWXrBCzxBcrp0yqzFAHGPcY/sWE7GVsvBD+RLS30fcf43uirXAKIj+KKtI?= =?us-ascii?Q?sEGU30hFLksb0JIO57IILbRnDfH52cR1v3+MkhGw8SBZk2OKs7y7H/RTnvfm?= =?us-ascii?Q?4Xr1oaU/bdqxCK6Us60IFpbXSK9qLreW65lxtyxOjmnuaQqJUu7Sy85gCTww?= =?us-ascii?Q?bu8YWaVrIQ5HLmzmrDkAQ6NzNkDcH9ETWGjjlRRi3UhJMUQIBBZByladlrdh?= =?us-ascii?Q?z2KYNS3K7Qdjusnvza6Pqtn4XzRY7WTr9c50C4q3bqpD3uJzCqssZblpiyL9?= =?us-ascii?Q?ke7RJJAtuwLYJ1foy7FEuJQdGCcWg+hEwsp+iBqEeCZjoUj1MXmC44phjz/P?= =?us-ascii?Q?JgIjthFR8M0rQJIjr1wsOBBhVSXCvIRReovcKyqf/wtsBpwcXKEcYORW9mg7?= =?us-ascii?Q?58a7LozIU5BFypsSeYWAZv/e0DCX/eAwSKBaNYCIt452w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 6:9e6oE8JDMVylEDsXdTJL5NamEC3dOU2ve4fcl0wIS0regiwxMWjBg5nuM53rxp7b0zhvDGb7JC7nmTTIM9O8qK9s0q81U4xRS7YUhc132cn4+y/asAHTEWq17QjJNZM3PbLe0wTn6kymGMKGl2ckJbId86qljCIEUKAYspvIcBvNd2lu6E1It/J5s/Rs+eMZS4FdDClM/ikHiRkcH5eiIkg/fmcXj4Ym28pi598l0zIEvInxY4iaTH/Oum3idk+edJRjD0yD8qgwPSF+WLpDeduPTHO0TbC2nu3dXww+Mp3oI5y9h8hJ5uBAjPzUiLpj0HQMfYdnVWv96w955cECvVW8lU6FVHjwb/dv9shggLdCE3usP0tMBWW/m/2GpFQ9uSaLjk9OHcg0zDxvnQ7oAzCo4/+DA17+NbbrazbN736d/+donqKEFaZ14bVzyU3EnZs19PDfHd0xiBdCUk637Zmh8kVFVIZqDzgjVDcCJpc=; 5:/9mbSMp4x2W1pgWzBVhs+qsvKOY2Rl8J+uu3HKQyLfthYr5pIZyZTPEdfkjaLBRJW0kRJlD04tvJLN858MK8F6HbWyUexrQQm+iBPjpxF8ONRFKg9tnyWZa0gs3J1LuB+qGl7dHrCPW8AlBPUIVLNYFedqTMANgMbFK9jkSRyYg=; 24:lO9KbnI/UkK+yI+WM50HpfpyWr/1Xd9Y/2oxf/XgUVW50rj5D6mBTBCOCcWo8zNiZngrIaZP/TcSl9cwecb663RHq6qxtz+uQbhOWd1VEJg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2582; 7:7HqBUf7LrKc/RN4MaLNt2TkaqV5yTzFzTeinsbDMrGS0zOtRQrrk4xxqb1AD6gtNYqUxsfvVQYUxupjM3TWGWngi4EckLSxFKi4CyowA+3FsMiwgIWReRwLIRCY5orsuxfr9RiWmaV/NZ35eNBf/CR76H58VbPZIadwBK3zm1dC9/MkFOEVsmkP6SbJ1pO2vjCZVISytZAnJGBW2+tSDqF34ILajY9BK+v3/ndHzWM2dHs5XmDXV1TkkRk50ZUFEDIw/sr3PzDFPFj9P+1HR4Tw4PY4PpC5dvyhtGAYZqdEe/6jNz7TxAnvcPLYjlPIi2fkidK3Du1f2pIftO9yiAQ== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 22:32:50.4318 (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: CY4PR02MB2582 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.72 Subject: [Qemu-devel] [PATCH v3 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Read the correct descriptor instead of hardcoding the first (q=0). Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé 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])); /* Descriptor owned by software ? */ if (rx_desc_get_ownership(s->rx_desc[q]) == 1) {