s390 updates for 5.4-rc3
Subsystems (2)
Vasily Gorbik
maintainerHello Linus,
please pull s390 changes for 5.4-rc3.
Thank you,
Vasily
The following changes since commit da0c9ea146cbe92b832f1b0f694840ea8eb33cce:
Linux 5.4-rc2 (2019-10-06 14:27:30 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.4-4
for you to fetch changes up to 062795fcdcb2d22822fb42644b1d76a8ad8439b3:
s390/uaccess: avoid (false positive) compiler warnings (2019-10-11 12:27:25 +0200)
----------------------------------------------------------------
s390 updates for 5.4-rc3
- Fix virtio-ccw DMA regression.
- Fix compiler warnings in uaccess.
----------------------------------------------------------------
Christian Borntraeger (1):
s390/uaccess: avoid (false positive) compiler warnings
Halil Pasic (1):
s390/cio: fix virtio-ccw DMA without PV
arch/s390/include/asm/uaccess.h | 4 ++-- drivers/s390/cio/cio.h | 1 + drivers/s390/cio/css.c | 7 ++++++- drivers/s390/cio/device.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-)
arch/s390/include/asm/uaccess.h +2 -2
@@ -83,7 +83,7 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n); __rc; \ }) -static inline int __put_user_fn (void *x,void __user *ptr,unsigned long size) +static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) {unsigned long spec =0x010000UL ;int rc;
@@ -113,7 +113,7 @@ static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)return rc; } -static inline int __get_user_fn (void *x,const void __user *ptr,unsigned long size) +static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size) {unsigned long spec =0x01UL ;int rc;
drivers/s390/cio/cio.h +1 -0
@@ -113,6 +113,7 @@ struct subchannel {enum sch_todo todo;struct work_struct todo_work;struct schib_config config; +u64 dma_mask;char *driver_override;/* Driver name to force a match */ } __attribute__ ((aligned(8)));
drivers/s390/cio/css.c +6 -1
@@ -232,7 +232,12 @@ struct subchannel *css_alloc_subchannel(struct subchannel_id schid,* belong to a subchannel need to fit 31 bit width (e.g. ccw). */ sch->dev.coherent_dma_mask =DMA_BIT_MASK (31 ); - sch->dev.dma_mask = &sch->dev.coherent_dma_mask; +/* +* But we don't have such restrictions imposed on the stuff that +* is handled by the streaming API. +*/ + sch->dma_mask =DMA_BIT_MASK (64 ); + sch->dev.dma_mask = &sch->dma_mask;return sch; err:
drivers/s390/cio/device.c +1 -1
@@ -710,7 +710,7 @@ static struct ccw_device * io_subchannel_allocate_dev(struct subchannel *sch)if (!cdev->private) goto err_priv; cdev->dev.coherent_dma_mask = sch->dev.coherent_dma_mask; - cdev->dev.dma_mask = &cdev->dev.coherent_dma_mask; + cdev->dev.dma_mask = sch->dev.dma_mask; dma_pool =cio_gp_dma_create (&cdev->dev,1 );if (!dma_pool) goto err_dma_pool;
The pull request you sent on Sat, 12 Oct 2019 12:25:39 +0200:
The pull request you sent on Sat, 12 Oct 2019 12:25:39 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.4-4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f154988a905e5cad9d1a20d4c4aeb176968fe3be
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker