From patchwork Fri Jul 28 14:19:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp554688vqg; Fri, 28 Jul 2023 09:34:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlEYAc0MZwlbYI3ykqI+VnojRrtLpHfE+RRFkO4+uVJgocRbwrKzim6sWI18bLr8KHtIIHzQ X-Received: by 2002:a17:906:c:b0:98e:26ae:9b07 with SMTP id 12-20020a170906000c00b0098e26ae9b07mr1991486eja.35.1690562074460; Fri, 28 Jul 2023 09:34:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690562074; cv=none; d=google.com; s=arc-20160816; b=OE3PCDcVCBIJRmW1vB5Hm+t7+rlL7wdomk71q2vk1AksYRJFWZmznScWkuxDw7+waK I7ebtso8ryP0yZJJBkunBOXz6uPpZAi+hivy3hpZSm/7ws3JIEsBEt1p+aCwNTnwM0Hz PSeywB9/5VKy6G4ZXb56+EbJBRZeuLsI8u4ic4cHeWNmZpY/3+u3sugfvzw+ggF/dzkC Zbs7hwFPAvOegqDAfzQBz13IXL9nRhIz/yRAEoHayOZg9eIS6dTW4NBNHQ4i4cJO1lWy Oe7dIVtwsob1BmOYq9zt3GSo1Rp7e68jpVqKE3ZxRrEC1RETUXxMZqwv4VniReU2IlSP 6MFA== 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:date:subject:cc:to:from :dkim-signature; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; fh=nH7gV2gKgMw9uac/GAdm6X6lgPBcDzZTgvh8+ZFMAS0=; b=jv1lZYkIzc3z2/NSOVAN8vHZ+DfmQL07jI0ptsEGbtnbIFYdBBFNHhWEX33QqTYic+ zi+pvmRYVjNTVKzgoy9Fs2zlhh+A2QBiTSSo2MT8govbrg4+PAhZo/LTGcyiwQ1+PGaY SCPMrST3ZJmnYWL6bFATWc0bFc5jqN2jTUJVXOed78Y6417MQggUUkOt0pn2tAGkZX2z gP/UiNp3zTL4k0irFISEIIfN1yjoL7E/GQy3CUy9l+w4sMmhq+XydsUWGlqQQdRj2v4g GLIahGiR2ur/3n3DnvI1gwH7ziul3urfpDorooqF1jcaCNICUBuy9bwBLXKqIMzNIbCP Fp6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=Z2kDCPjN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h15-20020a1709063c0f00b00993ebae9929si2796371ejg.708.2023.07.28.09.34.09; Fri, 28 Jul 2023 09:34:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=Z2kDCPjN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237029AbjG1OTl (ORCPT + 99 others); Fri, 28 Jul 2023 10:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236359AbjG1OTa (ORCPT ); Fri, 28 Jul 2023 10:19:30 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F871724 for ; Fri, 28 Jul 2023 07:19:28 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fbc1218262so23179475e9.3 for ; Fri, 28 Jul 2023 07:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553967; x=1691158767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; b=Z2kDCPjN1LPXmd6+dLzNEdwFl0tm/J1OLyqOgx9lpAsei0DTcOZ9Rm1TDDyeMaVx4Q 3TANE5fPp+7puCmC7KkIkWm8DLldEvX2ymDm6Z3g86nbpRbss9VIUAsUEukjSlLf107L l07dHdPmuGB1D1F6XIuVwYaY4mWWFIc2GEC4tbe4UoB6KPJdJHyPrTjvWZkFocjJMFFh INI30gTj79+BSROU9eSzL7vz5c9j23uYGU+fMqgGmzsmpmPKqyRIc8wCFo9ra4nfADpW AujkGy8Gsl+XROI4Q/lME/cNih96/ktTbwm7FBKcBPack9lbfXjLSlqPdw+pCbBH/j+5 MFcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553967; x=1691158767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; b=IAQ8Zv+9+99a1nj2lZDBALXSnbAsB9nYgtOknWu9w/rgTCchNB34/hWsHduJcuNpIj q3ooMm51P3MHGYESU+CdcGELWS6d9ZWoNPqdVcgliNn4WAhyHynhN9GZkn1CRd0RUCJn qghlmtqTjJZiyC43IaSR/14TwnJAAW/tvamYNbWguiLQ6WhIK3AOYbfHX43Ln6GKNPWZ K1DvHDzBK96APS6IgcmyDQpOwt/kuNlaUZwMMKjgm/2cTTlU3vMe7vhGBKhyrv0BzDSB jeuoB/lPjhlU9SwuWsvnjCmSrQ7MztVyxq7lufVe1f/Q0M8zph4eC+4YNs/VoNzlZcey 9Svw== X-Gm-Message-State: ABy/qLasG3DWUity7VvH0TF9X2MBdiFAfbCEZZGRu+FpZFNZEsMEfPv6 8GGjkf10xFh/ynmvc3b1YJvGew== X-Received: by 2002:a1c:4c12:0:b0:3fd:ad65:ea8b with SMTP id z18-20020a1c4c12000000b003fdad65ea8bmr1857466wmf.12.1690553966984; Fri, 28 Jul 2023 07:19:26 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:26 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann , Krzysztof Kozlowski Subject: [PATCH v4 1/6] dt-bindings: can: tcan4x5x: Add tcan4552 and tcan4553 variants Date: Fri, 28 Jul 2023 16:19:18 +0200 Message-Id: <20230728141923.162477-2-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772682817491635882 X-GMAIL-MSGID: 1772682817491635882 These two new chips do not have state or wake pins. Signed-off-by: Markus Schneider-Pargmann Acked-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../devicetree/bindings/net/can/tcan4x5x.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt index e3501bfa22e9..170e23f0610d 100644 --- a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt +++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt @@ -4,7 +4,10 @@ Texas Instruments TCAN4x5x CAN Controller This file provides device node information for the TCAN4x5x interface contains. Required properties: - - compatible: "ti,tcan4x5x" + - compatible: + "ti,tcan4552", "ti,tcan4x5x" + "ti,tcan4553", "ti,tcan4x5x" or + "ti,tcan4x5x" - reg: 0 - #address-cells: 1 - #size-cells: 0 @@ -21,8 +24,10 @@ Optional properties: - reset-gpios: Hardwired output GPIO. If not defined then software reset. - device-state-gpios: Input GPIO that indicates if the device is in - a sleep state or if the device is active. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. + a sleep state or if the device is active. Not + available with tcan4552/4553. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Not + available with tcan4552/4553. Example: tcan4x5x: tcan4x5x@0 { From patchwork Fri Jul 28 14:19:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp511327vqg; Fri, 28 Jul 2023 08:25:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlEpuKtA17JulpBq2TOyEgKHQ6IlrmSyhIPqLLUQ5RXv0YYv7HUno/tld6AufYzcmWUKeGNM X-Received: by 2002:a17:90a:ab92:b0:268:4c01:eb56 with SMTP id n18-20020a17090aab9200b002684c01eb56mr1560371pjq.2.1690557945982; Fri, 28 Jul 2023 08:25:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690557945; cv=none; d=google.com; s=arc-20160816; b=H4a02Wsgofh6SjEmvy8BQGs/hJn7YqcgSNcU4MVwR7anOHp5Dfr/a/jGvAXtScmkZV j0WdHmzaGYZa0Q2KfYroDRuxgDC6hw7qZy37y8i6UBgIv78NaM0OicxCYbkoIhK4aupj o3dVDZIHmfDPjvFWE6Fka7Bv0tPcsG2OLLM1OdVlXisvKN5pqgRci5rb9VwShVRsOoiJ u4y959kKp90apPQS6/2TEzWmmcVaJsYB9m+0Ukdv4dsxAJ/MhmxFK8d57fDJ6Bce84RM 5zZUWsxDpSBcsRFQjYNZzhknXV6Y8RW/zwzD6/p2alfkrbTu24cBvAdQPgtTbcg62ejX ofUw== 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:date:subject:cc:to:from :dkim-signature; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=ANFvg/PYL3WXAf009IiLB/eK2iHyk0RX4o3ALS0lI5IGR1at240yFGu2mS8bk7mZlS HiDsNagAZ/tFzlqYAOYyDJBqnMi3KaEXHr9QnEczsKCRHHQxLnPiD2ap/cLb6SQQ2zvA THe2K8s++yOEF77bRPvM0z9QCcTg0tnDDco4ERPQV1pDZTlCTGB2fHmyZMYCkLyskG0D 1HwF0Yc1C2GYJA32iH19/U1FQkIw8we8YumrkZ99TFSM36IhOdkCFvvnUArOtCHdqqFc G6uZVG90ZYEL26iU0qX+hZuY4OX412u5fm+7sGl9i7/7raBBSdkCWTf9IpF/ERcfyMt9 Rc9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=eCfDNPSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q62-20020a17090a1b4400b00267f3363479si3137617pjq.57.2023.07.28.08.25.31; Fri, 28 Jul 2023 08:25:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=eCfDNPSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237038AbjG1OTo (ORCPT + 99 others); Fri, 28 Jul 2023 10:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236995AbjG1OTb (ORCPT ); Fri, 28 Jul 2023 10:19:31 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA2D3ABF for ; Fri, 28 Jul 2023 07:19:29 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fde57684d7so21975685e9.2 for ; Fri, 28 Jul 2023 07:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553968; x=1691158768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; b=eCfDNPSl7vSoyBHYmOveE8fuDlgi8ZipveyzGaTlPOC0Q2OpbSPndzkwgMyclgAda/ V6WTHb/DKo1bo2kDoa0OhOJhJ4PL5NQqBFKROAUwm4e9A72r5un/Wtm8JoiZhb4l0DE1 Vs++o1lVFVOTFyUwli6h3oJ+wHe8tIxqaUvdlCDdAphocUK+ygU+y9/PrDVt7fIk7CW7 Ms2GNLTCZO5/X4rTwRGcPHx0MtToecCzRNkrPA7W26gLn5kE3H/GoJhCCBHIbzGQIXn5 Jszk8Jw96jdQ0daJjcTZN11nmfyS6iMVC2HVfmGVY0NLDFC3N9ANmvlVym1ZBAg+pMsx d+pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553968; x=1691158768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; b=JQcwwF5S+TY6hddo1G8dhFH2BpwCe/oxgvmm6qUW4Kn7oqSzeKrdNTdZgLm38NlkEN 2gI7dlZDYqD6PHeyXrTpFOdp5xVlYMb2uUWPlaHtYwwMAMCGJJ/2INXRagQgSez+yQ4u A0AiibrCO5icBXmow0kdwgC42jAH0fdWl/gLR+B0tKJA4knfpqWAbNDIjnSadyjYGAQV rW8ejtHqVtsi92LH29ZRkSAOI2fiGJrK6lcUFZBs2lRZjSMQikTyXqn6G4QeuzwyYgaQ ovlNP8+djtYWEZrpLKay6N3Jguc2yxcW4rpnwnZEWo3MaKeC8w/kTkxhZBbzZnpZ0nX0 1PDQ== X-Gm-Message-State: ABy/qLbbhZSoYQNuWuI+oPid/UTcb8PbZ1Wa06iiumWFSH7zEI8qel00 MOWr/lgYhHRsx9xgw02aUBoPOg== X-Received: by 2002:a5d:5101:0:b0:313:f5f8:a331 with SMTP id s1-20020a5d5101000000b00313f5f8a331mr1763758wrt.34.1690553967911; Fri, 28 Jul 2023 07:19:27 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:27 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v4 2/6] can: tcan4x5x: Remove reserved register 0x814 from writable table Date: Fri, 28 Jul 2023 16:19:19 +0200 Message-Id: <20230728141923.162477-3-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772678488751449581 X-GMAIL-MSGID: 1772678488751449581 The mentioned register is not writable. It is reserved and should not be written. Fixes: 39dbb21b6a29 ("can: tcan4x5x: Specify separate read/write ranges") Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/tcan4x5x-regmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/can/m_can/tcan4x5x-regmap.c b/drivers/net/can/m_can/tcan4x5x-regmap.c index 2b218ce04e9f..fafa6daa67e6 100644 --- a/drivers/net/can/m_can/tcan4x5x-regmap.c +++ b/drivers/net/can/m_can/tcan4x5x-regmap.c @@ -95,7 +95,6 @@ static const struct regmap_range tcan4x5x_reg_table_wr_range[] = { regmap_reg_range(0x000c, 0x0010), /* Device configuration registers and Interrupt Flags*/ regmap_reg_range(0x0800, 0x080c), - regmap_reg_range(0x0814, 0x0814), regmap_reg_range(0x0820, 0x0820), regmap_reg_range(0x0830, 0x0830), /* M_CAN */ From patchwork Fri Jul 28 14:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp481956vqg; Fri, 28 Jul 2023 07:40:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlEMiYof6+WmG1v+4Gjk+aIM6/APkibdZ3LwxnGGrFebmm29/pmOHYDT3EBdbiJARtqkuYfr X-Received: by 2002:a05:6a20:3206:b0:134:d4d3:f0aa with SMTP id hl6-20020a056a20320600b00134d4d3f0aamr1754755pzc.2.1690555248385; Fri, 28 Jul 2023 07:40:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690555248; cv=none; d=google.com; s=arc-20160816; b=Jvy9mvDZEcWIqFC6ANZ1zGruck5Jc9pGSFZLl++otowQbD8BHT2aw2LxyqxPCCPCs+ mxKNmIawQ+tztoixI6jAsZiWh6B6XRZCVXxm5ghf4kEtmAdu9EANHxcXsEJ/uB7BEp6X qWBKytqpSOZhVS/0b0h+azS97lxIpi83A6ryuC/oy1BywqHaJFCr6BNW+W0Yg+Yc/O9i vc3cyt51PHz5BI3va+Gv/uwgYcqTxXCXCbwzw2Rycq6CBMoH/sjSMNLKQBAcTL8J0Tw2 S2V7NreHL56h1mwUb11ygHYSdKWqa4ILRyQRN8OX1dDkvvbmAB2MOmmTrxQRdedrA/C2 Wcqw== 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:date:subject:cc:to:from :dkim-signature; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=AoPZrD3rwukfYQ7V/nq7pIHdHrNFf+57nq1wNOtuqPabHLR0wly/vGpmHL6yr5lVhx ypf/W8TNniQoyT/v8H/sMJiX5HfJuy5TlCJHD14049X6fdSpwiDo1CyRyNAjP/HcnPs+ 5hyKOQG+43Haznrtifb3w5FK4Ogc+9y+RCNdqZe9ASJW3APn9uEdvbJl7GvCM4H3IiaK EjsdX/QRrc+AombGkWYQTDwQf9IiuLpN27CLluLl+8fXDazZpbv9e0popytlulM2iyz0 5K0Vp+bV7XPw59aD80G+aXbWcGO+ZSdJF7jy2x3jtlETkOzhxxArxI5A0uOkOz01Tlxj 4N5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=xUKyFTsS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d20-20020a056a0024d400b0067ff1a1ccbcsi3343195pfv.63.2023.07.28.07.40.34; Fri, 28 Jul 2023 07:40:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=xUKyFTsS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236561AbjG1OUy (ORCPT + 99 others); Fri, 28 Jul 2023 10:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236993AbjG1OTc (ORCPT ); Fri, 28 Jul 2023 10:19:32 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 591ABB5 for ; Fri, 28 Jul 2023 07:19:30 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31751d7d96eso2022033f8f.1 for ; Fri, 28 Jul 2023 07:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553969; x=1691158769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; b=xUKyFTsSuvcbCo9x7xJzgCo0oi8PFn1TINP4lMKpkxprTf0fSFnKI6CO/S5K6BG4U4 aoSzf21spDOrbbJxqmOzt3E2ezOIXsAIegZZXaBpZ9sTRLPzZnHfC4sH6o6QWLc8Rogr +yXcap8TxO+tUAf6McFVa8Iuk4X2x1lQaF3GXWSpz64Q4LI590V++pfeW+hUbDZ/qbCK FdP4mQBw+v/PRGEN8ni/vSzX4KVKhkasOtgZvmStCpQZ5+cI1dpATaCtFOrMzXBBOSQh 9MVaZXQDFeOApmJTmwVjSyFg6Y6Vt3Z6yE8pIAkRw08w7U+eKNQ/aROZB6Tck/bZQ/SC +Y5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553969; x=1691158769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; b=W/0vYm4m5so4JLFEqP1hhvok/PoHg8ir4A2c920NeMQJg95jLF/Y0u5XS6vjFDTxOY tZU/TMwaWlELr6BnkRDcOMFiex5vn/7B76pgd31K/2QsHzlf4Q9dh1z5fmSY/jBptFRB RdWiqTBqWIR3OwhCAyozns3nQ1djLr7hoCZIw4KhFyUWpYdUKnw6G576pm3mSv/LDBX9 SqVCJ/59FZCCWow833yuzVxs3ltUWr2gdhcis0tDwad7ln3ZwkvGu8LMjm3Y94CH6AV4 p3iE0hqfNewvf5Gg2Oz2ZEoWBva1DwE0Y7YsvVy3fqFrfHrhvZHZc5hxuNifWXP/iUqU 7/JA== X-Gm-Message-State: ABy/qLZb/Lqp+2Boet00roTHetY0jLFB7YHS/5hRN9wRl/UkV7dtaCfL 1oCTC3EUbmeBW2Qxowkn2/LoZA== X-Received: by 2002:adf:d84b:0:b0:317:568d:d69a with SMTP id k11-20020adfd84b000000b00317568dd69amr1991756wrl.11.1690553968837; Fri, 28 Jul 2023 07:19:28 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:28 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v4 3/6] can: tcan4x5x: Check size of mram configuration Date: Fri, 28 Jul 2023 16:19:20 +0200 Message-Id: <20230728141923.162477-4-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772675659879417936 X-GMAIL-MSGID: 1772675659879417936 To reduce debugging effort in case the mram is misconfigured, add this size check of the DT configuration. Currently if the mram configuration doesn't fit into the available MRAM it just overwrites other areas of the MRAM. Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/m_can.c | 16 ++++++++++++++++ drivers/net/can/m_can/m_can.h | 1 + drivers/net/can/m_can/tcan4x5x-core.c | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index c5af92bcc9c9..9210cf0705a1 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1887,6 +1887,22 @@ static int register_m_can_dev(struct net_device *dev) return register_candev(dev); } +int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size) +{ + u32 total_size; + + total_size = cdev->mcfg[MRAM_TXB].off - cdev->mcfg[MRAM_SIDF].off + + cdev->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; + if (total_size > mram_max_size) { + dev_err(cdev->dev, "Total size of mram config(%u) exceeds mram(%u)\n", + total_size, mram_max_size); + return -EINVAL; + } + + return 0; +} +EXPORT_SYMBOL_GPL(m_can_check_mram_cfg); + static void m_can_of_parse_mram(struct m_can_classdev *cdev, const u32 *mram_config_vals) { diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index a839dc71dc9b..d8150d8128e7 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -101,6 +101,7 @@ int m_can_class_register(struct m_can_classdev *cdev); void m_can_class_unregister(struct m_can_classdev *cdev); int m_can_class_get_clocks(struct m_can_classdev *cdev); int m_can_init_ram(struct m_can_classdev *priv); +int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size); int m_can_class_suspend(struct device *dev); int m_can_class_resume(struct device *dev); diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index 2342aa011647..e706518176e4 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -80,6 +80,7 @@ TCAN4X5X_MCAN_IR_RF1F) #define TCAN4X5X_MRAM_START 0x8000 +#define TCAN4X5X_MRAM_SIZE 0x800 #define TCAN4X5X_MCAN_OFFSET 0x1000 #define TCAN4X5X_CLEAR_ALL_INT 0xffffffff @@ -307,6 +308,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi) if (!mcan_class) return -ENOMEM; + ret = m_can_check_mram_cfg(mcan_class, TCAN4X5X_MRAM_SIZE); + if (ret) + goto out_m_can_class_free_dev; + priv = cdev_to_priv(mcan_class); priv->power = devm_regulator_get_optional(&spi->dev, "vsup"); From patchwork Fri Jul 28 14:19:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp555457vqg; Fri, 28 Jul 2023 09:35:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlHvUX/yETQVxRKoOPYyo63YgsTVSeM2127XvyLGdEdMV5d1HA6B6oRTF7Nza3pJ8J6pEvpz X-Received: by 2002:a05:6a00:15d3:b0:67e:bf65:ae61 with SMTP id o19-20020a056a0015d300b0067ebf65ae61mr2383875pfu.28.1690562150306; Fri, 28 Jul 2023 09:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690562150; cv=none; d=google.com; s=arc-20160816; b=Ub2RYeeGmPdnSih7XH1dED5trdP/59ioX9N5floFcJFJByIo0pj9GP5ftEehbWbY5M IxKuvXqPMSrvEzM6VupbY9yEhaPNDZfd/yvXJ9591UAj2MX/E/NFgtmh0DQFrf9l1qqc E0qO1fJV88x4RAwqOifRiltl4xbJQGmf/0ApT8ZRJAgV/+L3zRdpnVkuhKjW/Y6nqE5V EdzVBciIVghnDuDPe5sc3zdH2zLmcNab8ZCgBzfKbXb0fEFdPJSuo5NtyF02mNen6Xuc TeT2Jl2poj81GDTKWZm9Bp4tT1rWTJnHvTRCSTY0wgQ2mhM2OeAqif+VuYmJeZN6LaKG RCtA== 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:date:subject:cc:to:from :dkim-signature; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=V2G4AcVhcfwb9jvgUusGuESK1i/3zo7WR0UjXafaA8ZLyKhxGet3DdoJrSpTSe+HFS qZjSzoyXD/nGbVTJK4d/bOFa/oTHI3Ek6ydZyR1vd4cdsBJl3QT4051KKi6S06FanCe5 bZaQwdL8HfjFk/zZouT4Or8A30jGjVHYm5HYrTAOWcs810D9LzVtPBBHFQK95QS3z1oz u4jMC9aK2frXx+MCw9TvwhbtDX5o3CQ7YvNN3Pw/gf9rMsMrnloJRZE7n2+PxRkuR43j 0scTJaTE5caC28N6EGmVxjgh4edqXuHOE0LfytQVuEj+PV3BPHf5UbJGPkk/6f/7G2u6 7ZcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=c7iw206N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q1-20020a056a00084100b00686baf235easi3439306pfk.258.2023.07.28.09.35.36; Fri, 28 Jul 2023 09:35:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=c7iw206N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236982AbjG1OUv (ORCPT + 99 others); Fri, 28 Jul 2023 10:20:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237006AbjG1OTd (ORCPT ); Fri, 28 Jul 2023 10:19:33 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D7713ABA for ; Fri, 28 Jul 2023 07:19:31 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fe078dcc3aso7492695e9.2 for ; Fri, 28 Jul 2023 07:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553970; x=1691158770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; b=c7iw206NmNGXQD51dyCTfjKcxUDG5tZ5kJQD2+JAaW4M6K4d4qsYEkIRe9WdL7qtmU xJLPDNDokcsQGomwHemsFPimM7eQAPctRh4pOVsJlChdD4ayKSNiBmSQJBEyzJnc3nBL qbJOMF4ro31jIVEvfxr2c1suQK7+xMStzu8Kq5cPkiSBTqFyNHsquGLDbNwsyM3eFne0 YUtZ/LQsQjWolMIoRmkohkvQ1sa112UoCnUGsWavlCW+fQvnFXm7p4kMN7bPNSoQCv6X fZTq3/5CLSNH5tRBuCV9QVzM8VSzVhY2q/3nqZDfapW5IfIRPDRXvVDmOXYCbORy97IU 3u6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553970; x=1691158770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; b=YkyJsTaPtX7HCUsFiB7uJx18/berVpVdDmlrVIspuwnm3y3No6LRzfPtYG65mwcawG W2dyGH+v4R4c2T2CfmkNnYrLD9GEatU8iIz+yzel/GGIj2RX+CPPpgXtBzQwMjWfne8N ipE2crSbnck2LScDYH4hR57tRooYDubER3ql42kGEYFcCrqruYmOltOQmibDsxXUHkkP PLiW/9qO0VFtExZDUfrynKWNFLJ/UsOXvqsPWAMy3i6P2fZchqztD79NajO9xwQM1jfB VKymA+DYXob0UMqeMCNaSJhPEVu2NlIvlAbEJTAWCgIUPi4Y6SjE2yR4Qys5AaHEGZ1V JtaQ== X-Gm-Message-State: ABy/qLYjtAoZwCpq+uUoIpoOJr8eHJoau5TS5hfzQDFbSOzgzSIXzDyI I1m8pIzWp02LLmVH7rVgG5JLCA== X-Received: by 2002:a05:600c:20f:b0:3fe:785:ac0b with SMTP id 15-20020a05600c020f00b003fe0785ac0bmr1757369wmi.5.1690553969966; Fri, 28 Jul 2023 07:19:29 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:29 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v4 4/6] can: tcan4x5x: Rename ID registers to match datasheet Date: Fri, 28 Jul 2023 16:19:21 +0200 Message-Id: <20230728141923.162477-5-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772682897094455135 X-GMAIL-MSGID: 1772682897094455135 The datasheet calls these registers ID1 and ID2. Rename these to avoid confusion. Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/tcan4x5x-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index e706518176e4..fb9375fa20ec 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -6,8 +6,8 @@ #define TCAN4X5X_EXT_CLK_DEF 40000000 -#define TCAN4X5X_DEV_ID0 0x00 -#define TCAN4X5X_DEV_ID1 0x04 +#define TCAN4X5X_DEV_ID1 0x00 +#define TCAN4X5X_DEV_ID2 0x04 #define TCAN4X5X_REV 0x08 #define TCAN4X5X_STATUS 0x0C #define TCAN4X5X_ERROR_STATUS_MASK 0x10 From patchwork Fri Jul 28 14:19:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp516208vqg; Fri, 28 Jul 2023 08:33:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFc0z6G39Qx+RKmUKXWAAQBOkSFa+xVIeb4jcx86sMVIO77NaS57HGukyEZCLFBv4MtwuCL X-Received: by 2002:aa7:c84b:0:b0:51d:95ac:22ed with SMTP id g11-20020aa7c84b000000b0051d95ac22edmr3128723edt.1.1690558414846; Fri, 28 Jul 2023 08:33:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690558414; cv=none; d=google.com; s=arc-20160816; b=EA5MSdyAShu3kQmIKnnmU42XZLNA2Bj4uNExsy0pXTvf1+mUHZbiaXy+VZp6TT35vD 9NmANXPP3GzgjExK4JnwCOlJEbt3+AZNsLkyPBtZ4G4TZBJdIiwcfKppbsQi9GBeqOWI yKbiFi8no9VHLZojlOslLWFiKZ7Q5dRDBLYhwc4F3Crk6YDZ5zHyzwX2MO26kHNEFpJg 4KHlC5RFN3zQlamNG86knk9VPI4uXui+Tj4+pdqy8EU+1J09H6T3FvULKHUtpfkwW9by Dl5NuPp6SSOZakkeZQ/zSQnUBe5gWST3Umbv7+aOl196mGOYc6mqDGmqxhK+QXJxoU8g 9UOg== 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:date:subject:cc:to:from :dkim-signature; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=VDlE+5RlE0KGqWssx937eNXAhTwSzwpeE7KqQ0v6ved0Vwgqe4Qyr+NMmxtIUs0TFh lWxfzKZxFaTJ1gHMFHrOOZ600Itl1qymFAlQ6Hei/xLI8QtRZSRz+aCTKO4r48MzpUBW tAFnl1G32L0WNePh2+6k1O607phqSZ4weXjruQRpGmkmFzMS1klHeE+xWwCphMfsd/yX SjiQQSclMftIRo9EY7/pfi6iUKlCoMxN32uGdXAHKcMnqrF3XdEnYUooOpmHdZt9V+JN /qhuW4FZpiQa4bMGyks6/j4/dTqPbzTVCzvoFYV8HDOsVFPJabgz+fHFDLdWwet4SMGI uZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=Njf1k3Dw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p6-20020a056402074600b005225891cde6si2350528edy.531.2023.07.28.08.33.06; Fri, 28 Jul 2023 08:33:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=Njf1k3Dw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237040AbjG1OT4 (ORCPT + 99 others); Fri, 28 Jul 2023 10:19:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237023AbjG1OTg (ORCPT ); Fri, 28 Jul 2023 10:19:36 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7CC43C1D for ; Fri, 28 Jul 2023 07:19:32 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe110de3b6so3654435e9.1 for ; Fri, 28 Jul 2023 07:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553971; x=1691158771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; b=Njf1k3Dw1JnWXqAlS0uxomasFTfTjz8A0pR0+lJt22KaXxeFtfpz6KSOih9jvn3p1S tSMleG2oHnw28yFKwbG9OlMvXdPTby6C1X4HumZn6p5uRoYF5vHZ6/4FfRP5KjHSMnV7 tTbRGpVQ6lP4UjwKIL4Fc/nHQhQX1uvqCt/s2CPL3vrl5jfV0MZ0+WTB4/rtEdPBHDxt 7hqZhXfh9Zqn5gqkBZAGNWRXKEXAn6Wj7uK8yvB/94thAI3tMgPb/c1DTLF83sHk0HGd p8puJwiaYDH+cz5q4EFjXtpnPp2pyvkHCL6UMwHdh30gIJlrcI/UjYr9b+Bv3rHz2nJu aIgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553971; x=1691158771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; b=Q+Euq+aTvFCWHi8OdRLuOa6lGaErNaJZ0b8iVYEnlpesAVloPB+/w8pLSSmSEsuhw1 XyNWkOLRCjjUFlAfC2cg4bZI0DKcvS2NlKGbzL9uNhsYhZLl/AS730MHg2LCR8QVItBg E1vaCDlVzE/XMeM3FMNkYSyy7sEuYKSu6HwFVqSSlx/yqu1u3wUaLodjA9xjR7eUQob3 3vPyHgrj4y9xSqUIds3JgcxfBoHQuQQQNnz5IcsD0YmBiwzsHOregebTC0dWe2nmk5h7 mvtKSfYDdjlD2FYU5eNhkP9Gmr5aF5DItC7QYXtCFpfaghVtH1rhQRWX3dh6ufBgJp56 XZrQ== X-Gm-Message-State: ABy/qLbE7MKk7bWFMP/6cH2TM2ECGPiN3nTeGvn/r3jm/hVQx8tzXx9l Zt6HCSygpFxMJ28SFoCAyHpxLQ== X-Received: by 2002:a05:600c:b5a:b0:3fb:4064:7e22 with SMTP id k26-20020a05600c0b5a00b003fb40647e22mr2261067wmr.19.1690553970873; Fri, 28 Jul 2023 07:19:30 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:30 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v4 5/6] can: tcan4x5x: Add support for tcan4552/4553 Date: Fri, 28 Jul 2023 16:19:22 +0200 Message-Id: <20230728141923.162477-6-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772678980324782013 X-GMAIL-MSGID: 1772678980324782013 tcan4552 and tcan4553 do not have wake or state pins, so they are currently not compatible with the generic driver. The generic driver uses tcan4x5x_disable_state() and tcan4x5x_disable_wake() if the gpios are not defined. These functions use register bits that are not available in tcan4552/4553. This patch adds support by introducing version information to reflect if the chip has wake and state pins. Also the version is now checked. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/tcan4x5x-core.c | 104 ++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 14 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index fb9375fa20ec..2d329b4e4f52 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -7,6 +7,7 @@ #define TCAN4X5X_EXT_CLK_DEF 40000000 #define TCAN4X5X_DEV_ID1 0x00 +#define TCAN4X5X_DEV_ID1_TCAN 0x4e414354 /* ASCII TCAN */ #define TCAN4X5X_DEV_ID2 0x04 #define TCAN4X5X_REV 0x08 #define TCAN4X5X_STATUS 0x0C @@ -103,6 +104,37 @@ #define TCAN4X5X_WD_3_S_TIMER BIT(29) #define TCAN4X5X_WD_6_S_TIMER (BIT(28) | BIT(29)) +struct tcan4x5x_version_info { + const char *name; + u32 id2_register; + + bool has_wake_pin; + bool has_state_pin; +}; + +enum { + TCAN4552 = 0, + TCAN4553, + TCAN4X5X, +}; + +static const struct tcan4x5x_version_info tcan4x5x_versions[] = { + [TCAN4552] = { + .name = "4552", + .id2_register = 0x32353534, + }, + [TCAN4553] = { + .name = "4553", + .id2_register = 0x32353534, + }, + /* generic version with no id2_register at the end */ + [TCAN4X5X] = { + .name = "generic", + .has_wake_pin = true, + .has_state_pin = true, + }, +}; + static inline struct tcan4x5x_priv *cdev_to_priv(struct m_can_classdev *cdev) { return container_of(cdev, struct tcan4x5x_priv, cdev); @@ -254,18 +286,53 @@ static int tcan4x5x_disable_state(struct m_can_classdev *cdev) TCAN4X5X_DISABLE_INH_MSK, 0x01); } -static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) +static const struct tcan4x5x_version_info +*tcan4x5x_find_version(struct tcan4x5x_priv *priv) +{ + u32 val; + int ret; + + ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID1, &val); + if (ret) + return ERR_PTR(ret); + + if (val != TCAN4X5X_DEV_ID1_TCAN) { + dev_err(&priv->spi->dev, "Not a tcan device %x\n", val); + return ERR_PTR(-ENODEV); + } + + ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID2, &val); + if (ret) + return ERR_PTR(ret); + + for (int i = 0; i != ARRAY_SIZE(tcan4x5x_versions); ++i) { + const struct tcan4x5x_version_info *vinfo = &tcan4x5x_versions[i]; + + if (!vinfo->id2_register || val == vinfo->id2_register) { + dev_info(&priv->spi->dev, "Detected TCAN device version %s\n", + vinfo->name); + return vinfo; + } + } + + return &tcan4x5x_versions[TCAN4X5X]; +} + +static int tcan4x5x_get_gpios(struct m_can_classdev *cdev, + const struct tcan4x5x_version_info *version_info) { struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev); int ret; - tcan4x5x->device_wake_gpio = devm_gpiod_get(cdev->dev, "device-wake", - GPIOD_OUT_HIGH); - if (IS_ERR(tcan4x5x->device_wake_gpio)) { - if (PTR_ERR(tcan4x5x->device_wake_gpio) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (version_info->has_wake_pin) { + tcan4x5x->device_wake_gpio = devm_gpiod_get(cdev->dev, "device-wake", + GPIOD_OUT_HIGH); + if (IS_ERR(tcan4x5x->device_wake_gpio)) { + if (PTR_ERR(tcan4x5x->device_wake_gpio) == -EPROBE_DEFER) + return -EPROBE_DEFER; - tcan4x5x_disable_wake(cdev); + tcan4x5x_disable_wake(cdev); + } } tcan4x5x->reset_gpio = devm_gpiod_get_optional(cdev->dev, "reset", @@ -277,12 +344,14 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) if (ret) return ret; - tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev, - "device-state", - GPIOD_IN); - if (IS_ERR(tcan4x5x->device_state_gpio)) { - tcan4x5x->device_state_gpio = NULL; - tcan4x5x_disable_state(cdev); + if (version_info->has_state_pin) { + tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev, + "device-state", + GPIOD_IN); + if (IS_ERR(tcan4x5x->device_state_gpio)) { + tcan4x5x->device_state_gpio = NULL; + tcan4x5x_disable_state(cdev); + } } return 0; @@ -299,6 +368,7 @@ static struct m_can_ops tcan4x5x_ops = { static int tcan4x5x_can_probe(struct spi_device *spi) { + const struct tcan4x5x_version_info *version_info; struct tcan4x5x_priv *priv; struct m_can_classdev *mcan_class; int freq, ret; @@ -361,7 +431,13 @@ static int tcan4x5x_can_probe(struct spi_device *spi) if (ret) goto out_m_can_class_free_dev; - ret = tcan4x5x_get_gpios(mcan_class); + version_info = tcan4x5x_find_version(priv); + if (IS_ERR(version_info)) { + ret = PTR_ERR(version_info); + goto out_power; + } + + ret = tcan4x5x_get_gpios(mcan_class, version_info); if (ret) goto out_power; From patchwork Fri Jul 28 14:19:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 127734 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp555379vqg; Fri, 28 Jul 2023 09:35:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlHqq6ekyEQNEQpG1BBxJjVFPqX7ourL3lI+vJ73obYjW7hObrGxEEcXVY9J1x+jiJEiY7FA X-Received: by 2002:a17:90a:c486:b0:268:300b:ee82 with SMTP id j6-20020a17090ac48600b00268300bee82mr2233197pjt.19.1690562142507; Fri, 28 Jul 2023 09:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690562142; cv=none; d=google.com; s=arc-20160816; b=RcjPko1FynKWp9N9R3GoJNKqgKd7nk75s/BXQvw9yxAjj/ty6WcJ8H5cG8tHVBeVf3 VAIVapEe3hMndsenCcfsKiY77VKovtmp73CDlrX5HHSbMYeVqzbLsX9zGFBCGXkgd83N K5ZXfJg2UcXPLBqlvSVrHwtDpluyeWnlaVqJGJxgcON8CeqJt8LM419zxwABvLBLiYfm 7Bn0aW3x5UtbldWHVDMDeqxW2Isj9HQkJbQecppYvQU3sM2tZqN4lQm6WqLoa2YdsWdq B58C0EJcgSQcsaE7IXZSLQJZxaykCu4hc6QGZJgh4YpZ9CAszUg5ATwJWcPDP8TDgAmv u+2w== 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:date:subject:cc:to:from :dkim-signature; bh=giuTVJOpvmU1j6SJtXvrs5HolX4CC90ajhkJHQ0pjgw=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=e1Bal0Gdf0qvYeyXxIO1sLo9o/DpG6mMDWXm4Kxpha1dv9rH7T2/e1T/i9BhfiISQ7 NiDwTE+TzAddqQpnJ+f4jEPZeJV5+qU/WXzd5cGqr5IxUHFquSldWTMJgAUcz8a1wuW3 aDNpbr0IAxSeh1wx9kTaCr9atx9ssjeeU4kHKac52u4J/3H3UuHYFI4MU8u5QQ6VeiI4 MnCemRaA+w6I4eTRR44NjgMmj8mPww018DuT0pS/oemlUyR/yA8jjU42PtVgDMUe3Lu4 lqRjAzMkI6NgY6f10Zx5fvEEX/3+SfvvlMXYfJJlIKLO3zzaCWp1OcB8qfDx2eGkIZLA HieA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b="GrtnL7/f"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a17090acf0500b002681895d0d9si2622638pju.120.2023.07.28.09.35.27; Fri, 28 Jul 2023 09:35:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b="GrtnL7/f"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237070AbjG1OTw (ORCPT + 99 others); Fri, 28 Jul 2023 10:19:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237021AbjG1OTg (ORCPT ); Fri, 28 Jul 2023 10:19:36 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B1243C29 for ; Fri, 28 Jul 2023 07:19:33 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-314172bac25so2076302f8f.3 for ; Fri, 28 Jul 2023 07:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1690553972; x=1691158772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=giuTVJOpvmU1j6SJtXvrs5HolX4CC90ajhkJHQ0pjgw=; b=GrtnL7/fM1SgKRl6fxfIk1pgHVZc0FLNnQTNXNMpxFHXajx2rXR3OjONZAlZAyreCW wS0ZA56RjkbAQzV8dIXlnRLIgoKTDUHRohsAmJAfzMuVkjr5Eksf9+y24egs7pWkz1Lt t6aWo+pYRTaeAVlx7aJyRoDnL18L8ci+c0IkUlTPPt30Grj5WLBSNu/++YOtqK/AV7FR 9AujkEv8QZrtBVNklyS4rjjO33pUWkVGZt9xTwemXM3VcFrc2pmM0EiFIJ173U7bccTe df3kQRxZyHLxaduu/v6G27VyPG8qfOPqqqKdg5koRtkWD54WPU55vPL1pHXtI8X+BVMr W/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690553972; x=1691158772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=giuTVJOpvmU1j6SJtXvrs5HolX4CC90ajhkJHQ0pjgw=; b=buZPkLTO2WXDd5AvDUO7w/VAM1iCQa+kfnOPzdJr7rIJmhmwQvDNSIc6ybyJ5D/gXZ zPXHoMImWJZ46QsUyfjYhrLhZ280xDd4+Kv7P/esmFIeHJf/guLAvIuPGvRDMoGUO3j/ LTCa8aFja80AKdH4WIOCwIu8lIbdOf2x2oJSlBJCO6lGCfCdRAiHTDxWM+/WtET0zzw8 O30873haAHvzmVdpba6+7TsE70RGxKXTqcW3R8ZKlMvRUwJAmuAGSVmQgj/1BA2xWd+/ IiB4zSvraTnp3ZiwflFmOfPVAaQL42PrXpaX9C3zP9iewg7bRILuaGq7hKhSKcdDa26n Ac7Q== X-Gm-Message-State: ABy/qLbCjklCxJJQ3+n3381lavk7CgqLOsOB+Ip+DKp2B5OqzFiphJ1J uijGoIpkCHq0VIPgRO8FRO/m7w== X-Received: by 2002:a5d:6849:0:b0:313:f347:eea0 with SMTP id o9-20020a5d6849000000b00313f347eea0mr1951153wrw.60.1690553971785; Fri, 28 Jul 2023 07:19:31 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4090:a246:80e3:766f:be78:d79a:8686]) by smtp.gmail.com with ESMTPSA id l6-20020adfe586000000b0031416362e23sm5013681wrm.3.2023.07.28.07.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 07:19:31 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v4 6/6] can: tcan4x5x: Add error messages in probe Date: Fri, 28 Jul 2023 16:19:23 +0200 Message-Id: <20230728141923.162477-7-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728141923.162477-1-msp@baylibre.com> References: <20230728141923.162477-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772682889078167266 X-GMAIL-MSGID: 1772682889078167266 To be able to understand issues during probe easier, add error messages if something fails. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/tcan4x5x-core.c | 29 +++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index 2d329b4e4f52..8a4143809d33 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -402,6 +402,8 @@ static int tcan4x5x_can_probe(struct spi_device *spi) /* Sanity check */ if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) { + dev_err(&spi->dev, "Clock frequency is out of supported range %d\n", + freq); ret = -ERANGE; goto out_m_can_class_free_dev; } @@ -420,16 +422,23 @@ static int tcan4x5x_can_probe(struct spi_device *spi) /* Configure the SPI bus */ spi->bits_per_word = 8; ret = spi_setup(spi); - if (ret) + if (ret) { + dev_err(&spi->dev, "SPI setup failed %pe\n", ERR_PTR(ret)); goto out_m_can_class_free_dev; + } ret = tcan4x5x_regmap_init(priv); - if (ret) + if (ret) { + dev_err(&spi->dev, "regmap init failed %pe\n", ERR_PTR(ret)); goto out_m_can_class_free_dev; + } ret = tcan4x5x_power_enable(priv->power, 1); - if (ret) + if (ret) { + dev_err(&spi->dev, "Enabling regulator failed %pe\n", + ERR_PTR(ret)); goto out_m_can_class_free_dev; + } version_info = tcan4x5x_find_version(priv); if (IS_ERR(version_info)) { @@ -438,16 +447,24 @@ static int tcan4x5x_can_probe(struct spi_device *spi) } ret = tcan4x5x_get_gpios(mcan_class, version_info); - if (ret) + if (ret) { + dev_err(&spi->dev, "Getting gpios failed %pe\n", ERR_PTR(ret)); goto out_power; + } ret = tcan4x5x_init(mcan_class); - if (ret) + if (ret) { + dev_err(&spi->dev, "tcan initialization failed %pe\n", + ERR_PTR(ret)); goto out_power; + } ret = m_can_class_register(mcan_class); - if (ret) + if (ret) { + dev_err(&spi->dev, "Failed registering m_can device %pe\n", + ERR_PTR(ret)); goto out_power; + } netdev_info(mcan_class->net, "TCAN4X5X successfully initialized.\n"); return 0;