summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvisa <visa@openbsd.org>2017-07-10 16:17:51 +0000
committervisa <visa@openbsd.org>2017-07-10 16:17:51 +0000
commit7aa7a19ae6b74e9a989aa6ac97d29c4973806c23 (patch)
treed975245fa2e8a035d404b31b88cb88a574f95f10
parentSwitch sample path for black/whitelist files from /var/mail (which is meant to (diff)
downloadwireguard-openbsd-7aa7a19ae6b74e9a989aa6ac97d29c4973806c23.tar.xz
wireguard-openbsd-7aa7a19ae6b74e9a989aa6ac97d29c4973806c23.zip
Keep refusing SDIO initialization. The driver cannot work properly
with SDIO because it does not handle card interrupts.
-rw-r--r--sys/arch/octeon/dev/octmmc.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/arch/octeon/dev/octmmc.c b/sys/arch/octeon/dev/octmmc.c
index 56cac9d9be7..bbcaf818ef7 100644
--- a/sys/arch/octeon/dev/octmmc.c
+++ b/sys/arch/octeon/dev/octmmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: octmmc.c,v 1.3 2017/07/07 14:49:04 visa Exp $ */
+/* $OpenBSD: octmmc.c,v 1.4 2017/07/10 16:17:51 visa Exp $ */
/*
* Copyright (c) 2016, 2017 Visa Hankala
@@ -495,6 +495,15 @@ octmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
struct octmmc_bus *bus = sch;
/*
+ * Refuse SDIO probe. Proper SDIO operation is not possible
+ * because of a lack of card interrupt handling.
+ */
+ if (cmd->c_opcode == SD_IO_SEND_OP_COND) {
+ cmd->c_error = ENOTSUP;
+ return;
+ }
+
+ /*
* The DMA mode can only do data block transfers. Other commands have
* to use the PIO mode. Single-block transfers can use PIO because
* it has low setup overhead.