Date:   Thu, 16 Mar 2023 11:06:58 +0100
From:   Simon Horman <simon.horman@corigine.com>
To:     Markus Schneider-Pargmann <msp@baylibre.com>
Cc:     Marc Kleine-Budde <mkl@pengutronix.de>,
        Chandrasekar Ramakrishnan <rcsekar@samsung.com>,
        Wolfgang Grandegger <wg@grandegger.com>,
        Vincent MAILHOL <mailhol.vincent@wanadoo.fr>,
        linux-can@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 10/16] can: m_can: Add tx coalescing ethtool support
Message-ID: <ZBLqQmj4FoMAsNsh@corigine.com>
References: <20230315110546.2518305-1-msp@baylibre.com>
 <20230315110546.2518305-11-msp@baylibre.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230315110546.2518305-11-msp@baylibre.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iQV2/QKJVrAbuXi8pEL/pVUvN6l8UbTIhCc1UcvhvEH2s/E3aLPAzqJNUD2f?=
 =?us-ascii?Q?SqcM3EzrIHG/rNk0xCV0VcVbtaWJpY4lZ3M4wqzaEaEVBvo1j+1m3NUMqbdX?=
 =?us-ascii?Q?HQlzbRasjMwDqBwnq4WUoMkn6YCi2aIT/bVX8xcjvm/0Y/eea3GGmHagFxYM?=
 =?us-ascii?Q?ZdXLI3prUxfiolYg0+CY0BWXODAKVSYupiLHVLAI49eie9PcFt+XMVZJTixI?=
 =?us-ascii?Q?lgdiU4IYJ+LUGkgxCLys1D1zr0au/KPpUNcW+XeQ343jfHapt9R2P2Y/ucvB?=
 =?us-ascii?Q?w3ypdiIYyrn5/owluOEWHSy2L1gyR/I/CbJTVA821mwsGVn0rplfw41VpiFx?=
 =?us-ascii?Q?4LS8hT1/DnQsrLU+yeU0cHxIySM3k3zs4VQJm3LA5t+gZdMDA6hrU+OycEct?=
 =?us-ascii?Q?3+KFBqLigG4ncEl8hWkQ597C8zL9M2GP2/OXB+Qy6CJma1KKh7SFl4g+O8dX?=
 =?us-ascii?Q?moXkIa5XnlTT8YLguGdgXJbneu3UfXzRqEVtstWvi65LZPYrZUktaK2/N9vV?=
 =?us-ascii?Q?qxs5DzcgUkUeuCV1C7CLhO1SjD0Na1HglBv3C3rY+AB2RTSUpjnjbNxUBJ1S?=
 =?us-ascii?Q?ZWZqmOwL7zSXYCjFy+kfjnxegHfU9VjQ3l5wsZxOolOfnKPslAU+sMGLKSui?=
 =?us-ascii?Q?JJKKmlm61fW4wOCe1E/+sHLXCcf0UasELQtIlLf/G5BCfNbQDzqscwfmntmp?=
 =?us-ascii?Q?qRP5AeY9jktdR0t05GQ3CAOIpdg+YjtH1CQii4/BIwnR5uYDJAbnx4e0tVWx?=
 =?us-ascii?Q?ZWChvX4VHvwfkhhbWYyYOSAqa9IJlecZUVE2dwo+sdMMH0MphsuhmLYUisEw?=
 =?us-ascii?Q?zOKOvOaLFBrl6G+w+3loccev0dRAMradIfQnksRZANLzNJLhjAccNnN81WFW?=
 =?us-ascii?Q?MG/UJXkY4B0yInNES2pjXMdwGzSjplm2NBitxj5Q+0TkhoQGhx8djQSYbOAJ?=
 =?us-ascii?Q?mkGuZ8EqmLAu0c2fM+d9TlOtfjtUmvuC8trHfb0wjErScWOcpZBndu+lS32U?=
 =?us-ascii?Q?qxMWmYaXFPZI9SU1jQdqEJZ1Dg1w2ctheHSbWdMJoAKeJ5tlM3L3ZTmjXs7R?=
 =?us-ascii?Q?qj5y9LCDsvO0c0EW07HOm/mADUxXJyY8EBBPPnv6UWeR5gGP9ZSZB9mnqzHt?=
 =?us-ascii?Q?DT8m2Wx7Q3+PqZqD8PDtDxlAFkk3praICto0+EZ96sZSKG/SS8N4NUhNp6wD?=
 =?us-ascii?Q?o5I7xq5pG+Um5aMrUyPE4SwNJB/0tFtkWjO3J19fCuykiy51jS1gg+TUxOvZ?=
 =?us-ascii?Q?B3l1xEjLaOUrx3NV25FNipzS7AW43L4lmWBiFca7hBzALj4JaR5cTEk7YRgQ?=
 =?us-ascii?Q?0SXRK5KvXLIXYJLO0gz+wEBFvHskzH+e9mJWtRy4BkCKK5aLyo3Kx792LtIa?=
 =?us-ascii?Q?ycfkvU5+IiyjGEosOOOLxW9dDmSXRecH+ogw6BygKTBqzc+IarvLyMFALHPd?=
 =?us-ascii?Q?CZoiCqRqDpz28/8NylEsuONdqS2WtO1kRF0fUeK+vOnpn1A7NPNfyYQoN71J?=
 =?us-ascii?Q?JkKXUYMWVnShk0gLp1Bz0YOt2QkX5GYOtIampyhntdES4NH+eTRJvM3iZH1L?=
 =?us-ascii?Q?rWVbGHzyowlnFCZbM8oGbqf6qhjif6BhTBvSMgRkaHg26iu7CV5h2HXP3RVf?=
 =?us-ascii?Q?mShbN7AyRZek60rJ09jku8saM7W3E8tQMc+WCk2uyXKH3PHHsqZ/zKYb7oS8?=
 =?us-ascii?Q?jlOChg=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4d14a95-f102-44a8-737f-08db26063110
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 10:07:03.9127
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZcwdKOicOkYQ73fvaJQ9pRAGqhxJCKlONwBZvDWKxOi5BWF9anPTaEcEpCVVF1DxxD/nwKXOBIDWKt5KUQSEfKErOZsxld/k5Mw2/HneOKM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR13MB6279
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Mar 15, 2023 at 12:05:40PM +0100, Markus Schneider-Pargmann wrote:
> Add get/set functions for ethtool coalescing. tx-frames-irq and
> tx-usecs-irq can only be set/unset together. tx-frames-irq needs to be
> less than TXE and TXB.

