From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CA311AA7BF; Sat, 29 Nov 2025 15:29:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430192; cv=none; b=IxCv27ze212v9Xv+Mth/XHo5arHN9TGkiNtGwf48OAvqgmobmI/brOeKtWaAkOz2Wov6RlzLp8m7eIH18s0O3nRMAzg2BUEqNOQmdNDaR89EQ71Mbi3XmzacPZezoYiEKv66QQAzyaD6pmSfXjeF1LVT4Jn09tjXBFh2iqUUxaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430192; c=relaxed/simple; bh=buB36Y5Sf5MgYfsXtNeJpE7oy9ZCXNnymdj5sOX4Nkg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q7s4+u5CUzu1uBpwolfPeYE9lm8Xc0YLohhcsseY4wTeaOU4etU3EoHEjfj+LHHTi81Nkq18VxHk+aB1/F9ykrAFXg1b4vpNJdqxSqnSVqovamwZd0+gpgFBdSQ1g6HDm6DqEv+ec0HdI7EdRaFPDycvwBZQa2DW8kiIHkUp5Xw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZqK6MM9R; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZqK6MM9R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6D1DC19421; Sat, 29 Nov 2025 15:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430191; bh=buB36Y5Sf5MgYfsXtNeJpE7oy9ZCXNnymdj5sOX4Nkg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZqK6MM9Rz3iIjbTnRJRLOLQ5Xl+voEiB6mwseQOzGeShW4XcHZmpZWBM3oxqO/b6m O1HZKKGTWbyahQjTT4ipc8rhRmOJwLty6nEHqgXZGr5mTytV6GxbuK3q8nW6Y+CA8v FRHDkWb76zdhvWv940E7VBmcbQdzUU2GSef++O+ItVdsqIofSwxXBXh/8A1HvSVVx0 br0brHPr0Ecnqv3qDUPs7JBVVCf2uAdG0AIB3Lb6n/oOogsdKCkbmh+GDLwMd925lz 61tMp/xYFL7z5YUcQPcbyzGBxmIi5kLfnt7FOqR7XrRmPExHLELg3htJTbdQY9lRvs fObV+G4/wCa4w== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:06 +0100 Subject: [PATCH 1/7] iplink_can: print_usage: fix the text indentation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-1-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2576; i=mailhol@kernel.org; h=from:subject:message-id; bh=buB36Y5Sf5MgYfsXtNeJpE7oy9ZCXNnymdj5sOX4Nkg=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagkFHtWU3i29sTn3RWenUwDhzgqJA5Pdb3a9WTjNd9 sL59lejjlIWBjEuBlkxRZZl5ZzcCh2F3mGH/lrCzGFlAhnCwMUpABNhf8PIcPv9F6cC+buF61Jd QhZdDDF7neIiqD9/d+SzjLc5X05s/sXwTzVki9/ExIXtgtedXB693TO/atvZgMuzlZ+JLZc+L+z NxgsA X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 The description of the BITRATE variable is not correctly aligned with the other ones. Put it on a new line with the same indentation as the other variables. This done, reindent everything to only one tabulation (was one tabulation and two spaces before). Before this patch...: $ ip link help can Usage: ip link set DEVICE type can (...) Where: BITRATE :=3D { NUMBER in bps } SAMPLE-POINT :=3D { 0.000..0.999 } TQ :=3D { NUMBER in ns } PROP-SEG :=3D { NUMBER in tq } PHASE-SEG1 :=3D { NUMBER in tq } PHASE-SEG2 :=3D { NUMBER in tq } SJW :=3D { NUMBER in tq } TDCV :=3D { NUMBER in tc } TDCO :=3D { NUMBER in tc } TDCF :=3D { NUMBER in tc } RESTART-MS :=3D { 0 | NUMBER in ms } ...and after: $ ip link help can Usage: ip link set DEVICE type can (...) Where: BITRATE :=3D { NUMBER in bps } SAMPLE-POINT :=3D { 0.000..0.999 } TQ :=3D { NUMBER in ns } PROP-SEG :=3D { NUMBER in tq } PHASE-SEG1 :=3D { NUMBER in tq } PHASE-SEG2 :=3D { NUMBER in tq } SJW :=3D { NUMBER in tq } TDCV :=3D { NUMBER in tc } TDCO :=3D { NUMBER in tc } TDCF :=3D { NUMBER in tc } RESTART-MS :=3D { 0 | NUMBER in ms } Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index 1afdf088..f3640fe0 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -48,17 +48,18 @@ static void print_usage(FILE *f) "\n" "\t[ termination { 0..65535 } ]\n" "\n" - "\tWhere: BITRATE :=3D { NUMBER in bps }\n" - "\t SAMPLE-POINT :=3D { 0.000..0.999 }\n" - "\t TQ :=3D { NUMBER in ns }\n" - "\t PROP-SEG :=3D { NUMBER in tq }\n" - "\t PHASE-SEG1 :=3D { NUMBER in tq }\n" - "\t PHASE-SEG2 :=3D { NUMBER in tq }\n" - "\t SJW :=3D { NUMBER in tq }\n" - "\t TDCV :=3D { NUMBER in tc }\n" - "\t TDCO :=3D { NUMBER in tc }\n" - "\t TDCF :=3D { NUMBER in tc }\n" - "\t RESTART-MS :=3D { 0 | NUMBER in ms }\n" + "\tWhere:\n" + "\t BITRATE :=3D { NUMBER in bps }\n" + "\t SAMPLE-POINT :=3D { 0.000..0.999 }\n" + "\t TQ :=3D { NUMBER in ns }\n" + "\t PROP-SEG :=3D { NUMBER in tq }\n" + "\t PHASE-SEG1 :=3D { NUMBER in tq }\n" + "\t PHASE-SEG2 :=3D { NUMBER in tq }\n" + "\t SJW :=3D { NUMBER in tq }\n" + "\t TDCV :=3D { NUMBER in tc }\n" + "\t TDCO :=3D { NUMBER in tc }\n" + "\t TDCF :=3D { NUMBER in tc }\n" + "\t RESTART-MS :=3D { 0 | NUMBER in ms }\n" ); } =20 --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 060951AA7BF; Sat, 29 Nov 2025 15:29:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430196; cv=none; b=ZzvVNEegAGL9ZjugCGz6x+XYbVui3s2uCVGf57/FjWxrm//jX5nnQS3hkoyYYdBr4fCaHBBUmG7ox/G2Dx0ZcFKJQyKXYNPHhO8wFIOADYPFnfTiz510gWvMYRTWT96lcQ6pMIhpuB4i/Qjf5CqGLszQTXWdf4R+fmRKdQ5KMEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430196; c=relaxed/simple; bh=M4KKHo72Z25bXFP51FFH0SkrJdmV0dkgh6ZN6tjjy80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CoXYbtA9FtaGP/SpHoi5nT4lk47A/rkgbzaXJD8mRQRZ75a3mWupbGT5haAznFnUEXdc3nmMEThfKZ8/aTPyr0mYiUa2nCqzZreZRJNh0h1qNzzXLn/XR3IFfAi59lntVlbp9FnIlr07zuU0u1IZAA3xmB5ZmAAbDWnZRgxWqkc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PMo0SbF0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PMo0SbF0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F1ADC4CEF7; Sat, 29 Nov 2025 15:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430195; bh=M4KKHo72Z25bXFP51FFH0SkrJdmV0dkgh6ZN6tjjy80=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PMo0SbF0/UcJyI9yq5qWBPjV4lxx70BR/9osWcUCaKEhmPalnxAuMmC9vI1tTrvn0 hEWZeEAswhXJMFC0aMzAIf3+LzdoVnIrIh4xBtSFF0JY6FJll5Eel0wq2YG0dHK0DX R0zhZB6nBkK+CfmhCv+h6sGDteWf1IMk+ZfF67iQNiYoQ9KOAuk/3te0NLVgzH4tp4 ookJKSuOV2zbrZg+/zc+nzbznEG6JM2oodJVDzCk9aEfhKM82CjzphYtW3xSw3ltrv KPpC3ummhQp1eIzdEq91EkDL5EZpTIX3DThdrOcsun4xW2dVrh1nCiVaNkHaZjFBgs FE6Ct2+39/YmQ== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:07 +0100 Subject: [PATCH 2/7] iplink_can: print_usage: change unit for minimum time quanta to mtq Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-2-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1309; i=mailhol@kernel.org; h=from:subject:message-id; bh=M4KKHo72Z25bXFP51FFH0SkrJdmV0dkgh6ZN6tjjy80=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagqGrCi+1pRyTTW/7vNH0/kUdhXNxXbvVfs0tmL5Ca rvdV9P1HaUsDGJcDLJiiizLyjm5FToKvcMO/bWEmcPKBDKEgYtTACZy4Sojw2FNnswLBWuzeT7v vS2z9t76Er+gnXvWnm7ybslbl7y84jrDP8s1DoHF+Yn2WZtt3z6w//D7+rVqzoaZKea5okaMNx9 dYQQA X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 In the vast majority of the available CAN datasheets, the minimum time quanta is abbreviated as "mtq". Note that the ISO standard uses "tqmin" (with the "min" part as a subscript). One fact is that no one seems to be using "tc". I was actually the one who initially proposed to use "tc", but I can not recall anymore the reasoning behind that. Change the minimum time quanta unit from "tc" to "mtq" to follow what the majority of the industry does. Fixes: 0c263d7c36ff ("iplink_can: add new CAN FD bittiming parameters: Tran= smitter Delay Compensation (TDC)") Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index f3640fe0..ee27659c 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -56,9 +56,9 @@ static void print_usage(FILE *f) "\t PHASE-SEG1 :=3D { NUMBER in tq }\n" "\t PHASE-SEG2 :=3D { NUMBER in tq }\n" "\t SJW :=3D { NUMBER in tq }\n" - "\t TDCV :=3D { NUMBER in tc }\n" - "\t TDCO :=3D { NUMBER in tc }\n" - "\t TDCF :=3D { NUMBER in tc }\n" + "\t TDCV :=3D { NUMBER in mtq }\n" + "\t TDCO :=3D { NUMBER in mtq }\n" + "\t TDCF :=3D { NUMBER in mtq }\n" "\t RESTART-MS :=3D { 0 | NUMBER in ms }\n" ); } --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 919BE1AA7BF; Sat, 29 Nov 2025 15:30:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430200; cv=none; b=jyateCjmBTKq7la3eANkjpy8Dcix9W3y+x0kqOk3ZXINCNDA1cwywN6lPJhYv3JP/CpcxcrTR8yCAYPUpAFIWn9vvYoqlS/kUdFkhtCsZboDV40tnWJhgeCodFAe2Dw15KibV4pYf+V+cF1llHgFNvvfHN4UgbZrXVhNp1btfro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430200; c=relaxed/simple; bh=tPQFzBWyzlWi11g6MZ0oEmeF5bwYY9HMEYIGQJpoLEE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qyeCxGZ2PXiF2WtLtaLltd28vqblMQoM+5n/FxTI/NkcHiUa1+nyRwC9qfHdQWWsoNYewAd+mO0VrODOnNt1Hmip0mxdCjnLWqMfVEwsKVp4lFTxG9YGSLH1gpevQJSWCSNicEuFAcWk9jOFh3kMVcceNKbB5YjLzVg1XxKySTI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BxdlROas; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BxdlROas" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8896EC113D0; Sat, 29 Nov 2025 15:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430200; bh=tPQFzBWyzlWi11g6MZ0oEmeF5bwYY9HMEYIGQJpoLEE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BxdlROasFvzPCa78ZpZokiiTjyYatmq08cd0llQEXzKFMhH0wpfddBpKlw+9ENZDH PjYSpAG5PZu6d4IPMjzEoFHSzOojZP6OF8JkXpHgUvyXUK0VJYt91ax5gsZNAosvdv 0NAkfeN7ReXzoxh0tpQELeMR0OD0OhFhn3Ng4t8WHi1xK1rykp3XRcVj7LXn66Jlag GBI3W9PgGhT4crmaRSFzkAxw1j6JFYqeKmuk+K0+vgb/3sx0dDbCwGWmAWaputmXpg x2k+5p/0/bvJD4YAV8OzStDHCGf6iilTcjPBO+JudwyiwSZY5IHSEFJhnDEy+EollY Y2Ci8+iLsT1Dw== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:08 +0100 Subject: [PATCH 3/7] iplink_can: print_usage: describe the CAN bittiming units Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-3-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=934; i=mailhol@kernel.org; h=from:subject:message-id; bh=tPQFzBWyzlWi11g6MZ0oEmeF5bwYY9HMEYIGQJpoLEE=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnaghFHdHI6GeT6X4g9/B5wR8vqbGkkd28hu+KRbS0d+ +b/3hHfUcrCIMbFICumyLKsnJNboaPQO+zQX0uYOaxMIEMYuDgFYCILzjP8T8+4sfVBzetVd7ca RIY731QoybY2XdLc0rfLa3tm4HMTPYa/8jwCDx+vZ3B1Eon7+PzhAYNN7YG/7xsf5OhNL9uwtsm cGwA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 While the meaning of "bps" or "ns" may be relatively easy to understand, some of the CAN specific units such as "mtq" (minimum time quanta) may be harder to understand. Add a new paragraph to the help menu which describes all the different units used for the CAN bittiming parameters. Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index ee27659c..a2f59764 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -60,6 +60,13 @@ static void print_usage(FILE *f) "\t TDCO :=3D { NUMBER in mtq }\n" "\t TDCF :=3D { NUMBER in mtq }\n" "\t RESTART-MS :=3D { 0 | NUMBER in ms }\n" + "\n" + "\tUnits:\n" + "\t bps :=3D bit per second\n" + "\t ms :=3D milli second\n" + "\t mtq :=3D minimum time quanta\n" + "\t ns :=3D nano second\n" + "\t tq :=3D time quanta\n" ); } =20 --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68E941F4CBC; Sat, 29 Nov 2025 15:30:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430204; cv=none; b=NwlEsqgDWaKoanC407AuezxoLWi9hwQBiaFJBYiwqDcdOodLXhJp7/TMduOIA7ZwqVXxfSk5X0Bqlo+VdVyseIXDhSV453eljmSH7TkZDos+ufF7p4x6Kk5ZtxqSceTJbW51urezN3O+hUuhBX+Ns3UJJu/EJVeVMnsJlWc/6Sc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430204; c=relaxed/simple; bh=VmlCwOmbLraO0q+f17W68Vp2cULBJAlHJpKgkRtYdJw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JZeRYAiIXvVLusie7nYYfOKKjkTDD0yDjcT66HCelxS/dxiDhvyvI981DL0Qxhp7AxDdUCJYduylRMhJ3+dhWN8o7hls0kRn8/JRDgT7u/YHlJUDJ7KRqZ8Ff6kG7JrjCRX48R6qmLkXrpSjcg3f9lKPYRWtBA6zvS5heULtC94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mQgKqAZa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mQgKqAZa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABCD7C4CEF7; Sat, 29 Nov 2025 15:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430204; bh=VmlCwOmbLraO0q+f17W68Vp2cULBJAlHJpKgkRtYdJw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mQgKqAZaO51fJ/ACj+Zu91dgBNna/1z918W36PRNM8CRxcwwCRsP8H1GTz9rqH/v2 EzLRsc7gGRvYnoVr1BQDmz2yfEaB51fxqDzgV6bBorTomtGbm0oX59r93+SbFOfi8d UOsZT245ML+qww6k8lPIRvI6BTZBeF6azpkJWGnStxaJNw3/weVcqAI/skTefAirjl cEUbChw83QZYV8k9AIHNtyGAp9yb/g6i32Ms3t3FyvyahYLhaEQ1UtmapE4eJMR5Ad FsNtmjRZJYJB7dRy3Cr+8VD9IITypX+nJMO60H9xS+eG8vF8gHzlwFbP9xgvZSX3PO gytT98xvsgm8A== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:09 +0100 Subject: [PATCH 4/7] iplink_can: add the "restricted" option Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-4-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2100; i=mailhol@kernel.org; h=from:subject:message-id; bh=VmlCwOmbLraO0q+f17W68Vp2cULBJAlHJpKgkRtYdJw=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagtGHdz49HVb74N/C1g7PN73tTB63prN6ezlYqMz41 8D4SLO8o5SFQYyLQVZMkWVZOSe3Qkehd9ihv5Ywc1iZQIYwcHEKwEQWFDL8ZHxzI6YqmtPR+9jT zNIDNT3f7M4a98geqqj7cjyB4eq9VEaGxvdd5wyFIj4dMRdTOrbldr/XEaOj+96Y3WDZ3bT6jkg gLwA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 This is the iproute2 counterpart of Linux kernel's commit 60f511f443e5 ("can: netlink: add CAN_CTRLMODE_RESTRICTED"). ISO 11898-1:2024 adds a new restricted operation mode. This mode is added as a mandatory feature for nodes which support CAN XL and is retrofitted as optional for legacy nodes (i.e. the ones which only support Classical CAN and CAN FD). The restricted operation mode is nearly the same as the listen only mode: the node can not send data frames or remote frames and can not send dominant bits if an error occurs. The only exception is that the node shall still send the acknowledgment bit. Add the "restricted" option to iplink_can which controls the CAN_CTRLMODE_RESTRICTED flag of the netlink interface. Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index a2f59764..aeae6185 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -42,6 +42,7 @@ static void print_usage(FILE *f) "\t[ presume-ack { on | off } ]\n" "\t[ cc-len8-dlc { on | off } ]\n" "\t[ tdc-mode { auto | manual | off } ]\n" + "\t[ restricted { on | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" @@ -116,6 +117,7 @@ static void print_ctrlmode(enum output_type t, __u32 fl= ags, const char *key) print_flag(t, &flags, CAN_CTRLMODE_CC_LEN8_DLC, "CC-LEN8-DLC"); print_flag(t, &flags, CAN_CTRLMODE_TDC_AUTO, "TDC-AUTO"); print_flag(t, &flags, CAN_CTRLMODE_TDC_MANUAL, "TDC-MANUAL"); + print_flag(t, &flags, CAN_CTRLMODE_RESTRICTED, "RESTRICTED"); =20 if (flags) print_hex(t, NULL, "%x", flags); @@ -257,6 +259,9 @@ static int can_parse_opt(struct link_util *lu, int argc= , char **argv, invarg("\"tdc-mode\" must be either of \"auto\", \"manual\" or \"off\"= ", *argv); } + } else if (matches(*argv, "restricted") =3D=3D 0) { + NEXT_ARG(); + set_ctrlmode("restricted", *argv, &cm, CAN_CTRLMODE_RESTRICTED); } else if (matches(*argv, "restart") =3D=3D 0) { __u32 val =3D 1; =20 --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06A3A27146A; Sat, 29 Nov 2025 15:30:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430209; cv=none; b=rkEeGYGPDNNV3pa/NOR7bT/YpKNUvE6xtLig6H+ezgf0UIxshQhA3mhGfs9UmS5U38tlNXQSWsqcrsegJrDGALv8keySjoGQ8LOE4DMth3w7PHhFLHss/qfeLZeq0FpNYbwOnYqheoMCHJkk3fpuOXoDbOOZ8ov7FWmL0UFvcoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430209; c=relaxed/simple; bh=71I/uJiS2l+XFAjTfSkSGBAKoyR9OB0awrBrnDRfeos=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZQI4CS368WFgRtm2z5Qf9x9swnTr+u4y7gnFcYdkKDR6Q1T1f2KOb7vS4lTvd+I8UFKyJLpqm36mVbRtt3ClFRtZSuvUCRTzD6m/HgolS6VrQElIvQ7tLscGkdjRseCXyfODK4DGv7keqA1nXC/jVjSTUa0YN1vdP729HyQre/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MwtgdoOi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MwtgdoOi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD044C113D0; Sat, 29 Nov 2025 15:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430208; bh=71I/uJiS2l+XFAjTfSkSGBAKoyR9OB0awrBrnDRfeos=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MwtgdoOiVq24/TcP+vpx2gi4iF8weS8tz1RxV7MHEhMgPW0TOwbBo4JP5I8EOc9r0 XEY1kNtFS4xwzPlNZgPrhqLdG+rSFH/W7Xiul9OAYPrUcvRrLESKVy572s8HPB3Zq1 lSx1MfmhT+wa8nraP7VPM2SaEwn3v+XfEYQm8CUleKMJkYsaGE5O2Uefy3X2dPM38u muoCSDIhf5jXUr2/elQoIpOrz6dAwr+1iPQSeu12YorhkTLoVQ/zRCaax5rxsDs8UX 6UxmFRrkc4p9v3bvbPZ/dPbDjD4sSp6+tY5QUs3/hOQoPs91tTLkcpplqa1Mn+MLVJ eLcwrGScwaU7A== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:10 +0100 Subject: [PATCH 5/7] iplink_can: add initial CAN XL support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-5-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=15363; i=mailhol@kernel.org; h=from:subject:message-id; bh=71I/uJiS2l+XFAjTfSkSGBAKoyR9OB0awrBrnDRfeos=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagnFH49Vu3U4Mjts1f37frw/u0//pqaUx35RKjxO51 CI/+01uRykLgxgXg6yYIsuyck5uhY5C77BDfy1h5rAygQxh4OIUgIm8TGVkOOndprGdO5ZZ9EHo 3UaL6zwW0pP37Pz4Zqnle7bKSaUP9jH8r1U1LJi+VV3LhjPSZTpvxYE/5U8CdLk4uR41Fy2bNqO aFQA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 This is the iproute2 counterpart of Linux kernel's commit e63281614747 ("can: netlink: add initial CAN XL support"). CAN XL uses bittiming parameters different from Classical CAN and CAN FD. Thus, all the data bittiming parameters, including TDC, need to be duplicated for CAN XL. Add the "xl" option to iplink_can which controls the CAN_CTRLMODE_XL flag of the netlink interface. Then add the "xbitrate", "xsample-point", "xtq", "xprop-seg", "xphase-seg1", "xphase-seg2", "xsjw", "xtdcv", "xtdco", "xtdcf" and "xtdc-mode" which are all sub options of "xl". Add the logic to query and print all those values. Update print_usage() accordingly. All these options behave similarly to their CAN FD equivalent. The new options which are specific to CAN XL (i.e. not inherited from CAN FD) will be added in a subsequent change. Example using the dummy_can driver: # modprobe dummy_can # ip link set can0 type can bitrate 500000 fd on dbitrate 2000000 xl on x= bitrate 8000000 $ ip --details link show can0 5: can0: mtu 2060 qdisc noop state DOWN mode DEFAULT group defaul= t qlen 10 link/can promiscuity 0 allmulti 0 minmtu 76 maxmtu 2060 can state STOPPED restart-ms 0 bitrate 500000 sample-point 0.875 tq 12 prop-seg 69 phase-seg1 70 phase-seg2 20 sjw 10 brp 2 dummy_can CC: tseg1 2..256 tseg2 2..128 sjw 1..128 brp 1..512 brp_inc 1 dbitrate 2000000 dsample-point 0.750 dtq 6 dprop-seg 29 dphase-seg1 30 dphase-seg2 20 dsjw 10 dbrp 1 tdco 60 tdcf 0 dummy_can FD: dtseg1 2..256 dtseg2 2..128 dsjw 1..128 dbrp 1..512 dbrp= _inc 1 tdco 0..127 tdcf 0..127 xbitrate 8000000 xsample-point 0.750 xtq 6 xprop-seg 7 xphase-seg1 7 xphase-seg2 5 xsjw 2 xbrp 1 xtdco 15 xtdcf 0 dummy_can XL: xtseg1 2..256 xtseg2 2..128 xsjw 1..128 xbrp 1..512 xbrp= _inc 1 xtdco 0..127 xtdcf 0..127 clock 160000000 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max= _segs 65535 tso_max_size 65536 tso_max_segs 65535 gro_max_size 65536 gso_ip= v4_max_size 65536 gro_ipv4_max_size 65536 Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ---- 1 file changed, 195 insertions(+), 13 deletions(-) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index aeae6185..24f59aad 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -32,6 +32,10 @@ static void print_usage(FILE *f) "\t[ dtq TQ dprop-seg PROP_SEG dphase-seg1 PHASE-SEG1\n \t dphase-seg2 = PHASE-SEG2 [ dsjw SJW ] ]\n" "\t[ tdcv TDCV tdco TDCO tdcf TDCF ]\n" "\n" + "\t[ xbitrate BITRATE [ xsample-point SAMPLE-POINT] ] |\n" + "\t[ xtq TQ xprop-seg PROP_SEG xphase-seg1 PHASE-SEG1\n \t xphase-seg2 = PHASE-SEG2 [ xsjw SJW ] ]\n" + "\t[ xtdcv TDCV xtdco TDCO xtdcf TDCF ]\n" + "\n" "\t[ loopback { on | off } ]\n" "\t[ listen-only { on | off } ]\n" "\t[ triple-sampling { on | off } ]\n" @@ -43,6 +47,8 @@ static void print_usage(FILE *f) "\t[ cc-len8-dlc { on | off } ]\n" "\t[ tdc-mode { auto | manual | off } ]\n" "\t[ restricted { on | off } ]\n" + "\t[ xl { on | off } ]\n" + "\t[ xtdc-mode { auto | manual | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" @@ -118,6 +124,9 @@ static void print_ctrlmode(enum output_type t, __u32 fl= ags, const char *key) print_flag(t, &flags, CAN_CTRLMODE_TDC_AUTO, "TDC-AUTO"); print_flag(t, &flags, CAN_CTRLMODE_TDC_MANUAL, "TDC-MANUAL"); print_flag(t, &flags, CAN_CTRLMODE_RESTRICTED, "RESTRICTED"); + print_flag(t, &flags, CAN_CTRLMODE_XL, "XL"); + print_flag(t, &flags, CAN_CTRLMODE_XL_TDC_AUTO, "XL-TDC-AUTO"); + print_flag(t, &flags, CAN_CTRLMODE_XL_TDC_MANUAL, "XL-TDC-MANUAL"); =20 if (flags) print_hex(t, NULL, "%x", flags); @@ -128,9 +137,10 @@ static void print_ctrlmode(enum output_type t, __u32 f= lags, const char *key) static int can_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) { - struct can_bittiming bt =3D {}, fd_dbt =3D {}; + struct can_bittiming bt =3D {}, fd_dbt =3D {}, xl_dbt =3D {}; struct can_ctrlmode cm =3D { 0 }; struct can_tdc fd =3D { .tdcv =3D -1, .tdco =3D -1, .tdcf =3D -1 }; + struct can_tdc xl =3D { .tdcv =3D -1, .tdco =3D -1, .tdcf =3D -1 }; =20 while (argc > 0) { if (matches(*argv, "bitrate") =3D=3D 0) { @@ -208,6 +218,52 @@ static int can_parse_opt(struct link_util *lu, int arg= c, char **argv, NEXT_ARG(); if (get_u32(&fd.tdcf, *argv, 0)) invarg("invalid \"tdcf\" value", *argv); + } else if (matches(*argv, "xl") =3D=3D 0) { + NEXT_ARG(); + set_ctrlmode("xl", *argv, &cm, CAN_CTRLMODE_XL); + } else if (matches(*argv, "xbitrate") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.bitrate, *argv, 0)) + invarg("invalid \"xbitrate\" value", *argv); + } else if (matches(*argv, "xsample-point") =3D=3D 0) { + float sp; + + NEXT_ARG(); + if (get_float(&sp, *argv)) + invarg("invalid \"xsample-point\" value", *argv); + xl_dbt.sample_point =3D (__u32)(sp * 1000); + } else if (matches(*argv, "xtq") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.tq, *argv, 0)) + invarg("invalid \"xtq\" value", *argv); + } else if (matches(*argv, "xprop-seg") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.prop_seg, *argv, 0)) + invarg("invalid \"xprop-seg\" value", *argv); + } else if (matches(*argv, "xphase-seg1") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.phase_seg1, *argv, 0)) + invarg("invalid \"xphase-seg1\" value", *argv); + } else if (matches(*argv, "xphase-seg2") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.phase_seg2, *argv, 0)) + invarg("invalid \"xphase-seg2\" value", *argv); + } else if (matches(*argv, "xsjw") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl_dbt.sjw, *argv, 0)) + invarg("invalid \"xsjw\" value", *argv); + } else if (matches(*argv, "xtdcv") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl.tdcv, *argv, 0)) + invarg("invalid \"xtdcv\" value", *argv); + } else if (matches(*argv, "xtdco") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl.tdco, *argv, 0)) + invarg("invalid \"xtdco\" value", *argv); + } else if (matches(*argv, "xtdcf") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&xl.tdcf, *argv, 0)) + invarg("invalid \"xtdcf\" value", *argv); } else if (matches(*argv, "loopback") =3D=3D 0) { NEXT_ARG(); set_ctrlmode("loopback", *argv, &cm, @@ -262,6 +318,21 @@ static int can_parse_opt(struct link_util *lu, int arg= c, char **argv, } else if (matches(*argv, "restricted") =3D=3D 0) { NEXT_ARG(); set_ctrlmode("restricted", *argv, &cm, CAN_CTRLMODE_RESTRICTED); + } else if (matches(*argv, "xtdc-mode") =3D=3D 0) { + NEXT_ARG(); + if (strcmp(*argv, "auto") =3D=3D 0) { + cm.flags |=3D CAN_CTRLMODE_XL_TDC_AUTO; + cm.mask |=3D CAN_CTRLMODE_XL_TDC_AUTO; + } else if (strcmp(*argv, "manual") =3D=3D 0) { + cm.flags |=3D CAN_CTRLMODE_XL_TDC_MANUAL; + cm.mask |=3D CAN_CTRLMODE_XL_TDC_MANUAL; + } else if (strcmp(*argv, "off") =3D=3D 0) { + cm.mask |=3D CAN_CTRLMODE_XL_TDC_AUTO | + CAN_CTRLMODE_XL_TDC_MANUAL; + } else { + invarg("\"xtdc-mode\" must be either of \"auto\", \"manual\" or \"off\= "", + *argv); + } } else if (matches(*argv, "restart") =3D=3D 0) { __u32 val =3D 1; =20 @@ -296,6 +367,8 @@ static int can_parse_opt(struct link_util *lu, int argc= , char **argv, addattr_l(n, 1024, IFLA_CAN_BITTIMING, &bt, sizeof(bt)); if (fd_dbt.bitrate || fd_dbt.tq) addattr_l(n, 1024, IFLA_CAN_DATA_BITTIMING, &fd_dbt, sizeof(fd_dbt)); + if (xl_dbt.bitrate || xl_dbt.tq) + addattr_l(n, 1024, IFLA_CAN_XL_DATA_BITTIMING, &xl_dbt, sizeof(xl_dbt)); if (cm.mask) addattr_l(n, 1024, IFLA_CAN_CTRLMODE, &cm, sizeof(cm)); =20 @@ -311,6 +384,18 @@ static int can_parse_opt(struct link_util *lu, int arg= c, char **argv, addattr32(n, 1024, IFLA_CAN_TDC_TDCF, fd.tdcf); addattr_nest_end(n, tdc); } + if (xl.tdcv !=3D -1 || xl.tdco !=3D -1 || xl.tdcf !=3D -1) { + struct rtattr *tdc =3D addattr_nest(n, 1024, + IFLA_CAN_XL_TDC | NLA_F_NESTED); + + if (xl.tdcv !=3D -1) + addattr32(n, 1024, IFLA_CAN_TDC_TDCV, xl.tdcv); + if (xl.tdco !=3D -1) + addattr32(n, 1024, IFLA_CAN_TDC_TDCO, xl.tdco); + if (xl.tdcf !=3D -1) + addattr32(n, 1024, IFLA_CAN_TDC_TDCF, xl.tdcf); + addattr_nest_end(n, tdc); + } =20 return 0; } @@ -341,58 +426,67 @@ can_print_timing_min_max(const char *json_attr, const= char *fp_attr, close_json_object(); } =20 -static void can_print_tdc_opt(struct rtattr *tdc_attr) +static void can_print_tdc_opt(struct rtattr *tdc_attr, bool is_xl) { struct rtattr *tb[IFLA_CAN_TDC_MAX + 1]; =20 parse_rtattr_nested(tb, IFLA_CAN_TDC_MAX, tdc_attr); if (tb[IFLA_CAN_TDC_TDCV] || tb[IFLA_CAN_TDC_TDCO] || tb[IFLA_CAN_TDC_TDCF]) { - open_json_object("tdc"); + const char *tdc =3D is_xl ? "xtdc" : "tdc"; + + open_json_object(tdc); can_print_nl_indent(); if (tb[IFLA_CAN_TDC_TDCV]) { + const char *tdcv_fmt =3D is_xl ? " xtdcv %u" : " tdcv %u"; __u32 *tdcv =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCV]); =20 - print_uint(PRINT_ANY, "tdcv", " tdcv %u", *tdcv); + print_uint(PRINT_ANY, "tdcv", tdcv_fmt, *tdcv); } if (tb[IFLA_CAN_TDC_TDCO]) { + const char *tdco_fmt =3D is_xl ? " xtdco %u" : " tdco %u"; __u32 *tdco =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCO]); =20 - print_uint(PRINT_ANY, "tdco", " tdco %u", *tdco); + print_uint(PRINT_ANY, "tdco", tdco_fmt, *tdco); } if (tb[IFLA_CAN_TDC_TDCF]) { + const char *tdcf_fmt =3D is_xl ? " xtdcf %u" : " tdcf %u"; __u32 *tdcf =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCF]); =20 - print_uint(PRINT_ANY, "tdcf", " tdcf %u", *tdcf); + print_uint(PRINT_ANY, "tdcf", tdcf_fmt, *tdcf); } close_json_object(); } } =20 -static void can_print_tdc_const_opt(struct rtattr *tdc_attr) +static void can_print_tdc_const_opt(struct rtattr *tdc_attr, bool is_xl) { + const char *tdc =3D is_xl ? "xtdc" : "tdc"; struct rtattr *tb[IFLA_CAN_TDC_MAX + 1]; =20 parse_rtattr_nested(tb, IFLA_CAN_TDC_MAX, tdc_attr); - open_json_object("tdc"); + open_json_object(tdc); can_print_nl_indent(); if (tb[IFLA_CAN_TDC_TDCV_MIN] && tb[IFLA_CAN_TDC_TDCV_MAX]) { __u32 *tdcv_min =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCV_MIN]); __u32 *tdcv_max =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCV_MAX]); + const char *tdcv =3D is_xl ? " xtdcv" : " tdcv"; =20 - can_print_timing_min_max("tdcv", " tdcv", *tdcv_min, *tdcv_max); + can_print_timing_min_max("tdcv", tdcv, *tdcv_min, *tdcv_max); } if (tb[IFLA_CAN_TDC_TDCO_MIN] && tb[IFLA_CAN_TDC_TDCO_MAX]) { __u32 *tdco_min =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCO_MIN]); __u32 *tdco_max =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCO_MAX]); + const char *tdco =3D is_xl ? " xtdco" : " tdco"; =20 - can_print_timing_min_max("tdco", " tdco", *tdco_min, *tdco_max); + can_print_timing_min_max("tdco", tdco, *tdco_min, *tdco_max); } if (tb[IFLA_CAN_TDC_TDCF_MIN] && tb[IFLA_CAN_TDC_TDCF_MAX]) { __u32 *tdcf_min =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCF_MIN]); __u32 *tdcf_max =3D RTA_DATA(tb[IFLA_CAN_TDC_TDCF_MAX]); + const char *tdcf =3D is_xl ? " xtdcf" : " tdcf"; =20 - can_print_timing_min_max("tdcf", " tdcf", *tdcf_min, *tdcf_max); + can_print_timing_min_max("tdcf", tdcf, *tdcf_min, *tdcf_max); } close_json_object(); } @@ -546,7 +640,7 @@ static void can_print_opt(struct link_util *lu, FILE *f= , struct rtattr *tb[]) print_uint(PRINT_ANY, "brp", " dbrp %u", dbt->brp); =20 if (tb[IFLA_CAN_TDC]) - can_print_tdc_opt(tb[IFLA_CAN_TDC]); + can_print_tdc_opt(tb[IFLA_CAN_TDC], false); =20 close_json_object(); } @@ -570,7 +664,7 @@ static void can_print_opt(struct link_util *lu, FILE *f= , struct rtattr *tb[]) print_uint(PRINT_ANY, "brp_inc", " dbrp_inc %u", dbtc->brp_inc); =20 if (tb[IFLA_CAN_TDC]) - can_print_tdc_const_opt(tb[IFLA_CAN_TDC]); + can_print_tdc_const_opt(tb[IFLA_CAN_TDC], false); =20 close_json_object(); } @@ -609,6 +703,94 @@ static void can_print_opt(struct link_util *lu, FILE *= f, struct rtattr *tb[]) close_json_array(PRINT_ANY, " ]"); } =20 + /* data bittiming is irrelevant if fixed bitrate is defined */ + if (tb[IFLA_CAN_XL_DATA_BITTIMING] && + !tb[IFLA_CAN_XL_DATA_BITRATE_CONST]) { + struct can_bittiming *dbt =3D + RTA_DATA(tb[IFLA_CAN_XL_DATA_BITTIMING]); + char dsp[6]; + + open_json_object("xl_data_bittiming"); + can_print_nl_indent(); + print_uint(PRINT_ANY, "bitrate", " xbitrate %u", dbt->bitrate); + snprintf(dsp, sizeof(dsp), "%.3f", dbt->sample_point / 1000.); + print_string(PRINT_ANY, "sample_point", " xsample-point %s", + dsp); + can_print_nl_indent(); + print_uint(PRINT_ANY, "tq", " xtq %u", dbt->tq); + print_uint(PRINT_ANY, "prop_seg", " xprop-seg %u", + dbt->prop_seg); + print_uint(PRINT_ANY, "phase_seg1", " xphase-seg1 %u", + dbt->phase_seg1); + print_uint(PRINT_ANY, "phase_seg2", " xphase-seg2 %u", + dbt->phase_seg2); + print_uint(PRINT_ANY, "sjw", " xsjw %u", dbt->sjw); + print_uint(PRINT_ANY, "brp", " xbrp %u", dbt->brp); + + if (tb[IFLA_CAN_XL_TDC]) + can_print_tdc_opt(tb[IFLA_CAN_XL_TDC], true); + + close_json_object(); + } + + /* data bittiming const is irrelevant if fixed bitrate is defined */ + if (tb[IFLA_CAN_XL_DATA_BITTIMING_CONST] && + !tb[IFLA_CAN_XL_DATA_BITRATE_CONST]) { + struct can_bittiming_const *dbtc =3D + RTA_DATA(tb[IFLA_CAN_XL_DATA_BITTIMING_CONST]); + + open_json_object("xl_data_bittiming_const"); + can_print_nl_indent(); + print_string(PRINT_ANY, "name", " %s:", dbtc->name); + can_print_timing_min_max("tseg1", " xtseg1", + dbtc->tseg1_min, dbtc->tseg1_max); + can_print_timing_min_max("tseg2", " xtseg2", + dbtc->tseg2_min, dbtc->tseg2_max); + can_print_timing_min_max("sjw", " xsjw", 1, dbtc->sjw_max); + can_print_timing_min_max("brp", " xbrp", + dbtc->brp_min, dbtc->brp_max); + print_uint(PRINT_ANY, "brp_inc", " xbrp_inc %u", dbtc->brp_inc); + + if (tb[IFLA_CAN_XL_TDC]) + can_print_tdc_const_opt(tb[IFLA_CAN_XL_TDC], true); + + close_json_object(); + } + + if (tb[IFLA_CAN_XL_DATA_BITRATE_CONST]) { + __u32 *dbitrate_const =3D + RTA_DATA(tb[IFLA_CAN_XL_DATA_BITRATE_CONST]); + int dbitrate_cnt =3D + RTA_PAYLOAD(tb[IFLA_CAN_XL_DATA_BITRATE_CONST]) / + sizeof(*dbitrate_const); + int i; + __u32 dbitrate =3D 0; + + if (tb[IFLA_CAN_XL_DATA_BITTIMING]) { + struct can_bittiming *dbt =3D + RTA_DATA(tb[IFLA_CAN_XL_DATA_BITTIMING]); + dbitrate =3D dbt->bitrate; + } + + can_print_nl_indent(); + print_uint(PRINT_ANY, "xl_data_bittiming_bitrate", " xbitrate %u", + dbitrate); + can_print_nl_indent(); + open_json_array(PRINT_ANY, is_json_context() ? + "data_bitrate_const" : " ["); + for (i =3D 0; i < dbitrate_cnt; ++i) { + /* This will keep lines below 80 signs */ + if (!(i % 6) && i) { + can_print_nl_indent(); + print_string(PRINT_FP, NULL, "%s", " "); + } + print_uint(PRINT_ANY, NULL, + i < dbitrate_cnt - 1 ? "%8u, " : "%8u", + dbitrate_const[i]); + } + close_json_array(PRINT_ANY, " ]"); + } + if (tb[IFLA_CAN_TERMINATION_CONST] && tb[IFLA_CAN_TERMINATION]) { __u16 *trm =3D RTA_DATA(tb[IFLA_CAN_TERMINATION]); __u16 *trm_const =3D RTA_DATA(tb[IFLA_CAN_TERMINATION_CONST]); --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FBFA3101BC; Sat, 29 Nov 2025 15:30:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430213; cv=none; b=BP8xPNv/z1hhjEN8JgEnlMuSNyehb37NbqDcBjctrc57XMrzCm0A7W9Z9kR5qjOdWntS10OjJzNcoW2wXqkasPjkZbxnVdAr7eiUGNJcKjTKacD9lggBRzfwBAsuKHzYpOuvIz8HAPMZlLj2W2vX9Fk1zT4ORG5V+c1bEKANqZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430213; c=relaxed/simple; bh=3TP7SNqp7tWdCwXEIzykODHN5BrAV73rkGehEawXc4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u0CMyAkf381m07nu+kMVagabEnnaWmYq4DIi/YSCS2yjAVzeDzWgX3QhPyiIqetFj5qLtxeSChvuZTLxE4OQXs/PBag63s9lK4aAsdfDozAJOIbGdbvlBoffpdUEfUo6fNdpXKzB1gJP/trmA/7XMCQLFh4akX0koorQ4LWqbTE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NDVty03f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NDVty03f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27114C116C6; Sat, 29 Nov 2025 15:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430212; bh=3TP7SNqp7tWdCwXEIzykODHN5BrAV73rkGehEawXc4E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NDVty03fRNXdboV/4pft3+zqAvBaRf6WBukaCK5RL91sbZa7Oye/UGfHlSb9rEAHq IsxdZL+ocm+VCg5sMZZtY4XKAkGnMGIA3ucqHExC7trvX7mDxj0ya/CH59p5YwXrfq LyQxsR92MxiETHXi/ecMaDRCytfRBiPrxLypVV3BDd6QkSUuDs6TPVA7zE8t5WsTG/ QpgVXcmVNEMMs14ndjgKmoE3GMfTc8a7x1st8DeP9wBudJl5fZ8tfgg7KyBcXtMP01 tf3nk8Df4zFJ3lAn/v9covIMdNroQsjyzaalzw+VMvihk0+IW0+fkrEi6/aMFnIZHQ ex8CZPzI2C85w== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:11 +0100 Subject: [PATCH 6/7] iplink_can: add CAN XL's "tms" option Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-6-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1884; i=mailhol@kernel.org; h=from:subject:message-id; bh=3TP7SNqp7tWdCwXEIzykODHN5BrAV73rkGehEawXc4E=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagol5VfOjf3rzfONkzut6Z8BdO3H9zdhFac6GoQJvh H9UzejpKGVhEONikBVTZFlWzsmt0FHoHXboryXMHFYmkCEMXJwCMJFNhxkZVtjM/B68kHGLzdZp E7nUgu67Rp3sPvR+Okd+tvnOB9sYjBn+iqp1G07vubT/QeHDk88YhPXt92zfmlyvMkfEI6fM8PM 3FgA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 This is the iproute2 counterpart of Linux kernel's commit 233134af2086 ("can: netlink: add CAN_CTRLMODE_XL_TMS flag"). The Transceiver Mode Switching (TMS) indicates whether the CAN XL controller shall use the PWM or NRZ encoding during the data phase. The term "transceiver mode switching" is used in both ISO 11898-1 and CiA 612-2 (although only the latter one uses the abbreviation TMS). We adopt the same naming convention here for consistency. Add the "tms" option to iplink_can which controls the CAN_CTRLMODE_XL_TMS flag of the CAN netlink interface. Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index 24f59aad..3e7925e8 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -49,6 +49,7 @@ static void print_usage(FILE *f) "\t[ restricted { on | off } ]\n" "\t[ xl { on | off } ]\n" "\t[ xtdc-mode { auto | manual | off } ]\n" + "\t[ tms { on | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" @@ -127,6 +128,7 @@ static void print_ctrlmode(enum output_type t, __u32 fl= ags, const char *key) print_flag(t, &flags, CAN_CTRLMODE_XL, "XL"); print_flag(t, &flags, CAN_CTRLMODE_XL_TDC_AUTO, "XL-TDC-AUTO"); print_flag(t, &flags, CAN_CTRLMODE_XL_TDC_MANUAL, "XL-TDC-MANUAL"); + print_flag(t, &flags, CAN_CTRLMODE_XL_TMS, "XL-TMS"); =20 if (flags) print_hex(t, NULL, "%x", flags); @@ -333,6 +335,9 @@ static int can_parse_opt(struct link_util *lu, int argc= , char **argv, invarg("\"xtdc-mode\" must be either of \"auto\", \"manual\" or \"off\= "", *argv); } + } else if (matches(*argv, "tms") =3D=3D 0) { + NEXT_ARG(); + set_ctrlmode("tms", *argv, &cm, CAN_CTRLMODE_XL_TMS); } else if (matches(*argv, "restart") =3D=3D 0) { __u32 val =3D 1; =20 --=20 2.51.2 From nobody Mon Dec 1 22:04:03 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74D0F21765B; Sat, 29 Nov 2025 15:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430216; cv=none; b=OA997RSW/8Ih0uxHmKskwRz6nwP45FsRgLhYfJKsEk66hEpi9ZHtsTFx8oC/mKuafpmLMt0sdEopSJ6HzrlShnbbZ2vEwOSbmYJ5IAtgpcz1cAvdhCvIHAQxeymfx/OePXFTZq3xFJhdFf5GovRTjVBY4UpK98DXO+MdwM/T/BQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764430216; c=relaxed/simple; bh=y6dkWsrB+ftplpB9FhS79M4pgOeDD8fmYpj+PGz3tHg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qfTZamY3rLDvY8bwgGk7cS4oFrvfvSkeQDkiBLj3hoYIBQsp9WBoWAFzzmlVDoOdefqPxHFnndp2VOL9YaevG5mdLonoZ6KH2ickX85QEJgZ+sfhxweC2WXTM+vZ2KRdEMsfhTGyqyZRbTfLV514JW6s/xYA3gqHROOk81b///k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nYrXys2H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nYrXys2H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CF23C113D0; Sat, 29 Nov 2025 15:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764430216; bh=y6dkWsrB+ftplpB9FhS79M4pgOeDD8fmYpj+PGz3tHg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nYrXys2HeKbzpATyO+PFeS2K3ogw7kWF0kYgaK50yUHGJALDDclJSfy0YFVlf6CMt P5jb/GM2nuGXd875VWVNiOsUeuK02XhMZTidmZO2pCDaEEq73DgLgvckJbKwz32a5N 5MEKUIsDlgF6e0z7U+0B+XugKRoH1t6qdKozWbkgD+dh5MeX4ttv4DJRhjWGQeX0yT AiF9vnaKjnW5SRN0Znmz02lSESyVOSv8fh7A5RxXBpFTrUXoR1NTt9CL9vnj1kBeSx IfQByTztYTsSl/wnOEWxfKjBjicuXY+sxvlKRBeyKiPv1zL6ARXm2mPrHTqP7onlKX SuvG98O7AxmKA== From: Vincent Mailhol Date: Sat, 29 Nov 2025 16:29:12 +0100 Subject: [PATCH 7/7] iplink_can: add CAN XL's PWM interface Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251129-canxl-netlink-v1-7-96f2c0c54011@kernel.org> References: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> In-Reply-To: <20251129-canxl-netlink-v1-0-96f2c0c54011@kernel.org> To: netdev@vger.kernel.org, Stephen Hemminger , Marc Kleine-Budde , Oliver Hartkopp , David Ahern Cc: linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7544; i=mailhol@kernel.org; h=from:subject:message-id; bh=y6dkWsrB+ftplpB9FhS79M4pgOeDD8fmYpj+PGz3tHg=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJnagqnG/+4tZ96cLzSfJTAmOeX6kg6pBV5TWusC5fsX8 VSyK73sKGVhEONikBVTZFlWzsmt0FHoHXboryXMHFYmkCEMXJwCMBEvWUaG6W51TfVT4gM+74r+ 47tRaotiw2XvWU+9O0UyDvMWv73TxvDP6mGbXmqVWM71Lx9aFv/Tljw1NziR0dp9WqFycGNgx3R 2AA== X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 This is the iproute2 counterpart of Linux kernel's commit 46552323fa67 ("can: netlink: add PWM netlink interface"). When the TMS is switched on, the node uses PWM (Pulse Width Modulation) during the data phase instead of the classic NRZ (Non Return to Zero) encoding. PWM is configured by three parameters: - PWMS: Pulse Width Modulation Short phase - PWML: Pulse Width Modulation Long phase - PWMO: Pulse Width Modulation Offset time For each of these parameters, the CAN netlink interface defines three IFLA symbols: - IFLA_CAN_PWM_PWM*_MIN: the minimum allowed value. - IFLA_CAN_PWM_PWM*_MAX: the maximum allowed value. - IFLA_CAN_PWM_PWM*: the runtime value. This results in a total of nine IFLA symbols which are all nested in a parent IFLA_CAN_XL_PWM symbol. Add the "pwms", "pwml" and "pwmo" options to iplink_can which controls the IFLA_CAN_PWM_PWM* runtime values. Add the logic to query and print all those IFLA values. Update print_usage() accordingly. Example using the dummy_can driver: # modprobe dummy_can # ip link set can0 type can bitrate 1000000 xl on xbitrate 20000000 tms on $ ip --details link show can0 5: can0: mtu 2060 qdisc noop state DOWN mode DEFAULT group defaul= t qlen 10 link/can promiscuity 0 allmulti 0 minmtu 76 maxmtu 2060 can state STOPPED restart-ms 0 bitrate 1000000 sample-point 0.750 tq 6 prop-seg 59 phase-seg1 60 phase-seg2 40 sjw 20 brp 1 dummy_can CC: tseg1 2..256 tseg2 2..128 sjw 1..128 brp 1..512 brp_inc 1 dummy_can FD: dtseg1 2..256 dtseg2 2..128 dsjw 1..128 dbrp 1..512 dbrp= _inc 1 tdco 0..127 tdcf 0..127 xbitrate 20000000 xsample-point 0.625 xtq 6 xprop-seg 2 xphase-seg1 2 xphase-seg2 3 xsjw 1 xbrp 1 pwms 2 pwml 6 pwmo 0 dummy_can XL: xtseg1 2..256 xtseg2 2..128 xsjw 1..128 xbrp 1..512 xbrp= _inc 1 xtdco 0..127 xtdcf 0..127 pwms 1..8 pwml 2..24 pwmo 0..16 clock 160000000 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max= _segs 65535 tso_max_size 65536 tso_max_segs 65535 gro_max_size 65536 gso_ip= v4_max_size 65536 gro_ipv4_max_size 65536 Signed-off-by: Vincent Mailhol --- ip/iplink_can.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/ip/iplink_can.c b/ip/iplink_can.c index 3e7925e8..d43dc9bb 100644 --- a/ip/iplink_can.c +++ b/ip/iplink_can.c @@ -34,7 +34,7 @@ static void print_usage(FILE *f) "\n" "\t[ xbitrate BITRATE [ xsample-point SAMPLE-POINT] ] |\n" "\t[ xtq TQ xprop-seg PROP_SEG xphase-seg1 PHASE-SEG1\n \t xphase-seg2 = PHASE-SEG2 [ xsjw SJW ] ]\n" - "\t[ xtdcv TDCV xtdco TDCO xtdcf TDCF ]\n" + "\t[ xtdcv TDCV xtdco TDCO xtdcf TDCF pwms PWMS pwml PWML pwmo PWMO]\n" "\n" "\t[ loopback { on | off } ]\n" "\t[ listen-only { on | off } ]\n" @@ -67,6 +67,9 @@ static void print_usage(FILE *f) "\t TDCV :=3D { NUMBER in mtq }\n" "\t TDCO :=3D { NUMBER in mtq }\n" "\t TDCF :=3D { NUMBER in mtq }\n" + "\t PWMS :=3D { NUMBER in mtq }\n" + "\t PWML :=3D { NUMBER in mtq }\n" + "\t PWMO :=3D { NUMBER in mtq }\n" "\t RESTART-MS :=3D { 0 | NUMBER in ms }\n" "\n" "\tUnits:\n" @@ -143,6 +146,7 @@ static int can_parse_opt(struct link_util *lu, int argc= , char **argv, struct can_ctrlmode cm =3D { 0 }; struct can_tdc fd =3D { .tdcv =3D -1, .tdco =3D -1, .tdcf =3D -1 }; struct can_tdc xl =3D { .tdcv =3D -1, .tdco =3D -1, .tdcf =3D -1 }; + __u32 pwms =3D -1, pwml =3D -1, pwmo =3D -1; =20 while (argc > 0) { if (matches(*argv, "bitrate") =3D=3D 0) { @@ -266,6 +270,18 @@ static int can_parse_opt(struct link_util *lu, int arg= c, char **argv, NEXT_ARG(); if (get_u32(&xl.tdcf, *argv, 0)) invarg("invalid \"xtdcf\" value", *argv); + } else if (matches(*argv, "pwms") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&pwms, *argv, 0)) + invarg("invalid \"pwms\" value", *argv); + } else if (matches(*argv, "pwml") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&pwml, *argv, 0)) + invarg("invalid \"pwml\" value", *argv); + } else if (matches(*argv, "pwmo") =3D=3D 0) { + NEXT_ARG(); + if (get_u32(&pwmo, *argv, 0)) + invarg("invalid \"pwmo\" value", *argv); } else if (matches(*argv, "loopback") =3D=3D 0) { NEXT_ARG(); set_ctrlmode("loopback", *argv, &cm, @@ -401,6 +417,18 @@ static int can_parse_opt(struct link_util *lu, int arg= c, char **argv, addattr32(n, 1024, IFLA_CAN_TDC_TDCF, xl.tdcf); addattr_nest_end(n, tdc); } + if (pwms !=3D -1 || pwml !=3D -1 || pwmo !=3D -1) { + struct rtattr *pwm =3D addattr_nest(n, 1024, + IFLA_CAN_XL_PWM | NLA_F_NESTED); + + if (pwms !=3D -1) + addattr32(n, 1024, IFLA_CAN_PWM_PWMS, pwms); + if (pwml !=3D -1) + addattr32(n, 1024, IFLA_CAN_PWM_PWML, pwml); + if (pwmo !=3D -1) + addattr32(n, 1024, IFLA_CAN_PWM_PWMO, pwmo); + addattr_nest_end(n, pwm); + } =20 return 0; } @@ -496,6 +524,62 @@ static void can_print_tdc_const_opt(struct rtattr *tdc= _attr, bool is_xl) close_json_object(); } =20 +static void can_print_pwm_opt(struct rtattr *pwm_attr) +{ + struct rtattr *tb[IFLA_CAN_PWM_MAX + 1]; + + parse_rtattr_nested(tb, IFLA_CAN_PWM_MAX, pwm_attr); + if (tb[IFLA_CAN_PWM_PWMS] || tb[IFLA_CAN_PWM_PWML] || + tb[IFLA_CAN_PWM_PWMO]) { + open_json_object("pwm"); + can_print_nl_indent(); + if (tb[IFLA_CAN_PWM_PWMS]) { + __u32 *pwms =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMS]); + + print_uint(PRINT_ANY, " pwms", " pwms %u", *pwms); + } + if (tb[IFLA_CAN_PWM_PWML]) { + __u32 *pwml =3D RTA_DATA(tb[IFLA_CAN_PWM_PWML]); + + print_uint(PRINT_ANY, " pwml", " pwml %u", *pwml); + } + if (tb[IFLA_CAN_PWM_PWMO]) { + __u32 *pwmo =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMO]); + + print_uint(PRINT_ANY, " pwmo", " pwmo %u", *pwmo); + } + close_json_object(); + } +} + +static void can_print_pwm_const_opt(struct rtattr *pwm_attr) +{ + struct rtattr *tb[IFLA_CAN_PWM_MAX + 1]; + + parse_rtattr_nested(tb, IFLA_CAN_PWM_MAX, pwm_attr); + open_json_object("pwm"); + can_print_nl_indent(); + if (tb[IFLA_CAN_PWM_PWMS_MAX]) { + __u32 *pwms_min =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMS_MIN]); + __u32 *pwms_max =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMS_MAX]); + + can_print_timing_min_max("pwms", " pwms", *pwms_min, *pwms_max); + } + if (tb[IFLA_CAN_PWM_PWML_MAX]) { + __u32 *pwml_min =3D RTA_DATA(tb[IFLA_CAN_PWM_PWML_MIN]); + __u32 *pwml_max =3D RTA_DATA(tb[IFLA_CAN_PWM_PWML_MAX]); + + can_print_timing_min_max("pwml", " pwml", *pwml_min, *pwml_max); + } + if (tb[IFLA_CAN_PWM_PWMO_MAX]) { + __u32 *pwmo_min =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMO_MIN]); + __u32 *pwmo_max =3D RTA_DATA(tb[IFLA_CAN_PWM_PWMO_MAX]); + + can_print_timing_min_max("pwmo", " pwmo", *pwmo_min, *pwmo_max); + } + close_json_object(); +} + static void can_print_ctrlmode_ext(struct rtattr *ctrlmode_ext_attr, __u32 cm_flags) { @@ -735,6 +819,9 @@ static void can_print_opt(struct link_util *lu, FILE *f= , struct rtattr *tb[]) if (tb[IFLA_CAN_XL_TDC]) can_print_tdc_opt(tb[IFLA_CAN_XL_TDC], true); =20 + if (tb[IFLA_CAN_XL_PWM]) + can_print_pwm_opt(tb[IFLA_CAN_XL_PWM]); + close_json_object(); } =20 @@ -759,6 +846,9 @@ static void can_print_opt(struct link_util *lu, FILE *f= , struct rtattr *tb[]) if (tb[IFLA_CAN_XL_TDC]) can_print_tdc_const_opt(tb[IFLA_CAN_XL_TDC], true); =20 + if (tb[IFLA_CAN_XL_PWM]) + can_print_pwm_const_opt(tb[IFLA_CAN_XL_PWM]); + close_json_object(); } =20 --=20 2.51.2