Allow the sdhci timeout sysctl var to be set as a tunable. Also, add a

missing newline in a warning printf.
This commit is contained in:
Ian Lepore 2019-08-10 20:03:14 +00:00
parent d27bec74fe
commit 4d52f81d43
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=350847

View File

@ -481,7 +481,7 @@ sdhci_set_power(struct sdhci_slot *slot, u_char power)
DELAY(100);
}
if (!(RD1(slot, SDHCI_POWER_CONTROL) & SDHCI_POWER_ON))
slot_printf(slot, "Bus power failed to enable");
slot_printf(slot, "Bus power failed to enable\n");
if (slot->quirks & SDHCI_QUIRK_INTEL_POWER_UP_RESET) {
WR1(slot, SDHCI_POWER_CONTROL, pwr | 0x10);
@ -1128,7 +1128,7 @@ sdhci_init_slot(device_t dev, struct sdhci_slot *slot, int num)
slot->timeout = 10;
SYSCTL_ADD_INT(device_get_sysctl_ctx(slot->bus),
SYSCTL_CHILDREN(device_get_sysctl_tree(slot->bus)), OID_AUTO,
"timeout", CTLFLAG_RW, &slot->timeout, 0,
"timeout", CTLFLAG_RWTUN, &slot->timeout, 0,
"Maximum timeout for SDHCI transfers (in secs)");
TASK_INIT(&slot->card_task, 0, sdhci_card_task, slot);
TIMEOUT_TASK_INIT(taskqueue_swi_giant, &slot->card_delayed_task, 0,