Perhaps I'm reading this wrong (maybe I need a coffee). But I think it
might be a bit clearer to call out the TX aspect of this patch up front (I
know it is in the subject.

Maybe something like this:

  Add TX support to get/set functions for ethtool coalescing...

> 
> As rx and tx share the same timer, rx-usecs-irq and tx-usecs-irq can be
> enabled/disabled individually but they need to have the same value if
> enabled.
> 
> Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>

Nits above and below not withstanding,

Reviewed-by: Simon Horman <simon.horman@corigine.com>

> ---
>  drivers/net/can/m_can/m_can.c | 38 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 37 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
> index 7f8decfae81e..4e794166664a 100644
> --- a/drivers/net/can/m_can/m_can.c
> +++ b/drivers/net/can/m_can/m_can.c
> @@ -1945,6 +1945,8 @@ static int m_can_get_coalesce(struct net_device *dev,
>  
>  	ec->rx_max_coalesced_frames_irq = cdev->rx_max_coalesced_frames_irq;
>  	ec->rx_coalesce_usecs_irq = cdev->rx_coalesce_usecs_irq;
> +	ec->tx_max_coalesced_frames_irq = cdev->tx_max_coalesced_frames_irq;
> +	ec->tx_coalesce_usecs_irq = cdev->tx_coalesce_usecs_irq;
>  
>  	return 0;
>  }
> @@ -1971,16 +1973,50 @@ static int m_can_set_coalesce(struct net_device *dev,
>  		netdev_err(dev, "rx-frames-irq and rx-usecs-irq can only be set together\n");
>  		return -EINVAL;
>  	}
> +	if (ec->tx_max_coalesced_frames_irq > cdev->mcfg[MRAM_TXE].num) {
> +		netdev_err(dev, "tx-frames-irq %u greater than the TX event FIFO %u\n",
> +			   ec->tx_max_coalesced_frames_irq,
> +			   cdev->mcfg[MRAM_TXE].num);
> +		return -EINVAL;
> +	}
> +	if (ec->tx_max_coalesced_frames_irq > cdev->mcfg[MRAM_TXB].num) {
> +		netdev_err(dev, "tx-frames-irq %u greater than the TX FIFO %u\n",
> +			   ec->tx_max_coalesced_frames_irq,
> +			   cdev->mcfg[MRAM_TXB].num);
> +		return -EINVAL;
> +	}
> +	if ((ec->tx_max_coalesced_frames_irq == 0) != (ec->tx_coalesce_usecs_irq == 0)) {
> +		netdev_err(dev, "tx-frames-irq and tx-usecs-irq can only be set together\n");
> +		return -EINVAL;
> +	}

nit: checkpatch complains about unnecessary parentheses

drivers/net/can/m_can/m_can.c:1988: CHECK: Unnecessary parentheses around 'ec->tx_max_coalesced_frames_irq == 0'
+	if ((ec->tx_max_coalesced_frames_irq == 0) != (ec->tx_coalesce_usecs_irq == 0)) {

drivers/net/can/m_can/m_can.c:1988: CHECK: Unnecessary parentheses around 'ec->tx_coalesce_usecs_irq == 0'
+	if ((ec->tx_max_coalesced_frames_irq == 0) != (ec->tx_coalesce_usecs_irq == 0)) {


> +	if (ec->rx_coalesce_usecs_irq != 0 && ec->tx_coalesce_usecs_irq != 0 &&
> +	    ec->rx_coalesce_usecs_irq != ec->tx_coalesce_usecs_irq) {
> +		netdev_err(dev, "rx-usecs-irq %u needs to be equal to tx-usecs-irq %u if both are enabled\n",
> +			   ec->rx_coalesce_usecs_irq,
> +			   ec->tx_coalesce_usecs_irq);
> +		return -EINVAL;
> +	}
>  
>  	cdev->rx_max_coalesced_frames_irq = ec->rx_max_coalesced_frames_irq;
>  	cdev->rx_coalesce_usecs_irq = ec->rx_coalesce_usecs_irq;
> +	cdev->tx_max_coalesced_frames_irq = ec->tx_max_coalesced_frames_irq;
> +	cdev->tx_coalesce_usecs_irq = ec->tx_coalesce_usecs_irq;
> +
> +	if (cdev->rx_coalesce_usecs_irq)
> +		cdev->irq_timer_wait =
> +			ns_to_ktime(cdev->rx_coalesce_usecs_irq * NSEC_PER_USEC);
> +	else
> +		cdev->irq_timer_wait =
> +			ns_to_ktime(cdev->tx_coalesce_usecs_irq * NSEC_PER_USEC);

nit: perhaps adding us_to_ktime() and using it treewide would be interesting

>  	return 0;
>  }
>  
>  static const struct ethtool_ops m_can_ethtool_ops = {
>  	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS_IRQ |
> -		ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ,
> +		ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ |
> +		ETHTOOL_COALESCE_TX_USECS_IRQ |
> +		ETHTOOL_COALESCE_TX_MAX_FRAMES_IRQ,
>  	.get_ts_info = ethtool_op_get_ts_info,
>  	.get_coalesce = m_can_get_coalesce,
>  	.set_coalesce = m_can_set_coalesce,
> -- 
> 2.39.2
>