From nobody Wed Apr 26 19:09:51 2023 X-Original-To: dev-commits-src-all@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 4Q67jC6lDHz479CL; Wed, 26 Apr 2023 19:09:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q67jC69LDz47pX; Wed, 26 Apr 2023 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682536191; 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=WWUgzX9UDqYY0uPLVgqamV03JlNUUlRZMeGTWcn7aN4=; b=UtYhFLeG2ei2dejhhaddkzFhbxC3SwD+jSYw97yvyq3RSJdt6KVZz1m+esJXlJbuRt7Zpq apErkl5UzlbAhWfJCK1VQojWYzsouhONKsAm4oJmfvH29gaTY0wpXyi3l+YExJsmXIqYIl 8wJrbJcjt5+CReffzsZF09g1QlQBq+u8+CeWbZW7dB1p6fRjTTX0krXJoEK+44FarPkqrB cvNzTJX54DqjSqDh4UDnB8SbGk/h6Phgbe/XJI6MjwlLTPm5SPUyDfQT/4Y52I/20kXCZb pjitEC7G/QY3Go5xuixU8Xv6rj76Hpce2GjegwCG/vHyLdAJ1q9c49axljYXXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682536191; 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=WWUgzX9UDqYY0uPLVgqamV03JlNUUlRZMeGTWcn7aN4=; b=EaDPDuKMKTNlAKjHlK1k8aF9x7bt2mWSbgskmUVKOV1PpWVGa70unwizZCS0A2hHPSRG+n xt7tXsN/0NYyof5VKKhktJTMF3wpCfbXDErhroZXIpn0pSxcAfNXRUcqmLBYy6xdujn2UE kcuqNSfahNpjVWAIsnCiSAkDfPFhtVYSiI6R9G1bm72GdCAW+19DwRFs5igIxDBUtmrZbA DsMBtQ+D7pDUHasW0uh9P84x+zsNQ0atAqxmXyWsHtZ4dxFRGtRNDqt9Rq1FC78BksLS43 iC1yy5Roc3FUcG6rAZ2S3UExNJUPV697/UQpFE5AujxnoIYREKyt09CynP+qgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682536191; a=rsa-sha256; cv=none; b=tj6BCloWPF4FWKcPg69kV1HkUVFAj4SGFaeaPxbi0QLblhQJ/2QhH/eM2bmKNR2OP16Jw/ GRUXJ1AwGprpkU98t0B1ml6bZqx+D+5IyO2vl4vG5qAewTsmyY3E7kqu2m1GSvGnjIVhrj DntQ69X24v90i9ZylEn8W3k9AekvDmjVwk7Fys0nyw4hsHPXTglKhj9qaAW162RR6Cj/FE buw5sHF+H9wRy245QQCXkl3Cfu+D5TxoW9SI16/hHh9RZh19XcXZHIy0JZygSEBvb/Sqbf l9OnbIfPkr7gLa+hKkrqWYnnGSv4/8M21Q1GNwImfvhQJvlBuyJ0bQmgcXydig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q67jC4r9GzmK5; Wed, 26 Apr 2023 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QJ9p10066344; Wed, 26 Apr 2023 19:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QJ9p6f066343; Wed, 26 Apr 2023 19:09:51 GMT (envelope-from git) Date: Wed, 26 Apr 2023 19:09:51 GMT Message-Id: <202304261909.33QJ9p6f066343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d7e3b05b0de1 - main - arm: remove passing trapframe to intr_ipi_dispatch() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e3b05b0de118e6940c032f0c207c452028f253 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e3b05b0de118e6940c032f0c207c452028f253 commit d7e3b05b0de118e6940c032f0c207c452028f253 Author: Elliott Mitchell AuthorDate: 2022-12-14 21:59:17 +0000 Commit: Andrew Turner CommitDate: 2023-04-26 19:08:30 +0000 arm: remove passing trapframe to intr_ipi_dispatch() This was needed before INTRNG was in place and handling the push of curthread->td_intr_frame. Since INTRNG now handles this, there is no longer and need for playing around with the frame inside IPI interrupts. --- sys/arm/arm/gic.c | 2 +- sys/arm/arm/machdep_intr.c | 2 +- sys/arm/broadcom/bcm2835/bcm2836.c | 2 +- sys/arm/include/intr.h | 2 +- sys/arm64/arm64/gic_v3.c | 2 +- sys/arm64/arm64/mp_machdep.c | 2 +- sys/arm64/include/intr.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index d2d88237935e..a6f81254fe7d 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -573,7 +573,7 @@ dispatch_irq: #ifdef SMP /* Call EOI for all IPI before dispatch. */ gic_c_write_4(sc, GICC_EOIR, irq_active_reg); - intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq], tf); + intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq]); goto next_irq; #else device_printf(sc->gic_dev, "SGI %u on UP system detected\n", diff --git a/sys/arm/arm/machdep_intr.c b/sys/arm/arm/machdep_intr.c index cd92dd5f79ad..ab7cd76261d7 100644 --- a/sys/arm/arm/machdep_intr.c +++ b/sys/arm/arm/machdep_intr.c @@ -141,7 +141,7 @@ intr_ipi_lookup(u_int ipi) } void -intr_ipi_dispatch(u_int ipi, struct trapframe *tf) +intr_ipi_dispatch(u_int ipi) { struct intr_ipi *ii; diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index 50759cd45b6f..38247398a192 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -369,7 +369,7 @@ bcm_lintc_ipi_dispatch(struct bcm_lintc_softc *sc, u_int cpu, #else dsb(); #endif - intr_ipi_dispatch(ipi, tf); + intr_ipi_dispatch(ipi); } } #endif diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index c783c41fd35d..3215008adb0c 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -55,7 +55,7 @@ typedef void intr_ipi_send_t(void *, cpuset_t, u_int); typedef void intr_ipi_handler_t(void *); -void intr_ipi_dispatch(u_int, struct trapframe *); +void intr_ipi_dispatch(u_int); void intr_ipi_send(cpuset_t, u_int); void intr_ipi_setup(u_int, const char *, intr_ipi_handler_t *, void *, diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 07ef8454afcf..dfa0f6c7cad1 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -631,7 +631,7 @@ arm_gic_v3_intr(void *arg) /* Call EOI for all IPI before dispatch. */ gic_icc_write(EOIR1, (uint64_t)active_irq); #ifdef SMP - intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq], tf); + intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq]); #else device_printf(sc->dev, "SGI %ju on UP system detected\n", (uintmax_t)(active_irq - GIC_FIRST_SGI)); diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 0e39b27557ea..5e4c035586a5 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -915,7 +915,7 @@ intr_ipi_lookup(u_int ipi) * source mapped. */ void -intr_ipi_dispatch(u_int ipi, struct trapframe *tf) +intr_ipi_dispatch(u_int ipi) { struct intr_ipi *ii; diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index 30805d4f4a91..b088de827dbf 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -45,7 +45,7 @@ arm_irq_memory_barrier(uintptr_t irq) } #ifdef SMP -void intr_ipi_dispatch(u_int, struct trapframe *); +void intr_ipi_dispatch(u_int); #endif #ifdef DEV_ACPI