Commit c1ebb940 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: sba-iommu: Fix sparse warnigs 



Fix sparse warnings, as pdir is __le64 *.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent eb3255ee

arch/parisc/include/asm/ropes.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
struct ioc {

	void __iomem	*ioc_hpa;	/* I/O MMU base address */

	char		*res_map;	/* resource map, bit == pdir entry */

	u64		*pdir_base;	/* physical base address */

	__le64		*pdir_base;	/* physical base address */

	unsigned long	ibase;		/* pdir IOV Space base - shared w/lba_pci */

	unsigned long	imask;		/* pdir IOV Space mask - shared w/lba_pci */

#ifdef ZX1_SUPPORT
@@ -113,7 +113,7 @@ static inline int IS_PLUTO(struct parisc_device *d) { 


#define SBA_PDIR_VALID_BIT	0x8000000000000000ULL



#define SBA_AGPGART_COOKIE	0x0000badbadc0ffeeULL

#define SBA_AGPGART_COOKIE	(__force __le64) 0x0000badbadc0ffeeULL



#define SBA_FUNC_ID	0x0000	/* function id */

#define SBA_FCLASS	0x0008	/* function class, bist, header, rev... */

drivers/parisc/iommu-helpers.h

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
static inline unsigned int

iommu_fill_pdir(struct ioc *ioc, struct scatterlist *startsg, int nents, 

		unsigned long hint,

		void (*iommu_io_pdir_entry)(u64 *, space_t, unsigned long,

		void (*iommu_io_pdir_entry)(__le64 *, space_t, unsigned long,

					    unsigned long))

{

	struct scatterlist *dma_sg = startsg;	/* pointer to current DMA */

	unsigned int n_mappings = 0;

	unsigned long dma_offset = 0, dma_len = 0;

	u64 *pdirp = NULL;

	__le64 *pdirp = NULL;



	/* Horrible hack.  For efficiency's sake, dma_sg starts one 

	 * entry below the true start (it is immediately incremented

drivers/parisc/sba_iommu.c

+14 −14
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void 
sba_dump_pdir_entry(struct ioc *ioc, char *msg, uint pide)

{

	/* start printing from lowest pde in rval */

	u64 *ptr = &(ioc->pdir_base[pide & (~0U * BITS_PER_LONG)]);

	__le64 *ptr = &(ioc->pdir_base[pide & (~0U * BITS_PER_LONG)]);

	unsigned long *rptr = (unsigned long *) &(ioc->res_map[(pide >>3) & ~(sizeof(unsigned long) - 1)]);

	uint rcnt;
@@ -569,7 +569,7 @@ typedef unsigned long space_t; 
 */



static void

sba_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,

sba_io_pdir_entry(__le64 *pdir_ptr, space_t sid, unsigned long vba,

		  unsigned long hint)

{

	u64 pa; /* physical address */
@@ -613,7 +613,7 @@ static void 
sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)

{

	u32 iovp = (u32) SBA_IOVP(ioc,iova);

	u64 *pdir_ptr = &ioc->pdir_base[PDIR_INDEX(iovp)];

	__le64 *pdir_ptr = &ioc->pdir_base[PDIR_INDEX(iovp)];



#ifdef ASSERT_PDIR_SANITY

	/* Assert first pdir entry is set.
@@ -714,7 +714,7 @@ sba_map_single(struct device *dev, void *addr, size_t size, 
	unsigned long flags; 

	dma_addr_t iovp;

	dma_addr_t offset;

	u64 *pdir_start;

	__le64 *pdir_start;

	int pide;



	ioc = GET_IOC(dev);
@@ -1432,7 +1432,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num) 


	ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);



	DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",

	DBG_INIT("%s() hpa %px mem %ldMB IOV %dMB (%d bits)\n",

			__func__,

			ioc->ioc_hpa,

			(unsigned long) totalram_pages() >> (20 - PAGE_SHIFT),
@@ -1469,7 +1469,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num) 
	ioc->iovp_mask = ~(iova_space_mask + PAGE_SIZE - 1);

#endif



	DBG_INIT("%s() IOV base 0x%lx mask 0x%0lx\n",

	DBG_INIT("%s() IOV base %#lx mask %#0lx\n",

		__func__, ioc->ibase, ioc->imask);



	/*
@@ -1581,7 +1581,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa, 


	if (!IS_PLUTO(sba_dev->dev)) {

		ioc_ctl = READ_REG(sba_dev->sba_hpa+IOC_CTRL);

		DBG_INIT("%s() hpa 0x%lx ioc_ctl 0x%Lx ->",

		DBG_INIT("%s() hpa %px ioc_ctl 0x%Lx ->",

			__func__, sba_dev->sba_hpa, ioc_ctl);

		ioc_ctl &= ~(IOC_CTRL_RM | IOC_CTRL_NC | IOC_CTRL_CE);

		ioc_ctl |= IOC_CTRL_DD | IOC_CTRL_D4 | IOC_CTRL_TC;
@@ -1666,14 +1666,14 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa, 
		/* flush out the last writes */

		READ_REG(sba_dev->ioc[i].ioc_hpa + ROPE7_CTL);



		DBG_INIT("	ioc[%d] ROPE_CFG 0x%Lx  ROPE_DBG 0x%Lx\n",

		DBG_INIT("	ioc[%d] ROPE_CFG %#lx  ROPE_DBG %lx\n",

				i,

				READ_REG(sba_dev->ioc[i].ioc_hpa + 0x40),

				READ_REG(sba_dev->ioc[i].ioc_hpa + 0x50)

				(unsigned long) READ_REG(sba_dev->ioc[i].ioc_hpa + 0x40),

				(unsigned long) READ_REG(sba_dev->ioc[i].ioc_hpa + 0x50)

			);

		DBG_INIT("	STATUS_CONTROL 0x%Lx  FLUSH_CTRL 0x%Lx\n",

				READ_REG(sba_dev->ioc[i].ioc_hpa + 0x108),

				READ_REG(sba_dev->ioc[i].ioc_hpa + 0x400)

		DBG_INIT("	STATUS_CONTROL %#lx  FLUSH_CTRL %#lx\n",

				(unsigned long) READ_REG(sba_dev->ioc[i].ioc_hpa + 0x108),

				(unsigned long) READ_REG(sba_dev->ioc[i].ioc_hpa + 0x400)

			);



		if (IS_PLUTO(sba_dev->dev)) {
@@ -1737,7 +1737,7 @@ sba_common_init(struct sba_device *sba_dev) 
#ifdef ASSERT_PDIR_SANITY

		/* Mark first bit busy - ie no IOVA 0 */

		sba_dev->ioc[i].res_map[0] = 0x80;

		sba_dev->ioc[i].pdir_base[0] = 0xeeffc0addbba0080ULL;

		sba_dev->ioc[i].pdir_base[0] = (__force __le64) 0xeeffc0addbba0080ULL;

#endif



		/* Third (and last) part of PIRANHA BUG */