From nobody Mon Feb 9 00:07:16 2026 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; arc=pass (i=1 dmarc=pass fromdomain=aspeedtech.com); dmarc=pass(p=quarantine dis=none) header.from=aspeedtech.com ARC-Seal: i=2; a=rsa-sha256; t=1770189691; cv=pass; d=zohomail.com; s=zohoarc; b=TpSnTfdlZF0jz60gtoPKog7QQYU95WeqbmhV2GJAz2XzFmy3/V8S3MOzTv0pC+KeylB9WB/x274lu9hQuG6OVa/I3j2yGQnsBcNjjdZCpnKtpMyJvatditDVoi22N2srVpUnqYLvBxFJgYkS1pqvDpRTWvON1BjXsQN9s0bzUlw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770189691; 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=xanY8lWWj1o9pHV4DaF+bwhx77T/jfPF1cnYyg/dbTU=; b=bBM2YZJku7ILYltWccB0s2vGJrcO9+Lcm2WKyamoWsPhcC4LFSupmfijodwkZj8otkhJQ8n2yLgTGddF/mjFLaEauYCxCJ0NhxZ4YVeHH6vPKBdjYGg/6C59Wru6aaQqoExcbYgWk1yDqVH1eNHcqdnqZwEbSzmN4eHhPaAkZ24= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=aspeedtech.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770189691835979.5177791430422; Tue, 3 Feb 2026 23:21:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnX9Z-0006fY-11; Wed, 04 Feb 2026 02:18:21 -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 1vnWZB-0004Y7-Pd; Wed, 04 Feb 2026 01:40:45 -0500 Received: from mail-japaneastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c405::7] helo=TYDPR03CU002.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 1vnWZ1-0004HR-0Q; Wed, 04 Feb 2026 01:40:38 -0500 Received: from SI6PR06MB7631.apcprd06.prod.outlook.com (2603:1096:4:239::11) by PUZPR06MB5901.apcprd06.prod.outlook.com (2603:1096:301:110::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.8; Wed, 4 Feb 2026 06:40:26 +0000 Received: from SI6PR06MB7631.apcprd06.prod.outlook.com ([fe80::afe5:a3f1:b435:e43c]) by SI6PR06MB7631.apcprd06.prod.outlook.com ([fe80::afe5:a3f1:b435:e43c%4]) with mapi id 15.20.9587.010; Wed, 4 Feb 2026 06:40:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pX+eC1oLaDvNHk/62WJuiX02o781C8rSRa8Zh2RWuYURISISD3TRm7evzNoT6fOkkaIscx71FzoARSHEOuWJNSiZR55CxDLtTgNZ7PFv/YURA4qtAhNDbe3zF3ydurBlpPBEI9kSpK+PfPIls/0dd4bhYgVRA63T34xboIDDJolIqQUUdtmuWPJA1dKSEstOz1mwpDl5KmQFlx7rgzA7yq6V/V2nIRDaLa5LtLumoyKEH7gQ4AmU51cRQ4OmIdF6oUl75GClMCDA9WDOoDV7rSZzCU3HwA6k+HBzBfVuoWTFC2oM4lc3/9ZWG5EwV9by43HUlt8HRyrwkuvAlXjmfA== 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=xanY8lWWj1o9pHV4DaF+bwhx77T/jfPF1cnYyg/dbTU=; b=So3RxvEv25SylaJV5xzz3d3Gbbr8CVs3xmBWHLXJbpVvc0hvywGCF4C2ZPxjL4r8IyuKIsIrxbzm+g151hFgTTMVRqKgzT0MEtISj5HQ/R8dzXcIgQhyZlMMnrafg+gtoM4Z+pZ1hFqHTrvuznzpUyb/XPw5hPgdfysPt2OvBYratuGgxXvSyGEkZNgqsNcgX3uaFWr0OYku83oazcmJ6LcyWEZxnCqlyP/Fl1mG18i/9gab+GLi5bogbsxSpfXIJQHRL5JTRGBxhj3O/fDZ3N1K8+IeZsVUXyj0QMMGp+Me6TnBSgYOxRrEGDWeNcfL61yRRp+s+9XvcDJlV+wjHg== 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=xanY8lWWj1o9pHV4DaF+bwhx77T/jfPF1cnYyg/dbTU=; b=g5mbTNGLXsc2BOpRlX1rgUxnChFBRiH2E7yPMwfXw2yR+ihlosLbWC9icMMdTduAhpEkzmnsIgem9xsk1HKCrnsFADLbCj1DeHE4gpMQUHjRDwuCEnm6rl8CKh9tg5dVMPcM0zUsjL97Yexl7ysOz+mjT+pguEZiF0h7GMLQy2zu+gx1HrGe+gG7LmLRIkLinDwfQV/Zqy8xzyGvptGyeAKi64yF8szQMNJUK5k0HBrSCkFHw+bV+4YHkkgU2v3EUveW0kPIqYtitRu7qNx72OTYh9DPCkHxF2NtdifMDej7ee1vEmDB6PT/HrsurvJEXyKpxGuwL15T5ZCfHnpXTw== From: Kane Chen To: =?iso-8859-1?Q?C=E9dric_Le_Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley , "open list:ASPEED BMCs" , "open list:All patches CC here" CC: Troy Lee , Kane Chen Subject: [PATCH v6 06/22] hw/arm/aspeed: Integrate interrupt controller for AST1700 Thread-Topic: [PATCH v6 06/22] hw/arm/aspeed: Integrate interrupt controller for AST1700 Thread-Index: AQHclaElY0Rc7SwRnkyWJqed5+Q0dA== Date: Wed, 4 Feb 2026 06:40:25 +0000 Message-ID: <20260204064016.3515639-7-kane_chen@aspeedtech.com> References: <20260204064016.3515639-1-kane_chen@aspeedtech.com> In-Reply-To: <20260204064016.3515639-1-kane_chen@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: SI6PR06MB7631:EE_|PUZPR06MB5901:EE_ x-ms-office365-filtering-correlation-id: c03f1b18-6a51-4393-a40e-08de63b8479d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|1800799024|376014|38070700021; x-microsoft-antispam-message-info: =?iso-8859-1?Q?/gSgSrOWy13bLjgOuvO9gJ88zbGseVIT6Q012D2wbB25GzFvWEvsSvLA9O?= =?iso-8859-1?Q?8nOZMQ9ea4PryWRZDA/s5yj1z9bjNiDUqeo8vBEBGGjgp/3+DKAv232rel?= =?iso-8859-1?Q?OgN2i2N4YNGfpkyFMaS4otZ17du3ozdwh1eJPM9PKaQP8UIDnxwPrXSWQD?= =?iso-8859-1?Q?aYLMz1+x4FvyOaVjEO6X1UREpwKo2OQsWzPt8QqPjlzi6Dbk70oxXgb+M3?= =?iso-8859-1?Q?Wsot/PQpv9Njk0ACwz31C0oFQCn+rDhsZmvOg3c+3DzLCd3IpjIsdOmac6?= =?iso-8859-1?Q?UbddihmjjHfuKt5Ypbpvi13+n8FoebmMYgQlbdc8A8U4HIDkUHVV6xZ7X0?= =?iso-8859-1?Q?6RKFz/pOeJYRP89a6Df/sziDs1oOOqbF/FEqOs3IO0o/jKA7RsxF1Ve/gs?= =?iso-8859-1?Q?SL2/XIWBzZE52L/aG6Egk/HWArGWP+e5+l+QtmWGH6D64x3AWJK330h0sG?= =?iso-8859-1?Q?490DSt5PlCb8sGYUuORXjiaGaJYv/amQkCv0sTIksXgo8ceULxKepF6CTv?= =?iso-8859-1?Q?9J40D9cndM1RCRuVSftJfhkz35IRFvLFIOEYKarMYC9RmB5KeUpCsGo7gW?= =?iso-8859-1?Q?OqV3zoy6pjEMjrmIDAvAwXpTXzuFWeAZsfYY68EX3Ti2RYjEi+RcS9rShM?= =?iso-8859-1?Q?Uw7aPzy9n2bx+Xy5ih6e2Smooz+mtPUf09UYrRtzU46BB2bajAzlRRbuW2?= =?iso-8859-1?Q?//SBkxaF+GyxfNjBDMy2Ex4aXfil9JSVpDO5c3v95uvD8wnjQncqayj3V2?= =?iso-8859-1?Q?ujdHB4qzXjoVDrLr9m5xT3oZ2gOW9VxMRQyHrHAQjrbmmBZgnxuUXUJoWB?= =?iso-8859-1?Q?OG7a+9oGH32fR4dKfVwlejZ5Xu+8taNmsZfg/1ajoGaFppWfZ5xN4Y3zud?= =?iso-8859-1?Q?gEi2EHH2ji/CW9VJZE9UTkFlPKlK/geAHwLd67Xolkyuz4en5RaJ+w/4sA?= =?iso-8859-1?Q?khUqdLHX/5qlEN8IqENGlyfZtCrCOK3K7T0YachDsNr3Mj/SBjI51PB+1B?= =?iso-8859-1?Q?DWJ1sRBpmWG9XB90EhTK0rrhHpcUN86eGSFjKTf+Ch/woyHEI1FiDNvitr?= =?iso-8859-1?Q?R0g42pzqeuQ9z8b3EoRNKOyZvU7GGSFROoiDloGGssPDcX6rmAR8A+zpYu?= =?iso-8859-1?Q?2T2RgvZi16shOjdoH4mXnq8QHSGPxByap7uPpsfIuYp/hf3ZWlwBgBAguF?= =?iso-8859-1?Q?musx1P6EgH4PhmbuFNmW1/xAbAxhG++ePiAGyYn27UsNPgyhgM/ZAfUo0l?= =?iso-8859-1?Q?8KM2+AtR+qhBr/bGjJnWedsnPHtxvNg0Pkx4UkjQEP9N7whp93i0IibORt?= =?iso-8859-1?Q?CmtKcYKYbxfMKd83Di95DoUZScczb8k6jtNC/kq1r06swYn/hs2zmfCWft?= =?iso-8859-1?Q?exxZB4ozS5P/aCxCo5nVfKrbQENa1NrNKt6slkty3fZ1ZwExZRNqeSqpdI?= =?iso-8859-1?Q?PW+7fXJHULMVtTen9H0J3krIJ3NuhfWAE8LVHGfD4yZfKcWEexcIRDbK83?= =?iso-8859-1?Q?AiZIT5fnRrE1z5XMrWfMIObWM8Ey8HrpZOTgJBkBqcEq6QEt0yWA/VL5sj?= =?iso-8859-1?Q?K4qUoGznMVF2RhqzMHqrhNuucmxQZEU+zcJu/ikMHy91o5lXuIXwiD+0ec?= =?iso-8859-1?Q?lR3hNgFksKy2pga2TWifqugSCK9zV5wtZv4BfORnm3jm6pVl8YI01tfiiw?= =?iso-8859-1?Q?rE1YFNmovgqKkAHj2Uo=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SI6PR06MB7631.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(38070700021); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?3Pctv+vNqFZADliO4pHm7nXVRnGBXxCVW9rrpBwoMPMCWuITGh7T1CEbLE?= =?iso-8859-1?Q?XRfBTuKbdQcqZF03MYPcyeyvzjoSjU4R1CCVfWRNUmTYOnIUEdEwIWjyhS?= =?iso-8859-1?Q?xNXSNXVvd6pLpGe2xUKVJ7TUjqf73HmAXg6BqQ0V/1iZmM/qYUumJpnLB/?= =?iso-8859-1?Q?LsEZjSi+gwoowvCM4Pg2qGO3uVAqswVxGk8WWnKijl9mZ7k93i9G4o2jj3?= =?iso-8859-1?Q?u5vZo9G2Vt6K8PYghvl1vkC2GXxtzYClR/NBiV3AgvrHrpDCC8UEMaqRmh?= =?iso-8859-1?Q?epLQ1SKpqVGfkGVpJurUieYGIjNtsODXOEBjPCOsrSjrJTL1nOgnWGZEoP?= =?iso-8859-1?Q?GSwQyh6FuMLqZJZXGTmJ9WIF1TWRBmAtvHJR+hZ+gb2f0pUL+z1mu0POFg?= =?iso-8859-1?Q?8MTBs2gxryhNdfu+oPbnDtsaqbjHBZIjL8mYFnB2NUaxpkxpwtnp4RQEvY?= =?iso-8859-1?Q?KJdg93xVzSQnNmeqpLMhluIvEH7xUvwUHZ9FdcLitw1SOmLMS7sX/ZiPxq?= =?iso-8859-1?Q?6s7+WfLXdljuQynJPQ22S/84lU8FHENVN7kEtS3BN8x3GqlOVXph+sW4am?= =?iso-8859-1?Q?F7rKceWRV53sU1JLaX1/TvVi9N1Ifm2OXBmYoRTawy+t+hRQolpzOtVsT4?= =?iso-8859-1?Q?YZG/BR7FRKAGgqUu3OOj3aKZUC/8fTz0tPBdI6ZU+P0ZBOCD1HZb6WphYR?= =?iso-8859-1?Q?8T1VTdqPkDaTv/2Yk/8m1s0vwCz6WW0b1PxkACaTZgtgbEzv3sjSMozsKM?= =?iso-8859-1?Q?0LTM8U7qwZqnrg9vmuDXh7dTfLrvSPkjKH9S+CX8X416Y1C8bgkF21VDcv?= =?iso-8859-1?Q?rCUEAnGY1E6EMGCZ/It3Gx5Q8Zx4xAggqC3HR2I4GiTkMXIhKEt5bnp33f?= =?iso-8859-1?Q?4lYB6GfMrNyynsfQ2dWVi5WXYrAr6rYZyzCAwdpB9rc5xIwbEAg1TOVdxo?= =?iso-8859-1?Q?jVR5UKW6e17z0nmJXqtzQEejZtj5fsToLcTgBmS6TsOgbLbo4JIXyQoO+E?= =?iso-8859-1?Q?koVgovgMwlJ2arNh486OOB/TkIxwMOLkbq8CrNy7uWMdJGbNwnAv8RSjPm?= =?iso-8859-1?Q?IPL3fLFbm9CS2F4sy0sUOt0RYFLN7h8WP7ghcphhF16saqVhfwEuMzt3ZK?= =?iso-8859-1?Q?xA5FxMCMbjtJDj/xt2JwH7qDdPfNmcvJ8q/VaUo337UZgUbzTzeypyeQv3?= =?iso-8859-1?Q?ffZ2FywhWVoRuNRqfo8PgRYWOGSK0ghRzy3XAQppE4eSfULc7jztsp3f+9?= =?iso-8859-1?Q?tNgIFpufJee2L4rNDFS5RGxpvqbNFKbj1DHV3rT9Q30Jq72cOojCb7c0qp?= =?iso-8859-1?Q?5zKeS8HjiQpVy2b+zgIE/SDoF6VVMjuONhum0STM/xpUs9lXy2YhlsXWs8?= =?iso-8859-1?Q?ZH3NOs4bX3SNvUlUQNVkCGfijLLQYkYrG0SOrTEMZh29MJ+2rLMVTt6AD4?= =?iso-8859-1?Q?RJEYsQC4GLHBp0fLzQkIGkst8UUNSlSyLlEHkkJSr/4Tr1yVl+3BC93LIR?= =?iso-8859-1?Q?9qMHmon/KLLaucUOxQGeo1SWBzccn9kjeu3GobRoFAxVy1RKtDJjb7AF68?= =?iso-8859-1?Q?THkDrw1vfIOmyHDA2nY03b6I157OJF9cbpFYENN6oUXVllob6mG2CGySuI?= =?iso-8859-1?Q?ccxUcuL4taNaJ0G3YeoIkZB0wRgbZEJet5F6WEzyRnwq2odcSJsVPTT59I?= =?iso-8859-1?Q?3iEoxhmjHU/KO2l+NOk9I7JPQ02y8gqipCK/vQfP9ehqFl+hghia0Q+5nC?= =?iso-8859-1?Q?cxf0w39aGSRQzmG32BLaiNuyCfOUytxhl/MTBs8gRO971mQFAUpg9n6PEv?= =?iso-8859-1?Q?7z3YlghB2Q=3D=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: aspeedtech.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SI6PR06MB7631.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c03f1b18-6a51-4393-a40e-08de63b8479d X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2026 06:40:25.9003 (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: RcnNNWrTl5inGeoVyl3bUDRK7Jd24fEKYzjl10RXZfXg85VO2hmlND4MRJYXQR/Qv/AZ0IyuE+RfdbLL0ZXiLUGd4lKDnkbgMWXliGJ6ZeQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB5901 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=2a01:111:f403:c405::7; envelope-from=kane_chen@aspeedtech.com; helo=TYDPR03CU002.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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 04 Feb 2026 02:17:16 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @aspeedtech.com) X-ZM-MESSAGEID: 1770189693994154100 Content-Type: text/plain; charset="utf-8" Connect the AST1700 interrupt lines to the GIC in AST27X0, enabling the propagation of AST1700-originated interrupts to the host SoC. This patch does not implement interrupt sources in AST1700 itself, only the wiring into AST27X0. Signed-off-by: Kane-Chen-AS --- include/hw/arm/aspeed_soc.h | 6 +++- include/hw/intc/aspeed_intc.h | 2 ++ hw/arm/aspeed_ast27x0.c | 37 +++++++++++++++++++++ hw/intc/aspeed_intc.c | 60 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index f19bab3457..b051d0eb3a 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -58,6 +58,7 @@ #define ASPEED_UARTS_NUM 13 #define ASPEED_JTAG_NUM 2 #define ASPEED_PCIE_NUM 3 +#define ASPEED_INTC_NUM 2 #define ASPEED_IOEXP_NUM 2 =20 struct AspeedSoCState { @@ -146,7 +147,8 @@ struct Aspeed27x0SoCState { AspeedSoCState parent; =20 ARMCPU cpu[ASPEED_CPUS_NUM]; - AspeedINTCState intc[2]; + AspeedINTCState intc[ASPEED_INTC_NUM]; + AspeedINTCState intcioexp[ASPEED_IOEXP_NUM]; GICv3State gic; MemoryRegion dram_empty; }; @@ -288,6 +290,8 @@ enum { ASPEED_DEV_LTPI_CTRL2, ASPEED_DEV_LTPI_IO0, ASPEED_DEV_LTPI_IO1, + ASPEED_DEV_IOEXP0_INTCIO, + ASPEED_DEV_IOEXP1_INTCIO, }; =20 const char *aspeed_soc_cpu_type(const char * const *valid_cpu_types); diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h index 5d10268fff..b25ef4a464 100644 --- a/include/hw/intc/aspeed_intc.h +++ b/include/hw/intc/aspeed_intc.h @@ -15,6 +15,8 @@ #define TYPE_ASPEED_INTC "aspeed.intc" #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700" #define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700" +#define TYPE_ASPEED_2700_INTCIOEXP1 TYPE_ASPEED_INTC "-ast2700-ioexp1" +#define TYPE_ASPEED_2700_INTCIOEXP2 TYPE_ASPEED_INTC "-ast2700-ioexp2" #define TYPE_ASPEED_2700SSP_INTC TYPE_ASPEED_INTC "-ast2700ssp" #define TYPE_ASPEED_2700SSP_INTCIO TYPE_ASPEED_INTC "io-ast2700ssp" #define TYPE_ASPEED_2700TSP_INTC TYPE_ASPEED_INTC "-ast2700tsp" diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index a05112e2b0..d9866c2c3b 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -91,7 +91,9 @@ static const hwaddr aspeed_soc_ast2700_memmap[] =3D { [ASPEED_DEV_LTPI_CTRL2] =3D 0x14C35000, [ASPEED_DEV_WDT] =3D 0x14C37000, [ASPEED_DEV_LTPI_IO0] =3D 0x30000000, + [ASPEED_DEV_IOEXP0_INTCIO] =3D 0x30C18000, [ASPEED_DEV_LTPI_IO1] =3D 0x50000000, + [ASPEED_DEV_IOEXP1_INTCIO] =3D 0x50C18000, [ASPEED_DEV_PCIE_MMIO0] =3D 0x60000000, [ASPEED_DEV_PCIE_MMIO1] =3D 0x80000000, [ASPEED_DEV_PCIE_MMIO2] =3D 0xA0000000, @@ -446,6 +448,10 @@ static void aspeed_soc_ast2700_init(Object *obj) object_initialize_child(obj, "intc", &a->intc[0], TYPE_ASPEED_2700_INT= C); object_initialize_child(obj, "intcio", &a->intc[1], TYPE_ASPEED_2700_INTCIO); + object_initialize_child(obj, "intc-ioexp0", &a->intcioexp[0], + TYPE_ASPEED_2700_INTCIOEXP1); + object_initialize_child(obj, "intc-ioexp1", &a->intcioexp[1], + TYPE_ASPEED_2700_INTCIOEXP2); =20 snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname); object_initialize_child(obj, "adc", &s->adc, typename); @@ -690,6 +696,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *de= v, Error **errp) aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intc[1]), 0, sc->memmap[ASPEED_DEV_INTCIO]); =20 + /* INTCIOEXP0 */ + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intcioexp[0]), errp)) { + return; + } + + aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intcioexp[0]), 0, + sc->memmap[ASPEED_DEV_IOEXP0_INTCIO]); + + /* INTCIOEXP1 */ + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intcioexp[1]), errp)) { + return; + } + + aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intcioexp[1]), 0, + sc->memmap[ASPEED_DEV_IOEXP1_INTCIO]); + /* irq sources -> orgates -> INTC */ for (i =3D 0; i < ic->num_inpins; i++) { qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0, @@ -1006,6 +1028,21 @@ static void aspeed_soc_ast2700_realize(DeviceState *= dev, Error **errp) } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ioexp[i]), 0, sc->memmap[ASPEED_DEV_LTPI_IO0 + i]); + + icio =3D ASPEED_INTC_GET_CLASS(&a->intcioexp[i]); + /* INTC_IOEXP internal: orgate[i] -> input[i] */ + for (int j =3D 0; j < icio->num_inpins; j++) { + irq =3D qdev_get_gpio_in(DEVICE(&a->intcioexp[i]), j); + qdev_connect_gpio_out(DEVICE(&a->intcioexp[i].orgates[j]), 0, + irq); + } + + /* INTC_IOEXP output[i] -> INTC0.orgate[0].input[i] */ + for (int j =3D 0; j < icio->num_outpins; j++) { + irq =3D qdev_get_gpio_in(DEVICE(&a->intc[0].orgates[0]), j); + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intcioexp[i]), j, + irq); + } } =20 aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu), diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index 77fae39205..52f2f946d5 100644 --- a/hw/intc/aspeed_intc.c +++ b/hw/intc/aspeed_intc.c @@ -793,6 +793,64 @@ static const TypeInfo aspeed_2700_intc_info =3D { .class_init =3D aspeed_2700_intc_class_init, }; =20 +static AspeedINTCIRQ aspeed_2700_intcioexp2_irqs[ASPEED_INTC_MAX_INPINS] = =3D { + {0, 8, 1, R_GICINT192_EN, R_GICINT192_STATUS}, + {1, 9, 1, R_GICINT193_EN, R_GICINT193_STATUS}, +}; + +static void aspeed_2700_intcioexp2_class_init(ObjectClass *klass, + const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + AspeedINTCClass *aic =3D ASPEED_INTC_CLASS(klass); + + dc->desc =3D "ASPEED 2700 IOEXP2 INTC Controller"; + aic->num_lines =3D 32; + aic->num_inpins =3D 2; + aic->num_outpins =3D 10; + aic->mem_size =3D 0x400; + aic->nr_regs =3D 0x58 >> 2; + aic->reg_offset =3D 0x100; + aic->reg_ops =3D &aspeed_intcio_ops; + aic->irq_table =3D aspeed_2700_intcioexp2_irqs; + aic->irq_table_count =3D ARRAY_SIZE(aspeed_2700_intcioexp2_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp2_info =3D { + .name =3D TYPE_ASPEED_2700_INTCIOEXP2, + .parent =3D TYPE_ASPEED_INTC, + .class_init =3D aspeed_2700_intcioexp2_class_init, +}; + +static AspeedINTCIRQ aspeed_2700_intcioexp1_irqs[ASPEED_INTC_MAX_INPINS] = =3D { + {0, 6, 1, R_GICINT192_EN, R_GICINT192_STATUS}, + {1, 7, 1, R_GICINT193_EN, R_GICINT193_STATUS}, +}; + +static void aspeed_2700_intcioexp1_class_init(ObjectClass *klass, + const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + AspeedINTCClass *aic =3D ASPEED_INTC_CLASS(klass); + + dc->desc =3D "ASPEED 2700 IOEXP1 INTC Controller"; + aic->num_lines =3D 32; + aic->num_inpins =3D 2; + aic->num_outpins =3D 10; + aic->mem_size =3D 0x400; + aic->nr_regs =3D 0x58 >> 2; + aic->reg_offset =3D 0x100; + aic->reg_ops =3D &aspeed_intcio_ops; + aic->irq_table =3D aspeed_2700_intcioexp1_irqs; + aic->irq_table_count =3D ARRAY_SIZE(aspeed_2700_intcioexp1_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp1_info =3D { + .name =3D TYPE_ASPEED_2700_INTCIOEXP1, + .parent =3D TYPE_ASPEED_INTC, + .class_init =3D aspeed_2700_intcioexp1_class_init, +}; + static AspeedINTCIRQ aspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS] =3D { {0, 0, 1, R_GICINT192_EN, R_GICINT192_STATUS}, {1, 1, 1, R_GICINT193_EN, R_GICINT193_STATUS}, @@ -950,6 +1008,8 @@ static void aspeed_intc_register_types(void) type_register_static(&aspeed_intc_info); type_register_static(&aspeed_2700_intc_info); type_register_static(&aspeed_2700_intcio_info); + type_register_static(&aspeed_2700_intcioexp1_info); + type_register_static(&aspeed_2700_intcioexp2_info); type_register_static(&aspeed_2700ssp_intc_info); type_register_static(&aspeed_2700ssp_intcio_info); type_register_static(&aspeed_2700tsp_intc_info); --=20 2.43.0