From nobody Wed Sep 10 02:01:30 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A50D12F7AD7; Mon, 8 Sep 2025 12:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333387; cv=none; b=N55FTTZhe0/olNKex3ZVn19oI4EsjGqEO6elP+wTeqmGzmRJoAe/QVy8H2MOlkSiFXB7p+OVUFsCrRNb5uD5SB9AGp9ICal/+AKqAj14MeKe11AM+ZuO+/nXmPIadtnAjov238/vOXr/PVGS16jL43cxnS1YA+3Iw+FKYcO75oA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333387; c=relaxed/simple; bh=GnezyDOYCJRZca65lNyJwAKwwlfZn4nyBrp5UBi3Qpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tYzRWjA0wA8RNoPvIxxYAIBeGw6Tmdv1Ujr/blmr0LfzFkyjsYZIQpnhxbfU1Otv/RKQhh7hEdMmaz7RrO9XACW3W4Njp9HxQyfvLJq5rwSDiQbblv4yvDlgT56LJQrkqWyNGidgOJPeAaXQT4UpRWka1cVB8qzbA3n9xIzrr8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M6hgffGQ; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M6hgffGQ" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-45deb61a28bso2244775e9.3; Mon, 08 Sep 2025 05:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757333384; x=1757938184; darn=vger.kernel.org; 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=WjDJCgUPYhMpaeFMs9pivkNfWSa+B+oIW/kZQ7mHCuM=; b=M6hgffGQ0tJiGsEHjv5F1B7ZgZZMnDOvp6Mf0h2MuPv3XSaFeAFdG3GI2GS5p5zLP5 wJLrLgwdCk8kaAm6Pq2/KoTVipRJp5EzOh/TOwFJVOsKAjMt5j1UmL5R+A8LORroSZje WLUDuioH5hGyAtu/CgrEnr3Wq3Gxe/RoR4VHdWy5IX2p3zdQwy1/7kR3KPQctYtOkU4+ /rlaQRkkUddO/1fdio7gMsg5gvAyApETiOFVsss0CvEY9IPtAkj8zLlRvKpPnnbbuZO/ FOQikcbKKqgM83KA7bBa/6NB/eDglNjiW1v0pl/5NKqKkdyhaIrs8jNq3e5h2Cxs1nnP r1fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757333384; x=1757938184; 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=WjDJCgUPYhMpaeFMs9pivkNfWSa+B+oIW/kZQ7mHCuM=; b=Xc5rI1dB6X3o7qonwf3caNkIdXKbcSuCn22vN2PBgU4tPM+BwM1VMMqTDcYGC9Xwxj Vdi8+bqHEncxyUPQqBcMtIKZVJiGJ5J7w06ow9qwvpgjn2fUJ+SJzJTA9guf/cxwjQ2g Ltu/JmuhvPjSHHTh1n3HgnLepWevb4A2VV7+HSOIfY4b8A5AS6Tl3CyJzqVpUg3bk/d7 /gt58KmiY+xClJojq44nxDgMYeyoiaVaGqYGhmD5mc7E7xN9QPeFilCs9Ij7aiSokUVz HnIhXFZ+QAabGA5mbLotgsWl9oQPHcuOBsM+o5xDMyNsGjyVSifJ0WhRnNhRL+dIGGUs EIIw== X-Forwarded-Encrypted: i=1; AJvYcCVq/zKHHZPxbfQnrwOlhO5orm4BrvANYe1BND5NAS9iG1gNcQVU3l2DSMBWAnZmDiBmcGXqm5X3P9yd49RW@vger.kernel.org, AJvYcCWGQdBp3/g3G/wEf4Iyi5ni9olMH05ykydQnqExocE+ZQbzKRHuah9nFeuORUT8LbkgqVXKq9o0GfY=@vger.kernel.org, AJvYcCX9tyrCZ04elzzSy91Ot5HkfrNLiA220IuunRE6RD7xnCOTmDfGvPNEVQzxaBpL9PmeOOItu8Q8sZO5j8/d1Lxmsp8=@vger.kernel.org X-Gm-Message-State: AOJu0YyMza7BqJlCGyuwJaH8Ryg+coVMNfQsNZNc+DXzl4GQDcbfnWt1 93I/mtELoFBpP5qMUvdRXAMUCx1E+O/cr2sm4Yd84Fsisli0voNkAI0d X-Gm-Gg: ASbGnctdXEFoMrQA0GPC58C03IgRlo0XkARJ0FT/VOL/37NGkD9dOkl5WPUDQxKkqeH /a2fKVq59dhAgVXYTjk9aeYqlzkgCz78fgOAbj6MN3s4JKT3q7PPI7JCy/leRcc84pErWMPEhEd IlBxdqfUvaz6GnvVZqyn1GRdosSMA5gi3JDiYjCII02IYxHlhOXJ899mcArhS5846m4Vd5ITB7x Y7mBaf62dGvUBeKnZd10vba8/C0NtnNGosvTcttTky8jFbZQGvVuYto/8QgBMmD5GO5vUidZx+w hCcp09qzK/ZD4Rq+u0irFytToGYbAxK9sY5ovmNx6wbh5xlITosJy93b+zbFmM35hrbfuaUTsrU hcdjSt4eU6pxQLGpIcVGH7BJMQjEM5JTKK6xdf85Xt/8ziPv734lSLJIgeJIEePnnVDsK2raPGu 9vPg== X-Google-Smtp-Source: AGHT+IHPhZJ23Azpt5od3KHGgCdB3KVpfVEYcYDvOL6LWEO3NNMSIU4fp2k8TJrukTB/+wrW/htsuw== X-Received: by 2002:a05:600c:548a:b0:458:bfb1:1fb6 with SMTP id 5b1f17b1804b1-45ddde6a471mr53818795e9.2.1757333383710; Mon, 08 Sep 2025 05:09:43 -0700 (PDT) Received: from biju.lan (host86-139-30-37.range86-139.btcentralplus.com. [86.139.30.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e543e9f444sm9646415f8f.60.2025.09.08.05.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 05:09:43 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Marc Kleine-Budde , Vincent Mailhol , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , linux-can@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v3 1/4] can: rcar_canfd: Update bit rate constants for RZ/G3E and R-Car Gen4 Date: Mon, 8 Sep 2025 13:09:30 +0100 Message-ID: <20250908120940.147196-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> References: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das The calculation formula for nominal bit rate of classical CAN is same as that of nominal bit rate of CANFD on the RZ/G3E and R-Car Gen4 SoCs compared to other SoCs. Update nominal bit rate constants. Signed-off-by: Biju Das --- v2->v3: * Replaced "shared_bittiming"->"shared_can_regs" as it is same for RZ/G3E and R-Car Gen4. * Dropped the tags as it is new change. * Updated commit header and description. v1->v2: * No change. --- drivers/net/can/rcar/rcar_canfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index b3c8c592fb0e..4185fc5b4a70 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1912,7 +1912,10 @@ static int rcar_canfd_channel_probe(struct rcar_canf= d_global *gpriv, u32 ch, priv->can.fd.do_get_auto_tdcv =3D rcar_canfd_get_auto_tdcv; } else { /* Controller starts in Classical CAN only mode */ - priv->can.bittiming_const =3D &rcar_canfd_bittiming_const; + if (gpriv->info->shared_can_regs) + priv->can.bittiming_const =3D gpriv->info->nom_bittiming; + else + priv->can.bittiming_const =3D &rcar_canfd_bittiming_const; priv->can.ctrlmode_supported =3D CAN_CTRLMODE_BERR_REPORTING; } =20 --=20 2.43.0 From nobody Wed Sep 10 02:01:30 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39D832F3C1A; Mon, 8 Sep 2025 12:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333388; cv=none; b=qcNKZjumiDygF9Pf5SoqhjaeUS3KVFxFWFwcKLr0+Ci0qDhf3ECvK5FHmQmwhDDVVJePKMXAew6z0GvBDV0P+SSG0a2SwRh74Q6BepXmRIL0RPvH7fhRvQu6SbensAy2bpJ7Uf/8xeMWZHj+C8AiB6nkBlzC5hdPXw2AmrEL/C8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333388; c=relaxed/simple; bh=H+xjditBxyX2hQRMgA6E4NAbCPYslBQUnZwDsyA/O/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e8/+aQcrhEAK1PclIgCqRNLKkm2X5ntAliO3A3VmwUBdBwyaaCaxAhXch75Myx+rUgl5IpbK9KOcm9GnczCzSSCSv6BOmhDVp3viTi5fSxa73JwcBXHhLfr6YQS0fTx6QUX1rv7EZ/70NRXGZRRJCC/NrETgphH+YNsp9mrLZhk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=emtoAOZt; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="emtoAOZt" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3d3ff4a4d6fso2637362f8f.0; Mon, 08 Sep 2025 05:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757333384; x=1757938184; darn=vger.kernel.org; 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=ik+xsJQUxPVH2IFlCRiMPMQeH7RbsU5tb884vTQlh7w=; b=emtoAOZtQTC1sM10L6cHnXZkxXdaUw2nLcrwwOrL0GBXkKjED6UOxxvtorHsKG0ZaH 4LZa9RdVpyLj4ygOgKaTB057UugCdKzjejmqHsUQGQDRhgD8C7BEwjyLOV0mMMhyWWeE GN3AmE33gNX3tKJqpiAm01LDheJSdxTxwjRVrk59Qs45EEUvZi4Z8rK6tZGpGc/+B3uW uTp5MvA3rz+DZHo+2+y8d7MyFMxLF1ncPg9+fs0d8pQikhHhRCsN09hPMKVfROqRhmW6 jAZYgRWZVKo8eYHsdo7ImT6wAtg90Lour0b/SC26MoRLAbXyRKXxgc4r7bK49lKu34+1 zP0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757333384; x=1757938184; 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=ik+xsJQUxPVH2IFlCRiMPMQeH7RbsU5tb884vTQlh7w=; b=D/hht+9hEiwKyoXe6f7WvajtO2Y29bpLY0FdiTj/RpJ0f+5LXexlV5dnu20FrDNm4h 4a5R5YqlDt+RMUHMZDwa6eLYwLU0hv27fZXmU51xBo5Xykzcala7GTMkDSZfj2gOrtwN r1a09NpdT8A06hB2YaX4QkkdVAF/x3vhsnjkJUsjKi4EcygNMi9l06K5g7B10l+P2no/ 3acouNkO3DJQaKoCVtEu+ZTMEe7u81YAjSwq61lDPRtkF7jk1AQim7pP8FzpkZzlDEy4 FNOnnCTwNmt4yAVfxBxXtpkcvlpZ3Dlw1o7DMHF330mc1soYk4jXsEkcx9C5MWYc3F3W LzoQ== X-Forwarded-Encrypted: i=1; AJvYcCVbuCIMp590HcwZDkGXTyiy1456/3B97XZqZtMn5QcEUf+TxOGKLts8Z+FMSlpVEHPmv4zwBooF5VA=@vger.kernel.org, AJvYcCWQO6hmtuzqKE/mLwRvXacyK1SaV1Q6FwSjNOg1/KzbrWASBzTr2ZH+kv0kv3GULQU1cvuJFv79IEM36zW8@vger.kernel.org, AJvYcCWqu3HlK3xQxMBKLfF5ON3LQctUbz1nNg0eV0dFghl6ZoSFjw5jsGPw3h7OWJS46Eqv3Pg/Ce1H4Zonocx6qPJ/T00=@vger.kernel.org X-Gm-Message-State: AOJu0YwN5oFvd2RI15aoBtXC4vqRe2WWgN26ws9nTWJG8bYjF+IUemMP CNzX73cvwtA0Ugh3zgNpVlSxnOKK9wAY7g3txY5pt+Yq+4uHZO4BUsOR/c/kmg== X-Gm-Gg: ASbGncvgHVOA/EmoCpZHDnG68PZlonk2GS7opQVTQAVHmX1btGOGrR6RT8kQfeJZcij PTK8qrjA5fkPOqUsQBf+P+V3QpBe4biK1tTlUj0QrtS8FL+rvUjShyA1Jg9WnrXRzlwnsWbuC81 neyG3V7snsKs5ULfZfhvJkbEqZ2tSTE6T1ajYaZjir/k/SoSvX9IU6S53TKHH103eijccpfFFOe 0BB+ltGimVVNpuJ02dfxV/Z6nVJKBtjS13X2LbNtJ2ElSQPA37EZJ4C/lIzm5q/jN4G12GD+jl5 b8xlnhZTs0+qQpRKN3pPceQuvKBAy2mKHg2z/HUeaTuWCLnIXQezO1R1p9yNWyX/umEqJMxyLy1 dmLdGIyi/kDcLtE8mkI1Mene5PyFvlxxxEheU4KYERAjqIZtvIFafF3IVV4DO8n6co2vR3CXNUo dMDHyeM8zmlcbr X-Google-Smtp-Source: AGHT+IGpW8ESARyCfwP9h6v7ngjtx+uxf0PWHjyKJ9f1PknuFkdZSpc/6I5FV0Y5AQUtYUMJum6N7A== X-Received: by 2002:a05:6000:2906:b0:3dc:45be:4a7f with SMTP id ffacd0b85a97d-3e643b18ccfmr3946799f8f.57.1757333384356; Mon, 08 Sep 2025 05:09:44 -0700 (PDT) Received: from biju.lan (host86-139-30-37.range86-139.btcentralplus.com. [86.139.30.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e543e9f444sm9646415f8f.60.2025.09.08.05.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 05:09:43 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Marc Kleine-Budde , Vincent Mailhol , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , linux-can@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v3 2/4] can: rcar_canfd: Update RCANFD_CFG_* macros Date: Mon, 8 Sep 2025 13:09:31 +0100 Message-ID: <20250908120940.147196-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> References: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Update RCANFD_CFG_* macros to give a meaning to the magic number using GENMASK macro and extract the values using FIELD_PREP macro. Reviewed-by: Geert Uytterhoeven Signed-off-by: Biju Das --- v2->v3: * Added Rb tag from Geert. * Dropped _MASK suffix from RCANFD_CFG_* macros. v1->v2: * Moved from patch#4 to patch#2. * Updated commit header and description. * Kept RCANFD_CFG* macro definitions to give a meaning to the magic number using GENMASK macro and used FIELD_PREP to extract value. --- drivers/net/can/rcar/rcar_canfd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index 4185fc5b4a70..8d0d0825cb54 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -103,10 +103,10 @@ /* Channel register bits */ =20 /* RSCFDnCmCFG - Classical CAN only */ -#define RCANFD_CFG_SJW(x) (((x) & 0x3) << 24) -#define RCANFD_CFG_TSEG2(x) (((x) & 0x7) << 20) -#define RCANFD_CFG_TSEG1(x) (((x) & 0xf) << 16) -#define RCANFD_CFG_BRP(x) (((x) & 0x3ff) << 0) +#define RCANFD_CFG_SJW GENMASK(25, 24) +#define RCANFD_CFG_TSEG2 GENMASK(22, 20) +#define RCANFD_CFG_TSEG1 GENMASK(19, 16) +#define RCANFD_CFG_BRP GENMASK(9, 0) =20 /* RSCFDnCFDCmNCFG - CAN FD only */ #define RCANFD_NCFG_NTSEG2(gpriv, x) \ @@ -1411,8 +1411,8 @@ static void rcar_canfd_set_bittiming(struct net_devic= e *ndev) cfg =3D (RCANFD_NCFG_NTSEG1(gpriv, tseg1) | RCANFD_NCFG_NBRP(brp) | RCANFD_NCFG_NSJW(gpriv, sjw) | RCANFD_NCFG_NTSEG2(gpriv, tseg2)); } else { - cfg =3D (RCANFD_CFG_TSEG1(tseg1) | RCANFD_CFG_BRP(brp) | - RCANFD_CFG_SJW(sjw) | RCANFD_CFG_TSEG2(tseg2)); + cfg =3D FIELD_PREP(RCANFD_CFG_TSEG1, tseg1) | FIELD_PREP(RCANFD_CFG_BRP,= brp) | + FIELD_PREP(RCANFD_CFG_SJW, sjw) | FIELD_PREP(RCANFD_CFG_TSEG2, tse= g2); } =20 rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg); --=20 2.43.0 From nobody Wed Sep 10 02:01:30 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3142E2FB097; Mon, 8 Sep 2025 12:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333389; cv=none; b=Q5cN/IMomijoLiTn2yG88aTuh0aKVYoYjpOV2l9Y26u5Icl+M9fZsQYbjqnm1qQw8fsT3lv4h0PZaiJuJlKPcApEb8oBp7aVsFrQj5pXh3yXFhyvViJOxXGNQByBvy5l3eeLIfa+/8uuzD5pWODkfV/CN9JR4e7xV7+H4cgJrF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333389; c=relaxed/simple; bh=mqk8Q2Odh2u2gjgbz+kLIXaUNEL0ZU5RfR01wro3VkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kKQqpFycMv2XRuUMy3CxqO7hB03ZY3YbD/UNmvQ8P9Yv09sVgUAoIEYXiXB11lKM2wWpktjScqsDTFvWWKZhfVDA619IPxn4PJuUQdbQXyztQKNEQTVVyVA+81mlPaJDL/ZeKzuBfsKq3pbFYvcWLNOR7w3HArYYB39KbmzpKCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DmxJa18W; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DmxJa18W" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-45dd5e24d16so28641795e9.3; Mon, 08 Sep 2025 05:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757333385; x=1757938185; darn=vger.kernel.org; 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=hVY7ik/srlY4hGPr/txfexWdJzrhhLv66TgN0CEbGxI=; b=DmxJa18WgmQ/KqmxVS6cTeWsj4u2EhNOOXVLZMmMWPZHBGE/eYS54ptAaHR0wQeogR f22eUaB+YPEt3a/iOohafF5QspCrrdLqsW1lTJwOSD0Yzz/ONtD7VFa3uIsk14C9xpaz RyemuhZskda6fLn/vongh4tkbHA6kCc0AR09bHPkmetRlvPjIceIPrKhZKwrK/iLtNm0 fCmQBCUYVZmesea+6hUwMzSY4Tk+hrmFzmg4ov2AkYOE/wad26QOcgEMvnJHqb8B6KKU l8yaVGL8fpKVR3efG2cfdtDaYv+hXqay5R7q0PLGI9W5ki8+w60KV7Y6UflBFRRieeg5 gJDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757333385; x=1757938185; 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=hVY7ik/srlY4hGPr/txfexWdJzrhhLv66TgN0CEbGxI=; b=fsOaa1k//0L7WQPFh4QEBfWJGHEjIHDCUyfl724NFPyR8qP4uXC22xq+yO7Qsavv5O 1Ys88W7+mavcxFkDwu6aoKKStYhj5Ywc0S/p3NXQb1L3tQ+UTfJZUTpQ4tTZNkvgsxon oZQ0VRxm1Fj1DcH+XkD6quFODyS/8CmA4bgcIjLfi14JlAF3TMGQpDwie1jWnuL/f2uU u65OLmf97JN5TSmRdzzLiheCMRxXXxAFAJiLMfJp/QLuYVtN5MhuEToQdDQGB4CNafCN AAS+DmCBsnyMEnqu3mSDqV0FSDZEjQRQNxtjkhiC39Z5OGdCo3T7Mpi8wyAbAOxkH+em foFA== X-Forwarded-Encrypted: i=1; AJvYcCVN520TxNxH+gr9FGjCQOCJ3YdRU0P2skD0j+KnY25DfvESJ8qjNtrPQOpIV5ub7RrlHzQhsobsGURjmV2h@vger.kernel.org, AJvYcCW4497FSJ7Ev173tNf3IN2G8bvsGTJsWA+bTl8OBlca7CIahMFWgjxMftov0BJ2TyudmolThoNGrQKhko4p4GzHLT4=@vger.kernel.org, AJvYcCWXfsNm+qRVJ2npB1HMdgmwapQi42y5vi//OGG0dWzR8LY6XSSGGpkfE6l2F9rerzrwwmgk2a8eHbA=@vger.kernel.org X-Gm-Message-State: AOJu0YzK3o5ibdlckdt4VBhIf3mXtYt7DPjN3u56vmBADAlh+GFxF+ey RSOOEbK0/jzltNzQvFajOWLToFSU96doskrTjBiMCiWc9yKeWbQc3MCi X-Gm-Gg: ASbGncuqEwsy2UhxO0qOEDTfofhYwbMmFTnnxLjKG9s29jqv1GhygWA/YvBpRD7wbo7 gODHQPRj4R3mCaceo/UaEHkTCtvCmDUL374GPDBZc6BjGwRAOOgujjMk6upAFistxKKJxIcUCyt z6ZgzG1S7PMH2SdcfdcHSL3VoFww4vYTxuYGUCLL090kNFbc08IyINoRp+VELhBg+X24e8CZNh+ r4OwM1te6N8F/VRv28YBY2lsb5Y0pIWmrX2g8Kn3FZH07rDFpQmoBZLBWAg8fhYyHb6RegwNC15 oMfMP5APPMBxKXSJaIiRH81FCKwm7xlQqLABkf6/GeaTk1psbdL36ijNNIzvuzVeyl789toYkMD NtCSheBznJPP/pnkSSdYpXei1+2C8s6+M1ZBu5cUfrxvEcQ5AOhHoknHdkSNYuHr5cDYjf/CdGt bR1w== X-Google-Smtp-Source: AGHT+IG47Gyw8GXuNhG9ijn02W4i1SBoZcoXFZ0ELFdZMF2suDHpY6rfOO5GuCPS15eTAPJ1NLbiXw== X-Received: by 2002:a05:600c:4711:b0:45b:4282:7b60 with SMTP id 5b1f17b1804b1-45dddf01a4fmr56477305e9.34.1757333385207; Mon, 08 Sep 2025 05:09:45 -0700 (PDT) Received: from biju.lan (host86-139-30-37.range86-139.btcentralplus.com. [86.139.30.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e543e9f444sm9646415f8f.60.2025.09.08.05.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 05:09:44 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Marc Kleine-Budde , Vincent Mailhol , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , linux-can@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v3 3/4] can: rcar_canfd: Simplify nominal bit rate config Date: Mon, 8 Sep 2025 13:09:32 +0100 Message-ID: <20250908120940.147196-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> References: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Introduce rcar_canfd_compute_nominal_bit_rate_cfg() for simplifying nominal bit rate configuration by replacing function-like macros. Reviewed-by: Geert Uytterhoeven Signed-off-by: Biju Das --- v2->v3: * Added Rb tag from Geert. * Dropped _MASK suffix from RCANFD_NCFG_NBRP_MASK macro. * Followed the order as used in struct can_bittiming{_const} for easy maintenance. v1->v2: * Split from patch#3 for computing nominal bit rate config separate. * Updated rcar_canfd_compute_nominal_bit_rate_cfg() to handle nominal bit rate configuration for both classical CAN and CANFD. * Replaced RCANFD_NCFG_NBRP->RCANFD_NCFG_NBRP_MASK and used FIELD_PREP to extract value. --- drivers/net/can/rcar/rcar_canfd.c | 43 +++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index 8d0d0825cb54..99719c84f452 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -109,16 +109,7 @@ #define RCANFD_CFG_BRP GENMASK(9, 0) =20 /* RSCFDnCFDCmNCFG - CAN FD only */ -#define RCANFD_NCFG_NTSEG2(gpriv, x) \ - (((x) & ((gpriv)->info->nom_bittiming->tseg2_max - 1)) << (gpriv)->info->= sh->ntseg2) - -#define RCANFD_NCFG_NTSEG1(gpriv, x) \ - (((x) & ((gpriv)->info->nom_bittiming->tseg1_max - 1)) << (gpriv)->info->= sh->ntseg1) - -#define RCANFD_NCFG_NSJW(gpriv, x) \ - (((x) & ((gpriv)->info->nom_bittiming->sjw_max - 1)) << (gpriv)->info->sh= ->nsjw) - -#define RCANFD_NCFG_NBRP(x) (((x) & 0x3ff) << 0) +#define RCANFD_NCFG_NBRP GENMASK(9, 0) =20 /* RSCFDnCFDCmCTR / RSCFDnCmCTR */ #define RCANFD_CCTR_CTME BIT(24) @@ -1388,6 +1379,28 @@ static irqreturn_t rcar_canfd_channel_interrupt(int = irq, void *dev_id) return IRQ_HANDLED; } =20 +static inline u32 rcar_canfd_compute_nominal_bit_rate_cfg(struct rcar_canf= d_channel *priv, + u16 tseg1, u16 tseg2, u16 sjw, u16 brp) +{ + struct rcar_canfd_global *gpriv =3D priv->gpriv; + const struct rcar_canfd_hw_info *info =3D gpriv->info; + u32 ntseg1, ntseg2, nsjw, nbrp; + + if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) || gpriv->info->shared_can_reg= s) { + ntseg1 =3D (tseg1 & (info->nom_bittiming->tseg1_max - 1)) << info->sh->n= tseg1; + ntseg2 =3D (tseg2 & (info->nom_bittiming->tseg2_max - 1)) << info->sh->n= tseg2; + nsjw =3D (sjw & (info->nom_bittiming->sjw_max - 1)) << info->sh->nsjw; + nbrp =3D FIELD_PREP(RCANFD_NCFG_NBRP, brp); + } else { + ntseg1 =3D FIELD_PREP(RCANFD_CFG_TSEG1, tseg1); + ntseg2 =3D FIELD_PREP(RCANFD_CFG_TSEG2, tseg2); + nsjw =3D FIELD_PREP(RCANFD_CFG_SJW, sjw); + nbrp =3D FIELD_PREP(RCANFD_CFG_BRP, brp); + } + + return (ntseg1 | ntseg2 | nsjw | nbrp); +} + static void rcar_canfd_set_bittiming(struct net_device *ndev) { u32 mask =3D RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC; @@ -1406,15 +1419,7 @@ static void rcar_canfd_set_bittiming(struct net_devi= ce *ndev) sjw =3D bt->sjw - 1; tseg1 =3D bt->prop_seg + bt->phase_seg1 - 1; tseg2 =3D bt->phase_seg2 - 1; - - if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) || gpriv->info->shared_can_reg= s) { - cfg =3D (RCANFD_NCFG_NTSEG1(gpriv, tseg1) | RCANFD_NCFG_NBRP(brp) | - RCANFD_NCFG_NSJW(gpriv, sjw) | RCANFD_NCFG_NTSEG2(gpriv, tseg2)); - } else { - cfg =3D FIELD_PREP(RCANFD_CFG_TSEG1, tseg1) | FIELD_PREP(RCANFD_CFG_BRP,= brp) | - FIELD_PREP(RCANFD_CFG_SJW, sjw) | FIELD_PREP(RCANFD_CFG_TSEG2, tse= g2); - } - + cfg =3D rcar_canfd_compute_nominal_bit_rate_cfg(priv, tseg1, tseg2, sjw, = brp); rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg); =20 if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD)) --=20 2.43.0 From nobody Wed Sep 10 02:01:30 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF0FF2FC02F; Mon, 8 Sep 2025 12:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333389; cv=none; b=m/U8S8EMsv+0OSAXNLFDPgTcZhNCqUXM8JbY23+uKPCzwlwbCiKj7O/JHG97EoVCGGWNT8DqP1svmkApKaknrVTDzh8Jo5hNR/CKnzPhZmFSS5o4wQETq03ZJcG0NoAvboqwDzkShYeTFvKzzyUjSPGVpndM3hDs2lSOvJUoCDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757333389; c=relaxed/simple; bh=LJBZR3g3tMapr1pcv05tu4758efqyzYypnEmmug+2k0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EV4seaRp5Cragb3Bksaby210VCeP6oihR+2EqfzLaBMzwZoNifzfQDJyP93vqpgudI1UW1kfCvY2WoIXtuh2H+ybx5HKUwHlYQAHc6bqQQAIg3OGlaWPUTLkJ6hRCjm8bivuw+mjJ8t+oXTYSuXqEOJzdJZpkUGZPbKuGb3sh7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PCVlGXDq; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PCVlGXDq" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-45dda7d87faso18706465e9.2; Mon, 08 Sep 2025 05:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757333386; x=1757938186; darn=vger.kernel.org; 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=K8djXVjM/tAen/yqZaA8g4X2SrzUVVaFVlQlWculVlI=; b=PCVlGXDqvpRHBJAVrMo6jG4wSHtFgb+RF1Yl6X7Cji2jkNIFhEO55wxIJ2mme0gF5Q gHNMettEeHUSoZ1Jv6AUW0SRtlOUscbWLp9HextA0a2KStq8aQTAyWezxSzLgJuKxNo+ QP7kZR/mOXxf3TmYQKMlAeFHJ3x5Y9tnwMHw5rJukdOOo5A3DxbX0w2UsN9cmNw3Eew8 v/0v+D9L3XY2pSdn9r8o3LtPHsrVFNdzWDJ62IFIk6oi3Ad4bj5y86Bzcx5EN8bZYLQh gnKHRPstxPTHHCOFHdW1Ug5pQR1pBqjlbxhN2JA+EGdGUso51VgaJ/IotEYhIir8/J4f j0Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757333386; x=1757938186; 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=K8djXVjM/tAen/yqZaA8g4X2SrzUVVaFVlQlWculVlI=; b=E4/K37mvW01UaS9BJlxu/16lD29TRe+HYxHNzhpIG6YwmFAo1IJzABnwJdD1FOiyq0 kp+WpGmw/qgc0DcoFb7xyY/uEunst6Ekr4Ehp4qAgaswx0hkYCdbWWCUq3TEAgY6EHny 0cbmybSfl6Z1mV3l2e6/TFhZvldOiRV71OaIKNWWIFE6WlgBjcas+KLf5OFJ2zAW4L01 Gnw5yX+QW2ZF53jOLJwvHebWUSa/lo6IirvnI7Gdkq7lhDaipK1M2Dt33XSjMnuuAZzV h6hjo0JFu7Y7pv9s8v+vxuEHTzU5ImrOd3rcBIqubPvhaTrNeMstpgcc4EWnGm/UqbN9 oSPg== X-Forwarded-Encrypted: i=1; AJvYcCVL9T1Bwf7kyUtyUtnrgu8Lh9aPM44yhlycbqMHQeXdF29LcKeQ9agI2HEKKEriYly2a3d30N5DNPvSeYGiuQPYQv8=@vger.kernel.org, AJvYcCWeNkAn1KAmRNaYBXo0o0zVDeRwaQWySCcHVNcDz4JVcWoSRu6dZ+YQ3L4uak5F/iv167sxySWGu4M=@vger.kernel.org, AJvYcCWzgZuiYnP4oRGJGCaL/QWN8skFGykEsTLV+6UnZwQ5yGO/ZptH0HCmXbyD2ia+5R8mNsbNhgDT0QjFkws7@vger.kernel.org X-Gm-Message-State: AOJu0Yy/AiBwkxkVuc51XxyFYSAgpiaahiS8goDX1RTOf2fCu0IOUfcH ES0nO9hlptfi1Vk5ZSnSB2giYWgs6VRWoDjILEDOgeB5BQNfPCRiIWPWJizWSw== X-Gm-Gg: ASbGncs8b0bb8gQ0Z4442wts5D/MzwuNEKSAfIGt71dbg/RWZXdBIvgpaKG1EzBaUMH O0QQ9xdbO0Sh1sub+0Wxg9Zqy7UJsTQ0XNiWC5ng/R/y9EJ+SzZ7KPp7LCoGMAKdtVkDrOrEeeO HhoX1RVB0Pux0apn64JvPYi0an16Qrj17ZmKNSC8EkjgvB6D/1tBs/ywkAmjjxg0tF/oR4aDJPk ROvApdfQnLU8vqB7hibh0fn9zK+pqI5QSIKnvpiPsOoU93EBnXfKHE/rdUn4gLrCLk9OJGElSZO IS/nVPp1ug9eOp9TUKkR9OwIUsVN2vC3IBRDF004N7ywcfLR+BqP/Fj6j+KNViGS56gBm4LsJer SWsatWOLu0WP+zWRewgUODBuKJDE+LcA8/Sd3yKSlh1IcQozmpbKfYl/vTHrua+pystg73awcq6 teZzdFw4zDYVZLUSwGJ+PzIsg= X-Google-Smtp-Source: AGHT+IFjpk6nqhdVNDShGcxzbiNs4vrs3gpWpDN9fuWPpdIRFPnfd3J6qig+JsyHX7ik5Tokjyp/Eg== X-Received: by 2002:a05:600c:1f13:b0:458:a559:a693 with SMTP id 5b1f17b1804b1-45dddee8ec7mr73239255e9.18.1757333386069; Mon, 08 Sep 2025 05:09:46 -0700 (PDT) Received: from biju.lan (host86-139-30-37.range86-139.btcentralplus.com. [86.139.30.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e543e9f444sm9646415f8f.60.2025.09.08.05.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 05:09:45 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Marc Kleine-Budde , Vincent Mailhol , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , linux-can@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v3 4/4] can: rcar_canfd: Simplify data bit rate config Date: Mon, 8 Sep 2025 13:09:33 +0100 Message-ID: <20250908120940.147196-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> References: <20250908120940.147196-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Introduce rcar_canfd_compute_data_bit_rate_cfg() for simplifying data bit rate configuration by replacing function-like macros. Reviewed-by: Geert Uytterhoeven Signed-off-by: Biju Das --- v2->v3: * Added Rb tag from Geert. * Dropped _MASK suffix from the macro RCANFD_DCFG_DBRP_MASK. * Followed the order as used in struct can_bittiming{_const} for easy maintenance. v1->v2: * Split from patch#3 for computing data bit rate config separate. separate. * Replaced RCANFD_DCFG_DBRP->RCANFD_DCFG_DBRP_MASK and used FIELD_PREP to extract value. --- drivers/net/can/rcar/rcar_canfd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index 99719c84f452..401505264676 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -169,15 +169,7 @@ #define RCANFD_CERFL_ERR(x) ((x) & (0x7fff)) /* above bits 14:0 */ =20 /* RSCFDnCFDCmDCFG */ -#define RCANFD_DCFG_DSJW(gpriv, x) (((x) & ((gpriv)->info->data_bittiming-= >sjw_max - 1)) << 24) - -#define RCANFD_DCFG_DTSEG2(gpriv, x) \ - (((x) & ((gpriv)->info->data_bittiming->tseg2_max - 1)) << (gpriv)->info-= >sh->dtseg2) - -#define RCANFD_DCFG_DTSEG1(gpriv, x) \ - (((x) & ((gpriv)->info->data_bittiming->tseg1_max - 1)) << (gpriv)->info-= >sh->dtseg1) - -#define RCANFD_DCFG_DBRP(x) (((x) & 0xff) << 0) +#define RCANFD_DCFG_DBRP GENMASK(7, 0) =20 /* RSCFDnCFDCmFDCFG */ #define RCANFD_GEN4_FDCFG_CLOE BIT(30) @@ -1401,6 +1393,19 @@ static inline u32 rcar_canfd_compute_nominal_bit_rat= e_cfg(struct rcar_canfd_chan return (ntseg1 | ntseg2 | nsjw | nbrp); } =20 +static inline u32 rcar_canfd_compute_data_bit_rate_cfg(const struct rcar_c= anfd_hw_info *info, + u16 tseg1, u16 tseg2, u16 sjw, u16 brp) +{ + u32 dtseg1, dtseg2, dsjw, dbrp; + + dtseg1 =3D (tseg1 & (info->data_bittiming->tseg1_max - 1)) << info->sh->d= tseg1; + dtseg2 =3D (tseg2 & (info->data_bittiming->tseg2_max - 1)) << info->sh->d= tseg2; + dsjw =3D (sjw & (info->data_bittiming->sjw_max - 1)) << 24; + dbrp =3D FIELD_PREP(RCANFD_DCFG_DBRP, brp); + + return (dtseg1 | dtseg2 | dsjw | dbrp); +} + static void rcar_canfd_set_bittiming(struct net_device *ndev) { u32 mask =3D RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC; @@ -1430,10 +1435,7 @@ static void rcar_canfd_set_bittiming(struct net_devi= ce *ndev) sjw =3D dbt->sjw - 1; tseg1 =3D dbt->prop_seg + dbt->phase_seg1 - 1; tseg2 =3D dbt->phase_seg2 - 1; - - cfg =3D (RCANFD_DCFG_DTSEG1(gpriv, tseg1) | RCANFD_DCFG_DBRP(brp) | - RCANFD_DCFG_DSJW(gpriv, sjw) | RCANFD_DCFG_DTSEG2(gpriv, tseg2)); - + cfg =3D rcar_canfd_compute_data_bit_rate_cfg(gpriv->info, tseg1, tseg2, s= jw, brp); writel(cfg, &gpriv->fcbase[ch].dcfg); =20 /* Transceiver Delay Compensation */ --=20 2.43.0