From nobody Thu Oct 5 15:35:08 2023 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 4S1bGh5Bvrz4vnZJ; Thu, 5 Oct 2023 15:35:08 +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 4S1bGh3cv6z4d97; Thu, 5 Oct 2023 15:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696520108; 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=EW/TUh4kl1nXCA57TpAPJb++aH68qGemMg0LF9sFqFw=; b=FcTlhXA3i/UCaGe1iRIOQ/RoVlBduljgqLCqSHsJQLm4EFqzOEMr+jl/md4U/dttE72Ute rA9olxMEiQ2hBszXWBFnznuRFYqvOle4pY/ugZBloK3+K9MHglcstnx1AOEt5VRo9A9qWK wfe/sh2TNpYcnj8ab+tIuxK0oMG8cYgsvy1ZGmHvGQ8BCicY/cDCdk30SXUEOIuKqyXG0M tPaBuAR9Vrpp7qJGP2HuPIWVEwMWYF6bN5tUbxvI7izuBXgP49LIxLMmUxOYCvbw9b3nE0 JCHO1mCmATNR0Oj2DpLr2u/x7f9pZlIqruGW0z7kCg3bIovVFtJzoANTNpSMvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696520108; a=rsa-sha256; cv=none; b=xGwixul6eaDbPmKlQAm/E13PqPrEz52y2tBiAzhyMkDZQrLnxzwdKIHhoXXf9cM5Pav8+/ R6hOdskzwGsqxVPL5RwJrIfqQuRCnoJyy2cj8R/a/AYC9UFjAl2/NICJM0ikJKErOcRJ+I 7JC2LlHo2UO49MexXxORK6VKvnZPatey16MX5T7OioC3HptZzwLroMDmjXIjclrWrbd/8V NwQQ9qrrX64cgv3sgYalsyeEljMSxvMPmUmexiu5eqwOx1rvV1HeqQBnkPp17lEl45sXQP V0yaiHStcoWBPrHtKtpqUR0LsBWC2HZG2gAdhhkgokzgtXg1dCiV4KcJMB7VzQ== 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=1696520108; 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=EW/TUh4kl1nXCA57TpAPJb++aH68qGemMg0LF9sFqFw=; b=KUt1i3EiXuyXBEqzDm+hdRfTyFOswdeov5FeSJKujtsPjuNpVS+DdZ1rttzL59+CR3Yphh TduJiWXEc6nj0JkyQVWJXnouK9yA0b+9NwZlagQvK7QzpFrQxJdWz6ov5W4qw73RixP4Vb snbruxBmbAg8ZgE7juT2tJBg+GNlL9UtQ1zO6Pk2azo9vnUdT195ayojeVbRxCt0+ufUiM Ky19toFeOlSjgX8ySWeJ3o/ruiZeewGEI7CuNFccm69mTeTNEUVt5ZOWOzxQVAuNDGTPBA CPL1KvbUtNEbQ5mPIBqxc/Edgy8NeXuEsqVfM8Qy8d7xyYkFM2zAfuVOa0SFxQ== 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 4S1bGh2dwqz1QJk; Thu, 5 Oct 2023 15:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395FZ8PE012786; Thu, 5 Oct 2023 15:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FZ8SI012783; Thu, 5 Oct 2023 15:35:08 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:35:08 GMT Message-Id: <202310051535.395FZ8SI012783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 29776aa436cf - main - dwc: Move interrupt related code to core and dma file 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29776aa436cf248950bcf755c6a53ec0590d89bf Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=29776aa436cf248950bcf755c6a53ec0590d89bf commit 29776aa436cf248950bcf755c6a53ec0590d89bf Author: Emmanuel Vadot AuthorDate: 2023-10-03 16:04:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-05 15:34:40 +0000 dwc: Move interrupt related code to core and dma file No functional changes intended. --- sys/dev/dwc/dwc1000_core.c | 19 +++++++++++++++++++ sys/dev/dwc/dwc1000_core.h | 2 ++ sys/dev/dwc/dwc1000_dma.c | 35 +++++++++++++++++++++++++++++++++++ sys/dev/dwc/dwc1000_dma.h | 1 + sys/dev/dwc/if_dwc.c | 38 +++++++++----------------------------- 5 files changed, 66 insertions(+), 29 deletions(-) diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c index c93019a49f3e..6cf836f87be2 100644 --- a/sys/dev/dwc/dwc1000_core.c +++ b/sys/dev/dwc/dwc1000_core.c @@ -419,3 +419,22 @@ dwc1000_harvest_stats(struct dwc_softc *sc) dwc1000_clear_stats(sc); } + +void +dwc1000_intr(struct dwc_softc *sc) +{ + uint32_t reg; + + DWC_ASSERT_LOCKED(sc); + + reg = READ4(sc, INTERRUPT_STATUS); + if (reg) + READ4(sc, SGMII_RGMII_SMII_CTRL_STATUS); +} + +void +dwc1000_intr_disable(struct dwc_softc *sc) +{ + + WRITE4(sc, INTERRUPT_ENABLE, 0); +} diff --git a/sys/dev/dwc/dwc1000_core.h b/sys/dev/dwc/dwc1000_core.h index 2069215bfffe..cb7d1f3946e9 100644 --- a/sys/dev/dwc/dwc1000_core.h +++ b/sys/dev/dwc/dwc1000_core.h @@ -39,5 +39,7 @@ void dwc1000_enable_csum_offload(struct dwc_softc *sc); void dwc1000_setup_rxfilter(struct dwc_softc *sc); void dwc1000_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr); void dwc1000_harvest_stats(struct dwc_softc *sc); +void dwc1000_intr(struct dwc_softc *softc); +void dwc1000_intr_disable(struct dwc_softc *sc); #endif /* __DWC1000_CORE_H__ */ diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index ad8bdbcfc883..3d95c9d8e764 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -810,3 +810,38 @@ dma1000_free(struct dwc_softc *sc) if (sc->txdesc_tag != NULL) bus_dma_tag_destroy(sc->txdesc_tag); } + +/* + * Interrupt function + */ + +int +dma1000_intr(struct dwc_softc *sc) +{ + uint32_t reg; + int rv; + + DWC_ASSERT_LOCKED(sc); + + rv = 0; + reg = READ4(sc, DMA_STATUS); + if (reg & DMA_STATUS_NIS) { + if (reg & DMA_STATUS_RI) + dma1000_rxfinish_locked(sc); + + if (reg & DMA_STATUS_TI) { + dma1000_txfinish_locked(sc); + dma1000_txstart(sc); + } + } + + if (reg & DMA_STATUS_AIS) { + if (reg & DMA_STATUS_FBI) { + /* Fatal bus error */ + rv = EIO; + } + } + + WRITE4(sc, DMA_STATUS, reg & DMA_STATUS_INTR_MASK); + return (rv); +} diff --git a/sys/dev/dwc/dwc1000_dma.h b/sys/dev/dwc/dwc1000_dma.h index b4af29076625..96a98c2d6d51 100644 --- a/sys/dev/dwc/dwc1000_dma.h +++ b/sys/dev/dwc/dwc1000_dma.h @@ -50,5 +50,6 @@ int dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp); void dma1000_txfinish_locked(struct dwc_softc *sc); void dma1000_rxfinish_locked(struct dwc_softc *sc); void dma1000_txstart(struct dwc_softc *sc); +int dma1000_intr(struct dwc_softc *sc); #endif /* __DWC1000_DMA_H__ */ diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 107158cebf02..896e2f2205a0 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -300,38 +300,18 @@ static void dwc_intr(void *arg) { struct dwc_softc *sc; - uint32_t reg; + int rv; sc = arg; - DWC_LOCK(sc); - - reg = READ4(sc, INTERRUPT_STATUS); - if (reg) - READ4(sc, SGMII_RGMII_SMII_CTRL_STATUS); - - reg = READ4(sc, DMA_STATUS); - if (reg & DMA_STATUS_NIS) { - if (reg & DMA_STATUS_RI) - dma1000_rxfinish_locked(sc); - - if (reg & DMA_STATUS_TI) { - dma1000_txfinish_locked(sc); - dwc_txstart_locked(sc); - } - } - - if (reg & DMA_STATUS_AIS) { - if (reg & DMA_STATUS_FBI) { - /* Fatal bus error */ - device_printf(sc->dev, - "Ethernet DMA error, restarting controller.\n"); - dwc_stop_locked(sc); - dwc_init_locked(sc); - } + dwc1000_intr(sc); + rv = dma1000_intr(sc); + if (rv == EIO) { + device_printf(sc->dev, + "Ethernet DMA error, restarting controller.\n"); + dwc_stop_locked(sc); + dwc_init_locked(sc); } - - WRITE4(sc, DMA_STATUS, reg & DMA_STATUS_INTR_MASK); DWC_UNLOCK(sc); } @@ -706,7 +686,7 @@ dwc_detach(device_t dev) * Disable and tear down interrupts before anything else, so we don't * race with the handler. */ - WRITE4(sc, INTERRUPT_ENABLE, 0); + dwc1000_intr_disable(sc); if (sc->intr_cookie != NULL) { bus_teardown_intr(dev, sc->res[1], sc->intr_cookie); }