evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "wil6210: Block write ioctl to the card by default"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-21 15:48:16 -08:00 • committed by Gerrit - the friendly Code Review server
commit e379f786aa
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/wireless/ath/wil6210/Kconfig
View file

@ -41,6 +41,17 @@ config WIL6210_TRACING
If unsure, say Y to make it easier to debug problems. If unsure, say Y to make it easier to debug problems.
config WIL6210_WRITE_IOCTL
bool "wil6210 write ioctl to the device"
depends on WIL6210
default n
---help---
Say Y here to allow write-access from user-space to
the device memory through ioctl. This is useful for
debugging purposes only.
If unsure, say N.
config WIL6210_PLATFORM_MSM config WIL6210_PLATFORM_MSM
bool "wil6210 MSM platform specific support" bool "wil6210 MSM platform specific support"
depends on WIL6210 depends on WIL6210

4
drivers/net/wireless/ath/wil6210/ioctl.c
View file

@ -87,10 +87,12 @@ static int wil_ioc_memio_dword(struct wil6210_priv *wil, void __user *data)
io.val = readl(a); io.val = readl(a);
need_copy = true; need_copy = true;
break; break;
#if defined(CONFIG_WIL6210_WRITE_IOCTL)
case wil_mmio_write: case wil_mmio_write:
writel(io.val, a); writel(io.val, a);
wmb(); /* make sure write propagated to HW */ wmb(); /* make sure write propagated to HW */
break; break;
#endif
default: default:
wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op); wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op);
return -EINVAL; return -EINVAL;
@ -147,6 +149,7 @@ static int wil_ioc_memio_block(struct wil6210_priv *wil, void __user *data)
goto out_free; goto out_free;
} }
break; break;
#if defined(CONFIG_WIL6210_WRITE_IOCTL)
case wil_mmio_write: case wil_mmio_write:
if (copy_from_user(block, io.block, io.size)) { if (copy_from_user(block, io.block, io.size)) {
rc = -EFAULT; rc = -EFAULT;
@ -156,6 +159,7 @@ static int wil_ioc_memio_block(struct wil6210_priv *wil, void __user *data)
wmb(); /* make sure write propagated to HW */ wmb(); /* make sure write propagated to HW */
wil_hex_dump_ioctl("Write ", block, io.size); wil_hex_dump_ioctl("Write ", block, io.size);
break; break;
#endif
default: default:
wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op); wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op);
rc = -EINVAL; rc = -EINVAL;