From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:505:a0c:b0:1be9:327d:8ee3 with SMTP id cg12csp4804443njb; Thu, 12 Dec 2024 06:05:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUjFNjLrXcaGBIgY6mFrSpp4WCHvs/uAZBL6D9q3FmxT77mtAcYgi+NU0Laiu1FqDSXS/Tur2V7Hw4d0A==@linaro.org X-Google-Smtp-Source: AGHT+IEGc5yAaDTLUDzziwDwXWr1X/OLH54oRQZuKqPKZrvMZssEdtkDZCUdZe6AXArHzHJEAGir X-Received: by 2002:a05:620a:2b98:b0:7b6:edc1:3d9c with SMTP id af79cd13be357-7b6f89f0255mr85007685a.58.1734012339115; Thu, 12 Dec 2024 06:05:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734012339; cv=none; d=google.com; s=arc-20240605; b=aIvOQBfy40Qu/dTku+NE4Xg2MfuSnD0qfVJZGu8DFQzkSvM9TEZgflIgaAc8yHDXeI PccY2Z9l7xe/UDh2W0aUiQ5Na8JiFvmKlEi6bV/dmktiqZQRXVQnUaRtDM6tCKyZx+0s lCXeStdVugtKgfSwbMnR1jKVYe1vfOp3lSJcZO1j5GA3jSOv8nYOrgTBjjS4Fk/LIMPo L5m07gR+eXW4xxjOqwtANK09kng4OKy+4fAR3l9SoVvpjoi5WvSn3X8Ii/APquPwOHMY yu/kg6NfVs8wcBkJv5eRUy0m9N0KAe7K8Vu7XG5HG4yruZ3M97lvuSs8c8ADuUVdmXBg 0R1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:from:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:ironport-hdrordr:ironport-data :dkim-signature; bh=fZe2+TYtPfrT6JfisAwlNwJhn0etmqmjdloFXOSLgfs=; fh=y/Ud+vEeYqzuU6BbB/O5EjMu88IiCYuwQZWjfD0xmew=; b=A9PrvrarCTk77eU40h9h4fQ4fOZuOK+j2fLDbKRsAuNLs5HfVh/FA8lLGK+5e6UTE4 0s3waP2x1K/NMDc4fhe4fzf4P4s3zO0yvS9CydFkxfuJs43kRx1k0oyU3LCS9Kf7GhYZ SB6fsokY+zWIRu/ErB/NDrJ5cTx+lK+m+r74OGyRA2/3xNa/zbmBfnKqy2Y+eBNEbysN aTzFhCu4WptYApNx+Rf7nSo/nclnpvMv4CZ5uRSz8LtasBTHg7clrvJUCzEaT8hqev8Z OXYTnkWmSZxQkGZvsIdTIPyljcQKMPv28yzLoTgWf0XV7UAXmuV9gocQynr1poy2CW9g 0z3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@asus.com header.s=asuscom header.b=kSEIwmPl; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-85c2bd7efc6si4223522241.114.2024.12.12.06.05.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Dec 2024 06:05:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@asus.com header.s=asuscom header.b=kSEIwmPl; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLjoq-0007U7-Kh; Thu, 12 Dec 2024 09:05:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLjIX-0008WD-P2; Thu, 12 Dec 2024 08:32:09 -0500 Received: from ms.asus.com ([103.10.4.142]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLjIV-0008Cn-IF; Thu, 12 Dec 2024 08:32:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=asus.com; i=@asus.com; q=dns/txt; s=asuscom; t=1734010328; x=1765546328; h=from:to:cc:subject:date:message-id:mime-version; bh=+BWRoSgWsOE7X8gxhEeW0GKnSxnR6+ax66jypHGL0EM=; b=kSEIwmPlsA74iIJV6EMf8DtoY9h5NgfN7Axe5t2Nge8i8folPRv+DkN7 gMKv3aXwpXHr8TZT8rbXrVtviwDHWoFvWbKZkLQBXqLWKVr4NxGMEAE1j xZHT+kT+75GOzQHkOmSgAccuA+LV8S8PoauqB8TBPMH2WpksPrubnfSal M=; IronPort-Data: A9a23:I1xTWqm+lBSgH6QIZooBKpTo5gybJ0RdPkR7XQ2eYbSJt1+Wr1Gzt xIWDT2DPquCZWDyf4snYITnoUIDv5/RnIJmTwtpqyljRS4T+ZvOCOrCIxarNUt+DOWaFxs/s J92hvosjiwQZiWBzvt4GuW5xZVE/fjUAOC6U4YoAwgpLSd8UiAtlBl/rOAwh49skLCRDhiE0 T/Ii5S31GKNgFaYDEpFs8pvlzsy5JweiBtA1nQiaPZCukPplnV9JPrz8onqdxMU6qENdgKLb 76rIIORpws1zD90Yj+RqYsXR2VRKlLk0ahivVINM0SqqkAqSiXfSc/XPtJEAatco23hc9ycV LyhHHF/IOskFvSkpQgTb/VXOwRfLfJf2rrIGlyuiN6Pn2/tLn/W7cw7WSnaPaVAkgp2KUhl3 rk1GGlTKy7b3qS/y7n9Qe52nsIuMI/iJ54E0p1i5WiGV7B8ENaYH+OTvLe03x9p7ixKNfXTY cwUdTpYbhXJSxRUJ0xRA5U79AutriCmL20H9gLIzUYxyzHZkQJb3aPyCf/UefiTavVZwE+q/ VuTqgwVBTlfbrRz0wGt63+pm6rGhybTXoUUG7ulsPlwjzW7zWgcIAcbWVuyvb+yjUvWc8pfK kgR9gIqrK477kvtScPyNzW6qXuFuCkYWtx4GvYi5QyB1qff40CSAW1sZjdHZMYrq+c9QjAn3 ViPhM/zGDdz9raSTDSU69+8oiiyMC49N2IOZSYYCwAC5rHLuYw2k1fDQ8huFIazidv6Hyy2x CqFxBXSnJ1K0pRNjfT9pgyB2mvESoX1czPZLz7/BgqNhj6Vrqb/D2B0wTA3Ncp9Ebs= IronPort-HdrOrdr: A9a23:5vRwV60O56Yu4XZpLDYOogqjBFckLtp133Aq2lEZdPUMSL38qy iv9M516faGskd0ZJhAo6HxBEDuewK+yXcY2+Qs1NSZLXrbUQmTXeNfBOLZqlWKcREWndQy6U 4USchD4arLbGSS4/yX3ODyKadG/DDOytHPuQ7x9QYVcekxBpsQlzuQKWugYzZLrEkqP+tFKH LTi/A32wZJNx4sH7WG7stpZZm4m/Tb0I/jaQQLQwUq8hWKkFqTmcHHOgndwxMXST8K3rs462 jClGXCl9uej80= X-Talos-CUID: 9a23:WXESg2DWaC35lN76EwxG5BENOMUqSVnM9WXMc22TVGJTZoTAHA== X-Talos-MUID: =?us-ascii?q?9a23=3AqgDWzw1sjfJ1021UQiCDgpNB6jUjuq7zBmoAioo?= =?us-ascii?q?/nsiHETVfCzvDhQbse9py?= Received: from unknown (HELO ACC-EX16-V01.acc.corpnet.asus) ([172.29.34.11]) by ms.asus.com with ESMTP; 12 Dec 2024 21:31:55 +0800 Received: from ACC-EX16-V03.acc.corpnet.asus (172.29.34.13) by ACC-EX16-V01.acc.corpnet.asus (172.29.34.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.43; Thu, 12 Dec 2024 21:31:54 +0800 Received: from ACC-EX16-V03.acc.corpnet.asus ([fe80::3dae:532a:2ef6:9654]) by ACC-EX16-V03.acc.corpnet.asus ([fe80::3dae:532a:2ef6:9654%3]) with mapi id 15.01.2507.043; Thu, 12 Dec 2024 21:31:48 +0800 To: "'qemu-arm@nongnu.org'" CC: =?gb2312?B?J0OopmRyaWMgTGUgR29hdGVyJw==?= , =?gb2312?B?J1BoaWxpcHBlIE1hdGhpZXUtRGF1ZKimJw==?= , "'Jamin Lin'" , 'Andrew Jeffery' , 'Gavin Shan' , "'open list:All patches CC here'" Subject: [PATCH] hw/arm/aspeed: fix connect_serial_hds_to_uarts Thread-Topic: [PATCH] hw/arm/aspeed: fix connect_serial_hds_to_uarts Thread-Index: AdtMmbwfoRQua2veTYW8MQ+0Vi041Q== Date: Thu, 12 Dec 2024 13:31:48 +0000 Message-ID: <5f9b0c53f1644922ba85522046e92f4c@asus.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [116.235.194.63] x-tm-as-product-ver: SMEX-14.0.0.3223-9.1.2019-28826.004 x-tm-as-result: No-10--14.720100-8.000000 x-tmase-matchedrid: 17iyaxE7EzIfHU5fltg9RrbW4WOZNAUnj5XD/cFEQwaQ+UeH24Dz4Lhu upHpXEmLU2VRnkEujdpjybcuQlsAB7ipA0mFNtPDyGyaQXOvRx4pihtGF1HQYaINgcEzNI9j7AI n5hx14Jqif1w5aAHlEkOBQVcKGV65AyTN38gAq/3vgBmbjAvGcP4HMKRDK5w12YGbrr/jo0ffOn cxfqt6MFxvJFCPsGl/3S/hhdntlxAm0dhXKknEYuKkRrdQOxlEJeVHOyz36PR3+86qkOXr2qF1m 9FYSo2UVs7wr6DPfUIagKanydgPttdASTplK1Vu5PkCeM7tNe3Ed+T1CCeSceHZCF6RvUzMY3Pf SmNBHfKjg0lrtKMWyoAII85gNIZEPRhkRGot+L5w0hoJ16zIu7LMDEFKafMtcHZCeuS/TLNsMSR /KkjaoxLRXl5vgI6AUvWcNoeLMyxYKVgm72vjJg== x-tm-as-user-approved-sender: No x-tm-as-user-blocked-sender: No x-tmase-result: 10--14.720100-8.000000 x-tmase-version: SMEX-14.0.0.3223-9.1.2019-28826.004 x-tm-snts-smtp: F343C16444858CD64C6543F9F7079A6048EF239BBCBDAED2B483D0437155F81A2000:9 Content-Type: multipart/alternative; boundary="_000_5f9b0c53f1644922ba85522046e92f4casuscom_" MIME-Version: 1.0 Received-SPF: pass client-ip=103.10.4.142; envelope-from=prvs=06952aba3=kenneth_jia@asus.com; helo=ms.asus.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) BAYES_00=-1.9, CHARSET_FARAWAY_HEADER=3.2, DKIMWL_WL_HIGH=-0.496, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 12 Dec 2024 09:05:11 -0500 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: , Reply-to: =?gb2312?B?S2VubmV0aCBKaWEovNa8zbarX7uqy7bJz7qjKQ==?= From: kenneth_jia--- via Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: Pj38bYWgJssP --_000_5f9b0c53f1644922ba85522046e92f4casuscom_ Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 RnJvbSAyNGQzYmFkYmJiOWRjYzBkMjIwNjA5YTdkZDMwZjhkYTUwMDJjYmE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogS2VubmV0aCBKaWEgPGtlbm5ldGhfamlhQGFzdXMuY29tPg0K RGF0ZTogVGh1LCAxMiBEZWMgMjAyNCAyMDo0MjowNCArMDgwMA0KU3ViamVjdDogW1BBVENIXSAg ICBody9hcm0vYXNwZWVkOiBmaXggY29ubmVjdF9zZXJpYWxfaGRzX3RvX3VhcnRzDQoNCiAgIElu IHRoZSBsb29wLCB3ZSBuZWVkIGlnbm9yZSB0aGUgaW5kZXggaW5jcmVhc2Ugd2hlbiB1YXJ0ID09 IHVhcnRfY2hvc2VuDQogICBXZSBzaG91bGQgaW5jcmVhc2UgdGhlIGluZGV4IG9ubHkgYWZ0ZXIg d2UgYWxsb2NhdGUgYSBzZXJpYWwuDQoNClNpZ25lZC1vZmYtYnk6IEtlbm5ldGggSmlhIDxrZW5u ZXRoX2ppYUBhc3VzLmNvbT4NCi0tLQ0KaHcvYXJtL2FzcGVlZC5jIHwgNCArKy0tDQoxIGZpbGUg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEv aHcvYXJtL2FzcGVlZC5jIGIvaHcvYXJtL2FzcGVlZC5jDQppbmRleCA1NTY0OThmMmEwLi5kOGNi MmQxNDI5IDEwMDY0NA0KLS0tIGEvaHcvYXJtL2FzcGVlZC5jDQorKysgYi9ody9hcm0vYXNwZWVk LmMNCkBAIC0zNjQsMTEgKzM2NCwxMSBAQCBzdGF0aWMgdm9pZCBjb25uZWN0X3NlcmlhbF9oZHNf dG9fdWFydHMoQXNwZWVkTWFjaGluZVN0YXRlICpibWMpDQogICAgIGludCB1YXJ0X2Nob3NlbiA9 IGJtYy0+dWFydF9jaG9zZW4gPyBibWMtPnVhcnRfY2hvc2VuIDogYW1jLT51YXJ0X2RlZmF1bHQ7 DQoNCiAgICAgYXNwZWVkX3NvY191YXJ0X3NldF9jaHIocywgdWFydF9jaG9zZW4sIHNlcmlhbF9o ZCgwKSk7DQotICAgIGZvciAoaW50IGkgPSAxLCB1YXJ0ID0gc2MtPnVhcnRzX2Jhc2U7IGkgPCBz Yy0+dWFydHNfbnVtOyBpKyssIHVhcnQrKykgew0KKyAgICBmb3IgKGludCBpID0gMSwgdWFydCA9 IHNjLT51YXJ0c19iYXNlOyBpIDwgc2MtPnVhcnRzX251bTsgdWFydCsrKSB7DQogICAgICAgICBp ZiAodWFydCA9PSB1YXJ0X2Nob3Nlbikgew0KICAgICAgICAgICAgIGNvbnRpbnVlOw0KICAgICAg ICAgfQ0KLSAgICAgICAgYXNwZWVkX3NvY191YXJ0X3NldF9jaHIocywgdWFydCwgc2VyaWFsX2hk KGkpKTsNCisgICAgICAgIGFzcGVlZF9zb2NfdWFydF9zZXRfY2hyKHMsIHVhcnQsIHNlcmlhbF9o ZChpKyspKTsNCiAgICAgfQ0KfQ0KDQotLQ0KMi4zNC4xDQo= --_000_5f9b0c53f1644922ba85522046e92f4casuscom_ Content-Type: text/html; charset="gb2312" Content-Transfer-Encoding: quoted-printable

From 24d3badbbb9dcc0d220609a7dd= 30f8da5002cba7 Mon Sep 17 00:00:00 2001

From: Kenneth Jia <kenneth_j= ia@asus.com>

Date: Thu, 12 Dec 2024 20:42:04= +0800

Subject: [PATCH]  &nb= sp; hw/arm/aspeed: fix connect_serial_hds_to_uarts

 

   In the loop, we ne= ed ignore the index increase when uart =3D=3D uart_chosen=

   We should increase= the index only after we allocate a serial.

 

Signed-off-by: Kenneth Jia <= kenneth_jia@asus.com>

---

hw/arm/aspeed.c | 4 ++-= -

1 file changed, 2 insertions(&#= 43;), 2 deletions(-)

 

diff --git a/hw/arm/aspeed.c b/= hw/arm/aspeed.c

index 556498f2a0..d8cb2d1429 10= 0644

--- a/hw/arm/aspeed.c

+++ b/hw/arm/aspeed= .c

@@ -364,11 +364,11 @@ stati= c void connect_serial_hds_to_uarts(AspeedMachineState *bmc)

     int ua= rt_chosen =3D bmc->uart_chosen ? bmc->uart_chosen : amc->uart_defa= ult;

 

     aspeed= _soc_uart_set_chr(s, uart_chosen, serial_hd(0));

-    for (int i = =3D 1, uart =3D sc->uarts_base; i < sc->uarts_num; i++, ua= rt++) {

+    for (in= t i =3D 1, uart =3D sc->uarts_base; i < sc->uarts_num; uart+&#= 43;) {

     &= nbsp;   if (uart =3D=3D uart_chosen) {

     &= nbsp;       continue;

     &= nbsp;   }

-     =    aspeed_soc_uart_set_chr(s, uart, serial_hd(i));

+    &n= bsp;   aspeed_soc_uart_set_chr(s, uart, serial_hd(i++));<= o:p>

     }=

}

 

--

2.34.1

--_000_5f9b0c53f1644922ba85522046e92f4casuscom_-- 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 lists.gnu.org (lists.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 49AF9E7717F for ; Thu, 12 Dec 2024 14:07:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLjq7-0008DR-FE; Thu, 12 Dec 2024 09:06:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLjIX-0008WD-P2; Thu, 12 Dec 2024 08:32:09 -0500 Received: from ms.asus.com ([103.10.4.142]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLjIV-0008Cn-IF; Thu, 12 Dec 2024 08:32:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=asus.com; i=@asus.com; q=dns/txt; s=asuscom; t=1734010328; x=1765546328; h=from:to:cc:subject:date:message-id:mime-version; bh=+BWRoSgWsOE7X8gxhEeW0GKnSxnR6+ax66jypHGL0EM=; b=kSEIwmPlsA74iIJV6EMf8DtoY9h5NgfN7Axe5t2Nge8i8folPRv+DkN7 gMKv3aXwpXHr8TZT8rbXrVtviwDHWoFvWbKZkLQBXqLWKVr4NxGMEAE1j xZHT+kT+75GOzQHkOmSgAccuA+LV8S8PoauqB8TBPMH2WpksPrubnfSal M=; IronPort-Data: A9a23:I1xTWqm+lBSgH6QIZooBKpTo5gybJ0RdPkR7XQ2eYbSJt1+Wr1Gzt xIWDT2DPquCZWDyf4snYITnoUIDv5/RnIJmTwtpqyljRS4T+ZvOCOrCIxarNUt+DOWaFxs/s J92hvosjiwQZiWBzvt4GuW5xZVE/fjUAOC6U4YoAwgpLSd8UiAtlBl/rOAwh49skLCRDhiE0 T/Ii5S31GKNgFaYDEpFs8pvlzsy5JweiBtA1nQiaPZCukPplnV9JPrz8onqdxMU6qENdgKLb 76rIIORpws1zD90Yj+RqYsXR2VRKlLk0ahivVINM0SqqkAqSiXfSc/XPtJEAatco23hc9ycV LyhHHF/IOskFvSkpQgTb/VXOwRfLfJf2rrIGlyuiN6Pn2/tLn/W7cw7WSnaPaVAkgp2KUhl3 rk1GGlTKy7b3qS/y7n9Qe52nsIuMI/iJ54E0p1i5WiGV7B8ENaYH+OTvLe03x9p7ixKNfXTY cwUdTpYbhXJSxRUJ0xRA5U79AutriCmL20H9gLIzUYxyzHZkQJb3aPyCf/UefiTavVZwE+q/ VuTqgwVBTlfbrRz0wGt63+pm6rGhybTXoUUG7ulsPlwjzW7zWgcIAcbWVuyvb+yjUvWc8pfK kgR9gIqrK477kvtScPyNzW6qXuFuCkYWtx4GvYi5QyB1qff40CSAW1sZjdHZMYrq+c9QjAn3 ViPhM/zGDdz9raSTDSU69+8oiiyMC49N2IOZSYYCwAC5rHLuYw2k1fDQ8huFIazidv6Hyy2x CqFxBXSnJ1K0pRNjfT9pgyB2mvESoX1czPZLz7/BgqNhj6Vrqb/D2B0wTA3Ncp9Ebs= IronPort-HdrOrdr: A9a23:5vRwV60O56Yu4XZpLDYOogqjBFckLtp133Aq2lEZdPUMSL38qy iv9M516faGskd0ZJhAo6HxBEDuewK+yXcY2+Qs1NSZLXrbUQmTXeNfBOLZqlWKcREWndQy6U 4USchD4arLbGSS4/yX3ODyKadG/DDOytHPuQ7x9QYVcekxBpsQlzuQKWugYzZLrEkqP+tFKH LTi/A32wZJNx4sH7WG7stpZZm4m/Tb0I/jaQQLQwUq8hWKkFqTmcHHOgndwxMXST8K3rs462 jClGXCl9uej80= X-Talos-CUID: 9a23:WXESg2DWaC35lN76EwxG5BENOMUqSVnM9WXMc22TVGJTZoTAHA== X-Talos-MUID: =?us-ascii?q?9a23=3AqgDWzw1sjfJ1021UQiCDgpNB6jUjuq7zBmoAioo?= =?us-ascii?q?/nsiHETVfCzvDhQbse9py?= Received: from unknown (HELO ACC-EX16-V01.acc.corpnet.asus) ([172.29.34.11]) by ms.asus.com with ESMTP; 12 Dec 2024 21:31:55 +0800 Received: from ACC-EX16-V03.acc.corpnet.asus (172.29.34.13) by ACC-EX16-V01.acc.corpnet.asus (172.29.34.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.43; Thu, 12 Dec 2024 21:31:54 +0800 Received: from ACC-EX16-V03.acc.corpnet.asus ([fe80::3dae:532a:2ef6:9654]) by ACC-EX16-V03.acc.corpnet.asus ([fe80::3dae:532a:2ef6:9654%3]) with mapi id 15.01.2507.043; Thu, 12 Dec 2024 21:31:48 +0800 To: "'qemu-arm@nongnu.org'" CC: =?gb2312?B?J0OopmRyaWMgTGUgR29hdGVyJw==?= , =?gb2312?B?J1BoaWxpcHBlIE1hdGhpZXUtRGF1ZKimJw==?= , "'Jamin Lin'" , 'Andrew Jeffery' , 'Gavin Shan' , "'open list:All patches CC here'" Subject: [PATCH] hw/arm/aspeed: fix connect_serial_hds_to_uarts Thread-Topic: [PATCH] hw/arm/aspeed: fix connect_serial_hds_to_uarts Thread-Index: AdtMmbwfoRQua2veTYW8MQ+0Vi041Q== Date: Thu, 12 Dec 2024 13:31:48 +0000 Message-ID: <5f9b0c53f1644922ba85522046e92f4c@asus.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [116.235.194.63] x-tm-as-product-ver: SMEX-14.0.0.3223-9.1.2019-28826.004 x-tm-as-result: No-10--14.720100-8.000000 x-tmase-matchedrid: 17iyaxE7EzIfHU5fltg9RrbW4WOZNAUnj5XD/cFEQwaQ+UeH24Dz4Lhu upHpXEmLU2VRnkEujdpjybcuQlsAB7ipA0mFNtPDyGyaQXOvRx4pihtGF1HQYaINgcEzNI9j7AI n5hx14Jqif1w5aAHlEkOBQVcKGV65AyTN38gAq/3vgBmbjAvGcP4HMKRDK5w12YGbrr/jo0ffOn cxfqt6MFxvJFCPsGl/3S/hhdntlxAm0dhXKknEYuKkRrdQOxlEJeVHOyz36PR3+86qkOXr2qF1m 9FYSo2UVs7wr6DPfUIagKanydgPttdASTplK1Vu5PkCeM7tNe3Ed+T1CCeSceHZCF6RvUzMY3Pf SmNBHfKjg0lrtKMWyoAII85gNIZEPRhkRGot+L5w0hoJ16zIu7LMDEFKafMtcHZCeuS/TLNsMSR /KkjaoxLRXl5vgI6AUvWcNoeLMyxYKVgm72vjJg== x-tm-as-user-approved-sender: No x-tm-as-user-blocked-sender: No x-tmase-result: 10--14.720100-8.000000 x-tmase-version: SMEX-14.0.0.3223-9.1.2019-28826.004 x-tm-snts-smtp: F343C16444858CD64C6543F9F7079A6048EF239BBCBDAED2B483D0437155F81A2000:9 Content-Type: multipart/alternative; boundary="_000_5f9b0c53f1644922ba85522046e92f4casuscom_" MIME-Version: 1.0 Received-SPF: pass client-ip=103.10.4.142; envelope-from=prvs=06952aba3=kenneth_jia@asus.com; helo=ms.asus.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) BAYES_00=-1.9, CHARSET_FARAWAY_HEADER=3.2, DKIMWL_WL_HIGH=-0.496, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 12 Dec 2024 09:05:35 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: =?gb2312?B?S2VubmV0aCBKaWEovNa8zbarX7uqy7bJz7qjKQ==?= From: kenneth_jia--- via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org --_000_5f9b0c53f1644922ba85522046e92f4casuscom_ Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 RnJvbSAyNGQzYmFkYmJiOWRjYzBkMjIwNjA5YTdkZDMwZjhkYTUwMDJjYmE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogS2VubmV0aCBKaWEgPGtlbm5ldGhfamlhQGFzdXMuY29tPg0K RGF0ZTogVGh1LCAxMiBEZWMgMjAyNCAyMDo0MjowNCArMDgwMA0KU3ViamVjdDogW1BBVENIXSAg ICBody9hcm0vYXNwZWVkOiBmaXggY29ubmVjdF9zZXJpYWxfaGRzX3RvX3VhcnRzDQoNCiAgIElu IHRoZSBsb29wLCB3ZSBuZWVkIGlnbm9yZSB0aGUgaW5kZXggaW5jcmVhc2Ugd2hlbiB1YXJ0ID09 IHVhcnRfY2hvc2VuDQogICBXZSBzaG91bGQgaW5jcmVhc2UgdGhlIGluZGV4IG9ubHkgYWZ0ZXIg d2UgYWxsb2NhdGUgYSBzZXJpYWwuDQoNClNpZ25lZC1vZmYtYnk6IEtlbm5ldGggSmlhIDxrZW5u ZXRoX2ppYUBhc3VzLmNvbT4NCi0tLQ0KaHcvYXJtL2FzcGVlZC5jIHwgNCArKy0tDQoxIGZpbGUg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEv aHcvYXJtL2FzcGVlZC5jIGIvaHcvYXJtL2FzcGVlZC5jDQppbmRleCA1NTY0OThmMmEwLi5kOGNi MmQxNDI5IDEwMDY0NA0KLS0tIGEvaHcvYXJtL2FzcGVlZC5jDQorKysgYi9ody9hcm0vYXNwZWVk LmMNCkBAIC0zNjQsMTEgKzM2NCwxMSBAQCBzdGF0aWMgdm9pZCBjb25uZWN0X3NlcmlhbF9oZHNf dG9fdWFydHMoQXNwZWVkTWFjaGluZVN0YXRlICpibWMpDQogICAgIGludCB1YXJ0X2Nob3NlbiA9 IGJtYy0+dWFydF9jaG9zZW4gPyBibWMtPnVhcnRfY2hvc2VuIDogYW1jLT51YXJ0X2RlZmF1bHQ7 DQoNCiAgICAgYXNwZWVkX3NvY191YXJ0X3NldF9jaHIocywgdWFydF9jaG9zZW4sIHNlcmlhbF9o ZCgwKSk7DQotICAgIGZvciAoaW50IGkgPSAxLCB1YXJ0ID0gc2MtPnVhcnRzX2Jhc2U7IGkgPCBz Yy0+dWFydHNfbnVtOyBpKyssIHVhcnQrKykgew0KKyAgICBmb3IgKGludCBpID0gMSwgdWFydCA9 IHNjLT51YXJ0c19iYXNlOyBpIDwgc2MtPnVhcnRzX251bTsgdWFydCsrKSB7DQogICAgICAgICBp ZiAodWFydCA9PSB1YXJ0X2Nob3Nlbikgew0KICAgICAgICAgICAgIGNvbnRpbnVlOw0KICAgICAg ICAgfQ0KLSAgICAgICAgYXNwZWVkX3NvY191YXJ0X3NldF9jaHIocywgdWFydCwgc2VyaWFsX2hk KGkpKTsNCisgICAgICAgIGFzcGVlZF9zb2NfdWFydF9zZXRfY2hyKHMsIHVhcnQsIHNlcmlhbF9o ZChpKyspKTsNCiAgICAgfQ0KfQ0KDQotLQ0KMi4zNC4xDQo= --_000_5f9b0c53f1644922ba85522046e92f4casuscom_ Content-Type: text/html; charset="gb2312" Content-Transfer-Encoding: quoted-printable

From 24d3badbbb9dcc0d220609a7dd= 30f8da5002cba7 Mon Sep 17 00:00:00 2001

From: Kenneth Jia <kenneth_j= ia@asus.com>

Date: Thu, 12 Dec 2024 20:42:04= +0800

Subject: [PATCH]  &nb= sp; hw/arm/aspeed: fix connect_serial_hds_to_uarts

 

   In the loop, we ne= ed ignore the index increase when uart =3D=3D uart_chosen=

   We should increase= the index only after we allocate a serial.

 

Signed-off-by: Kenneth Jia <= kenneth_jia@asus.com>

---

hw/arm/aspeed.c | 4 ++-= -

1 file changed, 2 insertions(&#= 43;), 2 deletions(-)

 

diff --git a/hw/arm/aspeed.c b/= hw/arm/aspeed.c

index 556498f2a0..d8cb2d1429 10= 0644

--- a/hw/arm/aspeed.c

+++ b/hw/arm/aspeed= .c

@@ -364,11 +364,11 @@ stati= c void connect_serial_hds_to_uarts(AspeedMachineState *bmc)

     int ua= rt_chosen =3D bmc->uart_chosen ? bmc->uart_chosen : amc->uart_defa= ult;

 

     aspeed= _soc_uart_set_chr(s, uart_chosen, serial_hd(0));

-    for (int i = =3D 1, uart =3D sc->uarts_base; i < sc->uarts_num; i++, ua= rt++) {

+    for (in= t i =3D 1, uart =3D sc->uarts_base; i < sc->uarts_num; uart+&#= 43;) {

     &= nbsp;   if (uart =3D=3D uart_chosen) {

     &= nbsp;       continue;

     &= nbsp;   }

-     =    aspeed_soc_uart_set_chr(s, uart, serial_hd(i));

+    &n= bsp;   aspeed_soc_uart_set_chr(s, uart, serial_hd(i++));<= o:p>

     }=

}

 

--

2.34.1

--_000_5f9b0c53f1644922ba85522046e92f4casuscom_--