From owner-svn-src-all@freebsd.org Thu May 16 22:28:15 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 916EA15A8D82; Thu, 16 May 2019 22:28:15 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BC1377466; Thu, 16 May 2019 22:28:15 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 183B77176E; Thu, 16 May 2019 18:28:07 -0400 (EDT) (envelope-from tychon@freebsd.org) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=content-type :mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=sasl; bh= j+sYgyw8GNoFuS89TV95irt0QJM=; b=X00nQOKyYOp+3Wg8dN/wEf/LcFYeYxx1 yhhqpxtD+/svOAh1bP515DJFYuu2UUR7Sb1cTyOXf5h/bEbeKHaL5QjmVxrKczxL M9nxe5ZBuW9NsA59KqK53AxAaQSY/wzcFSAwoQmh0lKQVg1nAgUpAtV/RtK1kuOC fiOmTRAOyQE= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 0EBC47176D; Thu, 16 May 2019 18:28:07 -0400 (EDT) (envelope-from tychon@freebsd.org) Received: from [10.0.1.195] (unknown [146.115.68.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 0B46A71768; Thu, 16 May 2019 18:28:03 -0400 (EDT) (envelope-from tychon@freebsd.org) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r347890 - in head/sys/dev: aac bge From: Tycho Nightingale In-Reply-To: <9aeac9a0-5816-51d1-c965-3764f5822382@selasky.org> Date: Thu, 16 May 2019 18:28:02 -0400 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1EF4A3E8-DD0D-4B2E-B4D2-6E72ED6BF790@freebsd.org> References: <201905162041.x4GKfTwb013353@repo.freebsd.org> <9aeac9a0-5816-51d1-c965-3764f5822382@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.3445.9.1) X-Pobox-Relay-ID: DF1F5286-7829-11E9-9377-B0405B776F7B-09779102!pb-smtp20.pobox.com X-Rspamd-Queue-Id: 2BC1377466 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2019 22:28:15 -0000 > On May 16, 2019, at 5:23 PM, Hans Petter Selasky = wrote: >=20 > On 2019-05-16 22:41, Tycho Nightingale wrote: >> Author: tychon >> Date: Thu May 16 20:41:28 2019 >> New Revision: 347890 >> URL: https://svnweb.freebsd.org/changeset/base/347890 >> Log: >> reinstate 4GB DMA boundary workarounds for bge and aac >> Reviewed by: kib >> Sponsored by: Dell EMC Isilon >> Differential Revision: https://reviews.freebsd.org/D20277 >> Modified: >> head/sys/dev/aac/aac_pci.c >> head/sys/dev/bge/if_bge.c >> head/sys/dev/bge/if_bgereg.h >> Modified: head/sys/dev/aac/aac_pci.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/dev/aac/aac_pci.c Thu May 16 19:32:11 2019 = (r347889) >> +++ head/sys/dev/aac/aac_pci.c Thu May 16 20:41:28 2019 = (r347890) >> @@ -443,7 +443,8 @@ aac_pci_attach(device_t dev) >> * Note that some of these controllers are 64-bit capable. >> */ >> if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ >> - PAGE_SIZE, 0, /* algnmnt, = boundary */ >> + PAGE_SIZE, /* algnmnt */ >> + ((bus_size_t)((uint64_t)1 << 32)), /* = boundary*/ >> BUS_SPACE_MAXADDR, /* lowaddr */ >> BUS_SPACE_MAXADDR, /* highaddr */ >> NULL, NULL, /* filter, = filterarg */ >> Modified: head/sys/dev/bge/if_bge.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/dev/bge/if_bge.c Thu May 16 19:32:11 2019 = (r347889) >> +++ head/sys/dev/bge/if_bge.c Thu May 16 20:41:28 2019 = (r347890) >> @@ -2927,10 +2927,14 @@ bge_dma_ring_alloc(struct bge_softc *sc, = bus_size_t al >> bus_addr_t *paddr, const char *msg) >> { >> struct bge_dmamap_arg ctx; >> + bus_addr_t lowaddr; >> + bus_size_t ring_end; >> int error; >> + lowaddr =3D BUS_SPACE_MAXADDR; >> +again: >> error =3D bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, >> - alignment, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, >> + alignment, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, >> NULL, maxsize, 1, maxsize, 0, NULL, NULL, tag); >> if (error !=3D 0) { >> device_printf(sc->bge_dev, >> @@ -2955,6 +2959,25 @@ bge_dma_ring_alloc(struct bge_softc *sc, = bus_size_t al >> return (ENOMEM); >> } >> *paddr =3D ctx.bge_busaddr; >> + ring_end =3D *paddr + maxsize; >> + if ((sc->bge_flags & BGE_FLAG_4G_BNDRY_BUG) !=3D 0 && >> + BGE_ADDR_HI(*paddr) !=3D BGE_ADDR_HI(ring_end)) { >> + /* >> + * 4GB boundary crossed. Limit maximum allowable DMA >> + * address space to 32bit and try again. >> + */ >> + bus_dmamap_unload(*tag, *map); >> + bus_dmamem_free(*tag, *ring, *map); >> + bus_dma_tag_destroy(*tag); >> + if (bootverbose) >> + device_printf(sc->bge_dev, "4GB boundary = crossed, " >> + "limit DMA address space to 32bit for %s\n", = msg); >> + *ring =3D NULL; >> + *tag =3D NULL; >> + *map =3D NULL; >> + lowaddr =3D BUS_SPACE_MAXADDR_32BIT; >> + goto again; >> + } >> return (0); >> } >> @@ -2962,7 +2985,7 @@ static int >> bge_dma_alloc(struct bge_softc *sc) >> { >> bus_addr_t lowaddr; >> - bus_size_t rxmaxsegsz, sbsz, txsegsz, txmaxsegsz; >> + bus_size_t boundary, sbsz, rxmaxsegsz, txsegsz, txmaxsegsz; >> int i, error; >> lowaddr =3D BUS_SPACE_MAXADDR; >> @@ -3049,7 +3072,9 @@ bge_dma_alloc(struct bge_softc *sc) >> } >> /* Create parent tag for buffers. */ >> + boundary =3D 0; >> if ((sc->bge_flags & BGE_FLAG_4G_BNDRY_BUG) !=3D 0) { >> + boundary =3D BGE_DMA_BNDRY; >> /* >> * XXX >> * watchdog timeout issue was observed on BCM5704 which >> @@ -3060,10 +3085,10 @@ bge_dma_alloc(struct bge_softc *sc) >> if (sc->bge_pcixcap !=3D 0) >> lowaddr =3D BUS_SPACE_MAXADDR_32BIT; >> } >> - error =3D bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), 1, 0, = lowaddr, >> - BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, >> - BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, >> - &sc->bge_cdata.bge_buffer_tag); >> + error =3D bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), >> + 1, boundary, lowaddr, BUS_SPACE_MAXADDR, NULL, >> + NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, >> + 0, NULL, NULL, &sc->bge_cdata.bge_buffer_tag); >> if (error !=3D 0) { >> device_printf(sc->bge_dev, >> "could not allocate buffer dma tag\n"); >> Modified: head/sys/dev/bge/if_bgereg.h >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/sys/dev/bge/if_bgereg.h Thu May 16 19:32:11 2019 = (r347889) >> +++ head/sys/dev/bge/if_bgereg.h Thu May 16 20:41:28 2019 = (r347890) >> @@ -2866,6 +2866,12 @@ struct bge_gib { >> #define BGE_DMA_MAXADDR 0xFFFFFFFFFF >> #endif >> +#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) >> +#define BGE_DMA_BNDRY 0x100000000 >> +#else >> +#define BGE_DMA_BNDRY 0 >> +#endif >> + >> /* >> * Ring structures. Most of these reside in host memory and we tell >> * the NIC where they are via the ring control blocks. The = exceptions >=20 > /usr/src/sys/dev/bge/if_bge.c:3077: warning: large integer implicitly = truncated to unsigned type [-Woverflow] Sorry. Fixed in r347896. Tycho=