From nobody Sat Oct 4 00:32:13 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 B208D2367CC; Thu, 21 Aug 2025 14:14:33 +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=1755785675; cv=none; b=d2x8dR3/OIGOC2HbMvqmae7UTfv4XulSGgEovhd4jFE6KatQW5rVIOCaGCT3YpHMGRGIW593mn4XEpY2hJuHS/YlsMIO3kpUrcoq9HU09qGTvBwsv267uqucXZuVMwmYhsX2Cph3pcEEmz6EoIadidovkh63xvQr1AJ4ci1Td5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785675; c=relaxed/simple; bh=MlUVROSS8IxTyPkOmHB7VLMft9kWD6POL72nhreUhlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PnG72+r8yP7NOGDkrf6h6Iv/sU18MyVwheenuGu+FgtgketuSnGPVa26EBOfZUcwCi5g3qNj/AkNTtIlqDNPYLGI5oqUUkTl0E1lM4E5o73plQ+tkI7a1v3VqvGsteHIFoBauoCYSpkwTHUjbUA7VdBLBQPOlXC9UottX1TNQRY= 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=NkukShjw; 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="NkukShjw" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-45a1ac7c066so6472135e9.1; Thu, 21 Aug 2025 07:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755785672; x=1756390472; 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=5CDQXCRlF7DU93mM+EhQrbZzbs1hT88XCXBB628181I=; b=NkukShjwLLihkwsrw+CNsBm14FzMgINrGa8QrjWgs08+/0CdLQAwR0naXoob+7quxY x4rBO6+b4SMlNx8CxDX6j90OkcFPHnGCQOdIsP9NHDIX7QoUKAvOczChqUcg/6yGkQ9Z M6AVVnocEVrpURzM8/OabO0gA5usR0+u5Fg/kWWcMXOorSnCGvtio+gUmWN2TGITRDaF JbwsJbhpV0FzbBdpNp+Fu0vfH3gOVjZ7EilquW1TiETi0nlCXlNvWgqi0bqUDAmblzfl ePlwL13sOHmsFtxujk9R1E8QrGs0zEbLI4e3bchsBRnqvbrScsPICH4O44g1Pe6jMK/s 137Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755785672; x=1756390472; 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=5CDQXCRlF7DU93mM+EhQrbZzbs1hT88XCXBB628181I=; b=SmvqKbX/mjYRA7acUF16fxbb7ZjMV2FoJt6XSPAdfDhVKpmZICouCBQPrneQxTqGmk QyW9Ni4ogHEpQbN8Zs4/kf5SXLl3vGcXpD9DhOaLkRPTXUYcVQM1nXFqgQIYWTePPsj/ 1lQ03GEKYGKJ/0zKJqxeXakJ1Yln6wLQ3TCeezLV5ixxJaDzCVKaXHFJrRUZc3B6i9pE TVGU8XN3Iud3zzowo2GtXA02hORs9tdsvkPvSpc0AUo3X2mJS4qTbTuA27+vA30XHzys ONNRRtz0+dsFVMsMipmO2rEQphzBk5IbMx/8wbVlCr4UMyvCnh2Z85vs6NCnrQ3vv/sN 7UNw== X-Forwarded-Encrypted: i=1; AJvYcCUM9WN+1S+v2dKzLaA5kEsAiM+JT75bmJm/wuPSgerxz4FMKH7Q0TYql5YQqIO62qW+FZqGtizHeJJwyd33pgmhCiA=@vger.kernel.org, AJvYcCVNztfrCbLor+bzf1fc+wY0X1FEj00zz4aIBtdUhQDucKE012VtDRxyea/TOQNzODYEYtPaUi/qoUI=@vger.kernel.org, AJvYcCX0zcbtjefGKoznZpRGGB1hdkTFujSwExqpABB7TfL8PdtRM2K1pmeakmJBEp9tsYUIl4pYuixDv0YYFTX9@vger.kernel.org X-Gm-Message-State: AOJu0Yzg3cbn7WpiiBSDtzFtEmFIPLh8favLGKN2Az/WrJ0p+gk1Nl5c vtuaosGzHXE9WZZLrPFj6qk24PZIYtXmqiAKN5krIh9aP7T8io56RPBi X-Gm-Gg: ASbGncuwFvO86SCT9KKEWDWsAMnveS4f+/OYDy/PgZ37pvbQXMsbiO/HtoR8oOqFa5W 2TBRO/rLAetK2PoHrm57Seo5Yp/htifbDWFeQM1Z74ozCgPdgdwz64LfUaUYPGg8UFK0TUNUhlJ 2M6BzEX1dAU/dHmcqdUAidi0hCt2kUGfPDhnpE5Mm6fc2JEBktMBwcIbAyjH3/HzfDf4iIa5jNs eJRwlc5MI1VnABpwvzoPVHe0wLEeOMf/HQUBT/ZuFQ8D1fywmspEEowFilHeN3+O24q3ptzGh4T tSabEItWEzEeO9Jp4XYIEjscME/FaIqus4Nu8s7LyXriFDlkavNttAGqzgSwfhQJAUFDKJHNXyY 1tbv3P54uguIMxmrKw6DMiwuYbXe59QJQOknZQKQm8hAiYdE1kCU4VwlxCMjjPoBCu+Pmis5Lsw == X-Google-Smtp-Source: AGHT+IH0rCu80lOqLncd3uxGUpCxuAEkXVTRwGJVfPqOHeYX2FSeRRxYSHo/Zxj/KcMqSPS+F4+CTQ== X-Received: by 2002:a05:600c:4e91:b0:459:d9d5:7f2b with SMTP id 5b1f17b1804b1-45b4d9f7b63mr28032445e9.16.1755785671639; Thu, 21 Aug 2025 07:14:31 -0700 (PDT) Received: from biju.lan (host31-53-6-191.range31-53.btcentralplus.com. [31.53.6.191]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4db1be3csm33203505e9.1.2025.08.21.07.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 07:14:31 -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 , Fabrizio Castro Subject: [PATCH v2 1/4] can: rcar_canfd: Add shared_bittiming variable to struct rcar_canfd_hw_info Date: Thu, 21 Aug 2025 15:14:21 +0100 Message-ID: <20250821141429.298324-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821141429.298324-1-biju.das.jz@bp.renesas.com> References: <20250821141429.298324-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 SoC compared to other SoCs. Add shared_bittiming variable to struct rcar_canfd_hw_info to handle this difference. Signed-off-by: Biju Das Reviewed-by: Fabrizio Castro --- v1->v2: * No change. --- drivers/net/can/rcar/rcar_canfd.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index b3c8c592fb0e..ce355f79e6b6 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -461,6 +461,7 @@ struct rcar_canfd_hw_info { unsigned ch_interface_mode:1; /* Has channel interface mode */ unsigned shared_can_regs:1; /* Has shared classical can registers */ unsigned external_clk:1; /* Has external clock */ + unsigned shared_bittiming:1; /* Has shared nominal bittiming constants */ }; =20 /* Channel priv data */ @@ -632,6 +633,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_inf= o =3D { .ch_interface_mode =3D 0, .shared_can_regs =3D 0, .external_clk =3D 1, + .shared_bittiming =3D 0, }; =20 static const struct rcar_canfd_hw_info rcar_gen4_hw_info =3D { @@ -649,6 +651,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_inf= o =3D { .ch_interface_mode =3D 1, .shared_can_regs =3D 1, .external_clk =3D 1, + .shared_bittiming =3D 0, }; =20 static const struct rcar_canfd_hw_info rzg2l_hw_info =3D { @@ -666,6 +669,7 @@ static const struct rcar_canfd_hw_info rzg2l_hw_info = =3D { .ch_interface_mode =3D 0, .shared_can_regs =3D 0, .external_clk =3D 1, + .shared_bittiming =3D 0, }; =20 static const struct rcar_canfd_hw_info r9a09g047_hw_info =3D { @@ -683,6 +687,7 @@ static const struct rcar_canfd_hw_info r9a09g047_hw_inf= o =3D { .ch_interface_mode =3D 1, .shared_can_regs =3D 1, .external_clk =3D 0, + .shared_bittiming =3D 1, }; =20 /* Helper functions */ @@ -1912,7 +1917,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_bittiming) + 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 Sat Oct 4 00:32:13 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 179222E3AEE; Thu, 21 Aug 2025 14:14:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785675; cv=none; b=McJg5AQ9H1R4plDTDCufZbFXkj1h5hTjGOQbMSWvlBKl2VGkA6idOnVTMOIQyMlQogi01dyywwu3duhCpkRqTu/Jv4UFLXz5rC1bthWEkhHRgHNDlfWOvsYu5nakLXc5zA40EtFehtZgAodOiA88EAR9B2nHwA7g/xs2sfzW9/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785675; c=relaxed/simple; bh=LFKhAjA6dAibPLcKWUQX+waQMyxIMKnRbhI9XU2EIzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HQRgF7Iz8NRkQJQjAvXIHDiZMTuTGwXIwCy8kmwGH5v2+5C/QF6mFCpxl1w/hIqPP+6jcdmzcrFrA53ce7NY0L/OxoYVnz8NbazR1MbjW49e3ndRMWUCq5tkdZSgre6JWm6MH5qZxF+2NW+CuvXeqDhhbMyWALyoVG9dvP9jLs0= 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=kmhN2gE6; arc=none smtp.client-ip=209.85.128.54 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="kmhN2gE6" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-45b4d892175so3648295e9.2; Thu, 21 Aug 2025 07:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755785672; x=1756390472; 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=WmmXRKSwkXbIZJoN56vuqrEQMZUuC/SffNh3CV0RFzM=; b=kmhN2gE6aWqjQd1WDekc9J5JUcTvui8t4qODtfXJBZMNKJMGw3nKoy7J8APTh9GQNg ZIofyQsBJ7Cf/Rc3U8mhbFAnpcJZ6tmV728MeFvJlaW09yHgnMNEAxBCrbvKGwecGvXH m+ovEdGjKcnvtfoPYvanDLkqEoUI+mu6Q5dD94hEGnRFkD7DhksPbomNOrbGhUmtQwEJ /FlqBWhZL3t67VyZEMA6crKDCKpruw3ndtU/DOczxi9Pv7Tjy1Y8plIC5HSq8F4Q07vW 48D3GMoi+1p9ZiD3ldmDqndbxvBkNaosQxrclWo4HFT/c8vBe6zfYQIvl7PlY5NZTiTL HUGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755785672; x=1756390472; 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=WmmXRKSwkXbIZJoN56vuqrEQMZUuC/SffNh3CV0RFzM=; b=ZPWT/c34/RGd7SR3OoxTsb67vYzTlFiUCmWtG1tsD7zf1rBkZVSrviPi4dXfA2uSS3 xYBjavlHc9OjIa9OcEHPZoOUpWNlMTVd2H511pjSxnvI3k0RkeM043lTpZ2GTyb8bkeA MK+NR6awZIoEfwk0g5JvUY2yhf3wLeP5PagrFtHgGUASaocp0QChiSg8QjJfJzQqnvHf Ny1mjIR01guZOPFrsfZ8ljhUxZ0hdt1X8lQ9n1/TpnlItBhlA+5dqwi6Dl1Jm7UEs0gY rXps5Z3L49gYxod78Hb+bcE6zTxpFNO7iaaRvdtFNiXTpVIOL6L4D3oT4rziTnems0T6 6sNQ== X-Forwarded-Encrypted: i=1; AJvYcCUNTHHuYvC9HlgYzUAj278t0i/dgiC006Eli1uj+Odv+vSeS6Wq1ATfcZJ1H/TD8dbE13wFhHsUjf8=@vger.kernel.org, AJvYcCVMwN7J7ojDUm+57ZwW8llvT6ckK6k7b7v6zBK0vkI8iMrVO8bkHsn9UVa1nYVByYDW3mSyj4tmr0mHrYao7p78TGE=@vger.kernel.org, AJvYcCWVBD/laVs9evwZyTIcuoketMYhBtTdRarr/vYJ0nutIZ6EjCc19B1NZkrrpnWN6FNNknEhXt5LpogXAa7w@vger.kernel.org X-Gm-Message-State: AOJu0Yy1MywZxWTwbrB0csELb+8SSs+OEnFwmakzkkGS7u6/p0/H7vHF sQc0CB26FdsHMP3g1kA1pdFtaLq74AC2zuYg3B+/WfujxwMTkOtUdAxt X-Gm-Gg: ASbGncvU02U52xF+nGDdgFf5/0AoA2QobusbJRFDPDUJYYbxEEkV08srgarEiqhZAqe nmHjS7doujhAgQA0vTFec8CgWBfUY9fv/mEosHM2a0HX7hn5jOQC/hrUAaxkLJqDZLtUoLyEjfs /J6sbKsTLyvDexcU36XNz89cC0cA5Ej4UPyhTEWGlBHy2rmlpqeCdkI9IdlDILFmM/04Qxgl7KW kQOZnNgzkR3Ni7fC327BojbGcpm/wK0pbW4mmao2Y8tJZ9PXkgek0fgqyOLSxN9EDfXQao9usfr wTqRY4aSGkfUchDzD9RGAh5FBQlPclMURtVMbB9ulOoH7ukhoi6UTpQ4POPL24EpIk1Xw3IIdaq kjF6LF9HQGww2ky0z9UIAjV93Fxnl/BGs3xfFb/r1RmIDhl5aNj72zZ4mmWuihRU6PkdVwgA6EQ == X-Google-Smtp-Source: AGHT+IH6aRlRng5HpzuZkmeDjmgpZvO7VE6EaPgXrI5wUqrXpiiMukcetpJ9Z6YH9VqHBh8xVY0FPQ== X-Received: by 2002:a05:600c:4fce:b0:458:c094:8ba5 with SMTP id 5b1f17b1804b1-45b4d7db5cfmr25176005e9.12.1755785672192; Thu, 21 Aug 2025 07:14:32 -0700 (PDT) Received: from biju.lan (host31-53-6-191.range31-53.btcentralplus.com. [31.53.6.191]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4db1be3csm33203505e9.1.2025.08.21.07.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 07:14:31 -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 v2 2/4] can: rcar_canfd: Update RCANFD_CFG_* macros Date: Thu, 21 Aug 2025 15:14:22 +0100 Message-ID: <20250821141429.298324-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821141429.298324-1-biju.das.jz@bp.renesas.com> References: <20250821141429.298324-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. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index ce355f79e6b6..8bae25758924 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_MASK GENMASK(25, 24) +#define RCANFD_CFG_TSEG2_MASK GENMASK(22, 20) +#define RCANFD_CFG_TSEG1_MASK GENMASK(19, 16) +#define RCANFD_CFG_BRP_MASK GENMASK(9, 0) =20 /* RSCFDnCFDCmNCFG - CAN FD only */ #define RCANFD_NCFG_NTSEG2(gpriv, x) \ @@ -1416,8 +1416,10 @@ static void rcar_canfd_set_bittiming(struct net_devi= ce *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_MASK, tseg1) | + FIELD_PREP(RCANFD_CFG_BRP_MASK, brp) | + FIELD_PREP(RCANFD_CFG_SJW_MASK, sjw) | + FIELD_PREP(RCANFD_CFG_TSEG2_MASK, tseg2); } =20 rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg); --=20 2.43.0 From nobody Sat Oct 4 00:32:13 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 883922D8385; Thu, 21 Aug 2025 14:14:34 +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=1755785676; cv=none; b=IrMIaP44M80zEpCVMtCSgO5LiaVMFAu4RDTILuRGLOiXBL5ZhicWrcs00otAfhDZGw0J0UMPMdNn/b1r5kDxL2Cs3GoTymxBLbYuhR39+A1z1UgfldLfS+0G4P7yYxS7gBjrFinEPGhuN6rIKbu8WdLo8YOQzDvBpNVmAuXCjk4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785676; c=relaxed/simple; bh=TAUrWAMO/Xod4rcdCGDBrTbU0Vpery16IzXqFv6qWFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jtqi+FngRm/aI5HqAHYcUCETokxVeykEy4EvaQZ3kqJfPZx/N4kOuGHW1xCKkKfmLiRzeWVFAUHwr/AJ5b37Qt0dL+hUBlOC7GiRyOFXO2EJsAQokDqMAdkD9BfAcGc2epKeIeIonGUrPAQfrPFOQ3m9afC/dau6vg+DJWqkCSg= 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=MypMsrX5; 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="MypMsrX5" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-45a286135c8so10958345e9.0; Thu, 21 Aug 2025 07:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755785673; x=1756390473; 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=TgcbcsDvID7e1whiRDt62JcbDXcbBZK2hy2RfTohtc8=; b=MypMsrX5HiyTM4fnFlXaqedwzTkeXBbLOzgJDL8xoXCo9Fu0Rm0XFN4vw2YaDhVKUu 3KyKx19Ycxjh9naPAsabFoONTOgsGBm5znBD4S8ZsOuPD740QVfS0d0O3v6cHnt8/ldb g86l9TpkMYKAl+vGmokFKcj6+N+JFx+9i+kCCqlZG+qDJTJ1ZJAikpavpmd3BS3ek7Op wGnphvJi4JRf/bO03wXmC7dBdvKC5MZlAlYwE7f4psaQsHsCME8RFMlO0XCtIGl312CO z7MXabAkNH8XN/9O3AJARcyxcuf3vGHPTrd/AkR6m0S18KYM+Ukkyc+qO+mgp9N77cJo 3ZCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755785673; x=1756390473; 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=TgcbcsDvID7e1whiRDt62JcbDXcbBZK2hy2RfTohtc8=; b=i6It0TFL9k/HShmu6g7GJeR8kHKPt1DpaqD3ylrM6l5ETtLrodg3fVr/B4ruP1+NWC CcQuTUprHY2dAalXgYFGln6LcOic7lA7QBnDfcAR5sIh5Lq7U1eB1ffilDCUFe+sx7a2 lvIH80OrRnfXCUEFeDD2KMdIvaj4FRHztD4BfcSFs0jkFrN1tE8aCYlOwnm2Lxpx7Y2+ bLWEzMg/jC4/q2+w5T5qDs11aPBQ+YzdUJUCIhGsJQ5+78NSVUuz5k4eh2S5Bihip5o4 lnOTV0DO2j2wwVhEg6Q4h+AVfzKOufvePtYFWIDqeElLEwNGO8ZkGh0csumM1d1w7aNH HduA== X-Forwarded-Encrypted: i=1; AJvYcCVN6Zszu6YV7tWjquHQask3zTf5slraK8XrxzAzvFmWX9Vki7iETZ2Q7fGQ3BAUXTfUS+HDbyUa+ro=@vger.kernel.org, AJvYcCVVdPhtE47NiOh37/bdob2uMErTUNbSTHzPrOBBiJu7dknjuARtKIKKCt6hfodrxTxmu7mWb4fUv/YDGeSI@vger.kernel.org, AJvYcCWqtgTWUQeXrqmIhSJS7T5Wj53a+JfgiuAXaZzV4VhEc7jQ3UWJ5cp/GunqE9TKR2ctaq4xuABN+wiw35C4D6ejMEY=@vger.kernel.org X-Gm-Message-State: AOJu0YxlUk7P5y8AmtaNtvHubesIata+tJmFdfxTVbloh/LM9ZT9U85i b3J74bLPxhIVhJfxM89X19HyEQBVK7NhMmQRsepnSx0qzKK2Wam3LvWS X-Gm-Gg: ASbGncv4OcUwZXh32aa8BYEL8NzgkJLoCSvmE2qIpjkLrWnFF4qXm8YN/tZLnPa9I/L aGlR2IBSZSVXYlXrXRRFJGg+W233YSfPPVTDMrJNRa7ZxJ95233sNYnDBqPlywu1UP8l9Pzu5Ht sculLOZxfNA94fT/vK91IYv0X/gzVsint+S7HW3htEy5F1oJFmJSordLDvL6cXeUOneEfzwj+9K rCF6Yz+Rm3qfWksERaLUTLqlmLpkFQ2Ewhbl6TBzy6BVEK5+4HFVvceUWDWNN/flilHRy0woRIy PQ8hkzdSPv9OgrItCcvPafFNJgFn/Nw1LjQKlyysMlyckoWl1hzkB9K8xC9ayL5pw3rc6rRCzRd vgsFgA9++CMrx77EZlWx+mP2vQqMpyn4RI6IO5V1l1ZcEtpahcYnqXQlcvcu/CkeeBgpKOgCSjw == X-Google-Smtp-Source: AGHT+IH8biWaXMKYUlK61n2UyVAf+SKNCyPysNlAg/om16uY6df73W8aNdkE34qF6xdqI6F5j4ONqw== X-Received: by 2002:a05:600c:4255:b0:456:2257:3777 with SMTP id 5b1f17b1804b1-45b4d79467fmr16329065e9.4.1755785672651; Thu, 21 Aug 2025 07:14:32 -0700 (PDT) Received: from biju.lan (host31-53-6-191.range31-53.btcentralplus.com. [31.53.6.191]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4db1be3csm33203505e9.1.2025.08.21.07.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 07:14:32 -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 v2 3/4] can: rcar_canfd: Simplify nominal bit rate config Date: Thu, 21 Aug 2025 15:14:23 +0100 Message-ID: <20250821141429.298324-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821141429.298324-1-biju.das.jz@bp.renesas.com> References: <20250821141429.298324-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. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- 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 | 45 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index 8bae25758924..944b960c0b5e 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_MASK 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_MASK GENMASK(9, 0) =20 /* RSCFDnCFDCmCTR / RSCFDnCmCTR */ #define RCANFD_CCTR_CTME BIT(24) @@ -1393,6 +1384,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 brp, u16 sjw, u16 tseg2) +{ + struct rcar_canfd_global *gpriv =3D priv->gpriv; + const struct rcar_canfd_hw_info *info =3D gpriv->info; + u32 ntseg2, ntseg1, nsjw, nbrp; + + if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) || gpriv->info->shared_can_reg= s) { + ntseg2 =3D (tseg2 & (info->nom_bittiming->tseg2_max - 1)) << info->sh->n= tseg2; + ntseg1 =3D (tseg1 & (info->nom_bittiming->tseg1_max - 1)) << info->sh->n= tseg1; + nsjw =3D (sjw & (info->nom_bittiming->sjw_max - 1)) << info->sh->nsjw; + nbrp =3D FIELD_PREP(RCANFD_NCFG_NBRP_MASK, brp); + } else { + ntseg2 =3D FIELD_PREP(RCANFD_CFG_TSEG2_MASK, tseg2); + ntseg1 =3D FIELD_PREP(RCANFD_CFG_TSEG1_MASK, tseg1); + nsjw =3D FIELD_PREP(RCANFD_CFG_SJW_MASK, sjw); + nbrp =3D FIELD_PREP(RCANFD_CFG_BRP_MASK, brp); + } + + return (ntseg1 | nbrp | nsjw | ntseg2); +} + static void rcar_canfd_set_bittiming(struct net_device *ndev) { u32 mask =3D RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC; @@ -1411,17 +1424,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_MASK, tseg1) | - FIELD_PREP(RCANFD_CFG_BRP_MASK, brp) | - FIELD_PREP(RCANFD_CFG_SJW_MASK, sjw) | - FIELD_PREP(RCANFD_CFG_TSEG2_MASK, tseg2); - } - + cfg =3D rcar_canfd_compute_nominal_bit_rate_cfg(priv, tseg1, brp, sjw, ts= eg2); rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg); =20 if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD)) --=20 2.43.0 From nobody Sat Oct 4 00:32:13 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.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 2E6C12EDD40; Thu, 21 Aug 2025 14:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785676; cv=none; b=Aws7dfKMj/6SzVH3J/bsmyBCcqidzmXF3Eje4VhXasNsXq5eFHZm1JxvKzNR4JYY1184jKP867mkiSjPnJ1amwnHZk/E2Xwkpna7lcD8iahInH2PCkQNKun0GdC/RvLiYIVK1W3wrZKgrC+JdaazoSb3XvdR01GSsZO69/VldsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755785676; c=relaxed/simple; bh=gw18hevqmIxFwrZV1sIG6fUjWbi1i9XDyZT3qrIxT7g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nYinrv4xJVWdF+4BOG6zOskdTMOh6SCi1KiIqFB/Kd56sKEKGd+HALXu2e92RE0Yi0+zxkhwu6TN4aKhpiGthkNf+2jolz5s0nUDyCumR3D29xjS1saUzrM0JpnKfr204K+qlMYMG9MazBmqCo0gvq4wuiQ+eBVTboc9exzcgas= 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=TB+Z8put; arc=none smtp.client-ip=209.85.221.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="TB+Z8put" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3b9d41bfa35so832657f8f.0; Thu, 21 Aug 2025 07:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755785673; x=1756390473; 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=fvOUlOSPPOsXB/3zWThy1pwPfkK9g4MWMHVB27lxX6I=; b=TB+Z8put/XZHbxn1OMU+cyi4MuO35XZzhk4HAvRA0NiGGiN8bBlYdGyENzqfKCSYtk J6HLaT3BcmDtn+oJSzC1bJCEpX9wYIkWKGpo0y3/gSEM6Dkx4etYaWt1UA2Eq7dWtvLW TR3wYV3zMPnlV/j3BxNfpyFyVDM6n9tA1GCFhrFohpAm+8GCl1TxQTSclg2c2IqCTG1b 5hynb949GEw8swXQPQ+eDs0FfpPxxOvFQLTzs7DNUcslauQ08vpcqAwB/Px3iW5LUmyN cepyNau38NqNIIzqyTX619vcIb97HAM2nXArr/HudTS9nbiQtZuaqnYoOZ8RxfvoYC32 qd4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755785673; x=1756390473; 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=fvOUlOSPPOsXB/3zWThy1pwPfkK9g4MWMHVB27lxX6I=; b=QwIYrfCwQIoFYhp1cbzN9gR+jQsLFET65rppNpJNNIsd0oYa9rjAxhweymPfIcEIh7 DSNG79/bAIv+M9Oa94DS2UsmpmYEUepEJejXLKghAtjYVAjQMFOdD6dvpqDqSgx16u0y CGeJ/ZnYvLBlElGJscUcrZbUHgEzNptxOdRZ6C0f1lq+2mDGoZCSZ6xBe4KtfZiiUaQb SntKZDyetzfqUgZvTsUtZ0dJ4R39820VKOIb2cchQmoVRK0nDsGBwwvoQidmyeBYl1jc lK5HYJWlVl2ta7ngaN1yFG/sGC1ZokZ6B/qRrGzXl+FxGUs8WEytJzA+tEQFWGX/xTu7 Klpw== X-Forwarded-Encrypted: i=1; AJvYcCUsv1RB1+JIomkbDX4J4yEK3nxvxTsJJZPwT2JrdGlyJHs7KOB5AOEqM+hTtSgC2ZnLcI25/Mb6bcP7otQKsrcnxzw=@vger.kernel.org, AJvYcCW2iH3ufa50m9GKsAmwkiSromoTt/iJWggsQB2kEp8nX0pDGIjXcBGULW5gqFQ8jDQ4ei/4HtnOzvM=@vger.kernel.org, AJvYcCWU585Z8u/8VhwKtmNk8RR4s4TSnB1qId/15ct4U2bhd+esQIXcOFCBxkvAe4sz+qKj1mwlBTneEWOHfuAL@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Y9R8YvbkI5SRuOfu76CN7Sxlwh+ndaMPJ4bV5xukSWkSgu28 hIbl3pJeyRlWZtBf6TlMlnYVRKjllwiG2bUxKf3gPfmjjM81d64jaf4O X-Gm-Gg: ASbGncsUJ1lPxLu80yjiXfPvpiryqkA6g3JXROspimxqOzGNI+PrnkpJ6cgvaISDKMI +lVXzW3NbiqQ0i3h99JsJVC3rMxSQ0C6/90XDE4wkTLkv8RKGWkmrL2s85/eZyeME9teyznblui J2LRc08knB+flxGBun7qLtHxa84IOYOFMNV0eiXCp8CH0Hl1LXp9bZxuLdK67+l7uZHyw00SJAF HO5XPjf+cgNlrDeIj6XKJ31ukvFGhEvIKPbQRUYEQi4OtE/Zc+s74/T5RS/fhF5e7feB5TP/gbN pM2SK1x1SUDnI7Ok8Odgo00LHhmSlqFvFxyS/OIu/ezUbjVc3RyxkETJLQBM10r75dJU1ptVB5L nBtDmRucZMsPWPTs/IWpQlO+kdE4PpsXLPI9YkNJwxOJ4sErKUkVrRb1Hxhw7v0VvqJl3XBwehA == X-Google-Smtp-Source: AGHT+IFO54QOz/DgXpOL4k9NcnTJZl5Mpjp4u748get5hxocrDQP/h9xWALOdO6Iipr/C4XNKv2vrw== X-Received: by 2002:a05:6000:2901:b0:3b9:16e5:bd03 with SMTP id ffacd0b85a97d-3c49405d32fmr2356062f8f.6.1755785673210; Thu, 21 Aug 2025 07:14:33 -0700 (PDT) Received: from biju.lan (host31-53-6-191.range31-53.btcentralplus.com. [31.53.6.191]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4db1be3csm33203505e9.1.2025.08.21.07.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 07:14:32 -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 v2 4/4] can: rcar_canfd: Simplify data bit rate config Date: Thu, 21 Aug 2025 15:14:24 +0100 Message-ID: <20250821141429.298324-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821141429.298324-1-biju.das.jz@bp.renesas.com> References: <20250821141429.298324-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. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- 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 944b960c0b5e..f56ed8967212 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_MASK GENMASK(7, 0) =20 /* RSCFDnCFDCmFDCFG */ #define RCANFD_GEN4_FDCFG_CLOE BIT(30) @@ -1406,6 +1398,19 @@ static inline u32 rcar_canfd_compute_nominal_bit_rat= e_cfg(struct rcar_canfd_chan return (ntseg1 | nbrp | nsjw | ntseg2); } =20 +static inline u32 rcar_canfd_compute_data_bit_rate_cfg(const struct rcar_c= anfd_hw_info *info, + u16 tseg1, u16 brp, u16 sjw, u16 tseg2) +{ + u32 dtseg2, dtseg1, dsjw, dbrp; + + dtseg2 =3D (tseg2 & (info->data_bittiming->tseg2_max - 1)) << info->sh->d= tseg2; + dtseg1 =3D (tseg1 & (info->data_bittiming->tseg1_max - 1)) << info->sh->d= tseg1; + dsjw =3D (sjw & (info->data_bittiming->sjw_max - 1)) << 24; + dbrp =3D FIELD_PREP(RCANFD_DCFG_DBRP_MASK, brp); + + return (dtseg1 | dbrp | dsjw | dtseg2); +} + static void rcar_canfd_set_bittiming(struct net_device *ndev) { u32 mask =3D RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC; @@ -1435,10 +1440,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, brp, sjw= , tseg2); writel(cfg, &gpriv->fcbase[ch].dcfg); =20 /* Transceiver Delay Compensation */ --=20 2.43.0