From 6f200b542cb536327c5496f260439f52cb99695e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Jun 2023 08:29:17 +0200 Subject: [PATCH] drop queue-4.19/parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch --- ...t-writes-and-adjust-gatt-mask-in-par.patch | 62 ------------------- queue-4.19/series | 1 - 2 files changed, 63 deletions(-) delete mode 100644 queue-4.19/parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch diff --git a/queue-4.19/parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch b/queue-4.19/parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch deleted file mode 100644 index 2db87dd0d04..00000000000 --- a/queue-4.19/parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6fb76b0af8332d3398b1c3fd1cfa1bad161175da Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 17 May 2023 15:54:40 +0200 -Subject: parisc: Flush gatt writes and adjust gatt mask in - parisc_agp_mask_memory() - -From: Helge Deller - -[ Upstream commit d703797380c540bbeac03f104ebcfc364eaf47cc ] - -Flush caches after changing gatt entries and calculate entry according -to SBA requirements. - -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - drivers/char/agp/parisc-agp.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c -index 1d5510cb6db4e..f6d5a9b52cfe9 100644 ---- a/drivers/char/agp/parisc-agp.c -+++ b/drivers/char/agp/parisc-agp.c -@@ -94,6 +94,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 */ - } -@@ -162,6 +165,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]); - } - } - -@@ -195,7 +199,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 --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 6855ab4def0..aefc0c099fc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -6,7 +6,6 @@ regulator-fix-error-checking-for-debugfs_create_dir.patch irqchip-meson-gpio-mark-of-related-data-as-maybe-unu.patch power-supply-fix-logic-checking-if-system-is-running.patch parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch -parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch mips-alchemy-fix-dbdma2.patch mips-move-initrd_start-check-after-initrd-address-sa.patch xen-blkfront-only-check-req_fua-for-writes.patch -- 2.47.2