Date: Sat, 2 May 2020 11:18:23 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Hans Petter Selasky <hselasky@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r360525 - in stable/12: sys/arm64/arm64 sys/arm64/include sys/compat/linuxkpi/common/include/linux sys/compat/linuxkpi/common/src sys/dev/ofw sys/dev/pci sys/kern sys/sys sys/x86/includ... Message-ID: <20200502081823.GA3866@kib.kiev.ua> In-Reply-To: <202005010946.0419kRVc060976@repo.freebsd.org> References: <202005010946.0419kRVc060976@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, May 01, 2020 at 09:46:27AM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Fri May 1 09:46:27 2020 > New Revision: 360525 > URL: https://svnweb.freebsd.org/changeset/base/360525 > > Log: > MFC r346645, r346664, r346687, r347387, r347836, r347088, 347089, r346956, > r346957, r346958, r347088, r347089, r347385, r353938, r350570, > r350572 and r350573: > > Implement full bus_dma(9) support in the LinuxKPI and pull in all dependencies. > > Bump FreeBSD version to force recompilation of external modules. > > Sponsored by: Mellanox Technologies > > Modified: > stable/12/sys/arm64/arm64/busdma_bounce.c > stable/12/sys/arm64/include/bus_dma.h > stable/12/sys/arm64/include/bus_dma_impl.h > stable/12/sys/compat/linuxkpi/common/include/linux/device.h > stable/12/sys/compat/linuxkpi/common/include/linux/dma-mapping.h > stable/12/sys/compat/linuxkpi/common/include/linux/dmapool.h > stable/12/sys/compat/linuxkpi/common/include/linux/gfp.h > stable/12/sys/compat/linuxkpi/common/include/linux/io.h > stable/12/sys/compat/linuxkpi/common/include/linux/pci.h > stable/12/sys/compat/linuxkpi/common/include/linux/scatterlist.h > stable/12/sys/compat/linuxkpi/common/src/linux_pci.c > stable/12/sys/dev/ofw/ofwpci.c > stable/12/sys/dev/pci/vga_pci.c > stable/12/sys/kern/bus_if.m > stable/12/sys/kern/subr_bus.c > stable/12/sys/sys/bus.h > stable/12/sys/sys/bus_dma.h > stable/12/sys/sys/param.h > stable/12/sys/x86/include/bus_dma.h > stable/12/sys/x86/include/busdma_impl.h > stable/12/sys/x86/iommu/busdma_dmar.c > stable/12/sys/x86/x86/busdma_bounce.c > stable/12/usr.sbin/camdd/camdd.c > Directory Properties: > stable/12/ (props changed) The diff was truncated by commit mailer, so I inline the change: Index: sys/x86/include/busdma_impl.h =================================================================== --- sys/x86/include/busdma_impl.h (revision 360524) +++ sys/x86/include/busdma_impl.h (revision 360525) @@ -62,6 +62,7 @@ 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, It changed the layout of struct bus_dma_impl which is part of the KBI because it is accessed by inline wrappers of busdma KPI. End result is that all drivers binaries using busdma are broken. I believe it would be fine to move id_mapped to the end of the structure.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200502081823.GA3866>