Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by mail-b.sr.ht (Postfix) with ESMTPS id 03E3DFF0D1 for <~postmarketos/upstreaming@lists.sr.ht>; Wed, 7 Oct 2020 17:20:55 +0000 (UTC) Authentication-Results: mail-b.sr.ht; dkim=pass (1024-bit key) header.d=connolly.tech header.i=@connolly.tech header.b=V2BIlimC Date: Wed, 07 Oct 2020 17:20:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1602091253; bh=UHVeS8mhguivBrMvSGJLXZGFXdxxnZc9zuVyS2Pzp9c=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=V2BIlimCjeDjKFKCRlR4nwVZwK4a/wJwL5PzhTUiKr0vG0V8VpBtvfRGxTmbs/lWw NuLPb0dx7zykJWJhaW4k4HpeYLvF268FgLvZ7LWdOWo4SUOlj9sfwCjhTwqF0kG6VG b5QBD2n3vG3wOMrfE3LvGAMrpdXe+1vhrrN0kYUk= To: Akash Asthana , Mukesh Savaliya , Andy Gross , Bjorn Andersson From: Caleb Connolly Cc: ~postmarketos/upstreaming@lists.sr.ht, Caleb Connolly , linux-i2c@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Caleb Connolly Subject: [PATCH 5/5] i2c: geni: sdm845: dont perform DMA for the oneplus6 Message-ID: <20201007171807.285298-6-caleb@connolly.tech> In-Reply-To: <20201007171807.285298-1-caleb@connolly.tech> References: <20201007171807.285298-1-caleb@connolly.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch The OnePlus 6/T has the same issues as the c630 causing a crash when DMA is used for i2c, so disable it. https://patchwork.kernel.org/patch/11133827/ Signed-off-by: Caleb Connolly --- drivers/i2c/busses/i2c-qcom-geni.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qc= om-geni.c index dead5db3315a..50a0674a6553 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -358,7 +358,8 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2= c, struct i2c_msg *msg, =09struct geni_se *se =3D &gi2c->se; =09size_t len =3D msg->len; =20 -=09if (!of_machine_is_compatible("lenovo,yoga-c630")) +=09if (!of_machine_is_compatible("lenovo,yoga-c630") && +=09 !of_machine_is_compatible("oneplus,oneplus6")) =09=09dma_buf =3D i2c_get_dma_safe_msg_buf(msg, 32); =20 =09if (dma_buf) @@ -400,7 +401,8 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2= c, struct i2c_msg *msg, =09struct geni_se *se =3D &gi2c->se; =09size_t len =3D msg->len; =20 -=09if (!of_machine_is_compatible("lenovo,yoga-c630")) +=09if (!of_machine_is_compatible("lenovo,yoga-c630") && +=09 !of_machine_is_compatible("oneplus,oneplus6")) =09=09dma_buf =3D i2c_get_dma_safe_msg_buf(msg, 32); =20 =09if (dma_buf) --=20 2.28.0