[GIT PULL] s390 updates for 5.6-rc5

* [GIT PULL] s390 updates for 5.6-rc5
@ 2020-03-07 13:06 Vasily Gorbik
  2020-03-07 14:30 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Vasily Gorbik @ 2020-03-07 13:06 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Heiko Carstens, Christian Borntraeger, linux-kernel, linux-s390

Hello Linus,

please pull s390 changes for 5.6-rc5.

Thank you,
Vasily

The following changes since commit 98d54f81e36ba3bf92172791eba5ca5bd813989b:

  Linux 5.6-rc4 (2020-03-01 16:38:46 -0600)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.6-5

for you to fetch changes up to df057c914a9c219ac8b8ed22caf7da2f80c1fe26:

  s390/pci: Fix unexpected write combine on resource (2020-03-04 11:18:03 +0100)

----------------------------------------------------------------
s390 updates for 5.6-rc5

- Fix panic in gup_fast on large pud by providing an implementation of
  pud_write. This has been overlooked during migration to common gup code.

- Fix unexpected write combining on PCI stores.

----------------------------------------------------------------
Gerald Schaefer (1):
      s390/mm: fix panic in gup_fast on large pud

Niklas Schnelle (1):
      s390/pci: Fix unexpected write combine on resource

 arch/s390/include/asm/pgtable.h | 6 ++++++
 arch/s390/pci/pci.c             | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 137a3920ca36..6d7c3b7e9281 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -752,6 +752,12 @@ static inline int pmd_write(pmd_t pmd)
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;
 }
 
+#define pud_write pud_write
+static inline int pud_write(pud_t pud)
+{
+	return (pud_val(pud) & _REGION3_ENTRY_WRITE) != 0;
+}
+
 static inline int pmd_dirty(pmd_t pmd)
 {
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index bc61ea18e88d..60716d18ce5a 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev)
 
 		if (zpci_use_mio(zdev))
 			pdev->resource[i].start =
-				(resource_size_t __force) zdev->bars[i].mio_wb;
+				(resource_size_t __force) zdev->bars[i].mio_wt;
 		else
 			pdev->resource[i].start = (resource_size_t __force)
 				pci_iomap_range_fh(pdev, i, 0, 0);
@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,
 			flags |= IORESOURCE_MEM_64;
 
 		if (zpci_use_mio(zdev))
-			addr = (unsigned long) zdev->bars[i].mio_wb;
+			addr = (unsigned long) zdev->bars[i].mio_wt;
 		else
 			addr = ZPCI_ADDR(entry);
 		size = 1UL << zdev->bars[i].size;


^ permalink raw reply related	[flat|nested] 2+ messages in thread