Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b39b06b authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory() 



[ Upstream commit d703797380c540bbeac03f104ebcfc364eaf47cc ]

Flush caches after changing gatt entries and calculate entry according
to SBA requirements.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent de873bce

drivers/char/agp/parisc-agp.c

+14 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ parisc_agp_tlbflush(struct agp_memory *mem) 
{

	struct _parisc_agp_info *info = &parisc_agp_info;



	/* force fdc ops to be visible to IOMMU */

	asm_io_sync();



	writeq(info->gart_base | ilog2(info->gart_size), info->ioc_regs+IOC_PCOM);

	readq(info->ioc_regs+IOC_PCOM);	/* flush */

}
@@ -158,6 +161,7 @@ parisc_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 
			info->gatt[j] =

				parisc_agp_mask_memory(agp_bridge,

					paddr, type);

			asm_io_fdc(&info->gatt[j]);

		}

	}
@@ -191,7 +195,16 @@ static unsigned long 
parisc_agp_mask_memory(struct agp_bridge_data *bridge, dma_addr_t addr,

		       int type)

{

	return SBA_PDIR_VALID_BIT | addr;

	unsigned ci;			/* coherent index */

	dma_addr_t pa;



	pa = addr & IOVP_MASK;

	asm("lci 0(%1), %0" : "=r" (ci) : "r" (phys_to_virt(pa)));



	pa |= (ci >> PAGE_SHIFT) & 0xff;/* move CI (8 bits) into lowest byte */

	pa |= SBA_PDIR_VALID_BIT;	/* set "valid" bit */



	return cpu_to_le64(pa);

}



static void