Merge "wil6210: Block write ioctl to the card by default" (e379f786) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/ath/wil6210/Kconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,17 @@ config WIL6210_TRACING

		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
		bool "wil6210 MSM platform specific support"
		depends on WIL6210

+4 −0

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