Received: by 2002:a19:3859:0:0:0:0:0 with SMTP id d25csp32278lfj; Thu, 12 May 2022 21:07:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzD1b0E0XYsNtE9dnLyi1rC5Gv9bHoZDHT4Dc4uRF2Fe6YyA/C53TFgUGhAFoGtjmMk1Ucs X-Received: by 2002:a05:622a:13d1:b0:2f3:ca31:2200 with SMTP id p17-20020a05622a13d100b002f3ca312200mr2949948qtk.348.1652414833489; Thu, 12 May 2022 21:07:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652414833; cv=none; d=google.com; s=arc-20160816; b=KJdl5YAzXXV2PXgpgQLMjF517gVJo3JKCfk+iMdUx7EQX9iJkYIcbxnT7v6Fjemlq8 KMB9UuXTjJ/2lrZduJ7I4nC4yx+B/0qoYWHZcj8LWFDzAwF+8RDtkCdL0GQh3vLMXbY6 248IvZtnZKwghsc4dm2dz8WzofcYFRb7CjtczE8xyQJhHHL4dVSZRxy8Kub8wzCW+lEq o368A6uoFqTk3HPsamDN+DXrTMOduXHD+wf0lk6x6Uey5bD6DW0ArW/OhhuZ0pGfnCJH raOLS5MyN+yG3ap2r4x2vaNRO/fX1qWcb6u3WI+7bM4vIYiSijpMLlghTu0uagizbqfg fM8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KC391Ze2nm6dEQKOMd/z/MuerJqxDPcaEuPSZpfPu3w=; b=IdvKktHLSI/KOKENdSdLs4Zo1Wygurma4vzICpxHFXKAwiwB+414/ndwVMognN+/zg ll0nV7c+hkD5S5WGFEJWnRoWE6islIyKo5q26mUsFx5AuR2LrMzdDVzJljnSXnGNG85M mSYK8BzwpRLMwIdYmgDu2j/0QwxzUZtT1NhyQvoke5DOLXWJfDsz1JrtbTuC4ouUqDrt 2pqs8bgiBgotJBqCZEKyk4e4onGXrmvTrM2Dg9YpUnA0+WLlTWMzsoLGroPUSeahEGAM O4J6F708arPMyndQF9FgfE8Q9i2b2eh6hspJ9pntMmCQKZR4QFXqrLPW6lC3I5QmYIue 2DKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=aGQK9UqT; 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=REJECT sp=REJECT dis=NONE) header.from=fb.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gw13-20020a0562140f0d00b0044408f6a912si825923qvb.509.2022.05.12.21.07.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 May 2022 21:07:13 -0700 (PDT) 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=pass header.i=@fb.com header.s=facebook header.b=aGQK9UqT; 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=REJECT sp=REJECT dis=NONE) header.from=fb.com Received: from localhost ([::1]:51756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npMa8-0001Ua-Vq for alex.bennee@linaro.org; Fri, 13 May 2022 00:07:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npMYH-0007mQ-HH for qemu-arm@nongnu.org; Fri, 13 May 2022 00:05:17 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:8254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npMY6-0006Pg-1D for qemu-arm@nongnu.org; Fri, 13 May 2022 00:05:07 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24CNMOIF030543 for ; Thu, 12 May 2022 21:05:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=KC391Ze2nm6dEQKOMd/z/MuerJqxDPcaEuPSZpfPu3w=; b=aGQK9UqTQ1k/snRuaNHJ24Gx+o8YdimVjhJjaL8b8IuBz9UwnWgWGTKk/epGs11HckrU UlGesr6dzObk/AyJKEF9iU3EUkqd/giJMLiJjk/QtK0nOSLTp9afnnsIAJhaReV25PzL z5iBvny6Ad99z0U7nwkDY7buJyLiT4i6FyY= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3g12mtnyv9-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 12 May 2022 21:05:04 -0700 Received: from twshared31479.05.prn5.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 12 May 2022 21:05:02 -0700 Received: by devvm9194.prn0.facebook.com (Postfix, from userid 385188) id BF66E62D7863; Thu, 12 May 2022 21:02:20 -0700 (PDT) From: Peter Delevoryas To: CC: , , , , , , , , , , Subject: [PATCH 1/2] hw: aspeed: Add missing UART's Date: Thu, 12 May 2022 21:02:19 -0700 Message-ID: <20220513040220.3657135-2-pdel@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220513040220.3657135-1-pdel@fb.com> References: <20220513040220.3657135-1-pdel@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: 8ECCjJo_U2QOmkGlrMCRHjfe0EvOBAq3 X-Proofpoint-ORIG-GUID: 8ECCjJo_U2QOmkGlrMCRHjfe0EvOBAq3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-12_19,2022-05-12_01,2022-02-23_01 Received-SPF: pass client-ip=67.231.145.42; envelope-from=prvs=613212e35b=pdel@fb.com; helo=mx0a-00082601.pphosted.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: fNNlAvhq3xkF This adds the missing UART memory and IRQ mappings for the AST2400, AST25= 00, AST2600, and AST1030. This also includes the new UART interfaces added in the AST2600 and AST10= 30 from UART6 to UART13. The addresses and interrupt numbers for these two later chips are identical. Signed-off-by: Peter Delevoryas --- hw/arm/aspeed_ast10x0.c | 24 ++++++++++++++++++++++++ hw/arm/aspeed_ast2600.c | 19 +++++++++++++++++++ hw/arm/aspeed_soc.c | 6 ++++++ include/hw/arm/aspeed_soc.h | 8 ++++++++ 4 files changed, 57 insertions(+) diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index 4271549282..f65dc139da 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -33,14 +33,38 @@ static const hwaddr aspeed_soc_ast1030_memmap[] =3D { [ASPEED_DEV_SBC] =3D 0x7E6F2000, [ASPEED_DEV_GPIO] =3D 0x7E780000, [ASPEED_DEV_TIMER1] =3D 0x7E782000, + [ASPEED_DEV_UART1] =3D 0x7E783000, + [ASPEED_DEV_UART2] =3D 0x7E78D000, + [ASPEED_DEV_UART3] =3D 0x7E78E000, + [ASPEED_DEV_UART4] =3D 0x7E78F000, [ASPEED_DEV_UART5] =3D 0x7E784000, + [ASPEED_DEV_UART6] =3D 0x7E790000, + [ASPEED_DEV_UART7] =3D 0x7E790100, + [ASPEED_DEV_UART8] =3D 0x7E790200, + [ASPEED_DEV_UART9] =3D 0x7E790300, + [ASPEED_DEV_UART10] =3D 0x7E790400, + [ASPEED_DEV_UART11] =3D 0x7E790500, + [ASPEED_DEV_UART12] =3D 0x7E790600, + [ASPEED_DEV_UART13] =3D 0x7E790700, [ASPEED_DEV_WDT] =3D 0x7E785000, [ASPEED_DEV_LPC] =3D 0x7E789000, [ASPEED_DEV_I2C] =3D 0x7E7B0000, }; =20 static const int aspeed_soc_ast1030_irqmap[] =3D { + [ASPEED_DEV_UART1] =3D 47, + [ASPEED_DEV_UART2] =3D 48, + [ASPEED_DEV_UART3] =3D 49, + [ASPEED_DEV_UART4] =3D 50, [ASPEED_DEV_UART5] =3D 8, + [ASPEED_DEV_UART6] =3D 57, + [ASPEED_DEV_UART7] =3D 58, + [ASPEED_DEV_UART8] =3D 59, + [ASPEED_DEV_UART9] =3D 60, + [ASPEED_DEV_UART10] =3D 61, + [ASPEED_DEV_UART11] =3D 62, + [ASPEED_DEV_UART12] =3D 63, + [ASPEED_DEV_UART13] =3D 64, [ASPEED_DEV_GPIO] =3D 11, [ASPEED_DEV_TIMER1] =3D 16, [ASPEED_DEV_TIMER2] =3D 17, diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index eedda7badc..1b72800682 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -61,7 +61,18 @@ static const hwaddr aspeed_soc_ast2600_memmap[] =3D { [ASPEED_DEV_IBT] =3D 0x1E789140, [ASPEED_DEV_I2C] =3D 0x1E78A000, [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART2] =3D 0x1E78D000, + [ASPEED_DEV_UART3] =3D 0x1E78E000, + [ASPEED_DEV_UART4] =3D 0x1E78F000, [ASPEED_DEV_UART5] =3D 0x1E784000, + [ASPEED_DEV_UART6] =3D 0x1E790000, + [ASPEED_DEV_UART7] =3D 0x1E790100, + [ASPEED_DEV_UART8] =3D 0x1E790200, + [ASPEED_DEV_UART9] =3D 0x1E790300, + [ASPEED_DEV_UART10] =3D 0x1E790400, + [ASPEED_DEV_UART11] =3D 0x1E790500, + [ASPEED_DEV_UART12] =3D 0x1E790600, + [ASPEED_DEV_UART13] =3D 0x1E790700, [ASPEED_DEV_VUART] =3D 0x1E787000, [ASPEED_DEV_I3C] =3D 0x1E7A0000, [ASPEED_DEV_SDRAM] =3D 0x80000000, @@ -78,6 +89,14 @@ static const int aspeed_soc_ast2600_irqmap[] =3D { [ASPEED_DEV_UART3] =3D 49, [ASPEED_DEV_UART4] =3D 50, [ASPEED_DEV_UART5] =3D 8, + [ASPEED_DEV_UART6] =3D 57, + [ASPEED_DEV_UART7] =3D 58, + [ASPEED_DEV_UART8] =3D 59, + [ASPEED_DEV_UART9] =3D 60, + [ASPEED_DEV_UART10] =3D 61, + [ASPEED_DEV_UART11] =3D 62, + [ASPEED_DEV_UART12] =3D 63, + [ASPEED_DEV_UART13] =3D 64, [ASPEED_DEV_VUART] =3D 8, [ASPEED_DEV_FMC] =3D 39, [ASPEED_DEV_SDMC] =3D 0, diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 58714cb2a0..2cd03d49da 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -48,6 +48,9 @@ static const hwaddr aspeed_soc_ast2400_memmap[] =3D { [ASPEED_DEV_ETH1] =3D 0x1E660000, [ASPEED_DEV_ETH2] =3D 0x1E680000, [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART2] =3D 0x1E78D000, + [ASPEED_DEV_UART3] =3D 0x1E78E000, + [ASPEED_DEV_UART4] =3D 0x1E78F000, [ASPEED_DEV_UART5] =3D 0x1E784000, [ASPEED_DEV_VUART] =3D 0x1E787000, [ASPEED_DEV_SDRAM] =3D 0x40000000, @@ -80,6 +83,9 @@ static const hwaddr aspeed_soc_ast2500_memmap[] =3D { [ASPEED_DEV_ETH1] =3D 0x1E660000, [ASPEED_DEV_ETH2] =3D 0x1E680000, [ASPEED_DEV_UART1] =3D 0x1E783000, + [ASPEED_DEV_UART2] =3D 0x1E78D000, + [ASPEED_DEV_UART3] =3D 0x1E78E000, + [ASPEED_DEV_UART4] =3D 0x1E78F000, [ASPEED_DEV_UART5] =3D 0x1E784000, [ASPEED_DEV_VUART] =3D 0x1E787000, [ASPEED_DEV_SDRAM] =3D 0x80000000, diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index e13af374b9..3f7f815275 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -104,6 +104,14 @@ enum { ASPEED_DEV_UART3, ASPEED_DEV_UART4, ASPEED_DEV_UART5, + ASPEED_DEV_UART6, + ASPEED_DEV_UART7, + ASPEED_DEV_UART8, + ASPEED_DEV_UART9, + ASPEED_DEV_UART10, + ASPEED_DEV_UART11, + ASPEED_DEV_UART12, + ASPEED_DEV_UART13, ASPEED_DEV_VUART, ASPEED_DEV_FMC, ASPEED_DEV_SPI1, --=20 2.30.2