From nobody Thu Oct 5 15:35:09 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 4S1bGj5Yfvz4vnWw; Thu, 5 Oct 2023 15:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1bGj4tPhz4dML; Thu, 5 Oct 2023 15:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696520109; 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=J67tjjukdvBH7qGluxyJy5PEgZxLhtMBAnLeu0UEYTA=; b=vTOKUFHF4BQPAky5B+fGnk45pVgUgotNb145x4RYFGcn9G7g0yrBd8yNy/YpsGG134GXQh J2cIENXAF2oUSX6+Q4p2XchRv1xzlr8stLElTJPRFIS5T2gH80vyfhnDPb2v3pCuslDvjE BbEAz/dflLQ8s8xD2PMGpYFVZqGMHw5MI8pJUnmKYnOYmT1+wASSJvA3KbeCeLWje2Io2z UVN3Zm+MhMCseh4XfLgNqJPMeIFBzD2Rnz2WD7oMCAdIEyAXOKtvmsmYkZoV6JcVm02pvc 2ov/FTpjnmIdubQmwRMkJ8INSmUw8FBIEDEPxYl4d54G+x7SvJNjkV3Lb8cdBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696520109; a=rsa-sha256; cv=none; b=tKgvmktytz8PROz1d/Zm6wsaLpCaITUPPxh1/JJVL2gBc3ax/U2cWWQBkLQ+iSbB0qVhgi +OVFKUMmz5J2bt5EdKBOSxVX2TieWVtDIIkFOY4+ljpOxJDMQDWsWKzkjkuDI8QrPs8Tg4 p7zId/fFCR/3nNdk58+I2itGheHk6wlG0X6VW1yJJ5p99Bs8DL3ooGANU8efIuY5qRIIlm 1Er6LBxtsX7+dI7iOImkRtTYSuduD/XdTw3/okfXYBxdv5948laukTfKyJj+kLfJMjl1bQ tUkvDDILIAawzveVQy0f8Hz2bkQL7oZbJHesC/EhLA34GfjYxSBwcLb4vEwGvg== 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=1696520109; 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=J67tjjukdvBH7qGluxyJy5PEgZxLhtMBAnLeu0UEYTA=; b=uIk2OSMKK4hjBKZrxRJ0m9MDCiH4HEON7sRIcP6M7qiyVuGYzZYK5ql+yd+SG5ZUppB9Gd 2PRU4/0BnfNh3OSNokxhZaDJJ6fmeWmYsroTlj/duD3J8cYPgJ9bWSJbi2z4pcj3XI3pza HJTmzrC6oqZlF72Rnm1NNrxls0ncJb4CLSeMmk+Wlyv1tRO3JyDMiTiAggTpszmweoXyYj TTCc7TB/QeWaJ0G3u4OhHVL5viOkNisdz4hXelLSNymx81QAsG3Aa7pYl3Wh9HdMxP+RNX 1CKZubm7rO1ihHpKyzLgNHRD3nvH2IwftPjrLY6hgEQ4d7TqWQae87lUZSqjfg== 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 4S1bGj3tNSz1PGp; Thu, 5 Oct 2023 15:35:09 +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 395FZ9dn012841; Thu, 5 Oct 2023 15:35:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FZ9Hr012838; Thu, 5 Oct 2023 15:35:09 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:35:09 GMT Message-Id: <202310051535.395FZ9Hr012838@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: f0a7dd770312 - main - dwc: Setup desc addresses in the dma init function. 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: f0a7dd7703124af42da3705bb11e785c0eb9f0c4 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f0a7dd7703124af42da3705bb11e785c0eb9f0c4 commit f0a7dd7703124af42da3705bb11e785c0eb9f0c4 Author: Emmanuel Vadot AuthorDate: 2023-10-03 16:46:56 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-05 15:34:40 +0000 dwc: Setup desc addresses in the dma init function. --- sys/dev/dwc/dwc1000_dma.c | 11 +++++++++++ sys/dev/dwc/if_dwc.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index 3d95c9d8e764..cdfd24afd574 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -605,10 +605,18 @@ int dma1000_init(struct dwc_softc *sc) { struct mbuf *m; + uint32_t reg; int error; int nidx; int idx; + /* + * DMA must be stop while changing descriptor list addresses. + */ + reg = READ4(sc, OPERATION_MODE); + reg &= ~(MODE_ST | MODE_SR); + WRITE4(sc, OPERATION_MODE, reg); + /* * Set up TX descriptor ring, descriptors, and dma maps. */ @@ -684,6 +692,8 @@ dma1000_init(struct dwc_softc *sc) for (idx = 0; idx < TX_DESC_COUNT; idx++) dwc_setup_txdesc(sc, idx, 0, 0, 0, false, false); + WRITE4(sc, TX_DESCR_LIST_ADDR, sc->txdesc_ring_paddr); + /* * Set up RX descriptor ring, descriptors, dma maps, and mbufs. */ @@ -758,6 +768,7 @@ dma1000_init(struct dwc_softc *sc) goto out; } } + WRITE4(sc, RX_DESCR_LIST_ADDR, sc->rxdesc_ring_paddr); out: if (error != 0) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 896e2f2205a0..0df99a7c205c 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -610,22 +610,11 @@ dwc_attach(device_t dev) WRITE4(sc, BUS_MODE, reg); - /* - * DMA must be stop while changing descriptor list addresses. - */ - reg = READ4(sc, OPERATION_MODE); - reg &= ~(MODE_ST | MODE_SR); - WRITE4(sc, OPERATION_MODE, reg); - if (dma1000_init(sc)) { bus_release_resources(dev, dwc_spec, sc->res); return (ENXIO); } - /* Setup addresses */ - WRITE4(sc, RX_DESCR_LIST_ADDR, sc->rxdesc_ring_paddr); - WRITE4(sc, TX_DESCR_LIST_ADDR, sc->txdesc_ring_paddr); - mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_NETWORK_LOCK, MTX_DEF);