Index | Thread | Search

From:
Mark Kettenis <mark.kettenis@xs4all.nl>
Subject:
Re: bce(4) fixup
To:
Martin Pieuchot <mpi@grenadille.net>
Cc:
tech@openbsd.org
Date:
Thu, 04 Sep 2025 17:28:22 +0200

Download raw body.

Thread
  • Martin Pieuchot:

    bce(4) fixup

    • Mark Kettenis:

      bce(4) fixup

> Date: Thu, 4 Sep 2025 17:19:41 +0200
> From: Martin Pieuchot <mpi@grenadille.net>
> 
> These were missed in the previous conversion, ok?

Oops, yes, ok kettenis@

> Index: dev/pci/if_bce.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_bce.c,v
> diff -u -p -r1.59 if_bce.c
> --- dev/pci/if_bce.c	14 Aug 2025 11:13:57 -0000	1.59
> +++ dev/pci/if_bce.c	4 Sep 2025 14:59:39 -0000
> @@ -288,9 +288,8 @@ bce_attach(struct device *parent, struct
>  	    1, BCE_NTXDESC * MCLBYTES, 0, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW,
>  	    &sc->bce_txdata_map))) {
>  		printf(": unable to create ring DMA map, error = %d\n", error);
> -		uvm_km_free(kernel_map, (vaddr_t)sc->bce_data,
> -		    (BCE_NTXDESC + BCE_NRXDESC) * MCLBYTES);
>  		bus_dmamap_destroy(sc->bce_dmatag, sc->bce_rxdata_map);
> +		bus_dmamem_free(sc->bce_dmatag, &dseg, drseg);
>  		return;
>  	}
>  
> @@ -299,10 +298,9 @@ bce_attach(struct device *parent, struct
>  	    sc->bce_data + BCE_NRXDESC * MCLBYTES,
>  	    BCE_NTXDESC * MCLBYTES, NULL, BUS_DMA_WRITE | BUS_DMA_NOWAIT)) {
>  		printf(": unable to load tx ring DMA map\n");
> -		uvm_km_free(kernel_map, (vaddr_t)sc->bce_data,
> -		    (BCE_NTXDESC + BCE_NRXDESC) * MCLBYTES);
>  		bus_dmamap_destroy(sc->bce_dmatag, sc->bce_rxdata_map);
>  		bus_dmamap_destroy(sc->bce_dmatag, sc->bce_txdata_map);
> +		bus_dmamem_free(sc->bce_dmatag, &dseg, drseg);
>  		return;
>  	}
>  
> 
> 
>