s390 updates for 5.6-rc5
Vasily Gorbik
maintainerHello 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(-)
arch/s390/include/asm/pgtable.h +6 -0
@@ -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 ;
arch/s390/pci/pci.c +2 -2
@@ -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;
The pull request you sent on Sat, 7 Mar 2020 14:06:45 +0100:
The pull request you sent on Sat, 7 Mar 2020 14:06:45 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.6-5
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9d588f63602778716921bb638cda412cdeacabc8
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker