tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

- Fix virtio-ccw DMA regression

- Fix compiler warnings in uaccess

* tag 's390-5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/uaccess: avoid (false positive) compiler warnings
s390/cio: fix virtio-ccw DMA without PV

Linus Torvalds f154988a 1c0cc5f1

+10 -4
+2 -2
arch/s390/include/asm/uaccess.h
··· 83 83 __rc; \ 84 84 }) 85 85 86 - static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) 86 + static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) 87 87 { 88 88 unsigned long spec = 0x010000UL; 89 89 int rc; ··· 113 113 return rc; 114 114 } 115 115 116 - static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size) 116 + static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size) 117 117 { 118 118 unsigned long spec = 0x01UL; 119 119 int rc;
+1
drivers/s390/cio/cio.h
··· 113 113 enum sch_todo todo; 114 114 struct work_struct todo_work; 115 115 struct schib_config config; 116 + u64 dma_mask; 116 117 char *driver_override; /* Driver name to force a match */ 117 118 } __attribute__ ((aligned(8))); 118 119
+6 -1
drivers/s390/cio/css.c
··· 232 232 * belong to a subchannel need to fit 31 bit width (e.g. ccw). 233 233 */ 234 234 sch->dev.coherent_dma_mask = DMA_BIT_MASK(31); 235 - sch->dev.dma_mask = &sch->dev.coherent_dma_mask; 235 + /* 236 + * But we don't have such restrictions imposed on the stuff that 237 + * is handled by the streaming API. 238 + */ 239 + sch->dma_mask = DMA_BIT_MASK(64); 240 + sch->dev.dma_mask = &sch->dma_mask; 236 241 return sch; 237 242 238 243 err:
+1 -1
drivers/s390/cio/device.c
··· 710 710 if (!cdev->private) 711 711 goto err_priv; 712 712 cdev->dev.coherent_dma_mask = sch->dev.coherent_dma_mask; 713 - cdev->dev.dma_mask = &cdev->dev.coherent_dma_mask; 713 + cdev->dev.dma_mask = sch->dev.dma_mask; 714 714 dma_pool = cio_gp_dma_create(&cdev->dev, 1); 715 715 if (!dma_pool) 716 716 goto err_dma_pool;