From nobody Thu Sep 19 16:12:01 2024 Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) (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 D13BE16C87B for ; Mon, 5 Aug 2024 18:31:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722882694; cv=none; b=oGZVZXUgTHdLFZPjzfFgNHz2maozBFK4I/kseM0Q7yo31h2e4XwdMIae8G8gw5PETXA8u/7K2V7NEQhPxG92UeARRxMmW29NcrkRZaoX9FFJvTurYd8jUeb+G5Ycp9kp0HbZRENTdMrlUwx4wQMZRmaQA4ozxcleybz6BY8syRc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722882694; c=relaxed/simple; bh=ChE2g8Bo15dbwXQCCELmyUPyayPuAqr/37EK4Q7ZpbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rsANCbsond47/mz//pB63FNvcoEeXqYvMF1fCAt1vkPsordvs1kAmkMraXquCgpv8/wb3L+ZO6sSXN8MHX/wk6YtZGj0pxQmuuvhJ90yQO74MkU0Blk94tvgrnGr3ulDFqRG1ZRDd/3MSwfNl/8KGqZLOx+4jx6JrzC6V+8urcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=MGgdwHrj; arc=none smtp.client-ip=209.85.166.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="MGgdwHrj" Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-39b3754468eso8011725ab.2 for ; Mon, 05 Aug 2024 11:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1722882692; x=1723487492; 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=Jt7QmiC+1K2MGxeb2j6VpzaOIs10RnCuQP9HHad9ocQ=; b=MGgdwHrjvjGji3glD5U++0SrVoXTlB2Dl3dc3MSCu1tPObTpuhxJXWBlElVZ4/XKEf 7ICWR+SsD+cEICW00mUpVCqbgmoyRjPoMki2KGO4j3SqB5VUJVhE7u/bBEfvZVEoIF70 hFQukWnI9b8wRevPfKaSb9RnFjtMevXNVrdjKe4M13oWL77lyfbnOKlr33P97taeE3w9 5omJ194jLesJBiKQoiGCHek7NCVZIuLvK5tGQPUM9X5jUEC8C33NjHoR02hgBCQrtGQz 9yDtqxY78L2IAZRrSo1reXF0KPpSTJjNkXC/drQYr+94XK9368y0e3h9QP5JjrGU8A2T pMUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722882692; x=1723487492; 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=Jt7QmiC+1K2MGxeb2j6VpzaOIs10RnCuQP9HHad9ocQ=; b=dCw0zjQAjIAM4lzWhUpzlknjgDwJ6njKjOuTeAQJdWT1H8jZuFCwbL5UA1NRyzxnTV 2jzW9oDSqbk+zcQBWdZvoPftY5+j5UYuxQmcIqMYuokkC4oXblHwwHqYhOuB4hnGDfIl y2OsDA+GVAoKDyxCj/NiUk0esP/sbhpkZl5pJIIr3eDSpYWPbwo1crOJsBPOy3TqawTf 8hc2w8tC0CjW//FW4ZgimGCJC6N2L778uxQicTfqgYcuZzVNghpVsAva7g1zxP340kJv bkQ9AJQWBsr7qKeeiGqVQiAPHWsJK6XrOYDKd00f0pdxMUkVjei7ztKwNrK+6yQLGEBZ xB0g== X-Forwarded-Encrypted: i=1; AJvYcCVqMA1BE4OEq6+Ymy8CW3CE4jVtavcabOL1psEcvEWnC1SKuSyIM2TXpgEST6sJOvOICyBth9oJMkIHMfdyffHb11e5lOQmEpKpbQSm X-Gm-Message-State: AOJu0YxqPi6f2NCOPv6jlPzuaibAvzfPAw3mIgYgY4uh8dXK8y7q9QP1 WSwPECiSCGlT+BXtU/gXiri/fLt67unxSAFVYmOBliUyv9pr/qxYCZKKsmqW9Wg= X-Google-Smtp-Source: AGHT+IFsYDvT/ScJTO38P4uPEY7MfcyBrpm0xyFckk7S5UPZJYPzTYR+VYnkh8TLJZtvjqPo5U1Jew== X-Received: by 2002:a05:6e02:214b:b0:39b:32f6:5e90 with SMTP id e9e14a558f8ab-39b32f65ed5mr87967485ab.15.1722882692118; Mon, 05 Aug 2024 11:31:32 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a245:8609:c1c4:a4f8:94c8:31f2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-39b20a9af29sm30867925ab.13.2024.08.05.11.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 11:31:31 -0700 (PDT) From: Markus Schneider-Pargmann To: Chandrasekar Ramakrishnan , Marc Kleine-Budde , Vincent Mailhol , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= , Markus Schneider-Pargmann , Judith Mendez , Tony Lindgren , Simon Horman Cc: Matthias Schiffer , Linux regression tracking , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] can: m_can: Limit coalescing to peripheral instances Date: Mon, 5 Aug 2024 20:30:47 +0200 Message-ID: <20240805183047.305630-8-msp@baylibre.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805183047.305630-1-msp@baylibre.com> References: <20240805183047.305630-1-msp@baylibre.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" The use of coalescing for non-peripheral chips in the current implementation is limited to non-existing. Disable the possibility to set coalescing through ethtool. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/m_can.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 69a7cbce19b4..5fd1af75682c 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -2181,7 +2181,7 @@ static int m_can_set_coalesce(struct net_device *dev, return 0; } =20 -static const struct ethtool_ops m_can_ethtool_ops =3D { +static const struct ethtool_ops m_can_ethtool_ops_coalescing =3D { .supported_coalesce_params =3D ETHTOOL_COALESCE_RX_USECS_IRQ | ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ | ETHTOOL_COALESCE_TX_USECS_IRQ | @@ -2192,18 +2192,20 @@ static const struct ethtool_ops m_can_ethtool_ops = =3D { .set_coalesce =3D m_can_set_coalesce, }; =20 -static const struct ethtool_ops m_can_ethtool_ops_polling =3D { +static const struct ethtool_ops m_can_ethtool_ops =3D { .get_ts_info =3D ethtool_op_get_ts_info, }; =20 -static int register_m_can_dev(struct net_device *dev) +static int register_m_can_dev(struct m_can_classdev *cdev) { + struct net_device *dev =3D cdev->net; + dev->flags |=3D IFF_ECHO; /* we support local echo */ dev->netdev_ops =3D &m_can_netdev_ops; - if (dev->irq) - dev->ethtool_ops =3D &m_can_ethtool_ops; + if (dev->irq && cdev->is_peripheral) + dev->ethtool_ops =3D &m_can_ethtool_ops_coalescing; else - dev->ethtool_ops =3D &m_can_ethtool_ops_polling; + dev->ethtool_ops =3D &m_can_ethtool_ops; =20 return register_candev(dev); } @@ -2389,7 +2391,7 @@ int m_can_class_register(struct m_can_classdev *cdev) if (ret) goto rx_offload_del; =20 - ret =3D register_m_can_dev(cdev->net); + ret =3D register_m_can_dev(cdev); if (ret) { dev_err(cdev->dev, "registering %s failed (err=3D%d)\n", cdev->net->name, ret); --=20 2.45.2