From nobody Fri Apr 4 03:40:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1741528658; cv=none; d=zohomail.com; s=zohoarc; b=GAnMf7F/JFk5S5lpH0Utk/kljfbQxwWZKt4VtIqWHbFMcFe6YIdopQoPrYEYwcKTTSdCPmHmPdNjGvsIdZzUBmPhJ/pEzZrlEihYjK5xTF/f+x0B3U7Llz7NhD/UPrACmWFlyx6nJliXXwBZO2PKABdjCNJ7+xzVlNoB/Nxzmbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741528658; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=71gYa93+m7oj7BHFz1te5Iel24DuZsxmP79Je1U5hyk=; b=UjsgFVt9Oj+v/RlW5GrZgL9IbXideSioNZvdw3Lmqh56YCY/ynyYdWnyT05yGM1kO/t/410QzMkZOqc/s+XLiieOFZWsFV4Lgr0NK7TyLV1JmV64fUv810YbebTwjb/b7eMvu2exfNucXLERNiyh01rCgd+wjlLwUb4ah6/pvzw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741528658952392.2348735409372; Sun, 9 Mar 2025 06:57:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trH5P-00018U-MK; Sun, 09 Mar 2025 09:52:59 -0400 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 1trH5E-0000YU-4x for qemu-devel@nongnu.org; Sun, 09 Mar 2025 09:52:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trH5A-0003EJ-0n for qemu-devel@nongnu.org; Sun, 09 Mar 2025 09:52:47 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-g9B5wXuCMpCfbSQi7QrVug-1; Sun, 09 Mar 2025 09:52:37 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7143E1800349; Sun, 9 Mar 2025 13:52:36 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.17]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D42EC1956094; Sun, 9 Mar 2025 13:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741528363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71gYa93+m7oj7BHFz1te5Iel24DuZsxmP79Je1U5hyk=; b=V4/nSQve2Bo9MBD5LMDU0VAkxStewkbw9BXtfkZMi0dZ9XnPbB3IEo/t0Yk6nUB8p3MUu4 mVNR1WcewFJnzPrJFDdss83//dDHDhs7+Uh98E0IaJrAzwzrB6Lx5ImGT9M5f4qzZAATMt ANBrmmczho/KtOxBphh0oUPdlKBgilM= X-MC-Unique: g9B5wXuCMpCfbSQi7QrVug-1 X-Mimecast-MFC-AGG-ID: g9B5wXuCMpCfbSQi7QrVug_1741528356 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Jamin Lin , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 25/46] hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0 Date: Sun, 9 Mar 2025 14:51:09 +0100 Message-ID: <20250309135130.545764-26-clg@redhat.com> In-Reply-To: <20250309135130.545764-1-clg@redhat.com> References: <20250309135130.545764-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1741528659504019000 From: Jamin Lin Currently, AST2700 SoC only supports A0. To support AST2700 A1, rename its = IRQ table and machine name. To follow the machine deprecation rule, the initial machine "ast2700-evb" is aliased to "ast2700a0-evb." In the future, we will alias "ast2700-evb" to n= ew SoCs, such as "ast2700a1-evb." Signed-off-by: Jamin Lin Reviewed-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/qemu-devel/20250307035945.3698802-9-jamin_lin= @aspeedtech.com Signed-off-by: C=C3=A9dric Le Goater --- hw/arm/aspeed.c | 9 +++++---- hw/arm/aspeed_ast27x0.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index c6c18596d62e..18f7c450dadd 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1673,12 +1673,13 @@ static void ast2700_evb_i2c_init(AspeedMachineState= *bmc) TYPE_TMP105, 0x4d); } =20 -static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *d= ata) +static void aspeed_machine_ast2700a0_evb_class_init(ObjectClass *oc, void = *data) { MachineClass *mc =3D MACHINE_CLASS(oc); AspeedMachineClass *amc =3D ASPEED_MACHINE_CLASS(oc); =20 - mc->desc =3D "Aspeed AST2700 EVB (Cortex-A35)"; + mc->alias =3D "ast2700-evb"; + mc->desc =3D "Aspeed AST2700 A0 EVB (Cortex-A35)"; amc->soc_name =3D "ast2700-a0"; amc->hw_strap1 =3D AST2700_EVB_HW_STRAP1; amc->hw_strap2 =3D AST2700_EVB_HW_STRAP2; @@ -1817,9 +1818,9 @@ static const TypeInfo aspeed_machine_types[] =3D { .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, #ifdef TARGET_AARCH64 }, { - .name =3D MACHINE_TYPE_NAME("ast2700-evb"), + .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, - .class_init =3D aspeed_machine_ast2700_evb_class_init, + .class_init =3D aspeed_machine_ast2700a0_evb_class_init, #endif }, { .name =3D TYPE_ASPEED_MACHINE, diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index f14d2ea1753d..44ddfdd2c6c9 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -73,7 +73,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] =3D { #define AST2700_MAX_IRQ 256 =20 /* Shared Peripheral Interrupt values below are offset by -32 from datashe= et */ -static const int aspeed_soc_ast2700_irqmap[] =3D { +static const int aspeed_soc_ast2700a0_irqmap[] =3D { [ASPEED_DEV_UART0] =3D 132, [ASPEED_DEV_UART1] =3D 132, [ASPEED_DEV_UART2] =3D 132, @@ -766,7 +766,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev= , Error **errp) create_unimplemented_device("ast2700.io", 0x0, 0x4000000); } =20 -static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data) +static void aspeed_soc_ast2700a0_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] =3D { ARM_CPU_TYPE_NAME("cortex-a35"), @@ -788,7 +788,7 @@ static void aspeed_soc_ast2700_class_init(ObjectClass *= oc, void *data) sc->uarts_num =3D 13; sc->num_cpus =3D 4; sc->uarts_base =3D ASPEED_DEV_UART0; - sc->irqmap =3D aspeed_soc_ast2700_irqmap; + sc->irqmap =3D aspeed_soc_ast2700a0_irqmap; sc->memmap =3D aspeed_soc_ast2700_memmap; sc->get_irq =3D aspeed_soc_ast2700_get_irq; } @@ -803,7 +803,7 @@ static const TypeInfo aspeed_soc_ast27x0_types[] =3D { .name =3D "ast2700-a0", .parent =3D TYPE_ASPEED27X0_SOC, .instance_init =3D aspeed_soc_ast2700_init, - .class_init =3D aspeed_soc_ast2700_class_init, + .class_init =3D aspeed_soc_ast2700a0_class_init, }, }; =20 --=20 2.48.1