From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>,
"David S . Miller" <davem@davemloft.net>,
Lukas Wunner <lukas@wunner.de>, Petr Stetiar <ynezz@true.cz>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH V2 08/14] net: ks8851: Use 16-bit writes to program MAC address
Date: Wed, 25 Mar 2020 16:05:37 +0100 [thread overview]
Message-ID: <20200325150543.78569-9-marex@denx.de> (raw)
In-Reply-To: <20200325150543.78569-1-marex@denx.de>
On the SPI variant of KS8851, the MAC address can be programmed with
either 8/16/32-bit writes. To make it easier to support the 16-bit
parallel option of KS8851 too, switch both the MAC address programming
and readout to 16-bit operations.
Remove ks8851_wrreg8() as it is not used anywhere anymore.
There should be no functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
---
V2: Get rid of the KS_MAR(i + 1) by adjusting KS_MAR(x) macro
---
drivers/net/ethernet/micrel/ks8851.c | 47 ++++++++--------------------
drivers/net/ethernet/micrel/ks8851.h | 2 +-
2 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 8f1cc05dc3c8..6f3ecf980514 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -185,36 +185,6 @@ static void ks8851_wrreg16(struct ks8851_net *ks, unsigned reg, unsigned val)
netdev_err(ks->netdev, "spi_sync() failed\n");
}
-/**
- * ks8851_wrreg8 - write 8bit register value to chip
- * @ks: The chip state
- * @reg: The register address
- * @val: The value to write
- *
- * Issue a write to put the value @val into the register specified in @reg.
- */
-static void ks8851_wrreg8(struct ks8851_net *ks, unsigned reg, unsigned val)
-{
- struct spi_transfer *xfer = &ks->spi_xfer1;
- struct spi_message *msg = &ks->spi_msg1;
- __le16 txb[2];
- int ret;
- int bit;
-
- bit = 1 << (reg & 3);
-
- txb[0] = cpu_to_le16(MK_OP(bit, reg) | KS_SPIOP_WR);
- txb[1] = val;
-
- xfer->tx_buf = txb;
- xfer->rx_buf = NULL;
- xfer->len = 3;
-
- ret = spi_sync(ks->spidev, msg);
- if (ret < 0)
- netdev_err(ks->netdev, "spi_sync() failed\n");
-}
-
/**
* ks8851_rdreg - issue read register command and return the data
* @ks: The device state
@@ -349,6 +319,7 @@ static void ks8851_set_powermode(struct ks8851_net *ks, unsigned pwrmode)
static int ks8851_write_mac_addr(struct net_device *dev)
{
struct ks8851_net *ks = netdev_priv(dev);
+ u16 val;
int i;
mutex_lock(&ks->lock);
@@ -358,8 +329,12 @@ static int ks8851_write_mac_addr(struct net_device *dev)
* the first write to the MAC address does not take effect.
*/
ks8851_set_powermode(ks, PMECR_PM_NORMAL);
- for (i = 0; i < ETH_ALEN; i++)
- ks8851_wrreg8(ks, KS_MAR(i), dev->dev_addr[i]);
+
+ for (i = 0; i < ETH_ALEN; i += 2) {
+ val = (dev->dev_addr[i] << 8) | dev->dev_addr[i + 1];
+ ks8851_wrreg16(ks, KS_MAR(i), val);
+ }
+
if (!netif_running(dev))
ks8851_set_powermode(ks, PMECR_PM_SOFTDOWN);
@@ -377,12 +352,16 @@ static int ks8851_write_mac_addr(struct net_device *dev)
static void ks8851_read_mac_addr(struct net_device *dev)
{
struct ks8851_net *ks = netdev_priv(dev);
+ u16 reg;
int i;
mutex_lock(&ks->lock);
- for (i = 0; i < ETH_ALEN; i++)
- dev->dev_addr[i] = ks8851_rdreg8(ks, KS_MAR(i));
+ for (i = 0; i < ETH_ALEN; i += 2) {
+ reg = ks8851_rdreg16(ks, KS_MAR(i));
+ dev->dev_addr[i] = reg & 0xff;
+ dev->dev_addr[i + 1] = reg >> 8;
+ }
mutex_unlock(&ks->lock);
}
diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
index 8f834aef8e32..f210d18a10b5 100644
--- a/drivers/net/ethernet/micrel/ks8851.h
+++ b/drivers/net/ethernet/micrel/ks8851.h
@@ -19,7 +19,7 @@
#define CCR_32PIN (1 << 0) /* KSZ8851SNL */
/* MAC address registers */
-#define KS_MAR(_m) (0x15 - (_m))
+#define KS_MAR(_m) (0x14 - (_m))
#define KS_MARL 0x10
#define KS_MARM 0x12
#define KS_MARH 0x14
--
2.25.1
next prev parent reply other threads:[~2020-03-25 15:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 15:05 [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Marek Vasut
2020-03-25 15:05 ` [PATCH V2 01/14] net: ks8851: Factor out spi->dev in probe()/remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 02/14] net: ks8851: Rename ndev to netdev in probe Marek Vasut
2020-03-25 15:05 ` [PATCH V2 03/14] net: ks8851: Replace dev_err() with netdev_err() in IRQ handler Marek Vasut
2020-03-25 15:05 ` [PATCH V2 04/14] net: ks8851: Pass device node into ks8851_init_mac() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 05/14] net: ks8851: Use devm_alloc_etherdev() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 06/14] net: ks8851: Use dev_{get,set}_drvdata() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 07/14] net: ks8851: Remove ks8851_rdreg32() Marek Vasut
2020-03-25 15:05 ` Marek Vasut [this message]
2020-03-25 16:56 ` [PATCH V2 08/14] net: ks8851: Use 16-bit writes to program MAC address Michal Kubecek
2020-03-25 17:05 ` Marek Vasut
2020-03-25 17:30 ` Michal Kubecek
2020-03-27 18:16 ` Marek Vasut
2020-03-25 15:05 ` [PATCH V2 09/14] net: ks8851: Use 16-bit read of RXFC register Marek Vasut
2020-03-25 15:05 ` [PATCH V2 10/14] net: ks8851: Split out SPI specific entries in struct ks8851_net Marek Vasut
2020-03-25 15:05 ` [PATCH V2 11/14] net: ks8851: Split out SPI specific code from probe() and remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 12/14] net: ks8851: Separate SPI operations into separate file Marek Vasut
2020-03-25 15:05 ` [PATCH V2 13/14] net: ks8851: Implement Parallel bus operations Marek Vasut
2020-03-25 15:05 ` [PATCH V2 14/14] net: ks8851: Remove ks8851_mll.c Marek Vasut
2020-03-26 19:02 ` [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Lukas Wunner
2020-03-27 18:18 ` Marek Vasut
2020-03-27 19:25 ` Marek Vasut
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=20200325150543.78569-9-marex@denx.de \
--to=marex@denx.de \
--cc=davem@davemloft.net \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=ynezz@true.cz \
--cc=yuehaibing@huawei.com \
/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).