Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp622787pxu; Wed, 7 Oct 2020 11:21:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5U34bI9IbjY41ZHqe1b2+XuckWMRgYa2iVKocE2OrsfRmCwJMNXUmPTtCIwhFDyd+xup+ X-Received: by 2002:a05:6402:2208:: with SMTP id cq8mr4784257edb.191.1602094910414; Wed, 07 Oct 2020 11:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602094910; cv=none; d=google.com; s=arc-20160816; b=xRAZUt1RCb8c89/MLo52h/Y5wZOoBnhf4zOmtRAIZ3pbimm4LBH91V8QHmQfVgkB2a hSRti0+MlqwZ4BQDKXE5cBdgIzIw8fIHjP7wU5pni3Rxn8l6pF7DaAwGvD/McnrmQykz svwLx0JLn6NZngPna21U29jng0baT5jsrQcEJY+wzjLe8RRlJ6xioUgvaZU6GqK+54i2 plb7J9Y041/jagXeCwcnWhJgCOlu/n5MjwRB9t+hq3XUVziaqlG5MmdiOEBT22OJODLk Uf7n9S8+1Y+fNvAsY2+irxGYohoc+hO5sOE2E1nKCVBh2dVEkaF7g7BH3crYXtmWTNhg pZpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:reply-to:cc:from:to :dkim-signature:date; bh=UHVeS8mhguivBrMvSGJLXZGFXdxxnZc9zuVyS2Pzp9c=; b=RB05Pw+iS/rP2zGq29/dY7wbsKyaVjkmH9Lw+p1nEShwH2L3aiQKlgpFWeGOqv7VRP CaGRcXLWYoKBoLMzkuScy9HQiqPJyM4XjSSNIdkAlLjCtPqGDr8MOrQICGIs4HY31G4Y bDSZV4gXk377yQZ7IAd788oXPrlV0OKOIfzoXaPEPGb+gnCkJiIzD7wDSKUugfcAxdjC q25hXeY4K5str0JCdLSKXqAp08HpV5oFeKUJMvPToSHDVCjaL8/VszB0LZvBY95vHBF3 DZPKSyf2LCfaiqL5Wv6H3+HtfyJmVl5brO85YUECcrxOUHr5bP1mRWSSKL2fYnxPYZuF /joA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b="S4/v6pJn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u13si1966761ejx.104.2020.10.07.11.21.26; Wed, 07 Oct 2020 11:21:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b="S4/v6pJn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728731AbgJGRtu (ORCPT + 99 others); Wed, 7 Oct 2020 13:49:50 -0400 Received: from mail-03.mail-europe.com ([91.134.188.129]:53904 "EHLO mail-03.mail-europe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728702AbgJGRtr (ORCPT ); Wed, 7 Oct 2020 13:49:47 -0400 Date: Wed, 07 Oct 2020 17:49:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1602092984; bh=UHVeS8mhguivBrMvSGJLXZGFXdxxnZc9zuVyS2Pzp9c=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=S4/v6pJnxWmm6b3o4OVMT95uMMMMa8BVP32cXqU+9/WOwb+kWV2GhV68W1+Uh1nW2 g6eVEBDXWBfNfDCB7LfsLtoa0BIc4GbsitKaEwlQoQQRrL5VpT/j7Lter2ctiqbMpK LrjzS5pG1UVk73nHCoZIME8q86Q6RDGaYiuGQSFE= To: linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Akash Asthana , Mukesh Savaliya From: Caleb Connolly Cc: ~postmarketos/upstreaming@lists.sr.ht, Caleb Connolly , linux-i2c@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: <20201007174736.292968-6-caleb@connolly.tech> In-Reply-To: <20201007174736.292968-1-caleb@connolly.tech> References: <20201007174736.292968-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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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