From bf9b932f6ae506baf5b79c8407089448ed77fc56 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Sun, 17 Dec 2017 16:15:03 +0100 Subject: [PATCH] ASUS Tinkerboard: Stupid reboot patch This patch is ugly as shit and will be reworked when possible. Meanwhile, this fixes an issue with the ASUS Tinkerboard which cannot reboot correctly. The issue is that the MMC hardware is shutdown during the reboot phase and is not powered again after the power cycle, leading to a dead board awaiting a hard power cycle. Signed-off-by: Myy Miouyouyou --- drivers/mmc/host/dw_mmc-rockchip.c | 24 ++++++++++++++++++++++++ drivers/mmc/host/dw_mmc.c | 28 ++++++++++++++++++++++++++++ include/linux/reboot.h | 2 ++ kernel/reboot.c | 1 + 4 files changed, 55 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index a3f1c2b30..52c13733f 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -14,10 +14,12 @@ #include #include #include +#include // Stupid Tinkerboard Hack #include #include "dw_mmc.h" #include "dw_mmc-pltfm.h" +#include "../core/core.h" // Stupid Tinkerboard Hack #define RK3288_CLKGEN_DIV 2 @@ -365,6 +367,27 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) return 0; } +/* Stupid Tinkerboard Hack */ +static void dw_mci_rockchip_platfm_shutdown(struct platform_device *pdev) +{ + struct dw_mci *host = platform_get_drvdata(pdev); + struct mmc_host *mmc = host->slot->mmc; + int ret; + + if(of_machine_is_compatible("asus,rk3288-tinker")){ + + mmc_power_off(mmc); + + mdelay(20); + + if (!IS_ERR(mmc->supply.vmmc)) + ret = regulator_enable(mmc->supply.vmmc); + + if (!IS_ERR(mmc->supply.vqmmc)) + regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000); + } +} + static int dw_mci_rockchip_remove(struct platform_device *pdev) { pm_runtime_get_sync(&pdev->dev); @@ -385,6 +408,7 @@ static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = { static struct platform_driver dw_mci_rockchip_pltfm_driver = { .probe = dw_mci_rockchip_probe, .remove = dw_mci_rockchip_remove, + .shutdown = dw_mci_rockchip_platfm_shutdown, // Stupid Tinkerboard Hack .driver = { .name = "dwmmc_rockchip", .of_match_table = dw_mci_rockchip_match, diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 0aa39975f..70f7ce21b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -39,8 +39,10 @@ #include #include #include +#include // Stupid Tinkerboard Hack #include "dw_mmc.h" +#include "../core/core.h" // Stupid Tinkerboard Hack /* Common flag combinations */ #define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DRTO | SDMMC_INT_DCRC | \ @@ -2778,6 +2780,29 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } +/* Stupid Tinkerboard Hack */ +struct dw_mci *mSdhost; +void setmmcEmergency() { + struct mmc_host *mmc; + int ret; + + printk(KERN_ERR "Emergency route taken.\n"); + if (of_machine_is_compatible("asus,rk3288-tinker")) { + mmc = mSdhost->slot->mmc; + + mmc_power_off(mmc); + + mdelay(20); + + if (!IS_ERR(mmc->supply.vmmc)) + ret = regulator_enable(mmc->supply.vmmc); + + if (!IS_ERR(mmc->supply.vqmmc)) + regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000); + } +} +EXPORT_SYMBOL(setmmcEmergency); + static int dw_mci_init_slot(struct dw_mci *host) { struct mmc_host *mmc; @@ -2809,6 +2834,9 @@ static int dw_mci_init_slot(struct dw_mci *host) mmc->f_max = freq[1]; } + /* Stupid Tinkerboard Hack */ + if (of_find_property(host->dev->of_node, "supports-sd", NULL)) + mSdhost = host; /*if there are external regulators, get them*/ ret = mmc_regulator_get_supply(mmc); if (ret) diff --git a/include/linux/reboot.h b/include/linux/reboot.h index e63799a6e..057d3ce0c 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -77,6 +77,8 @@ extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN]; extern void orderly_poweroff(bool force); extern void orderly_reboot(void); +/* Stupid Tinkerboard Hack */ +extern void setmmcEmergency(void); /* * Emergency restart, callable from an interrupt handler. diff --git a/kernel/reboot.c b/kernel/reboot.c index e4ced883d..c8e678ce6 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -61,6 +61,7 @@ void (*pm_power_off_prepare)(void); void emergency_restart(void) { kmsg_dump(KMSG_DUMP_EMERG); + setmmcEmergency(); // Stupid Tinkerboard Hack machine_emergency_restart(); } EXPORT_SYMBOL_GPL(emergency_restart); -- 2.14.1