From nobody Tue Jun 16 17:03:50 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF3E83D9041; Thu, 30 Apr 2026 10:56:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777546611; cv=none; b=Uir6n5HRbRFeirjW1r+4WGVYmnDilsUd+ROFih7Xi/fryoK20mOQqgTMw+E1Yd6FsXPiSQ7YwbFngobjEt0/V5aTZpKX7rtfXQG7k/U/d2Th/V3zTGCjAIuRDLTSaJTKgjgiW4577iTGw2JQyQd27W24BVyOwCxPeB2XPShFhF8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777546611; c=relaxed/simple; bh=41y7WJqrfOFqY0ssHyqZd1uRfEaWkUkm40XVjWSmRGY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RDehfx5TtStYcbQEQqZjY3eJtwDB+IekV2kuEJmfShOnKLAqW7iLX1zh3WM9FZsy7Idl5QFakuqKey76/SBv7hasRESM7ZjYHXTS/kxA1FpG3Q+t93emVY3WpgnWKMRg1NSMoeNhhtwrbBZeD5BDHLRy7jBmxW19sokFQZNhLUQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fRI0PKuh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=mq0EMYEw; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fRI0PKuh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="mq0EMYEw" Date: Thu, 30 Apr 2026 10:56:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777546608; h=from:from:sender:sender:reply-to: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=i/xHENsXkBz/WoTa6X9gFVBIeMWnxqntmD9TFgwCCAw=; b=fRI0PKuhtvVgigaP1N8qMzLBPUkiYOgy/PVb+NXDQPL3aS3XgBlaSFF7UyDxtojyDGizkd sG7aMgyQ3SqNHkGosV77UAm97/RbfoGc6tC7jdY6S+Qm94vKAxbNXaoO8mI1N64zjylXk5 vuSJkTpUP2Vf5jGxUoE1rfKahuA5/AQUi61/DVz5IHtrx+snbwalQDkZmOq9Z6e4SL4gL2 ll8nURLdo+c334ZlpYPR/J7coPGOEmCVytsq0gZ+6vt9kEU9uix3ljq1wr7m1F1VHfkt4k KEbCueT0m2p3bfPBk/F8MV6GW9kPr+n0VsRC8wD3mu7UhKcZY3RfzSImAfdpJA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777546608; h=from:from:sender:sender:reply-to: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=i/xHENsXkBz/WoTa6X9gFVBIeMWnxqntmD9TFgwCCAw=; b=mq0EMYEw1ia4UBFgt3y4qNGVtASX03nB1I3imVqYKhF8A7uevSvRZOL6byzUUdcXTHNP3g fHCikkf80yVOyZDQ== From: "tip-bot2 for Ryan Chen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/drivers] irqchip/aspeed-intc: Remove AST2700-A0 support Cc: Ryan Chen , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260407-irqchip-v5-4-c0b0a300a057@aspeedtech.com> References: <20260407-irqchip-v5-4-c0b0a300a057@aspeedtech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177754660711.3521451.1488842286439547006.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/drivers branch of tip: Commit-ID: d3587cc4a5e691539c46f327f8d510c1bc482b7e Gitweb: https://git.kernel.org/tip/d3587cc4a5e691539c46f327f8d510c1b= c482b7e Author: Ryan Chen AuthorDate: Tue, 07 Apr 2026 11:08:07 +08:00 Committer: Thomas Gleixner CommitterDate: Thu, 30 Apr 2026 12:53:04 +02:00 irqchip/aspeed-intc: Remove AST2700-A0 support The existing AST2700 interrupt controller driver ("aspeed,ast2700-intc-ic") was written against the A0 pre-production design. >From A1 onwards (retained in the A2 production silicon), the interrupt fabric was re-architected: interrupt routing is programmable and interrupt outputs can be directed to multiple upstream controllers (PSP GIC, Secondary Service Processor (SSP) NVIC, Tertiary Service Processor (TSP) NVIC, and Boot MCU interrupt controller). This design requires route resolution and a controller hierarchy model which the A0 driver cannot represent. Remove driver support for A0 in favour of the driver for the A2 production design. Signed-off-by: Ryan Chen Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260407-irqchip-v5-4-c0b0a300a057@aspeedtec= h.com --- drivers/irqchip/Makefile | 1 +- drivers/irqchip/irq-aspeed-intc.c | 139 +----------------------------- 2 files changed, 140 deletions(-) delete mode 100644 drivers/irqchip/irq-aspeed-intc.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index ac04a4b..3d02441 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -92,7 +92,6 @@ obj-$(CONFIG_LS_SCFG_MSI) +=3D irq-ls-scfg-msi.o obj-$(CONFIG_ASPEED_AST2700_INTC) +=3D irq-ast2700.o irq-ast2700-intc0.o i= rq-ast2700-intc1.o obj-$(CONFIG_ASPEED_AST2700_INTC_TEST) +=3D irq-ast2700-intc0-test.o obj-$(CONFIG_ARCH_ASPEED) +=3D irq-aspeed-vic.o irq-aspeed-i2c-ic.o irq-a= speed-scu-ic.o -obj-$(CONFIG_ARCH_ASPEED) +=3D irq-aspeed-intc.o obj-$(CONFIG_STM32MP_EXTI) +=3D irq-stm32mp-exti.o obj-$(CONFIG_STM32_EXTI) +=3D irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) +=3D qcom-irq-combiner.o diff --git a/drivers/irqchip/irq-aspeed-intc.c b/drivers/irqchip/irq-aspeed= -intc.c deleted file mode 100644 index 4fb0dd8..0000000 --- a/drivers/irqchip/irq-aspeed-intc.c +++ /dev/null @@ -1,139 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Aspeed Interrupt Controller. - * - * Copyright (C) 2023 ASPEED Technology Inc. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define INTC_INT_ENABLE_REG 0x00 -#define INTC_INT_STATUS_REG 0x04 -#define INTC_IRQS_PER_WORD 32 - -struct aspeed_intc_ic { - void __iomem *base; - raw_spinlock_t gic_lock; - raw_spinlock_t intc_lock; - struct irq_domain *irq_domain; -}; - -static void aspeed_intc_ic_irq_handler(struct irq_desc *desc) -{ - struct aspeed_intc_ic *intc_ic =3D irq_desc_get_handler_data(desc); - struct irq_chip *chip =3D irq_desc_get_chip(desc); - - chained_irq_enter(chip, desc); - - scoped_guard(raw_spinlock, &intc_ic->gic_lock) { - unsigned long bit, status; - - status =3D readl(intc_ic->base + INTC_INT_STATUS_REG); - for_each_set_bit(bit, &status, INTC_IRQS_PER_WORD) { - generic_handle_domain_irq(intc_ic->irq_domain, bit); - writel(BIT(bit), intc_ic->base + INTC_INT_STATUS_REG); - } - } - - chained_irq_exit(chip, desc); -} - -static void aspeed_intc_irq_mask(struct irq_data *data) -{ - struct aspeed_intc_ic *intc_ic =3D irq_data_get_irq_chip_data(data); - unsigned int mask =3D readl(intc_ic->base + INTC_INT_ENABLE_REG) & ~BIT(d= ata->hwirq); - - guard(raw_spinlock)(&intc_ic->intc_lock); - writel(mask, intc_ic->base + INTC_INT_ENABLE_REG); -} - -static void aspeed_intc_irq_unmask(struct irq_data *data) -{ - struct aspeed_intc_ic *intc_ic =3D irq_data_get_irq_chip_data(data); - unsigned int unmask =3D readl(intc_ic->base + INTC_INT_ENABLE_REG) | BIT(= data->hwirq); - - guard(raw_spinlock)(&intc_ic->intc_lock); - writel(unmask, intc_ic->base + INTC_INT_ENABLE_REG); -} - -static struct irq_chip aspeed_intc_chip =3D { - .name =3D "ASPEED INTC", - .irq_mask =3D aspeed_intc_irq_mask, - .irq_unmask =3D aspeed_intc_irq_unmask, -}; - -static int aspeed_intc_ic_map_irq_domain(struct irq_domain *domain, unsign= ed int irq, - irq_hw_number_t hwirq) -{ - irq_set_chip_and_handler(irq, &aspeed_intc_chip, handle_level_irq); - irq_set_chip_data(irq, domain->host_data); - - return 0; -} - -static const struct irq_domain_ops aspeed_intc_ic_irq_domain_ops =3D { - .map =3D aspeed_intc_ic_map_irq_domain, -}; - -static int __init aspeed_intc_ic_of_init(struct device_node *node, - struct device_node *parent) -{ - struct aspeed_intc_ic *intc_ic; - int irq, i, ret =3D 0; - - intc_ic =3D kzalloc_obj(*intc_ic); - if (!intc_ic) - return -ENOMEM; - - intc_ic->base =3D of_iomap(node, 0); - if (!intc_ic->base) { - pr_err("Failed to iomap intc_ic base\n"); - ret =3D -ENOMEM; - goto err_free_ic; - } - writel(0xffffffff, intc_ic->base + INTC_INT_STATUS_REG); - writel(0x0, intc_ic->base + INTC_INT_ENABLE_REG); - - intc_ic->irq_domain =3D irq_domain_create_linear(of_fwnode_handle(node), = INTC_IRQS_PER_WORD, - &aspeed_intc_ic_irq_domain_ops, intc_ic); - if (!intc_ic->irq_domain) { - ret =3D -ENOMEM; - goto err_iounmap; - } - - raw_spin_lock_init(&intc_ic->gic_lock); - raw_spin_lock_init(&intc_ic->intc_lock); - - /* Check all the irq numbers valid. If not, unmaps all the base and frees= the data. */ - for (i =3D 0; i < of_irq_count(node); i++) { - irq =3D irq_of_parse_and_map(node, i); - if (!irq) { - pr_err("Failed to get irq number\n"); - ret =3D -EINVAL; - goto err_iounmap; - } - } - - for (i =3D 0; i < of_irq_count(node); i++) { - irq =3D irq_of_parse_and_map(node, i); - irq_set_chained_handler_and_data(irq, aspeed_intc_ic_irq_handler, intc_i= c); - } - - return 0; - -err_iounmap: - iounmap(intc_ic->base); -err_free_ic: - kfree(intc_ic); - return ret; -} - -IRQCHIP_DECLARE(ast2700_intc_ic, "aspeed,ast2700-intc-ic", aspeed_intc_ic_= of_init);