Date: Tue, 5 Jan 2016 20:53:59 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r293222 - in projects/release-install-debug: share/man/man4 sys/dev/ioat sys/dev/iwm Message-ID: <201601052053.u05KrxIQ068430@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Jan 5 20:53:59 2016 New Revision: 293222 URL: https://svnweb.freebsd.org/changeset/base/293222 Log: Final merge from head, before mergeing this branch back to head. Sponsored by: The FreeBSD Foundation Modified: projects/release-install-debug/share/man/man4/ioat.4 projects/release-install-debug/sys/dev/ioat/ioat.c projects/release-install-debug/sys/dev/ioat/ioat.h projects/release-install-debug/sys/dev/iwm/if_iwm.c Directory Properties: projects/release-install-debug/ (props changed) Modified: projects/release-install-debug/share/man/man4/ioat.4 ============================================================================== --- projects/release-install-debug/share/man/man4/ioat.4 Tue Jan 5 20:42:19 2016 (r293221) +++ projects/release-install-debug/share/man/man4/ioat.4 Tue Jan 5 20:53:59 2016 (r293222) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 17, 2015 +.Dd January 5, 2016 .Dt IOAT 4 .Os .Sh NAME @@ -65,6 +65,8 @@ In .Fn ioat_put_dmaengine "bus_dmaengine_t dmaengine" .Ft int .Fn ioat_get_hwversion "bus_dmaengine_t dmaengine" +.Ft size_t +.Fn ioat_get_max_io_size "bus_dmaengine_t dmaengine" .Ft int .Fn ioat_set_interrupt_coalesce "bus_dmaengine_t dmaengine" "uint16_t delay" .Ft uint16_t Modified: projects/release-install-debug/sys/dev/ioat/ioat.c ============================================================================== --- projects/release-install-debug/sys/dev/ioat/ioat.c Tue Jan 5 20:42:19 2016 (r293221) +++ projects/release-install-debug/sys/dev/ioat/ioat.c Tue Jan 5 20:53:59 2016 (r293222) @@ -744,6 +744,15 @@ ioat_get_hwversion(bus_dmaengine_t dmaen return (ioat->version); } +size_t +ioat_get_max_io_size(bus_dmaengine_t dmaengine) +{ + struct ioat_softc *ioat; + + ioat = to_ioat_softc(dmaengine); + return (ioat->max_xfer_size); +} + int ioat_set_interrupt_coalesce(bus_dmaengine_t dmaengine, uint16_t delay) { Modified: projects/release-install-debug/sys/dev/ioat/ioat.h ============================================================================== --- projects/release-install-debug/sys/dev/ioat/ioat.h Tue Jan 5 20:42:19 2016 (r293221) +++ projects/release-install-debug/sys/dev/ioat/ioat.h Tue Jan 5 20:53:59 2016 (r293222) @@ -70,6 +70,7 @@ void ioat_put_dmaengine(bus_dmaengine_t /* Check the DMA engine's HW version */ int ioat_get_hwversion(bus_dmaengine_t dmaengine); +size_t ioat_get_max_io_size(bus_dmaengine_t dmaengine); /* * Set interrupt coalescing on a DMA channel. Modified: projects/release-install-debug/sys/dev/iwm/if_iwm.c ============================================================================== --- projects/release-install-debug/sys/dev/iwm/if_iwm.c Tue Jan 5 20:42:19 2016 (r293221) +++ projects/release-install-debug/sys/dev/iwm/if_iwm.c Tue Jan 5 20:53:59 2016 (r293222) @@ -2041,7 +2041,6 @@ iwm_mvm_load_ucode_wait_alive(struct iwm sc->sc_uc_current = ucode_type; error = iwm_start_fw(sc, ucode_type); - iwm_fw_info_free(&sc->sc_fw); if (error) { sc->sc_uc_current = old_type; return error; @@ -4937,6 +4936,7 @@ iwm_suspend(device_t dev) static int iwm_detach_local(struct iwm_softc *sc, int do_net80211) { + struct iwm_fw_info *fw = &sc->sc_fw; device_t dev = sc->sc_dev; int i; @@ -4953,6 +4953,10 @@ iwm_detach_local(struct iwm_softc *sc, i for (i = 0; i < nitems(sc->txq); i++) iwm_free_tx_ring(sc, &sc->txq[i]); + /* Free firmware */ + if (fw->fw_fp != NULL) + iwm_fw_info_free(fw); + /* Free scheduler */ iwm_free_sched(sc); if (sc->ict_dma.vaddr != NULL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601052053.u05KrxIQ068430>