From: Michal Kubecek <mkubecek@suse.cz>
To: Shannon Nelson <snelson@pensando.io>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH v3 net-next 13/19] ionic: Add initial ethtool support
Date: Tue, 9 Jul 2019 07:25:41 +0200 [thread overview]
Message-ID: <20190709052541.GB16610@unicorn.suse.cz> (raw)
In-Reply-To: <20190708192532.27420-14-snelson@pensando.io>
On Mon, Jul 08, 2019 at 12:25:26PM -0700, Shannon Nelson wrote:
> Add in the basic ethtool callbacks for device information
> and control.
>
> Signed-off-by: Shannon Nelson <snelson@pensando.io>
> ---
> drivers/net/ethernet/pensando/ionic/Makefile | 2 +-
> .../net/ethernet/pensando/ionic/ionic_dev.h | 3 +
> .../ethernet/pensando/ionic/ionic_ethtool.c | 509 ++++++++++++++++++
> .../ethernet/pensando/ionic/ionic_ethtool.h | 9 +
> .../net/ethernet/pensando/ionic/ionic_lif.c | 2 +
> .../net/ethernet/pensando/ionic/ionic_lif.h | 8 +
> 6 files changed, 532 insertions(+), 1 deletion(-)
> create mode 100644 drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> create mode 100644 drivers/net/ethernet/pensando/ionic/ionic_ethtool.h
...
> +static int ionic_set_link_ksettings(struct net_device *netdev,
> + const struct ethtool_link_ksettings *ks)
> +{
> + struct lif *lif = netdev_priv(netdev);
> + struct ionic *ionic = lif->ionic;
> + struct ionic_dev *idev = &lif->ionic->idev;
> + u8 fec_type = PORT_FEC_TYPE_NONE;
> + u32 req_rs, req_fc;
> + int err = 0;
> +
> + /* set autoneg */
> + if (ks->base.autoneg != idev->port_info->config.an_enable) {
> + mutex_lock(&ionic->dev_cmd_lock);
> + ionic_dev_cmd_port_autoneg(idev, ks->base.autoneg);
> + err = ionic_dev_cmd_wait(ionic, devcmd_timeout);
> + mutex_unlock(&ionic->dev_cmd_lock);
> + if (err)
> + return err;
> +
> + idev->port_info->config.an_enable = ks->base.autoneg;
> + }
> +
> + /* set speed */
> + if (ks->base.speed != le32_to_cpu(idev->port_info->config.speed)) {
> + mutex_lock(&ionic->dev_cmd_lock);
> + ionic_dev_cmd_port_speed(idev, ks->base.speed);
> + err = ionic_dev_cmd_wait(ionic, devcmd_timeout);
> + mutex_unlock(&ionic->dev_cmd_lock);
> + if (err)
> + return err;
> +
> + idev->port_info->config.speed = cpu_to_le32(ks->base.speed);
> + }
> +
> + /* set FEC */
> + req_rs = ethtool_link_ksettings_test_link_mode(ks, advertising, FEC_RS);
> + req_fc = ethtool_link_ksettings_test_link_mode(ks, advertising, FEC_BASER);
> + if (req_rs && req_fc) {
> + netdev_info(netdev, "Only select one FEC mode at a time\n");
> + return -EINVAL;
> +
> + } else if (req_fc &&
> + idev->port_info->config.fec_type != PORT_FEC_TYPE_FC) {
> + fec_type = PORT_FEC_TYPE_FC;
> + } else if (req_rs &&
> + idev->port_info->config.fec_type != PORT_FEC_TYPE_RS) {
> + fec_type = PORT_FEC_TYPE_RS;
> + } else if (!(req_rs | req_fc) &&
> + idev->port_info->config.fec_type != PORT_FEC_TYPE_NONE) {
> + fec_type = PORT_FEC_TYPE_NONE;
> + }
> +
> + if (fec_type != idev->port_info->config.fec_type) {
> + mutex_lock(&ionic->dev_cmd_lock);
> + ionic_dev_cmd_port_fec(idev, PORT_FEC_TYPE_NONE);
The second argument should be fec_type, I believe.
> + err = ionic_dev_cmd_wait(ionic, devcmd_timeout);
> + mutex_unlock(&ionic->dev_cmd_lock);
> + if (err)
> + return err;
> +
> + idev->port_info->config.fec_type = fec_type;
> + }
> +
> + return 0;
> +}
...
> +static int ionic_set_ringparam(struct net_device *netdev,
> + struct ethtool_ringparam *ring)
> +{
> + struct lif *lif = netdev_priv(netdev);
> + bool running;
> + int i, j;
> +
> + if (ring->rx_mini_pending || ring->rx_jumbo_pending) {
> + netdev_info(netdev, "Changing jumbo or mini descriptors not supported\n");
> + return -EINVAL;
> + }
> +
> + i = ring->tx_pending & (ring->tx_pending - 1);
> + j = ring->rx_pending & (ring->rx_pending - 1);
> + if (i || j) {
> + netdev_info(netdev, "Descriptor count must be a power of 2\n");
> + return -EINVAL;
> + }
You can use is_power_of_2() here (it wouldn't allow 0 but you probably
don't want to allow that either).
Michal
> +
> + /* if nothing to do return success */
> + if (ring->tx_pending == lif->ntxq_descs &&
> + ring->rx_pending == lif->nrxq_descs)
> + return 0;
> +
> + while (test_and_set_bit(LIF_QUEUE_RESET, lif->state))
> + usleep_range(200, 400);
> +
> + running = test_bit(LIF_UP, lif->state);
> + if (running)
> + ionic_stop(netdev);
> +
> + lif->ntxq_descs = ring->tx_pending;
> + lif->nrxq_descs = ring->rx_pending;
> +
> + if (running)
> + ionic_open(netdev);
> + clear_bit(LIF_QUEUE_RESET, lif->state);
> +
> + return 0;
> +}
next prev parent reply other threads:[~2019-07-09 5:25 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 19:25 [PATCH v3 net-next 00/19] Add ionic driver Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 01/19] ionic: Add basic framework for IONIC Network device driver Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 02/19] ionic: Add hardware init and device commands Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 03/19] ionic: Add port management commands Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 04/19] ionic: Add basic lif support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 05/19] ionic: Add interrupts and doorbells Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 06/19] ionic: Add basic adminq support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 07/19] ionic: Add adminq action Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 08/19] ionic: Add notifyq support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 09/19] ionic: Add the basic NDO callbacks for netdev support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 10/19] ionic: Add management of rx filters Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 11/19] ionic: Add Rx filter and rx_mode ndo support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 12/19] ionic: Add async link status check and basic stats Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 13/19] ionic: Add initial ethtool support Shannon Nelson
2019-07-08 22:04 ` Andrew Lunn
2019-07-09 5:15 ` Michal Kubecek
2019-07-09 22:35 ` Shannon Nelson
2019-07-11 19:10 ` Shannon Nelson
2019-07-09 2:14 ` Andrew Lunn
2019-07-13 5:16 ` Shannon Nelson
2019-07-18 3:28 ` Andrew Lunn
2019-07-19 0:12 ` Shannon Nelson
2019-07-19 2:40 ` Andrew Lunn
2019-07-19 18:41 ` Shannon Nelson
2019-07-19 19:07 ` Andrew Lunn
2019-07-19 20:20 ` Shannon Nelson
2019-07-09 2:27 ` Andrew Lunn
2019-07-09 22:42 ` Shannon Nelson
2019-07-18 3:21 ` Andrew Lunn
2019-07-18 17:05 ` Shannon Nelson
2019-07-18 17:28 ` Andrew Lunn
2019-07-18 17:54 ` Shannon Nelson
2019-07-09 2:30 ` Andrew Lunn
2019-07-13 5:32 ` Shannon Nelson
2019-07-18 3:31 ` Andrew Lunn
2019-07-18 17:14 ` Shannon Nelson
2019-07-09 5:25 ` Michal Kubecek [this message]
2019-07-09 22:34 ` Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 14/19] ionic: Add Tx and Rx handling Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 15/19] ionic: Add netdev-event handling Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 16/19] ionic: Add driver stats Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 17/19] ionic: Add RSS support Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 18/19] ionic: Add coalesce and other features Shannon Nelson
2019-07-08 19:25 ` [PATCH v3 net-next 19/19] ionic: Add basic devlink interface Shannon Nelson
2019-07-08 19:34 ` Jiri Pirko
2019-07-08 19:58 ` Shannon Nelson
2019-07-08 20:03 ` Jiri Pirko
2019-07-08 22:58 ` Shannon Nelson
2019-07-09 6:56 ` Jiri Pirko
2019-07-09 19:13 ` Shannon Nelson
2019-07-10 6:48 ` Jiri Pirko
2019-07-10 17:06 ` Shannon Nelson
2019-07-09 1:26 ` Jakub Kicinski
2019-07-09 19:06 ` Shannon Nelson
2019-07-09 2:58 ` [PATCH v3 net-next 00/19] Add ionic driver David Miller
2019-07-09 3:01 ` Shannon Nelson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709052541.GB16610@unicorn.suse.cz \
--to=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=snelson@pensando.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).