9595#define DBG_RES (x ...)
9696#endif
9797
98- #define SBA_INLINE __inline__
99-
10098#define DEFAULT_DMA_HINT_REG 0
10199
102100struct sba_device * sba_list ;
@@ -332,13 +330,14 @@ static unsigned long ptr_to_pide(struct ioc *ioc, unsigned long *res_ptr,
332330/**
333331 * sba_search_bitmap - find free space in IO PDIR resource bitmap
334332 * @ioc: IO MMU structure which owns the pdir we are interested in.
333+ * @dev: device to query the bitmap for
335334 * @bits_wanted: number of entries we need.
336335 *
337336 * Find consecutive free bits in resource bitmap.
338337 * Each bit represents one entry in the IO Pdir.
339338 * Cool perf optimization: search for log2(size) bits at a time.
340339 */
341- static SBA_INLINE unsigned long
340+ static unsigned long
342341sba_search_bitmap (struct ioc * ioc , struct device * dev ,
343342 unsigned long bits_wanted )
344343{
@@ -431,6 +430,7 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev,
431430/**
432431 * sba_alloc_range - find free bits and mark them in IO PDIR resource bitmap
433432 * @ioc: IO MMU structure which owns the pdir we are interested in.
433+ * @dev: device for which pages should be alloced
434434 * @size: number of bytes to create a mapping for
435435 *
436436 * Given a size, find consecutive unmarked and then mark those bits in the
@@ -490,7 +490,7 @@ sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
490490 *
491491 * clear bits in the ioc's resource map
492492 */
493- static SBA_INLINE void
493+ static void
494494sba_free_range (struct ioc * ioc , dma_addr_t iova , size_t size )
495495{
496496 unsigned long iovp = SBA_IOVP (ioc , iova );
@@ -568,7 +568,7 @@ typedef unsigned long space_t;
568568 * IOMMU uses little endian for the pdir.
569569 */
570570
571- static void SBA_INLINE
571+ static void
572572sba_io_pdir_entry (u64 * pdir_ptr , space_t sid , unsigned long vba ,
573573 unsigned long hint )
574574{
@@ -609,7 +609,7 @@ sba_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
609609 * must be a power of 2. The "Cool perf optimization" in the
610610 * allocation routine helps keep that true.
611611 */
612- static SBA_INLINE void
612+ static void
613613sba_mark_invalid (struct ioc * ioc , dma_addr_t iova , size_t byte_cnt )
614614{
615615 u32 iovp = (u32 ) SBA_IOVP (ioc ,iova );
@@ -793,6 +793,7 @@ sba_map_page(struct device *dev, struct page *page, unsigned long offset,
793793 * @iova: IOVA of driver buffer previously mapped.
794794 * @size: number of bytes mapped in driver buffer.
795795 * @direction: R/W or both.
796+ * @attrs: attributes
796797 *
797798 * See Documentation/core-api/dma-api-howto.rst
798799 */
@@ -872,6 +873,8 @@ sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
872873 * @hwdev: instance of PCI owned by the driver that's asking.
873874 * @size: number of bytes mapped in driver buffer.
874875 * @dma_handle: IOVA of new buffer.
876+ * @gfp: allocation flags
877+ * @attrs: attributes
875878 *
876879 * See Documentation/core-api/dma-api-howto.rst
877880 */
@@ -902,7 +905,8 @@ static void *sba_alloc(struct device *hwdev, size_t size, dma_addr_t *dma_handle
902905 * @hwdev: instance of PCI owned by the driver that's asking.
903906 * @size: number of bytes mapped in driver buffer.
904907 * @vaddr: virtual address IOVA of "consistent" buffer.
905- * @dma_handler: IO virtual address of "consistent" buffer.
908+ * @dma_handle: IO virtual address of "consistent" buffer.
909+ * @attrs: attributes
906910 *
907911 * See Documentation/core-api/dma-api-howto.rst
908912 */
@@ -938,6 +942,7 @@ int dump_run_sg = 0;
938942 * @sglist: array of buffer/length pairs
939943 * @nents: number of entries in list
940944 * @direction: R/W or both.
945+ * @attrs: attributes
941946 *
942947 * See Documentation/core-api/dma-api-howto.rst
943948 */
@@ -946,7 +951,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
946951 enum dma_data_direction direction , unsigned long attrs )
947952{
948953 struct ioc * ioc ;
949- int coalesced , filled = 0 ;
954+ int filled = 0 ;
950955 unsigned long flags ;
951956
952957 DBG_RUN_SG ("%s() START %d entries\n" , __func__ , nents );
@@ -985,7 +990,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
985990 ** w/o this association, we wouldn't have coherent DMA!
986991 ** Access to the virtual address is what forces a two pass algorithm.
987992 */
988- coalesced = iommu_coalesce_chunks (ioc , dev , sglist , nents , sba_alloc_range );
993+ iommu_coalesce_chunks (ioc , dev , sglist , nents , sba_alloc_range );
989994
990995 /*
991996 ** Program the I/O Pdir
@@ -1022,6 +1027,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
10221027 * @sglist: array of buffer/length pairs
10231028 * @nents: number of entries in list
10241029 * @direction: R/W or both.
1030+ * @attrs: attributes
10251031 *
10261032 * See Documentation/core-api/dma-api-howto.rst
10271033 */
@@ -1992,7 +1998,7 @@ void __init sba_init(void)
19921998
19931999/**
19942000 * sba_get_iommu - Assign the iommu pointer for the pci bus controller.
1995- * @dev : The parisc device.
2001+ * @pci_hba : The parisc device.
19962002 *
19972003 * Returns the appropriate IOMMU data for the given parisc PCI controller.
19982004 * This is cached and used later for PCI DMA Mapping.
@@ -2012,7 +2018,7 @@ void * sba_get_iommu(struct parisc_device *pci_hba)
20122018
20132019/**
20142020 * sba_directed_lmmio - return first directed LMMIO range routed to rope
2015- * @pa_dev : The parisc device.
2021+ * @pci_hba : The parisc device.
20162022 * @r: resource PCI host controller wants start/end fields assigned.
20172023 *
20182024 * For the given parisc PCI controller, determine if any direct ranges
@@ -2054,7 +2060,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
20542060
20552061/**
20562062 * sba_distributed_lmmio - return portion of distributed LMMIO range
2057- * @pa_dev : The parisc device.
2063+ * @pci_hba : The parisc device.
20582064 * @r: resource PCI host controller wants start/end fields assigned.
20592065 *
20602066 * For the given parisc PCI controller, return portion of distributed LMMIO
0 commit comments