From patchwork Thu Jul 25 19:48:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergej Benilov X-Patchwork-Id: 1137094 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="DitUoYRY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45vjST2sPgz9s4Y for ; Fri, 26 Jul 2019 05:48:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726400AbfGYTsX (ORCPT ); Thu, 25 Jul 2019 15:48:23 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:38733 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfGYTsX (ORCPT ); Thu, 25 Jul 2019 15:48:23 -0400 Received: by mail-wr1-f66.google.com with SMTP id g17so52007411wrr.5 for ; Thu, 25 Jul 2019 12:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0wZ+VGWAFDHHLT9Pxw17FULtcj4+1rQ9IsCMMtzAOHE=; b=DitUoYRYOmwSjhikeXcUIV31KMHCnShj7qj/hCZfvNznMKK4rv+q6FtkKQGfOeNK/d 6iJBrzLpC4MH74HXxbeBp/IWuP+W6jdG+7c+1vFTXeeoF5rX3+8EotEd1wmzRksHRRlf l0dmom6FKNAqrM9CFIqtK4aJrOyrd7o8YMFtalyD5zub8wi0bVUstnMHVHpzJsrwuIfZ L/k7NiO5G5KmafbahjPWFCHQgo8p+EfOFHvoD/zV8tHYkQA5ZLwzDMqTeBQY6OLhygKb rtHRXy+A1v4rmAd2yR7IbeTshXe6eYJo86VGpPLVkDfDXO/83C9ZCPL+PRJt8+o8i4li TZOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0wZ+VGWAFDHHLT9Pxw17FULtcj4+1rQ9IsCMMtzAOHE=; b=XeXqLDQhOhC0RSHVPkk7x65MZnw26pAgEMfIFvlQVErfRWHysMVvx8n5Dmq6LgMXsM PgzGn/eWUFZFFAc5sSePPxt9kgnpoQVQk4GAjgh8U3SPSWSq2j508KU6dCetRk+mPE87 sdkz2LXdRR2aedXDUqkz9qPWS8hPDBiM40BLD53++03W1w4/Z6H77F2rUy5TpMC5/qdE JSk431xWkSdKNrFM7BEofuCbU3rGDwpjLfmjsn956w9I2eux3ltveKxPcauesyu09aNp ImXUv12wbmiPELG3OFJH9fMZyzNz+wjqCAOpHr2deHkjjbWS0znHe5LjlHGGPJQcD6/S lr0w== X-Gm-Message-State: APjAAAUCHOaa7PcbawVyElW720wXeXQCMtRpEaIk9u49Y2iff+gPR9be ZNFehF6RDlilFC4kAzw= X-Google-Smtp-Source: APXvYqyLQossWanKKbTMVBvJ7G6sQp/FGfqWgTUw24RvyybOz0PXx/s6kmy27xttHRgKJdyqTXmKhQ== X-Received: by 2002:adf:d4cc:: with SMTP id w12mr98569855wrk.121.1564084101512; Thu, 25 Jul 2019 12:48:21 -0700 (PDT) Received: from x-Inspiron-15-5568.fritz.box (ip-178-201-112-148.hsi08.unitymediagroup.de. [178.201.112.148]) by smtp.gmail.com with ESMTPSA id u2sm43744508wmc.3.2019.07.25.12.48.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 12:48:20 -0700 (PDT) From: Sergej Benilov To: venza@brownhat.org, netdev@vger.kernel.org, andrew@lunn.ch Cc: Sergej Benilov Subject: [PATCH] sis900: add support for ethtool's EEPROM dump Date: Thu, 25 Jul 2019 21:48:06 +0200 Message-Id: <20190725194806.17964-1-sergej.benilov@googlemail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Implement ethtool's EEPROM dump command (ethtool -e|--eeprom-dump). Thx to Andrew Lunn for comments. Signed-off-by: Sergej Benilov Reviewed-by: Andrew Lunn --- drivers/net/ethernet/sis/sis900.c | 68 +++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index 6e07f5ebacfc..85eaccbbbac1 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c @@ -191,6 +191,8 @@ struct sis900_private { unsigned int tx_full; /* The Tx queue is full. */ u8 host_bridge_rev; u8 chipset_rev; + /* EEPROM data */ + int eeprom_size; }; MODULE_AUTHOR("Jim Huang , Ollie Lho "); @@ -475,6 +477,8 @@ static int sis900_probe(struct pci_dev *pci_dev, sis_priv->pci_dev = pci_dev; spin_lock_init(&sis_priv->lock); + sis_priv->eeprom_size = 24; + pci_set_drvdata(pci_dev, net_dev); ring_space = pci_alloc_consistent(pci_dev, TX_TOTAL_SIZE, &ring_dma); @@ -2122,6 +2126,68 @@ static void sis900_get_wol(struct net_device *net_dev, struct ethtool_wolinfo *w wol->supported = (WAKE_PHY | WAKE_MAGIC); } +static int sis900_get_eeprom_len(struct net_device *dev) +{ + struct sis900_private *sis_priv = netdev_priv(dev); + + return sis_priv->eeprom_size; +} + +static int sis900_read_eeprom(struct net_device *net_dev, u8 *buf) +{ + struct sis900_private *sis_priv = netdev_priv(net_dev); + void __iomem *ioaddr = sis_priv->ioaddr; + int wait, ret = -EAGAIN; + u16 signature; + u16 *ebuf = (u16 *)buf; + int i; + + if (sis_priv->chipset_rev == SIS96x_900_REV) { + sw32(mear, EEREQ); + for (wait = 0; wait < 2000; wait++) { + if (sr32(mear) & EEGNT) { + /* read 16 bits, and index by 16 bits */ + for (i = 0; i < sis_priv->eeprom_size / 2; i++) + ebuf[i] = (u16)read_eeprom(ioaddr, i); + ret = 0; + break; + } + udelay(1); + } + sw32(mear, EEDONE); + } else { + signature = (u16)read_eeprom(ioaddr, EEPROMSignature); + if (signature != 0xffff && signature != 0x0000) { + /* read 16 bits, and index by 16 bits */ + for (i = 0; i < sis_priv->eeprom_size / 2; i++) + ebuf[i] = (u16)read_eeprom(ioaddr, i); + ret = 0; + } + } + return ret; +} + +#define SIS900_EEPROM_MAGIC 0xBABE +static int sis900_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data) +{ + struct sis900_private *sis_priv = netdev_priv(dev); + u8 *eebuf; + int res; + + eebuf = kmalloc(sis_priv->eeprom_size, GFP_KERNEL); + if (!eebuf) + return -ENOMEM; + + eeprom->magic = SIS900_EEPROM_MAGIC; + spin_lock_irq(&sis_priv->lock); + res = sis900_read_eeprom(dev, eebuf); + spin_unlock_irq(&sis_priv->lock); + if (!res) + memcpy(data, eebuf + eeprom->offset, eeprom->len); + kfree(eebuf); + return res; +} + static const struct ethtool_ops sis900_ethtool_ops = { .get_drvinfo = sis900_get_drvinfo, .get_msglevel = sis900_get_msglevel, @@ -2132,6 +2198,8 @@ static const struct ethtool_ops sis900_ethtool_ops = { .set_wol = sis900_set_wol, .get_link_ksettings = sis900_get_link_ksettings, .set_link_ksettings = sis900_set_link_ksettings, + .get_eeprom_len = sis900_get_eeprom_len, + .get_eeprom = sis900_get_eeprom, }; /**