From owner-svn-src-stable-12@freebsd.org Mon May 4 07:57:56 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 510F62C81DE; Mon, 4 May 2020 07:57:56 +0000 (UTC) (envelope-from hselasky@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FwFb6MyQz3M4f; Mon, 4 May 2020 07:57:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D5F3920E45; Mon, 4 May 2020 07:57:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0447vtaE084736; Mon, 4 May 2020 07:57:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0447vt7h084734; Mon, 4 May 2020 07:57:55 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202005040757.0447vt7h084734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 4 May 2020 07:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360620 - in stable/12/sys: sys x86/include X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/12/sys: sys x86/include X-SVN-Commit-Revision: 360620 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 07:57:56 -0000 Author: hselasky Date: Mon May 4 07:57:55 2020 New Revision: 360620 URL: https://svnweb.freebsd.org/changeset/base/360620 Log: Move id_mapped to end of bus_dma_impl structure to preserve KPI for 12-stable. This is a direct commit. Bump the __FreeBSD_version to force recompilation of external kernel modules. Reported by: kib @ Sponsored by: Mellanox Technologies Modified: stable/12/sys/sys/param.h stable/12/sys/x86/include/busdma_impl.h Modified: stable/12/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Mon May 4 05:49:11 2020 (r360619) +++ stable/12/sys/sys/param.h Mon May 4 07:57:55 2020 (r360620) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1201515 /* Master, propagated to newvers */ +#define __FreeBSD_version 1201516 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/12/sys/x86/include/busdma_impl.h ============================================================================== --- stable/12/sys/x86/include/busdma_impl.h Mon May 4 05:49:11 2020 (r360619) +++ stable/12/sys/x86/include/busdma_impl.h Mon May 4 07:57:55 2020 (r360620) @@ -62,7 +62,6 @@ struct bus_dma_impl { void *lockfuncarg, bus_dma_tag_t *dmat); int (*tag_destroy)(bus_dma_tag_t dmat); int (*tag_set_domain)(bus_dma_tag_t); - bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map); int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags, @@ -85,6 +84,7 @@ struct bus_dma_impl { void (*map_unload)(bus_dma_tag_t dmat, bus_dmamap_t map); void (*map_sync)(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op); + bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); }; void bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op);