s390/pci_mmio: use follow_pfnmap API

jira LE-3557
Rebuild_History Non-Buildable kernel-5.14.0-570.26.1.el9_6
commit-author Peter Xu <[email protected]>
commit bd8c2d1
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/bd8c2d18.failed

Use the new API that can understand huge pfn mappings.

Link: https://lkml.kernel.org/r/[email protected]
	Signed-off-by: Peter Xu <[email protected]>
	Cc: Niklas Schnelle <[email protected]>
	Cc: Gerald Schaefer <[email protected]>
	Cc: Heiko Carstens <[email protected]>
	Cc: Vasily Gorbik <[email protected]>
	Cc: Alexander Gordeev <[email protected]>
	Cc: Christian Borntraeger <[email protected]>
	Cc: Sven Schnelle <[email protected]>
	Cc: Alex Williamson <[email protected]>
	Cc: Aneesh Kumar K.V <[email protected]>
	Cc: Borislav Petkov <[email protected]>
	Cc: Catalin Marinas <[email protected]>
	Cc: Dave Hansen <[email protected]>
	Cc: David Hildenbrand <[email protected]>
	Cc: Gavin Shan <[email protected]>
	Cc: Ingo Molnar <[email protected]>
	Cc: Jason Gunthorpe <[email protected]>
	Cc: Matthew Wilcox <[email protected]>
	Cc: Paolo Bonzini <[email protected]>
	Cc: Ryan Roberts <[email protected]>
	Cc: Sean Christopherson <[email protected]>
	Cc: Thomas Gleixner <[email protected]>
	Cc: Will Deacon <[email protected]>
	Cc: Zi Yan <[email protected]>
	Signed-off-by: Andrew Morton <[email protected]>
(cherry picked from commit bd8c2d1)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	arch/s390/pci/pci_mmio.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/bd8c2d18.failed

@@ -0,0 +1,76 @@
+s390/pci_mmio: use follow_pfnmap API
+
+jira LE-3557
+Rebuild_History Non-Buildable kernel-5.14.0-570.26.1.el9_6
+commit-author Peter Xu <[email protected]>
+commit bd8c2d18bf5cccd8842d00b17d6f222beb98b1b3
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/bd8c2d18.failed
+
+Use the new API that can understand huge pfn mappings.
+
+Link: https://lkml.kernel.org/r/[email protected]
+	Signed-off-by: Peter Xu <[email protected]>
+	Cc: Niklas Schnelle <[email protected]>
+	Cc: Gerald Schaefer <[email protected]>
+	Cc: Heiko Carstens <[email protected]>
+	Cc: Vasily Gorbik <[email protected]>
+	Cc: Alexander Gordeev <[email protected]>
+	Cc: Christian Borntraeger <[email protected]>
+	Cc: Sven Schnelle <[email protected]>
+	Cc: Alex Williamson <[email protected]>
+	Cc: Aneesh Kumar K.V <[email protected]>
+	Cc: Borislav Petkov <[email protected]>
+	Cc: Catalin Marinas <[email protected]>
+	Cc: Dave Hansen <[email protected]>
+	Cc: David Hildenbrand <[email protected]>
+	Cc: Gavin Shan <[email protected]>
+	Cc: Ingo Molnar <[email protected]>
+	Cc: Jason Gunthorpe <[email protected]>
+	Cc: Matthew Wilcox <[email protected]>
+	Cc: Paolo Bonzini <[email protected]>
+	Cc: Ryan Roberts <[email protected]>
+	Cc: Sean Christopherson <[email protected]>
+	Cc: Thomas Gleixner <[email protected]>
+	Cc: Will Deacon <[email protected]>
+	Cc: Zi Yan <[email protected]>
+	Signed-off-by: Andrew Morton <[email protected]>
+(cherry picked from commit bd8c2d18bf5cccd8842d00b17d6f222beb98b1b3)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	arch/s390/pci/pci_mmio.c
+diff --cc arch/s390/pci/pci_mmio.c
+index 588089332931,de5c0b389a3e..000000000000
+--- a/arch/s390/pci/pci_mmio.c
++++ b/arch/s390/pci/pci_mmio.c
+@@@ -169,7 -168,9 +168,13 @@@ SYSCALL_DEFINE3(s390_pci_mmio_write, un
+  	if (!(vma->vm_flags & VM_WRITE))
+  		goto out_unlock_mmap;
+  
+++<<<<<<< HEAD
+ +	ret = follow_pte(vma->vm_mm, mmio_addr, &ptep, &ptl);
+++=======
++ 	args.address = mmio_addr;
++ 	args.vma = vma;
++ 	ret = follow_pfnmap_start(&args);
+++>>>>>>> bd8c2d18bf5c (s390/pci_mmio: use follow_pfnmap API)
+  	if (ret)
+  		goto out_unlock_mmap;
+  
+@@@ -308,7 -308,9 +312,13 @@@ SYSCALL_DEFINE3(s390_pci_mmio_read, uns
+  	if (!(vma->vm_flags & VM_WRITE))
+  		goto out_unlock_mmap;
+  
+++<<<<<<< HEAD
+ +	ret = follow_pte(vma->vm_mm, mmio_addr, &ptep, &ptl);
+++=======
++ 	args.vma = vma;
++ 	args.address = mmio_addr;
++ 	ret = follow_pfnmap_start(&args);
+++>>>>>>> bd8c2d18bf5c (s390/pci_mmio: use follow_pfnmap API)
+  	if (ret)
+  		goto out_unlock_mmap;
+  
+* Unmerged path arch/s390/pci/pci_mmio.c