From nobody Thu Oct 12 18:56:39 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 4S5zPz4wXVz4wmSq; Thu, 12 Oct 2023 18:56:39 +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 4S5zPz4PDfz3W7W; Thu, 12 Oct 2023 18:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697136999; 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=jArIIyQTTIOeh3RZzO+1eyDwFaSjqdYErvunbAqdPA8=; b=o73YzWqV2hgZJfEBrXpjNIna7p2xD8RSYq0g//rRNBoeicSjqcZae0WExSGlNtIxYLPRsH 7ShYNY8kK/Nw45Tu4XJyA0/SvDS2L/jAPxD0ZB38gxMrBNyEtdncPWHNJNd9n08RMxler2 0YW+eZoefx6uY14mZYGDXolIf8+7BkKlpFBUZm/4SLzHgqnVLtm/2hiWaPmkPyUgNf3oQW H3RD9/2gNg3XyJ5mveD64a8omONDy144Fteh9iBaWLZVF9R5DkGu9mlfHwpSyifX1DlZsN gHHBYZCkIKGYdWfmi3Y607sI336X2zaoeBu0g/bOur5OhDRQKBiVrnkO1Q7iDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697136999; a=rsa-sha256; cv=none; b=py1RnTFpp1Zq8nyUfJdL5L4vZC6PKWH+MmmENtV9blxTuTrvqiXseqNh86PxUBi54R46q2 C0vIGd1B1rTqPsqiA62vKqI50+eIAs7/9dK1uxhtptcaWvhG8LivD/fR2z62gK0FCTdSNI +BrDoyY1zV1B6iJqVTlTmbmHf21EAPKOoTvOU/5Z3abPRDk56K7xAfaCyHBRXZdYfwikEG inij2hddA75Dydr67hlQLpWVMiGTEHvVrGRzanEqQfBIIm1s50ke4k68vhB1rnRLLoE5cI hdrGvAmoJJYndxyzlvcwG4U9g2/7DxF/d3adMCJMW/gxKCulQSp1m+8BdTj1DQ== 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=1697136999; 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=jArIIyQTTIOeh3RZzO+1eyDwFaSjqdYErvunbAqdPA8=; b=dUWY1mqKrEbwktlHOZNf9CMbvaF8I2iMiqoX0bFYIJaSXL9wZXrCuJLme7ayxltwblpejq N1TBlmZ8v/gi5wi9PPllrmW6j0TEIthQ7zjYftPVOB17gkSNyK54yMPrZ4ozq7WSHTAkZb dONKSS+pxBjblE3nQq4KcuYRv7dnoOxuGHjiISqjMI7KmBGOMqfmRXayA1oGi5fc7KkjhG tOEgnKEocknXEUzFa+Trd4vZfLWFFRoKZXa79FX8BEuZhRTlFdacjEUUvR7xFEYZa/W7Mc PutrEigni1+Xma4yVdFJGusX8neSbPifwCLaVFI02V/1XzJ0sCBb8CZ7AxsaNw== 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 4S5zPz3RLWz1vj; Thu, 12 Oct 2023 18:56:39 +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 39CIudB5039738; Thu, 12 Oct 2023 18:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CIudCk039735; Thu, 12 Oct 2023 18:56:39 GMT (envelope-from git) Date: Thu, 12 Oct 2023 18:56:39 GMT Message-Id: <202310121856.39CIudCk039735@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: 43cd6bbba053 - main - dwc: re-rewrite barrier part 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43cd6bbba053f02999d846ef297655ebec2d218b Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=43cd6bbba053f02999d846ef297655ebec2d218b commit 43cd6bbba053f02999d846ef297655ebec2d218b Author: Emmanuel Vadot AuthorDate: 2023-10-12 18:54:52 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-12 18:56:16 +0000 dwc: re-rewrite barrier part We need the DMA engine to have everything coherent *before* we set the OWN bit (the bit that tells the DMA engine that it owns the descriptor). Fixes: 487034648805 ("dwc: Rewrite barrier part") Reported by: jhb --- sys/dev/dwc/dwc1000_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index 4f8ae088305a..c91036f5a714 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -216,8 +216,8 @@ txdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr, sc->txdesc_ring[idx].addr1 = (uint32_t)(paddr); sc->txdesc_ring[idx].desc0 = desc0; sc->txdesc_ring[idx].desc1 = desc1; - sc->txdesc_ring[idx].desc0 |= TDESC0_OWN; wmb(); + sc->txdesc_ring[idx].desc0 |= TDESC0_OWN; } inline static uint32_t @@ -236,8 +236,8 @@ rxdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr) sc->rxdesc_ring[idx].desc1 = ERDESC1_RCH | MIN(MCLBYTES, ERDESC1_RBS1_MASK); - sc->rxdesc_ring[idx].desc0 = RDESC0_OWN; wmb(); + sc->rxdesc_ring[idx].desc0 = RDESC0_OWN; return (nidx); } @@ -522,8 +522,8 @@ dma1000_rxfinish_locked(struct dwc_softc *sc) m = dwc_rxfinish_one(sc, desc, sc->rxbuf_map + idx); if (m == NULL) { - desc->desc0 = RDESC0_OWN; wmb(); + desc->desc0 = RDESC0_OWN; } else { /* We cannot create hole in RX ring */ error = dma1000_setup_rxbuf(sc, idx, m);