lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s390 updates for 5.4-rc3

Browse Source 
- Fix virtio-ccw DMA regression.
 
 - Fix compiler warnings in uaccess.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEE3QHqV+H2a8xAv27vjYWKoQLXFBgFAl2hp6wACgkQjYWKoQLX
 FBghOwf9GHjftGVaC521464smGl4VK7PAEKXcZZDQpu44m6auEGCeUx6H9pshBQq
 sZeBWT631LR8yLJ6WO+aKWO0veu3BUGST6yECm6vaSNsV9HFf8c7SVcUQFs48eGV
 C3SG7eLpUNGFEKbfnod3FalJ+YgqJDcOcvpG9zdbj23xKQTZ76V0Nc9QyfQYWcqI
 ZOlIrS+lv2c79jXYYd/ZnYpRU2DeQxmWzul0owRuHV1Eg0GmaUt0NXzdYQJKokZf
 pNmVPN2GaVAizlW02RrzHtb8sD+mwrmRoWdhmeLV9Xigm1Hhq7XnDzGyR2ubZgY4
 +Xs+vN6X0GbSTxOIx5qI8qKdOoxYsw==
 =hZa8
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-10-12 14:09:31 -07:00
commit f154988a90
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/s390/include/asm/uaccess.h
View File

@ -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;

1
drivers/s390/cio/cio.h
View File

@ -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)));

7
drivers/s390/cio/css.c
View File

@ -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:

2
drivers/s390/cio/device.c
View File

@ -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;