From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1569EF433D6 for ; Thu, 16 Apr 2026 01:51:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wDBsF-0008C9-4P; Wed, 15 Apr 2026 21:50:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wDBrk-0007rj-Eb; Wed, 15 Apr 2026 21:50:03 -0400 Received: from mail-japaneastazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c405::5] helo=TYPPR03CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wDBrg-0007Ut-LA; Wed, 15 Apr 2026 21:49:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; 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; s=arcselector10001; 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; bh=1SJUk+OB411DiWod9Xr9cVPUPRuL/mNGpNUQWEks0Wg=; 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 smtp.mailfrom=aspeedtech.com; dmarc=pass action=none 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; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1SJUk+OB411DiWod9Xr9cVPUPRuL/mNGpNUQWEks0Wg=; b=M1dur/RIbYpB1hVB7zlOFFcrpAyyuYfL7gWakofIukJ9HdziXIPlHAvK0J4UBD6gPYB0pOlrJvrkD2ImPwJE4dknWRGsoPlt0J8tucFj81vPOtzkCZrZAPPgxGSidfOV0uZamH089ubdZBLz49CfMcfwtiBw/4ISQ/6LjJKVF3xT4zLX/7VqshEF2PaCPh03Pmi0++AgPIwTnBxETNCKaRNmiZD7oXfy5+k8ueIfQ4b1O1Ys5qUaWR7W3jL0W4IP9khdBeYVn1X5JU7iYfi4lvgIDJQvo3aCZnzR1tgruriFy0/FiRqsvE870HAiic8gxhB6/4sEpYFKtFtFaZIicQ== Received: from TYPPR06MB8206.apcprd06.prod.outlook.com (2603:1096:405:383::19) by SEYPR06MB6202.apcprd06.prod.outlook.com (2603:1096:101:c7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.48; Thu, 16 Apr 2026 01:49:41 +0000 Received: from TYPPR06MB8206.apcprd06.prod.outlook.com ([fe80::e659:1ead:77cb:f6d3]) by TYPPR06MB8206.apcprd06.prod.outlook.com ([fe80::e659:1ead:77cb:f6d3%3]) with mapi id 15.20.9818.017; Thu, 16 Apr 2026 01:49:41 +0000 From: Jamin Lin To: "philmd@linaro.org" , =?iso-8859-1?Q?C=E9dric_Le_Goater?= , Peter Maydell , Steven Lee , Troy Lee , Kane Chen , Andrew Jeffery , Joel Stanley , "open list:ASPEED BMCs" , "open list:All patches CC here" CC: Jamin Lin , Troy Lee , "flwu@google.com" , "nabihestefan@google.com" Subject: [PATCH v3 06/17] hw/usb/hcd-ehci: Change descriptor addresses to 64-bit Thread-Topic: [PATCH v3 06/17] hw/usb/hcd-ehci: Change descriptor addresses to 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: dkim=none (message not signed) 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; ARA:13230040|376014|7416014|1800799024|366016|38070700021|921020|18002099003|22082099003|56012099003; x-microsoft-antispam-message-info: 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:; IPV:NLI; SFV:NSPM; H:TYPPR06MB8206.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016)(38070700021)(921020)(18002099003)(22082099003)(56012099003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?5OwtWQGHzJutlHZfDvkF0PomM68BuCeo5/SZyH5yGEh6swm4aQZRyBcDHg?= =?iso-8859-1?Q?doYOTsRh23k4dF8TVY3yYU6+SzU5AGmxYUOq1Tq1VND7JpFyvYGOpq0Ky5?= =?iso-8859-1?Q?jgxkvSdF98OxUThw89cUHsefYsV55qF1gQx6JQAinyogfF1reyRzgb4e6h?= =?iso-8859-1?Q?wDaSgZ4A6qBjn7TRKeEX0biVbBybHrYz59j9u7PAqLZy4BIIzxzZaj0I6m?= =?iso-8859-1?Q?55gv7VgTZ+YwVJyNt9rM6QUEVo2iPOeq3hM3dF6UxZTDHxPZKwXhVwctcg?= =?iso-8859-1?Q?BppQJDeGWfKPpUgWLt4yD9u7kqaluwBxeOAD60REqaLJeOrqaGNamfbMZG?= =?iso-8859-1?Q?vHxozZV4uE/8FDz7buOYGoL9fvt3VY569PlFsqM68zeQkKpmMLkrMvcaNN?= =?iso-8859-1?Q?ztOE9glZD8yc9PhAzctMElZ+xedkIYNaE0mdjtIta9mI9tMhMo544zfxHL?= =?iso-8859-1?Q?xK9ExO9lVvsAjbDELOjvn+ZSr5EqOce0Lk5/7dWtZaKfPUo7ez3bLuhSYP?= =?iso-8859-1?Q?8W0Nf7Vk4A2oSKOjAhuyMLjYsxA2lFkM3seqNJg5VjD8iUn7JjRGqi0HyP?= =?iso-8859-1?Q?+M6NxlAAN16p7x3UJksWDSPjXIEpu2xWM602Ab/oGwFKrLSYstx24ac1WT?= =?iso-8859-1?Q?iEaTaJ2INVUTZi7um4s41gOtO++eLHS8Pp/QPEL5UZORCrYoOEc+Rq6wNL?= =?iso-8859-1?Q?bgBg9kC6Pe9gYFx/7nuhWbt5YUqz7nUvnUSSpH/BOj50XQmmj0IVQqibmf?= =?iso-8859-1?Q?u0k1yT9TV3gWUfesTap/jWZaPhzQ55n0DAK4ZkZfQpH5j+GlyEeQCgWiui?= =?iso-8859-1?Q?N4S2h8GbtN5+jHBJ7DbyIhKiJ7/cF95kcgDvDhrfRdicM7TUAAKjJDsSVv?= =?iso-8859-1?Q?QiGrkip1lhlxJFcUQElM6Qj0fSsUeNWX3xvbF5Kirypu9XpUP/K5oulOjh?= =?iso-8859-1?Q?d+y7NrcsDf0VTrhcvAQ7MG5vwawCVOdPgZK5urPRc6tZsdTcNUHmh5jDnM?= =?iso-8859-1?Q?ZUF23Rsrt6wF0fCopmiejlmqqSyi6eGWix3IjHr8L4kZLnY2LAN/RvwxKE?= =?iso-8859-1?Q?sII53UgNmFNX13+r+SL7byjLM2g7etkbDJX4W6zMflyqnXA62NiElSdsAj?= =?iso-8859-1?Q?kHTBlx96Xh0VOR+unaB2srn+RPnj1diPOkoD9kPTS8zqcGb5J4bbA5/e5i?= =?iso-8859-1?Q?uLoRZkIqd31fC5cqTuVH/nhnmkZMBVp2T7F8t7eUFMWsYQHVNVTGsahbml?= =?iso-8859-1?Q?gVEvCIM70DnXXpsDEQlQ3Bq0yF0FprK/WgAleAye4xngVJWM7Ppb0rj9sc?= =?iso-8859-1?Q?v1HAz/zhUf/Nw/aqxFadm8xMSTt4TBRoUKB9EPsKgFVGjRBEPtOoI3+pmY?= =?iso-8859-1?Q?DyvCUxCUW0fbUOE0LJReY9J7IkI9NyQIz+FhxfNBdEkDnizK6mnE3AheOb?= =?iso-8859-1?Q?l/W319zPAzmGxzp5WKd4h51nYIGN3Abu7LxWX8ccy85LDsneEtwLEW4Bpq?= =?iso-8859-1?Q?8xMa6s1WT38elJEjsM0JxPGe5oGHMEKUF0f5fbEfodqo/cdiu7o7r701et?= =?iso-8859-1?Q?WHNfKb/jI40vMzfHxmIFDq+o7fog69WQVKEV3depNnH1dlOCRTdgLwmbES?= =?iso-8859-1?Q?POuRoihxgVIY/RGqIdCCrd2U5kOWs57AjgbvBtD+jI2nAj0iNlopukLtJE?= =?iso-8859-1?Q?nrw73LnXju4zbgjswCQ+cz3hRP2cWJDRnWksbMJ8f0gaQJ9H0uZBfWHRkD?= =?iso-8859-1?Q?+s4fMa9CbOvJvzDzCB2m0IQIg1R2WQNOSnIoip0T0bMHs6iAnEgDFhrL7s?= =?iso-8859-1?Q?ymRUSO7xLg=3D=3D?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Exchange-RoutingPolicyChecked: 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: 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: XUs87j0EZscbQj0A3fkc5KH6qPJiohvkwXae+kZZ1BH1ZQWR1JHS4aq3a9k0j07UXKC5j/7OLt3j3vutqOtHKz+rwG7mwiTP7Yxu9oNE36U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6202 Received-SPF: pass client-ip=2a01:111:f403:c405::5; envelope-from=jamin_lin@aspeedtech.com; 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Change internal EHCI descriptor addresses from uint32_t to uint64_t.=0A= =0A= The following fields are updated:=0A= - EHCIPacket::qtdaddr=0A= - EHCIQueue::{qhaddr, qtdaddr}=0A= - EHCIState::{a_fetch_addr, p_fetch_addr}=0A= =0A= Update get_dwords() and put_dwords() to take 64-bit addresses and=0A= propagate the type change through the descriptor traversal paths.=0A= =0A= Adjust NLPTR_GET() to operate on 64-bit values:=0A= =0A= #define NLPTR_GET(x) ((x) & ~0x1fULL)=0A= =0A= so that link pointer masking works correctly when descriptor=0A= addresses exceed 32-bit space. The previous mask (0xffffffe0)=0A= implicitly truncated addresses to 32 bits.=0A= =0A= This patch does not change the on-wire descriptor layout yet.=0A= It only removes the internal 32-bit address limit and prepares=0A= for later patches that will add full 64-bit QH/qTD/iTD/siTD support.=0A= =0A= Update the EHCI trace-events prototypes for QH, qTD, iTD, and siTD to=0A= use uint64_t for the address argument and print it with PRIx64. This=0A= ensures full 64-bit addresses are shown in trace output and improves=0A= debugging of queue heads and transfer descriptors.=0A= =0A= Migration compatibility:=0A= =0A= The fetch address fields in EHCIState are extended from 32-bit to=0A= 64-bit, requiring a VMState version bump (v2 -> v3).=0A= =0A= Backward compatibility is preserved by keeping the legacy 32-bit=0A= fields (a_fetch_addr_pre_v3, p_fetch_addr_pre_v3) for pre-v3=0A= migration streams via VMSTATE_UINT32_TEST(), and introducing new=0A= 64-bit fields for v3+.=0A= =0A= In post_load, pre-v3 state is promoted to the 64-bit fields.=0A= =0A= No functional change.=0A= =0A= Signed-off-by: Jamin Lin =0A= ---=0A= hw/usb/hcd-ehci.h | 12 +++++----=0A= hw/usb/hcd-ehci.c | 64 +++++++++++++++++++++++++++++----------------=0A= hw/usb/trace-events | 24 ++++++++---------=0A= 3 files changed, 60 insertions(+), 40 deletions(-)=0A= =0A= diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h=0A= index 4234591cb4..24eea9d23b 100644=0A= --- a/hw/usb/hcd-ehci.h=0A= +++ b/hw/usb/hcd-ehci.h=0A= @@ -208,7 +208,7 @@ struct EHCIPacket {=0A= QTAILQ_ENTRY(EHCIPacket) next;=0A= =0A= EHCIqtd qtd; /* copy of current QTD (being worked on) */=0A= - uint32_t qtdaddr; /* address QTD read from */=0A= + uint64_t qtdaddr; /* address QTD read from */=0A= =0A= USBPacket packet;=0A= QEMUSGList sgl;=0A= @@ -229,8 +229,8 @@ struct EHCIQueue {=0A= * when guest removes an entry (doorbell, handshake sequence)=0A= */=0A= EHCIqh qh; /* copy of current QH (being worked on) */=0A= - uint32_t qhaddr; /* address QH read from */=0A= - uint32_t qtdaddr; /* address QTD read from */=0A= + uint64_t qhaddr; /* address QH read from */=0A= + uint64_t qtdaddr; /* address QTD read from */=0A= int last_pid; /* pid of last packet executed */=0A= USBDevice *dev;=0A= QTAILQ_HEAD(, EHCIPacket) packets;=0A= @@ -294,8 +294,10 @@ struct EHCIState {=0A= EHCIQueueHead pqueues;=0A= =0A= /* which address to look at next */=0A= - uint32_t a_fetch_addr;=0A= - uint32_t p_fetch_addr;=0A= + uint32_t a_fetch_addr_pre_v3;=0A= + uint32_t p_fetch_addr_pre_v3;=0A= + uint64_t a_fetch_addr;=0A= + uint64_t p_fetch_addr;=0A= =0A= USBPacket ipacket;=0A= QEMUSGList isgl;=0A= diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c=0A= index d0ea4949f9..35173d27b4 100644=0A= --- a/hw/usb/hcd-ehci.c=0A= +++ b/hw/usb/hcd-ehci.c=0A= @@ -72,7 +72,7 @@ typedef enum {=0A= } EHCI_STATES;=0A= =0A= /* macros for accessing fields within next link pointer entry */=0A= -#define NLPTR_GET(x) ((x) & 0xffffffe0)=0A= +#define NLPTR_GET(x) ((x) & ~0x1fULL)=0A= #define NLPTR_TYPE_GET(x) (((x) >> 1) & 3)=0A= #define NLPTR_TBIT(x) ((x) & 1) /* 1=3Dinvalid, 0=3Dvalid */= =0A= =0A= @@ -287,7 +287,7 @@ static int ehci_get_state(EHCIState *s, int async)=0A= return async ? s->astate : s->pstate;=0A= }=0A= =0A= -static void ehci_set_fetch_addr(EHCIState *s, int async, uint32_t addr)=0A= +static void ehci_set_fetch_addr(EHCIState *s, int async, uint64_t addr)=0A= {=0A= if (async) {=0A= s->a_fetch_addr =3D addr;=0A= @@ -296,7 +296,7 @@ static void ehci_set_fetch_addr(EHCIState *s, int async= , uint32_t addr)=0A= }=0A= }=0A= =0A= -static int ehci_get_fetch_addr(EHCIState *s, int async)=0A= +static uint64_t ehci_get_fetch_addr(EHCIState *s, int async)=0A= {=0A= return async ? s->a_fetch_addr : s->p_fetch_addr;=0A= }=0A= @@ -373,7 +373,7 @@ static inline bool ehci_periodic_enabled(EHCIState *s)= =0A= }=0A= =0A= /* Get an array of dwords from main memory */=0A= -static inline int get_dwords(EHCIState *ehci, uint32_t addr,=0A= +static inline int get_dwords(EHCIState *ehci, uint64_t addr,=0A= uint32_t *buf, int num)=0A= {=0A= int i;=0A= @@ -395,7 +395,7 @@ static inline int get_dwords(EHCIState *ehci, uint32_t = addr,=0A= }=0A= =0A= /* Put an array of dwords in to main memory */=0A= -static inline int put_dwords(EHCIState *ehci, uint32_t addr,=0A= +static inline int put_dwords(EHCIState *ehci, uint64_t addr,=0A= uint32_t *buf, int num)=0A= {=0A= int i;=0A= @@ -549,7 +549,7 @@ static void ehci_free_packet(EHCIPacket *p)=0A= =0A= /* queue management */=0A= =0A= -static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint32_t addr, int asy= nc)=0A= +static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint64_t addr, int asy= nc)=0A= {=0A= EHCIQueueHead *head =3D async ? &ehci->aqueues : &ehci->pqueues;=0A= EHCIQueue *q;=0A= @@ -622,7 +622,7 @@ static void ehci_free_queue(EHCIQueue *q, const char *w= arn)=0A= g_free(q);=0A= }=0A= =0A= -static EHCIQueue *ehci_find_queue_by_qh(EHCIState *ehci, uint32_t addr,=0A= +static EHCIQueue *ehci_find_queue_by_qh(EHCIState *ehci, uint64_t addr,=0A= int async)=0A= {=0A= EHCIQueueHead *head =3D async ? &ehci->aqueues : &ehci->pqueues;=0A= @@ -1135,7 +1135,7 @@ static void ehci_flush_qh(EHCIQueue *q)=0A= {=0A= uint32_t *qh =3D (uint32_t *) &q->qh;=0A= uint32_t dwords =3D sizeof(EHCIqh) >> 2;=0A= - uint32_t addr =3D NLPTR_GET(q->qhaddr);=0A= + uint64_t addr =3D NLPTR_GET(q->qhaddr);=0A= =0A= put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);= =0A= }=0A= @@ -1406,12 +1406,13 @@ static int ehci_execute(EHCIPacket *p, const char *= action)=0A= /* 4.7.2 */=0A= static int ehci_process_itd(EHCIState *ehci,=0A= EHCIitd *itd,=0A= - uint32_t addr)=0A= + uint64_t addr)=0A= {=0A= USBDevice *dev;=0A= USBEndpoint *ep;=0A= uint32_t i, len, pid, dir, devaddr, endp;=0A= - uint32_t pg, off, ptr1, ptr2, max, mult;=0A= + uint32_t pg, off, max, mult;=0A= + uint64_t ptr1, ptr2;=0A= =0A= ehci->periodic_sched_active =3D PERIODIC_ACTIVE;=0A= =0A= @@ -1528,7 +1529,7 @@ static int ehci_state_waitlisthead(EHCIState *ehci, = int async)=0A= EHCIqh qh;=0A= int i =3D 0;=0A= int again =3D 0;=0A= - uint32_t entry =3D ehci->asynclistaddr;=0A= + uint64_t entry =3D ehci->asynclistaddr;=0A= =0A= /* set reclamation flag at start event (4.8.6) */=0A= if (async) {=0A= @@ -1578,7 +1579,7 @@ out:=0A= static int ehci_state_fetchentry(EHCIState *ehci, int async)=0A= {=0A= int again =3D 0;=0A= - uint32_t entry =3D ehci_get_fetch_addr(ehci, async);=0A= + uint64_t entry =3D ehci_get_fetch_addr(ehci, async);=0A= =0A= if (NLPTR_TBIT(entry)) {=0A= ehci_set_state(ehci, async, EST_ACTIVE);=0A= @@ -1610,8 +1611,10 @@ static int ehci_state_fetchentry(EHCIState *ehci, in= t async)=0A= =0A= default:=0A= /* TODO: handle FSTN type */=0A= - qemu_log_mask(LOG_GUEST_ERROR, "FETCHENTRY: entry at %X is of type= %u "=0A= - "which is not supported yet\n", entry, NLPTR_TYPE_GET(entr= y));=0A= + qemu_log_mask(LOG_GUEST_ERROR,=0A= + "FETCHENTRY: entry at %" PRIx64 "is of type %" PRIu6= 4=0A= + "which is not supported yet\n",=0A= + entry, NLPTR_TYPE_GET(entry));=0A= return -1;=0A= }=0A= =0A= @@ -1621,7 +1624,7 @@ out:=0A= =0A= static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)=0A= {=0A= - uint32_t entry;=0A= + uint64_t entry;=0A= EHCIQueue *q;=0A= EHCIqh qh;=0A= =0A= @@ -1710,7 +1713,7 @@ out:=0A= =0A= static int ehci_state_fetchitd(EHCIState *ehci, int async)=0A= {=0A= - uint32_t entry;=0A= + uint64_t entry;=0A= EHCIitd itd;=0A= =0A= assert(!async);=0A= @@ -1736,7 +1739,7 @@ static int ehci_state_fetchitd(EHCIState *ehci, int a= sync)=0A= =0A= static int ehci_state_fetchsitd(EHCIState *ehci, int async)=0A= {=0A= - uint32_t entry;=0A= + uint64_t entry;=0A= EHCIsitd sitd;=0A= =0A= assert(!async);=0A= @@ -1794,7 +1797,7 @@ static int ehci_state_fetchqtd(EHCIQueue *q)=0A= EHCIqtd qtd;=0A= EHCIPacket *p;=0A= int again =3D 1;=0A= - uint32_t addr;=0A= + uint64_t addr;=0A= =0A= addr =3D NLPTR_GET(q->qtdaddr);=0A= if (get_dwords(q->ehci, addr + 8, &qtd.token, 1) < 0) {=0A= @@ -1877,7 +1880,7 @@ static int ehci_fill_queue(EHCIPacket *p)=0A= USBEndpoint *ep =3D p->packet.ep;=0A= EHCIQueue *q =3D p->queue;=0A= EHCIqtd qtd =3D p->qtd;=0A= - uint32_t qtdaddr;=0A= + uint64_t qtdaddr;=0A= =0A= for (;;) {=0A= if (NLPTR_TBIT(qtd.next) !=3D 0) {=0A= @@ -2000,7 +2003,8 @@ static int ehci_state_executing(EHCIQueue *q)=0A= static int ehci_state_writeback(EHCIQueue *q)=0A= {=0A= EHCIPacket *p =3D QTAILQ_FIRST(&q->packets);=0A= - uint32_t *qtd, addr;=0A= + uint32_t *qtd;=0A= + uint64_t addr;=0A= int again =3D 0;=0A= =0A= /* Write back the QTD from the QH area */=0A= @@ -2441,6 +2445,11 @@ static int usb_ehci_post_load(void *opaque, int vers= ion_id)=0A= }=0A= }=0A= =0A= + if (version_id < 3) {=0A= + s->a_fetch_addr =3D s->a_fetch_addr_pre_v3;=0A= + s->p_fetch_addr =3D s->p_fetch_addr_pre_v3;=0A= + }=0A= +=0A= return 0;=0A= }=0A= =0A= @@ -2470,9 +2479,14 @@ static void usb_ehci_vm_state_change(void *opaque, b= ool running, RunState state)=0A= }=0A= }=0A= =0A= +static bool ehci_core_is_before_version_3(void *opaque, int version_id)=0A= +{=0A= + return version_id < 3;=0A= +}=0A= +=0A= const VMStateDescription vmstate_ehci =3D {=0A= .name =3D "ehci-core",=0A= - .version_id =3D 2,=0A= + .version_id =3D 3,=0A= .minimum_version_id =3D 1,=0A= .pre_save =3D usb_ehci_pre_save,=0A= .post_load =3D usb_ehci_post_load,=0A= @@ -2501,8 +2515,12 @@ const VMStateDescription vmstate_ehci =3D {=0A= /* schedule state */=0A= VMSTATE_UINT32(astate, EHCIState),=0A= VMSTATE_UINT32(pstate, EHCIState),=0A= - VMSTATE_UINT32(a_fetch_addr, EHCIState),=0A= - VMSTATE_UINT32(p_fetch_addr, EHCIState),=0A= + VMSTATE_UINT32_TEST(a_fetch_addr_pre_v3, EHCIState,=0A= + ehci_core_is_before_version_3),=0A= + VMSTATE_UINT32_TEST(p_fetch_addr_pre_v3, EHCIState,=0A= + ehci_core_is_before_version_3),=0A= + VMSTATE_UINT64_V(a_fetch_addr, EHCIState, 3),=0A= + VMSTATE_UINT64_V(p_fetch_addr, EHCIState, 3),=0A= VMSTATE_END_OF_LIST()=0A= }=0A= };=0A= diff --git a/hw/usb/trace-events b/hw/usb/trace-events=0A= index 0d4318dcf1..8c90688bb3 100644=0A= --- a/hw/usb/trace-events=0A= +++ b/hw/usb/trace-events=0A= @@ -86,15 +86,15 @@ usb_ehci_portsc_write(uint32_t addr, uint32_t port, uin= t32_t val) "wr mmio 0x%04=0A= usb_ehci_portsc_change(uint32_t addr, uint32_t port, uint32_t new, uint32_= t old) "ch mmio 0x%04x [port %d] =3D 0x%x (old: 0x%x)"=0A= usb_ehci_usbsts(const char *sts, int state) "usbsts %s %d"=0A= usb_ehci_state(const char *schedule, const char *state) "%s schedule %s"= =0A= -usb_ehci_qh_ptrs(void *q, uint32_t addr, uint32_t nxt, uint32_t c_qtd, uin= t32_t n_qtd, uint32_t a_qtd) "q %p - QH @ 0x%08x: next 0x%08x qtds 0x%08x,0= x%08x,0x%08x"=0A= -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"=0A= -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"=0A= +usb_ehci_qh_ptrs(void *q, uint64_t addr, uint32_t nxt, uint32_t c_qtd, uin= t32_t n_qtd, uint32_t a_qtd) "q %p - QH @ 0x%" PRIx64 ": next 0x%08x qtds 0= x%08x,0x%08x,0x%08x"=0A= +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"=0A= +usb_ehci_qh_bits(uint64_t addr, int c, int h, int dtc, int i) "QH @ 0x%" P= RIx64 " - c %d, h %d, dtc %d, i %d"=0A= usb_ehci_qh_tbytes(uint32_t tbytes) "updating tbytes to %d"=0A= -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"=0A= -usb_ehci_qtd_fields(uint32_t addr, int tbytes, int cpage, int cerr, int pi= d) "QTD @ 0x%08x - tbytes %d, cpage %d, cerr %d, pid %d"=0A= -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, xacte= rr %d"=0A= -usb_ehci_itd(uint32_t addr, uint32_t nxt, uint32_t mplen, uint32_t mult, u= int32_t ep, uint32_t devaddr) "ITD @ 0x%08x: next 0x%08x - mplen %d, mult %= d, ep %d, dev %d"=0A= -usb_ehci_sitd(uint32_t addr, uint32_t nxt, uint32_t active) "ITD @ 0x%08x:= next 0x%08x - active %d"=0A= +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"=0A= +usb_ehci_qtd_fields(uint64_t addr, int tbytes, int cpage, int cerr, int pi= d) "QTD @ 0x%" PRIx64 " - tbytes %d, cpage %d, cerr %d, pid %d"=0A= +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"=0A= +usb_ehci_itd(uint64_t addr, uint32_t nxt, uint32_t mplen, uint32_t mult, u= int32_t ep, uint32_t devaddr) "ITD @ 0x%" PRIx64 ": next 0x%08x - mplen %d,= mult %d, ep %d, dev %d"=0A= +usb_ehci_sitd(uint64_t addr, uint32_t nxt, uint32_t active) "SITD @ 0x%" P= RIx64 ": next 0x%08x - active %d"=0A= usb_ehci_port_attach(uint32_t port, const char *owner, const char *device)= "attach port #%d, owner %s, device %s"=0A= usb_ehci_port_detach(uint32_t port, const char *owner) "detach port #%d, o= wner %s"=0A= usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d"=0A= @@ -104,15 +104,15 @@ usb_ehci_port_resume(uint32_t port) "port #%d"=0A= usb_ehci_port_disable(uint32_t port) "port #%d"=0A= usb_ehci_queue_action(void *q, const char *action) "q %p: %s"=0A= usb_ehci_packet_action(void *q, void *p, const char *action) "q %p p %p: %= s"=0A= -usb_ehci_packet_submit(uint32_t qhaddr, uint32_t next, uint32_t qtdaddr, i= nt pid, size_t len, int endp, int status, int actual_length) "qh=3D0x%x, ne= xt=3D0x%x, qtd=3D0x%x, pid=3D0x%x, len=3D%zd, endp=3D0x%x, status=3D%d, act= ual_length=3D%d"=0A= +usb_ehci_packet_submit(uint64_t qhaddr, uint32_t next, uint64_t qtdaddr, i= nt pid, size_t len, int endp, int status, int actual_length) "qh=3D0x%" PRI= x64 ", next=3D0x%x, qtd=3D0x%" PRIx64 ", pid=3D0x%x, len=3D%zd, endp=3D0x%x= , status=3D%d, actual_length=3D%d"=0A= 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"=0A= usb_ehci_guest_bug(const char *reason) "%s"=0A= usb_ehci_doorbell_ring(void) ""=0A= usb_ehci_doorbell_ack(void) ""=0A= usb_ehci_dma_error(void) ""=0A= -usb_ehci_execute_complete(uint32_t qhaddr, uint32_t next, uint32_t qtdaddr= , int status, int actual_length) "qhaddr=3D0x%x, next=3D0x%x, qtdaddr=3D0x%= x, status=3D%d, actual_length=3D%d"=0A= -usb_ehci_fetchqh_reclaim_done(uint32_t qhaddr) "QH 0x%08x H-bit set, recla= mation status reset - done processing"=0A= -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%08= x"=0A= +usb_ehci_execute_complete(uint64_t qhaddr, uint32_t next, uint64_t qtdaddr= , int status, int actual_length) "qhaddr=3D0x%" PRIx64 ", next=3D0x%x, qtda= ddr=3D0x%" PRIx64 ", status=3D%d, actual_length=3D%d"=0A= +usb_ehci_fetchqh_reclaim_done(uint64_t qhaddr) "QH 0x%" PRIx64 " H-bit set= , reclamation status reset - done processing"=0A= +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) nex= t 0x%08x"=0A= usb_ehci_periodic_state_advance(uint32_t frame, uint32_t list, uint32_t en= try) "frame=3D%d, list=3D0x%x, entry=3D0x%x"=0A= usb_ehci_skipped_uframes(uint64_t skipped_uframes) "skipped %" PRIu64 " uf= rames"=0A= usb_ehci_log(const char *msg) "%s"=0A= -- =0A= 2.43.0=0A=