{"id":2223711,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2223711/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260416014928.1279360-7-jamin_lin@aspeedtech.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260416014928.1279360-7-jamin_lin@aspeedtech.com>","date":"2026-04-16T01:49:41","name":"[v3,06/17] hw/usb/hcd-ehci: Change descriptor addresses to 64-bit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"092b04a25068a01b9b3befd097d41d037e17e928","submitter":{"id":81768,"url":"http://patchwork.ozlabs.org/api/1.1/people/81768/?format=json","name":"Jamin Lin","email":"jamin_lin@aspeedtech.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260416014928.1279360-7-jamin_lin@aspeedtech.com/mbox/","series":[{"id":500066,"url":"http://patchwork.ozlabs.org/api/1.1/series/500066/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500066","date":"2026-04-16T01:49:32","name":"hw/usb/ehci: Add 64-bit descriptor addressing support","version":3,"mbox":"http://patchwork.ozlabs.org/series/500066/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223711/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223711/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=aspeedtech.com header.i=@aspeedtech.com\n header.a=rsa-sha256 header.s=selector1 header.b=M1dur/RI;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=aspeedtech.com;"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fx1GF5Rrtz1yDF\n\tfor ; Thu, 16 Apr 2026 11:51:49 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wDBsO-0008Jn-Ls; Wed, 15 Apr 2026 21:50:40 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDBrk-0007rj-Eb; Wed, 15 Apr 2026 21:50:03 -0400","from mail-japaneastazlp170120005.outbound.protection.outlook.com\n ([2a01:111:f403:c405::5] helo=TYPPR03CU001.outbound.protection.outlook.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDBrg-0007Ut-LA; Wed, 15 Apr 2026 21:49:58 -0400","from TYPPR06MB8206.apcprd06.prod.outlook.com (2603:1096:405:383::19)\n by SEYPR06MB6202.apcprd06.prod.outlook.com (2603:1096:101:c7::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.48; Thu, 16 Apr\n 2026 01:49:41 +0000","from TYPPR06MB8206.apcprd06.prod.outlook.com\n ([fe80::e659:1ead:77cb:f6d3]) by TYPPR06MB8206.apcprd06.prod.outlook.com\n ([fe80::e659:1ead:77cb:f6d3%3]) with mapi id 15.20.9818.017; Thu, 16 Apr 2026\n 01:49:41 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=dQGZ9QAA7GNXevn/eMAgyZ9oK9djyUW6AeU2+wBmRdoM1i3EK/CqCRgQEAEVOIkKbrFd5vm1nPF41HV1Aaa7vUh2a0YMknO9zP3jz2JvySsuUkps2TKfaZ8Q1vlw1Kw//nizVQllr23Gdk7haozd/aJqJF3V+dOJyKI/OzeBqQXXzbfSdQ75j/7iNHxSVDDme6Xw0qAsJQpjRQR3yvM4oz50eULFIOQOhe6itg5bnCFx1LLlUgUZ9UJHxyQStHMFSTBWhN7hbza6yXTwnpegeQ/sSBqHSjWOvmQeJNEqZ1hSQo09VMQvnrXtOsTbN2WTu7DuiUbCzbRuK0osdB8L1w==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=1SJUk+OB411DiWod9Xr9cVPUPRuL/mNGpNUQWEks0Wg=;\n b=j3ILxRo8Mu4vOKcJzgAU3uQLd7MsoYqYFPYaeGYIBda7neHG6BTT+k8TC0dYGZ/7bOjDbkuRLQdmD90QyzaDr7vN1yqVNHNiJWYN45s3B5qAnn/p+S14mc1RhwigT9MWNoRqTgiKcPAPvhxnhFZnlFjQ+gFltfHN6YEiwQucAVngKZr8/pU/Nuu/8Q7J93XeS1Wq9hdettC4ehnYTzLtpObeaXo3ROLOmlIjExhTisjyTRCJFsD6MkJaNqCwLt6S4iyw+81VUkHOF5PGf+o/rpLhJicnMP2FSeXfizBj42u3o2OJzrbRZEgK/pLmYwNKaivvQXybQWEj9lGawkMt1g==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=aspeedtech.com; dmarc=pass action=none\n header.from=aspeedtech.com; dkim=pass header.d=aspeedtech.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=aspeedtech.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=1SJUk+OB411DiWod9Xr9cVPUPRuL/mNGpNUQWEks0Wg=;\n b=M1dur/RIbYpB1hVB7zlOFFcrpAyyuYfL7gWakofIukJ9HdziXIPlHAvK0J4UBD6gPYB0pOlrJvrkD2ImPwJE4dknWRGsoPlt0J8tucFj81vPOtzkCZrZAPPgxGSidfOV0uZamH089ubdZBLz49CfMcfwtiBw/4ISQ/6LjJKVF3xT4zLX/7VqshEF2PaCPh03Pmi0++AgPIwTnBxETNCKaRNmiZD7oXfy5+k8ueIfQ4b1O1Ys5qUaWR7W3jL0W4IP9khdBeYVn1X5JU7iYfi4lvgIDJQvo3aCZnzR1tgruriFy0/FiRqsvE870HAiic8gxhB6/4sEpYFKtFtFaZIicQ==","From":"Jamin Lin ","To":"\"philmd@linaro.org\" , =?iso-8859-1?q?C=E9dric_Le_Goat?=\n\t=?iso-8859-1?q?er?= , Peter Maydell ,\n Steven Lee , Troy Lee ,\n Kane Chen ,\n Andrew Jeffery , Joel Stanley ,\n \"open list:ASPEED BMCs\" ,\n \"open list:All patches CC here\" ","CC":"Jamin Lin , Troy Lee ,\n \"flwu@google.com\" , \"nabihestefan@google.com\"\n ","Subject":"[PATCH v3 06/17] hw/usb/hcd-ehci: Change descriptor addresses to\n 64-bit","Thread-Topic":"[PATCH v3 06/17] hw/usb/hcd-ehci: Change descriptor addresses to\n 64-bit","Thread-Index":"AQHczUNKKWmZ+R83iUmW5is8kUw4Xg==","Date":"Thu, 16 Apr 2026 01:49:41 +0000","Message-ID":"<20260416014928.1279360-7-jamin_lin@aspeedtech.com>","References":"<20260416014928.1279360-1-jamin_lin@aspeedtech.com>","In-Reply-To":"<20260416014928.1279360-1-jamin_lin@aspeedtech.com>","Accept-Language":"zh-TW, en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","authentication-results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=aspeedtech.com header.i=@aspeedtech.com\n header.a=rsa-sha256 header.s=selector1 header.b=M1dur/RI;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=aspeedtech.com;"],"x-ms-publictraffictype":"Email","x-ms-traffictypediagnostic":"TYPPR06MB8206:EE_|SEYPR06MB6202:EE_","x-ms-office365-filtering-correlation-id":"b393707e-e462-4557-287e-08de9b5a6d57","x-ms-exchange-senderadcheck":"1","x-ms-exchange-antispam-relay":"0","x-microsoft-antispam":"BCL:0;\n ARA:13230040|376014|7416014|1800799024|366016|38070700021|921020|18002099003|22082099003|56012099003;","x-microsoft-antispam-message-info":"\n SmCnhdPwlHgrMUipWZMJofovK36R9JaAAE4KKx41mnblBG6Nq7UkX50xbwJQtP/DecJevo/Cr0go+AfD0s4fxRZ0oZT9hKOW84BfFDUx4q0cKLlara+86UO2Woi6Ebyg7gwAwpUf2U3LseFALzmy2YsQMWvugff/GW7OTa/ZwKChAw8FoaQO/Thlide+ivnTE1r2fv4iHV6Spv0ZnKGiF2HNZ3nvsYEwFCiOBO0BeyUBrnnBzticatgcOxI5eFZbkqD1hvBnUFu/Wwg5svoKsloRbwWFJG+EqnZYs+844v/n3Fx2V1Tdw76iISsVWZSYYsVruAlXGHiz6nk5T+v/BYaz9wG/hv6g6G1eUX80tGy/fS0syw9bdidXITMOV+jBXbLMH/xcQ97fL+QXpLCizCgEiPavOujvnCmC0d6lOjw7Mrd3k3PMxpXuCwmS42VcL/YBL0VwZ8BYNuGugP9LovsvecodPg7XWEbhCN5E2ICLUkTOeyK3c3CxCBdC/T9xDAz6qgKlG0MbUO9IEz3M9S7u464Qz3DP1x7KE+3c8eNxvPjwEtB5xFV3Ha6VefS+uXXtKpBWlemAvVh8wRB0V9Co9vMaR+vYm1dLP3GIbghLVDoi/9GW0ysddlVELAGMhQGiAskKBtwKcgWkidxRtQMKeqN1gYnkiB+RK8PR8Ee+8fEbmmXsRd2gIA6FwN8HC5+GaTKTJe1yoxd8NJ1bfcoOALtiXFFi8H58gtVOFQIxBtmBmPT74ZBfsJGsYTDHrHNS45nNDffd/Q74xfnhfbAXX2K62aAoqZu4hegkmnsr2WvV9tzAqlKX5nob+OqE","x-forefront-antispam-report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:TYPPR06MB8206.apcprd06.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(376014)(7416014)(1800799024)(366016)(38070700021)(921020)(18002099003)(22082099003)(56012099003);\n DIR:OUT; SFP:1102;","x-ms-exchange-antispam-messagedata-chunkcount":"1","x-ms-exchange-antispam-messagedata-0":"=?iso-8859-1?q?5OwtWQGHzJutlHZfDvkF0Po?=\n\t=?iso-8859-1?q?mM68BuCeo5/SZyH5yGEh6swm4aQZRyBcDHgdoYOTsRh23k4dF8TVY3yYU6+S?=\n\t=?iso-8859-1?q?zU5AGmxYUOq1Tq1VND7JpFyvYGOpq0Ky5jgxkvSdF98OxUThw89cUHsefYsV?=\n\t=?iso-8859-1?q?55qF1gQx6JQAinyogfF1reyRzgb4e6hwDaSgZ4A6qBjn7TRKeEX0biVbBybH?=\n\t=?iso-8859-1?q?rYz59j9u7PAqLZy4BIIzxzZaj0I6m55gv7VgTZ+YwVJyNt9rM6QUEVo2iPOe?=\n\t=?iso-8859-1?q?q3hM3dF6UxZTDHxPZKwXhVwctcgBppQJDeGWfKPpUgWLt4yD9u7kqaluwBxe?=\n\t=?iso-8859-1?q?OAD60REqaLJeOrqaGNamfbMZGvHxozZV4uE/8FDz7buOYGoL9fvt3VY569Pl?=\n\t=?iso-8859-1?q?FsqM68zeQkKpmMLkrMvcaNNztOE9glZD8yc9PhAzctMElZ+xedkIYNaE0mdj?=\n\t=?iso-8859-1?q?tIta9mI9tMhMo544zfxHLxK9ExO9lVvsAjbDELOjvn+ZSr5EqOce0Lk5/7dW?=\n\t=?iso-8859-1?q?tZaKfPUo7ez3bLuhSYP8W0Nf7Vk4A2oSKOjAhuyMLjYsxA2lFkM3seqNJg5V?=\n\t=?iso-8859-1?q?jD8iUn7JjRGqi0HyP+M6NxlAAN16p7x3UJksWDSPjXIEpu2xWM602Ab/oGwF?=\n\t=?iso-8859-1?q?KrLSYstx24ac1WTiEaTaJ2INVUTZi7um4s41gOtO++eLHS8Pp/QPEL5UZORC?=\n\t=?iso-8859-1?q?rYoOEc+Rq6wNLbgBg9kC6Pe9gYFx/7nuhWbt5YUqz7nUvnUSSpH/BOj50XQm?=\n\t=?iso-8859-1?q?mj0IVQqibmfu0k1yT9TV3gWUfesTap/jWZaPhzQ55n0DAK4ZkZfQpH5j+Gly?=\n\t=?iso-8859-1?q?EeQCgWiuiN4S2h8GbtN5+jHBJ7DbyIhKiJ7/cF95kcgDvDhrfRdicM7TUAAK?=\n\t=?iso-8859-1?q?jJDsSVvQiGrkip1lhlxJFcUQElM6Qj0fSsUeNWX3xvbF5Kirypu9XpUP/K5o?=\n\t=?iso-8859-1?q?ulOjhd+y7NrcsDf0VTrhcvAQ7MG5vwawCVOdPgZK5urPRc6tZsdTcNUHmh5j?=\n\t=?iso-8859-1?q?DnMZUF23Rsrt6wF0fCopmiejlmqqSyi6eGWix3IjHr8L4kZLnY2LAN/RvwxK?=\n\t=?iso-8859-1?q?EsII53UgNmFNX13+r+SL7byjLM2g7etkbDJX4W6zMflyqnXA62NiElSdsAjk?=\n\t=?iso-8859-1?q?HTBlx96Xh0VOR+unaB2srn+RPnj1diPOkoD9kPTS8zqcGb5J4bbA5/e5iuLo?=\n\t=?iso-8859-1?q?RZkIqd31fC5cqTuVH/nhnmkZMBVp2T7F8t7eUFMWsYQHVNVTGsahbmlgVEvC?=\n\t=?iso-8859-1?q?IM70DnXXpsDEQlQ3Bq0yF0FprK/WgAleAye4xngVJWM7Ppb0rj9scv1HAz/z?=\n\t=?iso-8859-1?q?hUf/Nw/aqxFadm8xMSTt4TBRoUKB9EPsKgFVGjRBEPtOoI3+pmYDyvCUxCUW?=\n\t=?iso-8859-1?q?0fbUOE0LJReY9J7IkI9NyQIz+FhxfNBdEkDnizK6mnE3AheObl/W319zPAzm?=\n\t=?iso-8859-1?q?Gxzp5WKd4h51nYIGN3Abu7LxWX8ccy85LDsneEtwLEW4Bpq8xMa6s1WT38el?=\n\t=?iso-8859-1?q?JEjsM0JxPGe5oGHMEKUF0f5fbEfodqo/cdiu7o7r701etWHNfKb/jI40vMzf?=\n\t=?iso-8859-1?q?HxmIFDq+o7fog69WQVKEV3depNnH1dlOCRTdgLwmbESPOuRoihxgVIY/RGqI?=\n\t=?iso-8859-1?q?dCCrd2U5kOWs57AjgbvBtD+jI2nAj0iNlopukLtJEnrw73LnXju4zbgjswCQ?=\n\t=?iso-8859-1?q?+cz3hRP2cWJDRnWksbMJ8f0gaQJ9H0uZBfWHRkD+s4fMa9CbOvJvzDzCB2m0?=\n\t=?iso-8859-1?q?IQIg1R2WQNOSnIoip0T0bMHs6iAnEgDFhrL7symRUSO7xLg=3D=3D?=","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","MIME-Version":"1.0","X-Exchange-RoutingPolicyChecked":"\n vhYMRcmJDJzsRzenY25EC4kJtwpP2JB1B5uiOsnCmMHO9Paz8hfr5JdPkeCgt9wcV5ZTGC2lAbdMHW0cV3Av8X2hcMUkzf/fYNwlCplJN2nar4CkVmzrBSSeuGDRexmMZQ325M3Z4SesaWLoVtt6BKrokyg8cBGGbcZfN8S6MXDWJsjCP1uPya5u0EDdSjBSebOP/gIUSIq5JczILEZPFIKS6uHHuxr3SnZFVkxMDxEahq4HaoBs+McG2jZaGqUqLGItkaixQ5niABU785mEjb0WopJceLr0OSBsdc8aEusugqLXSxa/Nl1/mOu6BTMYoefLPTkpHnGw76rHdDxV8Q==","X-OriginatorOrg":"aspeedtech.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-AuthSource":"TYPPR06MB8206.apcprd06.prod.outlook.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n b393707e-e462-4557-287e-08de9b5a6d57","X-MS-Exchange-CrossTenant-originalarrivaltime":"16 Apr 2026 01:49:41.6479 (UTC)","X-MS-Exchange-CrossTenant-fromentityheader":"Hosted","X-MS-Exchange-CrossTenant-id":"43d4aa98-e35b-4575-8939-080e90d5a249","X-MS-Exchange-CrossTenant-mailboxtype":"HOSTED","X-MS-Exchange-CrossTenant-userprincipalname":"\n XUs87j0EZscbQj0A3fkc5KH6qPJiohvkwXae+kZZ1BH1ZQWR1JHS4aq3a9k0j07UXKC5j/7OLt3j3vutqOtHKz+rwG7mwiTP7Yxu9oNE36U=","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"SEYPR06MB6202","Received-SPF":"pass client-ip=2a01:111:f403:c405::5;\n envelope-from=jamin_lin@aspeedtech.com;\n helo=TYPPR03CU001.outbound.protection.outlook.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Change internal EHCI descriptor addresses from uint32_t to uint64_t.\n\nThe following fields are updated:\n- EHCIPacket::qtdaddr\n- EHCIQueue::{qhaddr, qtdaddr}\n- EHCIState::{a_fetch_addr, p_fetch_addr}\n\nUpdate get_dwords() and put_dwords() to take 64-bit addresses and\npropagate the type change through the descriptor traversal paths.\n\nAdjust NLPTR_GET() to operate on 64-bit values:\n\n #define NLPTR_GET(x) ((x) & ~0x1fULL)\n\nso that link pointer masking works correctly when descriptor\naddresses exceed 32-bit space. The previous mask (0xffffffe0)\nimplicitly truncated addresses to 32 bits.\n\nThis patch does not change the on-wire descriptor layout yet.\nIt only removes the internal 32-bit address limit and prepares\nfor later patches that will add full 64-bit QH/qTD/iTD/siTD support.\n\nUpdate the EHCI trace-events prototypes for QH, qTD, iTD, and siTD to\nuse uint64_t for the address argument and print it with PRIx64. This\nensures full 64-bit addresses are shown in trace output and improves\ndebugging of queue heads and transfer descriptors.\n\nMigration compatibility:\n\nThe fetch address fields in EHCIState are extended from 32-bit to\n64-bit, requiring a VMState version bump (v2 -> v3).\n\nBackward compatibility is preserved by keeping the legacy 32-bit\nfields (a_fetch_addr_pre_v3, p_fetch_addr_pre_v3) for pre-v3\nmigration streams via VMSTATE_UINT32_TEST(), and introducing new\n64-bit fields for v3+.\n\nIn post_load, pre-v3 state is promoted to the 64-bit fields.\n\nNo functional change.\n\nSigned-off-by: Jamin Lin \n---\n hw/usb/hcd-ehci.h | 12 +++++----\n hw/usb/hcd-ehci.c | 64 +++++++++++++++++++++++++++++----------------\n hw/usb/trace-events | 24 ++++++++---------\n 3 files changed, 60 insertions(+), 40 deletions(-)","diff":"diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h\nindex 4234591cb4..24eea9d23b 100644\n--- a/hw/usb/hcd-ehci.h\n+++ b/hw/usb/hcd-ehci.h\n@@ -208,7 +208,7 @@ struct EHCIPacket {\n QTAILQ_ENTRY(EHCIPacket) next;\n \n EHCIqtd qtd; /* copy of current QTD (being worked on) */\n- uint32_t qtdaddr; /* address QTD read from */\n+ uint64_t qtdaddr; /* address QTD read from */\n \n USBPacket packet;\n QEMUSGList sgl;\n@@ -229,8 +229,8 @@ struct EHCIQueue {\n * when guest removes an entry (doorbell, handshake sequence)\n */\n EHCIqh qh; /* copy of current QH (being worked on) */\n- uint32_t qhaddr; /* address QH read from */\n- uint32_t qtdaddr; /* address QTD read from */\n+ uint64_t qhaddr; /* address QH read from */\n+ uint64_t qtdaddr; /* address QTD read from */\n int last_pid; /* pid of last packet executed */\n USBDevice *dev;\n QTAILQ_HEAD(, EHCIPacket) packets;\n@@ -294,8 +294,10 @@ struct EHCIState {\n EHCIQueueHead pqueues;\n \n /* which address to look at next */\n- uint32_t a_fetch_addr;\n- uint32_t p_fetch_addr;\n+ uint32_t a_fetch_addr_pre_v3;\n+ uint32_t p_fetch_addr_pre_v3;\n+ uint64_t a_fetch_addr;\n+ uint64_t p_fetch_addr;\n \n USBPacket ipacket;\n QEMUSGList isgl;\ndiff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c\nindex d0ea4949f9..35173d27b4 100644\n--- a/hw/usb/hcd-ehci.c\n+++ b/hw/usb/hcd-ehci.c\n@@ -72,7 +72,7 @@ typedef enum {\n } EHCI_STATES;\n \n /* macros for accessing fields within next link pointer entry */\n-#define NLPTR_GET(x) ((x) & 0xffffffe0)\n+#define NLPTR_GET(x) ((x) & ~0x1fULL)\n #define NLPTR_TYPE_GET(x) (((x) >> 1) & 3)\n #define NLPTR_TBIT(x) ((x) & 1) /* 1=invalid, 0=valid */\n \n@@ -287,7 +287,7 @@ static int ehci_get_state(EHCIState *s, int async)\n return async ? s->astate : s->pstate;\n }\n \n-static void ehci_set_fetch_addr(EHCIState *s, int async, uint32_t addr)\n+static void ehci_set_fetch_addr(EHCIState *s, int async, uint64_t addr)\n {\n if (async) {\n s->a_fetch_addr = addr;\n@@ -296,7 +296,7 @@ static void ehci_set_fetch_addr(EHCIState *s, int async, uint32_t addr)\n }\n }\n \n-static int ehci_get_fetch_addr(EHCIState *s, int async)\n+static uint64_t ehci_get_fetch_addr(EHCIState *s, int async)\n {\n return async ? s->a_fetch_addr : s->p_fetch_addr;\n }\n@@ -373,7 +373,7 @@ static inline bool ehci_periodic_enabled(EHCIState *s)\n }\n \n /* Get an array of dwords from main memory */\n-static inline int get_dwords(EHCIState *ehci, uint32_t addr,\n+static inline int get_dwords(EHCIState *ehci, uint64_t addr,\n uint32_t *buf, int num)\n {\n int i;\n@@ -395,7 +395,7 @@ static inline int get_dwords(EHCIState *ehci, uint32_t addr,\n }\n \n /* Put an array of dwords in to main memory */\n-static inline int put_dwords(EHCIState *ehci, uint32_t addr,\n+static inline int put_dwords(EHCIState *ehci, uint64_t addr,\n uint32_t *buf, int num)\n {\n int i;\n@@ -549,7 +549,7 @@ static void ehci_free_packet(EHCIPacket *p)\n \n /* queue management */\n \n-static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint32_t addr, int async)\n+static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint64_t addr, int async)\n {\n EHCIQueueHead *head = async ? &ehci->aqueues : &ehci->pqueues;\n EHCIQueue *q;\n@@ -622,7 +622,7 @@ static void ehci_free_queue(EHCIQueue *q, const char *warn)\n g_free(q);\n }\n \n-static EHCIQueue *ehci_find_queue_by_qh(EHCIState *ehci, uint32_t addr,\n+static EHCIQueue *ehci_find_queue_by_qh(EHCIState *ehci, uint64_t addr,\n int async)\n {\n EHCIQueueHead *head = async ? &ehci->aqueues : &ehci->pqueues;\n@@ -1135,7 +1135,7 @@ static void ehci_flush_qh(EHCIQueue *q)\n {\n uint32_t *qh = (uint32_t *) &q->qh;\n uint32_t dwords = sizeof(EHCIqh) >> 2;\n- uint32_t addr = NLPTR_GET(q->qhaddr);\n+ uint64_t addr = NLPTR_GET(q->qhaddr);\n \n put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);\n }\n@@ -1406,12 +1406,13 @@ static int ehci_execute(EHCIPacket *p, const char *action)\n /* 4.7.2 */\n static int ehci_process_itd(EHCIState *ehci,\n EHCIitd *itd,\n- uint32_t addr)\n+ uint64_t addr)\n {\n USBDevice *dev;\n USBEndpoint *ep;\n uint32_t i, len, pid, dir, devaddr, endp;\n- uint32_t pg, off, ptr1, ptr2, max, mult;\n+ uint32_t pg, off, max, mult;\n+ uint64_t ptr1, ptr2;\n \n ehci->periodic_sched_active = PERIODIC_ACTIVE;\n \n@@ -1528,7 +1529,7 @@ static int ehci_state_waitlisthead(EHCIState *ehci, int async)\n EHCIqh qh;\n int i = 0;\n int again = 0;\n- uint32_t entry = ehci->asynclistaddr;\n+ uint64_t entry = ehci->asynclistaddr;\n \n /* set reclamation flag at start event (4.8.6) */\n if (async) {\n@@ -1578,7 +1579,7 @@ out:\n static int ehci_state_fetchentry(EHCIState *ehci, int async)\n {\n int again = 0;\n- uint32_t entry = ehci_get_fetch_addr(ehci, async);\n+ uint64_t entry = ehci_get_fetch_addr(ehci, async);\n \n if (NLPTR_TBIT(entry)) {\n ehci_set_state(ehci, async, EST_ACTIVE);\n@@ -1610,8 +1611,10 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async)\n \n default:\n /* TODO: handle FSTN type */\n- qemu_log_mask(LOG_GUEST_ERROR, \"FETCHENTRY: entry at %X is of type %u \"\n- \"which is not supported yet\\n\", entry, NLPTR_TYPE_GET(entry));\n+ qemu_log_mask(LOG_GUEST_ERROR,\n+ \"FETCHENTRY: entry at %\" PRIx64 \"is of type %\" PRIu64\n+ \"which is not supported yet\\n\",\n+ entry, NLPTR_TYPE_GET(entry));\n return -1;\n }\n \n@@ -1621,7 +1624,7 @@ out:\n \n static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)\n {\n- uint32_t entry;\n+ uint64_t entry;\n EHCIQueue *q;\n EHCIqh qh;\n \n@@ -1710,7 +1713,7 @@ out:\n \n static int ehci_state_fetchitd(EHCIState *ehci, int async)\n {\n- uint32_t entry;\n+ uint64_t entry;\n EHCIitd itd;\n \n assert(!async);\n@@ -1736,7 +1739,7 @@ static int ehci_state_fetchitd(EHCIState *ehci, int async)\n \n static int ehci_state_fetchsitd(EHCIState *ehci, int async)\n {\n- uint32_t entry;\n+ uint64_t entry;\n EHCIsitd sitd;\n \n assert(!async);\n@@ -1794,7 +1797,7 @@ static int ehci_state_fetchqtd(EHCIQueue *q)\n EHCIqtd qtd;\n EHCIPacket *p;\n int again = 1;\n- uint32_t addr;\n+ uint64_t addr;\n \n addr = NLPTR_GET(q->qtdaddr);\n if (get_dwords(q->ehci, addr + 8, &qtd.token, 1) < 0) {\n@@ -1877,7 +1880,7 @@ static int ehci_fill_queue(EHCIPacket *p)\n USBEndpoint *ep = p->packet.ep;\n EHCIQueue *q = p->queue;\n EHCIqtd qtd = p->qtd;\n- uint32_t qtdaddr;\n+ uint64_t qtdaddr;\n \n for (;;) {\n if (NLPTR_TBIT(qtd.next) != 0) {\n@@ -2000,7 +2003,8 @@ static int ehci_state_executing(EHCIQueue *q)\n static int ehci_state_writeback(EHCIQueue *q)\n {\n EHCIPacket *p = QTAILQ_FIRST(&q->packets);\n- uint32_t *qtd, addr;\n+ uint32_t *qtd;\n+ uint64_t addr;\n int again = 0;\n \n /* Write back the QTD from the QH area */\n@@ -2441,6 +2445,11 @@ static int usb_ehci_post_load(void *opaque, int version_id)\n }\n }\n \n+ if (version_id < 3) {\n+ s->a_fetch_addr = s->a_fetch_addr_pre_v3;\n+ s->p_fetch_addr = s->p_fetch_addr_pre_v3;\n+ }\n+\n return 0;\n }\n \n@@ -2470,9 +2479,14 @@ static void usb_ehci_vm_state_change(void *opaque, bool running, RunState state)\n }\n }\n \n+static bool ehci_core_is_before_version_3(void *opaque, int version_id)\n+{\n+ return version_id < 3;\n+}\n+\n const VMStateDescription vmstate_ehci = {\n .name = \"ehci-core\",\n- .version_id = 2,\n+ .version_id = 3,\n .minimum_version_id = 1,\n .pre_save = usb_ehci_pre_save,\n .post_load = usb_ehci_post_load,\n@@ -2501,8 +2515,12 @@ const VMStateDescription vmstate_ehci = {\n /* schedule state */\n VMSTATE_UINT32(astate, EHCIState),\n VMSTATE_UINT32(pstate, EHCIState),\n- VMSTATE_UINT32(a_fetch_addr, EHCIState),\n- VMSTATE_UINT32(p_fetch_addr, EHCIState),\n+ VMSTATE_UINT32_TEST(a_fetch_addr_pre_v3, EHCIState,\n+ ehci_core_is_before_version_3),\n+ VMSTATE_UINT32_TEST(p_fetch_addr_pre_v3, EHCIState,\n+ ehci_core_is_before_version_3),\n+ VMSTATE_UINT64_V(a_fetch_addr, EHCIState, 3),\n+ VMSTATE_UINT64_V(p_fetch_addr, EHCIState, 3),\n VMSTATE_END_OF_LIST()\n }\n };\ndiff --git a/hw/usb/trace-events b/hw/usb/trace-events\nindex 0d4318dcf1..8c90688bb3 100644\n--- a/hw/usb/trace-events\n+++ b/hw/usb/trace-events\n@@ -86,15 +86,15 @@ usb_ehci_portsc_write(uint32_t addr, uint32_t port, uint32_t val) \"wr mmio 0x%04\n usb_ehci_portsc_change(uint32_t addr, uint32_t port, uint32_t new, uint32_t old) \"ch mmio 0x%04x [port %d] = 0x%x (old: 0x%x)\"\n usb_ehci_usbsts(const char *sts, int state) \"usbsts %s %d\"\n usb_ehci_state(const char *schedule, const char *state) \"%s schedule %s\"\n-usb_ehci_qh_ptrs(void *q, uint32_t addr, uint32_t nxt, uint32_t c_qtd, uint32_t n_qtd, uint32_t a_qtd) \"q %p - QH @ 0x%08x: next 0x%08x qtds 0x%08x,0x%08x,0x%08x\"\n-usb_ehci_qh_fields(uint32_t addr, int rl, int mplen, int eps, int ep, int devaddr) \"QH @ 0x%08x - rl %d, mplen %d, eps %d, ep %d, dev %d\"\n-usb_ehci_qh_bits(uint32_t addr, int c, int h, int dtc, int i) \"QH @ 0x%08x - c %d, h %d, dtc %d, i %d\"\n+usb_ehci_qh_ptrs(void *q, uint64_t addr, uint32_t nxt, uint32_t c_qtd, uint32_t n_qtd, uint32_t a_qtd) \"q %p - QH @ 0x%\" PRIx64 \": next 0x%08x qtds 0x%08x,0x%08x,0x%08x\"\n+usb_ehci_qh_fields(uint64_t addr, int rl, int mplen, int eps, int ep, int devaddr) \"QH @ 0x%\" PRIx64 \" - rl %d, mplen %d, eps %d, ep %d, dev %d\"\n+usb_ehci_qh_bits(uint64_t addr, int c, int h, int dtc, int i) \"QH @ 0x%\" PRIx64 \" - c %d, h %d, dtc %d, i %d\"\n usb_ehci_qh_tbytes(uint32_t tbytes) \"updating tbytes to %d\"\n-usb_ehci_qtd_ptrs(void *q, uint32_t addr, uint32_t nxt, uint32_t altnext) \"q %p - QTD @ 0x%08x: next 0x%08x altnext 0x%08x\"\n-usb_ehci_qtd_fields(uint32_t addr, int tbytes, int cpage, int cerr, int pid) \"QTD @ 0x%08x - tbytes %d, cpage %d, cerr %d, pid %d\"\n-usb_ehci_qtd_bits(uint32_t addr, int ioc, int active, int halt, int babble, int xacterr) \"QTD @ 0x%08x - ioc %d, active %d, halt %d, babble %d, xacterr %d\"\n-usb_ehci_itd(uint32_t addr, uint32_t nxt, uint32_t mplen, uint32_t mult, uint32_t ep, uint32_t devaddr) \"ITD @ 0x%08x: next 0x%08x - mplen %d, mult %d, ep %d, dev %d\"\n-usb_ehci_sitd(uint32_t addr, uint32_t nxt, uint32_t active) \"ITD @ 0x%08x: next 0x%08x - active %d\"\n+usb_ehci_qtd_ptrs(void *q, uint64_t addr, uint32_t nxt, uint32_t altnext) \"q %p - QTD @ 0x%\" PRIx64 \": next 0x%08x altnext 0x%08x\"\n+usb_ehci_qtd_fields(uint64_t addr, int tbytes, int cpage, int cerr, int pid) \"QTD @ 0x%\" PRIx64 \" - tbytes %d, cpage %d, cerr %d, pid %d\"\n+usb_ehci_qtd_bits(uint64_t addr, int ioc, int active, int halt, int babble, int xacterr) \"QTD @ 0x%\" PRIx64 \" - ioc %d, active %d, halt %d, babble %d, xacterr %d\"\n+usb_ehci_itd(uint64_t addr, uint32_t nxt, uint32_t mplen, uint32_t mult, uint32_t ep, uint32_t devaddr) \"ITD @ 0x%\" PRIx64 \": next 0x%08x - mplen %d, mult %d, ep %d, dev %d\"\n+usb_ehci_sitd(uint64_t addr, uint32_t nxt, uint32_t active) \"SITD @ 0x%\" PRIx64 \": next 0x%08x - active %d\"\n usb_ehci_port_attach(uint32_t port, const char *owner, const char *device) \"attach port #%d, owner %s, device %s\"\n usb_ehci_port_detach(uint32_t port, const char *owner) \"detach port #%d, owner %s\"\n usb_ehci_port_reset(uint32_t port, int enable) \"reset port #%d - %d\"\n@@ -104,15 +104,15 @@ usb_ehci_port_resume(uint32_t port) \"port #%d\"\n usb_ehci_port_disable(uint32_t port) \"port #%d\"\n usb_ehci_queue_action(void *q, const char *action) \"q %p: %s\"\n usb_ehci_packet_action(void *q, void *p, const char *action) \"q %p p %p: %s\"\n-usb_ehci_packet_submit(uint32_t qhaddr, uint32_t next, uint32_t qtdaddr, int pid, size_t len, int endp, int status, int actual_length) \"qh=0x%x, next=0x%x, qtd=0x%x, pid=0x%x, len=%zd, endp=0x%x, status=%d, actual_length=%d\"\n+usb_ehci_packet_submit(uint64_t qhaddr, uint32_t next, uint64_t qtdaddr, int pid, size_t len, int endp, int status, int actual_length) \"qh=0x%\" PRIx64 \", next=0x%x, qtd=0x%\" PRIx64 \", pid=0x%x, len=%zd, endp=0x%x, status=%d, actual_length=%d\"\n usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask) \"level %d, frindex 0x%04x, sts 0x%x, mask 0x%x\"\n usb_ehci_guest_bug(const char *reason) \"%s\"\n usb_ehci_doorbell_ring(void) \"\"\n usb_ehci_doorbell_ack(void) \"\"\n usb_ehci_dma_error(void) \"\"\n-usb_ehci_execute_complete(uint32_t qhaddr, uint32_t next, uint32_t qtdaddr, int status, int actual_length) \"qhaddr=0x%x, next=0x%x, qtdaddr=0x%x, status=%d, actual_length=%d\"\n-usb_ehci_fetchqh_reclaim_done(uint32_t qhaddr) \"QH 0x%08x H-bit set, reclamation status reset - done processing\"\n-usb_ehci_fetchqh_dbg(uint32_t qhaddr, uint32_t h, uint32_t halt, uint32_t active, uint32_t next) \"QH 0x%08x (h 0x%x halt 0x%x active 0x%x) next 0x%08x\"\n+usb_ehci_execute_complete(uint64_t qhaddr, uint32_t next, uint64_t qtdaddr, int status, int actual_length) \"qhaddr=0x%\" PRIx64 \", next=0x%x, qtdaddr=0x%\" PRIx64 \", status=%d, actual_length=%d\"\n+usb_ehci_fetchqh_reclaim_done(uint64_t qhaddr) \"QH 0x%\" PRIx64 \" H-bit set, reclamation status reset - done processing\"\n+usb_ehci_fetchqh_dbg(uint64_t qhaddr, uint32_t h, uint32_t halt, uint32_t active, uint32_t next) \"QH 0x%\" PRIx64 \" (h 0x%x halt 0x%x active 0x%x) next 0x%08x\"\n usb_ehci_periodic_state_advance(uint32_t frame, uint32_t list, uint32_t entry) \"frame=%d, list=0x%x, entry=0x%x\"\n usb_ehci_skipped_uframes(uint64_t skipped_uframes) \"skipped %\" PRIu64 \" uframes\"\n usb_ehci_log(const char *msg) \"%s\"\n","prefixes":["v3","06/17"]}