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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 65A1BCA100F for ; Mon, 22 Sep 2025 20:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IS6xW+WPxW9hNE0Dz/EvA/hRbGthORi+qAnj01ikOBQ=; b=iv+ksGXauNcXh2vWRwrpZ71eXG i1pe3RiK5ME3icVU9YK+856Lgf9P0qJsWXBg06zfJq/ZBKwXVqaYQQm22IX4m09FZMDzvcqdGeSV8 +wJrPVfgy0n6Bcp5aUOtqviDBRAzrpUIkNHOsvcpNuT2+nCfs5Ovej92xsoZ0xsh45D5kDLp+Cl9b xHWdMNErQCWg+dUdWtqM/nZIuUpSyttSGceiljybU3dT32+2VWQKaiDC137cv5AcHh2jcQi2UX9vn 99bSnWTmCYha5rVrINRK98E8wQnTLzTrttwVjmUqAaJaCt7/Fd2j30EbEaAZ3oWPRLIFtj8qP5MGp jNAsVBpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v0n5d-0000000BRKO-31lR; Mon, 22 Sep 2025 20:24:49 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v0n5c-0000000BRJp-1HNx for linux-arm-kernel@lists.infradead.org; Mon, 22 Sep 2025 20:24:49 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 4956C401B2; Mon, 22 Sep 2025 20:24:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20AD0C4CEF0; Mon, 22 Sep 2025 20:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758572686; bh=CPhPqucayv1P8fV0pV1Yfu5ztIss5MA5Fxes5eqfero=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mtpq9m1AHVQ992zzyrpc/81KPhzsjDlY5T/8OrAKGEXjNvubrc6EmpcMf2OjCUNB/ i1/S6KliRXQSquTwqNqLf5EZiaX0beh8rHWI01P2/s+yvyIIdrxafoHmz5M+RgoV5k RCOnFh4pOZSY/V+Sff+fKprjmWVxcfawZPXAwAKUR5TFBStvJZ0RpNj9KKhdSLtmFh lFvfTVWw4g07GElbMFshh+YOZ+dIoQMTAHpyDeN2CTuPVB1c6SMeqcCU+hxjii4GJv 34xf/uAwUx47uZNDjuMwXP822rzHrkDOwMuvaMz60ECqpCjys65CWJG+pnfYV8Q0pi bQyKYe9SA/JRg== Received: from sofa.misterjones.org ([185.219.108.64] helo=lobster-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1v0n5X-00000008Vwi-1snH; Mon, 22 Sep 2025 20:24:43 +0000 Date: Mon, 22 Sep 2025 21:24:42 +0100 Message-ID: <87jz1qxmk5.wl-maz@kernel.org> From: Marc Zyngier To: Sven Peter Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, Thomas Gleixner , Mark Rutland , Will Deacon , "Rafael J. Wysocki" , Rob Herring , Saravana Kannan , Greg Kroah-Hartman , Janne Grunau , Suzuki K Poulose , James Clark , Jonathan Cameron Subject: Re: [PATCH v3 22/26] irqchip/apple-aic: Drop support for custom PMU irq partitions In-Reply-To: <24bf4cd9-c992-463a-a17d-0a828c16f8f0@kernel.org> References: <20250922082833.2038905-1-maz@kernel.org> <20250922082833.2038905-23-maz@kernel.org> <24bf4cd9-c992-463a-a17d-0a828c16f8f0@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: sven@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, tglx@linutronix.de, mark.rutland@arm.com, will@kernel.org, rafael@kernel.org, robh@kernel.org, saravanak@google.com, gregkh@linuxfoundation.org, j@jannau.net, suzuki.poulose@arm.com, james.clark@linaro.org, jonathan.cameron@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250922_132448_380011_2A34CA9A X-CRM114-Status: GOOD ( 25.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 22 Sep 2025 19:43:40 +0100, Sven Peter wrote: > > On 22.09.25 10:28, Marc Zyngier wrote: > > Similarly to what has been done for GICv3, drop the irq partitioning > > support from the AIC driver, effectively merging the two per-cpu > > interrupts for the PMU. > > > > Signed-off-by: Marc Zyngier > > --- > > Reviewed-by: Sven Peter > > > > drivers/irqchip/irq-apple-aic.c | 28 +++++++--------------------- > > 1 file changed, 7 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-aic.c > > index cb8b6f40ce8d3..6305d25b9e77b 100644 > > --- a/drivers/irqchip/irq-apple-aic.c > > +++ b/drivers/irqchip/irq-apple-aic.c > > @@ -578,16 +578,9 @@ static void __exception_irq_entry aic_handle_fiq(struct pt_regs *regs) > > } > > if ((read_sysreg_s(SYS_IMP_APL_PMCR0_EL1) & (PMCR0_IMODE | > > PMCR0_IACT)) == > > - (FIELD_PREP(PMCR0_IMODE, PMCR0_IMODE_FIQ) | PMCR0_IACT)) { > > - int irq; > > - if (cpumask_test_cpu(smp_processor_id(), > > - &aic_irqc->fiq_aff[AIC_CPU_PMU_P]->aff)) > > - irq = AIC_CPU_PMU_P; > > - else > > - irq = AIC_CPU_PMU_E; > > + (FIELD_PREP(PMCR0_IMODE, PMCR0_IMODE_FIQ) | PMCR0_IACT)) > > generic_handle_domain_irq(aic_irqc->hw_domain, > > - AIC_FIQ_HWIRQ(irq)); > > - } > > + AIC_FIQ_HWIRQ(AIC_CPU_PMU_P)); > > Probably one of the most confusing diffs for a change that's actually > fairly simple that the diff algorithm generated! I was only able to > tell what's going on by looking at the file after applying this. It appears that all 4 algorithms (myers, minimal, patience and histogram) give the exact same resolution for these two hunks. It would have been easier to read if I had rewritten the 'if' statement to be on a single line (and moved the whole field business to a helper), but I went for the smallest possible change. My bad, Thanks for the review! M. -- Jazz isn't dead. It just smells funny.