UBUNTU: SAUCE: i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630

We have a production-level laptop (Lenovo Yoga C630) which is exhibiting
a rather horrific bug.  When I2C HID devices are being scanned for at
boot-time the QCom Geni based I2C (Serial Engine) attempts to use DMA.
When it does, the laptop reboots and the user never sees the OS.

Attempts are being made to debug the reason for the spontaneous reboot.
No luck so far, hence the requirement for this hot-fix.  This workaround
will be removed once we have a viable fix.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index a89bfce5388eeb4075b9afbcf0a5e7f2b8ff9876..17abf60c94aeb83402473c32d2dcc9685f63b049 100644 (file)
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -355,11 +355,13 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 {
        dma_addr_t rx_dma;
        unsigned long time_left;
-       void *dma_buf;
+       void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
        size_t len = msg->len;
 
-       dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
+       if (!of_machine_is_compatible("lenovo,yoga-c630"))
+               dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
+
        if (dma_buf)
                geni_se_select_mode(se, GENI_SE_DMA);
        else
@@ -394,11 +396,13 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 {
        dma_addr_t tx_dma;
        unsigned long time_left;
-       void *dma_buf;
+       void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
        size_t len = msg->len;
 
-       dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
+       if (!of_machine_is_compatible("lenovo,yoga-c630"))
+               dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
+
        if (dma_buf)
                geni_se_select_mode(se, GENI_SE_DMA);
        else