[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200316150116.330e4d94@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date: Mon, 16 Mar 2020 15:01:16 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Shannon Nelson <snelson@...sando.io>
Cc: netdev@...r.kernel.org, davem@...emloft.net,
Andrew Lunn <andrew@...n.ch>,
Russell King <rmk+kernel@...linux.org.uk>
Subject: Re: [PATCH v2 net-next 4/5] ionic: return error for unknown xcvr
type
On Mon, 16 Mar 2020 12:31:33 -0700 Shannon Nelson wrote:
> If we don't recognize the transceiver type, return an error
> so that ethtool doesn't try dumping bogus eeprom contents.
>
> Fixes: 4d03e00a2140 ("ionic: Add initial ethtool support")
> Signed-off-by: Shannon Nelson <snelson@...sando.io>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> index a233716eac29..3f92f301a020 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> @@ -694,7 +694,7 @@ static int ionic_get_module_info(struct net_device *netdev,
> default:
> netdev_info(netdev, "unknown xcvr type 0x%02x\n",
> xcvr->sprom[0]);
> - break;
> + return -EINVAL;
> }
>
> return 0;
> @@ -714,7 +714,19 @@ static int ionic_get_module_eeprom(struct net_device *netdev,
> /* The NIC keeps the module prom up-to-date in the DMA space
> * so we can simply copy the module bytes into the data buffer.
> */
> +
> xcvr = &idev->port_info->status.xcvr;
> + switch (xcvr->sprom[0]) {
> + case 0x03: /* SFP */
> + case 0x0D: /* QSFP */
> + case 0x11: /* QSFP28 */
Please use defines from sfp.h
> + break;
> + default:
> + netdev_info(netdev, "unknown xcvr type 0x%02x\n",
> + xcvr->sprom[0]);
> + return -EINVAL;
Isn't there _some_ amount of eeprom that we could always return?
> + }
> +
> len = min_t(u32, sizeof(xcvr->sprom), ee->len);
>
> do {
The pluggable module eeprom stuff really calls for some common infra :(
Powered by blists - more mailing lists