From nobody Tue Jul 14 15:06:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h02gj0Dj9z6krSP for ; Tue, 14 Jul 2026 15:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h02gh4F3gz3T4Q for ; Tue, 14 Jul 2026 15:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784041568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xl6+yl+OuljqySXTGNwLR4b60oOE0Iz3CNCfyOTNXN8=; b=HUvTGOMfgl7Gwf3K8ZyOKB91ZiBrhedy6nBLOuhmevNz+98ftCh3X30zXsf2eD6G0kXBL9 yIAMVQ/WnUfN7GUXuWxyL7CpWvFan2Nfb3ce6+SLWB8bOZpclbnHeg7Z1WPR6tb+QdIAbD bYV8e1I7eRdppMnaV4hVVqH7o6E6Wat6XtodfeSiRcRYetSzTpPExF3rphb01nOHgy8qnQ n5vD6KqdOe6Uxw7DvXmrhbIgkPrW0KPtgDRVwVSlBDwJ5eEqibWG+DPfPqapxuoj6EFgWx GOmwj2JE0R1oGRM/iA8xiEaOV1NRi8IfRd955+LQaFL7tAxuchxcnRpawLkD/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784041568; a=rsa-sha256; cv=none; b=rM/flW1p75KyYOvASYcy5M8MEt+GCJjUNPUyBsN0c5g4k/Nzr9uBwBvC5X5LwXdiAxfZ3v ejkYMyK5EnDX6TO7LLoFKExyokm6kCRoPjQRYlaNHff1SzsPA7U/lzIKb1JH3Dbhcvk8rq CoNJzkzpA9Hys3SQ0ejdtUyxAUG/jcy6/TymsOkq8QMPw/CPcrVGk8gbLlXkpndCf1qdco CnxewX7zBeUobx79P6dfYBc4/4MZywfkLUTZmtYTl172ATC2QNyBXXz8Ah096UgInfiMrH F2AzXMtOHUkZhvXMBXTZadHt+LAmHUyVUgKyQzAXG7xZtvGTPvoTKrqMa0Q5sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784041568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xl6+yl+OuljqySXTGNwLR4b60oOE0Iz3CNCfyOTNXN8=; b=XmD9/gXcL1ljCVXQ3syujC1GXaj0Ltib5AxinDRGV17VmEEbqdVwjwYrS2fW/Itm2/PDyv 11x9oKzC6hvXy7hjuWGv40+FqBEFxtlWoMydi/kfdHPIeGGPk6McgkbhbEJMUGdlz8Fkpg 1ZlIudkeD9KYqF28h29pSYwzEm5UQ+/J8DvKbYVah3WrW7VHLYTzLIPdCCKv275rBzk71F 7szEnntPcKS2p4//vo6GzSFSnNFl9c1bQYKBoyBA0tg0VxrTK7dnJkP2tzBuD8LOQGnFmr 0h1exglhZl6X5oT4nSMCLTo4PYQQToF85cxrs2Pyw0B9IYE4Motb2lsonSGnZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h02gh2czpzqJV for ; Tue, 14 Jul 2026 15:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 15:06:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 1aeb9d782ea1 - main - Revert "rk_gpio: defer level-IRQ EOI until source line is driven low" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1aeb9d782ea15f4f70fe104beac6eea1d27c5d92 Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 15:06:08 +0000 Message-Id: <6a565060.3ff30.49534db7@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1aeb9d782ea15f4f70fe104beac6eea1d27c5d92 commit 1aeb9d782ea15f4f70fe104beac6eea1d27c5d92 Author: Mitchell Horne AuthorDate: 2026-07-14 15:02:53 +0000 Commit: Mitchell Horne CommitDate: 2026-07-14 15:06:00 +0000 Revert "rk_gpio: defer level-IRQ EOI until source line is driven low" There is a more correct / preferable scheme for handling of EOI. Requested-by: mmel This reverts commit 8ffb400bfd64102ac2a49639ccbbfffbe0c6f127. --- sys/arm64/rockchip/rk_gpio.c | 57 +++----------------------------------------- 1 file changed, 3 insertions(+), 54 deletions(-) diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index 8988ecf992a1..7c2071d2d178 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -219,31 +219,13 @@ rk_gpio_intr(void *arg) RK_GPIO_LOCK(sc); status = rk_gpio_read_4(sc, RK_GPIO_INT_STATUS); + rk_gpio_write_4(sc, RK_GPIO_PORTA_EOI, status); RK_GPIO_UNLOCK(sc); while (status) { int pin = ffs(status) - 1; - bool is_level; status &= ~(1 << pin); - - /* - * Edge-triggered latches must be cleared before dispatch - * so a new edge during the handler still registers a new - * IRQ. Level-triggered latches must be cleared AFTER the - * consumer has deasserted the source line, otherwise the - * latch immediately re-arms and we storm. Edge EOI here; - * level EOI is deferred to pic_post_filter (filter-only - * consumers) or pic_post_ithread (threaded consumers). - */ - is_level = (sc->isrcs[pin].mode & - (GPIO_INTR_LEVEL_LOW | GPIO_INTR_LEVEL_HIGH)) != 0; - if (!is_level) { - RK_GPIO_LOCK(sc); - rk_gpio_write_4(sc, RK_GPIO_PORTA_EOI, 1u << pin); - RK_GPIO_UNLOCK(sc); - } - if (intr_isrc_dispatch(RK_GPIO_ISRC(sc, pin), tf)) { /* * Pin asserted but no consumer is registered for it @@ -253,19 +235,14 @@ rk_gpio_intr(void *arg) * messages per second. Mask the pin's IRQ at the * controller and disable further dispatches; if a * consumer attaches later it will re-enable through - * pic_enable_intr / rk_gpio_pic_enable_intr. For - * level pins also EOI now -- there is no consumer - * to drive the source low. + * pic_enable_intr / rk_gpio_pic_enable_intr. */ RK_GPIO_LOCK(sc); rk_gpio_write_bit(sc, RK_GPIO_INTMASK, pin, 1); rk_gpio_write_bit(sc, RK_GPIO_INTEN, pin, 0); - if (is_level) - rk_gpio_write_4(sc, RK_GPIO_PORTA_EOI, - 1u << pin); RK_GPIO_UNLOCK(sc); device_printf(sc->sc_dev, - "Interrupt pin=%d unhandled -- masked\n", pin); + "Interrupt pin=%d unhandled — masked\n", pin); continue; } @@ -954,37 +931,10 @@ rk_pic_post_ithread(device_t dev, struct intr_irqsrc *isrc) struct rk_pin_irqsrc *rkisrc = (struct rk_pin_irqsrc *)isrc; RK_GPIO_LOCK(sc); - /* - * Level pins: EOI now that the ithread has driven the source low, - * then unmask so future level transitions can fire. Edge pins - * already EOI'd in rk_gpio_intr before dispatch. - */ - if (rkisrc->mode & (GPIO_INTR_LEVEL_LOW | GPIO_INTR_LEVEL_HIGH)) - rk_gpio_write_4(sc, RK_GPIO_PORTA_EOI, 1u << rkisrc->irq); rk_gpio_write_bit(sc, RK_GPIO_INTMASK, rkisrc->irq, 0); RK_GPIO_UNLOCK(sc); } -/* - * Mirror image of pic_post_ithread for filter-only consumers: the MI - * interrupt framework calls this after a filter returns FILTER_HANDLED - * (no ithread). The filter is expected to have read+cleared the source - * device's IRQ status itself, so the GPIO line is now low; we EOI the - * level latch here. Edge pins are already EOI'd in rk_gpio_intr. - */ -static void -rk_pic_post_filter(device_t dev, struct intr_irqsrc *isrc) -{ - struct rk_gpio_softc *sc = device_get_softc(dev); - struct rk_pin_irqsrc *rkisrc = (struct rk_pin_irqsrc *)isrc; - - if ((rkisrc->mode & (GPIO_INTR_LEVEL_LOW | GPIO_INTR_LEVEL_HIGH)) == 0) - return; - RK_GPIO_LOCK(sc); - rk_gpio_write_4(sc, RK_GPIO_PORTA_EOI, 1u << rkisrc->irq); - RK_GPIO_UNLOCK(sc); -} - static device_method_t rk_gpio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, rk_gpio_probe), @@ -1016,7 +966,6 @@ static device_method_t rk_gpio_methods[] = { DEVMETHOD(pic_disable_intr, rk_pic_disable_intr), DEVMETHOD(pic_enable_intr, rk_pic_enable_intr), DEVMETHOD(pic_pre_ithread, rk_pic_pre_ithread), - DEVMETHOD(pic_post_filter, rk_pic_post_filter), DEVMETHOD(pic_post_ithread, rk_pic_post_ithread), /* ofw_bus interface */